From 4db5fae38b806a421cef05c79555e318f20dab65 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Mon, 23 Jul 2012 17:46:01 -0400 Subject: [PATCH] xibless-ified DirectoryPanel. --HG-- branch : xibless --- build.py | 1 + cocoa/base/DirectoryPanel.h | 26 +- cocoa/base/DirectoryPanel.m | 24 +- cocoa/base/en.lproj/DirectoryPanel.strings | 23 - cocoa/base/en.lproj/DirectoryPanel.xib | 1083 ------------------- cocoa/base/en.lproj/Localizable.strings | 10 + cocoa/base/ui/details_panel.py | 6 +- cocoa/base/ui/directory_panel.py | 59 + cocoa/pe/ui/details_panel.py | 16 +- cocoa/se/dupeguru.xcodeproj/project.pbxproj | 36 +- 10 files changed, 116 insertions(+), 1168 deletions(-) delete mode 100644 cocoa/base/en.lproj/DirectoryPanel.strings delete mode 100644 cocoa/base/en.lproj/DirectoryPanel.xib create mode 100644 cocoa/base/ui/directory_panel.py diff --git a/build.py b/build.py index 7a2a7d3c..06a304d2 100644 --- a/build.py +++ b/build.py @@ -61,6 +61,7 @@ def build_xibless(edition): xibless.generate('cocoa/base/ui/ignore_list_dialog.py', 'cocoa/autogen/IgnoreListDialog_UI', localizationTable='Localizable') xibless.generate('cocoa/base/ui/deletion_options.py', 'cocoa/autogen/DeletionOptions_UI', localizationTable='Localizable') xibless.generate('cocoa/base/ui/problem_dialog.py', 'cocoa/autogen/ProblemDialog_UI', localizationTable='Localizable') + xibless.generate('cocoa/base/ui/directory_panel.py', 'cocoa/autogen/DirectoryPanel_UI', localizationTable='Localizable') def build_cocoa(edition, dev): build_xibless(edition) diff --git a/cocoa/base/DirectoryPanel.h b/cocoa/base/DirectoryPanel.h index 75ed2ea2..10c75fa6 100644 --- a/cocoa/base/DirectoryPanel.h +++ b/cocoa/base/DirectoryPanel.h @@ -16,27 +16,33 @@ http://www.hardcoded.net/licenses/bsd_license @interface DirectoryPanel : NSWindowController { - IBOutlet NSPopUpButton *addButtonPopUp; - IBOutlet NSPopUpButton *loadRecentButtonPopUp; - IBOutlet HSOutlineView *outlineView; - IBOutlet NSButton *removeButton; - IBOutlet NSButton *loadResultsButton; - AppDelegateBase *_app; PyDupeGuru *model; HSRecentFiles *_recentDirectories; DirectoryOutline *outline; BOOL _alwaysShowPopUp; + NSPopUpButton *addButtonPopUp; + NSPopUpButton *loadRecentButtonPopUp; + HSOutlineView *outlineView; + NSButton *removeButton; + NSButton *loadResultsButton; } + +@property (readwrite, retain) NSPopUpButton *addButtonPopUp; +@property (readwrite, retain) NSPopUpButton *loadRecentButtonPopUp; +@property (readwrite, retain) HSOutlineView *outlineView; +@property (readwrite, retain) NSButton *removeButton; +@property (readwrite, retain) NSButton *loadResultsButton; + - (id)initWithParentApp:(AppDelegateBase *)aParentApp; - (void)fillPopUpMenu; // Virtual - (void)adjustUIToLocalization; -- (IBAction)askForDirectory:(id)sender; -- (IBAction)popupAddDirectoryMenu:(id)sender; -- (IBAction)popupLoadRecentMenu:(id)sender; -- (IBAction)removeSelectedDirectory:(id)sender; +- (void)askForDirectory; +- (void)popupAddDirectoryMenu:(id)sender; +- (void)popupLoadRecentMenu:(id)sender; +- (void)removeSelectedDirectory; - (void)addDirectory:(NSString *)directory; - (void)refreshRemoveButtonText; diff --git a/cocoa/base/DirectoryPanel.m b/cocoa/base/DirectoryPanel.m index ed8c3425..5ef3613a 100644 --- a/cocoa/base/DirectoryPanel.m +++ b/cocoa/base/DirectoryPanel.m @@ -7,16 +7,24 @@ http://www.hardcoded.net/licenses/bsd_license */ #import "DirectoryPanel.h" +#import "DirectoryPanel_UI.h" #import "Dialogs.h" #import "Utils.h" #import "AppDelegate.h" #import "Consts.h" @implementation DirectoryPanel + +@synthesize addButtonPopUp; +@synthesize loadRecentButtonPopUp; +@synthesize outlineView; +@synthesize removeButton; +@synthesize loadResultsButton; + - (id)initWithParentApp:(AppDelegateBase *)aParentApp { - self = [super initWithWindowNibName:@"DirectoryPanel"]; - [self window]; + self = [super initWithWindow:nil]; + [self setWindow:createDirectoryPanel_UI(self)]; _app = aParentApp; model = [_app model]; [[self window] setTitle:[model appName]]; @@ -47,7 +55,7 @@ http://www.hardcoded.net/licenses/bsd_license - (void)fillPopUpMenu { NSMenu *m = [addButtonPopUp menu]; - NSMenuItem *mi = [m addItemWithTitle:TR(@"Add New Folder...") action:@selector(askForDirectory:) keyEquivalent:@""]; + NSMenuItem *mi = [m addItemWithTitle:TR(@"Add New Folder...") action:@selector(askForDirectory) keyEquivalent:@""]; [mi setTarget:self]; [m addItem:[NSMenuItem separatorItem]]; } @@ -75,7 +83,7 @@ http://www.hardcoded.net/licenses/bsd_license /* Actions */ -- (IBAction)askForDirectory:(id)sender +- (void)askForDirectory { NSOpenPanel *op = [NSOpenPanel openPanel]; [op setCanChooseFiles:YES]; @@ -90,10 +98,10 @@ http://www.hardcoded.net/licenses/bsd_license } } -- (IBAction)popupAddDirectoryMenu:(id)sender +- (void)popupAddDirectoryMenu:(id)sender { if ((!_alwaysShowPopUp) && ([[_recentDirectories filepaths] count] == 0)) { - [self askForDirectory:sender]; + [self askForDirectory]; } else { [addButtonPopUp selectItem:nil]; @@ -101,7 +109,7 @@ http://www.hardcoded.net/licenses/bsd_license } } -- (IBAction)popupLoadRecentMenu:(id)sender +- (void)popupLoadRecentMenu:(id)sender { if ([[[_app recentResults] filepaths] count] > 0) { NSMenu *m = [loadRecentButtonPopUp menu]; @@ -120,7 +128,7 @@ http://www.hardcoded.net/licenses/bsd_license } } -- (IBAction)removeSelectedDirectory:(id)sender +- (void)removeSelectedDirectory { [[self window] makeKeyAndOrderFront:nil]; [[outline model] removeSelectedDirectory]; diff --git a/cocoa/base/en.lproj/DirectoryPanel.strings b/cocoa/base/en.lproj/DirectoryPanel.strings deleted file mode 100644 index e22074ac..00000000 --- a/cocoa/base/en.lproj/DirectoryPanel.strings +++ /dev/null @@ -1,23 +0,0 @@ -/* Class = "NSTableColumn"; headerCell.title = "State"; ObjectID = "13"; */ -"13.headerCell.title" = "State"; - -/* Class = "NSTableColumn"; headerCell.title = "Name"; ObjectID = "15"; */ -"15.headerCell.title" = "Name"; - -/* Class = "NSButtonCell"; title = "Scan"; ObjectID = "48"; */ -"48.title" = "Scan"; - -/* Class = "NSMenuItem"; title = "Normal"; ObjectID = "55"; */ -"55.title" = "Normal"; - -/* Class = "NSMenuItem"; title = "Reference"; ObjectID = "56"; */ -"56.title" = "Reference"; - -/* Class = "NSMenuItem"; title = "Excluded"; ObjectID = "57"; */ -"57.title" = "Excluded"; - -/* Class = "NSTextFieldCell"; title = "Select folders to scan and press \"Scan\"."; ObjectID = "71"; */ -"71.title" = "Select folders to scan and press \"Scan\"."; - -/* Class = "NSButtonCell"; title = "Load Results"; ObjectID = "73"; */ -"73.title" = "Load Results"; diff --git a/cocoa/base/en.lproj/DirectoryPanel.xib b/cocoa/base/en.lproj/DirectoryPanel.xib deleted file mode 100644 index 637fff9c..00000000 --- a/cocoa/base/en.lproj/DirectoryPanel.xib +++ /dev/null @@ -1,1083 +0,0 @@ - - - - 1060 - 11D50 - 2182 - 1138.32 - 568.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 2182 - - - NSTextField - NSPopUpButton - NSScroller - NSButton - NSMenu - NSScrollView - NSTextFieldCell - NSButtonCell - NSTableHeaderView - NSMenuItem - NSOutlineView - NSCustomObject - NSView - NSWindowTemplate - NSPopUpButtonCell - NSTableColumn - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - DirectoryPanel - - - FirstResponder - - - NSApplication - - - 11 - 2 - {{387, 265}, {422, 294}} - 1886913536 - dupeGuru - NSWindow - - View - - - {369, 269} - - - 256 - - - - 274 - - - - 2304 - - - - 256 - {380, 183} - - - YES - - - 256 - {380, 17} - - - - - - - -2147483392 - {{-26, 0}, {16, 17}} - - - - - - name - 289 - 16 - 1000 - - 75628096 - 2048 - Name - - LucidaGrande - 11 - 3100 - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - 3 - MAA - - - - - 337772096 - 2048 - Text Cell - - - - 6 - System - controlBackgroundColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - - - 3 - YES - - - - state - 85.35595703125 - 30.35595703125 - 1000 - - 75628096 - 2048 - State - - - 6 - System - headerColor - - 3 - MQA - - - - - - 71433792 - 2048 - - - -2046672641 - 1 - - - 400 - 75 - - - Normal - - 2147483647 - 1 - _popUpItemAction: - - - YES - - Normal - - - - - Reference - - 2147483647 - _popUpItemAction: - - - - - Excluded - - 2147483647 - _popUpItemAction: - - - - YES - YES - - 3 - YES - YES - 1 - - 2 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 14 - 1514176512 - - - 1 - 15 - 0 - YES - 0 - 1 - - - {{1, 17}, {380, 183}} - - - - - - 4 - - - - -2147483392 - {{-30, 17}, {15, 150}} - - - - _doScroller: - 0.7366071343421936 - - - - -2147483392 - {{1, -30}, {312, 15}} - - - 1 - - _doScroller: - 0.9541284441947937 - - - - 2304 - - - - {{1, 0}, {380, 17}} - - - - - - 4 - - - - {{20, 48}, {382, 201}} - - - - 133682 - - - - - - QSAAAEEgAABBgAAAQYAAAA - - - - -2147483356 - {{89, 16}, {46, 26}} - - - YES - - -2076049856 - 2048 - - LucidaGrande - 13 - 1044 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - YES - - - OtherViews - - - - -1 - 3 - YES - YES - 1 - - - - - -2147483356 - {{89, 6}, {46, 26}} - - - YES - - -2076049856 - 2048 - - - 109199615 - 1 - - - - - - 400 - 75 - - YES - - - OtherViews - - - - -1 - 3 - YES - YES - 1 - - - - - 289 - {{278, 13}, {130, 32}} - - - YES - - 67239424 - 134217728 - Scan - - - -2038284033 - 1 - - - DQ - 200 - 25 - - - - - 292 - {{20, 16}, {28, 25}} - - - YES - - -2080244224 - 134217728 - - - - -2033958657 - 163 - - NSImage - NSAddTemplate - - - - 400 - 75 - - - - - 292 - {{56, 16}, {28, 25}} - - - YES - - -2080244224 - 134217728 - - - - -2033958657 - 163 - - NSImage - NSRemoveTemplate - - - - 400 - 75 - - - - - 266 - {{17, 257}, {388, 17}} - - - YES - - 68288064 - 272630784 - Select folders to scan and press "Scan". - - - - 6 - System - controlColor - - - - - - - - 289 - {{148, 13}, {130, 32}} - - - YES - - 67239424 - 134217728 - Load Results - - - -2038284033 - 129 - - - 200 - 25 - - - - {422, 294} - - - - {{0, 0}, {1440, 878}} - {369, 291} - {10000000000000, 10000000000000} - DirectoryPanel - YES - - - - - - - window - - - - 25 - - - - addButtonPopUp - - - - 26 - - - - outlineView - - - - 54 - - - - removeSelectedDirectory: - - - - 67 - - - - popupAddDirectoryMenu: - - - - 68 - - - - removeButton - - - - 69 - - - - loadRecentButtonPopUp - - - - 77 - - - - popupLoadRecentMenu: - - - - 78 - - - - loadResultsButton - - - - 79 - - - - startScanning: - - - - 60 - - - - initialFirstResponder - - - - 19 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 5 - - - - - - directories - - - 6 - - - - - - - - - - - - - - - 7 - - - - - - - - 10 - - - - - - - - - - - 11 - - - - - - - - - 13 - - - - - - - - 14 - - - - - - - - 15 - - - - - - - - 31 - - - - - - - - 45 - - - - - - - - 48 - - - - - 49 - - - - - 8 - - - - - - 50 - - - - - - - - - - 51 - - - - - 52 - - - - - 53 - - - - - 55 - - - - - 56 - - - - - 57 - - - - - 63 - - - - - - - - 64 - - - - - 65 - - - - - - - - 66 - - - - - 70 - - - - - - - - 71 - - - - - 72 - - - - - - - - 73 - - - - - 74 - - - - - - - - 75 - - - - - - - - 76 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - HSOutlineView - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - {{413, 484}, {395, 294}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 79 - - - - - AppDelegateBase - NSObject - - id - id - id - id - id - id - id - id - id - - - - loadResults: - id - - - openHelp: - id - - - openWebsite: - id - - - showAboutBox: - id - - - showDirectoryWindow: - id - - - showIgnoreList: - id - - - showPreferencesPanel: - id - - - showResultWindow: - id - - - startScanning: - id - - - - NSMenu - NSMenu - NSMenu - - - - actionsMenu - NSMenu - - - columnsMenu - NSMenu - - - recentResultsMenu - NSMenu - - - - IBProjectSource - ./Classes/AppDelegateBase.h - - - - DirectoryPanel - NSWindowController - - id - id - id - id - - - - askForDirectory: - id - - - popupAddDirectoryMenu: - id - - - popupLoadRecentMenu: - id - - - removeSelectedDirectory: - id - - - - NSPopUpButton - NSPopUpButton - NSButton - HSOutlineView - NSButton - - - - addButtonPopUp - NSPopUpButton - - - loadRecentButtonPopUp - NSPopUpButton - - - loadResultsButton - NSButton - - - outlineView - HSOutlineView - - - removeButton - NSButton - - - - IBProjectSource - ./Classes/DirectoryPanel.h - - - - HSOutlineView - NSOutlineView - - copy: - id - - - copy: - - copy: - id - - - - IBProjectSource - ./Classes/HSOutlineView.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - {8, 8} - {8, 8} - - - diff --git a/cocoa/base/en.lproj/Localizable.strings b/cocoa/base/en.lproj/Localizable.strings index 8419096d..7e46a5ac 100644 --- a/cocoa/base/en.lproj/Localizable.strings +++ b/cocoa/base/en.lproj/Localizable.strings @@ -52,3 +52,13 @@ "Problems!" = "Problems!"; "There were problems processing some (or all) of the files. The cause of these problems are described in the table below. Those files were not removed from your results." = "There were problems processing some (or all) of the files. The cause of these problems are described in the table below. Those files were not removed from your results."; "Reveal Selected" = "Reveal Selected"; + +/* Directory Panel */ +"State" = "State"; +"Name" = "Name"; +"Scan" = "Scan"; +"Normal" = "Normal"; +"Reference" = "Reference"; +"Excluded" = "Excluded"; +"Select folders to scan and press \"Scan\"." = "Select folders to scan and press \"Scan\"."; +"Load Results" = "Load Results"; diff --git a/cocoa/base/ui/details_panel.py b/cocoa/base/ui/details_panel.py index 956188f1..d8d02905 100644 --- a/cocoa/base/ui/details_panel.py +++ b/cocoa/base/ui/details_panel.py @@ -27,8 +27,6 @@ col.autoResizable = True col = table.addColumn('2', "Reference", 172) col.autoResizable = True -result.ignoreMargin = True -table.packToCorner(Pack.UpperLeft) -table.fill(Pack.Right) -table.fill(Pack.Below) +table.packToCorner(Pack.UpperLeft, margin=0) +table.fill(Pack.LowerRight, margin=0) table.setAnchor(Pack.UpperLeft, growX=True, growY=True) diff --git a/cocoa/base/ui/directory_panel.py b/cocoa/base/ui/directory_panel.py new file mode 100644 index 00000000..41e641eb --- /dev/null +++ b/cocoa/base/ui/directory_panel.py @@ -0,0 +1,59 @@ +ownerclass = 'DirectoryPanel' +ownerimport = 'DirectoryPanel.h' + +result = Window(425, 300, "dupeGuru") +promptLabel = Label(result, "Select folders to scan and press \"Scan\".") +directoryOutline = OutlineView(result) +directoryOutline.OBJC_CLASS = 'HSOutlineView' +addButton = Button(result, "") +removeButton = Button(result, "") +loadResultsButton = Button(result, "Load Results") +scanButton = Button(result, "Scan") +addPopup = Popup(None) +loadRecentPopup = Popup(None) + +owner.outlineView = directoryOutline +owner.removeButton = removeButton +owner.loadResultsButton = loadResultsButton +owner.addButtonPopUp = addPopup +owner.loadRecentButtonPopUp = loadRecentPopup + +result.autosaveName = 'DirectoryPanel' +result.canMinimize = False +result.minSize = Size(370, 270) +addButton.image = 'NSAddTemplate' +removeButton.image = 'NSRemoveTemplate' +for button in (addButton, removeButton): + button.style = const.NSTexturedRoundedBezelStyle + button.imagePosition = const.NSImageOnly +scanButton.keyEquivalent = '\\r' +addButton.action = Action(owner, 'popupAddDirectoryMenu:') +removeButton.action = Action(owner, 'removeSelectedDirectory') +loadResultsButton.action = Action(owner, 'popupLoadRecentMenu:') +scanButton.action = Action(None, 'startScanning:') + +directoryOutline.font = Font(FontFamily.System, FontSize.SmallSystem) +col = directoryOutline.addColumn('name', "Name", 100) +col.editable = False +col.autoResizable = True +col = directoryOutline.addColumn('state', "State", 85) +col.editable = True +col.autoResizable = False +col.dataCell = Popup(None, ["Normal", "Reference", "Excluded"]) +col.dataCell.controlSize = const.NSSmallControlSize + +for button in (addButton, removeButton): + button.width = 28 +for button in (loadResultsButton, scanButton): + button.width = 118 + +buttonLayout = HLayout(left=[addButton, removeButton], right=[loadResultsButton, scanButton]) +promptLabel.packToCorner(Pack.UpperLeft) +promptLabel.fill(Pack.Right) +directoryOutline.packRelativeTo(promptLabel, Pack.Below) +buttonLayout.packRelativeTo(directoryOutline, Pack.Below, margin=8) +directoryOutline.fill(Pack.LowerRight) + +promptLabel.setAnchor(Pack.UpperLeft, growX=True) +directoryOutline.setAnchor(Pack.UpperLeft, growX=True, growY=True) +buttonLayout.setAnchor(Pack.Below) diff --git a/cocoa/pe/ui/details_panel.py b/cocoa/pe/ui/details_panel.py index 0fbd2186..86da0fd6 100644 --- a/cocoa/pe/ui/details_panel.py +++ b/cocoa/pe/ui/details_panel.py @@ -50,25 +50,21 @@ for subSplit, label, image, spinner in sides: spinner.controlSize = const.NSSmallControlSize spinner.displayedWhenStopped = False - subSplit.ignoreMargin = True - label.packToCorner(Pack.UpperLeft) - label.fill(Pack.Right) + label.packToCorner(Pack.UpperLeft, margin=0) + label.fill(Pack.Right, margin=0) label.setAnchor(Pack.UpperLeft, growX=True) image.packRelativeTo(label, Pack.Below) - image.fill(Pack.Right) - image.fill(Pack.Below) + image.fill(Pack.LowerRight, margin=0) image.setAnchor(Pack.UpperLeft, growX=True, growY=True) spinner.y = label.y spinner.x = subSplit.width - 30 spinner.setAnchor(Pack.UpperRight) -result.ignoreMargin = True -table.packToCorner(Pack.UpperLeft) -table.fill(Pack.Right) +table.packToCorner(Pack.UpperLeft, margin=0) +table.fill(Pack.Right, margin=0) table.setAnchor(Pack.UpperLeft, growX=True) split.packRelativeTo(table, Pack.Below) -split.fill(Pack.Right) -split.fill(Pack.Below) +split.fill(Pack.LowerRight, margin=0) split.setAnchor(Pack.UpperLeft, growX=True, growY=True) diff --git a/cocoa/se/dupeguru.xcodeproj/project.pbxproj b/cocoa/se/dupeguru.xcodeproj/project.pbxproj index daafed7e..1d942538 100644 --- a/cocoa/se/dupeguru.xcodeproj/project.pbxproj +++ b/cocoa/se/dupeguru.xcodeproj/project.pbxproj @@ -47,7 +47,6 @@ CE76FDF7111EE561006618EA /* NSEventAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDF6111EE561006618EA /* NSEventAdditions.m */; }; CE79638612536C94008D405B /* FairwareReminder.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE79638412536C94008D405B /* FairwareReminder.xib */; }; CE79638C12536F4E008D405B /* HSFairwareReminder.m in Sources */ = {isa = PBXBuildFile; fileRef = CE79638B12536F4E008D405B /* HSFairwareReminder.m */; }; - CE81134D12E5CE4D00A36C80 /* DirectoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81134412E5CE4D00A36C80 /* DirectoryPanel.xib */; }; CE81134E12E5CE4D00A36C80 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81134612E5CE4D00A36C80 /* MainMenu.xib */; }; CE81135012E5CE4D00A36C80 /* ResultWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81134A12E5CE4D00A36C80 /* ResultWindow.xib */; }; CE81135812E5CE6D00A36C80 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE81135612E5CE6D00A36C80 /* Preferences.xib */; }; @@ -85,6 +84,7 @@ CEEF2A4014C0B9050082545A /* HSSelectableList.m in Sources */ = {isa = PBXBuildFile; fileRef = CEEF2A3914C0B9050082545A /* HSSelectableList.m */; }; CEEF2A4114C0B9050082545A /* HSTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CEEF2A3B14C0B9050082545A /* HSTable.m */; }; CEF0ACCE12DF3C2000B32F7E /* HSRecentFiles.m in Sources */ = {isa = PBXBuildFile; fileRef = CEF0ACCD12DF3C2000B32F7E /* HSRecentFiles.m */; }; + CEFC030815BDEFA5005A2559 /* DirectoryPanel_UI.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC030715BDEFA5005A2559 /* DirectoryPanel_UI.m */; }; CEFC294609C89E3D00D9F998 /* folder32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC294509C89E3D00D9F998 /* folder32.png */; }; CEFC7F9E0FC9517500CD5728 /* Dialogs.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F8B0FC9517500CD5728 /* Dialogs.m */; }; CEFC7FA10FC9517500CD5728 /* ProgressController.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F910FC9517500CD5728 /* ProgressController.m */; }; @@ -116,14 +116,12 @@ 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; }; 8D1107320486CEB800E47090 /* dupeGuru.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = dupeGuru.app; sourceTree = BUILT_PRODUCTS_DIR; }; - CE00BBBE14910C5E006A717C /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/DirectoryPanel.xib; sourceTree = ""; }; CE00BBC014910C5E006A717C /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/MainMenu.xib; sourceTree = ""; }; CE00BBC114910C5E006A717C /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CE00BBC314910C5E006A717C /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/ResultWindow.xib; sourceTree = ""; }; CE00BBCC14910C72006A717C /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = hy.lproj/Preferences.xib; sourceTree = ""; }; CE00BBCE14910C8E006A717C /* hy */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hy; path = ../base/hy.lproj/Localizable.strings; sourceTree = ""; }; CE0564B014169D9E00D3D907 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_CN; path = ../base/zh_CN.lproj/Localizable.strings; sourceTree = ""; }; - CE0564B414169DB100D3D907 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/DirectoryPanel.xib; sourceTree = ""; }; CE0564B614169DB100D3D907 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/MainMenu.xib; sourceTree = ""; }; CE0564B814169DB100D3D907 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/ResultWindow.xib; sourceTree = ""; }; CE0564BF14169DDC00D3D907 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = zh_CN.lproj/Preferences.xib; sourceTree = ""; }; @@ -171,7 +169,6 @@ CE587E9814C07BCF004CA031 /* PyOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PyOutline.m; sourceTree = ""; }; CE587E9C14C0801F004CA031 /* PySelectableList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PySelectableList.h; sourceTree = ""; }; CE587E9D14C0801F004CA031 /* PySelectableList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PySelectableList.m; sourceTree = ""; }; - CE5A5CA215A283C200C4E461 /* pt_BR */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = pt_BR; path = ../base/pt_BR.lproj/DirectoryPanel.xib; sourceTree = ""; }; CE5A5CA415A283C200C4E461 /* pt_BR */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = pt_BR; path = ../base/pt_BR.lproj/MainMenu.xib; sourceTree = ""; }; CE5A5CA515A283C200C4E461 /* pt_BR */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = pt_BR; path = ../base/pt_BR.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CE5A5CA715A283C200C4E461 /* pt_BR */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = pt_BR; path = ../base/pt_BR.lproj/ResultWindow.xib; sourceTree = ""; }; @@ -196,15 +193,12 @@ CE79638A12536F4E008D405B /* HSFairwareReminder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSFairwareReminder.h; path = ../../cocoalib/HSFairwareReminder.h; sourceTree = SOURCE_ROOT; }; CE79638B12536F4E008D405B /* HSFairwareReminder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSFairwareReminder.m; path = ../../cocoalib/HSFairwareReminder.m; sourceTree = SOURCE_ROOT; }; CE7A6971146442010007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = ../base/it.lproj/Localizable.strings; sourceTree = ""; }; - CE7A6978146442160007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/DirectoryPanel.xib; sourceTree = ""; }; CE7A697A146442160007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/MainMenu.xib; sourceTree = ""; }; CE7A697B146442160007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CE7A697D146442160007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/ResultWindow.xib; sourceTree = ""; }; CE7A698B1464425A0007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = it.lproj/Preferences.xib; sourceTree = ""; }; - CE81134512E5CE4D00A36C80 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/DirectoryPanel.xib; sourceTree = SOURCE_ROOT; }; CE81134712E5CE4D00A36C80 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; }; CE81134B12E5CE4D00A36C80 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/ResultWindow.xib; sourceTree = SOURCE_ROOT; }; - CE81135212E5CE6100A36C80 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/DirectoryPanel.xib; sourceTree = SOURCE_ROOT; }; CE81135312E5CE6100A36C80 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; }; CE81135512E5CE6100A36C80 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/ResultWindow.xib; sourceTree = SOURCE_ROOT; }; CE81135712E5CE6D00A36C80 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/Preferences.xib; sourceTree = ""; }; @@ -245,18 +239,15 @@ CEC3F8FB157668A300B26F0C /* DeletionOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DeletionOptions.m; path = ../base/DeletionOptions.m; sourceTree = ""; }; CEC3F8FD1576697700B26F0C /* PyDeletionOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyDeletionOptions.h; sourceTree = ""; }; CEC3F8FE1576697700B26F0C /* PyDeletionOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PyDeletionOptions.m; sourceTree = ""; }; - CECFFF1D13CDF8D0003A4518 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/DirectoryPanel.xib; sourceTree = SOURCE_ROOT; }; CECFFF1F13CDF8D0003A4518 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; }; CECFFF2113CDF8D0003A4518 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/ResultWindow.xib; sourceTree = SOURCE_ROOT; }; CECFFF2413CDF8E5003A4518 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = de.lproj/Preferences.xib; sourceTree = ""; }; - CED638DD14B38CEC00B88D00 /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ../base/ru.lproj/DirectoryPanel.xib; sourceTree = ""; }; CED638DF14B38CEC00B88D00 /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ../base/ru.lproj/MainMenu.xib; sourceTree = ""; }; CED638E014B38CEC00B88D00 /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ../base/ru.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CED638E214B38CEC00B88D00 /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ../base/ru.lproj/ResultWindow.xib; sourceTree = ""; }; CED638EA14B38CF800B88D00 /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ru.lproj/Preferences.xib; sourceTree = ""; }; CED638EC14B38D0900B88D00 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ../base/ru.lproj/Localizable.strings; sourceTree = ""; }; CED64CEB145EF06000572B00 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = ../base/cs.lproj/Localizable.strings; sourceTree = ""; }; - CED64CF9145EF07700572B00 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/DirectoryPanel.xib; sourceTree = ""; }; CED64CFB145EF07700572B00 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/MainMenu.xib; sourceTree = ""; }; CED64CFC145EF07700572B00 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CED64CFE145EF07700572B00 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/ResultWindow.xib; sourceTree = ""; }; @@ -280,7 +271,6 @@ CEEACCF515BC63E200960A6A /* IgnoreListDialog_UI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IgnoreListDialog_UI.m; sourceTree = ""; }; CEEB135109C837A2004D2330 /* dupeguru.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = dupeguru.icns; sourceTree = ""; }; CEECCD0D14C636F100A2F3A0 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = ../base/uk.lproj/Localizable.strings; sourceTree = ""; }; - CEECCD1014C6370000A2F3A0 /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/DirectoryPanel.xib; sourceTree = ""; }; CEECCD1214C6370000A2F3A0 /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/MainMenu.xib; sourceTree = ""; }; CEECCD1314C6370000A2F3A0 /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CEECCD1514C6370000A2F3A0 /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/ResultWindow.xib; sourceTree = ""; }; @@ -309,6 +299,8 @@ CEF27A9C1423EAD90048ADFA /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CEF27A9D1423EAD90048ADFA /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CEF27A9E1423EAD90048ADFA /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/PrioritizeDialog.xib; sourceTree = ""; }; + CEFC030615BDEFA5005A2559 /* DirectoryPanel_UI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryPanel_UI.h; sourceTree = ""; }; + CEFC030715BDEFA5005A2559 /* DirectoryPanel_UI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DirectoryPanel_UI.m; sourceTree = ""; }; CEFC294509C89E3D00D9F998 /* folder32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = folder32.png; path = ../../images/folder32.png; sourceTree = SOURCE_ROOT; }; CEFC7F8A0FC9517500CD5728 /* Dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Dialogs.h; path = ../../cocoalib/Dialogs.h; sourceTree = SOURCE_ROOT; }; CEFC7F8B0FC9517500CD5728 /* Dialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Dialogs.m; path = ../../cocoalib/Dialogs.m; sourceTree = SOURCE_ROOT; }; @@ -425,6 +417,8 @@ CE1D091314BE0C6400CA6B8C /* autogen */ = { isa = PBXGroup; children = ( + CEFC030615BDEFA5005A2559 /* DirectoryPanel_UI.h */, + CEFC030715BDEFA5005A2559 /* DirectoryPanel_UI.m */, CE2EC62A15BD9D2C00698FF3 /* ProblemDialog_UI.h */, CE2EC62B15BD9D2C00698FF3 /* ProblemDialog_UI.m */, CE3A298915BAEA600008BDB9 /* DetailsPanel_UI.h */, @@ -532,7 +526,6 @@ CEEFC0CA10943849001F3A39 /* xib */ = { isa = PBXGroup; children = ( - CE81134412E5CE4D00A36C80 /* DirectoryPanel.xib */, CE81134612E5CE4D00A36C80 /* MainMenu.xib */, CE81134A12E5CE4D00A36C80 /* ResultWindow.xib */, CE81135612E5CE6D00A36C80 /* Preferences.xib */, @@ -686,7 +679,6 @@ CEFC294609C89E3D00D9F998 /* folder32.png in Resources */, CE6E0DFE1054E9EF008D9390 /* dsa_pub.pem in Resources */, CE79638612536C94008D405B /* FairwareReminder.xib in Resources */, - CE81134D12E5CE4D00A36C80 /* DirectoryPanel.xib in Resources */, CE81134E12E5CE4D00A36C80 /* MainMenu.xib in Resources */, CE81135012E5CE4D00A36C80 /* ResultWindow.xib in Resources */, CE81135812E5CE6D00A36C80 /* Preferences.xib in Resources */, @@ -771,6 +763,7 @@ CEEACCF615BC63E200960A6A /* IgnoreListDialog_UI.m in Sources */, CE2EC62915BD931E00698FF3 /* DeletionOptions_UI.m in Sources */, CE2EC62C15BD9D2C00698FF3 /* ProblemDialog_UI.m in Sources */, + CEFC030815BDEFA5005A2559 /* DirectoryPanel_UI.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -801,23 +794,6 @@ path = /Users/hsoft/src/dupeguru/cocoalib/xib; sourceTree = ""; }; - CE81134412E5CE4D00A36C80 /* DirectoryPanel.xib */ = { - isa = PBXVariantGroup; - children = ( - CE81134512E5CE4D00A36C80 /* en */, - CE81135212E5CE6100A36C80 /* fr */, - CECFFF1D13CDF8D0003A4518 /* de */, - CE0564B414169DB100D3D907 /* zh_CN */, - CED64CF9145EF07700572B00 /* cs */, - CE7A6978146442160007D927 /* it */, - CE00BBBE14910C5E006A717C /* hy */, - CED638DD14B38CEC00B88D00 /* ru */, - CEECCD1014C6370000A2F3A0 /* uk */, - CE5A5CA215A283C200C4E461 /* pt_BR */, - ); - name = DirectoryPanel.xib; - sourceTree = SOURCE_ROOT; - }; CE81134612E5CE4D00A36C80 /* MainMenu.xib */ = { isa = PBXVariantGroup; children = (