Fix bug 471378 - Create gnome theme (gnomestripe). r=philipp
authorRichard Marti <richard.marti@gmail.com>
Wed, 17 Aug 2011 21:49:45 +0200
changeset 8789 a709a5fdca1c6cfa9bd0ca8a1ae8ad5f6d449960
parent 8788 8e731eb1d074f231517f8367aff423d08ed6b2d3
child 8790 81675a52450aa334addd373a5c9b0417db26cdde
push id158
push userbugzilla@standard8.plus.com
push dateTue, 27 Sep 2011 19:18:14 +0000
treeherdercomm-beta@e47b99c61e4d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphilipp
bugs471378
Fix bug 471378 - Create gnome theme (gnomestripe). r=philipp
calendar/base/Makefile.in
calendar/base/jar.mn
calendar/base/themes/gnomestripe/calendar-daypicker.css
calendar/base/themes/gnomestripe/calendar-management.css
calendar/base/themes/gnomestripe/calendar-task-tree.css
calendar/base/themes/gnomestripe/calendar-task-view.css
calendar/base/themes/gnomestripe/calendar-unifinder.css
calendar/base/themes/gnomestripe/calendar-views.css
calendar/base/themes/gnomestripe/dialogs/calendar-alarm-dialog.css
calendar/base/themes/gnomestripe/dialogs/calendar-event-dialog.css
calendar/base/themes/gnomestripe/dialogs/images/calendar-event-dialog-attendees.png
calendar/base/themes/gnomestripe/dialogs/images/calendar-event-dialog-toolbar-small.png
calendar/base/themes/gnomestripe/dialogs/images/calendar-event-dialog-toolbar.png
calendar/base/themes/gnomestripe/dialogs/images/calendar-event-dialog.png
calendar/base/themes/gnomestripe/dialogs/images/calendar-invitations-dialog-button-images.png
calendar/base/themes/gnomestripe/dialogs/images/calendar-invitations-dialog-list-images.png
calendar/base/themes/gnomestripe/icons/calendar-alarm-dialog.png
calendar/base/themes/gnomestripe/icons/calendar-event-dialog.png
calendar/base/themes/gnomestripe/icons/calendar-event-summary-dialog.png
calendar/base/themes/gnomestripe/icons/calendar-task-dialog.png
calendar/base/themes/gnomestripe/icons/calendar-task-summary-dialog.png
calendar/base/themes/gnomestripe/images/cal-icon32.png
calendar/base/themes/gnomestripe/images/calendar-occurrence-prompt.png
calendar/base/themes/gnomestripe/images/checkbox-images.png
calendar/base/themes/gnomestripe/images/ok-cancel.png
calendar/base/themes/gnomestripe/images/tasks-actions.png
calendar/base/themes/gnomestripe/images/toolbar-large.png
calendar/base/themes/gnomestripe/images/toolbar-small.png
calendar/base/themes/gnomestripe/preferences/Options.png
calendar/base/themes/gnomestripe/preferences/preferences.css
calendar/base/themes/gnomestripe/today-pane.css
calendar/base/themes/gnomestripe/widgets/calendar-widgets.css
calendar/base/themes/winstripe/dialogs/images/calendar-event-dialog-toolbar-linux.png
calendar/base/themes/winstripe/dialogs/images/calendar-event-dialog-toolbar-small-linux.png
calendar/base/themes/winstripe/images/tasks-actions-linux.png
calendar/base/themes/winstripe/images/toolbar-large-linux.png
calendar/base/themes/winstripe/images/toolbar-small-linux.png
calendar/lightning/Makefile.in
calendar/lightning/themes/gnomestripe/accountCentral.css
calendar/lightning/themes/gnomestripe/imip.css
calendar/lightning/themes/gnomestripe/lightning-widgets.css
calendar/lightning/themes/gnomestripe/lightning.css
--- a/calendar/base/Makefile.in
+++ b/calendar/base/Makefile.in
@@ -45,24 +45,29 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = calbase
 MODULE_NAME = calBaseModule
 
 DIRS = public src modules build
 
 # Select a theme from which to pull our skin goodness
