light-themes

Merge lp:~danrabbit/light-themes/ubuntuonetheming into lp:~ubuntu-art-pkg/light-themes/trunk

  1. ubuntuonetheming
  2. Merge into trunk
Proposed by Danielle Foré
Status: Merged
Merged at revision: 60
Proposed branch: lp:~danrabbit/light-themes/ubuntuonetheming
Merge into: lp:~ubuntu-art-pkg/light-themes/trunk
Diff against target: 78 lines (+48/-0)
2 files modified
Ambiance/gtk-2.0/apps/ubuntuone.rc (+47/-0)
Ambiance/gtk-2.0/gtkrc (+1/-0)
To merge this branch: bzr merge lp:~danrabbit/light-themes/ubuntuonetheming
Reviewer Review Type Date Requested Status
Ubuntu Artwork Packagers Pending
Review via email: mp+50306@code.launchpad.net

Description of the change

Adding special theming for the Ubuntu One control panel.

To post a comment you must log in.
Revision history for this message
Andrea Cimitan (cimi) wrote :

Coding-wise is done correctly, I couldn't have done better.
Just ask the visual designer for an opinion on the mode-normal/prelight buttons

Revision history for this message
Paul Sladen (sladen) wrote :

Had a quick chat with kenvandine about this; not sure if it's the the right place (what will the U1 client look like when light-themes are not in use?) but otherwise happy to merge it.

Revision history for this message
Danielle Foré (danrabbit) wrote :

Hey Paul,

