From c34004ed9464d5dc9b6af54fa975b3bf5b68cf24 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Tue, 24 Jul 2012 11:31:18 -0400 Subject: [PATCH] xibless-ified PrioritizeDialog. --HG-- branch : xibless --- build.py | 1 + cocoa/base/PrioritizeDialog.h | 17 +- cocoa/base/PrioritizeDialog.m | 22 +- cocoa/base/en.lproj/Localizable.strings | 5 + cocoa/base/en.lproj/PrioritizeDialog.strings | 12 - cocoa/base/en.lproj/PrioritizeDialog.xib | 897 ------------------- cocoa/base/ui/directory_panel.py | 3 +- cocoa/base/ui/ignore_list_dialog.py | 2 +- cocoa/base/ui/prioritize_dialog.py | 50 ++ cocoa/se/dupeguru.xcodeproj/project.pbxproj | 36 +- 10 files changed, 84 insertions(+), 961 deletions(-) delete mode 100644 cocoa/base/en.lproj/PrioritizeDialog.strings delete mode 100644 cocoa/base/en.lproj/PrioritizeDialog.xib create mode 100644 cocoa/base/ui/prioritize_dialog.py diff --git a/build.py b/build.py index 06a304d2..bf0769f5 100644 --- a/build.py +++ b/build.py @@ -62,6 +62,7 @@ def build_xibless(edition): 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') + xibless.generate('cocoa/base/ui/prioritize_dialog.py', 'cocoa/autogen/PrioritizeDialog_UI', localizationTable='Localizable') def build_cocoa(edition, dev): build_xibless(edition) diff --git a/cocoa/base/PrioritizeDialog.h b/cocoa/base/PrioritizeDialog.h index d3c806e3..b3c5789d 100644 --- a/cocoa/base/PrioritizeDialog.h +++ b/cocoa/base/PrioritizeDialog.h @@ -15,20 +15,23 @@ http://www.hardcoded.net/licenses/bsd_license @interface PrioritizeDialog : NSWindowController { - IBOutlet NSPopUpButton *categoryPopUpView; - IBOutlet NSTableView *criteriaTableView; - IBOutlet NSTableView *prioritizationTableView; + NSPopUpButton *categoryPopUpView; + NSTableView *criteriaTableView; + NSTableView *prioritizationTableView; PyPrioritizeDialog *model; HSPopUpList *categoryPopUp; HSSelectableList *criteriaList; PrioritizeList *prioritizationList; } + +@property (readwrite, retain) NSPopUpButton *categoryPopUpView; +@property (readwrite, retain) NSTableView *criteriaTableView; +@property (readwrite, retain) NSTableView *prioritizationTableView; + - (id)initWithApp:(PyDupeGuru *)aApp; - (PyPrioritizeDialog *)model; -- (IBAction)addSelected:(id)sender; -- (IBAction)removeSelected:(id)sender; -- (IBAction)ok:(id)sender; -- (IBAction)cancel:(id)sender; +- (void)ok; +- (void)cancel; @end; \ No newline at end of file diff --git a/cocoa/base/PrioritizeDialog.m b/cocoa/base/PrioritizeDialog.m index 935c5f0b..6214f909 100644 --- a/cocoa/base/PrioritizeDialog.m +++ b/cocoa/base/PrioritizeDialog.m @@ -7,14 +7,20 @@ http://www.hardcoded.net/licenses/bsd_license */ #import "PrioritizeDialog.h" +#import "PrioritizeDialog_UI.h" #import "HSPyUtil.h" @implementation PrioritizeDialog + +@synthesize categoryPopUpView; +@synthesize criteriaTableView; +@synthesize prioritizationTableView; + - (id)initWithApp:(PyDupeGuru *)aApp { self = [super initWithWindowNibName:@"PrioritizeDialog"]; - [self window]; model = [[PyPrioritizeDialog alloc] initWithApp:[aApp pyRef]]; + [self setWindow:createPrioritizeDialog_UI(self)]; categoryPopUp = [[HSPopUpList alloc] initWithPyRef:[[self model] categoryList] popupView:categoryPopUpView]; criteriaList = [[HSSelectableList alloc] initWithPyRef:[[self model] criteriaList] tableView:criteriaTableView]; prioritizationList = [[PrioritizeList alloc] initWithPyRef:[[self model] prioritizationList] tableView:prioritizationTableView]; @@ -36,23 +42,13 @@ http://www.hardcoded.net/licenses/bsd_license return (PyPrioritizeDialog *)model; } -- (IBAction)addSelected:(id)sender -{ - [[self model] addSelected]; -} - -- (IBAction)removeSelected:(id)sender -{ - [[self model] removeSelected]; -} - -- (IBAction)ok:(id)sender +- (void)ok { [NSApp stopModal]; [self close]; } -- (IBAction)cancel:(id)sender +- (void)cancel { [NSApp abortModal]; [self close]; diff --git a/cocoa/base/en.lproj/Localizable.strings b/cocoa/base/en.lproj/Localizable.strings index 7e46a5ac..3a27d908 100644 --- a/cocoa/base/en.lproj/Localizable.strings +++ b/cocoa/base/en.lproj/Localizable.strings @@ -62,3 +62,8 @@ "Excluded" = "Excluded"; "Select folders to scan and press \"Scan\"." = "Select folders to scan and press \"Scan\"."; "Load Results" = "Load Results"; + +/* Prioritize Dialog */ +"Re-Prioritize duplicates" = "Re-Prioritize duplicates"; +"Ok" = "Ok"; +"Add criteria to the right box and click OK to send the dupes that correspond the best to these criteria to their respective group's reference position. Read the help file for more information." = "Add criteria to the right box and click OK to send the dupes that correspond the best to these criteria to their respective group's reference position. Read the help file for more information."; diff --git a/cocoa/base/en.lproj/PrioritizeDialog.strings b/cocoa/base/en.lproj/PrioritizeDialog.strings deleted file mode 100644 index 82e26868..00000000 --- a/cocoa/base/en.lproj/PrioritizeDialog.strings +++ /dev/null @@ -1,12 +0,0 @@ - -/* Class = "NSWindow"; title = "Re-Prioritize duplicates"; ObjectID = "1"; */ -"1.title" = "Re-Prioritize duplicates"; - -/* Class = "NSButtonCell"; title = "Ok"; ObjectID = "37"; */ -"37.title" = "Ok"; - -/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "39"; */ -"39.title" = "Cancel"; - -/* Class = "NSTextFieldCell"; title = "Add criteria to the right box and click OK to send the dupes that correspond the best to these criteria to their respective group's reference position. Read the help file for more information."; ObjectID = "41"; */ -"41.title" = "Add criteria to the right box and click OK to send the dupes that correspond the best to these criteria to their respective group's reference position. Read the help file for more information."; diff --git a/cocoa/base/en.lproj/PrioritizeDialog.xib b/cocoa/base/en.lproj/PrioritizeDialog.xib deleted file mode 100644 index 1785df2c..00000000 --- a/cocoa/base/en.lproj/PrioritizeDialog.xib +++ /dev/null @@ -1,897 +0,0 @@ - - - - 1060 - 11D50 - 2182 - 1138.32 - 568.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 2182 - - - NSTextField - NSPopUpButton - NSScroller - NSButton - NSMenu - NSScrollView - NSTextFieldCell - NSButtonCell - NSTableView - NSCustomObject - NSView - NSWindowTemplate - NSPopUpButtonCell - NSTableColumn - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - PrioritizeDialog - - - FirstResponder - - - NSApplication - - - 9 - 2 - {{196, 240}, {609, 401}} - 1618477056 - Re-Prioritize duplicates - NSWindow - - - - - 256 - - - - 268 - {{17, 298}, {268, 26}} - - - - _NS:179 - YES - - -2076049856 - 2048 - - LucidaGrande - 13 - 1044 - - _NS:179 - - 109199615 - 129 - - - 400 - 75 - - YES - - OtherViews - - - - -1 - 1 - YES - YES - 2 - - - - - 276 - - - - 2304 - - - - 256 - {260, 233} - - - - _NS:1197 - YES - - - -2147483392 - {{224, 0}, {16, 17}} - _NS:1202 - - - - 257 - 40 - 1000 - - 75628096 - 2048 - - - LucidaGrande - 11 - 3100 - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - 3 - MAA - - - - - 337772096 - 2560 - - - - - 6 - System - controlBackgroundColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - - - 3 - YES - YES - - - - 3 - 2 - - 3 - MQA - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 306184192 - - - 4 - 15 - 0 - NO - 0 - 1 - - - {{1, 1}, {260, 233}} - - - - _NS:1195 - - - 4 - - - - -2147483392 - {{224, 17}, {15, 102}} - - - - _NS:1214 - - _doScroller: - 0.9925373134328358 - - - - -2147483392 - {{1, 119}, {223, 15}} - - - - _NS:1216 - 1 - - _doScroller: - 0.99581589958159 - - - {{20, 60}, {262, 235}} - - - - _NS:1193 - 133682 - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 274 - - - - 2304 - - - - 256 - {248, 260} - - - - _NS:1197 - YES - - - -2147483392 - {{224, 0}, {16, 17}} - _NS:1202 - - - - 245 - 40 - 1000 - - 75628096 - 2048 - - - - 3 - MC4zMzMzMzI5ODU2AA - - - - - 337772096 - 2048 - - - - - - - 3 - YES - YES - - - - 3 - 2 - - - 17 - 306184192 - - - 4 - 15 - 0 - NO - 0 - 1 - - - {{1, 1}, {248, 260}} - - - - _NS:1195 - - - 4 - - - - -2147483392 - {{224, 17}, {15, 102}} - - - - _NS:1214 - - _doScroller: - 0.9925373134328358 - - - - -2147483392 - {{1, 119}, {223, 15}} - - - - _NS:1216 - 1 - - _doScroller: - 0.99581589958159 - - - {{339, 60}, {250, 262}} - - - - _NS:1193 - 133682 - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 268 - {{284, 186}, {53, 32}} - - - - _NS:161 - YES - - 67239424 - 134217728 - --> - - _NS:161 - - -2038284033 - 129 - - - 200 - 25 - - - - - 268 - {{284, 160}, {53, 32}} - - - - _NS:161 - YES - - 67239424 - 134217728 - <-- - - _NS:161 - - -2038284033 - 129 - - - 200 - 25 - - - - - 289 - {{495, 12}, {100, 32}} - - - - _NS:161 - YES - - 67239424 - 134217728 - Ok - - _NS:161 - - -2038284033 - 129 - - DQ - 200 - 25 - - - - - 289 - {{395, 12}, {100, 32}} - - - - _NS:161 - YES - - 67239424 - 134217728 - Cancel - - _NS:161 - - -2038284033 - 129 - - Gw - 200 - 25 - - - - - 268 - {{17, 330}, {575, 51}} - - - - _NS:3936 - YES - - 67239424 - 4194304 - Add criteria to the right box and click OK to send the dupes that correspond the best to these criteria to their respective group's reference position. Read the help file for more information. - - _NS:3936 - - - 6 - System - controlColor - - - - - - - {609, 401} - - - - - {{0, 0}, {1920, 1058}} - {10000000000000, 10000000000000} - YES - - - - - - - categoryPopUpView - - - - 10 - - - - criteriaTableView - - - - 20 - - - - prioritizationTableView - - - - 33 - - - - addSelected: - - - - 34 - - - - removeSelected: - - - - 35 - - - - cancel: - - - - 42 - - - - ok: - - - - 43 - - - - window - - - - 44 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 1 - - - - - - - - 2 - - - - - - - - - - - - - - - 3 - - - - - - - - 4 - - - - - - - - 5 - - - - - - 11 - - - - - - - - - - 12 - - - - - 14 - - - - - 15 - - - - - - - - 16 - - - - - - - - 19 - - - - - 21 - - - - - - - - 22 - - - - - 23 - - - - - - - - 24 - - - - - 25 - - - - - - - - - - 26 - - - - - - - - 27 - - - - - 28 - - - - - 29 - - - - - - - - 30 - - - - - 36 - - - - - - - - 37 - - - - - 38 - - - - - - - - 39 - - - - - 40 - - - - - - - - 41 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{357, 418}, {480, 270}} - - 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 - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 44 - - - - - PrioritizeDialog - NSWindowController - - id - id - id - id - - - - addSelected: - id - - - cancel: - id - - - ok: - id - - - removeSelected: - id - - - - NSPopUpButton - NSTableView - NSTableView - - - - categoryPopUpView - NSPopUpButton - - - criteriaTableView - NSTableView - - - prioritizationTableView - NSTableView - - - - IBProjectSource - ./Classes/PrioritizeDialog.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - diff --git a/cocoa/base/ui/directory_panel.py b/cocoa/base/ui/directory_panel.py index 41e641eb..7652c6d5 100644 --- a/cocoa/base/ui/directory_panel.py +++ b/cocoa/base/ui/directory_panel.py @@ -47,12 +47,13 @@ for button in (addButton, removeButton): for button in (loadResultsButton, scanButton): button.width = 118 -buttonLayout = HLayout(left=[addButton, removeButton], right=[loadResultsButton, scanButton]) +buttonLayout = HLayout([addButton, removeButton, None, 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) +buttonLayout.fill(Pack.Right) promptLabel.setAnchor(Pack.UpperLeft, growX=True) directoryOutline.setAnchor(Pack.UpperLeft, growX=True, growY=True) diff --git a/cocoa/base/ui/ignore_list_dialog.py b/cocoa/base/ui/ignore_list_dialog.py index a6e355d5..60ad46ab 100644 --- a/cocoa/base/ui/ignore_list_dialog.py +++ b/cocoa/base/ui/ignore_list_dialog.py @@ -21,7 +21,7 @@ table.allowsMultipleSelection = True removeSelectedButton.width = 142 clearButton.width = 142 closeButton.width = 84 -buttonLayout = HLayout(left=[removeSelectedButton, clearButton], right=[closeButton]) +buttonLayout = HLayout([removeSelectedButton, clearButton, None, closeButton]) buttonLayout.packToCorner(Pack.LowerLeft) buttonLayout.fill(Pack.Right) buttonLayout.setAnchor(Pack.Below) diff --git a/cocoa/base/ui/prioritize_dialog.py b/cocoa/base/ui/prioritize_dialog.py new file mode 100644 index 00000000..ac5c18cc --- /dev/null +++ b/cocoa/base/ui/prioritize_dialog.py @@ -0,0 +1,50 @@ +ownerclass = 'PrioritizeDialog' +ownerimport = 'PrioritizeDialog.h' + +result = Window(610, 400, "Re-Prioritize duplicates") +promptLabel = Label(result, "Add criteria to the right box and click OK to send the dupes that " + "correspond the best to these criteria to their respective group's reference position. Read " + "the help file for more information.") +categoryPopup = Popup(result) +criteriaTable = ListView(result) +prioritizationTable = ListView(result) +addButton = Button(result, "-->") +removeButton = Button(result, "<--") +okButton = Button(result, "Ok") +cancelButton = Button(result, "Cancel") + +owner.categoryPopUpView = categoryPopup +owner.criteriaTableView = criteriaTable +owner.prioritizationTableView = prioritizationTable + +result.canMinimize = False +result.canClose = False +result.minSize = Size(result.width, result.height) +addButton.action = Action(owner.model, 'addSelected') +removeButton.action = Action(owner.model, 'removeSelected') +okButton.action = Action(owner, 'ok') +cancelButton.action = Action(owner, 'cancel') +okButton.keyEquivalent = '\\r' +cancelButton.keyEquivalent = '\\e' + +promptLabel.height *= 3 # 3 lines + +leftLayout = VLayout([categoryPopup, criteriaTable], width=262, filler=criteriaTable) +middleLayout = VLayout([addButton, removeButton], width=41) +buttonLayout = HLayout([None, cancelButton, okButton]) + +promptLabel.packToCorner(Pack.UpperLeft) +promptLabel.fill(Pack.Right) +leftLayout.packRelativeTo(promptLabel, Pack.Below) +middleLayout.packRelativeTo(leftLayout, Pack.Right, align=Pack.Above) +prioritizationTable.packRelativeTo(middleLayout, Pack.Right, align=Pack.Above) +buttonLayout.packRelativeTo(leftLayout, Pack.Below) +buttonLayout.fill(Pack.Right) +leftLayout.fill(Pack.Below) +middleLayout.packRelativeTo(leftLayout, Pack.Right, align=Pack.Middle) +prioritizationTable.fill(Pack.Below, goal=leftLayout.y) +prioritizationTable.fill(Pack.Right) + +promptLabel.setAnchor(Pack.UpperLeft, growX=True) +prioritizationTable.setAnchor(Pack.UpperLeft, growX=True, growY=True) +buttonLayout.setAnchor(Pack.Below) diff --git a/cocoa/se/dupeguru.xcodeproj/project.pbxproj b/cocoa/se/dupeguru.xcodeproj/project.pbxproj index 1d942538..5dd2dba2 100644 --- a/cocoa/se/dupeguru.xcodeproj/project.pbxproj +++ b/cocoa/se/dupeguru.xcodeproj/project.pbxproj @@ -55,13 +55,13 @@ CE8C25CD15B9FCC100D44175 /* cocoalib.strings in Resources */ = {isa = PBXBuildFile; fileRef = CE8C25CB15B9FCC100D44175 /* cocoalib.strings */; }; CE91F216113BC22D0010360B /* StatsLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE91F214113BC22D0010360B /* StatsLabel.m */; }; CE9777CD141F8C2500C13FB5 /* PrioritizeDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9777CC141F8C2500C13FB5 /* PrioritizeDialog.m */; }; - CE9777D1141F8CB400C13FB5 /* PrioritizeDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE9777CF141F8CB400C13FB5 /* PrioritizeDialog.xib */; }; CE9FC22D14C080CF005C31FD /* PyGUIObject.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9FC22C14C080CF005C31FD /* PyGUIObject.m */; }; CE9FC23014C08622005C31FD /* PyTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9FC22F14C08622005C31FD /* PyTable.m */; }; CE9FC23314C0866F005C31FD /* PyResultTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9FC23214C0866F005C31FD /* PyResultTable.m */; }; CEA175CA1461E8E600776591 /* locale in Resources */ = {isa = PBXBuildFile; fileRef = CEA175C91461E8E600776591 /* locale */; }; CEA450B814BDDFD7002DAAF2 /* dg_cocoa.py in Resources */ = {isa = PBXBuildFile; fileRef = CEA450B714BDDFD7002DAAF2 /* dg_cocoa.py */; }; CEB2AF5614C49AC800F907A9 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = CEB2AF5514C49AC800F907A9 /* main.m */; }; + CEBAC7B515BEF3EE0012FDB2 /* PrioritizeDialog_UI.m in Sources */ = {isa = PBXBuildFile; fileRef = CEBAC7B415BEF3EE0012FDB2 /* PrioritizeDialog_UI.m */; }; CEBCE2D81573FE49000402E1 /* HSPyUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = CEBCE2D71573FE49000402E1 /* HSPyUtil.m */; }; CEC3F8FC157668A300B26F0C /* DeletionOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = CEC3F8FB157668A300B26F0C /* DeletionOptions.m */; }; CEC3F8FF1576697700B26F0C /* PyDeletionOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = CEC3F8FE1576697700B26F0C /* PyDeletionOptions.m */; }; @@ -117,7 +117,6 @@ 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; }; 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 = ""; }; @@ -170,7 +169,6 @@ 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 = ""; }; 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 = ""; }; CE5A5CB015A283D700C4E461 /* pt_BR */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = pt_BR; path = pt_BR.lproj/Preferences.xib; sourceTree = ""; }; CE647E541173024A006D28BA /* ProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProblemDialog.h; path = ../base/ProblemDialog.h; sourceTree = SOURCE_ROOT; }; @@ -194,7 +192,6 @@ 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 = ""; }; 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 = ""; }; CE81134712E5CE4D00A36C80 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; }; @@ -221,7 +218,6 @@ CE91F214113BC22D0010360B /* StatsLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StatsLabel.m; path = ../base/StatsLabel.m; sourceTree = SOURCE_ROOT; }; CE9777CB141F8C2500C13FB5 /* PrioritizeDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PrioritizeDialog.h; path = ../base/PrioritizeDialog.h; sourceTree = ""; }; CE9777CC141F8C2500C13FB5 /* PrioritizeDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PrioritizeDialog.m; path = ../base/PrioritizeDialog.m; sourceTree = ""; }; - CE9777D0141F8CB400C13FB5 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CE9FC22B14C080CF005C31FD /* PyGUIObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyGUIObject.h; sourceTree = ""; }; CE9FC22C14C080CF005C31FD /* PyGUIObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PyGUIObject.m; sourceTree = ""; }; CE9FC22E14C08622005C31FD /* PyTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyTable.h; sourceTree = ""; }; @@ -232,6 +228,8 @@ CEA450B714BDDFD7002DAAF2 /* dg_cocoa.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = dg_cocoa.py; path = ../../build/dg_cocoa.py; sourceTree = ""; }; CEB2AF5514C49AC800F907A9 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = ../base/main.m; sourceTree = ""; }; CEB57990146ADC5100EDF7D7 /* HSConsts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSConsts.h; path = ../../cocoalib/HSConsts.h; sourceTree = ""; }; + CEBAC7B315BEF3EE0012FDB2 /* PrioritizeDialog_UI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrioritizeDialog_UI.h; sourceTree = ""; }; + CEBAC7B415BEF3EE0012FDB2 /* PrioritizeDialog_UI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PrioritizeDialog_UI.m; sourceTree = ""; }; CEBCE2D61573FE49000402E1 /* HSPyUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSPyUtil.h; path = ../../cocoalib/HSPyUtil.h; sourceTree = ""; }; CEBCE2D71573FE49000402E1 /* HSPyUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSPyUtil.m; path = ../../cocoalib/HSPyUtil.m; sourceTree = ""; }; CEBCE2DA1573FEBF000402E1 /* HSFairwareProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSFairwareProtocol.h; path = ../../cocoalib/HSFairwareProtocol.h; sourceTree = ""; }; @@ -243,13 +241,11 @@ 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 = ""; }; 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 = ""; }; 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 = ""; }; CED64D06145EF16300572B00 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = cs.lproj/Preferences.xib; sourceTree = ""; }; CED939551406ABB70072C4E8 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = ../base/de.lproj/Localizable.strings; sourceTree = ""; }; @@ -272,7 +268,6 @@ 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 = ""; }; 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 = ""; }; CEECCD1D14C6370C00A2F3A0 /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = uk.lproj/Preferences.xib; sourceTree = ""; }; CEEF2A1614C0A5A60082545A /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyDupeGuru.h; sourceTree = ""; }; @@ -296,9 +291,6 @@ CEEF2A4214C0BB430082545A /* Worker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Worker.h; path = ../../cocoalib/Worker.h; sourceTree = ""; }; CEF0ACCC12DF3C2000B32F7E /* HSRecentFiles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSRecentFiles.h; path = ../../cocoalib/HSRecentFiles.h; sourceTree = SOURCE_ROOT; }; CEF0ACCD12DF3C2000B32F7E /* HSRecentFiles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSRecentFiles.m; path = ../../cocoalib/HSRecentFiles.m; sourceTree = SOURCE_ROOT; }; - 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; }; @@ -417,6 +409,8 @@ CE1D091314BE0C6400CA6B8C /* autogen */ = { isa = PBXGroup; children = ( + CEBAC7B315BEF3EE0012FDB2 /* PrioritizeDialog_UI.h */, + CEBAC7B415BEF3EE0012FDB2 /* PrioritizeDialog_UI.m */, CEFC030615BDEFA5005A2559 /* DirectoryPanel_UI.h */, CEFC030715BDEFA5005A2559 /* DirectoryPanel_UI.m */, CE2EC62A15BD9D2C00698FF3 /* ProblemDialog_UI.h */, @@ -529,7 +523,6 @@ CE81134612E5CE4D00A36C80 /* MainMenu.xib */, CE81134A12E5CE4D00A36C80 /* ResultWindow.xib */, CE81135612E5CE6D00A36C80 /* Preferences.xib */, - CE9777CF141F8CB400C13FB5 /* PrioritizeDialog.xib */, ); name = xib; sourceTree = ""; @@ -685,7 +678,6 @@ CE8113EB12E5CE9A00A36C80 /* Localizable.strings in Resources */, CE31819D13D85D9B00B6D649 /* about.xib in Resources */, CE31819E13D85D9B00B6D649 /* ErrorReportWindow.xib in Resources */, - CE9777D1141F8CB400C13FB5 /* PrioritizeDialog.xib in Resources */, CEA175CA1461E8E600776591 /* locale in Resources */, CE18005114BDD87B001B6329 /* py in Resources */, CEA450B814BDDFD7002DAAF2 /* dg_cocoa.py in Resources */, @@ -764,6 +756,7 @@ CE2EC62915BD931E00698FF3 /* DeletionOptions_UI.m in Sources */, CE2EC62C15BD9D2C00698FF3 /* ProblemDialog_UI.m in Sources */, CEFC030815BDEFA5005A2559 /* DirectoryPanel_UI.m in Sources */, + CEBAC7B515BEF3EE0012FDB2 /* PrioritizeDialog_UI.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -879,23 +872,6 @@ name = cocoalib.strings; sourceTree = ""; }; - CE9777CF141F8CB400C13FB5 /* PrioritizeDialog.xib */ = { - isa = PBXVariantGroup; - children = ( - CE9777D0141F8CB400C13FB5 /* en */, - CEF27A9C1423EAD90048ADFA /* de */, - CEF27A9D1423EAD90048ADFA /* fr */, - CEF27A9E1423EAD90048ADFA /* zh_CN */, - CED64CFC145EF07700572B00 /* cs */, - CE7A697B146442160007D927 /* it */, - CE00BBC114910C5E006A717C /* hy */, - CED638E014B38CEC00B88D00 /* ru */, - CEECCD1314C6370000A2F3A0 /* uk */, - CE5A5CA515A283C200C4E461 /* pt_BR */, - ); - name = PrioritizeDialog.xib; - sourceTree = ""; - }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */