From 22979d897aff8c4b503305ab5eca96c3f7c50d3c Mon Sep 17 00:00:00 2001 From: Cody Krieger Date: Sun, 23 Sep 2012 22:16:55 -0700 Subject: [PATCH] Bump version, revise Advanced preferences view for v2.3 release. --- Classes/AdvancedPreferencesViewController.h | 2 + Classes/AdvancedPreferencesViewController.m | 9 ++ .../English.lproj/AdvancedPreferencesView.xib | 84 +++++++++++++++++-- gfxCardStatus-Info.plist | 4 +- gfxCardStatus.xcodeproj/project.pbxproj | 4 +- 5 files changed, 91 insertions(+), 12 deletions(-) diff --git a/Classes/AdvancedPreferencesViewController.h b/Classes/AdvancedPreferencesViewController.h index f0aa97a..10e30e2 100644 --- a/Classes/AdvancedPreferencesViewController.h +++ b/Classes/AdvancedPreferencesViewController.h @@ -14,4 +14,6 @@ @property (strong) GSPreferences *prefs; +- (IBAction)whyButtonClicked:(id)sender; + @end diff --git a/Classes/AdvancedPreferencesViewController.m b/Classes/AdvancedPreferencesViewController.m index 044def8..910ac8b 100644 --- a/Classes/AdvancedPreferencesViewController.m +++ b/Classes/AdvancedPreferencesViewController.m @@ -11,6 +11,8 @@ #define kAdvancedPreferencesName @"Advanced" +#define kPowerSourceBasedSwitchingExplanationURL [kApplicationWebsiteURL stringByAppendingString:@"/switching.html#power-source-based-switching"] + @implementation AdvancedPreferencesViewController @synthesize prefs; @@ -44,4 +46,11 @@ - (NSImage *)image return [NSImage imageNamed:NSImageNameAdvanced]; } +#pragma mark - AdvancedPreferencesViewController API + +- (IBAction)whyButtonClicked:(id)sender +{ + [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:kPowerSourceBasedSwitchingExplanationURL]]; +} + @end diff --git a/Localizations/English.lproj/AdvancedPreferencesView.xib b/Localizations/English.lproj/AdvancedPreferencesView.xib index 15d5dce..34ab504 100644 --- a/Localizations/English.lproj/AdvancedPreferencesView.xib +++ b/Localizations/English.lproj/AdvancedPreferencesView.xib @@ -2,16 +2,18 @@ 1060 - 12C31a - 2549 - 1187.2 + 12C54 + 2840 + 1187.34 625.00 com.apple.InterfaceBuilder.CocoaPlugin - 2549 + 2840 YES + NSButton + NSButtonCell NSCustomObject NSCustomView NSObjectController @@ -42,19 +44,48 @@ 268 YES + + + 268 + {{184, 37}, {72, 32}} + + + _NS:9 + YES + + 67108864 + 134217728 + Why? + + LucidaGrande + 13 + 1044 + + _NS:9 + + -2038284288 + 129 + + + 200 + 25 + + NO + 268 - {{17, 64}, {406, 34}} + {{17, 85}, {406, 34}} + _NS:9 {250, 750} YES 67108864 138674176 - Power source-based switching has been removed from gfxCardStatus in v2.3. It will not be returning in the future. + Power source-based switching has been removed from gfxCardStatus. It will not be returning in the future. LucidaGrande 13 @@ -82,7 +113,6 @@ NO - YES {440, 162} @@ -107,6 +137,14 @@ 4 + + + whyButtonClicked: + + + + 74 + contentObject: prefs.prefsDict @@ -159,6 +197,7 @@ YES + @@ -181,6 +220,20 @@ + + 72 + + + YES + + + + + + 73 + + + @@ -194,6 +247,8 @@ 26.IBPluginDependency 68.IBPluginDependency 69.IBPluginDependency + 72.IBPluginDependency + 73.IBPluginDependency YES @@ -204,6 +259,8 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin @@ -218,7 +275,7 @@ - 69 + 74 @@ -226,6 +283,17 @@ AdvancedPreferencesViewController NSViewController + + whyButtonClicked: + id + + + whyButtonClicked: + + whyButtonClicked: + id + + IBProjectSource ./Classes/AdvancedPreferencesViewController.h diff --git a/gfxCardStatus-Info.plist b/gfxCardStatus-Info.plist index d90ccd7..5c55090 100755 --- a/gfxCardStatus-Info.plist +++ b/gfxCardStatus-Info.plist @@ -19,13 +19,13 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.3b1 + 2.3 CFBundleSignature ???? CFBundleURLTypes CFBundleVersion - 2.2.2 + 2.3 LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} LSUIElement diff --git a/gfxCardStatus.xcodeproj/project.pbxproj b/gfxCardStatus.xcodeproj/project.pbxproj index fd818d5..fff885b 100755 --- a/gfxCardStatus.xcodeproj/project.pbxproj +++ b/gfxCardStatus.xcodeproj/project.pbxproj @@ -720,7 +720,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; INSTALL_PATH = /Applications; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.7; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = "-DDEBUG"; RUN_CLANG_STATIC_ANALYZER = YES; @@ -746,7 +746,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; INSTALL_PATH = /Applications; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.7; RUN_CLANG_STATIC_ANALYZER = YES; SDKROOT = macosx; VALIDATE_PRODUCT = YES;