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

Added a 'Load Results' button in the Directory window.

This commit is contained in:
Virgil Dupras 2011-01-15 12:08:10 +01:00
parent ad3114c56b
commit 9833067ba7
4 changed files with 187 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cocoa/base/AppDelegate.m
View File

@ -17,13 +17,13 @@ http://www.hardcoded.net/licenses/bsd_license
@implementation AppDelegateBase
- (void)awakeFromNib
{
_resultWindow = nil;
_directoryPanel = nil;
_detailsPanel = nil;
_aboutBox = nil;
_preferencesPanel = nil;
_recentResults = [[HSRecentFiles alloc] initWithName:@"recentResults" menu:recentResultsMenu];
[_recentResults setDelegate:self];
_resultWindow = [self createResultWindow];
_directoryPanel = [self createDirectoryPanel];
_detailsPanel = nil; // Lazily loaded
_aboutBox = nil; // Lazily loaded
_preferencesPanel = nil; // Lazily loaded
[[[self directoryPanel] window] makeKeyAndOrderFront:self];
}
@ -54,15 +54,11 @@ http://www.hardcoded.net/licenses/bsd_license
/* Public */
- (ResultWindowBase *)resultWindow
{
if (!_resultWindow)
_resultWindow = [self createResultWindow];
return _resultWindow;
}
- (DirectoryPanel *)directoryPanel
{
if (!_directoryPanel)
_directoryPanel = [self createDirectoryPanel];
return _directoryPanel;
}

7
cocoa/base/DirectoryPanel.h
View File

@ -12,23 +12,28 @@ http://www.hardcoded.net/licenses/bsd_license
#import "DirectoryOutline.h"
#import "PyDupeGuru.h"
@class AppDelegateBase;
@interface DirectoryPanel : NSWindowController
{
IBOutlet NSPopUpButton *addButtonPopUp;
IBOutlet NSPopUpButton *loadRecentButtonPopUp;
IBOutlet HSOutlineView *outlineView;
IBOutlet NSButton *removeButton;
AppDelegateBase *_app;
PyDupeGuruBase *_py;
HSRecentFiles *_recentDirectories;
DirectoryOutline *outline;
BOOL _alwaysShowPopUp;
}
- (id)initWithParentApp:(id)aParentApp;
- (id)initWithParentApp:(AppDelegateBase *)aParentApp;
- (void)fillPopUpMenu; // Virtual
- (IBAction)askForDirectory:(id)sender;
- (IBAction)popupAddDirectoryMenu:(id)sender;
- (IBAction)popupLoadRecentMenu:(id)sender;
- (IBAction)removeSelectedDirectory:(id)sender;
- (void)addDirectory:(NSString *)directory;

25
cocoa/base/DirectoryPanel.m
View File

