Skip to content

Commit

Permalink
- Implemented apply search as proposed by Kevin Pratt
Browse files Browse the repository at this point in the history 
- Added a global popup menu for search
- Fixed broken revert changes for pictures
- Extended revert changes to also do the reverse
  • Loading branch information
@griff
griff committed Dec 14, 2009
1 parent 6f3dea3 commit 7edfc95
Show file tree
Hide file tree
Showing 12 changed files with 264 additions and 124 deletions.
200 changes: 120 additions & 80 deletions App/English.lproj/MainMenu.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="465"/>
<integer value="205"/>
<integer value="1723"/>
<integer value="1762"/>
<integer value="205"/>
<integer value="475"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
Expand Down Expand Up @@ -5360,6 +5361,20 @@
</object>
</object>
</object>
<object class="NSMenu" id="152166291">
<string key="NSTitle"/>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMenuItem" id="138406454">
<reference key="NSMenu" ref="152166291"/>
<string key="NSTitle">Apply Search</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="35465992"/>
<reference key="NSMixedImage" ref="502551668"/>
</object>
</object>
</object>
<object class="NSCustomObject" id="265254279">
<string key="NSClassName">MZPresets</string>
</object>
Expand Down Expand Up @@ -8348,51 +8363,6 @@
</object>
<int key="connectionID">1747</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">value: changed</string>
<reference key="source" ref="183612391"/>
<reference key="destination" ref="569338711"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="183612391"/>
<reference key="NSDestination" ref="569338711"/>
<string key="NSLabel">value: changed</string>
<string key="NSBinding">value</string>
<string key="NSKeyPath">changed</string>
<object class="NSDictionary" key="NSOptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSAllowsEditingMultipleValuesSelection</string>
<string>NSRaisesForNotApplicableKeys</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<boolean value="NO"/>
<boolean value="NO"/>
</object>
</object>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">1750</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">enabled: changedEditable</string>
<reference key="source" ref="183612391"/>
<reference key="destination" ref="569338711"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="183612391"/>
<reference key="NSDestination" ref="569338711"/>
<string key="NSLabel">enabled: changedEditable</string>
<string key="NSBinding">enabled</string>
<string key="NSKeyPath">changedEditable</string>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">1752</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">showPresets:</string>
Expand Down Expand Up @@ -8442,6 +8412,75 @@
</object>
<int key="connectionID">1760</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">applySearchEntry:</string>
<reference key="source" ref="1053022543"/>
<reference key="destination" ref="184141390"/>
</object>
<int key="connectionID">1761</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">menu</string>
<reference key="source" ref="184141390"/>
<reference key="destination" ref="152166291"/>
</object>
<int key="connectionID">1766</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">applySearchEntry:</string>
<reference key="source" ref="1053022543"/>
<reference key="destination" ref="138406454"/>
</object>
<int key="connectionID">1767</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">enabled: dataChangedEditable</string>
<reference key="source" ref="183612391"/>
<reference key="destination" ref="569338711"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="183612391"/>
<reference key="NSDestination" ref="569338711"/>
<string key="NSLabel">enabled: dataChangedEditable</string>
<string key="NSBinding">enabled</string>
<string key="NSKeyPath">dataChangedEditable</string>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">1768</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">value: dataChanged</string>
<reference key="source" ref="183612391"/>
<reference key="destination" ref="569338711"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="183612391"/>
<reference key="NSDestination" ref="569338711"/>
<string key="NSLabel">value: dataChanged</string>
<string key="NSBinding">value</string>
<string key="NSKeyPath">dataChanged</string>
<object class="NSDictionary" key="NSOptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSAllowsEditingMultipleValuesSelection</string>
<string>NSRaisesForNotApplicableKeys</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<boolean value="NO"/>
<boolean value="NO"/>
</object>
</object>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">1769</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
Expand Down Expand Up @@ -11799,6 +11838,7 @@
<reference ref="452066177"/>
</object>
<reference key="parent" ref="0"/>
<string key="objectName">Picture Popup Menu</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">1724</int>
Expand Down Expand Up @@ -11844,6 +11884,21 @@
<reference key="object" ref="922064220"/>
<reference key="parent" ref="439893737"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1762</int>
<reference key="object" ref="152166291"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="138406454"/>
</object>
<reference key="parent" ref="0"/>
<string key="objectName">Search Popup Menu</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">1763</int>
<reference key="object" ref="138406454"/>
<reference key="parent" ref="152166291"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
Expand Down Expand Up @@ -12012,6 +12067,9 @@
<string>1735.IBPluginDependency</string>
<string>1736.IBPluginDependency</string>
<string>1755.IBPluginDependency</string>
<string>1762.IBEditorWindowLastContentRect</string>
<string>1762.IBPluginDependency</string>
<string>1763.IBPluginDependency</string>
<string>19.IBPluginDependency</string>
<string>19.ImportedFromIB2</string>
<string>195.IBPluginDependency</string>
Expand Down Expand Up @@ -12582,6 +12640,9 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{83, 788}, {140, 23}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
Expand Down Expand Up @@ -12677,9 +12738,9 @@
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{54, 180}, {1082, 612}}</string>
<string>{{59, 140}, {1082, 612}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{54, 180}, {1082, 612}}</string>
<string>{{59, 140}, {1082, 612}}</string>
<integer value="1"/>
<string>{{33, 99}, {480, 360}}</string>
<boolean value="YES"/>
Expand Down Expand Up @@ -13018,7 +13079,7 @@
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">1760</int>
<int key="maxID">1769</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
Expand All @@ -13030,6 +13091,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>applySearchEntry:</string>
<string>openDocument:</string>
<string>revertChanges:</string>
<string>searchForImages:</string>
Expand Down Expand Up @@ -13063,6 +13125,7 @@
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
Expand Down Expand Up @@ -13442,36 +13505,6 @@
</object>
</object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBDocumentRelativeSource</string>
<string key="minorKey">../../Sparkle.framework/Versions/A/Headers/SUAppcast.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="894029683">
<string key="majorKey">IBDocumentRelativeSource</string>
<string key="minorKey">../../Sparkle.framework/Versions/A/Headers/SUUpdater.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">SUUpdater</string>
<string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">checkForUpdates:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">delegate</string>
<string key="NS.object.0">id</string>
</object>
<reference key="sourceIdentifier" ref="894029683"/>
</object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
Expand Down Expand Up @@ -14117,6 +14150,13 @@
<string key="minorKey">Foundation.framework/Headers/NSXMLParser.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">Growl.framework/Headers/GrowlApplicationBridge.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
Expand Down
2 changes: 2 additions & 0 deletions App/src/AppController.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@
- (IBAction)searchForImages:(id)sender;
- (IBAction)openDocument:(id)sender;
- (IBAction)showPresets:(id)sender;
- (IBAction)applySearchEntry:(id)sender;

//- (void)openPanelDidEnd:(NSOpenPanel *)panel returnCode:(int)returnCode contextInfo:(void *)contextInfo;

#pragma mark - as window delegate
Expand Down

0 comments on commit 7edfc95

Please sign in to comment.