preferences: support a pre-defined list of date formats

Add a combo-box in place of the single line text field and
support some pre-defined date formats, such as:
MM/dd/yyyy

Each long format has a corresponding short variant stored in the
QMap dateFormatShortMap and it's updated automatically once
the user selects a combo box item for the long format.

The regex for dates is slighly modified:
[^dMy/\\s:;\\.,\\-]

The user is still allowed to enter custom long / short date foramats.

Fixes #276

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>

1 files changed, 25 insertions, 22 deletions

diff --git a/desktop-widgets/preferences/prefs_language.ui b/desktop-widgets/preferences/prefs_language.ui
index af3a0ad87..470e8b6d1 100644
--- a/desktop-widgets/preferences/prefs_language.ui
+++ b/desktop-widgets/preferences/prefs_language.ui
@@ -74,13 +74,6 @@
       <string>Date format</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="1">
-       <widget class="QLineEdit" name="dateFormatEntry">
-        <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Preferred date format. Commonly used fields are&lt;/p&gt;&lt;p&gt;d (day of month)&lt;/p&gt;&lt;p&gt;ddd (abbr. day name)&lt;/p&gt;&lt;p&gt;M (month number)&lt;/p&gt;&lt;p&gt;MMM (abbr. month name)&lt;/p&gt;&lt;p&gt;yy/yyyy (2/4 digit year)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="0">
        <widget class="QCheckBox" name="dateFormatSystemDefault">
         <property name="text">
@@ -114,6 +107,16 @@
         </property>
        </spacer>
       </item>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="dateFormatEntry">
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Preferred date format. Commonly used fields are&lt;/p&gt;&lt;p&gt;d (day of month)&lt;/p&gt;&lt;p&gt;ddd (abbr. day name)&lt;/p&gt;&lt;p&gt;M (month number)&lt;/p&gt;&lt;p&gt;MMM (abbr. month name)&lt;/p&gt;&lt;p&gt;yy/yyyy (2/4 digit year)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="editable">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -209,50 +212,50 @@
    </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>79</x>
-     <y>132</y>
+     <y>210</y>
     </hint>
     <hint type="destinationlabel">
      <x>264</x>
-     <y>132</y>
+     <y>210</y>
     </hint>
    </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>