Merge lp:~rpadovani/reminders-app/rtfmplaceholders into lp:reminders-app

[Riccardo Padovani]

Added RTF mode panel, with icons for bold, italic, underlined text and font change.
They are only placeholders

Added RTF mode panel, with icons for bold, italic, underlined text and font change.
They are only placeholders

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:49
http://91.189.93.70:8080/job/reminders-app-ci/92/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/927
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/92
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/92

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/92/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

Sorry... I kinda went wild and implemented this a bit differently.

Unmerged revisions

49. By Riccardo Padovani on 2014-02-02

Modified icons

48. By Riccardo Padovani on 2014-02-02

Added placeholders for RTF mode

=== modified file 'src/app/qml/ui/EditNotePage.qml'
--- src/app/qml/ui/EditNotePage.qml	2014-01-30 11:34:23 +0000
+++ src/app/qml/ui/EditNotePage.qml	2014-02-02 10:41:23 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright: 2013 Canonical, Ltd
+ * Copyright: 2013, 2014 Canonical, Ltd
  *
  * This file is part of reminders
  *
@@ -26,6 +26,7 @@
 Page {
     id: root
     property var note
+    property bool isRTFMode: false
 
     tools: ToolbarItems {
         locked: true
@@ -33,6 +34,13 @@
     }
 
     QtObject {
+        id: modifier
+        property bool isBoldMode: false
+        property bool isItalicMode: false   
+        property bool isUnderlinedMode: false
+    }
+
+    QtObject {
         id: priv
         property int insertPosition
         property var activeTransfer
@@ -147,6 +155,7 @@
             name: "import-image"
             height: units.gu(3)
             width: height
+            visible: !isRTFMode
             anchors.verticalCenter: parent.verticalCenter
             anchors.left: parent.left
             anchors.margins: units.gu(2)
@@ -167,6 +176,7 @@
             name: "camera-symbolic"
             height: units.gu(3)
             width: height
+            visible: !isRTFMode
             anchors.centerIn: parent
             MouseArea {
                 anchors.fill: parent
@@ -179,13 +189,97 @@
             name: "edit"
             height: units.gu(3)
             width: height
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.right: parent.right
-            anchors.margins: units.gu(2)
-            MouseArea {
-                anchors.fill: parent
-                onClicked: {
-                }
+            visible: !isRTFMode
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.right: parent.right
+            anchors.margins: units.gu(2)
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    isRTFMode = true;
+                    console.log("These are only placeholders, RTF mode is not implemented yet");
+                }
+            }
+        }
+
+        Icon {
+            id: fontIcon
+            name: "preferences-desktop-font"
+            height: units.gu(3)
+            width: height
+            visible: isRTFMode
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.left: parent.left
+            anchors.margins: units.gu(2)
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                }
+            }
+        }
+
+        Icon {
+            id: boldIcon
+            name: "format-text-bold"
+            height: units.gu(3)
+            width: height
+            visible: isRTFMode
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.left: fontIcon.right
+            anchors.margins: units.gu(2)
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    modifier.isBoldMode = !modifier.isBoldMode
+                }
+            }
+        }
+
+        Icon {
+            id: italicIcon
+            name: "format-text-italic"
+            height: units.gu(3)
+            width: height
+            visible: isRTFMode
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.left: boldIcon.right
+            anchors.margins: units.gu(2)
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    modifier.isItalicMode = !modifier.isItalicMode
+                }
+            }
+        }
+
+        Icon {
+            id: underlineIcon
+            name: "format-text-underline"
+            height: units.gu(3)
+            width: height
+            visible: isRTFMode
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.left: italicIcon.right
+            anchors.margins: units.gu(2)
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    modifier.isUnderlinedMode = !modifier.isUnderlinedMode
+                }
+            }
+        }
+
+        Icon {
+            name: "back"
+            height: units.gu(3)
+            width: height
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.margins: units.gu(2)
+            anchors.right: parent.right
+            visible: isRTFMode
+            MouseArea {
+                anchors.fill: parent
+                onClicked: isRTFMode = false
             }
         }