Changeset 1046
- Timestamp:
- 2008-08-20 14:20:49 (3 months ago)
- Files:
-
- trunk/chrome/content/dta/manager.js (modified) (2 diffs)
- trunk/chrome/content/dta/manager/prefs.js (modified) (2 diffs)
- trunk/chrome/content/preferences/advPane.xul (modified) (3 diffs)
- trunk/chrome/content/preferences/prefs.js (modified) (3 diffs)
- trunk/chrome/content/preferences/prefs.xul (modified) (2 diffs)
- trunk/chrome/locale/en-US/common.properties (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
r1045 r1046 84 84 const STREAMS_FREQ = 200; 85 85 86 const END_FIRST_SIZE = 2 * 1024 * 1024;87 88 86 let Prompts = {}; 89 87 Components.utils.import('resource://dta/prompts.jsm', Prompts); … … 1727 1725 } 1728 1726 1729 if (this.chunks.length == 1 && Prefs.loadEndFirst && this.chunks[0].remainder > 3 * END_FIRST_SIZE) {1727 if (this.chunks.length == 1 && !!Prefs.loadEndFirst && this.chunks[0].remainder > 3 * Prefs.loadEndFirst) { 1730 1728 // we should download the end first! 1731 1729 let c = this.chunks[0]; 1732 1730 let end = c.end; 1733 c.end -= END_FIRST_SIZE;1731 c.end -= Prefs.loadEndFirst; 1734 1732 downloadNewChunk(this, c.end + 1, end); 1735 1733 rv = true; trunk/chrome/content/dta/manager/prefs.js
r1045 r1046 61 61 ['confirmRemove', true], 62 62 ['permissions', 384], 63 ['loadEndFirst', false]63 ['loadEndFirst', 0] 64 64 ], 65 65 … … 138 138 this.tempLocation = null; 139 139 } 140 141 // Make this KB 142 this.loadEndFirst *= 1024; 143 140 144 if (!prefName || prefName == PREF_CONN) { 141 145 let conns = (this.maxInProgress * this.maxChunks) + 2; trunk/chrome/content/preferences/advPane.xul
r990 r1046 29 29 <preference id="dtarememberoneclick" name="extensions.dta.rememberoneclick" type="bool" /> 30 30 <preference id="dtaconfirmremove" name="extensions.dta.confirmremove" type="bool" /> 31 <preference id="dtapermissions" name="extensions.dta.permissions" type="int" /> 31 <preference id="dtapermissions" name="extensions.dta.permissions" type="int" /> 32 <preference id="dtaloadendfirst" name="extensions.dta.loadendfirst" type="int" /> 32 33 </preferences> 33 34 … … 37 38 <spacer flex="1"/> 38 39 <scale min="1" max="10" id="maxchunks" preference-editable="true" onchange="Advanced.changedMaxChunks();"/> 39 <label id="maxchunkslabel" style="min-width: 3em;" />40 <label id="maxchunkslabel" style="min-width: 6em;" /> 40 41 </groupbox> 41 42 … … 63 64 <checkbox label="&advancedpane.rememberoneclick.label;" preference="dtarememberoneclick"/> 64 65 <checkbox label="&advancedpane.confirmremove.label;" preference="dtaconfirmremove"/> 66 <hbox align="center"> 67 <label value="&advancedpane.loadendfirst.label;" id="loadendfirst"/> 68 <spacer flex="1"/> 69 <scale min="0" max="4096" id="loadendfirst" increment="4" pageincrement="16" preference-editable="true" onchange="Advanced.changedLoadEndFirst();"/> 70 <label id="loadendfirstlabel" style="min-width: 6em;" /> 71 </hbox> 72 65 73 </groupbox> 66 74 trunk/chrome/content/preferences/prefs.js
r1003 r1046 50 50 $('alert2').hidden = !('nsIAlertsService' in Ci); 51 51 52 // delay th is assignment, or else we get messed up by the slider c'tor52 // delay these assignments, or else we get messed up by the slider c'tor 53 53 $('maxtasks').setAttribute('preference', 'dtamaxtasks'); 54 54 $('dtamaxtasks').updateElements(); … … 121 121 }; 122 122 123 varAdvanced = {123 let Advanced = { 124 124 load: function() { 125 125 if (/win/i.test(navigator.platform)) { 126 126 $('advPermissions').hidden = true; 127 127 } 128 // delay th is assignment, or else we get messed up by the slider c'tor128 // delay these assignments, or else we get messed up by the slider c'tor 129 129 $('maxchunks').setAttribute('preference', 'dtamaxchunks'); 130 130 $('dtamaxchunks').updateElements(); 131 $('loadendfirst').setAttribute('preference', 'dtaloadendfirst'); 132 $('dtaloadendfirst').updateElements(); 131 133 }, 132 134 browse: function() { … … 155 157 }, 156 158 changedMaxChunks: function() { 159 let v = $('maxchunks').value; 157 160 $('maxchunkslabel').value = $('maxchunks').value; 161 if (v == '1') { 162 $('maxchunkslabel').value += ' / ' + _('disabled'); 163 } 164 }, 165 changedLoadEndFirst: function() { 166 let v = $('loadendfirst').value; 167 if (v == '0') { 168 $('loadendfirstlabel').value = _('disabled'); 169 } 170 else { 171 $('loadendfirstlabel').value = _('sizeKB', [$('loadendfirst').value]); 172 } 158 173 } 159 174 }; trunk/chrome/content/preferences/prefs.xul
r996 r1046 13 13 <?xml-stylesheet href="chrome://dta-platform/skin/preferences.css"?> 14 14 15 <!DOCTYPE window SYSTEM "chrome://dta/locale/prefpanes.dtd"> 15 <!DOCTYPE prefwindow [ 16 <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> 17 %globalDTD; 18 <!ENTITY % prefpanesDTD SYSTEM "chrome://dta/locale/prefpanes.dtd"> 19 %prefpanesDTD; 20 <!ENTITY % commonDTD SYSTEM "chrome://dta/locale/common.dtd"> 21 %commonDTD; 22 ]> 16 23 17 24 <prefwindow … … 28 35 style="&winstyle;" 29 36 > 37 <stringbundle id="stringB" src="chrome://dta/locale/common.properties" /> 30 38 <stringbundle id="stringB" src="chrome://dta/locale/prefpanes.properties" /> 31 39 trunk/chrome/locale/en-US/common.properties
r588 r1046 11 11 sizeGB=%S GB 12 12 sizeTB=%S TB 13 disabled=Disabled trunk/chrome/locale/en-US/prefpanes.dtd
r967 r1046 80 80 <!ENTITY advancedpane.permissions.read "May read"> 81 81 <!ENTITY advancedpane.permissions.write "May write"> 82 <!ENTITY advancedpane.loadendfirst.label "Load last few kilobytes first"> 82 83 83 84 <!ENTITY uipane.label "Interface"> trunk/defaults/preferences/dta.js
r1045 r1046 68 68 pref("extensions.dta.confirmremove", true); 69 69 pref("extensions.dta.permissions", 384); 70 pref("extensions.dta.loadendfirst", false);70 pref("extensions.dta.loadendfirst", 0); 71 71 72 72 // Seamonkey specific
