chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Bug Fix: Move default hotkeys to main app startup

Browse source 
Instead of the Preferences plugin.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
This commit is contained in:
Christopher Snowhill 2025-03-06 03:08:41 -08:00
parent 0b1482b3c6
commit c48b74d52d
3 changed files with 66 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
Application/AppController.m
View file

@ -209,6 +209,8 @@ static BOOL consentLastEnabled = NO;
[randomizeButton setToolTip:NSLocalizedString(@"RandomizeButtonTooltip", @"")]; [randomizeButton setToolTip:NSLocalizedString(@"RandomizeButtonTooltip", @"")];
[fileButton setToolTip:NSLocalizedString(@"FileButtonTooltip", @"")]; [fileButton setToolTip:NSLocalizedString(@"FileButtonTooltip", @"")];
[self registerDefaultHotKeys];
[self registerHotKeys]; [self registerHotKeys];
(void)[spotlightWindowController init]; (void)[spotlightWindowController init];
@ -715,7 +717,67 @@ static BOOL consentLastEnabled = NO;
} }
} }
/* Unassign previous handler first, so dealloc can unregister it from the global map before the new instances are assigned */ MASShortcut *shortcutWithMigration(NSString *oldKeyCodePrefName,
NSString *oldKeyModifierPrefName,
NSString *newShortcutPrefName,
NSInteger newDefaultKeyCode) {
NSEventModifierFlags defaultModifiers = NSEventModifierFlagControl | NSEventModifierFlagCommand;
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
if([defaults objectForKey:oldKeyCodePrefName]) {
NSInteger oldKeyCode = [defaults integerForKey:oldKeyCodePrefName];
NSEventModifierFlags oldKeyModifiers = [defaults integerForKey:oldKeyModifierPrefName];
// Should we consider temporarily save these values for further migration?
[defaults removeObjectForKey:oldKeyCodePrefName];
[defaults removeObjectForKey:oldKeyModifierPrefName];
return [MASShortcut shortcutWithKeyCode:oldKeyCode modifierFlags:oldKeyModifiers];
} else {
return [MASShortcut shortcutWithKeyCode:newDefaultKeyCode modifierFlags:defaultModifiers];
}
}
static NSUserDefaultsController *shortcutDefaultsController = nil;
- (void)registerDefaultHotKeys {
MASShortcut *playShortcut = shortcutWithMigration(@"hotKeyPlayKeyCode",
@"hotKeyPlayModifiers",
CogPlayShortcutKey,
kVK_ANSI_P);
MASShortcut *nextShortcut = shortcutWithMigration(@"hotKeyNextKeyCode",
@"hotKeyNextModifiers",
CogNextShortcutKey,
kVK_ANSI_N);
MASShortcut *prevShortcut = shortcutWithMigration(@"hotKeyPreviousKeyCode",
@"hotKeyPreviousModifiers",
CogPrevShortcutKey,
kVK_ANSI_R);
MASShortcut *spamShortcut = [MASShortcut shortcutWithKeyCode:kVK_ANSI_C
modifierFlags:NSEventModifierFlagControl | NSEventModifierFlagCommand];
MASShortcut *fadeShortcut = [MASShortcut shortcutWithKeyCode:kVK_ANSI_O
modifierFlags:NSEventModifierFlagControl | NSEventModifierFlagCommand];
NSData *playShortcutData = [NSKeyedArchiver archivedDataWithRootObject:playShortcut];
NSData *nextShortcutData = [NSKeyedArchiver archivedDataWithRootObject:nextShortcut];
NSData *prevShortcutData = [NSKeyedArchiver archivedDataWithRootObject:prevShortcut];
NSData *spamShortcutData = [NSKeyedArchiver archivedDataWithRootObject:spamShortcut];
NSData *fadeShortcutData = [NSKeyedArchiver archivedDataWithRootObject:fadeShortcut];
// Register default values to be used for the first app start
NSDictionary<NSString *, NSData *> *defaultShortcuts = @{
CogPlayShortcutKey: playShortcutData,
CogNextShortcutKey: nextShortcutData,
CogPrevShortcutKey: prevShortcutData,
CogSpamShortcutKey: spamShortcutData,
CogFadeShortcutKey: fadeShortcutData
};
[[NSUserDefaults standardUserDefaults] registerDefaults:defaultShortcuts];
shortcutDefaultsController = [[NSUserDefaultsController sharedUserDefaultsController] initWithDefaults:nil initialValues:defaultShortcuts];
}
- (IBAction)resetHotkeys:(id)sender {
[shortcutDefaultsController revertToInitialValues:sender];
}
- (void)registerHotKeys { - (void)registerHotKeys {
MASShortcutBinder *binder = [MASShortcutBinder sharedBinder]; MASShortcutBinder *binder = [MASShortcutBinder sharedBinder];
[binder bindShortcutWithDefaultsKey:CogPlayShortcutKey [binder bindShortcutWithDefaultsKey:CogPlayShortcutKey

2
Preferences/Preferences/Base.lproj/Preferences.xib
View file

@ -225,7 +225,7 @@
<font key="font" metaFont="system"/> <font key="font" metaFont="system"/>
</buttonCell> </buttonCell>
<connections> <connections>
<action selector="resetToDefaultShortcuts:" target="6" id="SSH-OG-OHD"/> <action selector="resetHotkeys:" target="-1" id="POi-Ci-HfU"/>
</connections> </connections>
</button> </button>
</subviews> </subviews>

59
Preferences/Preferences/HotKeyPane.m
View file

@ -9,68 +9,13 @@
#import "HotKeyPane.h" #import "HotKeyPane.h"
#import "Shortcuts.h" #import "Shortcuts.h"
MASShortcut *shortcutWithMigration(NSString *oldKeyCodePrefName,
NSString *oldKeyModifierPrefName,
NSString *newShortcutPrefName,
NSInteger newDefaultKeyCode) {
NSEventModifierFlags defaultModifiers = NSEventModifierFlagControl | NSEventModifierFlagCommand;
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
if([defaults objectForKey:oldKeyCodePrefName]) {
NSInteger oldKeyCode = [defaults integerForKey:oldKeyCodePrefName];
NSEventModifierFlags oldKeyModifiers = [defaults integerForKey:oldKeyModifierPrefName];
// Should we consider temporarily save these values for further migration?
[defaults removeObjectForKey:oldKeyCodePrefName];
[defaults removeObjectForKey:oldKeyModifierPrefName];
return [MASShortcut shortcutWithKeyCode:oldKeyCode modifierFlags:oldKeyModifiers];
} else {
return [MASShortcut shortcutWithKeyCode:newDefaultKeyCode modifierFlags:defaultModifiers];
}
}
@implementation HotKeyPane { @implementation HotKeyPane {
NSUserDefaultsController *defaultsController; NSUserDefaultsController *defaultsController;
} }
// Defaults have been moved to AppController.m
- (void)awakeFromNib { - (void)awakeFromNib {
MASShortcut *playShortcut = shortcutWithMigration(@"hotKeyPlayKeyCode", defaultsController = [NSUserDefaultsController sharedUserDefaultsController];
@"hotKeyPlayModifiers",
CogPlayShortcutKey,
kVK_ANSI_P);
MASShortcut *nextShortcut = shortcutWithMigration(@"hotKeyNextKeyCode",
@"hotKeyNextModifiers",
CogNextShortcutKey,
kVK_ANSI_N);
MASShortcut *prevShortcut = shortcutWithMigration(@"hotKeyPreviousKeyCode",
@"hotKeyPreviousModifiers",
CogPrevShortcutKey,
kVK_ANSI_R);
MASShortcut *spamShortcut = shortcutWithMigration(@"hotKeySpamKeyCode",
@"hotKeySpamModifiers",
CogSpamShortcutKey,
kVK_ANSI_C);
MASShortcut *fadeShortcut = shortcutWithMigration(@"hotKeyFadeKeyCode",
@"hotKeyFadeModifiers",
CogFadeShortcutKey,
kVK_ANSI_O);
NSData *playShortcutData = [NSKeyedArchiver archivedDataWithRootObject:playShortcut];
NSData *nextShortcutData = [NSKeyedArchiver archivedDataWithRootObject:nextShortcut];
NSData *prevShortcutData = [NSKeyedArchiver archivedDataWithRootObject:prevShortcut];
NSData *spamShortcutData = [NSKeyedArchiver archivedDataWithRootObject:spamShortcut];
NSData *fadeShortcutData = [NSKeyedArchiver archivedDataWithRootObject:fadeShortcut];
// Register default values to be used for the first app start
NSDictionary<NSString *, NSData *> *defaultShortcuts = @{
CogPlayShortcutKey: playShortcutData,
CogNextShortcutKey: nextShortcutData,
CogPrevShortcutKey: prevShortcutData,
CogSpamShortcutKey: spamShortcutData,
CogFadeShortcutKey: fadeShortcutData
};
defaultsController =
[[NSUserDefaultsController sharedUserDefaultsController] initWithDefaults:nil
initialValues:defaultShortcuts];
_playShortcutView.associatedUserDefaultsKey = CogPlayShortcutKey; _playShortcutView.associatedUserDefaultsKey = CogPlayShortcutKey;
_nextShortcutView.associatedUserDefaultsKey = CogNextShortcutKey; _nextShortcutView.associatedUserDefaultsKey = CogNextShortcutKey;