From 513f5a0230f5039ba5407562a7539a22cb20802a Mon Sep 17 00:00:00 2001
From: "Lubomir I. Ivanov" <neolit123@gmail.com>
Date: Fri, 10 Nov 2017 17:28:09 +0200
Subject: preferences: support a pre-defined list of time formats

Add a combo-box that holds a list of pre-defined time formats
in the Language preferences.

The user is still allowed to enter a custom time format.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
---
 desktop-widgets/preferences/prefs_language.ui | 41 ++++++++++++++++-----------
 1 file changed, 25 insertions(+), 16 deletions(-)

(limited to 'desktop-widgets/preferences/prefs_language.ui')

diff --git a/desktop-widgets/preferences/prefs_language.ui b/desktop-widgets/preferences/prefs_language.ui
index 470e8b6d1..b51dd083f 100644
--- a/desktop-widgets/preferences/prefs_language.ui
+++ b/desktop-widgets/preferences/prefs_language.ui
@@ -140,10 +140,19 @@
        </widget>
       </item>
       <item>
-       <widget class="QLineEdit" name="timeFormatEntry">
+       <widget class="QComboBox" name="timeFormatEntry">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Preferred time format&lt;/p&gt;&lt;p&gt;Commonly used format specifiers are&lt;/p&gt;&lt;p&gt;h (hours in 12h format)&lt;/p&gt;&lt;p&gt;H (hours in 24h format)&lt;/p&gt;&lt;p&gt;mm (2 digit minutes)&lt;/p&gt;&lt;p&gt;ss (2 digit seconds)&lt;/p&gt;&lt;p&gt;t/tt (a/p or am/pm)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
+        <property name="editable">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item>
@@ -212,50 +221,50 @@
    </hints>
   </connection>
   <connection>
-   <sender>timeFormatSystemDefault</sender>
+   <sender>dateFormatSystemDefault</sender>
    <signal>toggled(bool)</signal>
-   <receiver>timeFormatEntry</receiver>
+   <receiver>shortDateFormatEntry</receiver>
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>79</x>
-     <y>210</y>
+     <x>99</x>
+     <y>132</y>
     </hint>
     <hint type="destinationlabel">
-     <x>264</x>
-     <y>210</y>
+     <x>293</x>
+     <y>169</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>dateFormatSystemDefault</sender>
    <signal>toggled(bool)</signal>
-   <receiver>shortDateFormatEntry</receiver>
+   <receiver>dateFormatEntry</receiver>
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>99</x>
-     <y>132</y>
+     <x>89</x>
+     <y>103</y>
     </hint>
     <hint type="destinationlabel">
-     <x>293</x>
-     <y>169</y>
+     <x>273</x>
+     <y>103</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>dateFormatSystemDefault</sender>
+   <sender>timeFormatSystemDefault</sender>
    <signal>toggled(bool)</signal>
-   <receiver>dateFormatEntry</receiver>
+   <receiver>timeFormatEntry</receiver>
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>89</x>
-     <y>103</y>
+     <y>190</y>
     </hint>
     <hint type="destinationlabel">
      <x>273</x>
-     <y>103</y>
+     <y>190</y>
     </hint>
    </hints>
   </connection>
-- 
cgit v1.2.3-70-g09d2