Merge lp:~mcintire-evan/ubuntu-terminal-app/toggle_keyboard into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

[Evan McIntire]

Added an option to toggle the visibility of the keyboard button.

Added an option to toggle the visibility of the keyboard button.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

This is great, thanks Evan!

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'po/com.ubuntu.terminal.pot'
--- po/com.ubuntu.terminal.pot	2015-08-09 14:03:25 +0000
+++ po/com.ubuntu.terminal.pot	2015-12-19 05:16:44 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-09 16:01+0200\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -161,11 +161,15 @@
 msgid "Show Keyboard Bar"
 msgstr ""
 
-#: ../src/app/qml/SettingsPage.qml:52
+#: ../src/app/qml/SettingsPage.qml:50
+msgid "Show Keyboard Button"
+msgstr ""
+
+#: ../src/app/qml/SettingsPage.qml:60
 msgid "Font Size:"
 msgstr ""
 
-#: ../src/app/qml/SettingsPage.qml:85
+#: ../src/app/qml/SettingsPage.qml:93
 msgid "Color Scheme"
 msgstr ""
 
 
=== modified file 'src/app/qml/SettingsPage.qml'
--- src/app/qml/SettingsPage.qml	2015-07-13 20:25:21 +0000
+++ src/app/qml/SettingsPage.qml	2015-12-19 05:16:44 +0000
@@ -46,6 +46,14 @@
             }
         }
 
+        ListItem.Standard {
+            text: i18n.tr("Show Keyboard Button")
+            control: Switch {
+                onCheckedChanged: settings.showKeyboardButton = checked;
+                Component.onCompleted: checked = settings.showKeyboardButton;
+            }
+        }
+
         ListItem.Empty {
             height: units.gu(10)
             Label {
 
=== modified file 'src/app/qml/TerminalPage.qml'
--- src/app/qml/TerminalPage.qml	2015-07-13 20:25:21 +0000
+++ src/app/qml/TerminalPage.qml	2015-12-19 05:16:44 +0000
@@ -210,20 +210,22 @@
         }
     }
 
-    CircularTransparentButton {
+    Loader {
         id: keyboardButton
-
+        active: settings.showKeyboardButton
         anchors {right: parent.right; margins: units.gu(1)}
 
         y: parent.height - height - units.gu(1) - keyboardBarLoader.height
 
-        innerOpacity: 0.6
-        border {color: UbuntuColors.orange; width: units.dp(2)}
-        action: Action {
-            iconName: "input-keyboard-symbolic"
-            onTriggered: {
-                Qt.inputMethod.show();
-                terminal.forceActiveFocus();
+        sourceComponent: CircularTransparentButton {
+            innerOpacity: 0.6
+            border {color: UbuntuColors.orange; width: units.dp(2)}
+            action: Action {
+                iconName: "input-keyboard-symbolic"
+                onTriggered: {
+                    Qt.inputMethod.show();
+                    terminal.forceActiveFocus();
+                }
             }
         }
     }
 
=== modified file 'src/app/qml/TerminalSettings.qml'
--- src/app/qml/TerminalSettings.qml	2015-11-12 12:33:24 +0000
+++ src/app/qml/TerminalSettings.qml	2015-12-19 05:16:44 +0000
@@ -9,6 +9,7 @@
     property alias fontStyle: innerSettings.fontStyle
     property alias colorScheme: innerSettings.colorScheme
     property alias showKeyboardBar: innerSettings.showKeyboardBar
+    property alias showKeyboardButton: innerSettings.showKeyboardButton
 
     readonly property int defaultFontSize: units.gu(0.4)
     readonly property int minFontSize: 2
@@ -39,6 +40,7 @@
         property string fontStyle: "Ubuntu Mono"
         property string colorScheme: "Ubuntu"
         property bool showKeyboardBar: true
+        property bool showKeyboardButton: true
         property string jsonVisibleProfiles: "[]"
     }