moparisthebest
/
FireTray
mirror of https://github.com/moparisthebest/FireTray
1
0
Fork 0
Code Issues Releases Wiki Activity

add 'remember_desktop' option

This commit is contained in:
foudfou 2012-03-04 23:41:01 +01:00
parent 1b7aef50ce
commit 3d89441747
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@
<preference id="pref_hides_single_window" name="extensions.firetray.hides_single_window" type="bool"/>
<preference id="pref_start_hidden" name="extensions.firetray.start_hidden" type="bool"/>
<preference id="pref_show_activates" name="extensions.firetray.show_activates" type="bool"/>
<preference id="pref_remember_desktop" name="extensions.firetray.remember_desktop" type="bool"/>
<preference id="pref_show_icon_on_hide" name="extensions.firetray.show_icon_on_hide" type="bool"/>
<preference id="pref_scroll_hides" name="extensions.firetray.scroll_hides" type="bool" />
<preference id="pref_scroll_mode" name="extensions.firetray.scroll_mode" type="string" />
@ -66,6 +67,9 @@
label="&bool_show_activates.label;"
accesskey="&bool_show_activates.accesskey;"
tooltiptext="&bool_show_activates.tooltip;"/>
<checkbox id="ui_remember_desktop" preference="pref_remember_desktop"
label="&bool_remember_desktop.label;"
accesskey="&bool_remember_desktop.accesskey;"/>
</groupbox>
<groupbox>

2
src/chrome/locale/en-US/options.dtd
View File

@ -20,6 +20,8 @@
<!ENTITY bool_show_activates.label "Activate restored windows">
<!ENTITY bool_show_activates.accesskey "e">
<!ENTITY bool_show_activates.tooltip "restored windows raise on top and get focus">
<!ENTITY bool_remember_desktop.label "Remember desktop">
<!ENTITY bool_remember_desktop.accesskey "e">
<!ENTITY icon_settings "Icon settings">
<!ENTITY bool_show_icon_on_hide.label "Show tray icon only if a window is hidden">

1
src/defaults/preferences/prefs.js
View File

@ -12,6 +12,7 @@ pref("extensions.firetray.hides_on_minimize", true);
pref("extensions.firetray.hides_single_window", false);
pref("extensions.firetray.start_hidden", false);
pref("extensions.firetray.show_activates", false);
pref("extensions.firetray.remember_desktop", true);
pref("extensions.firetray.show_icon_on_hide", false);
pref("extensions.firetray.scroll_hides", true);

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

@ -198,7 +198,7 @@ firetray.Window = {
// better visual effect if visibility set here instead of before
firetray.Window.setVisibility(xid, true);
firetray.Window.restoreDesktop(xid); // after show
firetray.Window.restoreDesktop(xid); // after show
firetray.Window.activate(xid);
firetray.PopupMenu.hideSingleWindowItemAndSeparatorMaybe(xid);
@ -294,12 +294,18 @@ firetray.Window = {
},
saveDesktop: function(xid) {
if (!firetray.Utils.prefService.getBoolPref('remember_desktop'))
return;
let winDesktop = firetray.Window.getXWindowDesktop(x11.Window(xid));
firetray.Handler.windows[xid].savedDesktop = winDesktop;
LOG("save: windowDesktop="+winDesktop);
},
restoreDesktop: function(xid) {
if (!firetray.Utils.prefService.getBoolPref('remember_desktop'))
return;
let desktopDest = firetray.Handler.windows[xid].savedDesktop;
if (desktopDest === null || "undefined" === typeof(desktopDest)) return;