aboutsummaryrefslogtreecommitdiff
path: root/lumina-config
diff options
context:
space:
mode:
authorKen Moore <moorekou@gmail.com>2015-09-11 12:03:31 -0400
committerKen Moore <moorekou@gmail.com>2015-09-11 12:03:31 -0400
commit0d434549cba673fbd4a362313fa8548c03f6b158 (patch)
treec758909719d24de8c2ee3e383928fbb13fef64e5 /lumina-config
parentAdd the option for wallpaper layout/format to lumina-config. (diff)
parentMerge pull request #155 from harcobbit/issue/11400 (diff)
downloadlumina-0d434549cba673fbd4a362313fa8548c03f6b158.tar.gz
lumina-0d434549cba673fbd4a362313fa8548c03f6b158.tar.bz2
lumina-0d434549cba673fbd4a362313fa8548c03f6b158.zip
Merge branch 'master' of github.com:pcbsd/lumina
Diffstat (limited to 'lumina-config')
-rw-r--r--lumina-config/mainUI.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lumina-config/mainUI.cpp b/lumina-config/mainUI.cpp
index 27ec0008..5b4cb66b 100644
--- a/lumina-config/mainUI.cpp
+++ b/lumina-config/mainUI.cpp
@@ -1977,7 +1977,7 @@ void MainUI::sessionResetLumina(){
void MainUI::sessionLoadTimeSample(){
if(ui->line_session_time->text().simplified().isEmpty()){
- ui->label_session_timesample->setText( QTime::currentTime().toString(Qt::SystemLocaleShortDate) );
+ ui->label_session_timesample->setText( QTime::currentTime().toString(Qt::DefaultLocaleShortDate) );
}else{
ui->label_session_timesample->setText( QTime::currentTime().toString( ui->line_session_time->text() ) );
}
@@ -2000,7 +2000,7 @@ void MainUI::sessionShowTimeCodes(){
void MainUI::sessionLoadDateSample(){
if(ui->line_session_date->text().simplified().isEmpty()){
- ui->label_session_datesample->setText( QDate::currentDate().toString(Qt::SystemLocaleLongDate) );
+ ui->label_session_datesample->setText( QDate::currentDate().toString(Qt::DefaultLocaleShortDate) );
}else{
ui->label_session_datesample->setText( QDate::currentDate().toString( ui->line_session_date->text() ) );
}
bgstack15