From eb0dff70fcffc21fde729cd6a5dd2c7907507592 Mon Sep 17 00:00:00 2001 From: "kairo%kairo.at" Date: Fri, 7 Sep 2007 15:13:45 +0000 Subject: [PATCH] bug 394567 - Move SeaMonkey parts of mozilla/themes to suite/ (build changes to use themes from new location), r+sr=Neil - NPOTFFDB git-svn-id: svn://10.0.0.236/trunk@235366 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/suite/Makefile.in | 1 + mozilla/suite/build.mk | 1 - mozilla/suite/themes/Makefile.in | 45 ++++ mozilla/suite/themes/classic/Makefile.in | 15 +- mozilla/suite/themes/classic/jar.mn | 258 ----------------------- mozilla/suite/themes/modern/Makefile.in | 18 +- mozilla/suite/themes/modern/jar.mn | 9 - 7 files changed, 55 insertions(+), 292 deletions(-) create mode 100644 mozilla/suite/themes/Makefile.in diff --git a/mozilla/suite/Makefile.in b/mozilla/suite/Makefile.in index cf0acb4e6ad..73f0c5ac8c8 100644 --- a/mozilla/suite/Makefile.in +++ b/mozilla/suite/Makefile.in @@ -53,6 +53,7 @@ DIRS += \ browser \ common \ locales \ + themes \ profile \ build \ app \ diff --git a/mozilla/suite/build.mk b/mozilla/suite/build.mk index 21f9eddc635..55171a7881c 100644 --- a/mozilla/suite/build.mk +++ b/mozilla/suite/build.mk @@ -59,7 +59,6 @@ endif tier_app_dirs += \ xpfe/components/bookmarks \ - themes \ suite \ $(NULL) diff --git a/mozilla/suite/themes/Makefile.in b/mozilla/suite/themes/Makefile.in new file mode 100644 index 00000000000..31991cb5d12 --- /dev/null +++ b/mozilla/suite/themes/Makefile.in @@ -0,0 +1,45 @@ +# +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is +# the mozilla.org SeaMonkey project. +# Portions created by the Initial Developer are Copyright (C) 2007 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the terms of +# either of the GNU General Public License Version 2 or later (the "GPL"), +# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +DIRS = classic modern + +include $(topsrcdir)/config/rules.mk diff --git a/mozilla/suite/themes/classic/Makefile.in b/mozilla/suite/themes/classic/Makefile.in index f8301782d5a..aecef70d540 100644 --- a/mozilla/suite/themes/classic/Makefile.in +++ b/mozilla/suite/themes/classic/Makefile.in @@ -35,7 +35,7 @@ # # ***** END LICENSE BLOCK ***** -DEPTH = ../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -44,24 +44,19 @@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk -# XXX Remove this once SeaMonkey becomes a full XUL app. -ifdef MOZ_XUL_APP - CLASSIC_EXTENSION_DIR = {972ce4c6-7e08-4474-a285-3208198ce6fd} DEFINES += -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) FILES = \ - $(topsrcdir)/suite/themes/classic/preview.png \ - $(topsrcdir)/suite/themes/classic/icon.png \ + $(srcdir)/preview.png \ + $(srcdir)/icon.png \ $(NULL) libs:: $(INSTALL) $(FILES) $(DIST)/bin/extensions/$(CLASSIC_EXTENSION_DIR) - $(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(topsrcdir)/suite/themes/classic/install.rdf > $(DIST)/bin/extensions/$(CLASSIC_EXTENSION_DIR)/install.rdf + $(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(srcdir)/install.rdf > $(DIST)/bin/extensions/$(CLASSIC_EXTENSION_DIR)/install.rdf install:: $(SYSINSTALL) $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/extensions/$(CLASSIC_EXTENSION_DIR) - $(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(topsrcdir)/suite/themes/classic/install.rdf > $(DESTDIR)$(mozappdir)/extensions/$(CLASSIC_EXTENSION_DIR)/install.rdf - -endif + $(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(srcdir)/install.rdf > $(DESTDIR)$(mozappdir)/extensions/$(CLASSIC_EXTENSION_DIR)/install.rdf diff --git a/mozilla/suite/themes/classic/jar.mn b/mozilla/suite/themes/classic/jar.mn index 56d9307f81b..f761d2ddfd8 100644 --- a/mozilla/suite/themes/classic/jar.mn +++ b/mozilla/suite/themes/classic/jar.mn @@ -1,23 +1,9 @@ classic.jar: -#ifdef MOZ_XUL_APP % skin communicator classic/1.0 %skin/classic/communicator/ % skin editor classic/1.0 %skin/classic/editor/ % skin global classic/1.0 %skin/classic/global/ % skin messenger classic/1.0 %skin/classic/messenger/ % skin navigator classic/1.0 %skin/classic/navigator/ -#else -* skin/classic/communicator/contents.rdf (communicator/contents.rdf) -* skin/classic/editor/contents.rdf (editor/contents.rdf) -* skin/classic/messenger/contents.rdf (messenger/contents.rdf) -* skin/classic/navigator/contents.rdf (navigator/contents.rdf) -#ifdef XP_MACOSX -* skin/classic/global/contents.rdf (global/mac/contents.rdf) - skin/classic/global/preview.gif (global/mac/preview.gif) -#else -* skin/classic/global/contents.rdf (global/win/contents.rdf) - skin/classic/global/preview.gif (global/win/preview.gif) -#endif -#endif skin/classic/communicator/tasksOverlay.css (communicator/tasksOverlay.css) skin/classic/communicator/button.css (communicator/button.css) skin/classic/communicator/brand.css (communicator/brand.css) @@ -142,250 +128,6 @@ classic.jar: skin/classic/editor/icons/progress-busy.gif (editor/icons/progress-busy.gif) skin/classic/editor/icons/progress-done.gif (editor/icons/progress-done.gif) skin/classic/editor/icons/progress-failed.gif (editor/icons/progress-failed.gif) -#ifndef MOZ_XUL_APP -#ifdef XP_MACOSX - skin/classic/global/button.css (global/mac/button.css) - skin/classic/global/console.css (global/mac/console.css) - skin/classic/global/checkbox.css (global/mac/checkbox.css) - skin/classic/global/colorpicker.css (global/mac/colorpicker.css) - skin/classic/global/autocomplete.css (global/mac/autocomplete.css) - skin/classic/global/datetimepicker.css (global/mac/datetimepicker.css) - skin/classic/global/dialog.css (global/mac/dialog.css) - skin/classic/global/dropmarker.css (global/mac/dropmarker.css) - skin/classic/global/filepicker.css (global/mac/filepicker.css) - skin/classic/global/formatting.css (global/mac/formatting.css) - skin/classic/global/global.css (global/mac/global.css) - skin/classic/global/globalBindings.xml (global/mac/globalBindings.xml) - skin/classic/global/groupbox.css (global/mac/groupbox.css) - skin/classic/global/linkTree.css (global/mac/linkTree.css) - skin/classic/global/listbox.css (global/mac/listbox.css) - skin/classic/global/menu.css (global/mac/menu.css) - skin/classic/global/menulist.css (global/mac/menulist.css) - skin/classic/global/numberbox.css (global/mac/numberbox.css) - skin/classic/global/popup.css (global/mac/popup.css) - skin/classic/global/progressmeter.css (global/mac/progressmeter.css) - skin/classic/global/radio.css (global/mac/radio.css) - skin/classic/global/scrollbox.css (global/mac/scrollbox.css) - skin/classic/global/spinbuttons.css (global/mac/spinbuttons.css) - skin/classic/global/splitter.css (global/mac/splitter.css) - skin/classic/global/tabbox.css (global/mac/tabbox.css) - skin/classic/global/textbox.css (global/mac/textbox.css) - skin/classic/global/toolbar.css (global/mac/toolbar.css) - skin/classic/global/toolbarbutton.css (global/mac/toolbarbutton.css) - skin/classic/global/tree.css (global/mac/tree.css) - skin/classic/global/wizard.css (global/mac/wizard.css) - skin/classic/global/icons/alert-exclam.gif (global/mac/icons/alert-exclam.gif) - skin/classic/global/icons/alert-error.gif (global/mac/icons/alert-error.gif) - skin/classic/global/icons/alert-message.gif (global/mac/icons/alert-message.gif) - skin/classic/global/icons/alert-question.gif (global/mac/icons/alert-question.gif) - skin/classic/global/checkbox/cbox-check-act.gif (global/mac/checkbox/cbox-check-act.gif) - skin/classic/global/checkbox/cbox-check-dis.gif (global/mac/checkbox/cbox-check-dis.gif) - skin/classic/global/checkbox/cbox-check.gif (global/mac/checkbox/cbox-check.gif) - skin/classic/global/checkbox/cbox.gif (global/mac/checkbox/cbox.gif) - skin/classic/global/checkbox/cbox-act.gif (global/mac/checkbox/cbox-act.gif) - skin/classic/global/checkbox/cbox-dis.gif (global/mac/checkbox/cbox-dis.gif) - skin/classic/global/radio/radio-check.gif (global/mac/radio/radio-check.gif) - skin/classic/global/radio/radio-check-act.gif (global/mac/radio/radio-check-act.gif) - skin/classic/global/radio/radio-check-dis.gif (global/mac/radio/radio-check-dis.gif) - skin/classic/global/radio/radio.gif (global/mac/radio/radio.gif) - skin/classic/global/radio/radio-act.gif (global/mac/radio/radio-act.gif) - skin/classic/global/radio/radio-dis.gif (global/mac/radio/radio-dis.gif) - skin/classic/global/menu/menu-arrow-hov.gif (global/mac/menu/menu-arrow-hov.gif) - skin/classic/global/menu/menu-arrow-dis.gif (global/mac/menu/menu-arrow-dis.gif) - skin/classic/global/menu/menu-arrow.gif (global/mac/menu/menu-arrow.gif) - skin/classic/global/menu/menu-check.png (/toolkit/themes/pinstripe/global/menu/menu-check.png) - skin/classic/global/menu/menu-check-dis.png (/toolkit/themes/pinstripe/global/menu/menu-check-dis.png) - skin/classic/global/menu/menu-check-hov.png (/toolkit/themes/pinstripe/global/menu/menu-check-hov.png) - skin/classic/global/menulist/menulist-arrow-act.gif (global/mac/menulist/menulist-arrow-act.gif) - skin/classic/global/menulist/menulist-arrow.gif (global/mac/menulist/menulist-arrow.gif) - skin/classic/global/menulist/menulist-arrow-dis.gif (global/mac/menulist/menulist-arrow-dis.gif) - skin/classic/global/progressmeter/progressmeter-busy.gif (global/mac/progressmeter/progressmeter-busy.gif) - skin/classic/global/progressmeter/progressmeter-bar.gif (global/mac/progressmeter/progressmeter-bar.gif) - skin/classic/global/scrollbar/slider-vrt.gif (global/mac/scrollbar/slider-vrt.gif) - skin/classic/global/scrollbar/slider-hrz.gif (global/mac/scrollbar/slider-hrz.gif) - skin/classic/global/scrollbar/thumb-hrz-act.png (global/mac/scrollbar/thumb-hrz-act.png) - skin/classic/global/scrollbar/thumb-vrt-act.png (global/mac/scrollbar/thumb-vrt-act.png) - skin/classic/global/scrollbar/btn-rit.gif (global/mac/scrollbar/btn-rit.gif) - skin/classic/global/scrollbar/btn-up.gif (global/mac/scrollbar/btn-up.gif) - skin/classic/global/scrollbar/btn-lft.gif (global/mac/scrollbar/btn-lft.gif) - skin/classic/global/scrollbar/thumb-hrz.png (global/mac/scrollbar/thumb-hrz.png) - skin/classic/global/scrollbar/thumb-vrt.png (global/mac/scrollbar/thumb-vrt.png) - skin/classic/global/scrollbar/btn-dn.gif (global/mac/scrollbar/btn-dn.gif) - skin/classic/global/scrollbox/autorepeat-arrow-dn.gif (global/mac/scrollbox/autorepeat-arrow-dn.gif) - skin/classic/global/scrollbox/autorepeat-arrow-up.gif (global/mac/scrollbox/autorepeat-arrow-up.gif) - skin/classic/global/tabbox/tab-unselect-active-left.gif (global/mac/tabbox/tab-unselect-active-left.gif) - skin/classic/global/tabbox/tab-border-bot-left-cap.gif (global/mac/tabbox/tab-border-bot-left-cap.gif) - skin/classic/global/tabbox/tab-border-bot-right-cap.gif (global/mac/tabbox/tab-border-bot-right-cap.gif) - skin/classic/global/tabbox/tab-border-top.gif (global/mac/tabbox/tab-border-top.gif) - skin/classic/global/tabbox/tab-border-top-left-cap.gif (global/mac/tabbox/tab-border-top-left-cap.gif) - skin/classic/global/tabbox/tab-border-top-right-cap.gif (global/mac/tabbox/tab-border-top-right-cap.gif) - skin/classic/global/tabbox/tab-select-left.gif (global/mac/tabbox/tab-select-left.gif) - skin/classic/global/tabbox/tab-select-middle.gif (global/mac/tabbox/tab-select-middle.gif) - skin/classic/global/tabbox/tab-select-right.gif (global/mac/tabbox/tab-select-right.gif) - skin/classic/global/tabbox/tab-sm-bot-sel-left.gif (global/mac/tabbox/tab-sm-bot-sel-left.gif) - skin/classic/global/tabbox/tab-sm-bot-sel-mid.gif (global/mac/tabbox/tab-sm-bot-sel-mid.gif) - skin/classic/global/tabbox/tab-sm-bot-sel-right.gif (global/mac/tabbox/tab-sm-bot-sel-right.gif) - skin/classic/global/tabbox/tab-sm-bot-unsel-acti-left.gif (global/mac/tabbox/tab-sm-bot-unsel-acti-left.gif) - skin/classic/global/tabbox/tab-sm-bot-unsel-acti-mid.gif (global/mac/tabbox/tab-sm-bot-unsel-acti-mid.gif) - skin/classic/global/tabbox/tab-sm-bot-unsel-acti-right.gif (global/mac/tabbox/tab-sm-bot-unsel-acti-right.gif) - skin/classic/global/tabbox/tab-sm-bot-unsel-left.gif (global/mac/tabbox/tab-sm-bot-unsel-left.gif) - skin/classic/global/tabbox/tab-sm-bot-unsel-mid.gif (global/mac/tabbox/tab-sm-bot-unsel-mid.gif) - skin/classic/global/tabbox/tab-sm-bot-unsel-right.gif (global/mac/tabbox/tab-sm-bot-unsel-right.gif) - skin/classic/global/tabbox/tab-border-bot.gif (global/mac/tabbox/tab-border-bot.gif) - skin/classic/global/tabbox/tab-unselect-active-middle.gif (global/mac/tabbox/tab-unselect-active-middle.gif) - skin/classic/global/tabbox/tab-unselect-active-right.gif (global/mac/tabbox/tab-unselect-active-right.gif) - skin/classic/global/tabbox/tab-unselect-left.gif (global/mac/tabbox/tab-unselect-left.gif) - skin/classic/global/tabbox/tab-unselect-middle.gif (global/mac/tabbox/tab-unselect-middle.gif) - skin/classic/global/tabbox/tab-unselect-right.gif (global/mac/tabbox/tab-unselect-right.gif) - skin/classic/global/wizard/wizard-btn-rit-act.gif (global/mac/wizard/wizard-btn-rit-act.gif) - skin/classic/global/wizard/wizard-btn-lft-act.gif (global/mac/wizard/wizard-btn-lft-act.gif) - skin/classic/global/wizard/wizard-btn-lft-dis.gif (global/mac/wizard/wizard-btn-lft-dis.gif) - skin/classic/global/wizard/wizard-btn-rit.gif (global/mac/wizard/wizard-btn-rit.gif) - skin/classic/global/wizard/wizard-btn-lft.gif (global/mac/wizard/wizard-btn-lft.gif) - skin/classic/global/wizard/wizard-btn-rit-dis.gif (global/mac/wizard/wizard-btn-rit-dis.gif) - skin/classic/global/tree/checkbox.gif (global/mac/tree/checkbox.gif) - skin/classic/global/tree/checkbox-checked.gif (global/mac/tree/checkbox-checked.gif) - skin/classic/global/tree/twisty-open.gif (global/mac/tree/twisty-open.gif) - skin/classic/global/tree/twisty-clsd.gif (global/mac/tree/twisty-clsd.gif) -#else -#ifdef XP_UNIX - skin/classic/global/autocomplete.css (global/unix/autocomplete.css) - skin/classic/global/checkbox.css (global/unix/checkbox.css) - skin/classic/global/radio.css (global/unix/radio.css) - skin/classic/global/button.css (global/unix/button.css) - skin/classic/global/toolbarbutton.css (global/unix/toolbarbutton.css) - skin/classic/global/numberbox.css (global/unix/numberbox.css) - skin/classic/global/global.css (global/unix/global.css) -#else - skin/classic/global/autocomplete.css (global/win/autocomplete.css) - skin/classic/global/checkbox.css (global/win/checkbox.css) - skin/classic/global/radio.css (global/win/radio.css) - skin/classic/global/button.css (global/win/button.css) - skin/classic/global/toolbarbutton.css (global/win/toolbarbutton.css) - skin/classic/global/numberbox.css (global/win/numberbox.css) - skin/classic/global/global.css (global/win/global.css) -#endif - skin/classic/global/colorpicker.css (global/win/colorpicker.css) - skin/classic/global/console.css (global/win/console.css) - skin/classic/global/datetimepicker.css (global/win/datetimepicker.css) - skin/classic/global/dialog.css (global/win/dialog.css) - skin/classic/global/dropmarker.css (global/win/dropmarker.css) - skin/classic/global/filepicker.css (global/win/filepicker.css) - skin/classic/global/formatting.css (global/win/formatting.css) - skin/classic/global/groupbox.css (global/win/groupbox.css) - skin/classic/global/linkTree.css (global/win/linkTree.css) - skin/classic/global/listbox.css (global/win/listbox.css) - skin/classic/global/menulist.css (global/win/menulist.css) - skin/classic/global/popup.css (global/win/popup.css) - skin/classic/global/progressmeter.css (global/win/progressmeter.css) - skin/classic/global/scrollbox.css (global/win/scrollbox.css) - skin/classic/global/spinbuttons.css (global/win/spinbuttons.css) - skin/classic/global/splitter.css (global/win/splitter.css) - skin/classic/global/tabbox.css (global/win/tabbox.css) - skin/classic/global/textbox.css (global/win/textbox.css) - skin/classic/global/tree.css (global/win/tree.css) - skin/classic/global/wizard.css (global/win/wizard.css) -#ifdef XP_OS2 - skin/classic/global/menu.css (global/os2/menu.css) - skin/classic/global/menu/menu-check.gif (global/os2/menu/menu-check.gif) - skin/classic/global/menu/menu-arrow.gif (global/os2/menu/menu-arrow.gif) - skin/classic/global/toolbar.css (global/os2/toolbar.css) -#else -* skin/classic/global/menu.css (global/win/menu.css) - skin/classic/global/menu/menu-check-hover.gif (global/win/menu/menu-check-hover.gif) - skin/classic/global/menu/menu-arrow-disabled.gif (global/win/menu/menu-arrow-disabled.gif) - skin/classic/global/menu/menu-arrow-hover.gif (global/win/menu/menu-arrow-hover.gif) - skin/classic/global/menu/menu-check.gif (global/win/menu/menu-check.gif) - skin/classic/global/menu/menu-check-disabled.gif (global/win/menu/menu-check-disabled.gif) - skin/classic/global/menu/menu-arrow.gif (global/win/menu/menu-arrow.gif) - skin/classic/global/menu/menu-radio.gif (global/win/menu/menu-radio.gif) - skin/classic/global/menu/menu-radio-disabled.gif (global/win/menu/menu-radio-disabled.gif) - skin/classic/global/menu/menu-radio-hover.gif (global/win/menu/menu-radio-hover.gif) - skin/classic/global/toolbar.css (global/win/toolbar.css) -#endif - skin/classic/global/globalBindings.xml (global/win/globalBindings.xml) - skin/classic/global/icons/alert-exclam.gif (global/win/icons/alert-exclam.gif) - skin/classic/global/icons/alert-error.gif (global/win/icons/alert-error.gif) - skin/classic/global/icons/alert-message.gif (global/win/icons/alert-message.gif) - skin/classic/global/icons/alert-question.gif (global/win/icons/alert-question.gif) - skin/classic/global/checkbox/cbox-check.gif (global/win/checkbox/cbox-check.gif) - skin/classic/global/checkbox/cbox-check-dis.gif (global/win/checkbox/cbox-check-dis.gif) - skin/classic/global/radio/radio-check-dis.gif (global/win/radio/radio-check-dis.gif) - skin/classic/global/radio/radio-check.gif (global/win/radio/radio-check.gif) - skin/classic/global/tree/checkbox.gif (global/win/tree/checkbox.gif) - skin/classic/global/tree/checkbox-checked.gif (global/win/tree/checkbox-checked.gif) - skin/classic/global/tree/twisty-open.gif (global/win/tree/twisty-open.gif) - skin/classic/global/tree/twisty-clsd.gif (global/win/tree/twisty-clsd.gif) - skin/classic/global/progressmeter/progressmeter-busy.gif (global/win/progressmeter/progressmeter-busy.gif) -#endif - skin/classic/global/config.css (global/config.css) - skin/classic/global/netError.css (global/netError.css) - skin/classic/global/plugins.css (/toolkit/empty-file) - skin/classic/global/printing.css (global/printing.css) -# chrome://global/skin/nativescrollbars.css is used on Mac - skin/classic/global/nativescrollbars.css (global/mac/nativescrollbars.css) -# chrome://global/skin/xulscrollbars.css is used on non-Mac platforms -#ifdef XP_OS2 - skin/classic/global/xulscrollbars.css (global/os2/xulscrollbars.css) - skin/classic/global/arrow/arrow-dn-dis.gif (global/os2/arrow/arrow-dn-dis.gif) - skin/classic/global/arrow/arrow-dn.gif (global/os2/arrow/arrow-dn.gif) - skin/classic/global/arrow/arrow-lft-dis.gif (global/os2/arrow/arrow-lft-dis.gif) - skin/classic/global/arrow/arrow-lft.gif (global/os2/arrow/arrow-lft.gif) - skin/classic/global/arrow/arrow-rit-dis.gif (global/os2/arrow/arrow-rit-dis.gif) - skin/classic/global/arrow/arrow-rit.gif (global/os2/arrow/arrow-rit.gif) - skin/classic/global/arrow/arrow-up-dis.gif (global/os2/arrow/arrow-up-dis.gif) - skin/classic/global/arrow/arrow-up.gif (global/os2/arrow/arrow-up.gif) - skin/classic/global/scrollbar/thumb-hrz.gif (global/os2/scrollbar/thumb-hrz.gif) - skin/classic/global/scrollbar/thumb-vrt.gif (global/os2/scrollbar/thumb-vrt.gif) -#else - skin/classic/global/xulscrollbars.css (global/win/scrollbars.css) - skin/classic/global/scrollbar/slider.gif (global/win/scrollbar/slider.gif) - skin/classic/global/arrow/arrow-dn-dis.gif (global/arrow/arrow-dn-dis.gif) - skin/classic/global/arrow/arrow-dn-hov.gif (global/arrow/arrow-dn-hov.gif) - skin/classic/global/arrow/arrow-lft-dis.gif (global/arrow/arrow-lft-dis.gif) - skin/classic/global/arrow/arrow-lft-hov.gif (global/arrow/arrow-lft-hov.gif) - skin/classic/global/arrow/arrow-lft-sharp.gif (global/arrow/arrow-lft-sharp.gif) - skin/classic/global/arrow/arrow-lft-sharp-end.gif (global/arrow/arrow-lft-sharp-end.gif) - skin/classic/global/arrow/arrow-rit-dis.gif (global/arrow/arrow-rit-dis.gif) - skin/classic/global/arrow/arrow-rit-hov.gif (global/arrow/arrow-rit-hov.gif) - skin/classic/global/arrow/arrow-rit-sharp.gif (global/arrow/arrow-rit-sharp.gif) - skin/classic/global/arrow/arrow-rit-sharp-end.gif (global/arrow/arrow-rit-sharp-end.gif) - skin/classic/global/arrow/arrow-up-dis.gif (global/arrow/arrow-up-dis.gif) - skin/classic/global/arrow/arrow-up-hov.gif (global/arrow/arrow-up-hov.gif) - skin/classic/global/arrow/arrow-dn.gif (global/arrow/arrow-dn.gif) - skin/classic/global/arrow/arrow-lft.gif (global/arrow/arrow-lft.gif) - skin/classic/global/arrow/arrow-rit.gif (global/arrow/arrow-rit.gif) - skin/classic/global/arrow/arrow-up.gif (global/arrow/arrow-up.gif) -#endif - skin/classic/global/scale.css (global/win/scale.css) - skin/classic/global/filepicker/blank.gif (global/filepicker/blank.gif) - skin/classic/global/filepicker/dir-closed.gif (global/filepicker/dir-closed.gif) - skin/classic/global/filepicker/dir-open.gif (global/filepicker/dir-open.gif) - skin/classic/global/filepicker/folder-up.gif (global/filepicker/folder-up.gif) - skin/classic/global/filepicker/folder-home.gif (global/filepicker/folder-home.gif) - skin/classic/global/filepicker/folder-new.gif (global/filepicker/folder-new.gif) - skin/classic/global/tree/columnpicker.gif (global/tree/columnpicker.gif) - skin/classic/global/tree/sort-asc.gif (global/tree/sort-asc.gif) - skin/classic/global/tree/sort-dsc.gif (global/tree/sort-dsc.gif) - skin/classic/global/console/console-error-dash.gif (global/console/console-error-dash.gif) - skin/classic/global/console/console-error-caret.gif (global/console/console-error-caret.gif) - skin/classic/global/icons/close-button.gif (global/icons/close-button.gif) - skin/classic/global/icons/pg-landscape.gif (global/icons/pg-landscape.gif) - skin/classic/global/icons/pg-landscape-small.gif (global/icons/pg-landscape-small.gif) - skin/classic/global/icons/pg-portrait.gif (global/icons/pg-portrait.gif) - skin/classic/global/icons/pg-portrait-small.gif (global/icons/pg-portrait-small.gif) - skin/classic/global/toolbar/tbgrip-arrow.gif (global/toolbar/tbgrip-arrow.gif) - skin/classic/global/toolbar/tbgrip-arrow-clps.gif (global/toolbar/tbgrip-arrow-clps.gif) - skin/classic/global/toolbar/tbgrip-texture.gif (global/toolbar/tbgrip-texture.gif) - skin/classic/global/toolbar/chevron.gif (global/toolbar/chevron.gif) - skin/classic/global/scale/scale-tray-horiz.gif (global/win/scale/scale-tray-horiz.gif) - skin/classic/global/scale/scale-tray-vert.gif (global/win/scale/scale-tray-vert.gif) - skin/classic/global/splitter/grip-vrt-after.gif (global/splitter/grip-vrt-after.gif) - skin/classic/global/splitter/grip-vrt-before.gif (global/splitter/grip-vrt-before.gif) - skin/classic/global/splitter/grip-hrz-after.gif (global/splitter/grip-hrz-after.gif) - skin/classic/global/splitter/grip-hrz-before.gif (global/splitter/grip-hrz-before.gif) - skin/classic/global/splitter/drag-bg.gif (global/splitter/drag-bg.gif) -#endif skin/classic/messenger/dialogs.css (messenger/dialogs.css) skin/classic/messenger/mailWindow2.css (messenger/mailWindow2.css) skin/classic/messenger/accountManage.css (messenger/accountManage.css) diff --git a/mozilla/suite/themes/modern/Makefile.in b/mozilla/suite/themes/modern/Makefile.in index 2e42c594c06..bb8171eb9fa 100644 --- a/mozilla/suite/themes/modern/Makefile.in +++ b/mozilla/suite/themes/modern/Makefile.in @@ -37,18 +37,11 @@ # # ***** END LICENSE BLOCK ***** -DEPTH = ../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -# XXX This include can be removed when the ifdef MOZ_XUL_APP is removed -# below. -include $(DEPTH)/config/autoconf.mk - -# XXX Remove this ifdef once SeaMonkey becomes a full XUL app. -ifdef MOZ_XUL_APP - USE_EXTENSION_MANIFEST = 1 include $(topsrcdir)/config/config.mk @@ -58,18 +51,15 @@ FINAL_TARGET = $(DIST)/bin/extensions/modern@themes.mozilla.org DEFINES += -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) DIST_FILES = \ - ../../suite/themes/modern/install.rdf \ + install.rdf \ $(NULL) FILES = \ - $(topsrcdir)/suite/themes/modern/preview.png \ - $(topsrcdir)/suite/themes/modern/icon.png \ + $(srcdir)/preview.png \ + $(srcdir)/icon.png \ $(NULL) libs:: $(INSTALL) $(FILES) $(FINAL_TARGET) -endif - include $(topsrcdir)/config/rules.mk - diff --git a/mozilla/suite/themes/modern/jar.mn b/mozilla/suite/themes/modern/jar.mn index 6c7d0c49b8e..6bd63b7c5df 100644 --- a/mozilla/suite/themes/modern/jar.mn +++ b/mozilla/suite/themes/modern/jar.mn @@ -1,19 +1,10 @@ modern.jar: -#ifdef MOZ_XUL_APP % skin communicator modern/1.0 %skin/modern/communicator/ % skin editor modern/1.0 %skin/modern/editor/ % skin global modern/1.0 %skin/modern/global/ % skin help modern/1.0 %skin/modern/help/ % skin messenger modern/1.0 %skin/modern/messenger/ % skin navigator modern/1.0 %skin/modern/navigator/ -#else -* skin/modern/communicator/contents.rdf (communicator/contents.rdf) -* skin/modern/editor/contents.rdf (editor/contents.rdf) -* skin/modern/global/contents.rdf (global/contents.rdf) -* skin/modern/messenger/contents.rdf (messenger/contents.rdf) -* skin/modern/navigator/contents.rdf (navigator/contents.rdf) - skin/modern/global/preview.gif (global/preview.gif) -#endif skin/modern/communicator/brand.css (communicator/brand.css) skin/modern/communicator/prefpanels.css (communicator/prefpanels.css) skin/modern/communicator/tasksOverlay.css (communicator/tasksOverlay.css)