Merge lp:~vthompson/ubuntu-terminal-app/move-settings-to-toolbar into lp:ubuntu-terminal-app

[Victor Thompson]

* Move the Settings tab to an icon on the toolbar

* Move the Settings tab to an icon on the toolbar, per Design direction [1]

[1] http://design.canonical.com/2013/12/app-design-clinic-6/

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

FAILED: Continuous integration, rev:34
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/23/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/532
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-raring-amd64-ci/23
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-saucy-amd64-ci/23
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-trusty-amd64-ci/11

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/23/rebuild

review: Needs Fixing (continuous-integration)

[lp:~vthompson/ubuntu-terminal-app/move-settings-to-toolbar]

35. By Victor Thompson on 2013-12-21

Fix AP test

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

PASSED: Continuous integration, rev:35
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/24/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/533
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-raring-amd64-ci/24
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-saucy-amd64-ci/24
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-trusty-amd64-ci/12

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/24/rebuild

review: Approve (continuous-integration)

[lp:~vthompson/ubuntu-terminal-app/move-settings-to-toolbar]

36. By Victor Thompson on 2013-12-22

Move tabs to a page since there is only one tab.

37. By Victor Thompson on 2013-12-22

Move pages into pagestack

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

PASSED: Continuous integration, rev:36
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/25/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/535
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-raring-amd64-ci/25
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-saucy-amd64-ci/25
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-trusty-amd64-ci/13

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/25/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:37
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/26/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/536
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-raring-amd64-ci/26
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-saucy-amd64-ci/26
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-trusty-amd64-ci/14

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/26/rebuild

review: Approve (continuous-integration)

=== added file 'settings.png'
Binary files settings.png	1970-01-01 00:00:00 +0000 and settings.png	2013-12-22 00:19:16 +0000 differ
=== modified file 'tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py'
--- tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py	2013-11-12 20:31:42 +0000
+++ tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py	2013-12-22 00:19:16 +0000
@@ -165,7 +165,8 @@
 
     def test_font_size_changes(self):
         """Make sure that font size is set correctly"""
-        self.main_view.switch_to_tab("SettingsTab")
+        toolbar = self.main_view.open_toolbar()
+        toolbar.click_button("SettingsButton")
 
         # change font size to max
         self.main_view.drag_horizontal_slider("slFont",32)

=== modified file 'ubuntu-terminal-app.qml'
--- ubuntu-terminal-app.qml	2013-10-08 10:11:44 +0000
+++ ubuntu-terminal-app.qml	2013-12-22 00:19:16 +0000
@@ -43,52 +43,61 @@
         }
     }
 
-    Tabs {
-        id: tabs
-        objectName: "rootTabs"
-        anchors.fill: parent
-
-        Tab {
-            objectName: "TerminalTab"
+    PageStack {
+        id: pageStack
+
+        Component.onCompleted: {
+            pageStack.push(terminalPage)
+        }
+
+        Page {
+            id: terminalPage
+            visible: false
+
+            objectName: "TerminalPage"
             title: i18n.tr("Terminal")
-            page: Page {
-
-                onWidthChanged: {
-                    header.visible = width < height;
-                }
-
-                onHeightChanged: {
-                    header.visible = width < height;
-                }
-
-                Terminal {
-                    id: pgTerm
-                    objectName: "pgTerm"
-                }
-
-                tools: ToolbarItems {
-                    ToolbarButton {
-                           id: toolbarAction
-                           objectName: "PanelsButton"
-                           action: Action {
-                                text: "Panels"
-                                iconSource: Qt.resolvedUrl("avatar.png")
-                                onTriggered: PopupUtils.open(actionSelectionPopover, toolbarAction)
-                           }
-                    }
-                }
-
-            }
-
+
+            onWidthChanged: {
+                header.visible = width < height;
+            }
+
+            onHeightChanged: {
+                header.visible = width < height;
+            }
+
+            Terminal {
+                id: pgTerm
+                objectName: "pgTerm"
+            }
+
+            tools: ToolbarItems {
+                ToolbarButton {
+                    id: toolbarAction
+                    objectName: "PanelsButton"
+                    action: Action {
+                        text: "Panels"
+                        iconSource: Qt.resolvedUrl("avatar.png")
+                        onTriggered: PopupUtils.open(actionSelectionPopover, toolbarAction)
+                    }
+                }
+                ToolbarButton {
+                    id: settingsButton
+                    objectName: "SettingsButton"
+                    action: Action {
+                        text: "Settings"
+                        iconSource: Qt.resolvedUrl("settings.png")
+                        onTriggered: pageStack.push(settingsPage)
+                    }
+                }
+            }
         }
 
-        Tab {
-            objectName: "SettingsTab"
+        Page {
+            id: settingsPage
+            visible: false
             title: i18n.tr("Settings")
-            page: Page {
-                Configs { id: pgConf }
-            }
+            Configs { id: pgConf }
         }
+    }
 
-    }
 }