Merge lp:~flscogna/ubuntu-terminal-app/profile-selection into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

[Filippo Scognamiglio]

Custom profile visibility in settings

Custom profile visibility in settings. It is possible to show only a subset of the installed layouts.

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

PASSED: Continuous integration, rev:73
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/144/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2481
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2481/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/65
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-vivid-amd64-ci/28

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

I set no profiles active, but still see the keyboard button. Can we hide that when all keyboard layouts are disabled?

http://people.canonical.com/~alan/screenshots/device-2015-04-13-120147.png

Other than that, looks great.

review: Needs Fixing

[Filippo Scognamiglio (flscogna)]

Alan, we can theoretically hide the keyboard button, but what about the row? If we hide only the button, we would basically have a black useless rectangle at the bottom.
Let's discuss some options:

1) Leave the current situation, with a useless bar and a useless button. (quite bad but predictable)
2) Hide the keyboard bar when no profiles are selected. (might be confusing?)
3) Force at least one profiles to be active (e.g. your ubuntu layout).

What do you think?

[Alan Pope 🍺🐧🐱 🦄 (popey)]

I prefer 2).

If someone doesn't want to 'waste' the screen real-estate used by the layout, so switches them all off, they'll be disappointed that they don't gain space IMO.

If we force a profile to be active, we're forcing that 'waste' of space for users who don't need it.

I would default to having the layouts enabled by default, but if the user actively has chosen to disable them _all_ then they should expect the consequence that they're gone from the main UI. They've already discovered how to disable them, re-enabling them shouldn't be a stretch for them.

What do you think?

[Filippo Scognamiglio (flscogna)]

We already have a setting to completely disable the keyboard bar (in the main page).
The state which might be confusing here is: "Show Keyboard Bar" is turned on, but all profiles are disabled.

I'd personally not mix profiles selection with bar visibility. I'm thinking some day we'll have a keyboard shortcut to show/hide the bar, and we need to preserve the state (read the profiles enabled).

I'm inclined to think the best solution is to always show the additional bar (provided "Show Keyboard Bar" is enabled), but grey out the button when no profile is selected.
If the users wants to recover the screen real-estate (temporarily or permanently) it is just a tick away, without the need to change anything about its favourites profiles.

I perfectly agree with the default choices.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Ok, you make a good argument. Let's go with your plan.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Are you planning to add the grey icon in this merge? If so, when can we expect that?

[Filippo Scognamiglio (flscogna)]

Sorry, I completely forgot about this merge proposal. I'll work on it in
the next two days.

2015-05-19 11:22 GMT+02:00 Alan Pope  <email address hidden>:

> Are you planning to add the grey icon in this merge? If so, when can we
> expect that?
> --
>
> https://code.launchpad.net/~flscogna/ubuntu-terminal-app/profile-selection/+merge/255077
> You are the owner of lp:~flscogna/ubuntu-terminal-app/profile-selection.
>

[lp:~flscogna/ubuntu-terminal-app/profile-selection]

74. By Filippo Scognamiglio on 2015-05-21

Set the button colour to grey when no profiles are selected.

75. By Filippo Scognamiglio on 2015-05-21

Merge the latest changes from trunk.

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

PASSED: Continuous integration, rev:75
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/146/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2797
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2797/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/67
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-vivid-amd64-ci/30

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

review: Approve (continuous-integration)

[Filippo Scognamiglio (flscogna)]

Alan, when you have some time give this a go. The colour might be tweaked a bit, but I think the result is decent.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

There seems to be a breakage in some use cases.

Add a few layouts
Go back to the main terminal screen
Select one as the current one
Go back to layout settings, de-select the one set as current

Expected behaviour:- Switch to another layout (next in list for example), or un-set a layout

Actual behaviour can sometimes be:-

* No layout set, choosing a layout has no effect:-
http://people.canonical.com/~alan/screenshots/device-2015-05-27-155914.png
http://people.canonical.com/~alan/screenshots/device-2015-05-27-155920.png

review: Needs Fixing

[lp:~flscogna/ubuntu-terminal-app/profile-selection]

76. By Filippo Scognamiglio on 2015-06-02

Fix unexpected behaviour when unselecting the last profile in the list.

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

FAILED: Continuous integration, rev:76
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/148/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2870/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/69/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-terminal-app-vivid-amd64-ci/32/console

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

review: Needs Fixing (continuous-integration)

[Filippo Scognamiglio (flscogna)]

