Reshape icon directories, and fix Makefile.

src/Makefile

@@ -92,14 +92,13 @@ chrome_sources := $(chrome_sources_js)								\
                $(wildcard $(chrome_source_root)/content/*.xul)					\
                $(wildcard $(chrome_source_root)/content/*.xml)					\
                $(wildcard $(chrome_source_root)/content/*.css)					\
-               $(wildcard $(chrome_source_root)/skin/*.css)					\
-               $(wildcard $(chrome_source_root)/skin/*.gif)					\
-               $(wildcard $(chrome_source_root)/skin/*.png)					\
-               $(wildcard $(chrome_source_root)/skin/*.svg)					\
-               $(wildcard $(chrome_source_root)/skin/linux/icons/hicolor/22x22/apps/*.png)	\
-               $(wildcard $(chrome_source_root)/skin/linux/icons/gnome/22x22/status/*.png)	\
-               $(wildcard $(chrome_source_root)/skin/winnt/*.bmp)				\
-               $(wildcard $(chrome_source_root)/skin/winnt/*.ico)				\
+               $(wildcard $(chrome_source_root)/skin/icons/*.css)				\
+               $(wildcard $(chrome_source_root)/skin/icons/*.gif)				\
+               $(wildcard $(chrome_source_root)/skin/icons/*.png)				\
+               $(wildcard $(chrome_source_root)/skin/icons/*.svg)				\
+               $(wildcard $(chrome_source_root)/skin/icons/linux/hicolor/22x22/*/*.png)		\
+               $(wildcard $(chrome_source_root)/skin/icons/winnt/*.bmp)				\
+               $(wildcard $(chrome_source_root)/skin/icons/winnt/*.ico)				\
                $(wildcard $(chrome_source_root)/locale/*/*.dtd)					\
                $(wildcard $(chrome_source_root)/locale/*/*.properties)
 

src/chrome/content/options.xul

@@ -18,7 +18,7 @@
   </broadcasterset>
 
   <prefpane id="pref-pane-windows" label="&windows_options;"
-            image="chrome://firetray/skin/pref-windows.svg">
+            image="chrome://firetray/skin/icons/pref-windows.svg">
 
     <preferences>
       <preference id="pref_hides_on_close" name="extensions.firetray.hides_on_close" type="bool"/>
@@ -63,7 +63,7 @@
   </prefpane>
 
   <prefpane id="pref-pane-icon" label="&icon_options;"
-            image="chrome://firetray/skin/pref-icon.svg">
+            image="chrome://firetray/skin/icons/pref-icon.svg">
 
     <preferences>
       <preference id="pref_app_icon_type" name="extensions.firetray.app_icon_type" type="int"/>
@@ -125,7 +125,7 @@
   </prefpane>
 
   <prefpane id="pref-pane-mail" label="&mail_options;"
-            image="chrome://firetray/skin/pref-mail.svg">
+            image="chrome://firetray/skin/icons/pref-mail.svg">
 
     <preferences>
       <preference id="pref_mail_notification_enabled" name="extensions.firetray.mail_notification_enabled" type="bool" />
@@ -315,7 +315,7 @@
   </prefpane>
 
   <prefpane id="pref-pane-chat" label="&chat_options;"
-            image="chrome://firetray/skin/pref-chat.svg">
+            image="chrome://firetray/skin/icons/pref-chat.svg">
 
     <preferences>
       <preference id="pref_chat_icon_enable" name="extensions.firetray.chat_icon_enable" type="bool" />

src/chrome/skin/icons/linux/hicolor/22x22/apps/chatzilla.png

@@ -0,0 +1 @@
+../../../../img/chatzilla22.png

src/chrome/skin/icons/linux/hicolor/22x22/apps/firefox.png

@@ -0,0 +1 @@
+../../../../img/firefox22.png

src/chrome/skin/icons/linux/hicolor/22x22/apps/seamonkey.png

@@ -0,0 +1 @@
+../../../../img/seamonkey22.png

src/chrome/skin/icons/linux/hicolor/22x22/apps/thunderbird.png

@@ -0,0 +1 @@
+../../../../img/thunderbird22.png

src/chrome/skin/icons/linux/hicolor/22x22/apps/zotero.png

@@ -0,0 +1 @@
+../../../../img/zotero22.png

src/chrome/skin/icons/linux/hicolor/22x22/status/mail-unread.png

@@ -0,0 +1 @@
+../../../../img/mail-unread.png

src/chrome/skin/icons/linux/hicolor/22x22/status/user-available.png

@@ -0,0 +1 @@
+../../../../img/pidgin-tray-available.png

src/chrome/skin/icons/linux/hicolor/22x22/status/user-away.png

@@ -0,0 +1 @@
+../../../../img/pidgin-tray-away.png

src/chrome/skin/icons/linux/hicolor/22x22/status/user-busy.png

@@ -0,0 +1 @@
+../../../../img/pidgin-tray-busy.png

src/chrome/skin/icons/linux/hicolor/22x22/status/user-offline.png

@@ -0,0 +1 @@
+../../../../img/pidgin-tray-offline.png

src/chrome/skin/linux/icons/hicolor/22x22/apps/chatzilla.png

@@ -1 +0,0 @@
-../../../../../img/chatzilla22.png

src/chrome/skin/linux/icons/hicolor/22x22/apps/firefox.png

@@ -1 +0,0 @@
-../../../../../img/firefox22.png

src/chrome/skin/linux/icons/hicolor/22x22/apps/seamonkey.png

@@ -1 +0,0 @@
-../../../../../img/seamonkey22.png

src/chrome/skin/linux/icons/hicolor/22x22/apps/thunderbird.png

@@ -1 +0,0 @@
-../../../../../img/thunderbird22.png

src/chrome/skin/linux/icons/hicolor/22x22/apps/zotero.png

@@ -1 +0,0 @@
-../../../../../img/zotero22.png

src/chrome/skin/linux/icons/hicolor/22x22/status/mail-unread.png

@@ -1 +0,0 @@
-../../../../../img/mail-unread.png

src/chrome/skin/linux/icons/hicolor/22x22/status/user-available.png

@@ -1 +0,0 @@
-../../../../../img/pidgin-tray-available.png

src/chrome/skin/linux/icons/hicolor/22x22/status/user-away.png

@@ -1 +0,0 @@
-../../../../../img/pidgin-tray-away.png

src/chrome/skin/linux/icons/hicolor/22x22/status/user-busy.png

@@ -1 +0,0 @@
-../../../../../img/pidgin-tray-busy.png

src/chrome/skin/linux/icons/hicolor/22x22/status/user-offline.png

@@ -1 +0,0 @@
-../../../../../img/pidgin-tray-offline.png

src/chrome/skin/overlay.css

@@ -5,12 +5,12 @@ treechildren::-moz-tree-checkbox {
 
 treechildren::-moz-tree-checkbox(checked) {
   /* css for checked cells */
-  list-style-image: url("chrome://firetray/skin/cbox-check.gif");
+  list-style-image: url("chrome://firetray/skin/icons/cbox-check.gif");
 }
 
 treechildren::-moz-tree-checkbox(checked, disabled) {
   /* css for disabled checkboxes */
-  list-style-image: url("chrome://firetray/skin/cbox-disabled.gif");
+  list-style-image: url("chrome://firetray/skin/icons/cbox-disabled.gif");
 }
 
 /* properties="disabled" */

