Merge lp:~verzegnassi-stefano/ubuntu-terminal-app/ubuntu-color-scheme into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

[Stefano Verzegnassi]

* Fixed standard ANSI blue color in the Ubuntu color scheme (previously it was red)
* Use the official Ubuntu palette (based on the UbuntuColors singleton of UITK)

* Fixed standard ANSI blue color in the Ubuntu color scheme (previously it was red)
* Use the official Ubuntu palette (based on the UbuntuColors singleton of UITK)

Comparison: (left: new color scheme - right: old color scheme)
https://imgur.com/FqnT8GG

QUESTIONS:
* The background is much darker now. That's the background color used in SuruDark (UbuntuColors.jet).
  Let me know if we want to use a lighter color (e.g. the UbuntuColors.inkstone - currently used as Color0Intense)

* Should intense color be a bit lighter too?

Alternatively, I can use the color of the new app-icon as background - RGB(65, 65, 65).
Visually, it's more consistent with the current palette we're going to replace.

Alt. BG proposal - screenshot: https://imgur.com/Q0fGgY6

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Tested on device and it looks great exactly as it is

http://people.canonical.com/~alan/screenshots/device-2016-02-05-135844.png

I think the background in https://imgur.com/Q0fGgY6 looks too washed-out personally.

Thanks for fixing this!

review: Approve

[Evan McIntire (mcintire-evan)]

Awesome change, looks great to me! Loving those comments that say where everything is from

review: Approve

[Niklas Wenzel (nikwen)]

The new color scheme is great! Very good job, Stefano!

I was about to merge this, but given that this isn't a minor color change, I'd love to see the old scheme still being an option to choose in the settings. We have quite a lot of themes anyway and the old one is probably better than a lot of them, at least in my opinion.

So what do you think about readding it with another name?

review: Needs Information

[Stefano Verzegnassi (verzegnassi-stefano)]

@Niklas: the current "Ubuntu" theme uses exactly the same palette of "DarkPastels".
The only differences are the background color[1] and the blue color (which in the Ubuntu theme is shown as red).

We could rename "Dark Pastels" as "Dark Pastels / Ubuntu (old)" (or something similar), but I don't think users will complain that the "old" Ubuntu theme does not exist anymore.

[1] Ubuntu theme: RGB(51,51,51)
    Dark Pastels theme: RGB(44,44,44)
    Visually the two colors are the same.

[Niklas Wenzel (nikwen)]

@Stefano: I compared them earlier today due to line 161 of the diff and it looks like those two colors confused me. However, you're right about the background color and the red/blue thing also isn't that much of an issue.

Hence, I support renaming the Dark Pastels scheme to the name you suggested.

Would you mind making this small change? We can happily merge the MP afterwards. :)

[Stefano Verzegnassi (verzegnassi-stefano)]