+# Linux: gnomesripe
 # OS X: pinstripe
-# Others: winstripe
+# Windows: winstripe
 
+ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT)))
+THEME = gnomestripe
+else
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 THEME = pinstripe
 else
 THEME = winstripe
 endif
+endif
 
 
 WINDOW_ICONS = calendar-alarm-dialog \
                calendar-event-dialog \
                calendar-event-summary-dialog \
                calendar-task-dialog \
                calendar-task-summary-dialog \
                $(NULL)
--- a/calendar/base/jar.mn
+++ b/calendar/base/jar.mn
@@ -145,49 +145,30 @@ calendar.jar:
     skin/calendar/calendar-task-tree.css                   (themes/@THEME@/calendar-task-tree.css)
     skin/calendar/calendar-task-view.css                   (themes/@THEME@/calendar-task-view.css)
     skin/calendar/calendar-unifinder.css                   (themes/@THEME@/calendar-unifinder.css)
     skin/calendar/calendar-views.css                       (themes/@THEME@/calendar-views.css)
     skin/calendar/checkbox-images.png                      (themes/@THEME@/images/checkbox-images.png)
     skin/calendar/ok-cancel.png                            (themes/@THEME@/images/ok-cancel.png)
     skin/calendar/today-pane.css                           (themes/@THEME@/today-pane.css)
     skin/calendar/widgets/calendar-widgets.css             (themes/@THEME@/widgets/calendar-widgets.css)
-
-# Following files only add for OSX.
-#ifdef XP_MACOSX
     skin/calendar/calendar-event-dialog-toolbar.png        (themes/@THEME@/dialogs/images/calendar-event-dialog-toolbar.png)
     skin/calendar/calendar-event-dialog-toolbar-small.png  (themes/@THEME@/dialogs/images/calendar-event-dialog-toolbar-small.png)
     skin/calendar/calendar-occurrence-prompt.png           (themes/@THEME@/images/calendar-occurrence-prompt.png)
     skin/calendar/tasks-actions.png                        (themes/@THEME@/images/tasks-actions.png)
     skin/calendar/toolbar-large.png                        (themes/@THEME@/images/toolbar-large.png)
     skin/calendar/toolbar-small.png                        (themes/@THEME@/images/toolbar-small.png)
+
+# Following files only add for OSX.
+#ifdef XP_MACOSX
     skin/calendar/sidebar-item.png                         (themes/@THEME@/images/sidebar-item.png)
 #endif
 
-# Following files only add for Linux.
-#ifdef XP_UNIX
-#ifndef XP_MACOSX
-    skin/calendar/calendar-event-dialog-toolbar.png        (themes/@THEME@/dialogs/images/calendar-event-dialog-toolbar-linux.png)
-    skin/calendar/calendar-event-dialog-toolbar-small.png  (themes/@THEME@/dialogs/images/calendar-event-dialog-toolbar-small-linux.png)
-    skin/calendar/calendar-occurrence-prompt.png           (themes/@THEME@/images/calendar-occurrence-prompt.png)
-    skin/calendar/tasks-actions.png                        (themes/@THEME@/images/tasks-actions-linux.png)
-    skin/calendar/toolbar-large.png                        (themes/@THEME@/images/toolbar-large-linux.png)
-    skin/calendar/toolbar-small.png                        (themes/@THEME@/images/toolbar-small-linux.png)
-#endif
-#endif
-
-# The following files only add for Windows.
+# The following files are added for aero support on windows.
 #ifdef XP_WIN
