Skip to content
Browse files

remove featureLevel and related variables/methods - closes #341

  • Loading branch information...
1 parent aee8bc8 commit be854cdae8cae6c3c7ba07fc3d323e07b98e619d @skurfer skurfer committed
Showing with 37 additions and 162 deletions.
  1. +0 −3 Quicksilver/Code-App/QSApp.h
  2. +0 −11 Quicksilver/Code-App/QSApp.m
  3. +9 −7 Quicksilver/Code-App/QSController.m
  4. +0 −1 Quicksilver/Code-App/QSHelpersPrefPane.m
  5. +0 −2 Quicksilver/Code-App/QSMainPreferencePanes.h
  6. +0 −24 Quicksilver/Code-App/QSMainPreferencePanes.m
  7. +1 −1 Quicksilver/Code-App/QSPlugInsPrefPane.m
  8. +0 −2 Quicksilver/Code-App/QSPreferencesController.m
  9. +0 −1 Quicksilver/Code-QuickStepCore/QSCatalogEntry.h
  10. +4 −24 Quicksilver/Code-QuickStepCore/QSCatalogEntry.m
  11. +0 −1 Quicksilver/Code-QuickStepCore/QSCore.h
  12. +0 −10 Quicksilver/Code-QuickStepCore/QSExecutor.m
  13. +0 −13 Quicksilver/Code-QuickStepCore/QSFeatureLevel.h
  14. +0 −1 Quicksilver/Code-QuickStepCore/QSKeys.h
  15. +0 −1 Quicksilver/Code-QuickStepCore/QSPlugIn.h
  16. +0 −11 Quicksilver/Code-QuickStepCore/QSPlugIn.m
  17. +0 −2 Quicksilver/Code-QuickStepCore/QSPreferenceKeys.h
  18. +0 −1 Quicksilver/Code-QuickStepFoundation/NSApplication_BLTRExtensions.h
  19. +0 −2 Quicksilver/Code-QuickStepFoundation/NSApplication_BLTRExtensions.m
  20. +1 −2 Quicksilver/Code-QuickStepInterface/QSFileConflictPanel.m
  21. +2 −4 Quicksilver/Code-QuickStepInterface/QSInterfaceController.m
  22. +2 −2 Quicksilver/Code-QuickStepInterface/QSObjectView.m
  23. +0 −3 Quicksilver/Code-QuickStepInterface/QSPreferencePane.m
  24. +1 −2 Quicksilver/Code-QuickStepInterface/QSResultController.m
  25. +6 −11 Quicksilver/Code-QuickStepInterface/QSSearchObjectView.m
  26. +2 −2 Quicksilver/PlugIns-Main/QSCorePlugIn/Code/QSActionProvider_EmbeddedProviders.m
  27. +7 −10 Quicksilver/PlugIns-Main/QSCorePlugIn/Code/QSDefaultsObjectSource.m
  28. +2 −4 Quicksilver/PlugIns-Main/QSCorePlugIn/Code/QSFileSystemObjectSource.m
  29. +0 −4 Quicksilver/Quicksilver.xcodeproj/project.pbxproj
