From 222ce62bceac4c7f95e7a0564f11b5789dc18d29 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 30 Oct 2015 13:26:05 -0700 Subject: Preferences: add date and time format to language page Not hooked up, yet. Signed-off-by: Dirk Hohndel --- desktop-widgets/preferences/prefs_language.ui | 153 +++++++++++++++++++++++++- 1 file changed, 149 insertions(+), 4 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/preferences/prefs_language.ui b/desktop-widgets/preferences/prefs_language.ui index 650d543f6..af3a0ad87 100644 --- a/desktop-widgets/preferences/prefs_language.ui +++ b/desktop-widgets/preferences/prefs_language.ui @@ -29,7 +29,7 @@ - System default + Use system default @@ -62,19 +62,116 @@ + + + + + 0 + 0 + + + + Date format + + + + + + <html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html> + + + + + + + Use UI language default + + + + + + + + + + This is used in places where there is less space to show the full date + + + Short format + + + + + + + Qt::Horizontal + + + + 203 + 20 + + + + + + + + + + + + 0 + 0 + + + + Time format + + - + + + Use UI language default + + + + + + + <html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html> + + + + + - Qt::Vertical + Qt::Horizontal - 20 + 203 20 + + + + + + + Qt::Vertical + + + + 20 + 20 + + + + @@ -111,5 +208,53 @@ + + dateFormatSystemDefault + toggled(bool) + dateFormatEntry + setDisabled(bool) + + + 79 + 132 + + + 264 + 132 + + + + + timeFormatSystemDefault + toggled(bool) + timeFormatEntry + setDisabled(bool) + + + 79 + 210 + + + 264 + 210 + + + + + dateFormatSystemDefault + toggled(bool) + shortDateFormatEntry + setDisabled(bool) + + + 99 + 132 + + + 293 + 169 + + + -- cgit v1.2.3-70-g09d2