diff options
| -rw-r--r-- | Low Battery Yup/AppDelegate.h | 8 | ||||
| -rw-r--r-- | Low Battery Yup/AppDelegate.m | 31 | ||||
| -rw-r--r-- | Low Battery Yup/en.lproj/MainMenu.xib | 74 |
3 files changed, 6 insertions, 107 deletions
diff --git a/Low Battery Yup/AppDelegate.h b/Low Battery Yup/AppDelegate.h index 9621fd4..a2c8ba9 100644 --- a/Low Battery Yup/AppDelegate.h +++ b/Low Battery Yup/AppDelegate.h @@ -7,15 +7,11 @@ // #import <Cocoa/Cocoa.h> -#import <MASShortcut/MASShortcutView.h> -#import <MASShortcut/MASShortcutView+Bindings.h> -#import <MASShortcut/MASShortcutBinder.h> +#import "ShortcutView.h" @interface AppDelegate : NSObject <NSApplicationDelegate> { IBOutlet NSWindow *window; - IBOutlet MASShortcutView *_shortcut_view; + IBOutlet ShortcutView *_shortcut_view; } -- (IBAction)logDefaults:(id)sender; - @end diff --git a/Low Battery Yup/AppDelegate.m b/Low Battery Yup/AppDelegate.m index 8a9005f..d90bc97 100644 --- a/Low Battery Yup/AppDelegate.m +++ b/Low Battery Yup/AppDelegate.m @@ -8,9 +8,6 @@ #import "AppDelegate.h" -static NSString *const kPreferenceGlobalShortcut = @"GlobalShortcut"; -static void *AppObservingContext = &AppObservingContext; - @implementation AppDelegate - (void)dealloc @@ -20,35 +17,7 @@ static void *AppObservingContext = &AppObservingContext; - (void)applicationDidFinishLaunching:(NSNotification *)aNotification { - [_shortcut_view setAssociatedUserDefaultsKey:kPreferenceGlobalShortcut]; - -// NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; -// [_shortcut_view bind:@"shortcutValue" toObject:defaults withKeyPath:@"thisisatest" options:nil]; - -// [defaults addObserver:self forKeyPath:@"thisisatest" options:NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew context:AppObservingContext]; - -// [[MASShortcutBinder sharedBinder] -// bindShortcutWithDefaultsKey:kPreferenceGlobalShortcut -// toAction:^{NSLog(@"dudebro");}]; - -} - -- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context -{ - NSLog(@"OBSERVED"); - NSLog(@"%@", change); -} - -- (IBAction)logDefaults:(id)sender -{ - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - NSLog(@"%@", [defaults objectForKey:[@"values." stringByAppendingString:kPreferenceGlobalShortcut]]); -// NSLog(@"%@", [defaults objectForKey:kPreferenceGlobalShortcut]); -// NSLog(@"%@", [[NSUserDefaults standardUserDefaults] dictionaryRepresentation]); -// NSLog(@"%@", [_shortcut_view shortcutValue]); -// NSLog(@"%@", [[NSUserDefaults standardUserDefaults] objectForKey:@"thisisatest"]); -// [[NSUserDefaults standardUserDefaults] setObject:@"dude come on" forKey:@"thisisatest"]; } @end diff --git a/Low Battery Yup/en.lproj/MainMenu.xib b/Low Battery Yup/en.lproj/MainMenu.xib index 989bd27..2961acf 100644 --- a/Low Battery Yup/en.lproj/MainMenu.xib +++ b/Low Battery Yup/en.lproj/MainMenu.xib @@ -11,8 +11,6 @@ <string key="NS.object.0">2844</string> </object> <array key="IBDocument.IntegratedClassDependencies"> - <string>NSButton</string> - <string>NSButtonCell</string> <string>NSCustomObject</string> <string>NSCustomView</string> <string>NSMenu</string> @@ -1313,38 +1311,9 @@ <string key="NSFrame">{{84, 83}, {313, 19}}</string> <reference key="NSSuperview" ref="439893737"/> <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="840947810"/> - <string key="NSReuseIdentifierKey">_NS:9</string> - <string key="NSClassName">ShortcutView</string> - </object> - <object class="NSButton" id="840947810"> - <reference key="NSNextResponder" ref="439893737"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{211, 18}, {192, 32}}</string> - <reference key="NSSuperview" ref="439893737"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView"/> <string key="NSReuseIdentifierKey">_NS:9</string> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="316983695"> - <int key="NSCellFlags">67108864</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">Defaults?</string> - <object class="NSFont" key="NSSupport"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">13</double> - <int key="NSfFlags">1044</int> - </object> - <string key="NSCellIdentifier">_NS:9</string> - <reference key="NSControlView" ref="840947810"/> - <int key="NSButtonFlags">-2038284288</int> - <int key="NSButtonFlags2">129</int> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + <string key="NSClassName">ShortcutView</string> </object> </array> <string key="NSFrameSize">{480, 185}</string> @@ -1352,7 +1321,7 @@ <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="489226571"/> </object> - <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> + <string key="NSScreenRect">{{0, 0}, {2560, 1578}}</string> <string key="NSMinSize">{480, 207}</string> <string key="NSMaxSize">{480, 207}</string> <bool key="NSWindowIsRestorable">YES</bool> @@ -2054,14 +2023,6 @@ </object> <int key="connectionID">537</int> </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">logDefaults:</string> - <reference key="source" ref="976324537"/> - <reference key="destination" ref="840947810"/> - </object> - <int key="connectionID">540</int> - </object> </array> <object class="IBMutableOrderedSet" key="objectRecords"> <array key="orderedObjects"> @@ -2588,7 +2549,6 @@ <reference key="object" ref="439893737"/> <array class="NSMutableArray" key="children"> <reference ref="489226571"/> - <reference ref="840947810"/> </array> <reference key="parent" ref="972006081"/> </object> @@ -3070,19 +3030,6 @@ <reference key="object" ref="489226571"/> <reference key="parent" ref="439893737"/> </object> - <object class="IBObjectRecord"> - <int key="objectID">538</int> - <reference key="object" ref="840947810"/> - <array class="NSMutableArray" key="children"> - <reference ref="316983695"/> - </array> - <reference key="parent" ref="439893737"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">539</int> - <reference key="object" ref="316983695"/> - <reference key="parent" ref="840947810"/> - </object> </array> </object> <dictionary class="NSMutableDictionary" key="flattenedProperties"> @@ -3229,8 +3176,6 @@ <string key="517.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="534.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="536.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="538.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="539.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3257,19 +3202,8 @@ <object class="IBPartialClassDescription"> <string key="className">AppDelegate</string> <string key="superclassName">NSObject</string> - <object class="NSMutableDictionary" key="actions"> - <string key="NS.key.0">logDefaults:</string> - <string key="NS.object.0">id</string> - </object> - <object class="NSMutableDictionary" key="actionInfosByName"> - <string key="NS.key.0">logDefaults:</string> - <object class="IBActionInfo" key="NS.object.0"> - <string key="name">logDefaults:</string> - <string key="candidateClassName">id</string> - </object> - </object> <dictionary class="NSMutableDictionary" key="outlets"> - <string key="_shortcut_view">MASShortcutView</string> + <string key="_shortcut_view">ShortcutView</string> <string key="customShortcutView">MASShortcutView</string> <string key="feedbackTextField">NSTextField</string> <string key="window">NSWindow</string> @@ -3277,7 +3211,7 @@ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName"> <object class="IBToOneOutletInfo" key="_shortcut_view"> <string key="name">_shortcut_view</string> - <string key="candidateClassName">MASShortcutView</string> + <string key="candidateClassName">ShortcutView</string> </object> <object class="IBToOneOutletInfo" key="customShortcutView"> <string key="name">customShortcutView</string> |
