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

* display popup menu window items for all application, not only browsers

Browse Source 
* cleaning
This commit is contained in:
foudfou 2013-03-10 22:21:02 +01:00
parent 6fb8a15f22
commit bd83ca9304
3 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
build/ build*/

3
src/modules/linux/FiretrayPopupMenu.jsm
View File

@ -203,8 +203,7 @@ firetray.PopupMenu = {
}, },
windowItemsHandled: function() { windowItemsHandled: function() {
return (firetray.Handler.inBrowserApp && return firetray.Utils.prefService.getBoolPref('hides_single_window');
firetray.Utils.prefService.getBoolPref('hides_single_window'));
} }
}; // firetray.PopupMenu }; // firetray.PopupMenu

54
src/modules/linux/FiretrayWindow.jsm
View File

@ -258,6 +258,16 @@ firetray.Window = {
firetray.Handler.showHideIcon(); firetray.Handler.showHideIcon();
}, },
startupHide: function(xid) {
log.debug('startupHide: '+xid);
firetray.Handler.windows[xid].baseWin.visibility = false;
firetray.Window.updateVisibility(xid, false);
firetray.PopupMenu.showWindowItem(xid);
firetray.Handler.showHideIcon();
},
savePositionAndSize: function(xid) { savePositionAndSize: function(xid) {
let gx = {}, gy = {}, gwidth = {}, gheight = {}; let gx = {}, gy = {}, gwidth = {}, gheight = {};
firetray.Handler.windows[xid].baseWin.getPositionAndSize(gx, gy, gwidth, gheight); firetray.Handler.windows[xid].baseWin.getPositionAndSize(gx, gy, gwidth, gheight);
@ -489,10 +499,10 @@ firetray.Window = {
let title = firetray.Handler.windows[xid].baseWin.title; let title = firetray.Handler.windows[xid].baseWin.title;
log.debug("|baseWin.title="+title+"|"); log.debug("|baseWin.title="+title+"|");
let tailIndex; let tailIndex;
if (firetray.Handler.appId === FIRETRAY_APP_DB['seamonkey']['id']) tailIndex = title.indexOf(" - Mozilla "+firetray.Handler.appName);
if (tailIndex === -1)
tailIndex = title.indexOf(" - "+firetray.Handler.appName); tailIndex = title.indexOf(" - "+firetray.Handler.appName);
else
tailIndex = title.indexOf(" - Mozilla "+firetray.Handler.appName);
if (tailIndex !== -1) if (tailIndex !== -1)
return title.substring(0, tailIndex); return title.substring(0, tailIndex);
else if (title === "Mozilla "+firetray.Handler.appName) else if (title === "Mozilla "+firetray.Handler.appName)
@ -514,25 +524,6 @@ firetray.Window = {
} }
}, },
startupFilter: function(xev, gdkEv, data) {
if (!xev)
return gdk.GDK_FILTER_CONTINUE;
let xany = ctypes.cast(xev, x11.XAnyEvent.ptr);
let xid = xany.contents.window;
if (xany.contents.type === x11.MapNotify) {
if (firetray.Utils.prefService.getBoolPref('start_hidden')) {
log.debug("start_hidden");
firetray.Window.hide(xid);
}
gdk.gdk_window_remove_filter(firetray.Handler.gdkWindows.get(xid),
firetray.Handler.windows[xid].startupFilterCb, null);
}
return gdk.GDK_FILTER_CONTINUE;
},
filterWindow: function(xev, gdkEv, data) { filterWindow: function(xev, gdkEv, data) {
if (!xev) if (!xev)
return gdk.GDK_FILTER_CONTINUE; return gdk.GDK_FILTER_CONTINUE;
@ -580,6 +571,25 @@ firetray.Window = {
return gdk.GDK_FILTER_CONTINUE; return gdk.GDK_FILTER_CONTINUE;
}, },
startupFilter: function(xev, gdkEv, data) {
if (!xev)
return gdk.GDK_FILTER_CONTINUE;
let xany = ctypes.cast(xev, x11.XAnyEvent.ptr);
let xid = xany.contents.window;
if (xany.contents.type === x11.MapNotify) {
if (firetray.Utils.prefService.getBoolPref('start_hidden')) {
log.debug("start_hidden");
firetray.Window.startupHide(xid);
}
gdk.gdk_window_remove_filter(firetray.Handler.gdkWindows.get(xid),
firetray.Handler.windows[xid].startupFilterCb, null);
}
return gdk.GDK_FILTER_CONTINUE;
},
showAllWindowsAndActivate: function() { showAllWindowsAndActivate: function() {
let visibilityRate = firetray.Handler.visibleWindowsCount/firetray.Handler.windowsCount; let visibilityRate = firetray.Handler.visibleWindowsCount/firetray.Handler.windowsCount;
log.debug("visibilityRate="+visibilityRate); log.debug("visibilityRate="+visibilityRate);