Ubuntu Terminal App

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

  1. fix-default-color-scheme
  2. Merge into 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 :

PASSED: Continuous integration, rev:163
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1005/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/555/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1005/rebuild

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
=== 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 @@
1# SOME DESCRIPTIVE TITLE.1# SOME DESCRIPTIVE TITLE.
2# Copyright (C) YEAR Canonical Ltd.2# Copyright (C) YEAR Canonical Ltd.
3# This file is distributed under the same license as the package.3# This file is distributed under the same license as the PACKAGE package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5#5#
6#, fuzzy6#, fuzzy
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: \n"9"Project-Id-Version: \n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2016-01-19 20:23-0500\n"11"POT-Creation-Date: 2016-02-06 17:44+0100\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,6 +53,10 @@
53msgid "Authentication failed"53msgid "Authentication failed"
54msgstr ""54msgstr ""
5555
56#: ../src/app/qml/ColorSchemePage.qml:26 ../src/app/qml/SettingsPage.qml:124
57msgid "Color Scheme"
58msgstr ""
59
56#: ../src/app/qml/KeyboardBar.qml:17460#: ../src/app/qml/KeyboardBar.qml:174
57msgid "Change Keyboard"61msgid "Change Keyboard"
58msgstr ""62msgstr ""
@@ -149,39 +153,35 @@
149msgid "ENTER"153msgid "ENTER"
150msgstr ""154msgstr ""
151155
152#: ../src/app/qml/LayoutsPage.qml:27 ../src/app/qml/SettingsPage.qml:36156#: ../src/app/qml/LayoutsPage.qml:26 ../src/app/qml/SettingsPage.qml:42
153msgid "Layouts"157msgid "Layouts"
154msgstr ""158msgstr ""
155159
156#: ../src/app/qml/SettingsPage.qml:27160#: ../src/app/qml/SettingsPage.qml:26
157msgid "Settings"161msgid "Settings"
158msgstr ""162msgstr ""
159163
160#: ../src/app/qml/SettingsPage.qml:42164#: ../src/app/qml/SettingsPage.qml:57
161msgid "Show Keyboard Bar"165msgid "Show Keyboard Bar"
162msgstr ""166msgstr ""
163167
164#: ../src/app/qml/SettingsPage.qml:50168#: ../src/app/qml/SettingsPage.qml:73
165msgid "Show Keyboard Button"169msgid "Show Keyboard Button"
166msgstr ""170msgstr ""
167171
168#: ../src/app/qml/SettingsPage.qml:60172#: ../src/app/qml/SettingsPage.qml:91
169msgid "Font Size:"173msgid "Font Size:"
170msgstr ""174msgstr ""
171175
172#: ../src/app/qml/SettingsPage.qml:93176#: ../src/app/qml/TabsPage.qml:7
173msgid "Color Scheme"
174msgstr ""
175
176#: ../src/app/qml/TabsPage.qml:8
177msgid "Tabs"177msgid "Tabs"
178msgstr ""178msgstr ""
179179
180#: ../src/app/qml/TabsPage.qml:14180#: ../src/app/qml/TabsPage.qml:13
181msgid "New tab"181msgid "New tab"
182msgstr ""182msgstr ""
183183
184#: ../src/app/qml/TerminalPage.qml:164184#: ../src/app/qml/TerminalPage.qml:170
185msgid "Selection Mode"185msgid "Selection Mode"
186msgstr ""186msgstr ""
187187
188188
=== 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 @@
30 id: listView30 id: listView
31 anchors.fill: parent31 anchors.fill: parent
32 model: settings.profilesList32 model: settings.profilesList
33 currentIndex: model.indexOf(settings.colorScheme)
33 delegate: ListItem {34 delegate: ListItem {
34 ListItemLayout {35 ListItemLayout {
35 anchors.fill: parent36 anchors.fill: parent
@@ -41,7 +42,7 @@
41 color: UbuntuColors.green42 color: UbuntuColors.green
42 name: "tick"43 name: "tick"
4344
44 visible: model.index == listView.currentIndex45 visible: model.index === listView.currentIndex
45 }46 }
46 }47 }
4748
@@ -51,9 +52,5 @@
51 onCurrentIndexChanged: {52 onCurrentIndexChanged: {
52 settings.colorScheme = model[currentIndex];53 settings.colorScheme = model[currentIndex];
53 }54 }
54
55 Component.onCompleted: {
56 currentIndex = model.indexOf(settings.colorScheme);
57 }
58 }55 }
59}56}

Subscribers

People subscribed via source and target branches