Merge lp:~nikwen/ubuntu-terminal-app/fix-default-color-scheme into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

Proposed by Niklas Wenzel
Status: Merged
Approved by: Niklas Wenzel
Approved revision: 163
Merged at revision: 164
Proposed branch: lp:~nikwen/ubuntu-terminal-app/fix-default-color-scheme
Merge into: lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
Diff against target: 110 lines (+16/-19)
2 files modified
po/com.ubuntu.terminal.pot (+14/-14)
src/app/qml/ColorSchemePage.qml (+2/-5)
To merge this branch: bzr merge lp:~nikwen/ubuntu-terminal-app/fix-default-color-scheme
Reviewer Review Type Date Requested Status
Stefano Verzegnassi Approve
Jenkins Bot continuous-integration Approve
Ubuntu Terminal Developers Pending
Review via email: mp+285273@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Stefano Verzegnassi (verzegnassi-stefano) wrote :

LGTM, the default color scheme is properly set.

review: Approve
Revision history for this message
Niklas Wenzel (nikwen) wrote :

So I'll also top-level approve this one. :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/com.ubuntu.terminal.pot'
2--- po/com.ubuntu.terminal.pot 2016-01-20 01:24:35 +0000
3+++ po/com.ubuntu.terminal.pot 2016-02-06 16:47:46 +0000
4@@ -1,6 +1,6 @@
5 # SOME DESCRIPTIVE TITLE.
6 # Copyright (C) YEAR Canonical Ltd.
7-# This file is distributed under the same license as the package.
8+# This file is distributed under the same license as the PACKAGE package.
9 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
10 #
11 #, fuzzy
12@@ -8,7 +8,7 @@
13 msgstr ""
14 "Project-Id-Version: \n"
15 "Report-Msgid-Bugs-To: \n"
16-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
17+"POT-Creation-Date: 2016-02-06 17:44+0100\n"
18 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
19 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
20 "Language-Team: LANGUAGE <LL@li.org>\n"
21@@ -53,6 +53,10 @@
22 msgid "Authentication failed"
23 msgstr ""
24
25+#: ../src/app/qml/ColorSchemePage.qml:26 ../src/app/qml/SettingsPage.qml:124
26+msgid "Color Scheme"
27+msgstr ""
28+
29 #: ../src/app/qml/KeyboardBar.qml:174
30 msgid "Change Keyboard"
31 msgstr ""
32@@ -149,39 +153,35 @@
33 msgid "ENTER"
34 msgstr ""
35
36-#: ../src/app/qml/LayoutsPage.qml:27 ../src/app/qml/SettingsPage.qml:36
37+#: ../src/app/qml/LayoutsPage.qml:26 ../src/app/qml/SettingsPage.qml:42
38 msgid "Layouts"
39 msgstr ""
40
41-#: ../src/app/qml/SettingsPage.qml:27
42+#: ../src/app/qml/SettingsPage.qml:26
43 msgid "Settings"
44 msgstr ""
45
46-#: ../src/app/qml/SettingsPage.qml:42
47+#: ../src/app/qml/SettingsPage.qml:57
48 msgid "Show Keyboard Bar"
49 msgstr ""
50
51-#: ../src/app/qml/SettingsPage.qml:50
52+#: ../src/app/qml/SettingsPage.qml:73
53 msgid "Show Keyboard Button"
54 msgstr ""
55
56-#: ../src/app/qml/SettingsPage.qml:60
57+#: ../src/app/qml/SettingsPage.qml:91
58 msgid "Font Size:"
59 msgstr ""
60
61-#: ../src/app/qml/SettingsPage.qml:93
62-msgid "Color Scheme"
63-msgstr ""
64-
65-#: ../src/app/qml/TabsPage.qml:8
66+#: ../src/app/qml/TabsPage.qml:7
67 msgid "Tabs"
68 msgstr ""
69
70-#: ../src/app/qml/TabsPage.qml:14
71+#: ../src/app/qml/TabsPage.qml:13
72 msgid "New tab"
73 msgstr ""
74
75-#: ../src/app/qml/TerminalPage.qml:164
76+#: ../src/app/qml/TerminalPage.qml:170
77 msgid "Selection Mode"
78 msgstr ""
79
80
81=== modified file 'src/app/qml/ColorSchemePage.qml'
82--- src/app/qml/ColorSchemePage.qml 2016-01-22 18:29:56 +0000
83+++ src/app/qml/ColorSchemePage.qml 2016-02-06 16:47:46 +0000
84@@ -30,6 +30,7 @@
85 id: listView
86 anchors.fill: parent
87 model: settings.profilesList
88+ currentIndex: model.indexOf(settings.colorScheme)
89 delegate: ListItem {
90 ListItemLayout {
91 anchors.fill: parent
92@@ -41,7 +42,7 @@
93 color: UbuntuColors.green
94 name: "tick"
95
96- visible: model.index == listView.currentIndex
97+ visible: model.index === listView.currentIndex
98 }
99 }
100
101@@ -51,9 +52,5 @@
102 onCurrentIndexChanged: {
103 settings.colorScheme = model[currentIndex];
104 }
105-
106- Component.onCompleted: {
107- currentIndex = model.indexOf(settings.colorScheme);
108- }
109 }
110 }

Subscribers

People subscribed via source and target branches