diff options
| author | Ken Moore <moorekou@gmail.com> | 2015-09-11 12:03:31 -0400 |
|---|---|---|
| committer | Ken Moore <moorekou@gmail.com> | 2015-09-11 12:03:31 -0400 |
| commit | 0d434549cba673fbd4a362313fa8548c03f6b158 (patch) | |
| tree | c758909719d24de8c2ee3e383928fbb13fef64e5 /lumina-desktop/panel-plugins/clock/LClock.cpp | |
| parent | Add the option for wallpaper layout/format to lumina-config. (diff) | |
| parent | Merge pull request #155 from harcobbit/issue/11400 (diff) | |
| download | lumina-0d434549cba673fbd4a362313fa8548c03f6b158.tar.gz lumina-0d434549cba673fbd4a362313fa8548c03f6b158.tar.bz2 lumina-0d434549cba673fbd4a362313fa8548c03f6b158.zip | |
Merge branch 'master' of github.com:pcbsd/lumina
Diffstat (limited to 'lumina-desktop/panel-plugins/clock/LClock.cpp')
| -rw-r--r-- | lumina-desktop/panel-plugins/clock/LClock.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lumina-desktop/panel-plugins/clock/LClock.cpp b/lumina-desktop/panel-plugins/clock/LClock.cpp index f704647e..2c7e3e07 100644 --- a/lumina-desktop/panel-plugins/clock/LClock.cpp +++ b/lumina-desktop/panel-plugins/clock/LClock.cpp @@ -55,9 +55,9 @@ void LClock::updateTime(bool adjustformat){ QString label; QString timelabel; QString datelabel; - if(deftime){ timelabel = CT.time().toString(Qt::SystemLocaleShortDate) ; } + if(deftime){ timelabel = CT.time().toString(Qt::DefaultLocaleShortDate) ; } else{ timelabel=CT.toString(timefmt); } - if(defdate){ datelabel = CT.date().toString(Qt::SystemLocaleLongDate); } + if(defdate){ datelabel = CT.date().toString(Qt::DefaultLocaleShortDate); } else{ datelabel = CT.toString(datefmt); } if(datetimeorder == "dateonly"){ label = datelabel; @@ -255,4 +255,4 @@ void LClock::OrientationChange(){ } updateTime(true); //re-adjust the font/spacings this->layout()->update(); -}
\ No newline at end of file +} |