Ack... Now I realised that the name of color schemes is hard-coded. :(

We'd have to rename the color scheme file and accordingly change the schemes model in "ubuntu-terminal-app.qml". However it'd break the setting to the ones who are using the "DarkPastels" theme, since the old "DarkPastel.schema" file would not exist anymore, and the app would then revert to the default theme (not Ubuntu, but the IBM-like theme built inside the terminal plugin itself).

Adding an entry to the changelog we'll publish on the store would be much easier, I guess...

[Niklas Wenzel (nikwen)]

That's ugly...

Ok, so let's merge this now and I'll prepare a "proper" fix for the name.

I guess we can do it much easier by having some sort of mapping which only changes the displayed name in ColorSchemePage.qml, but doesn't change the file names. That way we can also make the scheme names translatable. :)

review: Approve

[Niklas Wenzel (nikwen)]

Here we go: https://code.launchpad.net/~nikwen/ubuntu-terminal-app/color-scheme-name-mapping/+merge/285297 :)

=== modified file 'src/plugin/qmltermwidget/lib/color-schemes/Ubuntu.colorscheme'
--- src/plugin/qmltermwidget/lib/color-schemes/Ubuntu.colorscheme	2014-11-16 22:38:02 +0000
+++ src/plugin/qmltermwidget/lib/color-schemes/Ubuntu.colorscheme	2016-02-05 10:33:19 +0000
@@ -1,103 +1,138 @@
+# UbuntuColors are taken from:
+# http://bazaar.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/staging/view/head:/src/Ubuntu/Components/1.3/UbuntuColors.qml
+
+# Colors that are not included in the official palette have been generated with:
+# http://www.color-hex.com/
+
+# Same as Color0 (Black)
 [Background]
 Bold=false
-Color=51,51,51
+Color=17,17,17
 Transparency=false
 
+# Same as Color0Intense (Black)
 [BackgroundIntense]
 Bold=true
-Color=51,51,51
+Color=59,59,59
 Transparency=false
 
+# Black: UbuntuColors.jet
 [Color0]
 Bold=false
-Color=63,63,63
+Color=17,17,17
 Transparency=false
 
+# BlackIntense: UbuntuColors.inkstone
 [Color0Intense]
 Bold=true
-Color=112,144,128
+Color=59,59,59
 Transparency=false
 
+# Red: UbuntuColors.red
 [Color1]
 Bold=false
-Color=112,80,80
+Color=237,49,70
 Transparency=false
 
+# RedIntense: a tint of UbuntuColors.red (#f05a6a)
+# http://www.color-hex.com/color/ed3146
 [Color1Intense]
 Bold=true
-Color=220,163,163
+Color=240,90,106
 Transparency=false
 
+#`Green: UbuntuColors.green
 [Color2]
 Bold=false
-Color=96,180,138
+Color=62,179,79
 Transparency=false
 
+#`GreenIntense: a tint of UbuntuColors.green (#64c272)
+# http://www.color-hex.com/color/3eb34f
 [Color2Intense]
 Bold=true
-Color=114,213,163
+Color=100,194,114
 Transparency=false
 
+# Yellow: analogous of UbuntuColors.orange (#e9b920)
+# http://www.color-hex.com/color/e95420
 [Color3]
 Bold=false
-Color=223,175,143
+Color=223,185,32
 Transparency=false
 
+# YellowIntense: a tint of the yellow above (#edc74c)
+# http://www.color-hex.com/color/e9b920
 [Color3Intense]
 Bold=true
-Color=240,223,175
+Color=237,199,76
 Transparency=false
 
+# Blue: UbuntuColors.blue
 [Color4]
 Bold=false
-Color=220,62,16
+Color=25,182,238
 Transparency=false
 
+# BlueIntense: a tint of UbuntuColors.blue (#46c4f1)
+# http://www.color-hex.com/color/19b6ee
 [Color4Intense]
 Bold=true
-Color=221,72,20
+Color=70,196,241
 Transparency=false
 
+# Magenta: complementary of UbuntuColors.green (#b33ea2)
+# http://www.color-hex.com/color/3eb34f
 [Color5]
 Bold=false
-Color=220,140,195
+Color=179,62,162
 Transparency=false
 
+# MagentaIntense: a tint of the magenta above (#c264b4)
+# http://www.color-hex.com/color/b33ea2
 [Color5Intense]
 Bold=true
-Color=236,147,211
+Color=194,100,180
 Transparency=false
 
+# Cyan: complementary of UbuntuColors.red (#31edd8)
+# http://www.color-hex.com/color/ed3146
 [Color6]
 Bold=false
-Color=140,208,211
+Color=49,237,216
 Transparency=false
 
+# CyanIntense: a tint of the cyan above (#5af0df)
+# http://www.color-hex.com/color/31edd8
 [Color6Intense]
 Bold=true
-Color=147,224,227
+Color=90,240,223
 Transparency=false
 
+# White: UbuntuColors.silk
 [Color7]
 Bold=false
-Color=220,220,204
+Color=193,193,193
 Transparency=false
 
+# WhiteIntense: 255 - UbuntuColors.jet
 [Color7Intense]
 Bold=true
-Color=255,255,255
+Color=236,236,236
 Transparency=false
 
+# Same as Color7 (White)
 [Foreground]
 Bold=false
-Color=220,220,204
+Color=193,193,193
 Transparency=false
 
+# Same as Color7Intense (White)
 [ForegroundIntense]
 Bold=true
-Color=220,220,204
+Color=236,236,236
 Transparency=false
 
 [General]
-Description=Dark Pastels
+Description=Ubuntu
 Opacity=1