@ -12,12 +12,12 @@ http://www.hardcoded.net/licenses/bsd_license
#import "AppDelegate.h"
@implementation DirectoryPanel
- (id)initWithParentApp:(id)aParentApp
- (id)initWithParentApp:(AppDelegateBase *)aParentApp
{
self = [super initWithWindowNibName:@"DirectoryPanel"];
[self window];
AppDelegateBase *app = aParentApp;
_py = [app py];
_app = aParentApp;
_py = [_app py];
_alwaysShowPopUp = NO;
[self fillPopUpMenu];
_recentDirectories = [[HSRecentFiles alloc] initWithName:@"recentDirectories" menu:[addButtonPopUp menu]];
@ -74,6 +74,25 @@ http://www.hardcoded.net/licenses/bsd_license
}
}
- (IBAction)popupLoadRecentMenu:(id)sender
{
if ([[[_app recentResults] filepaths] count] > 0) {
NSMenu *m = [loadRecentButtonPopUp menu];
while ([m numberOfItems] > 0) {
[m removeItemAtIndex:0];
}
NSMenuItem *mi = [m addItemWithTitle:@"Load from file..." action:@selector(loadResults:) keyEquivalent:@""];
[mi setTarget:_app];
[m addItem:[NSMenuItem separatorItem]];
[[_app recentResults] fillMenu:m];
[loadRecentButtonPopUp selectItem:nil];
[[loadRecentButtonPopUp cell] performClickWithFrame:[sender frame] inView:[sender superview]];
}
else {
[_app loadResults:nil];
}
}
- (IBAction)removeSelectedDirectory:(id)sender
{
[[self window] makeKeyAndOrderFront:nil];

158
cocoa/base/xib/DirectoryPanel.xib
View File

@ -306,7 +306,7 @@
<reference key="NSControlView" ref="1031103869"/>
<int key="NSButtonFlags">109199615</int>
<int key="NSButtonFlags2">1</int>
<object class="NSFont" key="NSAlternateImage">
<object class="NSFont" key="NSAlternateImage" id="992311554">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">16</int>
@ -334,6 +334,43 @@
<int key="NSArrowPosition">1</int>
</object>
</object>
<object class="NSPopUpButton" id="286019300">
<reference key="NSNextResponder" ref="53314480"/>
<int key="NSvFlags">-2147483356</int>
<string key="NSFrame">{{89, 6}, {46, 26}}</string>
<reference key="NSSuperview" ref="53314480"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="506582789">
<int key="NSCellFlags">-2076049856</int>
<int key="NSCellFlags2">2048</int>
<reference key="NSSupport" ref="156117695"/>
<reference key="NSControlView" ref="286019300"/>
<int key="NSButtonFlags">109199615</int>
<int key="NSButtonFlags2">1</int>
<reference key="NSAlternateImage" ref="992311554"/>
<string key="NSAlternateContents"/>
<object class="NSMutableString" key="NSKeyEquivalent">
<characters key="NS.bytes"/>
</object>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
<nil key="NSMenuItem"/>
<bool key="NSMenuItemRespectAlignment">YES</bool>
<object class="NSMenu" key="NSMenu" id="617191984">
<object class="NSMutableString" key="NSTitle">
<characters key="NS.bytes">OtherViews</characters>
</object>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<int key="NSSelectedIndex">-1</int>
<int key="NSPreferredEdge">3</int>
<bool key="NSUsesItemFromMenu">YES</bool>
<bool key="NSAltersState">YES</bool>
<int key="NSArrowPosition">1</int>
</object>
</object>
<object class="NSButton" id="580397230">
<reference key="NSNextResponder" ref="53314480"/>
<int key="NSvFlags">289</int>
@ -424,6 +461,26 @@
<reference key="NSTextColor" ref="409825145"/>
</object>
</object>
<object class="NSButton" id="84918337">
<reference key="NSNextResponder" ref="53314480"/>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{144, 12}, {120, 32}}</string>
<reference key="NSSuperview" ref="53314480"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1017656049">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Load Results</string>
<reference key="NSSupport" ref="156117695"/>
<reference key="NSControlView" ref="84918337"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">129</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
</object>
<string key="NSFrameSize">{369, 294}</string>
<reference key="NSSuperview"/>
@ -501,6 +558,22 @@
</object>
<int key="connectionID">69</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">loadRecentButtonPopUp</string>
<reference key="source" ref="566600593"/>
<reference key="destination" ref="286019300"/>
</object>
<int key="connectionID">77</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">popupLoadRecentMenu:</string>
<reference key="source" ref="566600593"/>
<reference key="destination" ref="84918337"/>
</object>
<int key="connectionID">78</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@ -552,6 +625,8 @@
<reference ref="580397230"/>
<reference ref="827813955"/>
<reference ref="888784157"/>
<reference ref="84918337"/>
<reference ref="286019300"/>
</object>
<reference key="parent" ref="970147395"/>
</object>
@ -732,6 +807,43 @@
<reference key="object" ref="293396843"/>
<reference key="parent" ref="186572573"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">72</int>
<reference key="object" ref="84918337"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="1017656049"/>
</object>
<reference key="parent" ref="53314480"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">73</int>
<reference key="object" ref="1017656049"/>
<reference key="parent" ref="84918337"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">74</int>
<reference key="object" ref="286019300"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="506582789"/>
</object>
<reference key="parent" ref="53314480"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">75</int>
<reference key="object" ref="506582789"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="617191984"/>
</object>
<reference key="parent" ref="286019300"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">76</int>
<reference key="object" ref="617191984"/>
<reference key="parent" ref="506582789"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@ -789,6 +901,16 @@
<string>7.ImportedFromIB2</string>
<string>70.IBPluginDependency</string>
<string>71.IBPluginDependency</string>
<string>72.IBPluginDependency</string>
<string>72.IBViewBoundsToFrameTransform</string>
<string>73.IBPluginDependency</string>
<string>74.IBPluginDependency</string>
<string>74.IBViewBoundsToFrameTransform</string>
<string>74.ImportedFromIB2</string>
<string>75.IBPluginDependency</string>
<string>76.IBEditorWindowLastContentRect</string>
<string>76.IBPluginDependency</string>
<string>76.ImportedFromIB2</string>
<string>8.IBEditorWindowLastContentRect</string>
<string>8.IBPluginDependency</string>
<string>8.ImportedFromIB2</string>
@ -851,11 +973,25 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABCsgAAwigAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABCsgAAwiAAAA</bytes>
</object>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDHAAAwigAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABCvAAAwgwAAA</bytes>
</object>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{241, 510}, {64, 6}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>{{95, 586}, {197, 33}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
@ -877,7 +1013,7 @@
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">71</int>
<int key="maxID">78</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -1012,6 +1148,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>askForDirectory:</string>
<string>popupAddDirectoryMenu:</string>
<string>popupLoadRecentMenu:</string>
<string>removeSelectedDirectory:</string>
</object>
<object class="NSMutableArray" key="dict.values">
@ -1019,6 +1156,7 @@
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
@ -1027,6 +1165,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>askForDirectory:</string>
<string>popupAddDirectoryMenu:</string>
<string>popupLoadRecentMenu:</string>
<string>removeSelectedDirectory:</string>
</object>
<object class="NSMutableArray" key="dict.values">
@ -1039,6 +1178,10 @@
<string key="name">popupAddDirectoryMenu:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">popupLoadRecentMenu:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">removeSelectedDirectory:</string>
<string key="candidateClassName">id</string>
@ -1050,12 +1193,14 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addButtonPopUp</string>
<string>loadRecentButtonPopUp</string>
<string>outlineView</string>
<string>removeButton</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSPopUpButton</string>
<string>NSPopUpButton</string>
<string>HSOutlineView</string>
<string>NSButton</string>
</object>
@ -1065,6 +1210,7 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addButtonPopUp</string>
<string>loadRecentButtonPopUp</string>
<string>outlineView</string>
<string>removeButton</string>
</object>
@ -1074,6 +1220,10 @@
<string key="name">addButtonPopUp</string>
<string key="candidateClassName">NSPopUpButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">loadRecentButtonPopUp</string>
<string key="candidateClassName">NSPopUpButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">outlineView</string>
<string key="candidateClassName">HSOutlineView</string>
@ -1705,7 +1855,7 @@
<integer value="3000" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">../../me/dupeguru.xcodeproj</string>
<string key="IBDocument.LastKnownRelativeProjectPath">../../se/dupeguru.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<bool key="EncodedWithXMLCoder">YES</bool>