Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Crash fixes #1860

Merged
merged 2 commits into from
Jun 1, 2014
Merged

Crash fixes #1860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39e795a
Select the 'custom triggers' pane when adding new triggers
pjrobertson May 31, 2014
7a1cd74
Fix a crash during startup
pjrobertson May 31, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 36 additions & 32 deletions Quicksilver/Code-App/QSController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,38 +927,6 @@ - (void)startQuicksilver:(id)sender {
// Setup Activation Hotkey
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];

if ([defaults integerForKey:@"QSModifierActivationCount"] >0) {
QSModifierKeyEvent *modActivation = [[QSModifierKeyEvent alloc] init];
[modActivation setModifierActivationMask: [defaults integerForKey:@"QSModifierActivationKey"]];
[modActivation setModifierActivationCount:[defaults integerForKey:@"QSModifierActivationCount"]];
[modActivation setTarget:self];
[modActivation setIdentifier:@"QSModKeyActivation"];
[modActivation setAction:@selector(activateInterface:)];
[modActivation enable];
}

id oldModifiers = [defaults objectForKey:kHotKeyModifiers];
id oldKeyCode = [defaults objectForKey:kHotKeyCode];

//Update hotkey prefs

if (oldModifiers && oldKeyCode) {
NSInteger modifiers = [oldModifiers unsignedIntegerValue];
if (modifiers < (1 << (rightControlKeyBit+1) )) {
NSLog(@"updating hotkey %ld", (long)modifiers);
[defaults setValue:[NSNumber numberWithInteger:carbonModifierFlagsToCocoaModifierFlags(modifiers)] forKey:kHotKeyModifiers];
[defaults synchronize];
}

NSLog(@"Updating Activation Key");
[defaults removeObjectForKey:kHotKeyModifiers];
[defaults removeObjectForKey:kHotKeyCode];
[defaults setObject:[NSDictionary dictionaryWithObjectsAndKeys:oldModifiers, @"modifiers", oldKeyCode, @"keyCode", nil] forKey:@"QSActivationHotKey"];
[defaults synchronize];
}

[self bind:@"activationHotKey" toObject:[NSUserDefaultsController sharedUserDefaultsController] withKeyPath:@"values.QSActivationHotKey" options:nil];

quitWindowController = nil;

NSInteger rescanInterval = [defaults integerForKey:@"QSCatalogRescanFrequency"];
Expand Down Expand Up @@ -1066,6 +1034,42 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
[NSApp disableRelaunchOnLogin];
[[NSNotificationCenter defaultCenter] postNotificationName:@"QSApplicationDidFinishLaunchingNotification" object:self];
[QSObject interfaceChanged];

// Setup Activation Hotkey
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];

if ([defaults integerForKey:@"QSModifierActivationCount"] >0) {
QSModifierKeyEvent *modActivation = [[QSModifierKeyEvent alloc] init];
[modActivation setModifierActivationMask: [defaults integerForKey:@"QSModifierActivationKey"]];
[modActivation setModifierActivationCount:[defaults integerForKey:@"QSModifierActivationCount"]];
[modActivation setTarget:self];
[modActivation setIdentifier:@"QSModKeyActivation"];
[modActivation setAction:@selector(activateInterface:)];
[modActivation enable];
}

id oldModifiers = [defaults objectForKey:kHotKeyModifiers];
id oldKeyCode = [defaults objectForKey:kHotKeyCode];

//Update hotkey prefs

if (oldModifiers && oldKeyCode) {
NSInteger modifiers = [oldModifiers unsignedIntegerValue];
if (modifiers < (1 << (rightControlKeyBit+1) )) {
NSLog(@"updating hotkey %ld", (long)modifiers);
[defaults setValue:[NSNumber numberWithInteger:carbonModifierFlagsToCocoaModifierFlags(modifiers)] forKey:kHotKeyModifiers];
[defaults synchronize];
}

NSLog(@"Updating Activation Key");
[defaults removeObjectForKey:kHotKeyModifiers];
[defaults removeObjectForKey:kHotKeyCode];
[defaults setObject:[NSDictionary dictionaryWithObjectsAndKeys:oldModifiers, @"modifiers", oldKeyCode, @"keyCode", nil] forKey:@"QSActivationHotKey"];
[defaults synchronize];
}

[self bind:@"activationHotKey" toObject:[NSUserDefaultsController sharedUserDefaultsController] withKeyPath:@"values.QSActivationHotKey" options:nil];

QSApplicationCompletedLaunch = YES;
}