-    skin/calendar/calendar-event-dialog-toolbar.png        (themes/@THEME@/dialogs/images/calendar-event-dialog-toolbar.png)
-    skin/calendar/calendar-event-dialog-toolbar-small.png  (themes/@THEME@/dialogs/images/calendar-event-dialog-toolbar-small.png)
-    skin/calendar/calendar-occurrence-prompt.png           (themes/@THEME@/images/calendar-occurrence-prompt.png)
-    skin/calendar/tasks-actions.png                        (themes/@THEME@/images/tasks-actions.png)
-    skin/calendar/toolbar-large.png                        (themes/@THEME@/images/toolbar-large.png)
-    skin/calendar/toolbar-small.png                        (themes/@THEME@/images/toolbar-small.png)
-# The following files are added for aero support on windows.
 % style chrome://calendar/content/calendar-common-sets.xul chrome://calendar/skin/calendar-aero.css os=WINNT osversion>=6
 % style chrome://calendar/content/calendar-event-dialog.xul chrome://calendar/skin/calendar-aero.css os=WINNT osversion>=6
 % style chrome://calendar/content/calendar-occurrence-prompt.xul chrome://calendar/skin/calendar-aero.css os=WINNT osversion>=6
     skin/calendar/calendar-aero.css                        (themes/@THEME@/calendar-aero.css)
     skin/calendar/calendar-event-dialog-toolbar-aero.png   (themes/@THEME@/dialogs/images/calendar-event-dialog-toolbar-aero.png)
     skin/calendar/calendar-event-dialog-toolbar-small-aero.png   (themes/@THEME@/dialogs/images/calendar-event-dialog-toolbar-small-aero.png)
     skin/calendar/calendar-occurrence-prompt-aero.png      (themes/@THEME@/images/calendar-occurrence-prompt-aero.png)
     skin/calendar/tasks-actions-aero.png                   (themes/@THEME@/images/tasks-actions-aero.png)