Ok, there was an issue when the last profile was active and unselected from the settings. This should work fine now.

[lp:~flscogna/ubuntu-terminal-app/profile-selection]

77. By Filippo Scognamiglio on 2015-06-02

Import the latest changes from trunk.

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

PASSED: Continuous integration, rev:77
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/149/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2871
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2871/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/70
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-vivid-amd64-ci/33

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

That fixed it!

review: Approve

=== modified file 'po/com.ubuntu.terminal.pot'
--- po/com.ubuntu.terminal.pot	2015-03-23 11:12:46 +0000
+++ po/com.ubuntu.terminal.pot	2015-06-02 19:52:04 +0000
@@ -8,7 +8,8 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-21 13:11+0100\n"
+
+"POT-Creation-Date: 2015-04-02 14:49+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -53,23 +54,27 @@
 msgid "Authentication failed"
 msgstr ""
 
-#: ../src/app/qml/KeyboardBar.qml:157
+#: ../src/app/qml/KeyboardBar.qml:163
 msgid "Change Keyboard"
 msgstr ""
 
+#: ../src/app/qml/LayoutsPage.qml:27 ../src/app/qml/SettingsPage.qml:36
+msgid "Layouts"
+msgstr ""
+
 #: ../src/app/qml/SettingsPage.qml:27
 msgid "Settings"
 msgstr ""
 
-#: ../src/app/qml/SettingsPage.qml:36
+#: ../src/app/qml/SettingsPage.qml:42
+msgid "Show Keyboard Bar"
+msgstr ""
+
+#: ../src/app/qml/SettingsPage.qml:52
 msgid "Font Size:"
 msgstr ""
 
-#: ../src/app/qml/SettingsPage.qml:59
-msgid "Show Keyboard Bar"
-msgstr ""
-
-#: ../src/app/qml/SettingsPage.qml:73
+#: ../src/app/qml/SettingsPage.qml:78
 msgid "Color Scheme"
 msgstr ""
 
 
=== modified file 'src/app/fileio.cpp'
--- src/app/fileio.cpp	2015-02-03 21:43:38 +0000
+++ src/app/fileio.cpp	2015-06-02 19:52:04 +0000
@@ -8,8 +8,7 @@
     if (sourceUrl.isEmpty())
         return false;
 
-    QUrl url(sourceUrl);
-    QFile file(url.toLocalFile());
+    QFile file(sourceUrl);
     if (!file.open(QFile::WriteOnly | QFile::Truncate))
         return false;
 
@@ -23,8 +22,7 @@
     if (sourceUrl.isEmpty())
         return "";
 
-    QUrl url(sourceUrl);
-    QFile file(url.toLocalFile());
+    QFile file(sourceUrl);
     if (!file.open(QFile::ReadOnly))
         return "";
 
 
=== modified file 'src/app/qml/KeyboardBar.qml'
--- src/app/qml/KeyboardBar.qml	2015-02-14 10:33:32 +0000
+++ src/app/qml/KeyboardBar.qml	2015-06-02 19:52:04 +0000
@@ -40,13 +40,16 @@
         }
     }
 
-    function createLayoutObject(profileUrl) {
+    function createLayoutObject(profileObject) {
         var object = layoutComponent.createObject(keyboardContainer);
-        object.loadProfile(fileIO.read(profileUrl));
+        object.loadProfile(profileObject);
         return object;
     }
 
     function disableLayout(index) {
+        if (!isIndexLayoutValid(index))
+            return;
+
         var layoutObject = layoutsList.get(index).layout;
         layoutObject.visible = false;
         layoutObject.enabled = false;
@@ -56,6 +59,9 @@
     }
 
     function enableLayout(index) {
+        if (!isIndexLayoutValid(index))
+            return;
+
         var layoutObject = layoutsList.get(index).layout;
         layoutObject.visible = true;
         layoutObject.enabled = true;
@@ -64,10 +70,13 @@
         layoutObject.simulateCommand.connect(simulateCommand);
     }
 
+    function isIndexLayoutValid(index) {
+        return (index >= 0 && index < layoutsList.count);
+    }
+
     function selectLayout(index) {
-        if (index < 0 || index >= layoutsList.count)
+        if (!isIndexLayoutValid(index))
             return;
-
         disableLayout(selectedLayoutIndex);
         enableLayout(index);
         selectedLayoutIndex = index;
@@ -97,13 +106,19 @@
     }
 
     function loadProfiles() {
-        for (var i = 0; i < keyboardLayouts.length; i++) {
+        dropProfiles();
+
+        for (var i = 0; i < settings.profilesList.count; i++) {
+            var profile = settings.profilesList.get(i);
+            if (!profile.profileVisible)
+                continue;
+
             try {
-                console.log("Loading Layout:", Qt.resolvedUrl(keyboardLayouts[i]));
-                var layoutObject = createLayoutObject(Qt.resolvedUrl(keyboardLayouts[i]));
+                console.log("Loading Layout:", Qt.resolvedUrl(profile.file));
+                var layoutObject = createLayoutObject(profile.object);
                 layoutsList.append({layout: layoutObject});
             } catch (e) {
-                console.error("Error in profile " + keyboardLayouts[i]);
+                console.error("Error in profile " + profile.file);
                 console.error(e);
             }
         }
@@ -129,9 +144,11 @@
             }
         }
 
+        enabled: layoutsList.count != 0
+
         Rectangle {
             anchors.fill: parent
-            color: UbuntuColors.orange
+            color: parent.enabled ? UbuntuColors.orange : UbuntuColors.warmGrey
 
             Icon {
                 scale: 0.5
@@ -187,6 +204,11 @@
         }
     }
 
+    Connections {
+        target: settings
+        onProfilesChanged: rootItem.loadProfiles();
+    }
+
     Component.onDestruction: dropProfiles();
     Component.onCompleted: loadProfiles();
 }
 
