napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the locale viewmodule use WaitingWidget.

Browse Source
This commit is contained in:
Teo Mrnjavac 2014-09-03 18:01:39 +02:00
parent 13ccede630
commit 8651b33843
1 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/modules/locale/LocaleViewStep.cpp
View File

@ -19,8 +19,8 @@
#include "LocaleViewStep.h" #include "LocaleViewStep.h"
#include "LocalePage.h" #include "LocalePage.h"
#include "widgets/QtWaitingSpinner.h"
#include "timezonewidget/localeglobal.h" #include "timezonewidget/localeglobal.h"
#include "widgets/WaitingWidget.h"
#include "utils/CalamaresUtilsGui.h" #include "utils/CalamaresUtilsGui.h"
@ -38,38 +38,10 @@ LocaleViewStep::LocaleViewStep( QObject* parent )
m_widget->setLayout( mainLayout ); m_widget->setLayout( mainLayout );
CalamaresUtils::unmarginLayout( mainLayout ); CalamaresUtils::unmarginLayout( mainLayout );
QWidget* waitingWidget = new QWidget; WaitingWidget* waitingWidget =
{ new WaitingWidget( tr( "Loading location data..." ) );
QBoxLayout* waitingLayout = new QVBoxLayout;
waitingWidget->setLayout( waitingLayout );
waitingLayout->addStretch();
QBoxLayout* pbLayout = new QHBoxLayout;
waitingLayout->addLayout( pbLayout );
pbLayout->addStretch();
QtWaitingSpinner* spnr = new QtWaitingSpinner(); mainLayout->addWidget( waitingWidget );
pbLayout->addWidget( spnr );
pbLayout->addStretch();
QLabel* waitingLabel = new QLabel( "Loading location data..." );
int spnrSize = waitingLabel->fontMetrics().height() * 4;
spnr->setFixedSize( spnrSize, spnrSize );
spnr->setRadius( spnrSize / 2 );
spnr->setLength( spnrSize / 2 );
spnr->setWidth( spnrSize / 8 );
spnr->start();
waitingLabel->setAlignment( Qt::AlignCenter);
waitingLayout->addSpacing( spnrSize / 2 );
waitingLayout->addWidget( waitingLabel );
waitingLayout->addStretch();
mainLayout->addWidget( waitingWidget );
CalamaresUtils::unmarginLayout( waitingLayout );
}
connect( &m_initWatcher, &QFutureWatcher< void >::finished, connect( &m_initWatcher, &QFutureWatcher< void >::finished,
[=] [=]