moparisthebest/FireTray
1
0
Fork 0
mirror of https://github.com/moparisthebest/FireTray synced 2024-12-22 05:48:49 -05:00
Code Issues Releases Wiki Activity

reorganize and clean

Browse Source
This commit is contained in:
foudfou 2012-02-09 15:39:33 +01:00
parent 868106ff61
commit 6daf73fe44
16 changed files with 34 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile
View File

@ -87,7 +87,8 @@ modules_dir := modules
modules_sources := $(wildcard $(modules_dir)/*.js) \ modules_sources := $(wildcard $(modules_dir)/*.js) \
$(wildcard $(modules_dir)/*.jsm) \ $(wildcard $(modules_dir)/*.jsm) \
$(wildcard $(modules_dir)/ctypes/*.jsm) \ $(wildcard $(modules_dir)/ctypes/*.jsm) \
$(wildcard $(modules_dir)/gtk2/*.jsm) $(wildcard $(modules_dir)/ctypes/linux/*.jsm) \
$(wildcard $(modules_dir)/linux/*.jsm)
# The sources for the XPI file. Uses variables defined in the included # The sources for the XPI file. Uses variables defined in the included
# Makefiles. # Makefiles.

10
src/modules/FiretrayHandler.jsm
View File

@ -8,10 +8,10 @@ const Cu = Components.utils;
Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/ctypes.jsm"); Cu.import("resource://gre/modules/ctypes.jsm");
Cu.import("resource://firetray/ctypes/gobject.jsm"); Cu.import("resource://firetray/ctypes/linux/gobject.jsm");
Cu.import("resource://firetray/ctypes/gtk.jsm"); Cu.import("resource://firetray/ctypes/linux/gtk.jsm");
Cu.import("resource://firetray/commons.js"); Cu.import("resource://firetray/commons.js");
Cu.import("resource://firetray/FiretrayPrefListener.jsm"); Cu.import("resource://firetray/PrefListener.jsm");
Cu.import("resource://firetray/FiretrayVersionChange.jsm"); Cu.import("resource://firetray/FiretrayVersionChange.jsm");
/** /**
@ -63,9 +63,9 @@ firetray.Handler = {
LOG("OS=" + this.runtimeOS + ", ABI=" + this.runtimeABI + ", XULrunner=" + xulVer); LOG("OS=" + this.runtimeOS + ", ABI=" + this.runtimeABI + ", XULrunner=" + xulVer);
switch (this.runtimeOS) { switch (this.runtimeOS) {
case "Linux": case "Linux":
Cu.import("resource://firetray/gtk2/FiretrayStatusIcon.jsm"); Cu.import("resource://firetray/linux/FiretrayStatusIcon.jsm");
LOG('FiretrayStatusIcon imported'); LOG('FiretrayStatusIcon imported');
Cu.import("resource://firetray/gtk2/FiretrayWindow.jsm"); Cu.import("resource://firetray/linux/FiretrayWindow.jsm");
LOG('FiretrayWindow imported'); LOG('FiretrayWindow imported');
break; break;
default: default:

0
src/modules/FiretrayPrefListener.jsm → src/modules/PrefListener.jsm
View File

0
src/modules/ctypes/cairo.jsm → src/modules/ctypes/linux/cairo.jsm
View File

8
src/modules/ctypes/gdk.jsm → src/modules/ctypes/linux/gdk.jsm
View File

@ -48,10 +48,10 @@ const Ci = Components.interfaces;
Cu.import("resource://gre/modules/ctypes.jsm"); Cu.import("resource://gre/modules/ctypes.jsm");
Cu.import("resource://firetray/ctypes/ctypes-utils.jsm"); Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
Cu.import("resource://firetray/ctypes/cairo.jsm"); Cu.import("resource://firetray/ctypes/linux/cairo.jsm");
Cu.import("resource://firetray/ctypes/glib.jsm"); Cu.import("resource://firetray/ctypes/linux/glib.jsm");
Cu.import("resource://firetray/ctypes/gobject.jsm"); Cu.import("resource://firetray/ctypes/linux/gobject.jsm");
Cu.import("resource://firetray/ctypes/x11.jsm"); Cu.import("resource://firetray/ctypes/linux/x11.jsm");
function gdk_defines(lib) { function gdk_defines(lib) {
this.GdkInterpType = ctypes.int; // enum this.GdkInterpType = ctypes.int; // enum

0
src/modules/ctypes/glib.jsm → src/modules/ctypes/linux/glib.jsm
View File

2
src/modules/ctypes/gobject.jsm → src/modules/ctypes/linux/gobject.jsm
View File

@ -48,7 +48,7 @@ const Ci = Components.interfaces;
Cu.import("resource://gre/modules/ctypes.jsm"); Cu.import("resource://gre/modules/ctypes.jsm");
Cu.import("resource://firetray/ctypes/ctypes-utils.jsm"); Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
Cu.import("resource://firetray/ctypes/glib.jsm"); Cu.import("resource://firetray/ctypes/linux/glib.jsm");
function gobject_defines(lib) { function gobject_defines(lib) {

6
src/modules/ctypes/gtk.jsm → src/modules/ctypes/linux/gtk.jsm
View File

@ -11,9 +11,9 @@ const Ci = Components.interfaces;
Cu.import("resource://gre/modules/ctypes.jsm"); Cu.import("resource://gre/modules/ctypes.jsm");
Cu.import("resource://firetray/ctypes/ctypes-utils.jsm"); Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
Cu.import("resource://firetray/ctypes/gdk.jsm"); Cu.import("resource://firetray/ctypes/linux/gdk.jsm");
Cu.import("resource://firetray/ctypes/gobject.jsm"); Cu.import("resource://firetray/ctypes/linux/gobject.jsm");
Cu.import("resource://firetray/ctypes/pango.jsm"); Cu.import("resource://firetray/ctypes/linux/pango.jsm");
function gtk_defines(lib) { function gtk_defines(lib) {
this.GTK_ICON_SIZE_MENU = 1; // enum GtkIconSize this.GTK_ICON_SIZE_MENU = 1; // enum GtkIconSize

0
src/modules/ctypes/libc.jsm → src/modules/ctypes/linux/libc.jsm
View File

4
src/modules/ctypes/pango.jsm → src/modules/ctypes/linux/pango.jsm
View File

@ -11,8 +11,8 @@ const Ci = Components.interfaces;
Cu.import("resource://gre/modules/ctypes.jsm"); Cu.import("resource://gre/modules/ctypes.jsm");
Cu.import("resource://firetray/ctypes/ctypes-utils.jsm"); Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
Cu.import("resource://firetray/ctypes/cairo.jsm"); Cu.import("resource://firetray/ctypes/linux/cairo.jsm");
Cu.import("resource://firetray/ctypes/gobject.jsm"); Cu.import("resource://firetray/ctypes/linux/gobject.jsm");
function pango_defines(lib) { function pango_defines(lib) {
this.PANGO_WEIGHT_THIN = 100; this.PANGO_WEIGHT_THIN = 100;

6
src/modules/ctypes/pangocairo.jsm → src/modules/ctypes/linux/pangocairo.jsm
View File

@ -11,9 +11,9 @@ const Ci = Components.interfaces;
Cu.import("resource://gre/modules/ctypes.jsm"); Cu.import("resource://gre/modules/ctypes.jsm");
Cu.import("resource://firetray/ctypes/ctypes-utils.jsm"); Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
Cu.import("resource://firetray/ctypes/cairo.jsm"); Cu.import("resource://firetray/ctypes/linux/cairo.jsm");
Cu.import("resource://firetray/ctypes/gobject.jsm"); Cu.import("resource://firetray/ctypes/linux/gobject.jsm");
Cu.import("resource://firetray/ctypes/pango.jsm"); Cu.import("resource://firetray/ctypes/linux/pango.jsm");
function pangocairo_defines(lib) { function pangocairo_defines(lib) {
lib.lazy_bind("pango_cairo_show_layout", ctypes.void_t, cairo.cairo_t.ptr, pango.PangoLayout.ptr); lib.lazy_bind("pango_cairo_show_layout", ctypes.void_t, cairo.cairo_t.ptr, pango.PangoLayout.ptr);

0
src/modules/ctypes/x11.jsm → src/modules/ctypes/linux/x11.jsm
View File

23
src/modules/ctypes/xinerama.jsm
View File

@ -1,23 +0,0 @@
/* -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
var EXPORTED_SYMBOLS = [ "xinerama" ];
const XINERAMA_LIBNAME = "Xinerama";
const XINERAMA_ABIS = [ 1 ];
const Cu = Components.utils;
const Cc = Components.classes;
const Ci = Components.interfaces;
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/ctypes.jsm");
Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
Cu.import("resource://firetray/logging.jsm");
Cu.import("resource://firetray/ctypes/x11.jsm");
function xinerama_defines(lib) {
lib.lazy_bind("XineramaIsActive", x11.Bool, x11.Display.ptr);
}
new ctypes_library(XINERAMA_LIBNAME, XINERAMA_ABIS, xinerama_defines, this);

4
src/modules/gtk2/FiretrayPopupMenu.jsm → src/modules/linux/FiretrayPopupMenu.jsm
View File

@ -9,8 +9,8 @@ const Cu = Components.utils;
Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/ctypes.jsm"); Cu.import("resource://gre/modules/ctypes.jsm");
Cu.import("resource://firetray/ctypes/gobject.jsm"); Cu.import("resource://firetray/ctypes/linux/gobject.jsm");
Cu.import("resource://firetray/ctypes/gtk.jsm"); Cu.import("resource://firetray/ctypes/linux/gtk.jsm");
Cu.import("resource://firetray/commons.js"); Cu.import("resource://firetray/commons.js");
if ("undefined" == typeof(firetray.StatusIcon)) if ("undefined" == typeof(firetray.StatusIcon))

14
src/modules/gtk2/FiretrayStatusIcon.jsm → src/modules/linux/FiretrayStatusIcon.jsm
View File

@ -9,12 +9,12 @@ const Cu = Components.utils;
Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/ctypes.jsm"); Cu.import("resource://gre/modules/ctypes.jsm");
Cu.import("resource://firetray/ctypes/cairo.jsm"); Cu.import("resource://firetray/ctypes/linux/cairo.jsm");
Cu.import("resource://firetray/ctypes/gobject.jsm"); Cu.import("resource://firetray/ctypes/linux/gobject.jsm");
Cu.import("resource://firetray/ctypes/gdk.jsm"); Cu.import("resource://firetray/ctypes/linux/gdk.jsm");
Cu.import("resource://firetray/ctypes/gtk.jsm"); Cu.import("resource://firetray/ctypes/linux/gtk.jsm");
Cu.import("resource://firetray/ctypes/pango.jsm"); Cu.import("resource://firetray/ctypes/linux/pango.jsm");
Cu.import("resource://firetray/ctypes/pangocairo.jsm"); Cu.import("resource://firetray/ctypes/linux/pangocairo.jsm");
Cu.import("resource://firetray/commons.js"); Cu.import("resource://firetray/commons.js");
if ("undefined" == typeof(firetray.Handler)) if ("undefined" == typeof(firetray.Handler))
@ -40,7 +40,7 @@ firetray.StatusIcon = {
firetray.Handler.setIconTooltipDefault(); firetray.Handler.setIconTooltipDefault();
Cu.import("resource://firetray/gtk2/FiretrayPopupMenu.jsm"); Cu.import("resource://firetray/linux/FiretrayPopupMenu.jsm");
if (!firetray.PopupMenu.init()) if (!firetray.PopupMenu.init())
return false; return false;

10
src/modules/gtk2/FiretrayWindow.jsm → src/modules/linux/FiretrayWindow.jsm
View File

@ -17,11 +17,11 @@ Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/ctypes.jsm"); Cu.import("resource://gre/modules/ctypes.jsm");
Cu.import("resource://firetray/ctypes/ctypesMap.jsm"); Cu.import("resource://firetray/ctypes/ctypesMap.jsm");
Cu.import("resource://firetray/ctypes/gobject.jsm"); Cu.import("resource://firetray/ctypes/linux/gobject.jsm");
Cu.import("resource://firetray/ctypes/gdk.jsm"); Cu.import("resource://firetray/ctypes/linux/gdk.jsm");
Cu.import("resource://firetray/ctypes/gtk.jsm"); Cu.import("resource://firetray/ctypes/linux/gtk.jsm");
Cu.import("resource://firetray/ctypes/libc.jsm"); Cu.import("resource://firetray/ctypes/linux/libc.jsm");
Cu.import("resource://firetray/ctypes/x11.jsm"); Cu.import("resource://firetray/ctypes/linux/x11.jsm");
Cu.import("resource://firetray/commons.js"); Cu.import("resource://firetray/commons.js");
if ("undefined" == typeof(firetray.Handler)) if ("undefined" == typeof(firetray.Handler))