Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 8 additions & 3 deletions Quicksilver/Code-QuickStepInterface/QSObjectView.m
Original file line number Diff line number Diff line change
Expand Up @@ -237,11 +237,16 @@ - (NSDragOperation) draggingSourceOperationMaskForLocal:(BOOL)isLocal {
else return ([[NSApp currentEvent] modifierFlags] & NSEventModifierFlagCommand) ? NSDragOperationNone : NSDragOperationEvery;
}

- (void)draggedImage:(NSImage *)anImage endedAt:(NSPoint)aPoint operation:(NSDragOperation)operation {
- (void)draggingSession:(NSDraggingSession *)session endedAtPoint:(NSPoint)screenPoint operation:(NSDragOperation)operation {
performingDrag = NO;
// NSLog(@"ended at %f %f %d", aPoint.x, aPoint.y, operation);
// if (operation == NSDragOperationNone) NSShowAnimationEffect(NSAnimationEffectDisappearingItemDefault, aPoint, NSZeroSize, nil, nil, nil);
// NSLog(@"ended at %f %f %d", screenPoint.x, screenPoint.y, operation);
// if (operation == NSDragOperationNone) NSShowAnimationEffect(NSAnimationEffectDisappearingItemDefault, screenPoint, NSZeroSize, nil, nil, nil);
// if (operation == NSDragOperationMove) [self removeFromSuperview];

// Check if drag was successful (not NSDragOperationNone) and close interface if preference is set
if (operation != NSDragOperationNone && [[NSUserDefaults standardUserDefaults] boolForKey:@"QSCloseInterfaceOnSuccessfulDrop"]) {
[[self controller] hideMainWindow:self];
}
}

//Dragging
Expand Down
2 changes: 2 additions & 0 deletions Quicksilver/Localized/en.lproj/QSAdvancedPrefPane.strings
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@

"Double Delete Clears Object:title" = "Pressing the Delete key clears the whole search string";
"QSHistoryMaxLength:title" = "Number of items in Quicksilver’s history";

"QSCloseInterfaceOnSuccessfulDrop:title" = "Close the interface after a successful drag and drop";
17 changes: 16 additions & 1 deletion Quicksilver/Quicksilver.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -2205,7 +2205,7 @@
E18001D007B2BBB800010DB0 /* QSCatalogPrefPane.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = QSCatalogPrefPane.h; sourceTree = "<group>"; usesTabs = 1; };
E18001D107B2BBB800010DB0 /* QSCatalogPrefPane.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = QSCatalogPrefPane.m; sourceTree = "<group>"; usesTabs = 1; };
E18001D407B2BBB800010DB0 /* QSController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = QSController.h; sourceTree = "<group>"; usesTabs = 0; };
E18001D507B2BBB800010DB0 /* QSController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QSController.m; sourceTree = "<group>"; usesTabs = 1; };
E18001D507B2BBB800010DB0 /* QSController.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = QSController.m; sourceTree = "<group>"; usesTabs = 0; };
E18001DA07B2BBB800010DB0 /* QSGetURLScriptCommand.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = QSGetURLScriptCommand.h; sourceTree = "<group>"; usesTabs = 1; };
E18001DB07B2BBB800010DB0 /* QSGetURLScriptCommand.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = QSGetURLScriptCommand.m; sourceTree = "<group>"; usesTabs = 1; };
E18001DC07B2BBB800010DB0 /* QSHelpersPrefPane.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = QSHelpersPrefPane.h; sourceTree = "<group>"; usesTabs = 1; };
Expand Down Expand Up @@ -4245,6 +4245,7 @@
isa = PBXNativeTarget;
buildConfigurationList = 7F6B3E68085CE68E000735A8 /* Build configuration list for PBXNativeTarget "Quicksilver" */;
buildPhases = (
66CAE627153EF9AD0021BC65 /* Check Code Signing Certificate */,
8D1107270486CEB800E47090 /* Headers */,
8D1107290486CEB800E47090 /* Resources */,
E1C3BE5106EA0AC500B848D6 /* Copy Plists */,
Expand Down Expand Up @@ -4863,6 +4864,20 @@
shellPath = /bin/sh;
shellScript = "# Intentionally blank -- only purpose is to tell XCode about the existence of\n# `Configuration/Quicksilver.pch`, copied in the step above, for automatic\n# dependency resolution. Without this (or something like it), one gets a race\n# condition with a lot of `/tmp/QS/Configuration/Quicksilver.pch: file not found`\n# type errors the first time XCode builds, which mysteriously resolve upon a\n# second build.\n#\n# Confirmed working alternatives to this hack:\n# - remove the `Copy Files` step above and use `cp -r` here instead\n# - Add a second (redundant) `Copy Files` step that explicitly (re-)copies `Quicksilver.pch`\n";
};
66CAE627153EF9AD0021BC65 /* Check Code Signing Certificate */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Code Signing Certificate";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Check if Local Self-Signed certificate exists, fail if not found\n\nset -euf\n\n# Skip this check if running on GitHub CI\nif [ \"${CI:-}\" = \"true\" ] && [ \"${GITHUB_ACTIONS:-}\" = \"true\" ]; then\n echo \"Running on GitHub CI - skipping certificate check\"\n exit 0\nfi\n\n# Check if the Local Self-Signed certificate exists in the keychain\nif ! security find-identity -v -p codesigning | grep -q \"Local Self-Signed\"; then\n echo \"ERROR: Local Self-Signed certificate not found!\"\n echo \"Please run the following command to set up code signing:\"\n echo \" ${SRCROOT}/Tools/codesign/setup_cert.sh\"\n echo \"\"\n echo \"This will create a self-signed certificate for local development.\"\n exit 1\nelse\n echo \"Local Self-Signed certificate found.\"\nfi\n";
};
66CAE628153EF9AE0021BC65 /* Adjust Version-String */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down
10 changes: 10 additions & 0 deletions Quicksilver/Resources/DefaultsMap.plist
Original file line number Diff line number Diff line change
Expand Up @@ -132,5 +132,15 @@
<key>type</key>
<string>text</string>
</dict>
<dict>
<key>category</key>
<string>Command</string>
<key>default</key>
<string>QSCloseInterfaceOnSuccessfulDrop</string>
<key>title</key>
<string>Close the interface after a successful drag and drop</string>
<key>type</key>
<string>checkbox</string>
</dict>
</array>
</plist>
Loading