copy from calendar/base/themes/winstripe/calendar-daypicker.css
copy to calendar/base/themes/gnomestripe/calendar-daypicker.css
copy from calendar/base/themes/winstripe/calendar-management.css
copy to calendar/base/themes/gnomestripe/calendar-management.css
copy from calendar/base/themes/winstripe/calendar-task-tree.css
copy to calendar/base/themes/gnomestripe/calendar-task-tree.css
copy from calendar/base/themes/winstripe/calendar-task-view.css
copy to calendar/base/themes/gnomestripe/calendar-task-view.css
copy from calendar/base/themes/winstripe/calendar-unifinder.css
copy to calendar/base/themes/gnomestripe/calendar-unifinder.css
copy from calendar/base/themes/winstripe/calendar-views.css
copy to calendar/base/themes/gnomestripe/calendar-views.css
copy from calendar/base/themes/winstripe/dialogs/calendar-alarm-dialog.css
copy to calendar/base/themes/gnomestripe/dialogs/calendar-alarm-dialog.css
copy from calendar/base/themes/winstripe/dialogs/calendar-event-dialog.css
copy to calendar/base/themes/gnomestripe/dialogs/calendar-event-dialog.css
copy from calendar/base/themes/winstripe/dialogs/images/calendar-event-dialog-attendees.png
copy to calendar/base/themes/gnomestripe/dialogs/images/calendar-event-dialog-attendees.png
rename from calendar/base/themes/winstripe/dialogs/images/calendar-event-dialog-toolbar-small-linux.png
rename to calendar/base/themes/gnomestripe/dialogs/images/calendar-event-dialog-toolbar-small.png
rename from calendar/base/themes/winstripe/dialogs/images/calendar-event-dialog-toolbar-linux.png
rename to calendar/base/themes/gnomestripe/dialogs/images/calendar-event-dialog-toolbar.png
copy from calendar/base/themes/winstripe/dialogs/images/calendar-event-dialog.png
copy to calendar/base/themes/gnomestripe/dialogs/images/calendar-event-dialog.png
copy from calendar/base/themes/winstripe/dialogs/images/calendar-invitations-dialog-button-images.png
copy to calendar/base/themes/gnomestripe/dialogs/images/calendar-invitations-dialog-button-images.png
copy from calendar/base/themes/winstripe/dialogs/images/calendar-invitations-dialog-list-images.png
copy to calendar/base/themes/gnomestripe/dialogs/images/calendar-invitations-dialog-list-images.png
copy from calendar/base/themes/winstripe/icons/calendar-alarm-dialog.png
copy to calendar/base/themes/gnomestripe/icons/calendar-alarm-dialog.png
copy from calendar/base/themes/winstripe/icons/calendar-event-dialog.png
copy to calendar/base/themes/gnomestripe/icons/calendar-event-dialog.png
copy from calendar/base/themes/winstripe/icons/calendar-event-summary-dialog.png
copy to calendar/base/themes/gnomestripe/icons/calendar-event-summary-dialog.png
copy from calendar/base/themes/winstripe/icons/calendar-task-dialog.png
copy to calendar/base/themes/gnomestripe/icons/calendar-task-dialog.png
copy from calendar/base/themes/winstripe/icons/calendar-task-summary-dialog.png
copy to calendar/base/themes/gnomestripe/icons/calendar-task-summary-dialog.png
copy from calendar/base/themes/winstripe/images/cal-icon32.png
copy to calendar/base/themes/gnomestripe/images/cal-icon32.png
copy from calendar/base/themes/winstripe/images/calendar-occurrence-prompt.png
copy to calendar/base/themes/gnomestripe/images/calendar-occurrence-prompt.png
copy from calendar/base/themes/winstripe/images/checkbox-images.png
copy to calendar/base/themes/gnomestripe/images/checkbox-images.png
copy from calendar/base/themes/winstripe/images/ok-cancel.png
copy to calendar/base/themes/gnomestripe/images/ok-cancel.png
rename from calendar/base/themes/winstripe/images/tasks-actions-linux.png
rename to calendar/base/themes/gnomestripe/images/tasks-actions.png
rename from calendar/base/themes/winstripe/images/toolbar-large-linux.png
rename to calendar/base/themes/gnomestripe/images/toolbar-large.png
rename from calendar/base/themes/winstripe/images/toolbar-small-linux.png
rename to calendar/base/themes/gnomestripe/images/toolbar-small.png
copy from calendar/base/themes/winstripe/preferences/Options.png
copy to calendar/base/themes/gnomestripe/preferences/Options.png
copy from calendar/base/themes/winstripe/preferences/preferences.css
copy to calendar/base/themes/gnomestripe/preferences/preferences.css
copy from calendar/base/themes/winstripe/today-pane.css
copy to calendar/base/themes/gnomestripe/today-pane.css
copy from calendar/base/themes/winstripe/widgets/calendar-widgets.css
copy to calendar/base/themes/gnomestripe/widgets/calendar-widgets.css
--- a/calendar/lightning/Makefile.in
+++ b/calendar/lightning/Makefile.in
@@ -112,23 +112,29 @@ DIRS = ../libical \
        ../providers \
        ../import-export \
        ../itip \
        components \
        locales \
        $(NULL)
 
 # Select a theme from which to pull our skin goodness
+# Linux: gnomesripe
 # OS X: pinstripe
-# Others: winstripe
+# Windows: winstripe
+
+ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT)))
+THEME=gnomestripe
+else
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 THEME=pinstripe
 else
 THEME=winstripe
 endif
+endif
 
 DEFINES += -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
            -DAB_CD=$(AB_CD) \
            -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
            -DLIGHTNING_VERSION=$(LIGHTNING_VERSION) \
            -DTARGET_PLATFORM=$(OS_TARGET)_$(TARGET_XPCOM_ABI) \
            -DXPI_EM_ID=$(XPI_EM_ID) \
            -DTHEME=$(THEME) \
copy from calendar/lightning/themes/winstripe/accountCentral.css
copy to calendar/lightning/themes/gnomestripe/accountCentral.css
copy from calendar/lightning/themes/winstripe/imip.css
copy to calendar/lightning/themes/gnomestripe/imip.css
copy from calendar/lightning/themes/winstripe/lightning-widgets.css
copy to calendar/lightning/themes/gnomestripe/lightning-widgets.css
copy from calendar/lightning/themes/winstripe/lightning.css
copy to calendar/lightning/themes/gnomestripe/lightning.css