GCR v2.8

ragaeeb · Dec 6, 2014 · 8dc0d21 · 8dc0d21
1 parent c04ce73
commit 8dc0d21
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/assets/ConversationView.qml b/assets/ConversationView.qml
@@ -86,7 +86,7 @@ Page
         ActionItem {
             title: qsTr("Save All") + Retranslate.onLanguageChanged
             imageSource: "images/menu/ic_save.png"
-            ActionBar.placement: 'Signature' in ActionBarPlacement ? ActionBarPlacement.Signature : ActionBarPlacement.OnBar
+            ActionBar.placement: 'Signature' in ActionBarPlacement ? ActionBarPlacement["Signature"] : ActionBarPlacement.OnBar
 
             onTriggered: {
                 console.log("UserEvent: SaveAllTriggered");

diff --git a/assets/ExportPane.qml b/assets/ExportPane.qml
@@ -26,7 +26,7 @@ NavigationPane
             ActionItem {
                 id: selectAllAction
                 imageSource: "images/menu/selectAll.png"
-                ActionBar.placement: 'Signature' in ActionBarPlacement ? ActionBarPlacement.Signature : ActionBarPlacement.OnBar
+                ActionBar.placement: 'Signature' in ActionBarPlacement ? ActionBarPlacement["Signature"] : ActionBarPlacement.OnBar
                 title: qsTr("Select All") + Retranslate.onLanguageChanged
                 enabled: false
 

diff --git a/assets/NotificationToast.qml b/assets/NotificationToast.qml
@@ -71,7 +71,7 @@ Delegate
 
                         Label {
                             id: tipLabel
-                            text: "Tip!"
+                            text: titleText
                             textStyle.fontSize: FontSize.XXSmall
                             textStyle.fontWeight: FontWeight.Bold
                             verticalAlignment: VerticalAlignment.Top

diff --git a/res/graphics/Mockup 1.psd b/res/graphics/Mockup 1.psd