src/install.rdf

@@ -12,8 +12,8 @@
     <em:homepageURL>https://github.com/foudfou/firetray</em:homepageURL>
     <em:description>A system tray extension for linux.</em:description>
     <em:optionsURL>chrome://firetray/content/options.xul</em:optionsURL>
-    <em:iconURL>chrome://firetray/skin/firetray48.png</em:iconURL>
-    <em:icon64URL>chrome://firetray/skin/firetray64.png</em:icon64URL>
+    <em:iconURL>chrome://firetray/skin/icons/firetray48.png</em:iconURL>
+    <em:icon64URL>chrome://firetray/skin/icons/firetray64.png</em:icon64URL>
     <em:targetPlatform>Linux</em:targetPlatform>
     <em:targetPlatform>WINNT</em:targetPlatform>
 

src/modules/linux/FiretrayGtkIcons.jsm

@@ -39,7 +39,7 @@ firetray.GtkIcons = {
   },
 
   loadDefaultTheme: function() {
-    this.GTK_THEME_ICON_PATH = firetray.Utils.chromeToPath("chrome://firetray/skin/linux/icons");
+    this.GTK_THEME_ICON_PATH = firetray.Utils.chromeToPath("chrome://firetray/skin/icons/linux");
     log.debug(this.GTK_THEME_ICON_PATH);
     let gtkIconTheme = gtk.gtk_icon_theme_get_default();
     log.debug("gtkIconTheme="+gtkIconTheme);

src/modules/linux/FiretrayStatusIcon.jsm

@@ -41,7 +41,7 @@ firetray.StatusIcon = {
 
   init: function() {
     this.FILENAME_BLANK = firetray.Utils.chromeToPath(
-      "chrome://firetray/skin/blank-icon.png");
+      "chrome://firetray/skin/icons/blank-icon.png");
 
     Cu.import("resource://firetray/linux/FiretrayGtkIcons.jsm");
     firetray.GtkIcons.init();

src/modules/winnt/FiretrayStatusIcon.jsm

@@ -27,15 +27,16 @@ let log = firetray.Logging.getLogger("firetray.StatusIcon");
 if ("undefined" == typeof(firetray.Handler))
   log.error("This module MUST be imported from/after FiretrayHandler !");
 
-const ICON_CHROME_PATHS = {
-  'blank-icon': "chrome://firetray/skin/winnt/blank-icon.bmp",
-  'mail-unread': "chrome://firetray/skin/winnt/mail-unread.ico",
+const ICON_CHROME_PATH = "chrome://firetray/skin/icons/winnt";
+const ICON_CHROME_FILES = {
+  'blank-icon': ICON_CHROME_PATH+"/blank-icon.bmp",
+  'mail-unread': ICON_CHROME_PATH+"/mail-unread.ico",
   // these are for the popup menu:
-  'prefs': "chrome://firetray/skin/winnt/gtk-preferences.bmp",
-  'quit': "chrome://firetray/skin/winnt/application-exit.bmp",
-  'new-wnd': "chrome://firetray/skin/winnt/document-new.bmp",
-  'new-msg': "chrome://firetray/skin/winnt/gtk-edit.bmp",
-  'reset': "chrome://firetray/skin/winnt/gtk-apply.bmp"
+  'prefs': ICON_CHROME_PATH+"/gtk-preferences.bmp",
+  'quit': ICON_CHROME_PATH+"/application-exit.bmp",
+  'new-wnd': ICON_CHROME_PATH+"/document-new.bmp",
+  'new-msg': ICON_CHROME_PATH+"/gtk-edit.bmp",
+  'reset': ICON_CHROME_PATH+"/gtk-apply.bmp"
 };
 
 
@@ -94,8 +95,8 @@ firetray.StatusIcon = {
 
     /* we'll take the first icon in the .ico file. To get the icon count in the
      file, pass ctypes.cast(ctypes.int(-1), win32.UINT); */
-    for (let imgName in ICON_CHROME_PATHS) {
-      let path = firetray.Utils.chromeToPath(ICON_CHROME_PATHS[imgName]);
+    for (let imgName in ICON_CHROME_FILES) {
+      let path = firetray.Utils.chromeToPath(ICON_CHROME_FILES[imgName]);
       let img = this.loadImageFromFile(path);
       if (img)
         this[this.IMG_TYPES[img['type']]['map']].insert(imgName, img['himg']);