Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #1295 from pjrobertson/services
Reshuffle of services and add trigger for ⌘⎋. Fixes #409
  • Loading branch information
skurfer committed Jan 29, 2013
2 parents 5cbbeb2 + dc4adae commit 8cae4eb
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 42 deletions.
2 changes: 1 addition & 1 deletion Quicksilver/Code-QuickStepCore/QSGlobalSelectionProvider.m
Expand Up @@ -59,7 +59,7 @@ - (NSPasteboard *)getSelectionFromFrontApp {
NSRunLoop *loop = [NSRunLoop currentRunLoop];
NSDate *date = [NSDate date];
while(!resultPboard && [date timeIntervalSinceNow] >-2) {
[loop runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.5]];
[loop runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
// NSLog(@"loop");
}
// NSLog(@"got %@", resultPboard);
Expand Down
6 changes: 6 additions & 0 deletions Quicksilver/PlugIns-Main/QSCorePlugIn/QSCorePlugIn-Info.plist
Expand Up @@ -752,6 +752,12 @@
<dict>
<key>set</key>
<string>Quicksilver</string>
<key>enabled</key>
<true/>
<key>keyCode</key>
<integer>53</integer>
<key>modifiers</key>
<integer>1048840</integer>
<key>type</key>
<string>QSHotKeyTrigger</string>
<key>command</key>
Expand Down
46 changes: 5 additions & 41 deletions Quicksilver/PropertyLists/Quicksilver-Info.plist
Expand Up @@ -225,10 +225,14 @@
<key>NSMenuItem</key>
<dict>
<key>default</key>
<string>Quicksilver/Get Current Selection (Internal)</string>
<string>Get Current Selection (Do Not Change Shortcut)</string>
</dict>
<key>NSRequiredContext</key>
<dict/>
<key>NSSendFileTypes</key>
<array>
<string>public.data</string>
</array>
<key>NSSendTypes</key>
<array>
<string>NSFilenamesPboardType</string>
Expand Down Expand Up @@ -263,46 +267,6 @@
<string></string>
</dict>
</dict>
<dict>
<key>NSMenuItem</key>
<dict>
<key>default</key>
<string>Quicksilver/Send to Quicksilver</string>
</dict>
<key>NSUserData</key>
<string>Send</string>
<key>NSSendTypes</key>
<array>
<string>NSFilenamesPboardType</string>
<string>NSFileContentsPboardType</string>
<string>NSFontPboardType</string>
<string>NSColorPboardType</string>
<string>NSHTMLPboardType</string>
<string>NSPDFPboardType</string>
<string>NSPICTPboardType</string>
<string>NSPostScriptPboardType</string>
<string>NSRulerPboardType</string>
<string>NSRTFPboardType</string>
<string>NSRTFDPboardType</string>
<string>NSStringPboardType</string>
<string>NSTabularTextPboardType</string>
<string>NSTIFFPboardType</string>
<string>NSURLPboardType</string>
<string>NSVCardPboardType</string>
<string>NSFilesPromisePboardType</string>
</array>
<key>NSPortName</key>
<string>Quicksilver</string>
<key>NSTimeout</key>
<string>60000</string>
<key>NSMessage</key>
<string>performService</string>
<key>NSKeyEquivalent</key>
<dict>
<key>default</key>
<string></string>
</dict>
</dict>
</array>
<key>LSUIElement</key>
<true/>
Expand Down

0 comments on commit 8cae4eb

Please sign in to comment.