diff options
Diffstat (limited to 'lumina-config')
| -rw-r--r-- | lumina-config/main.cpp | 1 | ||||
| -rw-r--r-- | lumina-config/mainUI.cpp | 17 | ||||
| -rw-r--r-- | lumina-config/mainUI.ui | 66 |
3 files changed, 33 insertions, 51 deletions
diff --git a/lumina-config/main.cpp b/lumina-config/main.cpp index 115e793a..12ba0cd1 100644 --- a/lumina-config/main.cpp +++ b/lumina-config/main.cpp @@ -12,6 +12,7 @@ int main(int argc, char ** argv) { + LTHEME::LoadCustomEnvSettings(); LSingleApplication a(argc, argv, "lumina-config"); //loads translations inside constructor if(!a.isPrimaryProcess()){ return 0; } diff --git a/lumina-config/mainUI.cpp b/lumina-config/mainUI.cpp index 6bd6ba07..33b17105 100644 --- a/lumina-config/mainUI.cpp +++ b/lumina-config/mainUI.cpp @@ -11,7 +11,7 @@ #include <QImageReader> #include <QTime> #include <QDate> -#include <QTimeZone> +//#include <QTimeZone> #include <QScrollBar> #include <unistd.h> @@ -202,7 +202,6 @@ void MainUI::setupConnections(){ connect(ui->tool_help_date, SIGNAL(clicked()), this, SLOT(sessionShowDateCodes()) ); connect(ui->line_session_time, SIGNAL(textChanged(QString)), this, SLOT(sessionLoadTimeSample()) ); connect(ui->line_session_date, SIGNAL(textChanged(QString)), this, SLOT(sessionLoadDateSample()) ); - connect(ui->combo_session_timezone, SIGNAL(currentIndexChanged(int)), this, SLOT(sessionoptchanged()) ); connect(ui->combo_session_datetimeorder, SIGNAL(currentIndexChanged(int)), this, SLOT(sessionoptchanged()) ); connect(ui->combo_locale_lang, SIGNAL(currentIndexChanged(int)), this, SLOT(sessionoptchanged()) ); connect(ui->combo_locale_collate, SIGNAL(currentIndexChanged(int)), this, SLOT(sessionoptchanged()) ); @@ -246,7 +245,7 @@ void MainUI::setupMenus(){ //if(cur>=0){ ui->combo_session_cursortheme->setCurrentIndex(cur); } //Available Time zones - ui->combo_session_timezone->clear(); + /*ui->combo_session_timezone->clear(); QList<QByteArray> TZList = QTimeZone::availableTimeZoneIds(); QDateTime DT = QDateTime::currentDateTime(); QStringList tzlist; //Need to create a list which can be sorted appropriately @@ -256,6 +255,7 @@ void MainUI::setupMenus(){ QString name = QLocale::countryToString(TZ.country()); if(name.count() > 20){ name = name.left(20)+"..."; } name = QString(tr("%1 (%2)")).arg(name, TZ.abbreviation(DT)); + qDebug() << "Time Zone:" << name << TZ.id(); if(tzlist.filter(name).isEmpty()){ tzlist << name+"::::"+QString::number(i); } @@ -267,7 +267,7 @@ void MainUI::setupMenus(){ //ui->combo_session_timezone->sort(); //Now set the default/system value ui->combo_session_timezone->insertItem(0,tr("System Time")); - + */ //Available localizations QStringList langs = LUtils::knownLocales(); langs.sort(); @@ -1587,14 +1587,15 @@ void MainUI::loadSessionSettings(){ ui->line_session_date->setText( sessionsettings->value("DateFormat","").toString() ); index = ui->combo_session_datetimeorder->findData( sessionsettings->value("DateTimeOrder","timeonly").toString() ); ui->combo_session_datetimeorder->setCurrentIndex(index); - if( !sessionsettings->value("CustomTimeZone", false).toBool() ){ + + /*if( !sessionsettings->value("CustomTimeZone", false).toBool() ){ //System Time selected ui->combo_session_timezone->setCurrentIndex(0); }else{ index = ui->combo_session_timezone->findData( sessionsettings->value("TimeZoneByteCode",QByteArray()).toByteArray() ); if(index>0){ ui->combo_session_timezone->setCurrentIndex(index); } else{ ui->combo_session_timezone->setCurrentIndex(0); } - } + }*/ //Now do the localization settings val = sessionsettings->value("InitLocale/LANG", "").toString(); @@ -1763,14 +1764,14 @@ void MainUI::saveSessionSettings(){ sessionsettings->setValue("TimeFormat", ui->line_session_time->text()); sessionsettings->setValue("DateFormat", ui->line_session_date->text()); sessionsettings->setValue("DateTimeOrder", ui->combo_session_datetimeorder->currentData().toString()); - if( ui->combo_session_timezone->currentIndex()==0){ + /*if( ui->combo_session_timezone->currentIndex()==0){ //System Time selected sessionsettings->setValue("CustomTimeZone", false); sessionsettings->setValue("TimeZoneByteCode", QByteArray()); //clear the value }else{ sessionsettings->setValue("CustomTimeZone", true); sessionsettings->setValue("TimeZoneByteCode", ui->combo_session_timezone->currentData().toByteArray()); //clear the value - } + }*/ //Now do the locale settings sessionsettings->setValue("InitLocale/LANG", ui->combo_locale_lang->currentData().toString() ); diff --git a/lumina-config/mainUI.ui b/lumina-config/mainUI.ui index aa7024d3..5a4324fb 100644 --- a/lumina-config/mainUI.ui +++ b/lumina-config/mainUI.ui @@ -1217,6 +1217,23 @@ </item> </layout> </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_28"> + <property name="text"> + <string>Sample:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLabel" name="label_session_timesample"> + <property name="text"> + <string notr="true"/> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> <item row="2" column="0"> <widget class="QLabel" name="label_25"> <property name="text"> @@ -1244,13 +1261,13 @@ </item> </layout> </item> - <item row="1" column="1"> - <widget class="QLabel" name="label_session_timesample"> + <item row="3" column="0"> + <widget class="QLabel" name="label_29"> <property name="text"> - <string notr="true"/> + <string>Sample:</string> </property> <property name="alignment"> - <set>Qt::AlignCenter</set> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> </property> </widget> </item> @@ -1264,53 +1281,16 @@ </property> </widget> </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_28"> - <property name="text"> - <string>Sample:</string> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_29"> - <property name="text"> - <string>Sample:</string> - </property> - <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> - </property> - </widget> - </item> <item row="4" column="0"> - <widget class="QLabel" name="label_26"> + <widget class="QLabel" name="label_27"> <property name="text"> - <string>Time Zone:</string> + <string>Display Format</string> </property> </widget> </item> <item row="4" column="1"> - <widget class="QComboBox" name="combo_session_timezone"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="sizeAdjustPolicy"> - <enum>QComboBox::AdjustToMinimumContentsLength</enum> - </property> - </widget> - </item> - <item row="5" column="1"> <widget class="QComboBox" name="combo_session_datetimeorder"/> </item> - <item row="5" column="0"> - <widget class="QLabel" name="label_27"> - <property name="text"> - <string>Display Format</string> - </property> - </widget> - </item> </layout> </item> <item row="1" column="0"> |