moparisthebest/FireTray
1
0
Fork 0
mirror of https://github.com/moparisthebest/FireTray synced 2025-01-08 12:08:05 -05:00
Code Issues Releases Wiki Activity

Reshape icon directories, and fix Makefile.

Browse Source
This commit is contained in:
foudfou 2014-05-25 21:11:07 +02:00
parent 11fb8b23b3
commit 9afa777c65
58 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Makefile
View File

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

8
src/chrome/content/options.xul
View File

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

0
src/chrome/skin/blank-icon.png → src/chrome/skin/icons/blank-icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
src/chrome/skin/cbox-check.gif → src/chrome/skin/icons/cbox-check.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 54 B

After

Width:  |  Height:  |  Size: 54 B

0
src/chrome/skin/cbox-disabled.gif → src/chrome/skin/icons/cbox-disabled.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 59 B

After

Width:  |  Height:  |  Size: 59 B

0
src/chrome/skin/firetray128.svg → src/chrome/skin/icons/firetray128.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

0
src/chrome/skin/firetray48.png → src/chrome/skin/icons/firetray48.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
src/chrome/skin/firetray64.png → src/chrome/skin/icons/firetray64.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
src/chrome/skin/img/chatzilla22.png → src/chrome/skin/icons/img/chatzilla22.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
src/chrome/skin/img/firefox22.png → src/chrome/skin/icons/img/firefox22.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
src/chrome/skin/img/internet-group-chat.svg → src/chrome/skin/icons/img/internet-group-chat.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

0
src/chrome/skin/img/internet-mail.svg → src/chrome/skin/icons/img/internet-mail.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

0
src/chrome/skin/img/mail-unread.png → src/chrome/skin/icons/img/mail-unread.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
src/chrome/skin/img/pidgin-tray-available.png → src/chrome/skin/icons/img/pidgin-tray-available.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
src/chrome/skin/img/pidgin-tray-away.png → src/chrome/skin/icons/img/pidgin-tray-away.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
src/chrome/skin/img/pidgin-tray-busy.png → src/chrome/skin/icons/img/pidgin-tray-busy.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
src/chrome/skin/img/pidgin-tray-offline.png → src/chrome/skin/icons/img/pidgin-tray-offline.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
src/chrome/skin/img/preferences-system-windows.svg → src/chrome/skin/icons/img/preferences-system-windows.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

0
src/chrome/skin/img/preferences-system.svg → src/chrome/skin/icons/img/preferences-system.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

0
src/chrome/skin/img/seamonkey22.png → src/chrome/skin/icons/img/seamonkey22.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
src/chrome/skin/img/thunderbird22.png → src/chrome/skin/icons/img/thunderbird22.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
src/chrome/skin/img/zotero22.png → src/chrome/skin/icons/img/zotero22.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

1
src/chrome/skin/icons/linux/hicolor/22x22/apps/chatzilla.png Symbolic link
View File

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

1
src/chrome/skin/icons/linux/hicolor/22x22/apps/firefox.png Symbolic link
View File

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

1
src/chrome/skin/icons/linux/hicolor/22x22/apps/seamonkey.png Symbolic link
View File

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

1
src/chrome/skin/icons/linux/hicolor/22x22/apps/thunderbird.png Symbolic link
View File

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

1
src/chrome/skin/icons/linux/hicolor/22x22/apps/zotero.png Symbolic link
View File

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

1
src/chrome/skin/icons/linux/hicolor/22x22/status/mail-unread.png Symbolic link
View File

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

1
src/chrome/skin/icons/linux/hicolor/22x22/status/user-available.png Symbolic link
View File

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

1
src/chrome/skin/icons/linux/hicolor/22x22/status/user-away.png Symbolic link
View File

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

1
src/chrome/skin/icons/linux/hicolor/22x22/status/user-busy.png Symbolic link
View File

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

1
src/chrome/skin/icons/linux/hicolor/22x22/status/user-offline.png Symbolic link
View File

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

0
src/chrome/skin/pref-chat.svg → src/chrome/skin/icons/pref-chat.svg
View File

0
src/chrome/skin/pref-icon.svg → src/chrome/skin/icons/pref-icon.svg
View File

0
src/chrome/skin/pref-mail.svg → src/chrome/skin/icons/pref-mail.svg
View File

0
src/chrome/skin/pref-windows.svg → src/chrome/skin/icons/pref-windows.svg
View File

0
src/chrome/skin/winnt/application-exit.bmp → src/chrome/skin/icons/winnt/application-exit.bmp
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

0
src/chrome/skin/winnt/blank-icon.bmp → src/chrome/skin/icons/winnt/blank-icon.bmp
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

0
src/chrome/skin/winnt/document-new.bmp → src/chrome/skin/icons/winnt/document-new.bmp
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

0
src/chrome/skin/winnt/gtk-apply.bmp → src/chrome/skin/icons/winnt/gtk-apply.bmp
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
src/chrome/skin/winnt/gtk-edit.bmp → src/chrome/skin/icons/winnt/gtk-edit.bmp
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

0
src/chrome/skin/winnt/gtk-preferences.bmp → src/chrome/skin/icons/winnt/gtk-preferences.bmp
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

0
src/chrome/skin/winnt/mail-unread.ico → src/chrome/skin/icons/winnt/mail-unread.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

4
src/chrome/skin/overlay.css
View File

@ -5,12 +5,12 @@ treechildren::-moz-tree-checkbox {
treechildren::-moz-tree-checkbox(checked) { treechildren::-moz-tree-checkbox(checked) {
/* css for checked cells */ /* 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) { treechildren::-moz-tree-checkbox(checked, disabled) {
/* css for disabled checkboxes */ /* 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" */ /* properties="disabled" */

4
src/install.rdf
View File

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

2
src/modules/linux/FiretrayGtkIcons.jsm
View File

@ -39,7 +39,7 @@ firetray.GtkIcons = {
}, },
loadDefaultTheme: function() { 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); log.debug(this.GTK_THEME_ICON_PATH);
let gtkIconTheme = gtk.gtk_icon_theme_get_default(); let gtkIconTheme = gtk.gtk_icon_theme_get_default();
log.debug("gtkIconTheme="+gtkIconTheme); log.debug("gtkIconTheme="+gtkIconTheme);

2
src/modules/linux/FiretrayStatusIcon.jsm
View File

@ -41,7 +41,7 @@ firetray.StatusIcon = {
init: function() { init: function() {
this.FILENAME_BLANK = firetray.Utils.chromeToPath( 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"); Cu.import("resource://firetray/linux/FiretrayGtkIcons.jsm");
firetray.GtkIcons.init(); firetray.GtkIcons.init();

21
src/modules/winnt/FiretrayStatusIcon.jsm
View File

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