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
=== added file 'Ambiance/gtk-2.0/apps/img/mode-center-normal.png'
0Binary 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 differ0Binary 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
=== added file 'Ambiance/gtk-2.0/apps/img/mode-center-prelight.png'
1Binary 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 differ1Binary 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
=== added file 'Ambiance/gtk-2.0/apps/img/mode-center-pressed.png'
2Binary 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 differ2Binary 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
=== added file 'Ambiance/gtk-2.0/apps/img/mode-left-normal.png'
3Binary 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 differ3Binary 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
=== added file 'Ambiance/gtk-2.0/apps/img/mode-left-prelight.png'
4Binary 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 differ4Binary 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
=== added file 'Ambiance/gtk-2.0/apps/img/mode-left-pressed.png'
5Binary 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 differ5Binary 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
=== added file 'Ambiance/gtk-2.0/apps/img/mode-right-normal.png'
6Binary 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 differ6Binary 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
=== added file 'Ambiance/gtk-2.0/apps/img/mode-right-prelight.png'
7Binary 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 differ7Binary 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
=== added file 'Ambiance/gtk-2.0/apps/img/mode-right-pressed.png'
8Binary 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 differ8Binary 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
=== added file 'Ambiance/gtk-2.0/apps/ubuntuone.rc'
--- Ambiance/gtk-2.0/apps/ubuntuone.rc 1970-01-01 00:00:00 +0000
+++ Ambiance/gtk-2.0/apps/ubuntuone.rc 2011-02-18 11:11:10 +0000
@@ -0,0 +1,47 @@
1# ==============================================================================
2# UBUNTU ONE SPECIFIC SETTINGS
3# ==============================================================================
4
5style "ubuntuone-button" = "button" { engine "murrine" { border_shades = {0.3, 0.2} shadow_shades = {0.9,3.0} } }
6style "ubuntuone-sep" = "dark" { engine "murrine" { contrast = 1.4 } }
7style "ubuntuone-buttonfix" = "default" { GtkWidget ::focus-line-width = 0 fg[ACTIVE] = "#fff" }
8
9style "mode-button" {
10 engine "pixmap" {
11 image { function = BOX state = PRELIGHT file = "img/mode-center-prelight.png" border = { 3, 13, 3, 3 } stretch = TRUE }
12 image { function = BOX state = NORMAL file = "img/mode-center-normal.png" border = { 3, 13, 3, 3 } stretch = TRUE }
13 image { function = BOX state = ACTIVE file = "img/mode-center-pressed.png" border = { 3, 13, 3, 3 } stretch = TRUE }
14 image { function = BOX state = INSENSITIVE file = "img/mode-center-pressed.png" border = { 3, 13, 3, 3 } stretch = TRUE }
15 image { function = BOX state = SELECTED file = "img/mode-center-pressed.png" border = { 3, 13, 3, 3 } stretch = TRUE }
16 }
17}
18
19style "mode-left" {
20 engine "pixmap" {
21 image { function = BOX state = PRELIGHT file = "img/mode-left-prelight.png" border = { 3, 13, 3, 3 } stretch = TRUE }
22 image { function = BOX state = NORMAL file = "img/mode-left-normal.png" border = { 3, 13, 3, 3 } stretch = TRUE }
23 image { function = BOX state = ACTIVE file = "img/mode-left-pressed.png" border = { 3, 13, 3, 3 } stretch = TRUE }
24 image { function = BOX state = INSENSITIVE file = "img/mode-left-pressed.png" border = { 3, 13, 3, 3 } stretch = TRUE }
25 image { function = BOX state = SELECTED file = "img/mode-left-pressed.png" border = { 3, 13, 3, 3 } stretch = TRUE }
26 }
27}
28
29style "mode-right" {
30 engine "pixmap" {
31 image { function = BOX state = PRELIGHT file = "img/mode-right-prelight.png" border = { 3, 13, 3, 3 } stretch = TRUE }
32 image { function = BOX state = NORMAL file = "img/mode-right-normal.png" border = { 3, 13, 3, 3 } stretch = TRUE }
33 image { function = BOX state = ACTIVE file = "img/mode-right-pressed.png" border = { 3, 13, 3, 3 } stretch = TRUE }
34 image { function = BOX state = INSENSITIVE file = "img/mode-right-pressed.png" border = { 3, 13, 3, 3 } stretch = TRUE }
35 image { function = BOX state = SELECTED file = "img/mode-right-pressed.png" border = { 3, 13, 3, 3 } stretch = TRUE }
36 }
37}
38
39widget "*ManagementPanel.GtkVBox.GtkEventBox*" style "dark"
40widget "*ManagementPanel.GtkVBox.GtkEventBox.GtkVBox.GtkHBox.GtkHBox*Button" style "ubuntuone-button"
41widget "*ManagementPanel.GtkVBox.GtkEventBox.GtkVBox.GtkVBox.GtkHBox*" style "ubuntuone-buttonfix"
42widget "*ManagementPanel.GtkVBox.GtkEventBox.GtkVBox.GtkVBox.GtkHBox*GtkHButtonBox*Button" style "mode-button"
43widget "*ManagementPanel.GtkVBox.GtkEventBox.GtkVBox.GtkVBox.GtkHBox*GtkHButtonBox*Account*" style "mode-left"
44widget "*ubuntuone*ManagementPanel.GtkVBox.GtkEventBox.GtkVBox.GtkVBox.GtkHBox*GtkHButtonBox*Devices*" style "mode-right"
45widget "*ubuntuone*ManagementPanel.GtkVBox.GtkEventBox.GtkVBox.GtkVBox.GtkHBox.GtkHSeparator" style "ubuntuone-sep"
46widget "*ubuntuone*ManagementPanel.GtkVBox.GtkNotebook.GtkVBox.GtkEventBox*" style "dark"
47
048
=== modified file 'Ambiance/gtk-2.0/gtkrc'
--- Ambiance/gtk-2.0/gtkrc 2011-01-29 04:10:35 +0000
+++ Ambiance/gtk-2.0/gtkrc 2011-02-18 11:11:10 +0000
@@ -708,3 +708,4 @@
708include "apps/gnome-panel.rc"708include "apps/gnome-panel.rc"
709include "apps/gnome-terminal.rc"709include "apps/gnome-terminal.rc"
710include "apps/nautilus.rc"710include "apps/nautilus.rc"
711include "apps/ubuntuone.rc"