Changeset 483
- Timestamp:
- 2007-07-07 20:30:53 (2 years ago)
- Files:
-
- trunk/chrome/content/dta/manager.js (modified) (1 diff)
- trunk/chrome/content/dta/manager/conflicts.xul (modified) (1 diff)
- trunk/chrome/content/preferences/mainPane.xul (modified) (1 diff)
- trunk/components/dtaprotocol.js (deleted)
- trunk/defaults/preferences/dta.js (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/chrome/content/dta/manager.js
r482 r483 2225 2225 } 2226 2226 if (type == 2) { 2227 Preferences.setDTA(' existing', option);2227 Preferences.setDTA('conflictresolution', option); 2228 2228 } 2229 2229 this._return(option); trunk/chrome/content/dta/manager/conflicts.xul
r482 r483 59 59 60 60 <radiogroup id="choice" style="margin-left: 10px; margin-bottom: 10px;" > 61 <radio id="s1" persist="selected" crop="right"/>61 <radio id="s1" persist="selected"/> 62 62 <radio id="s2" persist="selected" label="&overwrite.label;"/> 63 63 <radio id="s3" persist="selected" label="&skip.label;"/> trunk/chrome/content/preferences/mainPane.xul
r395 r483 20 20 21 21 <preferences> 22 <preference id="dtaexisting" name="extensions.dta. existing" type="int"/>22 <preference id="dtaexisting" name="extensions.dta.conflictresolution" type="int"/> 23 23 <preference id="dtantask" name="extensions.dta.ntask" type="int"/> 24 24 <preference id="dtaalert" name="extensions.dta.alertbox" type="int"/> trunk/defaults/preferences/dta.js
r464 r483 42 42 pref("extensions.dta.saveTemp", true); 43 43 pref("extensions.dta.downloadWin", true); 44 pref("extensions.dta. existing", 3);44 pref("extensions.dta.conflictresolution", 3); 45 45 pref("extensions.dta.ntask", 4); 46 46 pref("extensions.dta.timeout", 300);
