From 99c345fe3797ff3fb9812301dacb73a91177bfb1 Mon Sep 17 00:00:00 2001
From: rn10950 <rn10950@gmail.com>
Date: Fri, 15 Apr 2016 17:49:14 -0400
Subject: [PATCH] add GUI pref for session restore

---
 .mozconfig.mk                                     |  4 ++--
 .../resources/content/pref-navigator.xul          | 15 ++++++++++++++-
 .../resources/locale/en-US/pref-navigator.dtd     |  4 ++++
 .../locale/en-US/win/platformPrefOverlay.dtd      |  2 +-
 xpfe/global/resources/content/aboutChangelog.html |  1 +
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.mozconfig.mk b/.mozconfig.mk
index 7f871989..cc5b448a 100644
--- a/.mozconfig.mk
+++ b/.mozconfig.mk
@@ -1,12 +1,12 @@
 # gmake
 # This file is automatically generated for client.mk.
-# Do not edit. Edit /c/projects/moz95/mozilla/mozconfig instead.
+# Do not edit. Edit /c/projects/retrozilla/mozilla/mozconfig instead.
 # To create a new .mozconfig file, you can visit,
 #   http://webtools.mozilla.org/build/config.cgi
 
 # PATH=/local/bin:/c/mozilla-build//wget:/c/mozilla-build//7zip:/c/mozilla-build//blat261/full:/c/mozilla-build//python25:/c/mozilla-build//svn-win32-1.4.2/bin:/c/mozilla-build//upx203w:/c/mozilla-build//xemacs/XEmacs-21.4.19/i586-pc-win32:/c/mozilla-build//info-zip:/c/mozilla-build//nsis-2.22:/c/mozilla-build//nsis-2.33u:.:/usr/local/bin:/mingw/bin:/bin:/c/PROGRA~1/MICROS~3/Common/msdev98/BIN:/c/PROGRA~1/MICROS~3/VC98/BIN:/c/PROGRA~1/MICROS~3/Common/TOOLS/WINNT:/c/PROGRA~1/MICROS~3/Common/TOOLS:/c/WINNT/System32:/c/WINNT:/c/WINNT/System32/Wbem:/c/mozilla-build/moztools-180compat/bin
 MOZ_MAKE_FLAGS=-j4
-MOZ_OBJDIR=/c/projects/moz95/obj-sm95-release
+MOZ_OBJDIR=/c/projects/retrozilla/obj-sm95-release
 # --target=i586-pc-msvc is used by configure (not client.mk)
 # --enable-application=suite is used by configure (not client.mk)
 # --enable-optimize is used by configure (not client.mk)
diff --git a/xpfe/components/prefwindow/resources/content/pref-navigator.xul b/xpfe/components/prefwindow/resources/content/pref-navigator.xul
index c34fe304..db6cbbf5 100644
--- a/xpfe/components/prefwindow/resources/content/pref-navigator.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-navigator.xul
@@ -55,7 +55,7 @@
   <![CDATA[
     var _elementIDs = ["startupPage", "newWinPage", "newTabPage",
                        "bookmarksButton", "goButton", "homeButton",
-                       "printButton", "searchButton", "rzHomeAutofocus" ];
+                       "printButton", "searchButton", "rzHomeAutofocus", "rzSessionRestoreCB" ];
   ]]>
   </script>
   
@@ -131,6 +131,19 @@
     </vbox>
   </groupbox>
   
+  <!-- session restore groupbox -->
+  <groupbox>
+    <caption label="&header3.label;"/>
+    <vbox flex="1">
+	  <hbox align="center">
+	    <checkbox id="rzSessionRestoreCB"
+          label="&rzSessionRestore.label;"
+          accesskey="&rzSessionRestore.accesskey;"
+          prefstring="extensions.crashrecovery.resume_session"/>
+	  </hbox>
+    </vbox>
+  </groupbox>
+  
   <!-- toolbar buttons customization -->
   <description value="&toolbarIntro.label;"/>
   <hbox id="prefShowButtons" flex="1" equalsize="true">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-navigator.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-navigator.dtd
index 6189f397..1547386f 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-navigator.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-navigator.dtd
@@ -27,6 +27,10 @@
 <!ENTITY  rzHomeAutofocus.label     "Automatically focus search bar on RetroZilla Home">
 <!ENTITY  rzHomeAutofocus.accesskey "t">
 
+<!ENTITY  header3.label     "Session Restore">
+<!ENTITY  rzSessionRestore.label     "Restore your previous session when starting RetroZilla">
+<!ENTITY  rzSessionRestore.accesskey "i">
+
 <!ENTITY  toolbarIntro.label        "Select the buttons you want to see in the toolbars:">
 
 <!ENTITY  navToolbarIntro.label     "Navigation Toolbar">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/win/platformPrefOverlay.dtd b/xpfe/components/prefwindow/resources/locale/en-US/win/platformPrefOverlay.dtd
index e7a2d818..a2c3048f 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/win/platformPrefOverlay.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/win/platformPrefOverlay.dtd
@@ -18,4 +18,4 @@
      width of the letter 'm' in the selected font.
      XUL/FE DEVELOPERS: DO NOT MODIFY THIS VALUE. It represents the correct
      size of this window for en-US. -->
-<!ENTITY  prefWindow.size             "width: 52em; height: 41em;">
+<!ENTITY  prefWindow.size             "width: 52em; height: 47em;">
diff --git a/xpfe/global/resources/content/aboutChangelog.html b/xpfe/global/resources/content/aboutChangelog.html
index c1c247e4..2cb27520 100644
--- a/xpfe/global/resources/content/aboutChangelog.html
+++ b/xpfe/global/resources/content/aboutChangelog.html
@@ -18,6 +18,7 @@
 		<ul>
 			<li>New Home Page: about:home.</li>
 			<li>about:changelog.</li>
+			<li>Session Manager and Crash Restore system</li>
 		</ul>
 		<h3>Bug Fixes</h3>
 		<ul>