Changeset 1066
- Timestamp:
- 2008-09-08 09:13:45 (2 months ago)
- Files:
-
- trunk/chrome/content/dta/manager.js (modified) (2 diffs)
- trunk/chrome/content/dta/manager.xul (modified) (3 diffs)
- trunk/chrome/content/dta/manager/prefs.js (modified) (2 diffs)
- trunk/chrome/content/dta/manager/tray.js (added)
- trunk/chrome/content/preferences/interfacePane.xul (modified) (3 diffs)
- trunk/chrome/content/preferences/prefs.js (modified) (2 diffs)
- trunk/chrome/content/preferences/privacyPane.xul (modified) (1 diff)
- trunk/chrome/locale/en-US/manager.dtd (modified) (1 diff)
- trunk/chrome/locale/en-US/prefpanes.dtd (modified) (1 diff)
- trunk/defaults/preferences/dta.js (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/chrome/content/dta/manager.js
r1065 r1066 182 182 }, 183 183 184 start: function() { 184 openAdd: function D_openAdd() { 185 window.openDialog( 186 'chrome://dta/content/dta/addurl.xul', 187 '_blank', 188 'chrome, centerscreen, dialog=no, dependent=yes' 189 ); 190 }, 191 192 start: function D_start() { 185 193 if ("arguments" in window) { 186 194 startDownloads(window.arguments[0], window.arguments[1]); … … 2993 3001 2994 3002 addEventListener( 2995 " DOMContentLoaded",3003 "load", 2996 3004 function() { 2997 3005 if (Preferences.getExt('startminimized') && window.arguments && window.arguments.length != 0) { 2998 minimize(); 3006 setTimeout( 3007 function() { 3008 try { 3009 window.QueryInterface(Ci.nsIDOMChromeWindow).minimize(); 3010 } 3011 catch (ex) { 3012 } 3013 }, 3014 0 3015 ); 2999 3016 } 3000 3017 }, trunk/chrome/content/dta/manager.xul
r1059 r1066 36 36 37 37 <script type="application/javascript" src="chrome://dta/content/dta/manager.js" /> 38 <script type="application/javascript" src="chrome://dta/content/dta/manager/tooltip.js" /> 38 39 <script type="application/javascript" src="chrome://dta/content/dta/manager/tree.js" /> 40 <script type="application/javascript" src="chrome://dta/content/dta/manager/tray.js" /> 39 41 <script type="application/javascript" src="chrome://dta/content/dta/manager/prefs.js" /> 40 42 <script type="application/javascript" src="chrome://dta/content/dta/manager/sessionmanager.js" /> 41 <script type="application/javascript" src="chrome://dta/content/dta/manager/tooltip.js" />42 43 <script type="application/javascript" src="chrome://dta/content/dta/manager/filehandling.js" /> 43 44 <script type="application/javascript" src="chrome://dta/content/dta/manager/alertservice.js" /> … … 116 117 <grid id="canvasGrid"/> 117 118 </tooltip> 119 <menupopup id="traymenu"> 120 <menuitem label="&tooladd.label;" oncommand="Dialog.openAdd();"/> 121 <menuseparator/> 122 <menuitem label="&restore.label;" oncommand="TrayHandler.restore();"/> 123 <menuitem label="&close.label;" oncommand="window.close();"/> 124 </menupopup> 118 125 </popupset> 119 126 … … 123 130 <toolbar id="tools"> 124 131 <spacer/> 125 <toolbarbutton label="&tooladd.label;" id="tooladd" oncommand=" window.openDialog('chrome://dta/content/dta/addurl.xul','_blank','chrome, centerscreen, dialog=no, dependent=yes');" tooltiptext="&tooladd.tooltip;" />132 <toolbarbutton label="&tooladd.label;" id="tooladd" oncommand="Dialog.openAdd();" tooltiptext="&tooladd.tooltip;" /> 126 133 <spacer class="visible" /> 127 134 <toolbarbutton label="&resume.label;" id="toolplay" oncommand="Tree.resume();"/> trunk/chrome/content/dta/manager/prefs.js
r1046 r1066 61 61 ['confirmRemove', true], 62 62 ['permissions', 384], 63 ['loadEndFirst', 0] 63 ['loadEndFirst', 0], 64 ['minimizeToTray', false] 64 65 ], 65 66 … … 153 154 } 154 155 } 156 if (this.minimizeToTray) { 157 TrayHandler.watch(); 158 } 159 else { 160 TrayHandler.unwatch(); 161 } 155 162 }, 156 163 shutdown: function() { trunk/chrome/content/preferences/interfacePane.xul
r851 r1066 16 16 label="&uipane.label;" 17 17 helpURI="chrome://dta-help/content/help.rdf" 18 helpTopic="Preferences_UI" 18 helpTopic="Preferences_UI" 19 onpaneload="Interface.init();" 19 20 > 20 21 … … 27 28 <preference id="dtaTool" name="extensions.dta.toolsmenu" type="string" /> 28 29 <preference id="dtaShowTooltip" name="extensions.dta.showtooltip" type="bool" /> 30 <preference id="dtaStartMinimized" name="extensions.dta.startminimized" type="bool" /> 31 <preference id="dtaMinimizeToTray" name="extensions.dta.minimizetotray" type="bool" /> 29 32 </preferences> 30 33 … … 33 36 <checkbox label="&uipane.namesonly.label;" preference="dtaHideUrl" /> 34 37 <checkbox label="&uipane.showtooltip.label;" preference="dtaShowTooltip" /> 35 </groupbox> 38 </groupbox> 39 40 <groupbox> 41 <caption label="&uipane.window.caption;"/> 42 <checkbox label="&uipane.startminimized.label;" preference="dtaStartMinimized"/> 43 <hbox> 44 <checkbox flex="1" id="minimizetotray" label="&uipane.minimizetotray.label;" preference="dtaMinimizeToTray"/> 45 <label id="minimizetotray_link" value="Get MinTrayR" onclick="Interface.openMinTrayR();" hidden="true" class="link"/> 46 </hbox> 47 </groupbox> 36 48 37 49 <groupbox> trunk/chrome/content/preferences/prefs.js
r1046 r1066 175 175 176 176 var Interface = { 177 init: function(pref, which) { 178 if (!('trayITrayService' in Components.interfaces)) { 179 $('minimizetotray').disabled = true; 180 $('minimizetotray_link').hidden = false; 181 } 182 }, 177 183 getMenu: function(pref, which) { 178 184 let menu = $(pref).value.split(','); … … 183 189 menu[which] = $(pref + which).checked ? 1 : 0; 184 190 return menu.toString(); 191 }, 192 openMinTrayR: function() { 193 DTA_Mediator.openTab('http://tn123.ath.cx/mintrayr/?fromdta'); 185 194 } 186 195 }; trunk/chrome/content/preferences/privacyPane.xul
r990 r1066 78 78 <caption label="&privacypane.notice.caption;"/> 79 79 <description value="&privacypane.notice.desc;"/> 80 <label style="color: blue; text-decoration: underline;" value="&privacypane.privacynotice.label;" onclick="Privacy.showNotice();"/>80 <label class="link" value="&privacypane.privacynotice.label;" onclick="Privacy.showNotice();"/> 81 81 </groupbox> 82 82 </prefpane> trunk/chrome/locale/en-US/manager.dtd
r1015 r1066 45 45 <!ENTITY options.caption "Options"> 46 46 <!ENTITY loading.label "Loading..."> 47 48 <!ENTITY restore.label "Restore"> 49 <!ENTITY close.label "Close"> trunk/chrome/locale/en-US/prefpanes.dtd
r1046 r1066 93 93 <!ENTITY uipane.hide.label "Hide this menu"> 94 94 <!ENTITY uipane.showtooltip.label "Show download tooltips"> 95 <!ENTITY uipane.window.caption "Window"> 96 <!ENTITY uipane.startminimized.label "Start minimized"> 97 <!ENTITY uipane.minimizetotray.label "Minimize to system tray"> trunk/defaults/preferences/dta.js
r1046 r1066 69 69 pref("extensions.dta.permissions", 384); 70 70 pref("extensions.dta.loadendfirst", 0); 71 pref("extensions.dta.loadendfirst", 0); 72 pref("extensions.dta.startminimized", false); 73 pref("extensions.dta.minimizetotray", false); 71 74 72 // Seamonkeyspecific75 // Non-customizable-toolbar specific 73 76 pref("extensions.dta.sm.buttons", "1,1,0");
