Merge lp:~mutse-young/night-clock/trunk into lp:night-clock

[mutse]

add date format setting

[Michal Predotka (mpredotka)]

Hi mutse!

Many thanks for your code proposition. I really appreciate it. I hope it will not be a problem if I don't merge your code this time. It is because I plan to add an option for even more date formats.

Regards,
Michal

[mutse (mutse-young)]

Hi, Michal!

I have update the night clock, it is so cool! I am like it so much! I hope
you can add an option for more colors.

Thanks!

2015年12月7日星期一，Michal Predotka <email address hidden> 写道：
> Hi mutse!
>
> Many thanks for your code proposition. I really appreciate it. I hope it
will not be a problem if I don't merge your code this time. It is because I
plan to add an option for even more date formats.
>
> Regards,
> Michal
> --
> https://code.launchpad.net/~mutse-young/night-clock/trunk/+merge/279684
> You are the owner of lp:~mutse-young/night-clock/trunk.
>

Unmerged revisions

5. By mutse on 2015-12-06

add date format setting

=== modified file 'Main.qml'
--- Main.qml	2015-12-05 23:05:57 +0000
+++ Main.qml	2015-12-06 07:50:46 +0000
@@ -10,10 +10,12 @@
     property bool isFullscreen: true
     property bool isLandscape: main_view.width > main_view.height
     property bool is24format: true
+    property bool isdateformat: false
     property string time_24: "00:00"
     property string time_12: "00:00:ap"
     property string this_day: Qt.formatDateTime(new Date(), "dddd")
     property string this_date: Qt.formatDateTime(new Date(), "d MMMM yyyy")
+    property string standard_date: Qt.formatDateTime(new Date(), "yyyy MMMM d")
     property color back_color: "#000"
     property color text_color: UbuntuColors.red
 
@@ -23,6 +25,7 @@
         time_12 = Qt.formatDateTime(new Date(), "hh:mm:ap")
         this_day = Qt.formatDateTime(new Date(), "dddd")
         this_date = Qt.formatDateTime(new Date(), "d MMMM yyyy")
+        standard_date = Qt.formatDateTime(new Date(), "yyyy MMMM d")
     }
 
     width: units.gu(40)
@@ -48,6 +51,7 @@
             property alias foreground_colour: root_window.text_color
             property alias is_fullscreen: root_window.isFullscreen
             property alias is_24_format: root_window.is24format
+            property alias is_sd_format: root_window.isdateformat
         }
 
         Connections {
 
=== modified file 'qml/Display.qml'
--- qml/Display.qml	2015-12-05 23:11:51 +0000
+++ qml/Display.qml	2015-12-06 07:50:46 +0000
@@ -132,7 +132,7 @@
             id: date_label
 
             color: text_color
-            text: this_date
+            text: isdateformat ? standard_date : this_date
             anchors {
                 top: day_label.bottom
                 topMargin: units.gu(1)
 
=== modified file 'qml/Settings.qml'
--- qml/Settings.qml	2015-12-03 10:36:47 +0000
+++ qml/Settings.qml	2015-12-06 07:50:46 +0000
@@ -149,6 +149,26 @@
                 }
 
                 ListItem {
+                    id: show_date_setting_item
+
+                    RowLayout {
+                        anchors.fill: parent
+
+                        Label {
+                            text: i18n.tr("Standard date format")
+                            anchors.verticalCenter: parent.verticalCenter
+                            Layout.fillWidth: true
+                        }
+
+                        Switch {
+                            anchors.verticalCenter: parent.verticalCenter
+                            checked: isdateformat
+                            onCheckedChanged: isdateformat = checked
+                        }
+                    }
+                }
+
+                ListItem {
                     id: text_color_setting_item
 
                     Column {