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

Text mode improvements #1173

Merged
merged 4 commits into from Oct 16, 2012
Merged

Text mode improvements #1173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec189e9
Set cursor text colour based on user prefs
pjrobertson Oct 14, 2012
beacd21
Don't dismiss the QS Interface when docking windows appear
pjrobertson Oct 14, 2012
0fc97aa
Add a description to the hidingWindow BOOL
pjrobertson Oct 14, 2012
da05f65
Enable automatic text replacement for the text editor. Fixes #127
pjrobertson Oct 14, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions Quicksilver/Code-QuickStepInterface/QSDockingWindow.m
View file
Open in desktop
@@ -1,6 +1,7 @@
#import "QSDockingWindow.h"
#import <Carbon/Carbon.h>
#import "QSRegistry.h"
#import "QSController.h"

#import "QSTypes.h"

Expand Down Expand Up @@ -152,7 +153,10 @@ - (IBAction)hideOrOrderOut:(id)sender {

- (void)makeKeyAndOrderFront:(id)sender {
allowKey = YES;
QSInterfaceController *interfaceController = [(QSController *)[NSApp delegate] interfaceController];
[interfaceController setHiding:YES];
[super makeKeyAndOrderFront:sender];
[interfaceController setHiding:NO];
allowKey = NO;
}

Expand Down
3 changes: 3 additions & 0 deletions Quicksilver/Code-QuickStepInterface/QSInterfaceController.h
View file
Open in desktop
Expand Up @@ -22,11 +22,14 @@

NSTimer *hideTimer;
NSTimer *actionsUpdateTimer;
/* A BOOL that can be used to override whether or not the interface is dismissed on resiging key
if set to 'YES', when the interface resigns key, it does not close */
BOOL hidingWindow;
BOOL preview;

TISInputSourceRef savedKeyboard;
}

- (QSCommand *)currentCommand;
- (void)setCommand:(QSCommand *)command;
- (void)setCommandWithArray:(NSArray *)array;
Expand Down
4 changes: 4 additions & 0 deletions Quicksilver/Code-QuickStepInterface/QSSearchObjectView.m
View file
Open in desktop
Expand Up @@ -74,6 +74,10 @@ - (void)awakeFromNib {
[self setTextModeEditor:(NSTextView *)[[self window] fieldEditor:YES forObject:self]];

[[self textModeEditor] bind:@"textColor" toObject:[NSUserDefaultsController sharedUserDefaultsController] withKeyPath:@"values.QSAppearance3T" options:[NSDictionary dictionaryWithObject:NSUnarchiveFromDataTransformerName forKey:@"NSValueTransformerName"]];
[[self textModeEditor] bind:@"insertionPointColor" toObject:[NSUserDefaultsController sharedUserDefaultsController] withKeyPath:@"values.QSAppearance3T" options:[NSDictionary dictionaryWithObject:NSUnarchiveFromDataTransformerName forKey:@"NSValueTransformerName"]];
[[self textModeEditor] setAllowsUndo:YES];

[[self textModeEditor] setAutomaticTextReplacementEnabled:YES];

searchMode = SearchFilter;
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(hideResultView:) name:@"NSWindowDidResignKeyNotification" object:[self window]];
Expand Down