Fix application close on finish.

new_installer
ivan 14 years ago
parent b90d84e1fa
commit a86b1f6b74

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

@ -63,31 +63,28 @@ void PageManager::showFirst()
void PageManager::showNext() 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; ++m_CurPage;
pageUpdate(); pageUpdate();
} }
}
if (m_isSinglePage) if (m_isSinglePage)
{ {
m_isSinglePage = false; m_isSinglePage = false;
pageUpdate(); pageUpdate();
} }
}
} }
void PageManager::showPrevious() void PageManager::showPrevious()
{ {
if ( !m_isSinglePage && (m_CurPage != m_Pages.begin()) ) if ( !m_isSinglePage && (m_CurPage != m_Pages.begin()) )
{
if ((*m_CurPage)->validate())
{ {
--m_CurPage; --m_CurPage;
pageUpdate(); pageUpdate();
} }
}
if (m_isSinglePage) if (m_isSinglePage)
{ {
m_isSinglePage = false; m_isSinglePage = false;
@ -95,7 +92,6 @@ void PageManager::showPrevious()
} }
} }
// TODO
void PageManager::pageUpdate() void PageManager::pageUpdate()
{ {
QString label; QString label;

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

Loading…
Cancel
Save