Changeset 572


Ignore:
Timestamp:
07/20/09 06:03:42 (10 years ago)
Author:
Nicholas Riley
Message:

Support tabbing in preferences panel.

Location:
trunk/Cocoa/Pester/Source
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cocoa/Pester/Source/English.lproj/Preferences.nib/classes.nib

    r361 r572  
    2020                <dict>
    2121                        <key>CLASS</key>
     22                        <string>NSObject</string>
     23                        <key>LANGUAGE</key>
     24                        <string>ObjC</string>
     25                </dict>
     26                <dict>
     27                        <key>CLASS</key>
    2228                        <string>FirstResponder</string>
    2329                        <key>LANGUAGE</key>
     
    2531                        <key>SUPERCLASS</key>
    2632                        <string>NSObject</string>
    27                 </dict>
    28                 <dict>
    29                         <key>CLASS</key>
    30                         <string>NSObject</string>
    31                         <key>LANGUAGE</key>
    32                         <string>ObjC</string>
    3333                </dict>
    3434                <dict>
     
    5050                        <string>NSWindowController</string>
    5151                </dict>
     52                <dict>
     53                        <key>CLASS</key>
     54                        <string>NSWindow</string>
     55                        <key>LANGUAGE</key>
     56                        <string>ObjC</string>
     57                        <key>SUPERCLASS</key>
     58                        <string>NSResponder</string>
     59                </dict>
    5260        </array>
    5361        <key>IBVersion</key>
  • trunk/Cocoa/Pester/Source/English.lproj/Preferences.nib/info.nib

    r361 r572  
    44<dict>
    55        <key>IBFramework Version</key>
    6         <string>629</string>
     6        <string>677</string>
    77        <key>IBLastKnownRelativeProjectPath</key>
    8         <string>../../Pester.xcodeproj</string>
     8        <string>../Pester.xcodeproj</string>
    99        <key>IBOldestOS</key>
    1010        <integer>5</integer>
     
    1414        </array>
    1515        <key>IBSystem Version</key>
    16         <string>9B18</string>
     16        <string>9J61</string>
    1717        <key>targetFramework</key>
    1818        <string>IBCocoaFramework</string>
  • trunk/Cocoa/Pester/Source/NJRHotKeyField.m

    r355 r572  
    111111}
    112112
     113- (void)textDidEndEditing:(NSNotification *)notification;
     114{
     115    [self showKeyEquivalentAttributedStringFinalized: YES];
     116    [super textDidEndEditing: notification];
     117}
     118
    113119#pragma mark event handling
    114120
     
    125131        id delegate = [self delegate];
    126132        NSString *message = nil;
    127         if (delegate != nil && ![delegate hotKeyField: self shouldAcceptCharacter: [characters characterAtIndex: 0] modifierFlags: modifierFlags rejectionMessage: &message]) {
     133        unichar character = [characters characterAtIndex: 0];
     134        if (character == NSTabCharacter || character == NSBackTabCharacter)
     135            return;
     136        if (delegate != nil && ![delegate hotKeyField: self shouldAcceptCharacter: character modifierFlags: modifierFlags rejectionMessage: &message]) {
    128137            [self showStatus: message != nil ? message : @"key is unavailable for use"];
    129138        } else {
     
    137146- (BOOL)performKeyEquivalent:(NSEvent *)theEvent;
    138147{
    139     [self keyUp: theEvent];
     148    if ([[self window] firstResponder] == self)
     149        [self keyUp: theEvent];
    140150    return [super performKeyEquivalent: theEvent];
    141151}
  • trunk/Cocoa/Pester/Source/PSPreferencesController.m

    r355 r572  
    8383        [set formUnionWithCharacterSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
    8484        [set formUnionWithCharacterSet: [NSCharacterSet punctuationCharacterSet]];
    85         [set addCharactersInString: @"\t\r\e\x7f\x03\x19"]; // tab, CR, escape, delete, enter, backtab
     85        [set addCharactersInString: @"\r\e\x7f\x03"]; // CR, escape, delete, enter
    8686        [set addCharactersInRange: NSMakeRange(0xF700, 0x1FF)]; // reserved function key range
    8787        [set removeCharactersInRange: NSMakeRange(NSF1FunctionKey, 15)]; // F1-F15
Note: See TracChangeset for help on using the changeset viewer.