=== modified file 'src/app/qml/KeyboardRows/KeyboardLayout.qml'
--- src/app/qml/KeyboardRows/KeyboardLayout.qml	2015-02-14 10:56:28 +0000
+++ src/app/qml/KeyboardRows/KeyboardLayout.qml	2015-06-02 19:52:04 +0000
@@ -68,13 +68,13 @@
         return objectString;
     }
 
-    function loadProfile(profileString) {
+    function loadProfile(profileObject) {
         dropProfile();
 
         var maxWidth = 0;
 
         // This function might raise exceptions which are handled in KeyboardBar.qml
-        var profile = profile = Parser.parseJson(profileString);
+        var profile = profileObject;
 
         name = profile.name;
         short_name = profile.short_name;
 
=== added file 'src/app/qml/LayoutsPage.qml'
--- src/app/qml/LayoutsPage.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/LayoutsPage.qml	2015-06-02 19:52:04 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2013, 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Filippo Scognamiglio <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
+
+Page {
+    id: rootItem
+    objectName: "layoutsPage"
+
+    title: i18n.tr("Layouts")
+
+    onVisibleChanged: {
+        if (visible === false)
+            settings.profilesChanged();
+    }
+
+    ListView {
+        anchors.fill: parent
+        model: settings.profilesList
+        delegate: ListItem.Standard {
+            control: Switch {
+                checked: profileVisible
+                onCheckedChanged: {
+                    settings.profilesList.setProperty(index, "profileVisible", checked);
+                }
+            }
+            text: name
+        }
+    }
+}
 
=== modified file 'src/app/qml/SettingsPage.qml'
--- src/app/qml/SettingsPage.qml	2015-01-17 02:02:04 +0000
+++ src/app/qml/SettingsPage.qml	2015-06-02 19:52:04 +0000
@@ -30,50 +30,57 @@
         id: mainColumn
 
         spacing: units.gu(1)
-        anchors { margins: units.gu(2); fill: parent }
-
-        Label {
-            text: i18n.tr("Font Size:")
-        }
-
-        Slider {
-            id: slFont
-            objectName: "slFont"
-            anchors { left: parent.left; right: parent.right }
-            minimumValue: 8;
-            maximumValue: 32;
-            onValueChanged: {
-                settings.fontSize = value;
-            }
-            Component.onCompleted: {
-                value = settings.fontSize;
-            }
-        }
-
-        ListItem.ThinDivider { }
+        anchors.fill: parent
+
+        ListItem.Standard {
+            text: i18n.tr("Layouts")
+            progression: true
+            onClicked: pageStack.push(layoutsPage);
+        }
+
+        ListItem.Standard {
+            text: i18n.tr("Show Keyboard Bar")
+            control: Switch {
+                onCheckedChanged: settings.showKeyboardBar = checked;
+                Component.onCompleted: checked = settings.showKeyboardBar;
+            }
+        }
 
         ListItem.Empty {
-            showDivider: false
+            height: units.gu(10)
             Label {
-                anchors { left: parent.left; verticalCenter: parent.verticalCenter }
-                text: i18n.tr("Show Keyboard Bar")
+                text: i18n.tr("Font Size:")
+                x: units.gu(2)
             }
-            Switch {
-                anchors { right: parent.right; verticalCenter: parent.verticalCenter }
-                onCheckedChanged: settings.showKeyboardBar = checked;
-                Component.onCompleted: checked = settings.showKeyboardBar;
+            Slider {
+                id: slFont
+                objectName: "slFont"
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    bottom: parent.bottom
+                    margins: units.gu(2)
+                }
+                minimumValue: 8;
+                maximumValue: 32;
+                onValueChanged: {
+                    settings.fontSize = value;
+                }
+                Component.onCompleted: {
+                    value = settings.fontSize;
+                }
             }
         }
 
-        ListItem.ThinDivider { }
-
         OptionSelector {
             id: colorsSchemeSelector
             objectName: "colorsSchemeSelector"
             text: i18n.tr("Color Scheme")
+            width: parent.width - units.gu(4)
+            x: units.gu(2)
 
             // TODO Hackish, but works quite well.
-            containerHeight: parent.height - y - units.gu(4)
+            containerHeight: parent.height - y - units.gu(6)
 
             // TODO This is a workaround at the moment.
             // The application should get them from the c++.
 
=== modified file 'src/app/qml/TerminalSettings.qml'
--- src/app/qml/TerminalSettings.qml	2015-01-17 02:02:04 +0000
+++ src/app/qml/TerminalSettings.qml	2015-06-02 19:52:04 +0000
@@ -1,9 +1,73 @@
 import QtQuick 2.0
 import Qt.labs.settings 1.0
 
-Settings {
-    property int fontSize: 14
-    property string fontStyle: "Ubuntu Mono"
-    property string colorScheme: "Ubuntu"
-    property bool showKeyboardBar: true
+import "KeyboardRows/jsonParser.js" as Parser
+
+Item {
+    id: rootItem
+    property alias fontSize: innerSettings.fontSize
+    property alias fontStyle: innerSettings.fontStyle
+    property alias colorScheme: innerSettings.colorScheme
+    property alias showKeyboardBar: innerSettings.showKeyboardBar
+
+    property alias jsonVisibleProfiles: innerSettings.jsonVisibleProfiles
+
+    property ListModel profilesList: ListModel {}
+
+    signal profilesChanged();
+
+    onProfilesChanged: saveProfileVisibleStrings();
+
+    function saveProfileVisibleStrings() {
+        var result = {};
+
+        for (var i = 0; i < profilesList.count; i++) {
+            var profileObject = profilesList.get(i);
+            result[profileObject.file] = profileObject.profileVisible;
+        }
+
+        jsonVisibleProfiles = JSON.stringify(result);
+    }
+
+    Settings {
+        id: innerSettings
+        property int fontSize: 14
+        property string fontStyle: "Ubuntu Mono"
+        property string colorScheme: "Ubuntu"
+        property bool showKeyboardBar: true
+        property string jsonVisibleProfiles: "[]"
+    }
+
+    // Load the keyboard profiles.
+    Component.onCompleted: {
+        var visibleProfiles = undefined;
+        try {
+            visibleProfiles = JSON.parse(innerSettings.jsonVisibleProfiles);
+        } catch (e) {}
+
+        function isProfileVisible(profilePath) {
+            return !(visibleProfiles[profilePath] == false);
+        }
+
+        for (var i = 0; i < keyboardLayouts.length; i++) {
+            var filePath = keyboardLayouts[i];
+            var isVisible = isProfileVisible(filePath);
+
+            try {
+                var profileObject = Parser.parseJson(fileIO.read(filePath));
+
+                profilesList.append(
+                        {
+                            file: filePath,
+                            profileVisible: isVisible,
+                            object: profileObject,
+                            name: profileObject.name
+                        });
+            } catch (e) {
+                console.error("Error in profile", filePath);
+                console.error(e);
+            }
+        }
+        profilesChanged();
+    }
 }
 
=== modified file 'src/app/qml/ubuntu-terminal-app.qml'
--- src/app/qml/ubuntu-terminal-app.qml	2014-12-05 22:52:26 +0000
+++ src/app/qml/ubuntu-terminal-app.qml	2015-06-02 19:52:04 +0000
@@ -106,6 +106,11 @@
             id: settingsPage
             visible: false
         }
+
+        LayoutsPage {
+            id: layoutsPage
+            visible: false
+        }
     }
 
     Component.onCompleted: {