Navigation

← Previous Changeset
Next Changeset →

Changeset 993

Timestamp:

07/27/08 01:34:30 (1 month ago)

Author:

MaierMan

Message:

* Modularize Prefs more
* No need for special multibyte handling
* (Fix Prompts/AuthPrompts in manager)

Files:

trunk/chrome/content/about/notice.xul (modified) (1 diff)
trunk/chrome/content/common/bindings.xml (modified) (4 diffs)
trunk/chrome/content/common/internalFunctions.js (modified) (1 diff)
trunk/chrome/content/common/overlayFunctions.js (modified) (4 diffs)
trunk/chrome/content/dta/addurl.js (modified) (2 diffs)
trunk/chrome/content/dta/manager.js (modified) (4 diffs)
trunk/chrome/content/dta/manager/metalinker.js (modified) (1 diff)
trunk/chrome/content/dta/manager/prefs.js (modified) (4 diffs)
trunk/chrome/content/dta/manager/tree.js (modified) (1 diff)
trunk/chrome/content/dta/select.js (modified) (4 diffs)
trunk/chrome/content/integration/elements.js (modified) (3 diffs)
trunk/chrome/content/integration/saveas.js (modified) (4 diffs)
trunk/chrome/content/integration/toolbarButtons.js (modified) (1 diff)
trunk/chrome/content/preferences/prefs.js (modified) (4 diffs)
trunk/components/debugService.js (modified) (1 diff)
trunk/components/migrationService.js (modified) (7 diffs)
trunk/modules/preferences.jsm (modified) (7 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/chrome/content/about/notice.xul

r991	r993
34	34	var version = params.GetString(0);
35	35	try {
36		Preferences.set~~DTA~~('version', version);
	36	Preferences.setExt('version', version);
37	37	}
38	38	catch (ex) {

trunk/chrome/content/common/bindings.xml

r961	r993
120	120	}
121	121	try {
122		return eval(DTA_preferences.get~~MultiByteDTA~~(this._pref, rv));
	122	return eval(DTA_preferences.getExt(this._pref, rv));
123	123	}
124	124	catch (ex) {
…	…
128	128	]]></getter>
129	129	</property>
130		<property name="_max" onget="return DTA_preferences.get~~DTA~~('history', 5);"/>
	130	<property name="_max" onget="return DTA_preferences.getExt('history', 5);"/>
