StatusItemIcon.png @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> - <int key="IBDocument.SystemTarget">1060</int> + <int key="IBDocument.SystemTarget">1050</int> <string key="IBDocument.SystemVersion">10B504</string> <string key="IBDocument.InterfaceBuilderVersion">732</string> <string key="IBDocument.AppKitVersion">1038.2</string> @@ -57,7 +57,7 @@ <object class="NSWindowTemplate" id="448742277"> <int key="NSWindowStyleMask">7</int> <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{235, 453}, {457, 106}}</string> + <string key="NSWindowRect">{{235, 433}, {509, 126}}</string> <int key="NSWTFlags">1685588992</int> <string key="NSWindowTitle">QuickCursor Preferences</string> <string key="NSWindowClass">NSWindow</string> @@ -161,7 +161,7 @@ <object class="NSButton" id="940179569"> <reference key="NSNextResponder" ref="248881203"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{133, 68}, {306, 18}}</string> + <string key="NSFrame">{{133, 88}, {306, 18}}</string> <reference key="NSSuperview" ref="248881203"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="40342116"> @@ -188,7 +188,7 @@ <object class="NSButton" id="717588714"> <reference key="NSNextResponder" ref="248881203"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{133, 48}, {306, 18}}</string> + <string key="NSFrame">{{133, 68}, {306, 18}}</string> <reference key="NSSuperview" ref="248881203"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="618729808"> @@ -207,8 +207,30 @@ <int key="NSPeriodicInterval">25</int> </object> </object> + <object class="NSButton" id="417188638"> + <reference key="NSNextResponder" ref="248881203"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{133, 48}, {358, 18}}</string> + <reference key="NSSuperview" ref="248881203"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="511874735"> + <int key="NSCellFlags">-2080244224</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Switch to source application when finished editing</string> + <reference key="NSSupport" ref="752916645"/> + <reference key="NSControlView" ref="417188638"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="371842225"/> + <reference key="NSAlternateImage" ref="945704191"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> </object> - <string key="NSFrameSize">{457, 106}</string> + <string key="NSFrameSize">{509, 126}</string> <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string> @@ -316,6 +338,22 @@ </object> <int key="connectionID">584</int> </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: values.QCSwitchBackWhenFinishedEditing</string> + <reference key="source" ref="417188638"/> + <reference key="destination" ref="313902647"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="417188638"/> + <reference key="NSDestination" ref="313902647"/> + <string key="NSLabel">value: values.QCSwitchBackWhenFinishedEditing</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">values.QCSwitchBackWhenFinishedEditing</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">591</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -370,9 +408,10 @@ <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="940179569"/> <reference ref="717588714"/> + <reference ref="705553932"/> <reference ref="1039590887"/> <reference ref="521699642"/> - <reference ref="705553932"/> + <reference ref="417188638"/> </object> <reference key="parent" ref="448742277"/> </object> @@ -474,6 +513,20 @@ <reference key="object" ref="313902647"/> <reference key="parent" ref="0"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">585</int> + <reference key="object" ref="417188638"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="511874735"/> + </object> + <reference key="parent" ref="248881203"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">586</int> + <reference key="object" ref="511874735"/> + <reference key="parent" ref="417188638"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -498,13 +551,15 @@ <string>568.IBPluginDependency</string> <string>569.IBPluginDependency</string> <string>570.IBPluginDependency</string> + <string>585.IBPluginDependency</string> + <string>586.IBPluginDependency</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{616, 916}, {457, 106}}</string> + <string>{{616, 896}, {509, 126}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{616, 916}, {457, 106}}</string> + <string>{{616, 896}, {509, 126}}</string> <boolean value="NO"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>net.wafflesoftware.ShortcutRecorder.IB.Leopard</string> @@ -519,6 +574,8 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> @@ -537,7 +594,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">584</int> + <int key="maxID">591</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -1000,6 +1057,13 @@ <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Print.framework/Headers/PDEPluginInterface.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> <string key="minorKey">Sparkle.framework/Headers/SUAppcast.h</string> </object> </object> @@ -1131,7 +1195,7 @@ <int key="IBDocument.localizationMode">0</int> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> - <integer value="1060" key="NS.object.0"/> + <integer value="1050" key="NS.object.0"/> </object> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string> English.lproj/MainMenu.xib @@ -33,4 +33,6 @@ - (IBAction)editInPopUpButtonClicked:(id)sender; - (IBAction)beginQuickCursorEdit:(id)sender; -@end \ No newline at end of file +@end + +APPKIT_EXTERN NSString *QCSwitchBackWhenFinishedEditing; QCAppDelegate.h @@ -18,6 +18,7 @@ + (void)initialize { [[NSUserDefaults standardUserDefaults] registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys: + [NSNumber numberWithBool:YES], QCSwitchBackWhenFinishedEditing, nil]]; } @@ -130,7 +131,7 @@ } quickCursorStatusItem = [[[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength] retain]; - NSImage *image = [NSImage imageNamed:@"StatusItemIcon"]; + NSImage *image = [NSImage imageNamed:@"StatusItemIcon.png"]; [image setTemplate:YES]; [quickCursorStatusItem setImage:image]; [quickCursorStatusItem setHighlightMode:YES]; @@ -311,9 +312,11 @@ #pragma mark ODBEditor Callbacks - (void)odbEditor:(ODBEditor *)editor didModifyFile:(NSString *)path newFileLocation:(NSString *)newPath context:(NSDictionary *)context { + // never seems to be called. } - (void)odbEditor:(ODBEditor *)editor didClosefile:(NSString *)path context:(NSDictionary *)context; { + // never seems to be called. } - (void)odbEditor:(ODBEditor *)editor didModifyFileForString:(NSString *)newString context:(NSDictionary *)context; { @@ -322,6 +325,9 @@ } - (void)odbEditor:(ODBEditor *)editor didCloseFileForString:(NSString *)newString context:(NSDictionary *)context; { + if ([[NSUserDefaults standardUserDefaults] boolForKey:QCSwitchBackWhenFinishedEditing]) { + [[context valueForKey:@"uiElement"] activateProcess]; + } } #pragma mark shortcutRecorder Delegate @@ -340,4 +346,6 @@ [userDefaults synchronize]; } -@end \ No newline at end of file +@end + +NSString *QCSwitchBackWhenFinishedEditing = @"QCSwitchBackWhenFinishedEditing"; \ No newline at end of file QCAppDelegate.m @@ -24,6 +24,7 @@ #pragma mark Attributes +@property(readonly) pid_t processID; @property(readonly) NSString *processName; @property(readonly) QCUIElement *application; @property(readonly) QCUIElement *topLevelUIElement; @@ -36,5 +37,9 @@ @property(readonly) NSArray *attributeNames; - (id)valueForAttribute:(NSString *)attributeName; - (BOOL)setValue:(id)newValue forAttribute:(NSString *)attributeName; - + +#pragma mark Process + +- (BOOL)activateProcess; + @end QCUIElement.h @@ -44,6 +44,14 @@ #pragma mark Attributes +- (pid_t)processID { + pid_t theAppPID = 0; + if (AXUIElementGetPid(uiElementRef, &theAppPID) == kAXErrorSuccess) { + return theAppPID; + } + return -1; +} + - (NSString *)processName { pid_t theAppPID = 0; ProcessSerialNumber theAppPSN = {0,0}; @@ -208,4 +216,17 @@ return YES; } +#pragma mark Process + +- (BOOL)activateProcess { + pid_t theAppPID = 0; + ProcessSerialNumber theAppPSN = {0,0}; + + if (AXUIElementGetPid(uiElementRef, &theAppPID) == kAXErrorSuccess && GetProcessForPID(theAppPID, &theAppPSN) == noErr && SetFrontProcess(&theAppPSN) == noErr) { + return YES; + } + + return NO; +} + @end QCUIElement.m @@ -23,9 +23,9 @@ <key>LSMinimumSystemVersion</key> <string>${MACOSX_DEPLOYMENT_TARGET}</string> <key>CFBundleShortVersionString</key> - <string>1.1.3-Development</string> + <string>1.1.4-Development</string> <key>CFBundleVersion</key> - <string>13</string> + <string>14</string> <key>SUFeedURL</key> <string>https://hogbaysoftware.appspot.com/products/quickcursor/releases.rss</string> <key>SUPublicDSAKeyFile</key> @@ -43,6 +43,7 @@ <string>org.vim.MacVim</string> <string>org.smultron.Smultron</string> <string>com.macromates.textmate</string> + <string>com.barebones.textwrangler</string> <string>com.hogbaysoftware.WriteRoom</string> </array> </dict> QuickCursor-Info.plist QuickCursor.icns @@ -15,6 +15,7 @@ 88864E7D107A3D27001CFB7E /* CrashReporterWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 88864E7B107A3D27001CFB7E /* CrashReporterWindow.xib */; }; 888CB5B510763D2A0093C30E /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 88E71F5010763A9A0080DE7E /* Sparkle.framework */; }; 88AAF90C105014A500DFD8E5 /* StatusItemIcon.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 88AAF90B105014A500DFD8E5 /* StatusItemIcon.pdf */; }; + 88AF3357107FCD190045633D /* StatusItemIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 88AF3356107FCD190045633D /* StatusItemIcon.png */; }; 88B27D9E104D8EDF00806BAE /* NSAppleEventDescriptor-Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 88B27D95104D8EDE00806BAE /* NSAppleEventDescriptor-Extensions.m */; }; 88B27D9F104D8EDF00806BAE /* ODBEditor.m in Sources */ = {isa = PBXBuildFile; fileRef = 88B27D97104D8EDE00806BAE /* ODBEditor.m */; }; 88B27DA1104D8EDF00806BAE /* QCUIElement.m in Sources */ = {isa = PBXBuildFile; fileRef = 88B27D9B104D8EDF00806BAE /* QCUIElement.m */; }; @@ -112,6 +113,7 @@ 888CB656107645A00093C30E /* release_notes */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = release_notes; sourceTree = "<group>"; }; 888CB658107645B90093C30E /* Markdown.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = Markdown.pl; sourceTree = "<group>"; }; 88AAF90B105014A500DFD8E5 /* StatusItemIcon.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = StatusItemIcon.pdf; sourceTree = "<group>"; }; + 88AF3356107FCD190045633D /* StatusItemIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = StatusItemIcon.png; sourceTree = "<group>"; }; 88B27D94104D8EDE00806BAE /* NSAppleEventDescriptor-Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSAppleEventDescriptor-Extensions.h"; sourceTree = "<group>"; }; 88B27D95104D8EDE00806BAE /* NSAppleEventDescriptor-Extensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSAppleEventDescriptor-Extensions.m"; sourceTree = "<group>"; }; 88B27D96104D8EDE00806BAE /* ODBEditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ODBEditor.h; sourceTree = "<group>"; }; @@ -221,6 +223,7 @@ children = ( 88864E7B107A3D27001CFB7E /* CrashReporterWindow.xib */, 88AAF90B105014A500DFD8E5 /* StatusItemIcon.pdf */, + 88AF3356107FCD190045633D /* StatusItemIcon.png */, 88B27E46104D95A000806BAE /* QuickCursor.icns */, 8D1107310486CEB800E47090 /* QuickCursor-Info.plist */, 88864D36107A3305001CFB7E /* sparkle_dsa_pub.pem */, @@ -374,6 +377,7 @@ 88864D37107A3305001CFB7E /* sparkle_dsa_pub.pem in Resources */, 88864DFC107A376C001CFB7E /* PTKeyCodes.plist in Resources */, 88864E7D107A3D27001CFB7E /* CrashReporterWindow.xib in Resources */, + 88AF3357107FCD190045633D /* StatusItemIcon.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; QuickCursor.xcodeproj/project.pbxproj @@ -1,4 +1,2 @@ -- **Added** Check for updates option. -- **Added** Crash reporting framework. -- **Fixed** Some crashes related to login items. -- **Fixed** Incorrect keyboard shortcuts shown in menu. \ No newline at end of file +- **Added** Option to switch back to souch app when finished editing. +- **Changed** Icon to represent text cursor. Application icon still needs work. \ No newline at end of file release_notes 1f9f130bd33228ed20d0f096de47629f9d130d4d Jesse Grosjean jesse@hogbaysoftware.com http://github.com/jessegrosjean/quickcursor/commit/02feb2baa1c01eaf66904d0376f1e3a08d79e45c 02feb2baa1c01eaf66904d0376f1e3a08d79e45c 2009-10-12T07:01:31-07:00 2009-10-12T07:01:31-07:00 commit for 14 release 3b1639f5d1922733593d653f08037760b78859ab Jesse Grosjean jesse@hogbaysoftware.com