From 79e6020982a6b5db2d3f50c0de9fe28b7b3f5481 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Fri, 27 Jul 2012 09:02:03 -0400 Subject: [PATCH] Tweaked the result window xibless file and removed the old results XIB. --HG-- branch : xibless --- cocoa/base/en.lproj/Localizable.strings | 27 + cocoa/base/en.lproj/ResultWindow.strings | 99 -- cocoa/base/en.lproj/ResultWindow.xib | 1782 ------------------- cocoa/base/ui/result_window.py | 9 +- cocoa/se/dupeguru.xcodeproj/project.pbxproj | 30 - 5 files changed, 33 insertions(+), 1914 deletions(-) delete mode 100644 cocoa/base/en.lproj/ResultWindow.strings delete mode 100644 cocoa/base/en.lproj/ResultWindow.xib diff --git a/cocoa/base/en.lproj/Localizable.strings b/cocoa/base/en.lproj/Localizable.strings index 3a27d908..3f1330cd 100644 --- a/cocoa/base/en.lproj/Localizable.strings +++ b/cocoa/base/en.lproj/Localizable.strings @@ -67,3 +67,30 @@ "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."; + +/* Results Window */ +"dupeGuru Results" = "dupeGuru Results"; +"Options" = "Options"; +"Filter" = "Filter"; +"Action" = "Action"; +"Directories" = "Directories"; +"Send Marked to Trash..." = "Send Marked to Trash..."; +"Move Marked to..." = "Move Marked to..."; +"Copy Marked to..." = "Copy Marked to..."; +"Remove Marked from Results" = "Remove Marked from Results"; +"Remove Selected from Results" = "Remove Selected from Results"; +"Add Selected to Ignore List" = "Add Selected to Ignore List"; +"Make Selected Reference" = "Make Selected Reference"; +"Open Selected with Default Application" = "Open Selected with Default Application"; +"Reveal Selected in Finder" = "Reveal Selected in Finder"; +"Rename Selected" = "Rename Selected"; +"Details" = "Details"; +"Dupes Only" = "Dupes Only"; +"Delta" = "Delta"; +"Add Selected to Ignore List" = "Add Selected to Ignore List"; +"Rename Selected" = "Rename Selected"; +"Remove Selected from Results" = "Remove Selected from Results"; +"Make Selected Reference" = "Make Selected Reference"; +"Reveal Selected in Finder" = "Reveal Selected in Finder"; +"Open Selected with Default Application" = "Open Selected with Default Application"; +"Quick Look" = "Quick Look"; diff --git a/cocoa/base/en.lproj/ResultWindow.strings b/cocoa/base/en.lproj/ResultWindow.strings deleted file mode 100644 index f91ba4a5..00000000 --- a/cocoa/base/en.lproj/ResultWindow.strings +++ /dev/null @@ -1,99 +0,0 @@ - -/* Class = "NSWindow"; title = "dupeGuru Results"; ObjectID = "1"; */ -"1.title" = "dupeGuru Results"; - -/* Class = "NSTextFieldCell"; title = "Marked: 0 files, 0 B. Total: 0 files, 0 B."; ObjectID = "6"; */ -"6.title" = "Marked: 0 files, 0 B. Total: 0 files, 0 B."; - -/* Class = "NSToolbarItem"; label = "Options"; ObjectID = "15"; */ -"15.label" = "Options"; - -/* Class = "NSToolbarItem"; paletteLabel = "Options"; ObjectID = "15"; */ -"15.paletteLabel" = "Options"; - -/* Class = "NSToolbarItem"; label = "Filter"; ObjectID = "16"; */ -"16.label" = "Filter"; - -/* Class = "NSToolbarItem"; paletteLabel = "Filter"; ObjectID = "16"; */ -"16.paletteLabel" = "Filter"; - -/* Class = "NSToolbarItem"; label = "Action"; ObjectID = "17"; */ -"17.label" = "Action"; - -/* Class = "NSToolbarItem"; paletteLabel = "Action"; ObjectID = "17"; */ -"17.paletteLabel" = "Action"; - -/* Class = "NSToolbarItem"; label = "Directories"; ObjectID = "19"; */ -"19.label" = "Directories"; - -/* Class = "NSToolbarItem"; paletteLabel = "Directories"; ObjectID = "19"; */ -"19.paletteLabel" = "Directories"; - -/* Class = "NSMenuItem"; title = "Send Marked to Trash..."; ObjectID = "29"; */ -"29.title" = "Send Marked to Trash..."; - -/* Class = "NSMenuItem"; title = "Move Marked to..."; ObjectID = "30"; */ -"30.title" = "Move Marked to..."; - -/* Class = "NSMenuItem"; title = "Copy Marked to..."; ObjectID = "31"; */ -"31.title" = "Copy Marked to..."; - -/* Class = "NSMenuItem"; title = "Remove Marked from Results"; ObjectID = "32"; */ -"32.title" = "Remove Marked from Results"; - -/* Class = "NSMenuItem"; title = "Remove Selected from Results"; ObjectID = "34"; */ -"34.title" = "Remove Selected from Results"; - -/* Class = "NSMenuItem"; title = "Add Selected to Ignore List"; ObjectID = "35"; */ -"35.title" = "Add Selected to Ignore List"; - -/* Class = "NSMenuItem"; title = "Make Selected Reference"; ObjectID = "36"; */ -"36.title" = "Make Selected Reference"; - -/* Class = "NSMenuItem"; title = "Open Selected with Default Application"; ObjectID = "38"; */ -"38.title" = "Open Selected with Default Application"; - -/* Class = "NSMenuItem"; title = "Reveal Selected in Finder"; ObjectID = "39"; */ -"39.title" = "Reveal Selected in Finder"; - -/* Class = "NSMenuItem"; title = "Rename Selected"; ObjectID = "40"; */ -"40.title" = "Rename Selected"; - -/* Class = "NSSearchFieldCell"; placeholderString = "Filter"; ObjectID = "42"; */ -"42.placeholderString" = "Filter"; - -/* Class = "NSSegmentedCell"; 44.ibShadowedLabels[0] = "Details"; ObjectID = "44"; */ -"44.ibShadowedLabels[0]" = "Details"; - -/* Class = "NSSegmentedCell"; 44.ibShadowedLabels[1] = "Dupes Only"; ObjectID = "44"; */ -"44.ibShadowedLabels[1]" = "Dupes Only"; - -/* Class = "NSSegmentedCell"; 44.ibShadowedLabels[2] = "Delta"; ObjectID = "44"; */ -"44.ibShadowedLabels[2]" = "Delta"; - -/* Class = "NSMenu"; title = "Menu"; ObjectID = "67"; */ -"67.title" = "Menu"; - -/* Class = "NSMenuItem"; title = "Add Selected to Ignore List"; ObjectID = "68"; */ -"68.title" = "Add Selected to Ignore List"; - -/* Class = "NSMenuItem"; title = "Rename Selected"; ObjectID = "70"; */ -"70.title" = "Rename Selected"; - -/* Class = "NSMenuItem"; title = "Remove Selected from Results"; ObjectID = "71"; */ -"71.title" = "Remove Selected from Results"; - -/* Class = "NSMenuItem"; title = "Make Selected Reference"; ObjectID = "72"; */ -"72.title" = "Make Selected Reference"; - -/* Class = "NSMenuItem"; title = "Reveal Selected in Finder"; ObjectID = "73"; */ -"73.title" = "Reveal Selected in Finder"; - -/* Class = "NSMenuItem"; title = "Open Selected with Default Application"; ObjectID = "74"; */ -"74.title" = "Open Selected with Default Application"; - -/* Class = "NSToolbarItem"; label = "Quick Look"; ObjectID = "86"; */ -"86.label" = "Quick Look"; - -/* Class = "NSToolbarItem"; paletteLabel = "Quick Look"; ObjectID = "86"; */ -"86.paletteLabel" = "Quick Look"; diff --git a/cocoa/base/en.lproj/ResultWindow.xib b/cocoa/base/en.lproj/ResultWindow.xib deleted file mode 100644 index 61414245..00000000 --- a/cocoa/base/en.lproj/ResultWindow.xib +++ /dev/null @@ -1,1782 +0,0 @@ - - - - 1060 - 11E53 - 2182 - 1138.47 - 569.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 2182 - - - NSPopUpButton - NSMenu - NSToolbarItem - NSButton - NSToolbarFlexibleSpaceItem - NSCustomObject - NSTableView - NSSearchField - NSTextField - NSSearchFieldCell - NSWindowTemplate - NSTextFieldCell - NSButtonCell - NSSegmentedControl - NSToolbarSpaceItem - NSPopUpButtonCell - NSView - NSToolbar - NSScrollView - NSUserDefaultsController - NSSegmentedCell - NSScroller - NSTableHeaderView - NSMenuItem - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - ResultWindow - - - FirstResponder - - - NSApplication - - - Menu - - - - Remove Selected from Results - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - - - - Add Selected to Ignore List - - 1048576 - 2147483647 - - - - - - Make Selected Reference - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Open Selected with Default Application - - 1048576 - 2147483647 - - - - - - Reveal Selected in Finder - - 1048576 - 2147483647 - - - - - - Rename Selected - - 1048576 - 2147483647 - - - - - - - - 15 - 2 - {{47, 310}, {557, 400}} - 1618477056 - dupeGuru Results - NSWindow - - - 184FCE08-7704-43E1-B7CA-394621354414 - - - YES - YES - YES - YES - 2 - 1 - - - - 4BD1D94E-8A70-48E1-AF8A-CEDC80CD0A5E - - Options - Options - - - - 268 - {{0, 14}, {195, 23}} - - - YES - - 67239424 - 0 - - LucidaGrande - 11 - 16 - - - - - 57 - Details - 0 - - - 82 - Dupes Only - 1 - 0 - - - 48 - Delta - 0 - - - -1 - 1 - 5 - - - - - - {195, 23} - {195, 25} - YES - YES - 0 - YES - 0 - - - - 8E5ADD0F-24AD-452A-BE68-464FE9E5E240 - - Filter - Filter - - - - 258 - {{0, 14}, {81, 22}} - - - YES - - 343014976 - 268436480 - - - LucidaGrande - 13 - 1044 - - Filter - - YES - 1 - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - 130560 - 0 - search - - _searchFieldSearch: - - 138690815 - 0 - - 400 - 75 - - - 130560 - 0 - clear - - - cancel - - - - - _searchFieldCancel: - - 138690815 - 0 - - 400 - 75 - - 10 - YES - - - - - - {81, 22} - {300, 22} - YES - YES - 0 - YES - 0 - - - - A85CDEA8-333B-47CF-960E-DDC65B0C56BC - - Quick Look - Quick Look - - - - 268 - {{12, 14}, {44, 25}} - - - _NS:161 - YES - - 67239424 - 134217728 - - - _NS:161 - - -2033958657 - 163 - - NSImage - NSQuickLookTemplate - - - - 200 - 25 - - - - - - {30, 25} - {44, 32} - YES - YES - 0 - YES - 0 - - - - BA65FFF2-9E56-4E88-AB2E-8FBE2B3D030F - - Directories - Directories - - - - NSImage - folder32 - - - - {0, 0} - {0, 0} - YES - YES - -1 - YES - 0 - - - - F37510C7-955F-4141-9D09-AC2881ADCCFA - - Action - Action - - - - 256 - {{1, 14}, {40, 25}} - - - YES - - -2076049856 - 134219776 - - - -2035269377 - 35 - - - - - 400 - 75 - - - YES - IA - - 1048576 - 2147483647 - 1 - - NSImage - NSActionTemplate - - - - _popUpItemAction: - - - YES - - - OtherViews - - - - - - Send Marked to Trash... - - 2147483647 - - - _popUpItemAction: - - - - - Move Marked to... - - 2147483647 - - - _popUpItemAction: - - - - - Copy Marked to... - - 2147483647 - - - _popUpItemAction: - - - - - Remove Marked from Results - - 2147483647 - - - _popUpItemAction: - - - - - YES - YES - - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - Remove Selected from Results - - 2147483647 - - - _popUpItemAction: - - - - - Add Selected to Ignore List - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - Make Selected Reference - - 2147483647 - - - _popUpItemAction: - - - - - YES - YES - - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - Open Selected with Default Application - - 2147483647 - - - _popUpItemAction: - - - - - Reveal Selected in Finder - - 2147483647 - - - _popUpItemAction: - - - - - Rename Selected - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - 1 - YES - 3 - YES - YES - 2 - - - - - - {30, 25} - {40, 26} - YES - YES - 0 - YES - 0 - - - NSToolbarFlexibleSpaceItem - - Flexible Space - - - - - - {1, 5} - {20000, 32} - YES - YES - -1 - YES - 0 - - YES - YES - - - 1048576 - 2147483647 - - - - - - NSToolbarSpaceItem - - Space - - - - - - {32, 5} - {32, 32} - YES - YES - -1 - YES - 0 - - YES - YES - - - 1048576 - 2147483647 - - - - - - - - - - - - - - - - - - - - - - - - - - {340, 340} - - - 256 - - - - 290 - {{17, 6}, {523, 17}} - - - - YES - - 67239424 - 138412032 - Marked: 0 files, 0 B. Total: 0 files, 0 B. - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - - - - - 274 - - - - 2304 - - - - 256 - {557, 355} - - - - YES - - - 256 - {557, 17} - - - - - - - - -2147483392 - {{224, 0}, {16, 17}} - - - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 14 - -358612992 - - - 2 - 4 - 15 - 0 - YES - 0 - 1 - - - {{1, 17}, {557, 355}} - - - - - - 6 - System - controlBackgroundColor - - - 4 - - - - -2147483392 - {{224, 17}, {15, 102}} - - - - - _doScroller: - 37 - 0.1947367936372757 - - - - -2147483392 - {{1, 119}, {223, 15}} - - - - 1 - - _doScroller: - 0.57142859697341919 - - - - 2304 - - - - {{1, 0}, {557, 17}} - - - - - - 4 - - - - {{0, 28}, {559, 373}} - - - - 133682 - - - - - - QSAAAEEgAABBgAAAQYAAAA - - - {557, 400} - - - - - {{0, 0}, {1920, 1058}} - {340, 402} - {10000000000000, 10000000000000} - MainWindow - YES - - - YES - - - - - - - window - - - - 46 - - - - moveMarked: - - - - 52 - - - - copyMarked: - - - - 53 - - - - removeMarked: - - - - 54 - - - - removeSelected: - - - - 55 - - - - ignoreSelected: - - - - 56 - - - - switchSelected: - - - - 57 - - - - openSelected: - - - - 58 - - - - revealSelected: - - - - 59 - - - - renameSelected: - - - - 60 - - - - filterField - - - - 61 - - - - filter: - - - - 62 - - - - changeOptions: - - - - 63 - - - - optionsSwitch - - - - 64 - - - - stats - - - - 65 - - - - matches - - - - 66 - - - - removeSelected: - - - - 76 - - - - ignoreSelected: - - - - 77 - - - - switchSelected: - - - - 78 - - - - openSelected: - - - - 79 - - - - revealSelected: - - - - 80 - - - - renameSelected: - - - - 81 - - - - toggleQuicklookPanel: - - - - 87 - - - - optionsToolbarItem - - - - 92 - - - - showDirectoryWindow: - - - - 82 - - - - trashMarked: - - - - 93 - - - - delegate - - - - 45 - - - - menu - - - - 83 - - - - rowHeight: values.TableFontSize - - - - - - rowHeight: values.TableFontSize - rowHeight - values.TableFontSize - - NSValueTransformerName - vtRowHeightOffset - - 2 - - - 90 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 1 - - - - - - - Window - - - 3 - - - - - - - - - 4 - - - - - - - - - - - 5 - - - - - - - - 6 - - - - - 7 - - - - - 8 - - - - - - 9 - - - - - 10 - - - - - 67 - - - - - - - - - - - - matches_context - - - 68 - - - - - 69 - - - - - 70 - - - - - 71 - - - - - 72 - - - - - 73 - - - - - 74 - - - - - 2 - - - - - - - - - - - - - - 22 - - - - - 21 - - - - - 19 - - - - - 17 - - - - - - - - 24 - - - - - - - - 25 - - - - - - - - 26 - - - - - - - - - - - - - - - - - - - - 40 - - - - - 39 - - - - - 38 - - - - - 37 - - - - - 36 - - - - - 35 - - - - - 34 - - - - - 33 - - - - - 32 - - - - - 31 - - - - - 30 - - - - - 29 - - - - - 28 - - - - - 16 - - - - - - - - 41 - - - - - - - - 42 - - - - - 15 - - - - - - - - 43 - - - - - - - - 44 - - - - - 86 - - - - - - - - 84 - - - - - - - - 85 - - - - - 88 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{324, 305}, {557, 400}} - - 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 - 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 - HSTableView - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 93 - - - - - 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 - - - - HSTableView - NSTableView - - IBProjectSource - ./Classes/HSTableView.h - - - - ResultWindow - ResultWindowBase - - clearPictureCache: - id - - - clearPictureCache: - - clearPictureCache: - id - - - - IBProjectSource - ./Classes/ResultWindow.h - - - - ResultWindowBase - NSWindowController - - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - - - - changeOptions: - id - - - copyMarked: - id - - - exportToXHTML: - id - - - filter: - id - - - focusOnFilterField: - id - - - ignoreSelected: - id - - - invokeCustomCommand: - id - - - markAll: - id - - - markInvert: - id - - - markNone: - id - - - markSelected: - id - - - moveMarked: - id - - - openClicked: - id - - - openSelected: - id - - - removeMarked: - id - - - removeSelected: - id - - - renameSelected: - id - - - reprioritizeResults: - id - - - resetColumnsToDefault: - id - - - revealSelected: - id - - - saveResults: - id - - - startDuplicateScan: - id - - - switchSelected: - id - - - toggleColumn: - id - - - toggleDelta: - id - - - toggleDetailsPanel: - id - - - togglePowerMarker: - id - - - toggleQuicklookPanel: - id - - - trashMarked: - id - - - - NSSearchField - HSTableView - NSSegmentedControl - NSToolbarItem - NSTextField - - - - filterField - NSSearchField - - - matches - HSTableView - - - optionsSwitch - NSSegmentedControl - - - optionsToolbarItem - NSToolbarItem - - - stats - NSTextField - - - - IBProjectSource - ./Classes/ResultWindowBase.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - 3 - - {15, 15} - {11, 11} - {10, 3} - {21, 16} - {32, 32} - - - diff --git a/cocoa/base/ui/result_window.py b/cocoa/base/ui/result_window.py index 39d4443f..0e978823 100644 --- a/cocoa/base/ui/result_window.py +++ b/cocoa/base/ui/result_window.py @@ -5,7 +5,7 @@ result = Window(557, 400, "dupeGuru Results") toolbar = result.createToolbar('ResultsToolbar') table = TableView(result) table.OBJC_CLASS = 'HSTableView' -statsLabel = Label(result, "Hello") +statsLabel = Label(result, "") contextMenu = Menu("") #Setup toolbar items @@ -27,6 +27,7 @@ actionPopup.width = 44 actionToolItem.view = actionPopup filterField = SearchField(None, "Filter") filterField.action = Action(owner, 'filter:') +filterField.sendsWholeSearchString = True filterToolItem.view = filterField filterToolItem.minSize = Size(80, 22) filterToolItem.maxSize = Size(300, 22) @@ -86,8 +87,10 @@ table.setAnchor(Pack.UpperLeft, growX=True, growY=True) statsLabel.setAnchor(Pack.LowerLeft, growX=True) # Layout -table.packToCorner(Pack.UpperLeft, margin=0) +# It's a little weird to pack with a margin of -1, but if I don't do that, I get too thick of a +# border on the upper side of the table. +table.packToCorner(Pack.UpperLeft, margin=-1) table.fill(Pack.Right, margin=0) statsLabel.packRelativeTo(table, Pack.Below, margin=6) statsLabel.fill(Pack.Right, margin=0) -table.fill(Pack.Below, margin=6) +table.fill(Pack.Below, margin=5) diff --git a/cocoa/se/dupeguru.xcodeproj/project.pbxproj b/cocoa/se/dupeguru.xcodeproj/project.pbxproj index 36805a07..1da0d0b9 100644 --- a/cocoa/se/dupeguru.xcodeproj/project.pbxproj +++ b/cocoa/se/dupeguru.xcodeproj/project.pbxproj @@ -48,7 +48,6 @@ CE79638612536C94008D405B /* FairwareReminder.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE79638412536C94008D405B /* FairwareReminder.xib */; }; CE79638C12536F4E008D405B /* HSFairwareReminder.m in Sources */ = {isa = PBXBuildFile; fileRef = CE79638B12536F4E008D405B /* HSFairwareReminder.m */; }; 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 */; }; CE8113EB12E5CE9A00A36C80 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = CE8113E912E5CE9A00A36C80 /* Localizable.strings */; }; CE89240A14239CC30024CE4E /* PrioritizeList.m in Sources */ = {isa = PBXBuildFile; fileRef = CE89240714239CC30024CE4E /* PrioritizeList.m */; }; @@ -118,12 +117,10 @@ 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 = ""; }; - 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 = ""; }; 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 = ""; }; CE066CEE15B9D15B007084A6 /* pt_BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt_BR; path = ../base/pt_BR.lproj/Localizable.strings; sourceTree = ""; }; CE073F5409CAE1A3005C1D2F /* help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = help; path = ../../build/help; sourceTree = ""; }; @@ -170,7 +167,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 = ""; }; - 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; }; CE647E551173024A006D28BA /* ProblemDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProblemDialog.m; path = ../base/ProblemDialog.m; sourceTree = SOURCE_ROOT; }; @@ -193,12 +189,9 @@ 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 = ""; }; - 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; }; - CE81134B12E5CE4D00A36C80 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/ResultWindow.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 = ""; }; CE81135912E5CE7B00A36C80 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = fr.lproj/Preferences.xib; sourceTree = ""; }; CE8113EA12E5CE9A00A36C80 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = ../base/en.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; }; @@ -239,15 +232,12 @@ 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 = ""; }; 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 = ""; }; CED638DF14B38CEC00B88D00 /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ../base/ru.lproj/MainMenu.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 = ""; }; - 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 = ""; }; CEE49F3415B9F4E1002BD78B /* HSAboutBox_UI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSAboutBox_UI.h; path = ../../cocoalib/autogen/HSAboutBox_UI.h; sourceTree = ""; }; @@ -271,7 +261,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 = ""; }; - 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 = ""; }; CEEF2A1714C0A5A60082545A /* PyDupeGuru.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PyDupeGuru.m; sourceTree = ""; }; @@ -526,7 +515,6 @@ isa = PBXGroup; children = ( CE81134612E5CE4D00A36C80 /* MainMenu.xib */, - CE81134A12E5CE4D00A36C80 /* ResultWindow.xib */, CE81135612E5CE6D00A36C80 /* Preferences.xib */, ); name = xib; @@ -678,7 +666,6 @@ CE6E0DFE1054E9EF008D9390 /* dsa_pub.pem in Resources */, CE79638612536C94008D405B /* FairwareReminder.xib in Resources */, CE81134E12E5CE4D00A36C80 /* MainMenu.xib in Resources */, - CE81135012E5CE4D00A36C80 /* ResultWindow.xib in Resources */, CE81135812E5CE6D00A36C80 /* Preferences.xib in Resources */, CE8113EB12E5CE9A00A36C80 /* Localizable.strings in Resources */, CE31819D13D85D9B00B6D649 /* about.xib in Resources */, @@ -810,23 +797,6 @@ name = MainMenu.xib; sourceTree = SOURCE_ROOT; }; - CE81134A12E5CE4D00A36C80 /* ResultWindow.xib */ = { - isa = PBXVariantGroup; - children = ( - CE81134B12E5CE4D00A36C80 /* en */, - CE81135512E5CE6100A36C80 /* fr */, - CECFFF2113CDF8D0003A4518 /* de */, - CE0564B814169DB100D3D907 /* zh_CN */, - CED64CFE145EF07700572B00 /* cs */, - CE7A697D146442160007D927 /* it */, - CE00BBC314910C5E006A717C /* hy */, - CED638E214B38CEC00B88D00 /* ru */, - CEECCD1514C6370000A2F3A0 /* uk */, - CE5A5CA715A283C200C4E461 /* pt_BR */, - ); - name = ResultWindow.xib; - sourceTree = SOURCE_ROOT; - }; CE81135612E5CE6D00A36C80 /* Preferences.xib */ = { isa = PBXVariantGroup; children = (