From 6458c32a12a97bd2acdd821655276d403e1086d2 Mon Sep 17 00:00:00 2001
From: "myk%mozilla.org" <myk%mozilla.org>
Date: Wed, 9 Aug 2006 23:05:52 +0000
Subject: [PATCH] enable a simple way to set a blank page as your home page in
 preferences bug=346044 r=mconnor

---
 browser/components/preferences/main.xul            | 14 ++++++++++++++
 .../en-US/chrome/browser/preferences/main.dtd      |  5 +++++
 .../pinstripe/browser/preferences/preferences.css  |  4 ++--
 .../winstripe/browser/preferences/preferences.css  |  2 +-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/browser/components/preferences/main.xul b/browser/components/preferences/main.xul
index 97b36d0fd038..be943ce89056 100644
--- a/browser/components/preferences/main.xul
+++ b/browser/components/preferences/main.xul
@@ -69,6 +69,10 @@
                   name="pref.browser.homepage.disable_button.bookmark_page"
                   type="bool"/>
 
+      <preference id="browser.startup.page"
+                  name="browser.startup.page"
+                  type="int"/>
+
       <!-- Downloads -->
       <preference id="browser.download.manager.showWhenStarting"
                   name="browser.download.manager.showWhenStarting"
@@ -130,6 +134,16 @@
                 id="restoreDefaultHomePage"
                 preference="pref.browser.homepage.disable_button.restore_default"/>
       </hbox>
+      <hbox align="center">
+        <label value="&startup.label;" accesskey="&startup.accesskey;" control="browserStartupPage"/>
+          <menulist id="browserStartupPage" preference="browser.startup.page">
+            <menupopup>
+              <menuitem label="&startupHomePage.label;"         value="1"/>
+              <menuitem label="&startupBlankPage.label;"        value="0"/>
+              <menuitem label="&startupPreviousSession.label;"  value="3"/>
+            </menupopup>
+          </menulist>
+      </hbox>
     </groupbox>
 
     <!-- Downloads -->
diff --git a/browser/locales/en-US/chrome/browser/preferences/main.dtd b/browser/locales/en-US/chrome/browser/preferences/main.dtd
index ccf317dacd70..3147c4bee9c3 100644
--- a/browser/locales/en-US/chrome/browser/preferences/main.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/main.dtd
@@ -9,6 +9,11 @@
 <!ENTITY useBookmark.accesskey     "B">
 <!ENTITY restoreDefault.label      "Restore to Default">
 <!ENTITY restoreDefault.accesskey  "R">
+<!ENTITY startup.label             "When &brandShortName; Starts:">
+<!ENTITY startup.accesskey         "S">
+<!ENTITY startupHomePage.label     "Load my home page">
+<!ENTITY startupBlankPage.label    "Show a blank page">
+<!ENTITY startupPreviousSession.label  "Show the tabs and windows from last time">
 
 <!ENTITY downloads.label     "Downloads">
 
diff --git a/browser/themes/pinstripe/browser/preferences/preferences.css b/browser/themes/pinstripe/browser/preferences/preferences.css
index 95706780fdf3..6116c556144b 100644
--- a/browser/themes/pinstripe/browser/preferences/preferences.css
+++ b/browser/themes/pinstripe/browser/preferences/preferences.css
@@ -150,7 +150,7 @@ description {
   margin-bottom: 4px !important;
 }
 
-#browserStartupHomepage {
+#browserHomePage {
   padding: 2px 2px 3px 4px;
 }
 
@@ -247,7 +247,7 @@ caption {
   padding: 18px 10px 10px 10px;
 }
 
-#browserStartupHomepage {
+#browserHomePage {
   padding: 0;
 }
 
diff --git a/browser/themes/winstripe/browser/preferences/preferences.css b/browser/themes/winstripe/browser/preferences/preferences.css
index 8fd3b96d4f2b..6643d99bdaaa 100644
--- a/browser/themes/winstripe/browser/preferences/preferences.css
+++ b/browser/themes/winstripe/browser/preferences/preferences.css
@@ -93,7 +93,7 @@ radio[pane=paneAdvanced]:hover, radio[pane=paneAdvanced][selected="true"] {
 }
 
 /* General Pane */
-#browserStartupHomepage {
+#browserHomePage {
   padding-top: 2px;
   padding-bottom: 3px;
   -moz-padding-start: 4px;