131	131	<property name="inputField" onget="return this._list.inputField"/>
132	132	<property name="value" onget="return this._list.label">
…	…
183	183	}
184	184	try {
185		DTA_preferences.set~~MultiByteDTA~~(this._pref, outValues.toSource());
	185	DTA_preferences.setExt(this._pref, outValues.toSource());
186	186	}
187	187	catch (ex) {
…	…
192	192	<method name="clear">
193	193	<body>
194		DTA_preferences.reset~~DTA~~(this._pref);
	194	DTA_preferences.resetExt(this._pref);
195	195	</body>
196	196	</method>

trunk/chrome/content/common/internalFunctions.js

r961	r993
299	299	playSound: function(name) {
300	300	try {
301		if (Preferences.get~~DTA~~("sounds." + name, false)) {
	301	if (Preferences.getExt("sounds." + name, false)) {
302	302	new SoundFactory(("chrome://dta/skin/sounds/" + name + ".wav").toURI());
303	303	}

trunk/chrome/content/common/overlayFunctions.js

r991	r993
268	268
269	269	getDropDownValue : function(name) {
270		var values = eval(DTA_preferences.get~~MultiByteDTA~~(name, '[]'));
	270	var values = eval(DTA_preferences.getExt(name, '[]'));
271	271	return values.length ? values[0] : '';
272	272	},
…	…
281	281	}
282	282
283		var num = DTA_preferences.get~~DTA~~("counter", 0);
	283	var num = DTA_preferences.getExt("counter", 0);
284	284	if (++num > 999) {
285	285	num = 1;
286	286	}
287		DTA_preferences.set~~DTA~~("counter", num);
	287	DTA_preferences.setExt("counter", num);
288	288
289	289	for (var i = 0; i < urlsArray.length; i++) {
…	…
293	293	}
294	294
295		this.sendToDown(!DTA_preferences.get~~DTA~~("lastqueued", false), urlsArray);
	295	this.sendToDown(!DTA_preferences.getExt("lastqueued", false), urlsArray);
296	296	},
297	297
…	…
308	308	var links;
309	309	var type;
310		if (DTA_preferences.get~~DTA~~("seltab", 0)) {
	310	if (DTA_preferences.getExt("seltab", 0)) {
311	311	links = images;
312	312	type = 2;

trunk/chrome/content/dta/addurl.js

r986	r993
425	425	}
426	426
427		var num = Preferences.get~~DTA~~("counter", 0);
	427	var num = Preferences.getExt("counter", 0);
428	428	if (++num > 999) {
429	429	num = 1;
…	…
467	467	DTA_AddingFunctions.sendToDown(start, batch);
468	468
469		Preferences.set~~DTA~~("counter", num);
470		Preferences.set~~DTA~~("lastqueued", !start);
	469	Preferences.setExt("counter", num);
	470	Preferences.setExt("lastqueued", !start);
471	471
472	472	['ddRenaming', 'ddDirectory'].forEach(function(e) { Dialog[e].save(); });

trunk/chrome/content/dta/manager.js

r986	r993
496	496	},
497	497	_cleanTmpDir: function D__cleanTmpDir() {
498		if (!Prefs.tempLocation \|\| Preferences.get~~MultiByteDTA~~("tempLocation", '') != '') {
	498	if (!Prefs.tempLocation \|\| Preferences.getExt("tempLocation", '') != '') {
499	499	// cannot perform this action if we don't use a temp file
500	500	// there might be far too many directories containing far too many tmpFiles.
…	…
1891	1891	}
1892	1892
1893		~~var~~ Prompts = {
	1893	let AuthPrompts = {
1894	1894	_authPrompter: null,
1895	1895	_prompter: null,
…	…
2017	2017	}
2018	2018	if (iid.equals(Ci.nsIAuthPrompt)) {
2019		return Prompts.authPrompter;
	2019	return AuthPrompts.authPrompter;
2020	2020	}
2021	2021	if (iid.equals(Ci.nsIPrompt)) {
2022		return Prompts.prompter;
	2022	return AuthPrompts.prompter;
2023	2023	}
2024	2024	// for 1.9
2025	2025	/* this one makes minefield ask for the password again and again :p
2026	2026	if ('nsIAuthPromptProvider' in Ci && iid.equals(Ci.nsIAuthPromptProvider)) {
2027		return Prompts.prompter.QueryInterface(Ci.nsIAuthPromptProvider);
	2027	return AuthPrompts.prompter.QueryInterface(Ci.nsIAuthPromptProvider);
2028	2028	}*/
2029	2029	// for 1.9
2030	2030	if ('nsIAuthPrompt2' in Ci && iid.equals(Ci.nsIAuthPrompt2)) {
2031		return Prompts.authPrompter.QueryInterface(Ci.nsIAuthPrompt2);
	2031	return AuthPrompts.authPrompter.QueryInterface(Ci.nsIAuthPrompt2);
2032	2032	}
2033	2033	try {
…	…
2735	2735	}
2736	2736	if (type == 2) {
2737		Preferences.set~~DTA~~('conflictresolution', option);
	2737	Preferences.setExt('conflictresolution', option);
2738	2738	}
2739	2739	this._return(option);

trunk/chrome/content/dta/manager/metalinker.js

r959	r993
131	131	}
132	132
133		var aNum = Preferences.get~~DTA~~('numistance', 0);
	133	var aNum = Preferences.getExt('numistance', 0);
134	134	if (++aNum > 999) {
135	135	aNum = 1;
136	136	}
137		Preferences.set~~DTA~~('numistance', aNum);
	137	Preferences.setExt('numistance', aNum);
138	138
139	139

trunk/chrome/content/dta/manager/prefs.js

r970	r993
99	99	def = e[1];
100	100	}
101		this[key] = Preferences.get~~DTA~~(pref, def);
	101	this[key] = Preferences.getExt(pref, def);
102	102	}
103	103
…	…
114	114	this.dirPermissions = perms;
115	115
116		if (Preferences.get~~DTA~~("saveTemp", true)) {
	116	if (Preferences.getExt("saveTemp", true)) {
117	117	try {
118		this.tempLocation = Preferences.get~~MultiByteDTA~~("tempLocation", '');
	118	this.tempLocation = Preferences.getExt("tempLocation", '');
119	119	if (this.tempLocation == '') {
120	120	// #44: generate a default tmp dir on per-profile basis
…	…
142	142
143	143	if (conns != cur) {
144		Preferences.set~~DTA~~(PREF_CONN, cur);
	144	Preferences.setExt(PREF_CONN, cur);
145	145	}
146	146	if (conns > cur) {
…	…
155	155	},
156	156	_resetConnPrefs: function() {
157		let conn = Preferences.get~~DTA~~(PREF_CONN, 0);
	157	let conn = Preferences.getExt(PREF_CONN, 0);
158	158	if (conn) {
159	159	Preferences.set(PREF_CONN, conn);
160		Preferences.set~~DTA~~(PREF_CONN, 0);
	160	Preferences.setExt(PREF_CONN, 0);
161	161	}
162	162	}

trunk/chrome/content/dta/manager/tree.js

r989	r993
288	288	let res = Prompts.confirm(window, _('removetitle'), _('removequestion'), Prompts.YES, Prompts.NO, null, 0, false, _('removecheck'));
289	289	if (res.checked) {
290		Preferences.set~~DTA~~('confirmremove', false);
	290	Preferences.setExt('confirmremove', false);
291	291	}
292	292	if (res.button) {

trunk/chrome/content/dta/select.js

r983	r993
343	343
344	344	// changeTab will initialize the filters and do the selection for us
345		this.changeTab(Preferences.get~~DTA~~("seltab", 0) ? 'images': 'links');
	345	this.changeTab(Preferences.getExt("seltab", 0) ? 'images': 'links');
346	346
347	347	$("urlList").addEventListener(
…	…
403	403	var dir = this.ddDirectory.value;
404	404	var mask = this.ddRenaming.value;
405		var counter = Preferences.get~~DTA~~("counter", 1);
	405	var counter = Preferences.getExt("counter", 1);
406	406	if (++counter > 999) {
407	407	counter = 1;
…	…
442	442
443	443	// save the counter, queued state
444		Preferences.set~~DTA~~("counter", counter);
445		Preferences.set~~DTA~~("lastqueued", !start);
	444	Preferences.setExt("counter", counter);
	445	Preferences.setExt("lastqueued", !start);
446	446
447	447	let boxen = this.boxen;
…	…
632	632	var type = this.current.type;
633	633	if (type == 1) {
634		Preferences.set~~DTA~~('seltab', 0);
	634	Preferences.setExt('seltab', 0);
635	635	$("viewlinks").setAttribute("selected", true);
636	636	$("viewpics").setAttribute("selected", false);
637	637	}
638	638	else {
639		Preferences.set~~DTA~~('seltab', 1);
	639	Preferences.setExt('seltab', 1);
640	640	$("viewlinks").setAttribute("selected", false);
641	641	$("viewpics").setAttribute("selected", true);

trunk/chrome/content/integration/elements.js

r989	r993
251	251	findLinks: function(turbo, all) {
252	252	try {
253		if (all == undefined && turbo && DTA_preferences.get~~DTA~~('rememberoneclick', false)) {
254		all = DTA_preferences.get~~DTA~~('lastalltabs', false);
	253	if (all == undefined && turbo && DTA_preferences.getExt('rememberoneclick', false)) {
	254	all = DTA_preferences.getExt('lastalltabs', false);
255	255	}
256	256	if (turbo && all != undefined) {
257		DTA_preferences.set~~DTA~~('lastalltabs', all);
	257	DTA_preferences.setExt('lastalltabs', all);
258	258	}
259	259
…	…
530	530	var ctx = this.contextMenu;
531	531	// get settings
532		var items = DTA_preferences.get~~DTA~~("ctxmenu", "1,1,0").split(",").map(function(e){return parseInt(e);});
533		var compact = DTA_preferences.get~~DTA~~("ctxcompact", false);
	532	var items = DTA_preferences.getExt("ctxmenu", "1,1,0").split(",").map(function(e){return parseInt(e);});
	533	var compact = DTA_preferences.getExt("ctxcompact", false);
534	534
535	535	var menu;
…	…
639	639
640	640	// get settings
641		var menu = DTA_preferences.get~~DTA~~("toolsmenu", "1,1,1").split(",").map(function(e){return parseInt(e);});
	641	var menu = DTA_preferences.getExt("toolsmenu", "1,1,1").split(",").map(function(e){return parseInt(e);});
642	642
643	643	// all hidden...
644		var hidden = DTA_preferences.get~~DTA~~("toolshidden", false);
	644	var hidden = DTA_preferences.getExt("toolshidden", false);
645	645	for (var i in this.tools) {
646	646	this.tools[i].hidden = hidden;

trunk/chrome/content/integration/saveas.js

r980	r993
43	43	var normalBox = document.getElementById('normalBox');
44	44	const doRevert = basicBox && (!basicBox.collapsed \|\| (normalBox && normalBox.collapsed));
45		const doOverlay = DTA_preferences.get~~DTA~~("downloadWin", true);
	45	const doOverlay = DTA_preferences.getExt("downloadWin", true);
46	46	if (
47	47	!doOverlay
…	…
88	88
89	89	try {
90		switch (DTA_preferences.get~~DTA~~('saveasmode', 0)) {
	90	switch (DTA_preferences.getExt('saveasmode', 0)) {
91	91	case 1:
92	92	this.mode.selectedItem = this.normal;
…	…
96	96	break;
97	97	}
98		if (DTA_preferences.get~~DTA~~('saveasmode', 0)) {
	98	if (DTA_preferences.getExt('saveasmode', 0)) {
99	99	this.remember.checked = true;
100	100	this.remember.disabled = false;
…	…
183	183	if (mode == this.normal \|\| mode == this.turbo) {
184	184	if (this.remember.checked) {
185		DTA_preferences.set~~DTA~~("saveasmode", mode == this.normal ? 1 : 2);
	185	DTA_preferences.setExt("saveasmode", mode == this.normal ? 1 : 2);
186	186	}
187	187	else {
188		DTA_preferences.set~~DTA~~("saveasmode", 0);
	188	DTA_preferences.setExt("saveasmode", 0);
189	189	}
190	190	this.download(mode == this.turbo);
191	191	return false;
192	192	}
193		DTA_preferences.set~~DTA~~("saveasmode", 0);
	193	DTA_preferences.setExt("saveasmode", 0);
194	194	return true;
195	195	},

trunk/chrome/content/integration/toolbarButtons.js

r707	r993
52	52	_refresh: function() {
53	53	DTA_preferences
54		.get~~DTA~~('sm.buttons')
	54	.getExt('sm.buttons')
55	55	.split(',')
56	56	.forEach(

trunk/chrome/content/preferences/prefs.js

r991	r993
66	66	.forEach(function(e) { e.disabled = log; });
67	67
68		var history = uneval(Preferences.get~~DTA~~("filter", ''));
	68	var history = uneval(Preferences.getExt("filter", ''));
69	69	history = !history \|\| !history.length;
70	70	$("butFiltDel").disabled = history;
71	71
72		history = uneval(Preferences.get~~DTA~~("directory", ''));
	72	history = uneval(Preferences.getExt("directory", ''));
73	73	history = !history \|\| !history.length;
74	74	$("butFoldDel").disabled = history;
…	…
86	86	},
87	87	delFilters: function() {
88		Preferences.reset~~DTA~~("filter");
	88	Preferences.resetExt("filter");
89	89	},
90	90	delDirectories: function() {
91		Preferences.reset~~DTA~~("directory");
	91	Preferences.resetExt("directory");
92	92	},
93	93	showLog: function() {
…	…
136	136	return;
137	137	}
138		var f = Utils.askForDir(Preferences.get~~MultiByteDTA~~("tempLocation", tmp.value), "");
	138	var f = Utils.askForDir(Preferences.getExt("tempLocation", tmp.value), "");
139	139	if (!f) {
140	140	return;
141	141	}
142	142	$("temp").value = f;
143		Preferences.set~~MultiByteDTA~~("tempLocation", f);
	143	Preferences.setExt("tempLocation", f);
144	144	$("temp").focus();
145	145	},
…	…
431	431	}
432	432	try {
433		Preferences.resetAll~~DTA~~();
	433	Preferences.resetAllExt();
434	434	} catch(ex) {
435	435	// XXX

trunk/components/debugService.js

r985	r993
90	90	_log: function DS__log(msg, exception) {
91	91	try {
92		if (~~msg == "" && typeof(exception) != "object"~~) {
	92	if (!msg \|\| (msg == "" && typeof(exception) != "object")) {
93	93	return;
94	94	}

trunk/components/migrationService.js

r991	r993
63	63	.getService(Ci.nsIVersionComparator);
64	64
65		var lastVersion = Preferences.get~~DTA~~('version', '0');
	65	var lastVersion = Preferences.getExt('version', '0');
66	66	if (0 == vc.compare(DTA.VERSION, lastVersion)) {
67	67	return;
…	…
91	91	debug("MigrationManager:", ex);
92	92	try {
93		Preferences.reset~~DTA~~("version");
	93	Preferences.resetExt("version");
94	94	}
95	95	catch (ex) {
…	…
136	136	for each (let [oldName, newName, defaultValue] in toMigrate) {
137	137	try {
138		let nv = Preferences.get~~DTA~~(newName, defaultValue);
139		let ov = Preferences.get~~DTA~~(oldName, nv);
	138	let nv = Preferences.getExt(newName, defaultValue);
	139	let ov = Preferences.getExt(oldName, nv);
140	140	if (ov != nv) {
141		Preferences.set~~DTA~~(newName, ov);
	141	Preferences.setExt(newName, ov);
142	142	}
143	143	Preferences.reset(oldName);
…	…
183	183	var name = 'context.' + children[i].slice(0, -8);
184	184	try {
185		var reg = Preferences.get~~MultiByteDTA~~(name + '.filter', '');
	185	var reg = Preferences.getExt(name + '.filter', '');
186	186	if (-1 != defFilters.indexOf(reg) \|\| !reg.length) {
187	187	continue;
188	188	}
189		var label = Preferences.get~~MultiByteDTA~~(name + '.caption', 'imported');
190		var active = Preferences.get~~DTA~~(name + '.checked', false);
	189	var label = Preferences.getExt(name + '.caption', 'imported');
	190	var active = Preferences.getExt(name + '.checked', false);
191	191	var type = 0;
192		if (Preferences.get~~DTA~~(name + '.isImageFilter', false)) {
	192	if (Preferences.getExt(name + '.isImageFilter', false)) {
193	193	type \|= IMAGE_FILTER;
194	194	}
195		if (Preferences.get~~DTA~~(name + '.isLinkFilter', false)) {
	195	if (Preferences.getExt(name + '.isLinkFilter', false)) {
196	196	type \|= LINK_FILTER;
197	197	}
…	…
209	209	for each (let e in ['renaming', 'filter', 'directory']) {
210	210	try {
211		Preferences.reset~~DTA~~(e);
	211	Preferences.resetExt(e);
212	212	}
213	213	catch (ex) {
…	…
215	215	}
216	216	try {
217		let cv = Preferences.get~~MultiByteDTA~~('dropdown.' + e + '-history', null);
	217	let cv = Preferences.getExt('dropdown.' + e + '-history', null);
218	218	if (cv == null) {
219	219	return;
220	220	}
221	221	cv = cv.split('\|@\|');
222		Preferences.set~~MultiByteDTA~~(e, cv.toSource());
	222	Preferences.setExt(e, cv.toSource());
223	223	}
224	224	catch (ex) {
…	…
231	231	_migrateRemove: function MM_migrateRemove() {
232	232	for each (let e in ['context.', 'tool.', 'dropdown.', 'windows.', 'rename.']) {
233		Preferences.resetBranch~~DTA~~(e);
	233	Preferences.resetBranchExt(e);
234	234	}
235	235	},

trunk/modules/preferences.jsm

r991	r993
37	37	const EXPORTED_SYMBOLS = [
38	38	'get',
39		'getDTA',
40		'getMultiByte',
41		'getMultiByteDTA',
	39	'getExt',
42	40	'set',
43		'setDTA',
44		'setMultiByte',
45		'setMultiByteDTA',
	41	'setExt',
	42	'hasUserValue',
	43	'hasUserValueExt',
	44	'getChildren',
	45	'getChildrenExt',
46	46	'reset',
47		'reset~~DTA~~',
	47	'resetExt',
48	48	'resetBranch',
49		'resetBranch~~DTA~~',
50		'resetAll~~DTA~~',
	49	'resetBranchExt',
	50	'resetAllExt',
51	51	'addObserver',
52	52	'removeObserver'
53	53	];
	54
	55	const EXT = 'extensions.dta.';
54	56
55	57	const Cc = Components.classes;
…	…
91	93	}
92	94
93		function get~~DTA~~(key, defaultValue) {
94		return get(~~'extensions.dta.'~~ + key, defaultValue);
	95	function getExt(key, defaultValue) {
	96	return get(EXT + key, defaultValue);
95	97	}
96	98
…	…
105	107	}
106	108
107		function set~~DTA~~(key, value){
108		return set(~~'extensions.dta.'~~ + key, value);
	109	function setExt(key, value){
	110	return set(EXT + key, value);
109	111	}
110	112
…	…
119	121	}
120	122
121		~~function getMultiByteDTA(key, defaultValue){~~
122		~~return getMultiByte('extensions.dta.' + key, defaultValue);~~
123		}
124
125	123	function setMultiByte(key, value) {
126	124	let str = new SupportsString();
…	…
129	127	}
130	128
131		function setMultiByteDTA(key, value) {
132		setMultiByte('extensions.dta.' + key, value);
	129	function hasUserValue(key) {
	130	try {
	131	return prefs.prefHasUserValue(key);
	132	}
	133	catch (ex) {
	134	// no-op
	135	}
	136	return false;
	137	}
	138
	139	function hasUserValueExt(key) {
	140	return hasUserValue(EXT + key);
	141	}
	142
	143	function getChildren(key) {
	144	return prefs.getChildList(key, {});
	145	}
	146
	147	function getChildrenExt(key) {
	148	return getChildren(EXT + key);
133	149	}
134	150
…	…
144	160
145	161
146		function reset~~DTA~~(key) {
147		if (key.search(~~/^extensions\.dta\./~~) != 0) {
148		key = ~~'extensions.dta.'~~ + key;
	162	function resetExt(key) {
	163	if (key.search(new RegExp('/^' + EXT + '/')) != 0) {
	164	key = EXT + key;
149	165	}
150	166	return reset(key);
…	…
165	181	}
166	182
167		function resetBranch~~DTA~~(branch) {
	183	function resetBranchExt(branch) {
168	184	resetBranch('extension.dta.' + branch);
169	185	}
170	186
171		function resetAll~~DTA~~() {
172		resetBranch~~DTA~~('');
	187	function resetAllExt() {
	188	resetBranchExt('');
173	189	}
174	190

Navigation

Changeset 993

Legend:

Download in other formats: