From 7aa47d22edf98be63e79384fb17bfc31e520d3b5 Mon Sep 17 00:00:00 2001 From: "stridey%gmail.com" Date: Wed, 31 Jan 2007 16:42:51 +0000 Subject: [PATCH] Camino only - Bug 360839: Expose preference for saving session state. --- .../English.lproj/Navigation.nib/classes.nib | 2 ++ .../English.lproj/Navigation.nib/info.nib | 2 +- .../Navigation.nib/keyedobjects.nib | Bin 10338 -> 11163 bytes .../PreferencePanes/Navigation/Navigation.h | 2 ++ .../PreferencePanes/Navigation/Navigation.mm | 21 +++++++++++++----- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/classes.nib b/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/classes.nib index 1f8223090e7..2d47c1ed490 100644 --- a/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/classes.nib +++ b/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/classes.nib @@ -17,6 +17,7 @@ checkboxStartPageClicked = id; defaultBrowserChange = id; defaultFeedViewerChange = id; + rememberWindowStateCheckboxClicked = id; runOpenDialogToSelectBrowser = id; runOpenDialogToSelectFeedViewer = id; warningCheckboxClicked = id; @@ -27,6 +28,7 @@ checkboxCheckDefaultBrowserOnLaunch = NSButton; checkboxNewTabBlank = NSButton; checkboxNewWindowBlank = NSButton; + checkboxRememberWindowState = NSButton; checkboxWarnWhenClosing = NSButton; defaultBrowserPopUp = NSPopUpButton; defaultFeedViewerPopUp = NSPopUpButton; diff --git a/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/info.nib b/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/info.nib index eea46b6a4b5..041f6cff111 100644 --- a/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/info.nib +++ b/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/info.nib @@ -3,7 +3,7 @@ IBDocumentLocation - 83 20 462 260 0 0 1024 746 + 10 8 462 260 0 0 1024 746 IBFramework Version 446.1 IBOpenObjects diff --git a/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/keyedobjects.nib b/camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/keyedobjects.nib index 2b6fbe593f8945c59bbd2b6bdb293a2170840975..569256bc9c117e25eb42e6bf521d9e5fbf2fc9a1 100644 GIT binary patch literal 11163 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 literal 10338 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 Xq?6Lu(iu?xC{?eTX6m*6Te|Q+?BjdX diff --git a/camino/PreferencePanes/Navigation/Navigation.h b/camino/PreferencePanes/Navigation/Navigation.h index b72301bf411..a6c670a8ab2 100644 --- a/camino/PreferencePanes/Navigation/Navigation.h +++ b/camino/PreferencePanes/Navigation/Navigation.h @@ -49,12 +49,14 @@ IBOutlet NSPopUpButton* defaultFeedViewerPopUp; IBOutlet NSButton* checkboxCheckDefaultBrowserOnLaunch; IBOutlet NSButton* checkboxWarnWhenClosing; + IBOutlet NSButton* checkboxRememberWindowState; } - (IBAction)checkboxStartPageClicked:(id)sender; - (IBAction)defaultBrowserChange:(id)sender; - (IBAction)defaultFeedViewerChange:(id)sender; - (IBAction)warningCheckboxClicked:(id)sender; +- (IBAction)rememberWindowStateCheckboxClicked:(id)sender; // method to be called so that when the default feed viewer is modified // in FeedServiceController, we can rebuild the list here as well. diff --git a/camino/PreferencePanes/Navigation/Navigation.mm b/camino/PreferencePanes/Navigation/Navigation.mm index 9b6d76cadc4..78200996c0a 100644 --- a/camino/PreferencePanes/Navigation/Navigation.mm +++ b/camino/PreferencePanes/Navigation/Navigation.mm @@ -83,12 +83,12 @@ const int kDefaultExpireDays = 9; return; BOOL gotPref; - + // 0: blank page. 1: home page. 2: last page visited. Our behaviour here should // match what the browser does when the prefs don't exist. if (([self getIntPref:"browser.startup.page" withSuccess:&gotPref] == 1) || !gotPref) [checkboxNewWindowBlank setState:NSOnState]; - + if (([self getIntPref:"browser.tabs.startPage" withSuccess:&gotPref] == 1)) [checkboxNewTabBlank setState:NSOnState]; @@ -97,15 +97,18 @@ const int kDefaultExpireDays = 9; if ([self getBooleanPref:"camino.warn_when_closing" withSuccess:&gotPref]) [checkboxWarnWhenClosing setState:NSOnState]; - + + if ([self getBooleanPref:"camino.remember_window_state" withSuccess:&gotPref]) + [checkboxRememberWindowState setState:NSOnState]; + [textFieldHomePage setStringValue:[self getCurrentHomePage]]; - + // set up default browser menu [self updateDefaultBrowserMenu]; - + // set up the feed viewer menu [self updateDefaultFeedViewerMenu]; - + // register notification if the default feed viewer is changed in the FeedServiceController [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateDefaultFeedViewerMenu) @@ -146,6 +149,12 @@ const int kDefaultExpireDays = 9; [self setPref:"camino.warn_when_closing" toBoolean:([sender state] == NSOnState)]; } +- (IBAction)rememberWindowStateCheckboxClicked:(id)sender +{ + if (sender == checkboxRememberWindowState) + [self setPref:"camino.remember_window_state" toBoolean:([sender state] == NSOnState)]; +} + - (NSString*)getCurrentHomePage { BOOL gotPref;