Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 44239, 43714, 48023, 51248: home button d&d, tooltips, prefs, and other cleanup. r=timeless a=alecf

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@82305 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
blakeross%telocity.com
2000-11-04 02:37:51 +00:00
parent 4f8f242f56
commit 03edc947cd
5 changed files with 22 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/xpfe/browser/resources/content/navigator.js
View File

@@ -489,7 +489,7 @@ function Startup()
homepage = null;
}
if (homepage)
setTooltipText("homebutton", homepage);
setTooltipText("home-button", homepage);
initConsoleListener();

57
mozilla/xpfe/browser/resources/content/navigatorDD.js
View File

@@ -445,64 +445,43 @@ var homeButtonObserver = {
{
var data = aData.length ? aData[0] : aData;
var url = retrieveURLFromData(data);
var showDialog = nsPreferences.getBoolPref("browser.homepage.enable_home_button_drop", false);
var setHomepage;
if (showDialog)
{
var commonDialogService = nsJSComponentManager.getService("@mozilla.org/appshell/commonDialogs;1",
"nsICommonDialogs");
var block = nsJSComponentManager.createInstanceByID("c01ad085-4915-11d3-b7a0-85cf-55c3523c",
"nsIDialogParamBlock");
var checkValue = { value: true };
var pressedVal = { };
var promptTitle = bundle.GetStringFromName("droponhometitle");
var promptMsg = bundle.GetStringFromName("droponhomemsg");
var checkMsg = bundle.GetStringFromName("dontremindme");
var okButton = bundle.GetStringFromName("droponhomeokbutton");
var iconURL = "chrome://navigator/skin/home.gif"; // evil evil common dialog code! evil!
var commonDialogService = nsJSComponentManager.getService("@mozilla.org/appshell/commonDialogs;1",
"nsICommonDialogs");
var pressedVal = { };
var promptTitle = bundle.GetStringFromName("droponhometitle");
var promptMsg = bundle.GetStringFromName("droponhomemsg");
var okButton = bundle.GetStringFromName("droponhomeokbutton");
var iconURL = "chrome://navigator/skin/home.gif"; // evil evil common dialog code! evil!
commonDialogService.UniversalDialog(window, null, promptTitle, promptMsg, checkMsg,
okButton, null, null, null, null, null, { }, { },
iconURL, checkValue, 2, 0, null, pressedVal);
nsPreferences.setBoolPref("browser.homepage.enable_home_button_drop", checkValue.value);
commonDialogService.UniversalDialog(window, null, promptTitle, promptMsg, null,
okButton, null, null, null, null, null, { }, { },
iconURL, { }, 2, 0, null, pressedVal);
setHomepage = pressedVal.value == 0 ? true : false;
}
else
setHomepage = true;
if (setHomepage)
{
nsPreferences.setUnicharPref("browser.startup.homepage", url);
setTooltipText("homebutton", url);
}
if (pressedVal.value == 0) {
nsPreferences.setUnicharPref("browser.startup.homepage", url);
setTooltipText("home-button", url);
}
},
onDragOver: function (aEvent, aFlavour, aDragSession)
{
var homeButton = aEvent.target;
// preliminary attribute name for now
homeButton.setAttribute("home-dragover","true");
var statusTextFld = document.getElementById("statusbar-display");
gStatus = gStatus ? gStatus : statusTextFld.value;
var statusTextFld = document.getElementById("statusbar-display");
statusTextFld.setAttribute("value", bundle.GetStringFromName("droponhomebutton"));
},
onDragExit: function (aEvent, aDragSession)
{
var homeButton = document.getElementById("homebutton");
homeButton.removeAttribute("home-dragover");
statusTextFld.setAttribute("value", gStatus);
gStatus = null;
statusTextFld.setAttribute("value", "");
},
onDragStart: function ()
{
var homepage = nsPreferences.getLocalizedUnicharPref("browser.startup.homepage", "about:blank");
var flavourList = { };
flavourList["text/x-moz-url"] = { width: 2, data: homepage + " " + "[ TEMP - Home Page ]" };
var htmlString = "<a href=\"" + homepage + "\">" + homepage + "</a>";
flavourList["text/x-moz-url"] = { width: 2, data: homepage };
flavourList["text/html"] = { width: 2, data: htmlString };
flavourList["text/unicode"] = { width: 2, data: homepage };
var htmlString = "<a href=\"" + homepage + "\">" + homepage + "</a>";
return flavourList;
},

1
mozilla/xpfe/browser/resources/locale/en-US/navigator.properties
View File

@@ -17,7 +17,6 @@ droponhomemsg=Do you want this document to be your new home page?
droponhomemsg1=Do you want
droponhomemsg_thedocument=this address
droponhomemsg2=to be your new home page?
dontremindme=Always check when I drag an address to the Home button (This can also be set in the 'Navigator' category of Preferences)
droponhomeokbutton=Set Home Page
# navigator.js, font size submenu

14
mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul
View File

@@ -39,9 +39,9 @@
</script>
<script language="JavaScript">
<![CDATA[
var _elementIDs = ["startupPage", "browserStartupHomepage",
"alwaysCheckWhenDropOnHome", "bookmarksButton",
"goButton", "homeButton", "printButton",
var _elementIDs = ["startupPage", "browserStartupHomepage",
"bookmarksButton", "goButton",
"homeButton", "printButton",
"searchButton" ];
]]>
</script>
@@ -78,14 +78,6 @@
oncommand="setHomePageToCurrentPage('browserStartupHomepage');"/>
<button class="dialog" value="&browseFile.label;" accesskey="&browseFile.accesskey;"
oncommand="prefNavSelectFile('browserStartupHomepage', 'choosehomepage', false );"/>
</box>
<separator class="thin"/>
<box autostretch="never">
<checkbox id="alwaysCheckWhenDropOnHome"
value="&alwaysCheckWhenDropHome.label;"
accesskey="&alwaysCheckWhenDropHome.accesskey;"
pref="true" preftype="bool" prefstring="browser.homepage.enable_home_button_drop"
prefattribute="checked"/>
</box>
</titledbox>

3
mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-navigator.dtd
View File

@@ -19,9 +19,6 @@
<!ENTITY browseFile.label "Choose File...">
<!ENTITY browseFile.accesskey "c">
<!ENTITY alwaysCheckWhenDropHome.label "Always check when I drag an address to the Home button">
<!ENTITY alwaysCheckWhenDropHome.accesskey "d">
<!ENTITY header3.label "Toolbars">
<!ENTITY toolbarIntro.label "Select the buttons you want to see in the toolbars.">