View
3 Quicksilver/Code-App/QSApp.h
@@ -5,13 +5,11 @@
//extern BOOL QSApplicationCompletedLaunch;
@interface QSApp : NSApplication {
- int featureLevel;
BOOL isUIElement, shouldRelaunch;
IBOutlet NSMenu *hiddenMenu;
NSResponder *globalKeyEquivalentTarget;
NSMutableArray *eventDelegates;
}
-- (int) featureLevel;
- (BOOL)isUIElement;
- (BOOL)setShouldBeUIElement:(BOOL)hidden; //Returns YES if successful
@@ -22,5 +20,4 @@
- (void)setGlobalKeyEquivalentTarget:(NSResponder *)value;
- (void)addEventDelegate:(id)eDelegate;
- (void)removeEventDelegate:(id)eDelegate;
-- (BOOL)devLevel;
@end
View
11 Quicksilver/Code-App/QSApp.m
@@ -78,12 +78,6 @@ - (id)init {
[defaults setBool:NO forKey:kHideDockIcon];
}
}
-
- featureLevel = [defaults integerForKey:kFeatureLevel];
- if (featureLevel < 0)
- featureLevel = 0;
- else if (featureLevel > 2 && !([defaults boolForKey:kCuttingEdgeFeatures]) )
- featureLevel = 2;
}
return self;
}
@@ -105,11 +99,6 @@ - (void)setApplicationIconImage:(NSImage *)image {
[super setApplicationIconImage:image];
}
-- (int)featureLevel {return featureLevel;}
-- (BOOL)betaLevel {return featureLevel>0;}
-- (BOOL)alphaLevel {return featureLevel>1;}
-- (BOOL)devLevel {return featureLevel>2;}
-
- (BOOL)_handleKeyEquivalent:(NSEvent *)event {
if ([[self globalKeyEquivalentTarget] performKeyEquivalent:event])
return YES;
View
16 Quicksilver/Code-App/QSController.m
@@ -569,8 +569,10 @@ - (void)setAESelection:(NSAppleEventDescriptor *)desc {
object = [QSObject objectWithString:(NSString *)desc];
else if ([desc isKindOfClass:[NSArray class]])
object = [QSObject fileObjectWithArray:(NSArray *)desc];
- else if (fDEV) {
+ else {
+#ifdef DEBUG
NSLog(@"descriptor %@ %@", NSStringFromClass([desc class]), desc);
+#endif
object = [QSObject objectWithAEDescriptor:desc];
}
NSLog(@"object %@", object);
@@ -631,7 +633,7 @@ - (void)checkForFirstRun {
int lastVersion = [lastVersionString respondsToSelector:@selector(hexIntValue)] ? [lastVersionString hexIntValue] : 0;
switch (status) {
case QSApplicationUpgradedLaunch:
- if (fBETA && lastLocation && ![bundlePath isEqualToString:[lastLocation stringByStandardizingPath]]) {
+ if (lastLocation && ![bundlePath isEqualToString:[lastLocation stringByStandardizingPath]]) {
//New version in new location.
[NSApp activateIgnoringOtherApps:YES];
int selection = NSRunAlertPanel(@"Running from a new location", @"The previous version of Quicksilver was located in \"%@\". Would you like to move this new version to that location?", @"Move and Relaunch", @"Don't Move", nil, [[lastLocation stringByDeletingLastPathComponent] lastPathComponent]);
@@ -1034,11 +1036,11 @@ - (void)registerForErrors {
signal(SIGBUS, QSSignalHandler);
signal(SIGSEGV, QSSignalHandler);
- if (fDEV) {
- NSExceptionHandler *handler = [NSExceptionHandler defaultExceptionHandler];
- [handler setExceptionHandlingMask:NSLogAndHandleEveryExceptionMask];
- [handler setDelegate:self];
- }
+#ifdef DEBUG
+ NSExceptionHandler *handler = [NSExceptionHandler defaultExceptionHandler];
+ [handler setExceptionHandlingMask:NSLogAndHandleEveryExceptionMask];
+ [handler setDelegate:self];
+#endif
}
- (BOOL)exceptionHandler:(NSExceptionHandler *)sender shouldLogException:(NSException *)exception mask:(unsigned int)aMask {
View
1 Quicksilver/Code-App/QSHelpersPrefPane.m
@@ -98,7 +98,6 @@ - (void)reloadHelpersList:(id)sender {
foreachkey(key, header, [QSReg tableNamed:@"QSRegistryHeaders"]) {
if ([[header objectForKey:@"type"] isEqual:@"mediator"]) {
NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithObject:header forKey:INFO];
- if ([[header objectForKey:@"feature"] intValue] > [NSApp featureLevel]) continue;
NSMenu *menu = [self menuForTable:key includeDefault:[[header objectForKey:@"allowDefault"] boolValue]];
if (!menu) continue;
if (menu)
View
2 Quicksilver/Code-App/QSMainPreferencePanes.h
@@ -28,8 +28,6 @@
@interface QSApplicationPrefPane : QSPreferencePane {
- IBOutlet NSMatrix *featureLevelMatrix;
- int newFeatureLevel;
}
- (IBAction)checkNow:(id)sender;
- (IBAction)resetQS:(id)sender;
View
24 Quicksilver/Code-App/QSMainPreferencePanes.m
@@ -220,30 +220,6 @@ - (void)setDockIconIsHidden:(BOOL)flag {
[NSApp requestRelaunch:nil];
}
-- (int) featureLevel {
- if (newFeatureLevel) return newFeatureLevel;
- else return [NSApp featureLevel];
-}
-
-- (void)setFeatureLevel:(id)level {
- int newLevel = [level intValue];
- newFeatureLevel = newLevel;
- NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
- if (newLevel == 1 && (GetCurrentKeyModifiers() & (optionKey | rightOptionKey) )) {
- newLevel++;
- NSBeep();
- }
- if (newLevel == 2 && (GetCurrentKeyModifiers() & (shiftKey | optionKey | rightOptionKey))) {
- newLevel++;
- NSBeep();
- [defaults setBool:YES forKey:kCuttingEdgeFeatures];
- }
- [defaults setInteger:newLevel forKey:kFeatureLevel];
- [defaults synchronize];
- if (newLevel != [NSApp featureLevel])
- [NSApp requestRelaunch:nil];
-}
-
- (IBAction)checkNow:(id)sender {
[[QSUpdateController sharedInstance] threadedRequestedCheckForUpdate:sender];
}
View
2 Quicksilver/Code-App/QSPlugInsPrefPane.m
@@ -362,7 +362,7 @@ - (void)reloadFiltersIgnoringViewMode:(BOOL)ignoreView {
[predicates addObject:[NSPredicate predicateWithFormat:@"installed == YES || isRecommended == YES"]];
break;
case 3: //All
- [predicates addObject:[NSPredicate predicateWithFormat:@"meetsFeature == YES"]];
+ [predicates addObject:[NSPredicate predicateWithFormat:@"1 == 1"]];
break;
case 4: //UnInstalled
[predicates addObject:[NSPredicate predicateWithFormat:@"isInstalled <= 0"]];
View
2 Quicksilver/Code-App/QSPreferencesController.m
@@ -136,8 +136,6 @@ - (void)loadPlugInInfo:(NSNotification *)notif {
//NSLog(@"Not Loading Old-Style Prefs: %@", paneInfo);
continue;
}
- //NSLog(@"feature %@ %d", [paneInfo objectForKey:@"feature"] , [NSApp featureLevel]);
- if ([[paneInfo objectForKey:@"feature"] intValue] >[NSApp featureLevel]) continue;
NSString *imageName = [paneInfo objectForKey:@"icon"];
NSImage *image = [[QSResourceManager imageNamed:imageName] copy];
View
1 Quicksilver/Code-QuickStepCore/QSCatalogEntry.h
@@ -31,7 +31,6 @@
- (NSDictionary *)dictionaryRepresentation;
- (QSCatalogEntry *)childWithID:(NSString *)theID;
- (QSCatalogEntry *)childWithPath:(NSString *)path;
-- (BOOL)isRestricted;
- (BOOL)isSuppressed;
- (BOOL)isPreset;
- (BOOL)isSeparator;
View
28 Quicksilver/Code-QuickStepCore/QSCatalogEntry.m
@@ -110,18 +110,6 @@ - (QSCatalogEntry *)childWithPath:(NSString *)path {
return object;
}
-
-
-- (BOOL)isRestricted {
-#ifdef DEBUG
- return NO;
-#endif
- NSString *sourceType = [info objectForKey:kItemSource];
- if ([sourceType isEqualToString:@"QSGroupObjectSource"] || [QSReg sourceNamed:sourceType])
- return [NSApp featureLevel] < [[info objectForKey:kItemFeatureLevel] intValue];
- return YES;
-}
-
- (BOOL)isSuppressed {
#ifdef DEBUG
return NO;
@@ -196,9 +184,7 @@ - (BOOL)shouldIndex {
}
- (BOOL)isEnabled {
- if ([self isRestricted])
- return NO;
- else if ([self isPreset]) {
+ if ([self isPreset]) {
NSNumber *value;
if (value = [[QSLibrarian sharedInstance] presetIsEnabled:self])
return [value boolValue];
@@ -206,8 +192,9 @@ - (BOOL)isEnabled {
return [value boolValue];
// ***warning * this is just a little silly...
return YES;
- } else
+ } else {
return [[info objectForKey:kItemEnabled] boolValue];
+ }
}
- (void)setEnabled:(BOOL)enabled {
@@ -232,14 +219,7 @@ - (void)pruneInvalidChildren {
NSMutableArray *children2 = [children copy];
for(QSCatalogEntry * child in children2) {
if ([child isSeparator]) break; //Stop when at end of presets
- if ([child isRestricted]) {
-
-#ifdef DEBUG
- if (DEBUG_CATALOG) NSLog(@"Disabling Preset:%@", [child identifier]);
-#endif
-
- [children removeObject:child];
- } else if (![[NSUserDefaults standardUserDefaults] boolForKey:@"Show All Catalog Entries"] && [child isSuppressed]) {
+ if (![[NSUserDefaults standardUserDefaults] boolForKey:@"Show All Catalog Entries"] && [child isSuppressed]) {
#ifdef DEBUG
if (DEBUG_CATALOG) NSLog(@"Suppressing Preset:%@", [child identifier]);
View
1 Quicksilver/Code-QuickStepCore/QSCore.h
@@ -22,7 +22,6 @@
#import "QSDefines.h"
#import "QSense.h"
#import "QSExecutor.h"
-#import "QSFeatureLevel.h"
#import "QSGlobalSelectionProvider.h"
#import "QSHandledObjectHandler.h"
#import "QSHelp.h"
View
10 Quicksilver/Code-QuickStepCore/QSExecutor.m
@@ -510,16 +510,6 @@ - (BOOL)handleInfo:(id)info ofType:(NSString *)type fromBundle:(NSBundle *)bundl
NSDictionary *actionDict;
for (NSString *key in info) {
actionDict = [info objectForKey:key];
- if ([[actionDict objectForKey:kItemFeatureLevel] intValue] > [NSApp featureLevel]) {
- NSString * actionIdentifier = [actionDict objectForKey:kItemID];
- if (!actionIdentifier) {
- NSLog(@"Prevented load of unidentified action from bundle %@ because the action's featureLevel (set from its Info.plist) is higher than NSApp's current featureLevel. This is not neccessarily an error. Sometimes this mechanism is used to prevent unstable actions from loading.", [[bundle bundlePath] lastPathComponent]);
- } else {
- NSLog(@"Prevented load of action %@ because it's featureLevel (set from its Info.plist) is higher than NSApp's current featureLevel. This is not neccessarily an error. Sometimes this mechanism is used to prevent unstable actions from loading.", actionIdentifier);
- }
- continue;
- }
-
QSAction *action = [QSAction actionWithDictionary:actionDict identifier:key];
[action setBundle:bundle];
View
13 Quicksilver/Code-QuickStepCore/QSFeatureLevel.h
@@ -1,13 +0,0 @@
-/*
- * QSFeatureLevel.h
- * Quicksilver
- *
- * Created by Alcor on 2/3/05.
- * Copyright 2005 Blacktree. All rights reserved.
- *
- */
-
-#define fDEV ((int) [NSApp featureLevel] >2)
-#define fALPHA ((int) [NSApp featureLevel] >1)
-#define fBETA ((int) [NSApp featureLevel] >0)
-#define fSPECIAL 0
View
1 Quicksilver/Code-QuickStepCore/QSKeys.h
@@ -5,7 +5,6 @@
#define kItemDescription @"description"
#define kItemChildren @"children"
#define kItemID @"ID"
-#define kItemFeatureLevel @"feature"
#define kItemEnabled @"enabled"
#define kItemModificationDate @"modificationDate"
#define kItemSettings @"settings"
View
1 Quicksilver/Code-QuickStepCore/QSPlugIn.h
@@ -58,7 +58,6 @@
- (NSString *)bundleIdentifier;
- (NSString *)bundlePath;
- (int) isLoaded;
-- (BOOL)meetsFeature;
- (NSDictionary *)info;
- (BOOL)isUniversal;
- (BOOL)isSecret;
View
11 Quicksilver/Code-QuickStepCore/QSPlugIn.m
@@ -273,7 +273,6 @@ - (BOOL)isSecret {
- (BOOL)isRecommended {
if ([[[self info] valueForKeyPath:@"QSPlugIn.recommended"] boolValue]) return YES;
if ([self isInstalled] >0) return NO;
- if (![self meetsFeature]) return NO;
NSWorkspace *ws = [NSWorkspace sharedWorkspace];
NSArray *related = [self relatedBundles];
//if (!related) return YES;
@@ -394,10 +393,6 @@ - (BOOL)isHidden {
if (bundle == [NSBundle mainBundle]) return YES;
return [[[self info] valueForKeyPath:@"QSPlugIn.hidden"] boolValue];
}
-- (BOOL)meetsFeature {
- //return YES; // Override this for now
- return [[[self info] valueForKeyPath:@"QSRequirements.feature"] intValue] <= [NSApp featureLevel];
-}
- (int) isLoaded {return loaded;}
#define disabledPlugIns [[NSUserDefaults standardUserDefaults] arrayForKey:@"QSDisabledPlugIns"]
@@ -591,12 +586,6 @@ - (BOOL)meetsRequirements:(NSString **)error {
return NO;
}
}
-
-// int feature = [[requirementsDict objectForKey:@"feature"] intValue];
-// if (feature>[NSApp featureLevel]) {
-// if (error) *error = @"Feature Level not Met";
-// return NO;
-// }
}
return YES;
}
View
2 Quicksilver/Code-QuickStepCore/QSPreferenceKeys.h
@@ -14,8 +14,6 @@ Following lines are no longer used in this project.
#define kHotKeyCode @"HotKey Code"
#define kHotKeyModifiers @"HotKey Modifiers"
#define kUseEffects @"Use Effects"
-#define kCuttingEdgeFeatures @"Cutting Edge Features"
-#define kFeatureLevel @"Feature Level"
#define kShowReleaseNotesOnUpgrade @"Show Release Notes on Upgrade"
#define kSetupAssistantCompleted @"Setup Assistant Completed"
View
1 Quicksilver/Code-QuickStepFoundation/NSApplication_BLTRExtensions.h
@@ -12,7 +12,6 @@
@interface NSApplication (Info)
- (BOOL)wasLaunchedAtLogin;
- (NSString *)versionString;
-- (int) featureLevel;
- (NSDictionary *)processInformation;
- (NSDictionary *)parentProcessInformation;
@end
View
2 Quicksilver/Code-QuickStepFoundation/NSApplication_BLTRExtensions.m
@@ -35,8 +35,6 @@ - (NSString *)versionString {
return [NSString stringWithFormat:@"%@ (%@) ", [info objectForKey:@"CFBundleShortVersionString"], [info objectForKey:@"CFBundleVersion"]];
}
-- (int)featureLevel {return 0;}
-
- (NSDictionary *)processInformation {
ProcessSerialNumber currPSN;
OSStatus err = GetCurrentProcess (&currPSN);
View
3 Quicksilver/Code-QuickStepInterface/QSFileConflictPanel.m
@@ -14,8 +14,7 @@ - (void)awakeFromNib {
QSImageAndTextCell *imageAndTextCell = [[QSImageAndTextCell alloc] init];
[imageAndTextCell setEditable:YES];
[imageAndTextCell setWraps:NO];
- if ([(QSApp*)NSApp devLevel])
- [smartReplaceButton setHidden:0];
+ [smartReplaceButton setHidden:0];
[[[nameTable tableColumns] objectAtIndex:0] setDataCell:imageAndTextCell];
[imageAndTextCell release];
}
View
6 Quicksilver/Code-QuickStepInterface/QSInterfaceController.m
@@ -76,8 +76,7 @@ - (id)initWithWindow:(NSWindow *)window {
[nc addObserver:self selector:@selector(objectIconModified:) name:QSObjectIconModified object:nil];
[nc addObserver:self selector:@selector(searchObjectChanged:) name:@"SearchObjectChanged" object:nil];
[nc addObserver:self selector:@selector(appChanged:) name:QSActiveApplicationChanged object:nil];
- if (fALPHA)
- [QSHistoryController sharedInstance];
+ [QSHistoryController sharedInstance];
return self;
}
@@ -591,8 +590,7 @@ - (void)executeCommand:(id)sender cont:(BOOL)cont encapsulate:(BOOL)encapsulate
[NSThread detachNewThreadSelector:@selector(executeCommandThreaded) toTarget:self withObject:nil];
else
[self executeCommandThreaded];
- if (fALPHA)
- [QSHist addCommand:[self currentCommand]];
+ [QSHist addCommand:[self currentCommand]];
[dSelector saveMnemonic];
[aSelector saveMnemonic];
if (argumentCount == 2) {
View
4 Quicksilver/Code-QuickStepInterface/QSObjectView.m
@@ -262,7 +262,7 @@ - (NSDragOperation) draggingUpdated:(id <NSDraggingInfo>)sender {
cursor = [NSCursor informativeCursorWithString:@"Select"];
[cursor set];
[[self cell] setHighlighted:NO];
- } else if (fDEV && [[NSApp currentEvent] modifierFlags] & NSControlKeyMask) {
+ } else if ([[NSApp currentEvent] modifierFlags] & NSControlKeyMask) {
cursor = [NSCursor informativeCursorWithString:@"Choose Action..."];
[cursor performSelector:@selector(set) withObject:nil afterDelay:0.0];
operation = NSDragOperationPrivate;
@@ -293,7 +293,7 @@ - (void)drawRect:(NSRect)rect { [[self cell] drawWithFrame:rectFromSize([self fr
- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender {
NSString *action = [[self objectValue] actionForDragOperation:lastDragMask withObject:draggedObject];
- if (fDEV && [[NSApp currentEvent] modifierFlags] & NSControlKeyMask) {
+ if ([[NSApp currentEvent] modifierFlags] & NSControlKeyMask) {
if ([[[self objectValue] resolvedObject] respondsToSelector:@selector(actionsMenu)]) {
NSMenu *actionsMenu = [[[self objectValue] resolvedObject] performSelector:@selector(actionsMenu)];
[NSMenu popUpContextMenu:actionsMenu withEvent:[NSApp currentEvent] forView:self];
View
3 Quicksilver/Code-QuickStepInterface/QSPreferencePane.m
@@ -42,9 +42,6 @@
//- (NSString *)paneDescription {
// return @"Preferences";
//}
-//- (int) featureLevel {
-// return 1;
-//}
//- (NSString *)identifier {
// return NSStringFromClass([self class]);
//}
View
3 Quicksilver/Code-QuickStepInterface/QSResultController.m
@@ -496,8 +496,7 @@ - (void)setupResultTable {
[[tableColumn dataCell] setFont:[NSFont systemFontOfSize:9]];
[[tableColumn dataCell] setTextColor:[NSColor darkGrayColor]];
- if (1 || !fDEV)
- [resultTable removeTableColumn:tableColumn];
+ [resultTable removeTableColumn:tableColumn];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(viewChanged:) name:NSViewBoundsDidChangeNotification object:[[resultTable enclosingScrollView] contentView]];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(childViewChanged:) name:NSViewBoundsDidChangeNotification object:[[resultChildTable enclosingScrollView] contentView]];
View
17 Quicksilver/Code-QuickStepInterface/QSSearchObjectView.m
@@ -391,7 +391,7 @@ - (void)setResultsPadding:(float)aResultsPadding { resultsPadding = aResultsPadd
#pragma mark Menu Items
- (BOOL)validateMenuItem:(NSMenuItem*)anItem {
if ([anItem action] == @selector(newFile:) ) {
- return fDEV;
+ return YES;
}
if ([anItem action] == @selector(goForward:) ) {
return historyIndex > 0;
@@ -934,14 +934,9 @@ - (void)sourceArrayChanged:(NSNotification *)notif {
- (void)partialStringChanged {
[self setSearchString:[[partialString copy] autorelease]];
- double searchDelay = 0.0f;
- if (fALPHA)
- searchDelay = [[QSLibrarian sharedInstance] estimatedTimeForSearchInSet:searchArray] * 0.9f;
- else
- searchDelay = [[NSUserDefaults standardUserDefaults] floatForKey:kSearchDelay];
-
-
- if (fALPHA && moreComing) {
+ double searchDelay = [[NSUserDefaults standardUserDefaults] floatForKey:kSearchDelay];
+
+ if (moreComing) {
if ([searchTimer isValid]) [searchTimer invalidate];
} else {
if (![searchTimer isValid]) {
@@ -1060,7 +1055,7 @@ - (void)keyDown:(NSEvent *)theEvent {
}
// check for additional keydowns up to now so the search isn't done too often.
- if (fALPHA) moreComing = nil != [NSApp nextEventMatchingMask:NSKeyDownMask untilDate:[NSDate dateWithTimeIntervalSinceNow:SEARCH_RESULT_DELAY] inMode:NSDefaultRunLoopMode dequeue:NO];
+ moreComing = nil != [NSApp nextEventMatchingMask:NSKeyDownMask untilDate:[NSDate dateWithTimeIntervalSinceNow:SEARCH_RESULT_DELAY] inMode:NSDefaultRunLoopMode dequeue:NO];
#ifdef DEBUG
if (VERBOSE && moreComing) NSLog(@"moreComing");
#endif
@@ -1127,7 +1122,7 @@ - (BOOL)handleSlashEvent:(NSEvent *)theEvent {
} else if(!upEvent) {
[self setObjectValue:[QSObject fileObjectWithPath:@"/"]];
upEvent = [NSApp nextEventMatchingMask:NSKeyUpMask untilDate:[NSDate dateWithTimeIntervalSinceNow:0.25] inMode:NSDefaultRunLoopMode dequeue:YES];
- if (fBETA && !upEvent)
+ if (!upEvent)
[self moveRight:self];
}
View
4 Quicksilver/PlugIns-Main/QSCorePlugIn/Code/QSActionProvider_EmbeddedProviders.m
@@ -139,7 +139,7 @@ - (QSObject *)doURLOpenAction:(QSObject *)dObject {
}
}
// TODO: Bring this back later
-// if (fALPHA && ![QSAction modifiersAreIgnored] && mOptionKeyIsDown) {
+// if (![QSAction modifiersAreIgnored] && mOptionKeyIsDown) {
/* if (mOptionKeyIsDown) {
id cont = [[NSClassFromString(@"QSSimpleWebWindowController") alloc] initWithWindow:nil];
[(QSSimpleWebWindowController *)cont openURL:[urlArray lastObject]];
@@ -169,7 +169,7 @@ - (QSObject *)doURLOpenActionInBackground:(QSObject *)dObject {
}
}
// TODO: Bring this back later
- // if (fALPHA && ![QSAction modifiersAreIgnored] && mOptionKeyIsDown) {
+ // if (![QSAction modifiersAreIgnored] && mOptionKeyIsDown) {
/* if (mOptionKeyIsDown) {
id cont = [[NSClassFromString(@"QSSimpleWebWindowController") alloc] initWithWindow:nil];
[(QSSimpleWebWindowController *)cont openURL:[urlArray lastObject]];
View
17 Quicksilver/PlugIns-Main/QSCorePlugIn/Code/QSDefaultsObjectSource.m
@@ -18,24 +18,21 @@
#define kDefaultsObjectSourceKeyList @"keypath"
#define kDefaultsObjectSourceType @"type"
#import "QSVoyeur.h"
-#import "QSFeatureLevel.h"
@implementation QSDefaultsObjectSource
-- (BOOL)isVisibleSource { return fALPHA; }
+- (BOOL)isVisibleSource { return YES; }
- (BOOL)usesGlobalSettings { return NO; }
- (void)enableEntry:(QSCatalogEntry *)entry {
- if (fALPHA){
- NSMutableDictionary *settings = [[entry info] objectForKey:kItemSettings];
- if ([[settings objectForKey:@"watchTarget"] boolValue]) {
- NSString *path = [self prefFileForBundle:[settings objectForKey:kDefaultsObjectSourceBundleID]];
- [[QSVoyeur sharedInstance] addPathToQueue:path notifyingAbout:UKKQueueNotifyAboutDelete | UKKQueueNotifyAboutWrite];
+ NSMutableDictionary *settings = [[entry info] objectForKey:kItemSettings];
+ if ([[settings objectForKey:@"watchTarget"] boolValue]) {
+ NSString *path = [self prefFileForBundle:[settings objectForKey:kDefaultsObjectSourceBundleID]];
+ [[QSVoyeur sharedInstance] addPathToQueue:path notifyingAbout:UKKQueueNotifyAboutDelete | UKKQueueNotifyAboutWrite];
#ifdef DEBUG
- if (VERBOSE) NSLog(@"Watching Path %@", path);
+ if (VERBOSE) NSLog(@"Watching Path %@", path);
#endif
- [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:entry selector:@selector(invalidateIndex:) name:nil object:path];
- }
+ [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:entry selector:@selector(invalidateIndex:) name:nil object:path];
}
}
View
6 Quicksilver/PlugIns-Main/QSCorePlugIn/Code/QSFileSystemObjectSource.m
@@ -16,8 +16,6 @@
#import "NSBundle_BLTRExtensions.h"
-#import "QSFeatureLevel.h"
-
#if 0
@implementation QSEncapsulatedTextCell
- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
@@ -278,7 +276,7 @@ - (IBAction)endContainingSheet:(id)sender {
}
- (void)enableEntry:(QSCatalogEntry *)entry {
- if (!fALPHA) return;
+ //if (!fALPHA) return;
NSMutableDictionary *settings = [[entry info] objectForKey:kItemSettings];
NSString *path = [self fullPathForSettings:settings];
NSNotificationCenter *wsNotif = [[NSWorkspace sharedWorkspace] notificationCenter];
@@ -300,7 +298,7 @@ - (void)enableEntry:(QSCatalogEntry *)entry {
}
- (void)disableEntry:(QSCatalogEntry *)entry {
- if (!fALPHA) return;
+ //if (!fALPHA) return;
NSMutableDictionary *settings = [[entry info] objectForKey:kItemSettings];
NSString *path = [self fullPathForSettings:settings];
if ([[settings objectForKey:@"watchTarget"] boolValue]) {
View
4 Quicksilver/Quicksilver.xcodeproj/project.pbxproj
@@ -100,7 +100,6 @@
4DD89F230EBDDBA9005A15AE /* QSBuildOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DD89F1A0EBDDBA9005A15AE /* QSBuildOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
4DD89F240EBDDBA9005A15AE /* QSDebug.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DD89F1B0EBDDBA9005A15AE /* QSDebug.h */; settings = {ATTRIBUTES = (Public, ); }; };
4DD89F250EBDDBA9005A15AE /* QSDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DD89F1C0EBDDBA9005A15AE /* QSDefines.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 4DD89F260EBDDBA9005A15AE /* QSFeatureLevel.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DD89F1D0EBDDBA9005A15AE /* QSFeatureLevel.h */; settings = {ATTRIBUTES = (Public, ); }; };
4DD89F270EBDDBA9005A15AE /* QSKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DD89F1E0EBDDBA9005A15AE /* QSKeys.h */; settings = {ATTRIBUTES = (Public, ); }; };
4DD89F280EBDDBA9005A15AE /* QSMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DD89F1F0EBDDBA9005A15AE /* QSMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
4DD89F290EBDDBA9005A15AE /* QSNotifications.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DD89F200EBDDBA9005A15AE /* QSNotifications.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -951,7 +950,6 @@
4DD89F1A0EBDDBA9005A15AE /* QSBuildOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QSBuildOptions.h; sourceTree = "<group>"; };
4DD89F1B0EBDDBA9005A15AE /* QSDebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QSDebug.h; sourceTree = "<group>"; };
4DD89F1C0EBDDBA9005A15AE /* QSDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QSDefines.h; sourceTree = "<group>"; };
- 4DD89F1D0EBDDBA9005A15AE /* QSFeatureLevel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QSFeatureLevel.h; sourceTree = "<group>"; };
4DD89F1E0EBDDBA9005A15AE /* QSKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QSKeys.h; sourceTree = "<group>"; };
4DD89F1F0EBDDBA9005A15AE /* QSMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QSMacros.h; sourceTree = "<group>"; };
4DD89F200EBDDBA9005A15AE /* QSNotifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QSNotifications.h; sourceTree = "<group>"; };
@@ -2384,7 +2382,6 @@
E1E5FB7A07B20DD10044D6EF /* QSense.m */,
E1E5FB7B07B20DD10044D6EF /* QSExecutor.h */,
E1E5FB7C07B20DD10044D6EF /* QSExecutor.m */,
- 4DD89F1D0EBDDBA9005A15AE /* QSFeatureLevel.h */,
E1E5FB7D07B20DD10044D6EF /* QSGlobalSelectionProvider.h */,
E1E5FB7E07B20DD10044D6EF /* QSGlobalSelectionProvider.m */,
7FB8AD4C08E6328D000A65C4 /* QSHandledObjectHandler.h */,
@@ -2654,7 +2651,6 @@
4DD89F250EBDDBA9005A15AE /* QSDefines.h in Headers */,
E1E5FBE607B20DD20044D6EF /* QSense.h in Headers */,
E1E5FBE807B20DD20044D6EF /* QSExecutor.h in Headers */,
- 4DD89F260EBDDBA9005A15AE /* QSFeatureLevel.h in Headers */,
E1E5FBEA07B20DD20044D6EF /* QSGlobalSelectionProvider.h in Headers */,
7FB8AD4E08E6328D000A65C4 /* QSHandledObjectHandler.h in Headers */,
7FEE6B2907D2A93100847B74 /* QSHelp.h in Headers */,

0 comments on commit be854cd

Please sign in to comment.
Something went wrong with that request. Please try again.