diff --git a/suite/common/pref/pref-advanced.xul b/suite/common/pref/pref-advanced.xul index ba03fbcf68f..22c2dbfe0e2 100644 --- a/suite/common/pref/pref-advanced.xul +++ b/suite/common/pref/pref-advanced.xul @@ -21,115 +21,77 @@ --> - + onload="if( parent.handle ) parent.handle.onpageload( 'pref-advanced' ); else parent.queuedTag = 'pref-advanced';"> - - - - + + - + - - - + - - - &autoLoadImgCheck.label; - + + + &autoLoadImgCheck.label; + - - + + &enbJavaCheck.label; - - + + &enbJsCheck.label; - - + + &enbJsCheck.labelforMailNNews; - - + + &enbCssCheck.label; - - + + &sendAddFtpCheck.label; - - + + &remSignCheck.label; - - - - - - - - &server.label; - - - - - - - - - - - &cookies; - - - - - &accAllCookiesRadio.label; - - - - - - &accpOrgCookiesRadio.label; - - - - - - &disCookRadio.label; - - - - - - &warnCookCheck.label; - - - - diff --git a/suite/common/pref/pref-appearance.xul b/suite/common/pref/pref-appearance.xul index b0f3d940558..345ce83168f 100644 --- a/suite/common/pref/pref-appearance.xul +++ b/suite/common/pref/pref-appearance.xul @@ -25,75 +25,76 @@ - + align="vertical" + onload="if( parent.handle ) parent.handle.onpageload( 'pref-appearance' ); else parent.queuedTag = 'pref-appearance';"> - - - - - - - + + + + + &onStartLegend.label; + + + + &navCheck.label; + + + + + + &mesCheck.label; + + + + + + &compCheck.label; + + + + + + &calCheck.label; + + + - - - &onStartLegend.label; - - - - - &navCheck.label; - - - - - - &mesCheck.label; - - - - - - &compCheck.label; - - - - - - &calCheck.label; - - - - - - - - &showToolsLegend.label; - - - - - &picsNtextRadio.label; - - - - - - &picsOnlyRadio.label; - - - - - - &textonlyRadio.label; - - - + + &showToolsLegend.label; + + + + &picsNtextRadio.label; + + + + + + &picsOnlyRadio.label; + + + + + + &textonlyRadio.label; + + + + diff --git a/suite/common/pref/pref-applications.xul b/suite/common/pref/pref-applications.xul index 3c701999958..5ff96e235d0 100644 --- a/suite/common/pref/pref-applications.xul +++ b/suite/common/pref/pref-applications.xul @@ -26,46 +26,44 @@ + title="&window.title;" align="vertical" + onload="if( parent.handle ) parent.handle.onpageload( 'pref-applications' ); else parent.queuedTag = 'pref-applications';"> - - - - - - + + + + + + - - - &descript; - - - - - - &aimLaunchSelect.label; - - - - - - - - - - - - - - &file; - - &exten; - &mimeType; - &handle; - + + &descript; + + + &aimLaunchSelect.label; + + + + + + + + + + + &file; + &exten; + &mimeType; + &handle; + diff --git a/suite/common/pref/pref-cache.js b/suite/common/pref/pref-cache.js new file mode 100644 index 00000000000..15d65cc7e16 --- /dev/null +++ b/suite/common/pref/pref-cache.js @@ -0,0 +1,9 @@ + +function prefCacheSelectFolder() +{ + bundle = srGetStrBundle("chrome://pref/locale/prefutilities.properties"); + var folderField = document.getElementById("browserCacheDirectory"); + var url = getFileOrFolderURL( bundle.GetStringFromName("cachefolder"), true ); + if( url != -1 ) + folderField.value = url; +} \ No newline at end of file diff --git a/suite/common/pref/pref-cache.xul b/suite/common/pref/pref-cache.xul index 2fecbd9c2b6..267a0ca562d 100644 --- a/suite/common/pref/pref-cache.xul +++ b/suite/common/pref/pref-cache.xul @@ -20,96 +20,103 @@ Contributor(s): --> - - + + align="vertical" title="&title.label;" + onload="if( parent.handle ) parent.handle.onpageload( 'pref-cache' ); else parent.queuedTag = 'pref-cache';"> - + + + - - + + - - - - &cachePara; - - - - - - - &memCache; - - - - - &kbyes; - - - - - - - - - -&diskCache; - - - - - - &kbyes; - - - - - - - - - - - &diskCacheFolder; - - - + + + &cachePara; + + + + + + &memCache; + + + + &diskCache; + + + + &diskCacheFolder; + + + + + + + + &kbyes; + + + + + + + + &kbyes; + + + + + + + + + + + + + + + + + + + &docCache; + + + + &oncePsessionRadio.label; + + + + + &everyTimeRadio.label; + + + + + + &neverRadio.label; + + - - - - &docCache; - - - - &oncePsessionRadio.label; - - - - - - &everyTimeRadio.label; - - - - - - &neverRadio.label; - - - + diff --git a/suite/common/pref/pref-colors.xul b/suite/common/pref/pref-colors.xul index 8b40b0f69dd..b3ea5316292 100644 --- a/suite/common/pref/pref-colors.xul +++ b/suite/common/pref/pref-colors.xul @@ -25,97 +25,106 @@ + title="&window.title;" align="vertical" + onload="if( parent.handle ) parent.handle.onpageload( 'pref-colors' ); else parent.queuedTag = 'pref-colors'; InitColors();"> - + - - - - + + + + - - - - &color; - - - - - - - - - - - - - - - - - - - - - - - - - - &useWinColorsCheck.label; - - - + + &color; + + &text; + + + + + + + + + + + + &background; + + + + + + + + + + + + + + + &useWinColorsCheck.label; + + + - - &links; - - - - - - - - - - - - - - - - - - - - - - &underLinksCheck.label; - - - - - + &links; + + &unvisit; + + + + + + + + + + + + + &visit; + + + + + + + + + + + + + + + &underLinksCheck.label; + + + + - - - - + + &someProvColors; - &someProvColors; - - - - - &alwaysOverCheck.label; - + + + &alwaysOverCheck.label; + diff --git a/suite/common/pref/pref-cookies.xul b/suite/common/pref/pref-cookies.xul new file mode 100644 index 00000000000..ce0eb1396fb --- /dev/null +++ b/suite/common/pref/pref-cookies.xul @@ -0,0 +1,110 @@ + + + + + + + + + + + function viewCookies() + { + window.openDialog("chrome://wallet/content/CookieViewer.xul","","chrome, resizable=no"); + } + + + + + + + + + + + &cookies; + + + + + + &cookieDetails; + + + + + + + + + + + &accAllCookiesRadio.label; + + + + + + + + + + &accpOrgCookiesRadio.label; + + + + + + + + + + &disCookRadio.label; + + + + + + + + + &warnCookCheck.label; + + + + + + + + + + + + + diff --git a/suite/common/pref/pref-debug.xul b/suite/common/pref/pref-debug.xul index 9822b7077ac..d164e0acfb1 100644 --- a/suite/common/pref/pref-debug.xul +++ b/suite/common/pref/pref-debug.xul @@ -20,123 +20,134 @@ Contributor(s): --> - + + align="vertical" title="&window.title;" + onload="if( parent.handle ) parent.handle.onpageload( 'pref-debug' ); else parent.queuedTag = 'pref-debug';"> - - + + - + + + + + + &widgetRendering.label; + + + + + &nativeWidgets.label; + + + + + + &partialGfxWidgets.label; + + + + + + &gfxWidgets.label; + + + - - - - - &widgetRendering.label; - - - - - &gfxScrollbars.label; - - - - - - &debugWindow.label; - - + + + + &gfxScrollbars.label; + + - - + + - - - - - &debugEventDebugging.label; - - - - - &debugPaintFlashing.label; - - + + + + &debugEventDebugging.label; + + + + &debugPaintFlashing.label; + + - - - - &debugPaintDumping.label; - - + + + + &debugPaintDumping.label; + + - - - - &debugInvalidateDumping.label; - - + + + + &debugInvalidateDumping.label; + + - - - - &debugEventDumping.label; - - + + + + &debugEventDumping.label; + + - - - - &debugMotionEventDumping.label; - - + + + + &debugMotionEventDumping.label; + + + + + + + &debugCrossingEventDumping.label; + + - - - - &debugCrossingEventDumping.label; - - + + - - - - - - - &debugMiscellaneous.label; - - - - - &debugDisableXULCache.label; - - - - - - - &debugEnableMemCache.label; - - - - - - - &debugEnableXPCOMRefcntLog.label; - - + + + &debugMiscellaneous.label; + + + + &debugDisableXULCache.label; + + + + &debugEnableXPCOMRefcntLog.label; + + - + + diff --git a/suite/common/pref/pref-download.xul b/suite/common/pref/pref-download.xul index 493518b5605..c3dac07c7ad 100644 --- a/suite/common/pref/pref-download.xul +++ b/suite/common/pref/pref-download.xul @@ -20,16 +20,17 @@ Contributor(s): --> + - + + align="vertical" title="&title.label;" + onload="if( parent.handle ) parent.handle.onpageload( 'pref-download' ); else parent.queuedTag = 'pref-download';"> - @@ -42,24 +43,28 @@ &newmes; - - + + &downOnlyCheck; - - + + &downDateCheck; - - + + &fromRadio.label; - + &yesterday.select; &oneW.select; &twoW.select; @@ -69,11 +74,14 @@ - - + + &sinceRadio.label; - &daysAgo; + + &daysAgo; diff --git a/suite/common/pref/pref-fonts.xul b/suite/common/pref/pref-fonts.xul index a25d1307a72..33118f80cf2 100644 --- a/suite/common/pref/pref-fonts.xul +++ b/suite/common/pref/pref-fonts.xul @@ -21,15 +21,13 @@ Contributor(s): --> - + title="&window.title;" align="vertical" + onload="if( parent.handle ) parent.handle.onpageload( 'pref-fonts' ); else parent.queuedTag = 'pref-fonts';"> @@ -67,8 +65,11 @@ - - &encod1.option; + + Font + Foo + Bar @@ -112,26 +113,28 @@ &header2; - - + + &useDefaultFont; - - + + &useDocFontNonDynamic; - + &useDocFontDynamic; - - + title="&title.label;" + align="vertical" + onload="if( parent.handle ) parent.handle.onpageload( 'pref-offline' ); else parent.queuedTag = 'pref-offline';"> - - - + + - + - - - - &header1; - - - - - &prevRadio.label; - &communRemember; - - - - - - &askOfflineRadio.label; - &offlineStartAskEach; - - - - - - - - - - - &header2; - - - - - - &unsentAskRadio.label; - - - - - - &unsentAutoRadio.label; - - - - - - &unsentDoNotRadio.label; - - - - - - - - - - - - &header3; - - - - - &promptSynchCheck.label; - - - - - + + &descipt1; + + + + + + &prevRadio.label; + + + + + + &askOfflineRadio.label; + + + + + &header2; + + + + + &unsentAskRadio.label; + + + + + + &unsentAutoRadio.label; + + + + + + &unsentDoNotRadio.label; + + + + &header3; + + + + + &promptSynchCheck.label; + + diff --git a/suite/common/pref/pref-proxies.js b/suite/common/pref/pref-proxies.js new file mode 100644 index 00000000000..ee9f2814299 --- /dev/null +++ b/suite/common/pref/pref-proxies.js @@ -0,0 +1,14 @@ +function showManualProxyConfig() +{ + var manualRow = document.getElementById("manual-proxy"); + bundle = srGetStrBundle("chrome://pref/locale/prefutilities.properties"); + var viewHideButton = document.getElementById("viewhideManual"); + if( manualRow.style.display == "none" ) { + viewHideButton.value = bundle.GetStringFromName("hiderow"); + manualRow.style.display = "inherit"; + } + else { + viewHideButton.value = bundle.GetStringFromName("viewrow"); + manualRow.style.display = "none" + } +} \ No newline at end of file diff --git a/suite/common/pref/pref-proxies.xul b/suite/common/pref/pref-proxies.xul index 602a5a72a1c..56f14305a37 100644 --- a/suite/common/pref/pref-proxies.xul +++ b/suite/common/pref/pref-proxies.xul @@ -24,141 +24,131 @@ + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + class="dialog" title="Sample Prefs Panel" + align="vertical" + onload="if( parent.handle ) parent.handle.onpageload( 'pref-proxies' ); else parent.queuedTag = 'pref-proxies';"> - - - - + + + + + + - + - - - - - - - - &directTypeRadio.label; - - - - - - &manualTypeRadio.label; - - - - - - - - - &autoTypeRadio.label; - - - - - &configAutoconfigText.label; - - - - - diff --git a/suite/common/pref/pref-search.xul b/suite/common/pref/pref-search.xul index 0d58c67fe65..2a2aa98c8fe 100755 --- a/suite/common/pref/pref-search.xul +++ b/suite/common/pref/pref-search.xul @@ -26,14 +26,13 @@ + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + onload="if( parent.handle ) parent.handle.onpageload( 'pref-colors' ); else parent.queuedTag = 'pref-colors'; InitSingleEngineList(); " title="&title.label;" + align="vertical"> - - + @@ -47,8 +46,9 @@ - - + + &browserSearchButtonText.label; @@ -72,16 +72,18 @@ - - + + &enablePowerSearch.label; - - + + &openSidebarSearchPanel.label; diff --git a/suite/common/pref/pref-smart_browsing.xul b/suite/common/pref/pref-smart_browsing.xul index fadbd550813..815aa7453db 100644 --- a/suite/common/pref/pref-smart_browsing.xul +++ b/suite/common/pref/pref-smart_browsing.xul @@ -26,11 +26,9 @@ - - + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + title="&title.label;" align="vertical" + onload="if( parent.handle ) parent.handle.onpageload( 'pref-smart_browsing' ); else parent.queuedTag = 'pref-smart_browsing';"> @@ -44,38 +42,42 @@ &lHeader; - &doNotDecp.label; - + + @@ -86,8 +88,9 @@ &internetKeywordsHeader.label; - - + + &enableKeyCheck.label; diff --git a/suite/common/pref/pref-smartupdate.xul b/suite/common/pref/pref-smartupdate.xul index 16db79e12b8..27099af737e 100644 --- a/suite/common/pref/pref-smartupdate.xul +++ b/suite/common/pref/pref-smartupdate.xul @@ -1,63 +1,51 @@ - + + title="&title.label;" + onload="if( parent.handle ) parent.handle.onpageload( 'pref-smartupdate' ); else parent.queuedTag = 'pref-smartupdate';"> - - - - - - - - &header; - - - - + + + + + - - - - - - &enableSU.label; - - - - - - - &enableNotification.label; - - + + + + &enableSU.label; + + + + &enableNotification.label; + + + + &requireConfirmation.label; + + - - - - &requireConfirmation.label; - - - - - - - &selectUninstall.label; - - - - - - - - - + + &selectUninstall.label; + + + + + + + + + + + diff --git a/suite/common/pref/pref.xul b/suite/common/pref/pref.xul index 0608585cbb6..714f8c8ae12 100644 --- a/suite/common/pref/pref.xul +++ b/suite/common/pref/pref.xul @@ -1,56 +1,71 @@ - + - - + - + + + - + + onload="window.handle = new PrefWindow( 'panelFrame' );" + width="550" height="410"> - + + + + - + - -&categoryHeader; - + + + + + + + + + + + + + + + + + + + - - - - - - - + + + diff --git a/suite/common/pref/preftree.xul b/suite/common/pref/preftree.xul index e7a28731116..687819ae218 100644 --- a/suite/common/pref/preftree.xul +++ b/suite/common/pref/preftree.xul @@ -22,78 +22,41 @@ Contributor(s): --> - - + - - - - - var prefwindow = null; - - function ClickChangePanel(node) - { - dump("node = " + node + "\n"); - url = node.getAttribute('name'); - dump("url = " + url + "\n"); - ChangePanelURL(url); - } - - function ChangePanelURL(url) - { - dump("\Loading " + url + "...\n"); - dump("Looking up prefwindow object...\n"); - if (prefwindow == null) - { - dump("Creating prefwindow object..."); - prefwindow = Components.classes['component://netscape/prefwindow'].getService(Components.interfaces.nsIPrefWindow); - dump("...created\n"); - } - else - { - dump("prefwindow has already been created! Hurrah!\n"); - } - if (prefwindow) - { - prefwindow.changePanel(url); - } - return true; - } - - - - - - + - - - + + + + + - + - + - + - + @@ -102,30 +65,30 @@ - + - + - + - + - + @@ -133,43 +96,43 @@ - + - + - + - + - + - + - + @@ -177,13 +140,13 @@ - + - + @@ -191,45 +154,57 @@ - + - + - + - + - + - + + + + + + + - + - + + + + + + + @@ -239,12 +214,11 @@ - + - - +