applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-26 17:05:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't allow to go next if the timezone view hasn't loaded.

Browse source
This commit is contained in:
Teo Mrnjavac 2014-07-03 13:19:32 +02:00
parent f9aa532d77
commit 81eafced2f
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/modules/locale/LocaleViewStep.cpp
View file

@ -31,6 +31,7 @@ LocaleViewStep::LocaleViewStep( QObject* parent )
: Calamares::ViewStep( parent ) : Calamares::ViewStep( parent )
, m_widget( new QWidget() ) , m_widget( new QWidget() )
, m_actualWidget( new LocalePage() ) , m_actualWidget( new LocalePage() )
, m_nextEnabled( false )
{ {
QBoxLayout* mainLayout = new QHBoxLayout; QBoxLayout* mainLayout = new QHBoxLayout;
m_widget->setLayout( mainLayout ); m_widget->setLayout( mainLayout );
@ -47,12 +48,14 @@ LocaleViewStep::LocaleViewStep( QObject* parent )
m_widget->layout()->removeWidget( waitingLabel ); m_widget->layout()->removeWidget( waitingLabel );
waitingLabel->deleteLater(); waitingLabel->deleteLater();
m_widget->layout()->addWidget( m_actualWidget ); m_widget->layout()->addWidget( m_actualWidget );
m_nextEnabled = true;
emit nextStatusChanged( m_nextEnabled );
}); });
QFuture< void > initFuture = QtConcurrent::run( LocaleGlobal::init ); QFuture< void > initFuture = QtConcurrent::run( LocaleGlobal::init );
m_initWatcher.setFuture( initFuture ); m_initWatcher.setFuture( initFuture );
emit nextStatusChanged( true ); emit nextStatusChanged( m_nextEnabled );
} }
@ -93,7 +96,7 @@ LocaleViewStep::back()
bool bool
LocaleViewStep::isNextEnabled() const LocaleViewStep::isNextEnabled() const
{ {
return true; return m_nextEnabled;
} }

1
src/modules/locale/LocaleViewStep.h
View file

@ -56,6 +56,7 @@ private:
QFutureWatcher< void > m_initWatcher; QFutureWatcher< void > m_initWatcher;
LocalePage* m_actualWidget; LocalePage* m_actualWidget;
bool m_nextEnabled;
}; };
#endif // LOCALEVIEWSTEP_H #endif // LOCALEVIEWSTEP_H