Fix application close on finish.

new_installer
ivan 14 years ago
parent b90d84e1fa
commit a86b1f6b74

@ -1,6 +1,7 @@
#include "pagefinish.h"
#include <QApplication>
#include <QDebug>
#include <QLabel>
#include <QBoxLayout>

@ -63,18 +63,18 @@ void PageManager::showFirst()
void PageManager::showNext()
{
if ( !m_isSinglePage && (m_CurPage != m_Pages.end()) && ((m_CurPage + 1) != m_Pages.end()) )
if ((*m_CurPage)->validate())
{
if ((*m_CurPage)->validate())
if ( !m_isSinglePage && (m_CurPage != m_Pages.end()) && ((m_CurPage + 1) != m_Pages.end()) )
{
++m_CurPage;
pageUpdate();
}
}
if (m_isSinglePage)
{
m_isSinglePage = false;
pageUpdate();
if (m_isSinglePage)
{
m_isSinglePage = false;
pageUpdate();
}
}
}
@ -82,11 +82,8 @@ void PageManager::showPrevious()
{
if ( !m_isSinglePage && (m_CurPage != m_Pages.begin()) )
{
if ((*m_CurPage)->validate())
{
--m_CurPage;
pageUpdate();
}
--m_CurPage;
pageUpdate();
}
if (m_isSinglePage)
{
@ -95,7 +92,6 @@ void PageManager::showPrevious()
}
}
// TODO
void PageManager::pageUpdate()
{
QString label;

@ -159,18 +159,19 @@ void SystemInstaller::completePartitioning()
void SystemInstaller::volumeSelect(QString volume)
{
qDebug() << "Selected volume is " << volume;
//qDebug() << "Selected volume is " << volume;
m_InstallSettings.disk = volume;
}
void SystemInstaller::configurationSelect(InstallerSettings settings)
{
/*
qDebug() << "Selected settings: ";
qDebug() << "Host: " << settings.host;
qDebug() << "FS: " << settings.fs;
qDebug() << "Language: " << settings.language;
qDebug() << "Timezone: " << settings.timezone;
*/
// replace selected volume
settings.disk = m_InstallSettings.disk;
m_InstallSettings = settings;

Loading…
Cancel
Save