ubuntu-touch-coreapps-reviewers team mailing list archive

[Niklas Wenzel <nikwen.developer@xxxxxxxxx>]

Niklas Wenzel has proposed merging lp:~nikwen/ubuntu-terminal-app/fix-default-color-scheme into lp:ubuntu-terminal-app.

Commit message:
Fix the color scheme to be set to "Ubuntu" again by default

Requested reviews:
  Stefano Verzegnassi (verzegnassi-stefano)
  Jenkins Bot (ubuntu-core-apps-jenkins-bot): continuous-integration
  Ubuntu Terminal Developers (ubuntu-terminal-dev)
Related bugs:
  Bug #1542668 in Ubuntu Terminal App: "Default color scheme isn't applied"
  https://bugs.launchpad.net/ubuntu-terminal-app/+bug/1542668

For more details, see:
https://code.launchpad.net/~nikwen/ubuntu-terminal-app/fix-default-color-scheme/+merge/285273

Fix the color scheme to be set to "Ubuntu" again by default
-- 
Your team Ubuntu Terminal Developers is requested to review the proposed merge of lp:~nikwen/ubuntu-terminal-app/fix-default-color-scheme into lp:ubuntu-terminal-app.

=== modified file 'po/com.ubuntu.terminal.pot'
--- po/com.ubuntu.terminal.pot	2016-01-20 01:24:35 +0000
+++ po/com.ubuntu.terminal.pot	2016-02-06 16:47:46 +0000
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Canonical Ltd.
-# This file is distributed under the same license as the  package.
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2016-02-06 17:44+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -53,6 +53,10 @@
 msgid "Authentication failed"
 msgstr ""
 
+#: ../src/app/qml/ColorSchemePage.qml:26 ../src/app/qml/SettingsPage.qml:124
+msgid "Color Scheme"
+msgstr ""
+
 #: ../src/app/qml/KeyboardBar.qml:174
 msgid "Change Keyboard"
 msgstr ""
@@ -149,39 +153,35 @@
 msgid "ENTER"
 msgstr ""
 
-#: ../src/app/qml/LayoutsPage.qml:27 ../src/app/qml/SettingsPage.qml:36
+#: ../src/app/qml/LayoutsPage.qml:26 ../src/app/qml/SettingsPage.qml:42
 msgid "Layouts"
 msgstr ""
 
-#: ../src/app/qml/SettingsPage.qml:27
+#: ../src/app/qml/SettingsPage.qml:26
 msgid "Settings"
 msgstr ""
 
-#: ../src/app/qml/SettingsPage.qml:42
+#: ../src/app/qml/SettingsPage.qml:57
 msgid "Show Keyboard Bar"
 msgstr ""
 
-#: ../src/app/qml/SettingsPage.qml:50
+#: ../src/app/qml/SettingsPage.qml:73
 msgid "Show Keyboard Button"
 msgstr ""
 
-#: ../src/app/qml/SettingsPage.qml:60
+#: ../src/app/qml/SettingsPage.qml:91
 msgid "Font Size:"
 msgstr ""
 
-#: ../src/app/qml/SettingsPage.qml:93
-msgid "Color Scheme"
-msgstr ""
-
-#: ../src/app/qml/TabsPage.qml:8
+#: ../src/app/qml/TabsPage.qml:7
 msgid "Tabs"
 msgstr ""
 
-#: ../src/app/qml/TabsPage.qml:14
+#: ../src/app/qml/TabsPage.qml:13
 msgid "New tab"
 msgstr ""
 
-#: ../src/app/qml/TerminalPage.qml:164
+#: ../src/app/qml/TerminalPage.qml:170
 msgid "Selection Mode"
 msgstr ""
 

=== modified file 'src/app/qml/ColorSchemePage.qml'
--- src/app/qml/ColorSchemePage.qml	2016-01-22 18:29:56 +0000
+++ src/app/qml/ColorSchemePage.qml	2016-02-06 16:47:46 +0000
@@ -30,6 +30,7 @@
         id: listView
         anchors.fill: parent
         model: settings.profilesList
+        currentIndex: model.indexOf(settings.colorScheme)
         delegate: ListItem {
             ListItemLayout {
                 anchors.fill: parent
@@ -41,7 +42,7 @@
                     color: UbuntuColors.green
                     name: "tick"
 
-                    visible: model.index == listView.currentIndex
+                    visible: model.index === listView.currentIndex
                 }
             }
 
@@ -51,9 +52,5 @@
         onCurrentIndexChanged: {
             settings.colorScheme = model[currentIndex];
         }
-
-        Component.onCompleted: {
-            currentIndex = model.indexOf(settings.colorScheme);
-        }
     }
 }