Expand Down
17 changes: 10 additions & 7 deletions Quicksilver/Code-App/QSTriggersPrefPane.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,10 @@ - (IBAction)hideTriggerInfo:(id)sender {


- (IBAction)addTrigger:(id)sender {
if (!mOptionKeyIsDown)
if (!mOptionKeyIsDown) {
[self setCurrentSet:@"Custom Triggers"];
[triggerSetsController setSelectionIndex:[[[self triggerSets] valueForKey:@"text"] indexOfObject:@"Custom Triggers"]];
}

NSMutableDictionary *info;
if (mOptionKeyIsDown) {
Expand Down Expand Up @@ -343,11 +345,13 @@ - (IBAction)addTrigger:(id)sender {
[[QSTriggerCenter sharedInstance] removeTrigger:trigger];
// [self updateTriggerArray];
}
// select the trigger (its position has changed since adding the trigger)
NSUInteger selectTriggerIndex = [[triggerArrayController arrangedObjects] indexOfObject:trigger];
if (selectTriggerIndex != NSNotFound && (NSInteger)selectTriggerIndex < [triggerTable numberOfRows]) {
[triggerTable selectRowIndexes:[NSIndexSet indexSetWithIndex:selectTriggerIndex] byExtendingSelection:NO];
[triggerTable scrollRowToVisible:selectTriggerIndex];
if (command) {
// select the trigger (its position has changed since adding the trigger)
NSUInteger selectTriggerIndex = [[triggerArrayController arrangedObjects] indexOfObject:trigger];
if (selectTriggerIndex != NSNotFound && (NSInteger)selectTriggerIndex < [triggerTable numberOfRows]) {
[triggerTable selectRowIndexes:[NSIndexSet indexSetWithIndex:selectTriggerIndex] byExtendingSelection:NO];
[triggerTable scrollRowToVisible:selectTriggerIndex];
}
}
[commandEditor.window orderOut:self];
}];
Expand Down Expand Up @@ -454,7 +458,6 @@ - (void)reloadFilters {
else
predicate = searchPredicate;
}

[triggerArrayController setFilterPredicate:predicate];
}

Expand Down
22 changes: 13 additions & 9 deletions Quicksilver/Nibs/QSTriggersPrefPane.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13D65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
<deployment version="1070" defaultVersion="1070" identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="QSTriggersPrefPane">
Expand All @@ -25,7 +25,7 @@
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application"/>
<window title="Triggers" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" wantsToBeColor="NO" visibleAtLaunch="NO" animationBehavior="default" id="62" userLabel="Triggers" customClass="QSWindow">
<window title="Triggers" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" visibleAtLaunch="NO" animationBehavior="default" id="62" userLabel="Triggers" customClass="QSWindow">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="161" y="212" width="384" height="424"/>
Expand All @@ -50,7 +50,7 @@
<tableViewGridLines key="gridStyleMask" horizontal="YES"/>
<color key="gridColor" red="0.94525545840000003" green="1" blue="0.94933468099999996" alpha="1" colorSpace="deviceRGB"/>
<tableColumns>
<tableColumn identifier="enabled" width="16.40576171875" minWidth="16.40576171875" maxWidth="16" id="484">
<tableColumn identifier="enabled" width="16" minWidth="16.40576171875" maxWidth="16" id="484">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="✓">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
Expand Down Expand Up @@ -93,13 +93,13 @@
</popUpButtonCell>
<tableColumnResizingMask key="resizingMask" userResizable="YES"/>
<connections>
<binding destination="-2" name="content" keyPath="typeMenuItems" id="496"/>
<binding destination="490" name="enabled" keyPath="arrangedObjects.isGroup" id="865">
<dictionary key="options">
<string key="NSValueTransformerName">NSNegateBoolean</string>
</dictionary>
</binding>
<binding destination="490" name="selectedObject" keyPath="arrangedObjects.type" previousBinding="496" id="497"/>
<binding destination="-2" name="content" keyPath="typeMenuItems" id="496"/>
</connections>
</tableColumn>
<tableColumn identifier="trigger" width="54" minWidth="54" maxWidth="128" id="486" customClass="QSDelegatingTableColumn">
Expand Down Expand Up @@ -228,8 +228,8 @@
<string>self</string>
</declaredKeys>
<connections>
<binding destination="-2" name="contentArray" keyPath="triggerArray" id="387"/>
<binding destination="490" name="sortDescriptors" keyPath="sortDescriptors" id="868"/>
<binding destination="-2" name="contentArray" keyPath="triggerArray" id="387"/>
</connections>
</arrayController>
<treeController objectClassName="QSTrigger" childrenKeyPath="children" leafKeyPath="isLeaf" selectsInsertedObjects="NO" id="490" userLabel="TriggerTreeController" customClass="QSTreeController">
Expand Down Expand Up @@ -457,12 +457,12 @@
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="490" name="value" keyPath="selection.info.applicationScope" id="779"/>
<binding destination="490" name="hidden" keyPath="selection.info.applicationScopeType" id="782">
<dictionary key="options">
<string key="NSValueTransformerName">NSNegateBoolean</string>
</dictionary>
</binding>
<binding destination="490" name="value" keyPath="selection.info.applicationScope" id="779"/>
<outlet property="delegate" destination="-2" id="777"/>
</connections>
</textField>
Expand Down Expand Up @@ -512,7 +512,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<clipView key="contentView" id="2q3-MA-dsf">
<rect key="frame" x="0.0" y="0.0" width="128" height="233"/>
<autoresizingMask key="autoresizingMask"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="32" id="731" customClass="QSFancyTableView">
<rect key="frame" x="0.0" y="0.0" width="128" height="233"/>
Expand All @@ -538,6 +538,10 @@
</connections>
</tableColumn>
</tableColumns>
<connections>
<binding destination="737" name="content" keyPath="arrangedObjects" id="Jde-Cf-kgt"/>
<binding destination="737" name="selectionIndexes" keyPath="selectionIndexes" previousBinding="Jde-Cf-kgt" id="x3i-Bz-0m7"/>
</connections>
</tableView>
</subviews>
<color key="backgroundColor" red="0.90588235859999999" green="0.92941176889999999" blue="0.97254902119999997" alpha="1" colorSpace="deviceRGB"/>
Expand Down Expand Up @@ -567,4 +571,4 @@
<image name="Button-Info" width="12" height="12"/>
<image name="Button-Remove" width="12" height="12"/>
</resources>
</document>
</document>