arsenetar
/
dupeguru
mirror of https://github.com/arsenetar/dupeguru.git
1
0
Fork 0
Code Releases Wiki Activity

Made a few UI fixes. Mostly, it's about main menu item not pointing the appropriate target.

This commit is contained in:
Virgil Dupras 2011-01-14 15:34:10 +01:00
parent c9fd1b1a17
commit 0a22bb8469
12 changed files with 143 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocoa/base/AppDelegate.h
View File

@ -43,10 +43,12 @@ http://www.hardcoded.net/licenses/bsd_license
- (NSMenu *)columnsMenu;
/* Actions */
- (IBAction)showAboutBox:(id)sender;
- (IBAction)loadResults:(id)sender;
- (IBAction)openWebsite:(id)sender;
- (IBAction)openHelp:(id)sender;
- (IBAction)showAboutBox:(id)sender;
- (IBAction)showDirectoryWindow:(id)sender;
- (IBAction)showPreferencesPanel:(id)sender;
- (IBAction)showResultWindow:(id)sender;
- (IBAction)startScanning:(id)sender;
- (IBAction)toggleDirectories:(id)sender;
@end

39
cocoa/base/AppDelegate.m
View File

@ -81,12 +81,20 @@ http://www.hardcoded.net/licenses/bsd_license
- (NSMenu *)columnsMenu { return columnsMenu; }
/* Actions */
- (IBAction)showAboutBox:(id)sender
- (IBAction)loadResults:(id)sender
{
if (_aboutBox == nil) {
_aboutBox = [[HSAboutBox alloc] initWithApp:py];
NSOpenPanel *op = [NSOpenPanel openPanel];
[op setCanChooseFiles:YES];
[op setCanChooseDirectories:NO];
[op setCanCreateDirectories:NO];
[op setAllowsMultipleSelection:NO];
[op setAllowedFileTypes:[NSArray arrayWithObject:@"dupeguru"]];
[op setTitle:@"Select a results file to load"];
if ([op runModal] == NSOKButton) {
NSString *filename = [[op filenames] objectAtIndex:0];
[py loadResultsFrom:filename];
[[self recentResults] addFile:filename];
}
[[_aboutBox window] makeKeyAndOrderFront:sender];
}
- (IBAction)openWebsite:(id)sender
@ -102,6 +110,19 @@ http://www.hardcoded.net/licenses/bsd_license
[[NSWorkspace sharedWorkspace] openURL:u];
}
- (IBAction)showAboutBox:(id)sender
{
if (_aboutBox == nil) {
_aboutBox = [[HSAboutBox alloc] initWithApp:py];
}
[[_aboutBox window] makeKeyAndOrderFront:sender];
}
- (IBAction)showDirectoryWindow:(id)sender
{
[[[self directoryPanel] window] makeKeyAndOrderFront:nil];
}
- (IBAction)showPreferencesPanel:(id)sender
{
if (_preferencesPanel == nil) {
@ -110,16 +131,16 @@ http://www.hardcoded.net/licenses/bsd_license
[_preferencesPanel showWindow:sender];
}
- (IBAction)showResultWindow:(id)sender
{
[[[self resultWindow] window] makeKeyAndOrderFront:nil];
}
- (IBAction)startScanning:(id)sender
{
[[[self resultWindow] window] makeKeyAndOrderFront:sender];
[[self resultWindow] startDuplicateScan:sender];
}
- (IBAction)toggleDirectories:(id)sender
{
[[self directoryPanel] toggleVisible:sender];
}
/* Delegate */
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification

1
cocoa/base/DirectoryPanel.h
View File

@ -30,7 +30,6 @@ http://www.hardcoded.net/licenses/bsd_license
- (IBAction)askForDirectory:(id)sender;
- (IBAction)popupAddDirectoryMenu:(id)sender;
- (IBAction)removeSelectedDirectory:(id)sender;
- (IBAction)toggleVisible:(id)sender;
- (void)addDirectory:(NSString *)directory;
- (void)refreshRemoveButtonText;

5
cocoa/base/DirectoryPanel.m
View File

@ -92,11 +92,6 @@ http://www.hardcoded.net/licenses/bsd_license
[self refreshRemoveButtonText];
}
- (IBAction)toggleVisible:(id)sender
{
[[self window] makeKeyAndOrderFront:nil];
}
/* Public */
- (void)addDirectory:(NSString *)directory
{

1
cocoa/base/ResultWindow.h
View File

@ -52,7 +52,6 @@ http://www.hardcoded.net/licenses/bsd_license
- (IBAction)filter:(id)sender;
- (IBAction)ignoreSelected:(id)sender;
- (IBAction)invokeCustomCommand:(id)sender;
- (IBAction)loadResults:(id)sender;
- (IBAction)markAll:(id)sender;
- (IBAction)markInvert:(id)sender;
- (IBAction)markNone:(id)sender;

17
cocoa/base/ResultWindow.m
View File

@ -244,22 +244,6 @@ http://www.hardcoded.net/licenses/bsd_license
}
}
- (IBAction)loadResults:(id)sender
{
NSOpenPanel *op = [NSOpenPanel openPanel];
[op setCanChooseFiles:YES];
[op setCanChooseDirectories:NO];
[op setCanCreateDirectories:NO];
[op setAllowsMultipleSelection:NO];
[op setAllowedFileTypes:[NSArray arrayWithObject:@"dupeguru"]];
[op setTitle:@"Select a results file to load"];
if ([op runModal] == NSOKButton) {
NSString *filename = [[op filenames] objectAtIndex:0];
[py loadResultsFrom:filename];
[[app recentResults] addFile:filename];
}
}
- (IBAction)markAll:(id)sender
{
[py markAll];
@ -448,6 +432,7 @@ http://www.hardcoded.net/licenses/bsd_license
- (void)jobStarted:(NSNotification *)aNotification
{
[[self window] makeKeyAndOrderFront:nil];
NSDictionary *ui = [aNotification userInfo];
NSString *desc = [ui valueForKey:@"desc"];
[[ProgressController mainProgressController] setJobDesc:desc];

161
cocoa/base/xib/MainMenu.xib
View File

@ -12,7 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="57"/>
<integer value="24"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -461,8 +461,8 @@
<object class="NSMenuItem" id="517397504">
<reference key="NSMenu" ref="600111647"/>
<string key="NSTitle">Invoke Custom Command</string>
<string key="NSKeyEquiv">i</string>
<int key="NSKeyEquivModMask">1048576</int>
<string key="NSKeyEquiv">C</string>
<int key="NSKeyEquivModMask">262144</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="34697260"/>
<reference key="NSMixedImage" ref="201180191"/>
@ -541,11 +541,18 @@
<string key="NSTitle">Window</string>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMenuItem" id="937862901">
<reference key="NSMenu" ref="472719764"/>
<string key="NSTitle">Results Window</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="34697260"/>
<reference key="NSMixedImage" ref="201180191"/>
</object>
<object class="NSMenuItem" id="571301982">
<reference key="NSMenu" ref="472719764"/>
<string key="NSTitle">Directory Panel</string>
<string key="NSKeyEquiv">3</string>
<int key="NSKeyEquivModMask">1048576</int>
<string key="NSTitle">Directories Window</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="34697260"/>
<reference key="NSMixedImage" ref="201180191"/>
@ -553,7 +560,7 @@
<object class="NSMenuItem" id="961037837">
<reference key="NSMenu" ref="472719764"/>
<string key="NSTitle">Details Panel</string>
<string key="NSKeyEquiv">4</string>
<string key="NSKeyEquiv">i</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="34697260"/>
@ -750,14 +757,6 @@
</object>
<int key="connectionID">614</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">toggleDirectories:</string>
<reference key="source" ref="91622651"/>
<reference key="destination" ref="571301982"/>
</object>
<int key="connectionID">758</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">performClose:</string>
@ -966,14 +965,6 @@
</object>
<int key="connectionID">1258</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">startDuplicateScan:</string>
<reference key="source" ref="83466988"/>
<reference key="destination" ref="1035429435"/>
</object>
<int key="connectionID">1259</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">switchSelected:</string>
@ -1046,6 +1037,30 @@
</object>
<int key="connectionID">1270</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">startScanning:</string>
<reference key="source" ref="91622651"/>
<reference key="destination" ref="1035429435"/>
</object>
<int key="connectionID">1271</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">showDirectoryWindow:</string>
<reference key="source" ref="91622651"/>
<reference key="destination" ref="571301982"/>
</object>
<int key="connectionID">1273</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">showResultWindow:</string>
<reference key="source" ref="91622651"/>
<reference key="destination" ref="937862901"/>
</object>
<int key="connectionID">1274</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@ -1115,6 +1130,7 @@
<reference ref="424012835"/>
<reference ref="571301982"/>
<reference ref="762484626"/>
<reference ref="937862901"/>
</object>
<reference key="parent" ref="751320875"/>
</object>
@ -1565,6 +1581,11 @@
</object>
<reference key="parent" ref="356425059"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1272</int>
<reference key="object" ref="937862901"/>
<reference key="parent" ref="472719764"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@ -1603,6 +1624,7 @@
<string>1239.IBPluginDependency</string>
<string>1240.IBEditorWindowLastContentRect</string>
<string>1240.IBPluginDependency</string>
<string>1272.IBPluginDependency</string>
<string>134.IBPluginDependency</string>
<string>134.ImportedFromIB2</string>
<string>136.IBPluginDependency</string>
@ -1743,7 +1765,7 @@
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{242, 685}, {258, 83}}</string>
<string>{{538, 738}, {258, 83}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -1753,6 +1775,7 @@
<string>{{500, 742}, {64, 6}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
@ -1771,10 +1794,10 @@
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>{{531, 625}, {193, 143}}</string>
<string>{{827, 658}, {208, 163}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>{{140, 768}, {523, 20}}</string>
<string>{{436, 821}, {523, 20}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -1798,7 +1821,7 @@
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>{{328, 455}, {383, 313}}</string>
<string>{{624, 508}, {383, 313}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -1818,7 +1841,7 @@
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>{{397, 762}, {64, 6}}</string>
<string>{{693, 815}, {64, 6}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -1848,7 +1871,7 @@
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>{{475, 725}, {167, 43}}</string>
<string>{{771, 778}, {167, 43}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -1857,7 +1880,7 @@
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>{{284, 615}, {188, 153}}</string>
<string>{{580, 668}, {188, 153}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -1884,7 +1907,7 @@
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">1270</int>
<int key="maxID">1274</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -1904,11 +1927,14 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>loadResults:</string>
<string>openHelp:</string>
<string>openWebsite:</string>
<string>showAboutBox:</string>
<string>showDirectoryWindow:</string>
<string>showPreferencesPanel:</string>
<string>toggleDirectories:</string>
<string>showResultWindow:</string>
<string>startScanning:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -1917,20 +1943,30 @@
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>loadResults:</string>
<string>openHelp:</string>
<string>openWebsite:</string>
<string>showAboutBox:</string>
<string>showDirectoryWindow:</string>
<string>showPreferencesPanel:</string>
<string>toggleDirectories:</string>
<string>showResultWindow:</string>
<string>startScanning:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">loadResults:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">openHelp:</string>
<string key="candidateClassName">id</string>
@ -1943,12 +1979,20 @@
<string key="name">showAboutBox:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">showDirectoryWindow:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">showPreferencesPanel:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">toggleDirectories:</string>
<string key="name">showResultWindow:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">startScanning:</string>
<string key="candidateClassName">id</string>
</object>
</object>
@ -2129,46 +2173,6 @@
<string key="minorKey">../PyFairware.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">ResultWindow</string>
<string key="superclassName">ResultWindowBase</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>resetColumnsToDefault:</string>
<string>startDuplicateScan:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>resetColumnsToDefault:</string>
<string>startDuplicateScan:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">resetColumnsToDefault:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">startDuplicateScan:</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">ResultWindow.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">ResultWindowBase</string>
<string key="superclassName">NSWindowController</string>
@ -2185,7 +2189,6 @@
<string>hardlinkMarked:</string>
<string>ignoreSelected:</string>
<string>invokeCustomCommand:</string>
<string>loadResults:</string>
<string>markAll:</string>
<string>markInvert:</string>
<string>markNone:</string>
@ -2236,7 +2239,6 @@
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
@ -2252,7 +2254,6 @@
<string>hardlinkMarked:</string>
<string>ignoreSelected:</string>
<string>invokeCustomCommand:</string>
<string>loadResults:</string>
<string>markAll:</string>
<string>markInvert:</string>
<string>markNone:</string>
@ -2311,10 +2312,6 @@
<string key="name">invokeCustomCommand:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">loadResults:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">markAll:</string>
<string key="candidateClassName">id</string>
@ -2956,7 +2953,7 @@
<integer value="3000" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">../../se/dupeguru.xcodeproj</string>
<string key="IBDocument.LastKnownRelativeProjectPath">../../me/dupeguru.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<bool key="EncodedWithXMLCoder">YES</bool>

47
cocoa/base/xib/ResultWindow.xib
View File

@ -890,14 +890,6 @@
</object>
<int key="connectionID">46</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">toggleDirectories:</string>
<reference key="source" ref="1003"/>
<reference key="destination" ref="272445295"/>
</object>
<int key="connectionID">48</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">deleteMarked:</string>
@ -1090,6 +1082,14 @@
</object>
<int key="connectionID">81</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">showDirectoryWindow:</string>
<reference key="source" ref="1003"/>
<reference key="destination" ref="272445295"/>
</object>
<int key="connectionID">82</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@ -1668,7 +1668,7 @@
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">81</int>
<int key="maxID">82</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -1680,12 +1680,14 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>loadResults:</string>
<string>openHelp:</string>
<string>openWebsite:</string>
<string>showAboutBox:</string>
<string>showDirectoryWindow:</string>
<string>showPreferencesPanel:</string>
<string>showResultWindow:</string>
<string>startScanning:</string>
<string>toggleDirectories:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -1695,21 +1697,29 @@
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>loadResults:</string>
<string>openHelp:</string>
<string>openWebsite:</string>
<string>showAboutBox:</string>
<string>showDirectoryWindow:</string>
<string>showPreferencesPanel:</string>
<string>showResultWindow:</string>
<string>startScanning:</string>
<string>toggleDirectories:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">loadResults:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">openHelp:</string>
<string key="candidateClassName">id</string>
@ -1722,16 +1732,20 @@
<string key="name">showAboutBox:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">showDirectoryWindow:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">showPreferencesPanel:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">startScanning:</string>
<string key="name">showResultWindow:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">toggleDirectories:</string>
<string key="name">startScanning:</string>
<string key="candidateClassName">id</string>
</object>
</object>
@ -1869,7 +1883,6 @@
<string>hardlinkMarked:</string>
<string>ignoreSelected:</string>
<string>invokeCustomCommand:</string>
<string>loadResults:</string>
<string>markAll:</string>
<string>markInvert:</string>
<string>markNone:</string>
@ -1920,7 +1933,6 @@
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
@ -1936,7 +1948,6 @@
<string>hardlinkMarked:</string>
<string>ignoreSelected:</string>
<string>invokeCustomCommand:</string>
<string>loadResults:</string>
<string>markAll:</string>
<string>markInvert:</string>
<string>markNone:</string>
@ -1995,10 +2006,6 @@
<string key="name">invokeCustomCommand:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">loadResults:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">markAll:</string>
<string key="candidateClassName">id</string>

4
cocoa/me/ResultWindow.m
View File

@ -70,10 +70,8 @@ http://www.hardcoded.net/licenses/bsd_license
[_py setIgnoreHardlinkMatches:n2b([ud objectForKey:@"ignoreHardlinkMatches"])];
[_py setMatchSimilarWords:[ud objectForKey:@"matchSimilarWords"]];
NSInteger r = n2i([py doScan]);
if (r == 3)
{
if (r == 3) {
[Dialogs showMessage:@"The selected directories contain no scannable file."];
[app toggleDirectories:nil];
}
}

1
cocoa/pe/ResultWindow.h
View File

@ -11,5 +11,4 @@ http://www.hardcoded.net/licenses/bsd_license
@interface ResultWindow : ResultWindowBase {}
- (IBAction)clearPictureCache:(id)sender;
- (IBAction)toggleDirectories:(id)sender;
@end

6
cocoa/pe/ResultWindow.m
View File

@ -67,18 +67,12 @@ http://www.hardcoded.net/licenses/bsd_license
}
if (r == 3) {
[Dialogs showMessage:@"The selected directories contain no scannable file."];
[app toggleDirectories:nil];
}
if (r == 4) {
[Dialogs showMessage:@"The iPhoto application couldn't be found."];
}
}
- (IBAction)toggleDirectories:(id)sender
{
[(AppDelegate *)app toggleDirectories:sender];
}
/* Public */
- (void)initResultColumns
{

4
cocoa/se/ResultWindow.m
View File

@ -59,10 +59,8 @@ http://www.hardcoded.net/licenses/bsd_license
int r = n2i([py doScan]);
if (r != 0)
[[ProgressController mainProgressController] hide];
if (r == 3)
{
if (r == 3) {
[Dialogs showMessage:@"The selected directories contain no scannable file."];
[app toggleDirectories:nil];
}
}