ubuntu-touch-coreapps-reviewers team mailing list archive

[Niklas Wenzel <nikwen.developer@xxxxxxxxx>]

Niklas Wenzel has proposed merging lp:~nikwen/ubuntu-terminal-app/uitk-update into lp:ubuntu-terminal-app.

Commit message:
Update to the new UI Toolkit

Requested reviews:
  Ubuntu Terminal Developers (ubuntu-terminal-dev)
Related bugs:
  Bug #1474114 in Ubuntu Terminal App: "Upgrade the Ubuntu Components version"
  https://bugs.launchpad.net/ubuntu-terminal-app/+bug/1474114

For more details, see:
https://code.launchpad.net/~nikwen/ubuntu-terminal-app/uitk-update/+merge/266665

Update to the new UI Toolkit
-- 
Your team Ubuntu Terminal Developers is requested to review the proposed merge of lp:~nikwen/ubuntu-terminal-app/uitk-update into lp:ubuntu-terminal-app.

=== modified file 'manifest.json.in'
--- manifest.json.in	2015-01-17 00:51:51 +0000
+++ manifest.json.in	2015-08-02 12:58:52 +0000
@@ -1,6 +1,6 @@
 {
     "description": "Terminal application",
-    "framework": "ubuntu-sdk-14.10",
+    "framework": "ubuntu-sdk-15.04",
     "architecture": "@CLICK_ARCH@",
     "hooks": {
         "terminal": {

=== modified file 'po/com.ubuntu.terminal.pot'
--- po/com.ubuntu.terminal.pot	2015-06-18 21:10:04 +0000
+++ po/com.ubuntu.terminal.pot	2015-08-02 12:58:52 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-14 17:32+0200\n"
+"POT-Creation-Date: 2015-07-14 18:36+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,15 +17,15 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/app/qml/AlternateActionPopover.qml:19
+#: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
 msgstr ""
 
-#: ../src/app/qml/AlternateActionPopover.qml:26
+#: ../src/app/qml/AlternateActionPopover.qml:17
 msgid "Copy"
 msgstr ""
 
-#: ../src/app/qml/AlternateActionPopover.qml:33
+#: ../src/app/qml/AlternateActionPopover.qml:21
 msgid "Paste"
 msgstr ""
 
@@ -57,7 +57,7 @@
 msgid "Change Keyboard"
 msgstr ""
 
-#: ../src/app/qml/LayoutsPage.qml:27 ../src/app/qml/SettingsPage.qml:36
+#: ../src/app/qml/LayoutsPage.qml:26 ../src/app/qml/SettingsPage.qml:36
 msgid "Layouts"
 msgstr ""
 
@@ -73,7 +73,7 @@
 msgid "Font Size:"
 msgstr ""
 
-#: ../src/app/qml/SettingsPage.qml:78
+#: ../src/app/qml/SettingsPage.qml:85
 msgid "Color Scheme"
 msgstr ""
 
@@ -85,7 +85,7 @@
 msgid "New tab"
 msgstr ""
 
-#: ../src/app/qml/TerminalPage.qml:166
+#: ../src/app/qml/TerminalPage.qml:164
 msgid "Selection Mode"
 msgstr ""
 

=== modified file 'src/app/qml/AlternateActionPopover.qml'
--- src/app/qml/AlternateActionPopover.qml	2015-01-17 00:48:05 +0000
+++ src/app/qml/AlternateActionPopover.qml	2015-08-02 12:58:52 +0000
@@ -1,40 +1,25 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.Popups 1.0
 
 Component {
     id: popoverComponent
-    Popover {
+
+    ActionSelectionPopover {
         id: popover
 
-        Column {
-            id: containerLayout
-            anchors {
-                left: parent.left
-                top: parent.top
-                right: parent.right
-            }
-            ListItem.Standard {
+        actions: ActionList {
+            Action {
                 text: i18n.tr("Select")
-                onClicked: {
-                    terminalPage.state = "SELECTION";
-                    popover.hide();
-                }
+                onTriggered: terminalPage.state = "SELECTION";
             }
-            ListItem.Standard {
+            Action {
                 text: i18n.tr("Copy")
-                onClicked: {
-                    terminal.copyClipboard();
-                    popover.hide();
-                }
+                onTriggered: terminal.copyClipboard();
             }
-            ListItem.Standard {
+            Action {
                 text: i18n.tr("Paste")
-                onClicked: {
-                    terminal.pasteClipboard();
-                    popover.hide();
-                }
+                onTriggered: terminal.pasteClipboard();
             }
         }
     }

=== modified file 'src/app/qml/AuthenticationDialog.qml'
--- src/app/qml/AuthenticationDialog.qml	2015-05-29 21:14:13 +0000
+++ src/app/qml/AuthenticationDialog.qml	2015-08-02 12:58:52 +0000
@@ -15,9 +15,9 @@
  *
  * Authored by: Arto Jalkanen <ajalkane@xxxxxxxxx>
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Popups 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
+import Ubuntu.Components.Popups 1.0
 
 Dialog {
     id: root

=== modified file 'src/app/qml/AuthenticationService.qml'
--- src/app/qml/AuthenticationService.qml	2014-10-25 04:42:31 +0000
+++ src/app/qml/AuthenticationService.qml	2015-08-02 12:58:52 +0000
@@ -13,9 +13,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Popups 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
+import Ubuntu.Components.Popups 1.0
 import com.ubuntu.PamAuthentication 0.1
 
 /**

=== modified file 'src/app/qml/CircularTransparentButton.qml'
--- src/app/qml/CircularTransparentButton.qml	2014-11-22 14:30:52 +0000
+++ src/app/qml/CircularTransparentButton.qml	2015-08-02 12:58:52 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Rectangle {
     property color backgroundColor: "black"

=== modified file 'src/app/qml/ExpandableButton.qml'
--- src/app/qml/ExpandableButton.qml	2015-01-16 23:04:14 +0000
+++ src/app/qml/ExpandableButton.qml	2015-08-02 12:58:52 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: container

=== modified file 'src/app/qml/KeyboardBar.qml'
--- src/app/qml/KeyboardBar.qml	2015-06-02 19:44:37 +0000
+++ src/app/qml/KeyboardBar.qml	2015-08-02 12:58:52 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import "KeyboardRows"
 
 import "KeyboardRows/jsonParser.js" as Parser

=== modified file 'src/app/qml/KeyboardRows/ExpandableKeyboardButton.qml'
--- src/app/qml/KeyboardRows/ExpandableKeyboardButton.qml	2015-01-16 23:04:14 +0000
+++ src/app/qml/KeyboardRows/ExpandableKeyboardButton.qml	2015-08-02 12:58:52 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 import ".."
 

=== modified file 'src/app/qml/KeyboardRows/KeyModel.qml'
--- src/app/qml/KeyboardRows/KeyModel.qml	2014-12-07 16:11:58 +0000
+++ src/app/qml/KeyboardRows/KeyModel.qml	2015-08-02 12:58:52 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 QtObject {
     property string text

=== modified file 'src/app/qml/KeyboardRows/KeyboardButton.qml'
--- src/app/qml/KeyboardRows/KeyboardButton.qml	2014-12-07 16:11:58 +0000
+++ src/app/qml/KeyboardRows/KeyboardButton.qml	2015-08-02 12:58:52 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Rectangle {
     property alias text: mainLabel.text

=== modified file 'src/app/qml/KeyboardRows/KeyboardLayout.qml'
--- src/app/qml/KeyboardRows/KeyboardLayout.qml	2015-04-01 22:01:44 +0000
+++ src/app/qml/KeyboardRows/KeyboardLayout.qml	2015-08-02 12:58:52 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 import "jsonParser.js" as Parser
 
@@ -57,8 +57,8 @@
 
     function createEntryString(text, actionString, otherActionsString) {
         var objectString = "
-            import QtQuick 2.0
-            import Ubuntu.Components 1.1
+            import QtQuick 2.4
+            import Ubuntu.Components 1.2
 
             KeyModel {
                 text: \"" + text + "\"

=== modified file 'src/app/qml/KeyboardRows/KeyboardRow.qml'
--- src/app/qml/KeyboardRows/KeyboardRow.qml	2015-02-03 21:43:38 +0000
+++ src/app/qml/KeyboardRows/KeyboardRow.qml	2015-08-02 12:58:52 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Rectangle {
     id: container

=== modified file 'src/app/qml/LayoutsPage.qml'
--- src/app/qml/LayoutsPage.qml	2015-03-26 22:32:38 +0000
+++ src/app/qml/LayoutsPage.qml	2015-08-02 12:58:52 +0000
@@ -16,8 +16,8 @@
  * Authored by: Filippo Scognamiglio <flscogna@xxxxxxxxx>
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Page {

=== modified file 'src/app/qml/ListItemWithActions.qml'
--- src/app/qml/ListItemWithActions.qml	2014-11-16 20:10:09 +0000
+++ src/app/qml/ListItemWithActions.qml	2015-08-02 12:58:52 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 Item {
     id: root

=== modified file 'src/app/qml/PressFeedback.qml'
--- src/app/qml/PressFeedback.qml	2014-11-22 14:30:52 +0000
+++ src/app/qml/PressFeedback.qml	2015-08-02 12:58:52 +0000
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
 import QtFeedback 5.0
 
 HapticsEffect {

=== modified file 'src/app/qml/SettingsPage.qml'
--- src/app/qml/SettingsPage.qml	2015-06-11 22:10:24 +0000
+++ src/app/qml/SettingsPage.qml	2015-08-02 12:58:52 +0000
@@ -16,8 +16,8 @@
  * Authored by: Filippo Scognamiglio <flscogna@xxxxxxxxx>
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Page {

=== modified file 'src/app/qml/TabsModel.qml'
--- src/app/qml/TabsModel.qml	2015-06-11 21:33:57 +0000
+++ src/app/qml/TabsModel.qml	2015-08-02 12:58:52 +0000
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
 
 ListModel {
     property int selectedIndex: 0

=== modified file 'src/app/qml/TabsPage.qml'
--- src/app/qml/TabsPage.qml	2014-12-07 16:11:58 +0000
+++ src/app/qml/TabsPage.qml	2015-08-02 12:58:52 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Page {

=== modified file 'src/app/qml/TerminalComponent.qml'
--- src/app/qml/TerminalComponent.qml	2015-06-23 17:38:54 +0000
+++ src/app/qml/TerminalComponent.qml	2015-08-02 12:58:52 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
 import QMLTermWidget 1.0
 
 Component {

=== modified file 'src/app/qml/TerminalInputArea.qml'
--- src/app/qml/TerminalInputArea.qml	2015-06-19 20:55:45 +0000
+++ src/app/qml/TerminalInputArea.qml	2015-08-02 12:58:52 +0000
@@ -1,4 +1,4 @@
-import QtQuick 2.3
+import QtQuick 2.4
 
 Item{
     property bool touchAreaPressed: false

=== modified file 'src/app/qml/TerminalKeyboardShortcutHandler.qml'
--- src/app/qml/TerminalKeyboardShortcutHandler.qml	2015-06-23 17:38:54 +0000
+++ src/app/qml/TerminalKeyboardShortcutHandler.qml	2015-08-02 12:58:52 +0000
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
 
 Item {
 

=== modified file 'src/app/qml/TerminalPage.qml'
--- src/app/qml/TerminalPage.qml	2015-06-14 15:42:15 +0000
+++ src/app/qml/TerminalPage.qml	2015-08-02 12:58:52 +0000
@@ -1,6 +1,6 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Popups 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.2
+import Ubuntu.Components.Popups 1.0
 import QMLTermWidget 1.0
 
 Page {

=== modified file 'src/app/qml/TerminalSettings.qml'
--- src/app/qml/TerminalSettings.qml	2015-06-11 22:10:24 +0000
+++ src/app/qml/TerminalSettings.qml	2015-08-02 12:58:52 +0000
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
 import Qt.labs.settings 1.0
 
 import "KeyboardRows/jsonParser.js" as Parser

=== modified file 'src/app/qml/ubuntu-terminal-app.qml'
--- src/app/qml/ubuntu-terminal-app.qml	2015-03-26 22:32:38 +0000
+++ src/app/qml/ubuntu-terminal-app.qml	2015-08-02 12:58:52 +0000
@@ -1,6 +1,6 @@
-import QtQuick 2.3
+import QtQuick 2.4
 import QtGraphicalEffects 1.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 
 import QMLTermWidget 1.0
 
@@ -10,7 +10,6 @@
     objectName: "terminal"
     applicationName: "com.ubuntu.terminal"
     automaticOrientation: true
-    useDeprecatedToolbar: false
 
     width: units.gu(50)
     height: units.gu(75)