From 5a6d74ab37c519574440d51a6140089131b52e2b Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Thu, 15 Apr 2010 10:38:53 +0200 Subject: [PATCH] Brought dgpe cocoa up to speed for the 1.9 release. --- cocoa/pe/dupeguru.xcodeproj/project.pbxproj | 34 +- cocoa/pe/xib/Preferences.xib | 1194 +++++++++++-------- 2 files changed, 734 insertions(+), 494 deletions(-) diff --git a/cocoa/pe/dupeguru.xcodeproj/project.pbxproj b/cocoa/pe/dupeguru.xcodeproj/project.pbxproj index 41cba033..6070dbb5 100644 --- a/cocoa/pe/dupeguru.xcodeproj/project.pbxproj +++ b/cocoa/pe/dupeguru.xcodeproj/project.pbxproj @@ -12,6 +12,9 @@ CE031751109B340A00517EE6 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE031750109B340A00517EE6 /* Preferences.xib */; }; CE031754109B345200517EE6 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE031753109B345200517EE6 /* MainMenu.xib */; }; CE073F6309CAE1A3005C1D2F /* dupeguru_pe_help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* dupeguru_pe_help */; }; + CE0C2AB61177011000BC749F /* HSTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0C2AB51177011000BC749F /* HSTable.m */; }; + CE0C2ABD1177014200BC749F /* ProblemDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0C2ABB1177014200BC749F /* ProblemDialog.m */; }; + CE0C2AC81177021600BC749F /* ProblemDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE0C2AC71177021600BC749F /* ProblemDialog.xib */; }; CE15C8A80ADEB8B50061D4A5 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */; }; CE15C8C00ADEB8D40061D4A5 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */; }; CE381C9609914ACE003581CE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9409914ACE003581CE /* AppDelegate.m */; }; @@ -84,6 +87,13 @@ CE031750109B340A00517EE6 /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Preferences.xib; sourceTree = ""; }; CE031753109B345200517EE6 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainMenu.xib; path = ../../base/xib/MainMenu.xib; sourceTree = ""; }; CE073F5409CAE1A3005C1D2F /* dupeguru_pe_help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dupeguru_pe_help; path = ../../help_pe/dupeguru_pe_help; sourceTree = SOURCE_ROOT; }; + CE0C2AAA117700E700BC749F /* PyTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyTable.h; sourceTree = ""; }; + CE0C2AB41177011000BC749F /* HSTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSTable.h; sourceTree = ""; }; + CE0C2AB51177011000BC749F /* HSTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSTable.m; sourceTree = ""; }; + CE0C2ABA1177014200BC749F /* ProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProblemDialog.h; path = ../base/ProblemDialog.h; sourceTree = SOURCE_ROOT; }; + CE0C2ABB1177014200BC749F /* ProblemDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProblemDialog.m; path = ../base/ProblemDialog.m; sourceTree = SOURCE_ROOT; }; + CE0C2ABC1177014200BC749F /* PyProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyProblemDialog.h; path = ../base/PyProblemDialog.h; sourceTree = SOURCE_ROOT; }; + CE0C2AC71177021600BC749F /* ProblemDialog.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ProblemDialog.xib; path = ../base/xib/ProblemDialog.xib; sourceTree = SOURCE_ROOT; }; CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = /Library/Frameworks/Sparkle.framework; sourceTree = ""; }; CE18126F111C9D5100E49FCE /* PyDetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDetailsPanel.h; path = ../base/PyDetailsPanel.h; sourceTree = SOURCE_ROOT; }; CE381C9409914ACE003581CE /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = SOURCE_ROOT; }; @@ -180,7 +190,7 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 080E96DDFE201D6D7F000001 /* Classes */ = { + 080E96DDFE201D6D7F000001 /* DGPE */ = { isa = PBXGroup; children = ( CE381C9509914ACE003581CE /* AppDelegate.h */, @@ -194,7 +204,7 @@ CE381C9B09914ADF003581CE /* ResultWindow.h */, CE381C9A09914ADF003581CE /* ResultWindow.m */, ); - name = Classes; + name = DGPE; sourceTree = ""; }; 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = { @@ -227,7 +237,7 @@ 29B97314FDCFA39411CA2CEA /* dupeguru */ = { isa = PBXGroup; children = ( - 080E96DDFE201D6D7F000001 /* Classes */, + 080E96DDFE201D6D7F000001 /* DGPE */, CE80DB1A0FC192AB0086DCA6 /* cocoalib */, CE80DB810FC194BD0086DCA6 /* dgbase */, 29B97315FDCFA39411CA2CEA /* Other Sources */, @@ -276,6 +286,7 @@ CE77C8A710946CE20078B0DB /* DetailsPanel.xib */, CE77C89C10946C6D0078B0DB /* DirectoryPanel.xib */, CE031750109B340A00517EE6 /* Preferences.xib */, + CE0C2AC71177021600BC749F /* ProblemDialog.xib */, ); path = xib; sourceTree = ""; @@ -335,19 +346,22 @@ CE6044EB0FE6796200B71262 /* DetailsPanel.m */, CE80DB850FC1951C0086DCA6 /* DirectoryPanel.h */, CE80DB860FC1951C0086DCA6 /* DirectoryPanel.m */, - CE9EA7711122CA0B008CD2BC /* PyDirectoryOutline.h */, CE9EA76F1122CA0B008CD2BC /* DirectoryOutline.h */, CE9EA7701122CA0B008CD2BC /* DirectoryOutline.m */, - CE80DB870FC1951C0086DCA6 /* PyDupeGuru.h */, - CE18126F111C9D5100E49FCE /* PyDetailsPanel.h */, + CE0C2ABA1177014200BC749F /* ProblemDialog.h */, + CE0C2ABB1177014200BC749F /* ProblemDialog.m */, CE80DB880FC1951C0086DCA6 /* ResultWindow.h */, CE80DB890FC1951C0086DCA6 /* ResultWindow.m */, CE958658112C516400F95FD2 /* PyResultTree.h */, CE95865A112C516400F95FD2 /* ResultOutline.h */, CE95865B112C516400F95FD2 /* ResultOutline.m */, - CE958659112C516400F95FD2 /* PyStatsLabel.h */, CE95865C112C516400F95FD2 /* StatsLabel.h */, CE95865D112C516400F95FD2 /* StatsLabel.m */, + CE80DB870FC1951C0086DCA6 /* PyDupeGuru.h */, + CE18126F111C9D5100E49FCE /* PyDetailsPanel.h */, + CE9EA7711122CA0B008CD2BC /* PyDirectoryOutline.h */, + CE0C2ABC1177014200BC749F /* PyProblemDialog.h */, + CE958659112C516400F95FD2 /* PyStatsLabel.h */, ); name = dgbase; sourceTree = ""; @@ -359,6 +373,8 @@ CE9EA7441122C96C008CD2BC /* HSGUIController.m */, CE9EA7451122C96C008CD2BC /* HSOutline.h */, CE9EA7461122C96C008CD2BC /* HSOutline.m */, + CE0C2AB41177011000BC749F /* HSTable.h */, + CE0C2AB51177011000BC749F /* HSTable.m */, CE9EA7471122C96C008CD2BC /* HSWindowController.h */, CE9EA7481122C96C008CD2BC /* HSWindowController.m */, ); @@ -371,6 +387,7 @@ children = ( CE9EA74C1122C96C008CD2BC /* PyGUI.h */, CE9EA74D1122C96C008CD2BC /* PyOutline.h */, + CE0C2AAA117700E700BC749F /* PyTable.h */, ); name = proxies; path = ../../cocoalib/proxies; @@ -470,6 +487,7 @@ CE7AC9181119911200D02F6C /* ErrorReportWindow.xib in Resources */, CE7AC9191119911200D02F6C /* progress.xib in Resources */, CE7AC91A1119911200D02F6C /* registration.xib in Resources */, + CE0C2AC81177021600BC749F /* ProblemDialog.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -509,6 +527,8 @@ CE9EA7721122CA0B008CD2BC /* DirectoryOutline.m in Sources */, CE95865E112C516400F95FD2 /* ResultOutline.m in Sources */, CE95865F112C516400F95FD2 /* StatsLabel.m in Sources */, + CE0C2AB61177011000BC749F /* HSTable.m in Sources */, + CE0C2ABD1177014200BC749F /* ProblemDialog.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/cocoa/pe/xib/Preferences.xib b/cocoa/pe/xib/Preferences.xib index f15e1671..2444e86a 100644 --- a/cocoa/pe/xib/Preferences.xib +++ b/cocoa/pe/xib/Preferences.xib @@ -2,10 +2,10 @@ 1050 - 10C540 + 10D573 740 - 1038.25 - 458.00 + 1038.29 + 460.00 com.apple.InterfaceBuilder.CocoaPlugin 740 @@ -41,14 +41,14 @@ YES - SUEnableAutomaticChecks + CustomCommand YES 3 2 - {{92, 350}, {352, 252}} + {{92, 371}, {392, 231}} 1886912512 dupeGuru PE Preferences @@ -64,212 +64,10 @@ 256 YES - - - 292 - {{120, 213}, {181, 21}} - - YES - - 67239424 - 0 - - - - - Helvetica - 12 - 16 - - - 100 - 1 - 80 - 0.0 - 0 - 1 - NO - NO - - - - - 292 - {{122, 196}, {80, 13}} - - YES - - 67239424 - 272629760 - More results - - LucidaGrande - 10 - 2843 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 289 - {{219, 196}, {80, 13}} - - YES - - 67239424 - 71303168 - Fewer results - - - - - - - - - 292 - {{17, 218}, {100, 14}} - - YES - - 67239424 - 272629760 - Filter hardness: - - LucidaGrande - 11 - 3100 - - - - - - - - - 256 - {{18, 152}, {214, 18}} - - YES - - 67239424 - 0 - Can mix file kind - - - 1211912703 - 2 - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{304, 218}, {31, 14}} - - YES - - 67239424 - -1874853888 - - - - - YES - - YES - allowsFloats - attributedStringForZero - decimalSeparator - formatterBehavior - groupingSeparator - negativeFormat - positiveFormat - usesGroupingSeparator - - - YES - - - 0 - - YES - - - YES - - - - . - - , - -0 - 0 - - - - 0 - -0 - - - - - - - - NaN - - - - 0 - 0 - YES - NO - 1 - AAAAAAAAAAAAAAAAAAAAAA - - - - . - , - NO - YES - YES - - - - - - 256 - {{190, 16}, {148, 32}} + {{230, 12}, {148, 32}} YES @@ -293,184 +91,479 @@ 25 - + - 292 - {{20, 71}, {85, 13}} + 12 + {{13, 40}, {366, 185}} - YES - - 67239424 - 272629760 - Copy and Move: - - - - - - - - - 292 - {{110, 60}, {216, 26}} - - YES - - -2076049856 - 2048 - - - 109199615 - 1 - - - - - - 400 - 75 - - - Right in destination - - 1048576 - 2147483647 - 1 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - _popUpItemAction: - - - YES - - - OtherViews - - - YES - - - - Recreate relative path - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - Recreate absolute path - - 1048576 - 2147483647 - - - _popUpItemAction: - + + YES + + 1 + + + 256 + + YES + + + 292 + {{117, 117}, {181, 21}} + + YES + + 67239424 + 0 + + + + + Helvetica + 12 + 16 + + + 100 + 1 + 80 + 0.0 + 0 + 1 + NO + NO + + + + + 292 + {{119, 100}, {80, 13}} + + YES + + 67239424 + 272629760 + More results + + LucidaGrande + 10 + 2843 + + + + 6 + System + controlColor + + 3 + MC42NjY2NjY2NjY3AA + + + + 6 + System + controlTextColor + + 3 + MAA + + + + + + + 289 + {{216, 100}, {80, 13}} + + YES + + 67239424 + 71303168 + Fewer results + + + + + + + + + 292 + {{14, 122}, {100, 14}} + + YES + + 67239424 + 272629760 + Filter hardness: + + LucidaGrande + 11 + 3100 + + + + + + + + + 256 + {{15, 56}, {214, 18}} + + YES + + 67239424 + 0 + Can mix file kind + + + 1211912703 + 2 + + NSSwitch + + + + 200 + 25 + + + + + 256 + {{15, 76}, {214, 18}} + + YES + + 67239424 + 0 + Match scaled pictures together + + + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{15, 14}, {283, 18}} + + YES + + 67239424 + 0 + Automatically check for updates + + + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{15, 36}, {242, 18}} + + YES + + 67239424 + 0 + Remove empty folders on delete or move + + + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{301, 122}, {31, 14}} + + YES + + 67239424 + -1874853888 + + + + + YES + + YES + allowsFloats + attributedStringForZero + decimalSeparator + formatterBehavior + groupingSeparator + negativeFormat + positiveFormat + usesGroupingSeparator + + + YES + + + 0 + + YES + + + YES + + + + . + + , + -0 + 0 + + + + 0 + -0 + + + + + + + + NaN + + + + 0 + 0 + YES + NO + 1 + AAAAAAAAAAAAAAAAAAAAAA + + + + . + , + NO + YES + YES + + + + + + + {{10, 33}, {346, 139}} + + Basic + + + + + 2 + + + 256 + + YES + + + 256 + {{15, 120}, {228, 18}} + + YES + + 67239424 + 0 + Use regular expressions when filtering + + + 1211912703 + 2 + + + + 200 + 25 + + + + + 292 + {{14, 97}, {85, 13}} + + YES + + 67239424 + 272629760 + Copy and Move: + + + + + + + + + 292 + {{14, 69}, {306, 17}} + + YES + + 67239424 + 272629760 + Custom Command (arguments: %d for dupe, %r for ref): + + + + + + + + + 292 + {{104, 90}, {216, 26}} + + YES + + -2076049856 + 2048 + + + 109199615 + 1 + + + + + + 400 + 75 + + + Right in destination + + 1048576 + 2147483647 + 1 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + _popUpItemAction: + + + YES + + + OtherViews + + + YES + + + + Recreate relative path + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + Recreate absolute path + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + 3 + YES + YES + 1 + + + + + 266 + {{17, 47}, {312, 22}} + + YES + + -1804468671 + 272630784 + + + + YES + + 6 + System + textBackgroundColor + + 3 + MQA + + + + 6 + System + textColor + + + + + + {{10, 33}, {346, 139}} + + Advanced + + - 3 - YES - YES - 1 - - - - 256 - {{18, 172}, {214, 18}} - - YES - - 67239424 - 0 - Match scaled pictures together - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{18, 90}, {283, 18}} - - YES - - 67239424 - 0 - Automatically check for updates - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{18, 112}, {242, 18}} - - YES - - 67239424 - 0 - Remove empty folders on delete or move - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{18, 132}, {228, 18}} - - YES - - 67239424 - 0 - Use regular expressions when filtering - - - 1211912703 - 2 - - - - 200 - 25 + + + 0 + YES + YES + + YES + - {352, 252} + {392, 231} {{0, 0}, {1440, 878}} @@ -681,6 +774,22 @@ 58 + + + value: values.CustomCommand + + + + + + value: values.CustomCommand + value + values.CustomCommand + 2 + + + 68 + @@ -730,76 +839,11 @@ YES - - - - - - + - - - - - - - - 4 - - - YES - - - - - - 5 - - - YES - - - - - - 6 - - - YES - - - - - - 7 - - - YES - - - - - - 8 - - - YES - - - - - - 9 - - - YES - - - - 10 @@ -810,49 +854,67 @@ - 11 - + 24 + + + + + 59 + YES - + + - 12 - + 60 + YES - + - + - 13 - + 61 + YES - + - + - 14 - + 62 + YES - + + + + + - + - 15 - + 63 + YES - + + + + + + + + + - + 16 @@ -861,33 +923,120 @@ YES - + 17 + + 15 + + + YES + + + + 18 + + 14 + + + YES + + + + 19 + + 13 + + + YES + + + + 20 + + 12 + + + YES + + + + 21 + + 7 + + + YES + + + + + + 31 + + + + + 6 + + + YES + + + + + + 32 + + + + + 5 + + + YES + + + + + + 33 + + + + + 11 + + + YES + + + + 22 @@ -903,15 +1052,42 @@ - 24 - - + 4 + + + YES + + + + + + 34 + + + + + 9 + + + YES + + + 25 + + 8 + + + YES + + + + 26 @@ -926,15 +1102,15 @@ YES - - + + - 28 - + 30 + @@ -943,29 +1119,37 @@ - 30 - + 28 + - 31 - - + 64 + + + YES + + + - 32 - - + 65 + + - 33 - - + 66 + + + YES + + + - 34 - - + 67 + + @@ -1025,8 +1209,18 @@ 4.ImportedFromIB2 5.IBPluginDependency 5.ImportedFromIB2 + 59.IBPluginDependency 6.IBPluginDependency 6.ImportedFromIB2 + 60.IBPluginDependency + 61.IBPluginDependency + 62.IBPluginDependency + 63.IBPluginDependency + 64.IBPluginDependency + 64.ImportedFromIB2 + 65.IBPluginDependency + 66.IBPluginDependency + 67.IBPluginDependency 7.IBPluginDependency 7.ImportedFromIB2 8.IBPluginDependency @@ -1056,9 +1250,9 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{88, 593}, {352, 252}} + {{88, 614}, {392, 231}} com.apple.InterfaceBuilder.CocoaPlugin - {{88, 593}, {352, 252}} + {{88, 614}, {392, 231}} {213, 107} @@ -1089,8 +1283,18 @@ 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 @@ -1114,7 +1318,7 @@ - 58 + 68 @@ -1572,6 +1776,22 @@ AppKit.framework/Headers/NSSliderCell.h + + NSTabView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSTabView.h + + + + NSTabViewItem + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTabViewItem.h + + NSTextField NSControl