One of the reasons for moving the theming into Ambiance and not leaving it in-app was so that the control panel would look better in other themes :) In it's current/previous incarnation, it breaks other themes really badly.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'Ambiance/gtk-2.0/apps/img/mode-center-normal.png'
2Binary files Ambiance/gtk-2.0/apps/img/mode-center-normal.png 1970-01-01 00:00:00 +0000 and Ambiance/gtk-2.0/apps/img/mode-center-normal.png 2011-02-18 11:11:10 +0000 differ
3=== added file 'Ambiance/gtk-2.0/apps/img/mode-center-prelight.png'
4Binary files Ambiance/gtk-2.0/apps/img/mode-center-prelight.png 1970-01-01 00:00:00 +0000 and Ambiance/gtk-2.0/apps/img/mode-center-prelight.png 2011-02-18 11:11:10 +0000 differ
5=== added file 'Ambiance/gtk-2.0/apps/img/mode-center-pressed.png'
6Binary files Ambiance/gtk-2.0/apps/img/mode-center-pressed.png 1970-01-01 00:00:00 +0000 and Ambiance/gtk-2.0/apps/img/mode-center-pressed.png 2011-02-18 11:11:10 +0000 differ
7=== added file 'Ambiance/gtk-2.0/apps/img/mode-left-normal.png'
8Binary files Ambiance/gtk-2.0/apps/img/mode-left-normal.png 1970-01-01 00:00:00 +0000 and Ambiance/gtk-2.0/apps/img/mode-left-normal.png 2011-02-18 11:11:10 +0000 differ
9=== added file 'Ambiance/gtk-2.0/apps/img/mode-left-prelight.png'
10Binary files Ambiance/gtk-2.0/apps/img/mode-left-prelight.png 1970-01-01 00:00:00 +0000 and Ambiance/gtk-2.0/apps/img/mode-left-prelight.png 2011-02-18 11:11:10 +0000 differ
11=== added file 'Ambiance/gtk-2.0/apps/img/mode-left-pressed.png'
12Binary files Ambiance/gtk-2.0/apps/img/mode-left-pressed.png 1970-01-01 00:00:00 +0000 and Ambiance/gtk-2.0/apps/img/mode-left-pressed.png 2011-02-18 11:11:10 +0000 differ
13=== added file 'Ambiance/gtk-2.0/apps/img/mode-right-normal.png'
14Binary files Ambiance/gtk-2.0/apps/img/mode-right-normal.png 1970-01-01 00:00:00 +0000 and Ambiance/gtk-2.0/apps/img/mode-right-normal.png 2011-02-18 11:11:10 +0000 differ
15=== added file 'Ambiance/gtk-2.0/apps/img/mode-right-prelight.png'
16Binary files Ambiance/gtk-2.0/apps/img/mode-right-prelight.png 1970-01-01 00:00:00 +0000 and Ambiance/gtk-2.0/apps/img/mode-right-prelight.png 2011-02-18 11:11:10 +0000 differ
17=== added file 'Ambiance/gtk-2.0/apps/img/mode-right-pressed.png'
18Binary files Ambiance/gtk-2.0/apps/img/mode-right-pressed.png 1970-01-01 00:00:00 +0000 and Ambiance/gtk-2.0/apps/img/mode-right-pressed.png 2011-02-18 11:11:10 +0000 differ
19=== added file 'Ambiance/gtk-2.0/apps/ubuntuone.rc'
20--- Ambiance/gtk-2.0/apps/ubuntuone.rc 1970-01-01 00:00:00 +0000
21+++ Ambiance/gtk-2.0/apps/ubuntuone.rc 2011-02-18 11:11:10 +0000
22@@ -0,0 +1,47 @@
23+# ==============================================================================
24+# UBUNTU ONE SPECIFIC SETTINGS
25+# ==============================================================================
26+
27+style "ubuntuone-button" = "button" { engine "murrine" { border_shades = {0.3, 0.2} shadow_shades = {0.9,3.0} } }
28+style "ubuntuone-sep" = "dark" { engine "murrine" { contrast = 1.4 } }
29+style "ubuntuone-buttonfix" = "default" { GtkWidget ::focus-line-width = 0 fg[ACTIVE] = "#fff" }
30+
31+style "mode-button" {
32+ engine "pixmap" {
33+ image { function = BOX state = PRELIGHT file = "img/mode-center-prelight.png" border = { 3, 13, 3, 3 } stretch = TRUE }
34+ image { function = BOX state = NORMAL file = "img/mode-center-normal.png" border = { 3, 13, 3, 3 } stretch = TRUE }
35+ image { function = BOX state = ACTIVE file = "img/mode-center-pressed.png" border = { 3, 13, 3, 3 } stretch = TRUE }
36+ image { function = BOX state = INSENSITIVE file = "img/mode-center-pressed.png" border = { 3, 13, 3, 3 } stretch = TRUE }
37+ image { function = BOX state = SELECTED file = "img/mode-center-pressed.png" border = { 3, 13, 3, 3 } stretch = TRUE }
38+ }
39+}
40+
41+style "mode-left" {
42+ engine "pixmap" {
43+ image { function = BOX state = PRELIGHT file = "img/mode-left-prelight.png" border = { 3, 13, 3, 3 } stretch = TRUE }
44+ image { function = BOX state = NORMAL file = "img/mode-left-normal.png" border = { 3, 13, 3, 3 } stretch = TRUE }
45+ image { function = BOX state = ACTIVE file = "img/mode-left-pressed.png" border = { 3, 13, 3, 3 } stretch = TRUE }
46+ image { function = BOX state = INSENSITIVE file = "img/mode-left-pressed.png" border = { 3, 13, 3, 3 } stretch = TRUE }
47+ image { function = BOX state = SELECTED file = "img/mode-left-pressed.png" border = { 3, 13, 3, 3 } stretch = TRUE }
48+ }
49+}
50+
51+style "mode-right" {
52+ engine "pixmap" {
53+ image { function = BOX state = PRELIGHT file = "img/mode-right-prelight.png" border = { 3, 13, 3, 3 } stretch = TRUE }
54+ image { function = BOX state = NORMAL file = "img/mode-right-normal.png" border = { 3, 13, 3, 3 } stretch = TRUE }
55+ image { function = BOX state = ACTIVE file = "img/mode-right-pressed.png" border = { 3, 13, 3, 3 } stretch = TRUE }
56+ image { function = BOX state = INSENSITIVE file = "img/mode-right-pressed.png" border = { 3, 13, 3, 3 } stretch = TRUE }
57+ image { function = BOX state = SELECTED file = "img/mode-right-pressed.png" border = { 3, 13, 3, 3 } stretch = TRUE }
58+ }
59+}
60+
61+widget "*ManagementPanel.GtkVBox.GtkEventBox*" style "dark"
62+widget "*ManagementPanel.GtkVBox.GtkEventBox.GtkVBox.GtkHBox.GtkHBox*Button" style "ubuntuone-button"
63+widget "*ManagementPanel.GtkVBox.GtkEventBox.GtkVBox.GtkVBox.GtkHBox*" style "ubuntuone-buttonfix"
64+widget "*ManagementPanel.GtkVBox.GtkEventBox.GtkVBox.GtkVBox.GtkHBox*GtkHButtonBox*Button" style "mode-button"
65+widget "*ManagementPanel.GtkVBox.GtkEventBox.GtkVBox.GtkVBox.GtkHBox*GtkHButtonBox*Account*" style "mode-left"
66+widget "*ubuntuone*ManagementPanel.GtkVBox.GtkEventBox.GtkVBox.GtkVBox.GtkHBox*GtkHButtonBox*Devices*" style "mode-right"
67+widget "*ubuntuone*ManagementPanel.GtkVBox.GtkEventBox.GtkVBox.GtkVBox.GtkHBox.GtkHSeparator" style "ubuntuone-sep"
68+widget "*ubuntuone*ManagementPanel.GtkVBox.GtkNotebook.GtkVBox.GtkEventBox*" style "dark"
69+
70
71=== modified file 'Ambiance/gtk-2.0/gtkrc'
72--- Ambiance/gtk-2.0/gtkrc 2011-01-29 04:10:35 +0000
73+++ Ambiance/gtk-2.0/gtkrc 2011-02-18 11:11:10 +0000
74@@ -708,3 +708,4 @@
75 include "apps/gnome-panel.rc"
76 include "apps/gnome-terminal.rc"
77 include "apps/nautilus.rc"
78+include "apps/ubuntuone.rc"