diff --git a/mozilla/extensions/cck/browser/locales/en-US/chrome/cckWizard.dtd b/mozilla/extensions/cck/browser/locales/en-US/chrome/cckWizard.dtd
index 86afaef5ec2..200a9ce3333 100755
--- a/mozilla/extensions/cck/browser/locales/en-US/chrome/cckWizard.dtd
+++ b/mozilla/extensions/cck/browser/locales/en-US/chrome/cckWizard.dtd
@@ -5,9 +5,11 @@
Custom animation files for browser's animated logo
- Search pluginsfdsafdsafs
+ Search plugins
Browser plug-ins
">
+
+
diff --git a/mozilla/extensions/cck/browser/resources/content/cckwizard/cckwizard.js b/mozilla/extensions/cck/browser/resources/content/cckwizard/cckwizard.js
index 015e5e0ff2f..17c10281383 100755
--- a/mozilla/extensions/cck/browser/resources/content/cckwizard/cckwizard.js
+++ b/mozilla/extensions/cck/browser/resources/content/cckwizard/cckwizard.js
@@ -175,7 +175,9 @@ function updateconfiglist()
menulist.selectedItem = menulistitem;
selecteditem = true;
document.getElementById('example-window').canAdvance = true;
+ document.getElementById('byb-configs').disabled = false;
document.getElementById('deleteconfig').disabled = false;
+ document.getElementById('showconfig').disabled = false;
}
}
if ((!selecteditem) && (list.length > 0)) {
@@ -184,7 +186,10 @@ function updateconfiglist()
}
if (list.length == 0) {
document.getElementById('example-window').canAdvance = false;
- document.getElementById('deleteconfig').disabled = true;
+ document.getElementById('byb-configs').disabled = true;
+ document.getElementById('deleteconfig').disabled = true;
+ document.getElementById('showconfig').disabled = true;
+
}
}
@@ -1113,8 +1118,11 @@ function CCKReadConfigFile(srcdir)
var file = srcdir.clone();
file.append("cck.config");
- if (!file.exists())
+ if (!file.exists()) {
+ DoEnabling();
+ toggleProxySettings();
return;
+ }
var stream = Components.classes["@mozilla.org/network/file-input-stream;1"]
.createInstance(Components.interfaces.nsIFileInputStream);
@@ -1131,16 +1139,11 @@ function CCKReadConfigFile(srcdir)
firstpart = str.substring(0,equals);
secondpart = str.substring(equals+1);
document.getElementById(firstpart).value = secondpart;
- if (firstpart == "ProxyType") {
- DoEnabling();
- }
- if (firstpart == "shareAllProxies") {
- toggleProxySettings();
- }
}
} while (more);
-
+ DoEnabling();
+ toggleProxySettings();
stream.close();
}
@@ -1236,6 +1239,8 @@ function DoEnabling()
// radio buttons
var radiogroup = document.getElementById("ProxyType");
+ if (radiogroup.value == "")
+ radiogroup.value = "0";
switch ( radiogroup.value ) {
case "0":
diff --git a/mozilla/extensions/cck/browser/resources/content/cckwizard/cckwizard.xul b/mozilla/extensions/cck/browser/resources/content/cckwizard/cckwizard.xul
index 932fe060c26..ac5963558d7 100755
--- a/mozilla/extensions/cck/browser/resources/content/cckwizard/cckwizard.xul
+++ b/mozilla/extensions/cck/browser/resources/content/cckwizard/cckwizard.xul
@@ -1,665 +1,681 @@
-
-
-
-
-
-
-
-
-
-
-
-
- &cckWizard.description;
-
-
- &beforeYouBegin.description;
-
-
-
- &selectConfig.description;
-
-
-
-
-
-
-
- />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- &orgName.description;
-
-
-
-
-
-
-
- &homePage.description;
-
-
-
-
-
-
-
- &titleBar.description;
-
-
-
-
-
-
-
-
-
-
- &animLogoURL.description;
-
-
-
-
- &animLogoTooltip.description;
-
-
-
-
- &animLogoAnim.description;
-
-
-
-
-
- &animLogoStill.description;
-
-
-
-
-
-
-
-
-
-
-
- &helpMenu.description;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- &allowedSites.description;
-
-
-
-
-
-
-
-
-
-
-
-
-
- &browserPlugins.description;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- &searchPlugins.description;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- &addToolbarFolder.description;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- &addToolbarBookmark.description;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- &addBookmarkFolder.description;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- &addBookmark.description;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- &prefs.description;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- >
- &customizeCerts.warning;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ &cckWizard.description;
+
+
+ &beforeYouBegin.description;
+
+
+
+
+
+
+ &selectConfig.description;
+
+
+
+
+
+
+
+
+
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &orgName.description;
+
+
+
+
+
+
+
+ &homePage.description;
+
+
+
+
+
+
+
+ &titleBar.description;
+
+
+
+
+
+
+
+
+
+
+ &animLogoURL.description;
+
+
+
+
+ &animLogoTooltip.description;
+
+
+
+
+ &animLogoAnim.description;
+
+
+
+
+
+ &animLogoStill.description;
+
+
+
+
+
+
+
+
+
+
+
+ &helpMenu.description;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &allowedSites.description;
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &browserPlugins.description;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &searchPlugins.description;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &addToolbarFolder.description;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &addToolbarBookmark.description;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &addBookmarkFolder.description;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &addBookmark.description;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &prefs.description;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ >
+ &customizeCerts.warning;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+