This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

added combo input, initial jump to tag working

  • Loading branch information...
Greg Allen
Greg Allen committed Mar 1, 2010
1 parent 05d6a4f commit b6061c8baadb485ca8ab6ae23efa3b43d74bb1fb
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -0,0 +1,22 @@
+//
+// ComboInputWindowController.h
+// MilkMaid
+//
+// Created by Gregamel on 2/28/10.
+// Copyright 2010 JGA. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+
+@interface ComboInputWindowController : NSWindowController {
+ IBOutlet NSComboBox *comboBox;
+ NSArray *data;
+ NSString *text;
+}
+//@property (assign) NSArray *data;
+@property (assign) NSString *text;
+-(IBAction)okClicked:(id)sender;
+-(IBAction)cancelClicked:(id)sender;
+-(void)setData:(NSArray *)aData;
+@end
@@ -0,0 +1,41 @@
+//
+// ComboInputWindowController.m
+// MilkMaid
+//
+// Created by Gregamel on 2/28/10.
+// Copyright 2010 JGA. All rights reserved.
+//
+
+#import "ComboInputWindowController.h"
+
+
+@implementation ComboInputWindowController
+//@synthesize data;
+@synthesize text;
+
+-(void)awakeFromNib {
+ [self setData:data];
+}
+
+
+-(void)okClicked:(id)sender {
+ text = [comboBox objectValue];
+ [comboBox setObjectValue:@""];
+ [NSApp endSheet:[self window] returnCode:1];
+}
+
+-(void)cancelClicked:(id)sender {
+ [comboBox setObjectValue:@""];
+ [NSApp endSheet:[self window] returnCode:0];
+}
+
+-(void)setData:(NSArray *)aData {
+ [comboBox removeAllItems];
+ for (NSString *item in aData) {
+ [comboBox addItemWithObjectValue:item];
+ }
+ data = aData;
+}
+
+
+@end
View
@@ -3,12 +3,12 @@
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">10C540</string>
- <string key="IBDocument.InterfaceBuilderVersion">740</string>
+ <string key="IBDocument.InterfaceBuilderVersion">761</string>
<string key="IBDocument.AppKitVersion">1038.25</string>
<string key="IBDocument.HIToolboxVersion">458.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">740</string>
+ <string key="NS.object.0">761</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -244,6 +244,15 @@
<reference key="NSOnImage" ref="35465992"/>
<reference key="NSMixedImage" ref="502551668"/>
</object>
+ <object class="NSMenuItem" id="266855277">
+ <reference key="NSMenu" ref="720053764"/>
+ <string key="NSTitle">Jump To Tag</string>
+ <string key="NSKeyEquiv">t</string>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="35465992"/>
+ <reference key="NSMixedImage" ref="502551668"/>
+ </object>
<object class="NSMenuItem" id="860898925">
<reference key="NSMenu" ref="720053764"/>
<string key="NSTitle">Search</string>
@@ -858,6 +867,14 @@
</object>
<int key="connectionID">877</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">menuJumpToTag:</string>
+ <reference key="source" ref="1014"/>
+ <reference key="destination" ref="266855277"/>
+ </object>
+ <int key="connectionID">879</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -940,6 +957,7 @@
<reference ref="860898925"/>
<reference ref="510805079"/>
<reference ref="473679681"/>
+ <reference ref="266855277"/>
</object>
<reference key="parent" ref="379814623"/>
</object>
@@ -1305,6 +1323,11 @@
<reference key="object" ref="976324537"/>
<reference key="parent" ref="0"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">878</int>
+ <reference key="object" ref="266855277"/>
+ <reference key="parent" ref="720053764"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1410,6 +1433,7 @@
<string>82.ImportedFromIB2</string>
<string>83.IBPluginDependency</string>
<string>83.ImportedFromIB2</string>
+ <string>878.IBPluginDependency</string>
<string>92.IBPluginDependency</string>
<string>92.ImportedFromIB2</string>
</object>
@@ -1499,7 +1523,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{546, 563}, {250, 173}}</string>
+ <string>{{687, 494}, {250, 173}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1512,7 +1536,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
- <string>{{645, 514}, {224, 153}}</string>
+ <string>{{645, 494}, {224, 173}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{145, 474}, {199, 203}}</string>
@@ -1521,6 +1545,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
</object>
</object>
@@ -1540,19 +1565,21 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">877</int>
+ <int key="maxID">879</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">FirstResponder</string>
+ <string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>menuAddTask:</string>
<string>menuDeleteTask:</string>
+ <string>menuJumpToTag:</string>
<string>menuMultiAdd:</string>
<string>menuPostponeTask:</string>
<string>menuPriority:</string>
@@ -1576,6 +1603,7 @@
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -1590,10 +1618,6 @@
<string key="NS.key.0">openNewWindow:</string>
<string key="NS.object.0">id</string>
</object>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">window</string>
- <string key="NS.object.0">NSWindow</string>
- </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">MilkMaidAppDelegate.h</string>
@@ -1611,6 +1635,7 @@
<string>menuAddTask:</string>
<string>menuDeleteTask:</string>
<string>menuDueDate:</string>
+ <string>menuJumpToTag:</string>
<string>menuMultiAdd:</string>
<string>menuPostponeTask:</string>
<string>menuPriority:</string>
@@ -1637,6 +1662,7 @@
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
@@ -2261,6 +2287,7 @@
</object>
</object>
<int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<integer value="1050" key="NS.object.0"/>
@@ -2272,5 +2299,18 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">../MilkMaid.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSMenuCheckmark</string>
+ <string>NSMenuMixedState</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>{9, 8}</string>
+ <string>{7, 2}</string>
+ </object>
+ </object>
</data>
</archive>
@@ -15,6 +15,8 @@
762EAB05113AD8FF0093921D /* MilkMaid.xib in Resources */ = {isa = PBXBuildFile; fileRef = 762EAB04113AD8FF0093921D /* MilkMaid.xib */; };
767A8743112AF51E00A77326 /* MultiAdd.xib in Resources */ = {isa = PBXBuildFile; fileRef = 767A8742112AF51E00A77326 /* MultiAdd.xib */; };
767A8758112AF58E00A77326 /* MultiAddWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 767A8757112AF58E00A77326 /* MultiAddWindowController.m */; };
+ 76DF8422113B687400B2A3B2 /* ComboInput.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76DF8421113B687400B2A3B2 /* ComboInput.xib */; };
+ 76DF8434113B693900B2A3B2 /* ComboInputWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 76DF8433113B693900B2A3B2 /* ComboInputWindowController.m */; };
76EA44521111650700E10B8A /* BWToolkitFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76EA44511111650700E10B8A /* BWToolkitFramework.framework */; };
76EA44561111652500E10B8A /* BWToolkitFramework.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 76EA44511111650700E10B8A /* BWToolkitFramework.framework */; };
76EA44A4111167A500E10B8A /* EVRZRtmApi.m in Sources */ = {isa = PBXBuildFile; fileRef = 76EA44A3111167A500E10B8A /* EVRZRtmApi.m */; };
@@ -75,6 +77,9 @@
767A8742112AF51E00A77326 /* MultiAdd.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MultiAdd.xib; sourceTree = "<group>"; };
767A8756112AF58E00A77326 /* MultiAddWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MultiAddWindowController.h; sourceTree = "<group>"; };
767A8757112AF58E00A77326 /* MultiAddWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MultiAddWindowController.m; sourceTree = "<group>"; };
+ 76DF8421113B687400B2A3B2 /* ComboInput.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ComboInput.xib; sourceTree = "<group>"; };
+ 76DF8432113B693900B2A3B2 /* ComboInputWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ComboInputWindowController.h; sourceTree = "<group>"; };
+ 76DF8433113B693900B2A3B2 /* ComboInputWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ComboInputWindowController.m; sourceTree = "<group>"; };
76EA44511111650700E10B8A /* BWToolkitFramework.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BWToolkitFramework.framework; path = ../../../lib/BWToolkit/BWToolkitFramework.framework; sourceTree = SOURCE_ROOT; };
76EA44A2111167A500E10B8A /* EVRZRtmApi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EVRZRtmApi.h; sourceTree = "<group>"; };
76EA44A3111167A500E10B8A /* EVRZRtmApi.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EVRZRtmApi.m; sourceTree = "<group>"; };
@@ -151,6 +156,8 @@
762EAA2A113ACB8E0093921D /* MilkMaidWindowController.m */,
C9C148EE113B1AA400F292B7 /* MilkMaidPanel.h */,
C9C148EF113B1AA400F292B7 /* MilkMaidPanel.m */,
+ 76DF8432113B693900B2A3B2 /* ComboInputWindowController.h */,
+ 76DF8433113B693900B2A3B2 /* ComboInputWindowController.m */,
);
name = Classes;
sourceTree = "<group>";
@@ -219,6 +226,7 @@
C9FBE61E1123D73300115FFF /* SingleInput.xib */,
767A8742112AF51E00A77326 /* MultiAdd.xib */,
762EAB04113AD8FF0093921D /* MilkMaid.xib */,
+ 76DF8421113B687400B2A3B2 /* ComboInput.xib */,
);
name = Resources;
sourceTree = "<group>";
@@ -310,6 +318,7 @@
C9F45EDE112B74E100F48377 /* priority2.png in Resources */,
C9F45EDF112B74E100F48377 /* priority3.png in Resources */,
762EAB05113AD8FF0093921D /* MilkMaid.xib in Resources */,
+ 76DF8422113B687400B2A3B2 /* ComboInput.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -337,6 +346,7 @@
767A8758112AF58E00A77326 /* MultiAddWindowController.m in Sources */,
762EAA2B113ACB8E0093921D /* MilkMaidWindowController.m in Sources */,
C9C148F0113B1AA400F292B7 /* MilkMaidPanel.m in Sources */,
+ 76DF8434113B693900B2A3B2 /* ComboInputWindowController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -13,10 +13,12 @@
#import "YRKSpinningProgressIndicator.h"
#import "SingleInputWindowController.h"
#import "MultiAddWindowController.h"
+#import "ComboInputWindowController.h"
@interface MilkMaidWindowController : NSWindowController {
SingleInputWindowController *singleInputWindowController;
MultiAddWindowController *multiAddWindowController;
+ ComboInputWindowController *comboInputWindowController;
EVRZRtmApi *rtmController;
NSMutableArray *lists;
NSDictionary *currentList;
@@ -29,6 +31,7 @@
NSImage *priority1Image;
NSImage *priority2Image;
NSImage *priority3Image;
+ NSMutableArray *tagList;
IBOutlet YRKSpinningProgressIndicator *progress;
}
@@ -47,4 +50,5 @@
-(IBAction)menuRenameTask:(id)sender;
-(IBAction)menuSetTagsTask:(id)sender;
-(IBAction)menuSetDueTask:(id)sender;
+-(IBAction)menuJumpToTag:(id)sender;
@end
Oops, something went wrong.

0 comments on commit b6061c8

Please sign in to comment.