From 729db491831782bda6c55d5ff4513a3ec2f393ea Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Sat, 21 Jul 2012 16:13:16 -0400 Subject: [PATCH] xibless-ified PE\s details panel. --HG-- branch : xibless rename : cocoa/pe/DetailsPanel.h => cocoa/pe/DetailsPanelPE.h rename : cocoa/pe/DetailsPanel.m => cocoa/pe/DetailsPanelPE.m --- build.py | 11 +- cocoa/base/ui/details_panel.py | 8 +- cocoa/pe/AppDelegate.m | 2 +- cocoa/pe/{DetailsPanel.h => DetailsPanelPE.h} | 15 +- cocoa/pe/{DetailsPanel.m => DetailsPanelPE.m} | 8 +- cocoa/pe/dupeguru.xcodeproj/project.pbxproj | 48 +- cocoa/pe/en.lproj/DetailsPanel.strings | 18 - cocoa/pe/en.lproj/DetailsPanel.xib | 846 ------------------ cocoa/pe/ui/details_panel.py | 74 ++ 9 files changed, 115 insertions(+), 915 deletions(-) rename cocoa/pe/{DetailsPanel.h => DetailsPanelPE.h} (54%) rename cocoa/pe/{DetailsPanel.m => DetailsPanelPE.m} (95%) delete mode 100644 cocoa/pe/en.lproj/DetailsPanel.strings delete mode 100644 cocoa/pe/en.lproj/DetailsPanel.xib create mode 100644 cocoa/pe/ui/details_panel.py diff --git a/build.py b/build.py index b612f340..ac158332 100644 --- a/build.py +++ b/build.py @@ -42,7 +42,7 @@ def parse_args(): (options, args) = parser.parse_args() return options -def build_xibless(): +def build_xibless(edition): import xibless if not op.exists('cocoalib/autogen'): os.mkdir('cocoalib/autogen') @@ -54,10 +54,13 @@ def build_xibless(): xibless.generate('cocoalib/ui/demo_reminder.py', 'cocoalib/autogen/HSDemoReminder_UI', localizationTable='cocoalib') xibless.generate('cocoalib/ui/enter_code.py', 'cocoalib/autogen/HSEnterCode_UI', localizationTable='cocoalib') xibless.generate('cocoalib/ui/error_report.py', 'cocoalib/autogen/HSErrorReportWindow_UI', localizationTable='cocoalib') - xibless.generate('cocoa/base/ui/details_panel.py', 'cocoa/autogen/DetailsPanel_UI', localizationTable='Localizable') + if edition == 'pe': + xibless.generate('cocoa/pe/ui/details_panel.py', 'cocoa/autogen/DetailsPanel_UI', localizationTable='Localizable') + else: + xibless.generate('cocoa/base/ui/details_panel.py', 'cocoa/autogen/DetailsPanel_UI', localizationTable='Localizable') def build_cocoa(edition, dev): - build_xibless() + build_xibless(edition) build_cocoa_proxy_module() build_cocoa_bridging_interfaces(edition) print("Building the cocoa layer") @@ -301,7 +304,7 @@ def main(): build_cocoa_proxy_module() build_cocoa_bridging_interfaces(edition) elif options.xibless: - build_xibless() + build_xibless(edition) else: build_normal(edition, ui, dev) diff --git a/cocoa/base/ui/details_panel.py b/cocoa/base/ui/details_panel.py index 1ca57def..956188f1 100644 --- a/cocoa/base/ui/details_panel.py +++ b/cocoa/base/ui/details_panel.py @@ -27,8 +27,8 @@ col.autoResizable = True col = table.addColumn('2', "Reference", 172) col.autoResizable = True -table.x = 0 -table.y = 0 -table.width = result.width -table.height = result.height +result.ignoreMargin = True +table.packToCorner(Pack.UpperLeft) +table.fill(Pack.Right) +table.fill(Pack.Below) table.setAnchor(Pack.UpperLeft, growX=True, growY=True) diff --git a/cocoa/pe/AppDelegate.m b/cocoa/pe/AppDelegate.m index a1364d46..f67cb9eb 100644 --- a/cocoa/pe/AppDelegate.m +++ b/cocoa/pe/AppDelegate.m @@ -11,7 +11,7 @@ http://www.hardcoded.net/licenses/bsd_license #import "Utils.h" #import "ValueTransformers.h" #import "Consts.h" -#import "DetailsPanel.h" +#import "DetailsPanelPE.h" #import "DirectoryPanel.h" #import "ResultWindow.h" diff --git a/cocoa/pe/DetailsPanel.h b/cocoa/pe/DetailsPanelPE.h similarity index 54% rename from cocoa/pe/DetailsPanel.h rename to cocoa/pe/DetailsPanelPE.h index 6de1d837..3a68f60b 100644 --- a/cocoa/pe/DetailsPanel.h +++ b/cocoa/pe/DetailsPanelPE.h @@ -7,15 +7,15 @@ http://www.hardcoded.net/licenses/bsd_license */ #import -#import "../base/DetailsPanel.h" +#import "DetailsPanel.h" #import "PyDupeGuru.h" @interface DetailsPanelPE : DetailsPanel { - IBOutlet NSImageView *dupeImage; - IBOutlet NSProgressIndicator *dupeProgressIndicator; - IBOutlet NSImageView *refImage; - IBOutlet NSProgressIndicator *refProgressIndicator; + NSImageView *dupeImage; + NSProgressIndicator *dupeProgressIndicator; + NSImageView *refImage; + NSProgressIndicator *refProgressIndicator; PyDupeGuru *pyApp; BOOL _needsRefresh; @@ -23,5 +23,10 @@ http://www.hardcoded.net/licenses/bsd_license NSString *_refPath; } +@property (readwrite, retain) NSImageView *dupeImage; +@property (readwrite, retain) NSProgressIndicator *dupeProgressIndicator; +@property (readwrite, retain) NSImageView *refImage; +@property (readwrite, retain) NSProgressIndicator *refProgressIndicator; + - (id)initWithApp:(PyDupeGuru *)aApp; @end \ No newline at end of file diff --git a/cocoa/pe/DetailsPanel.m b/cocoa/pe/DetailsPanelPE.m similarity index 95% rename from cocoa/pe/DetailsPanel.m rename to cocoa/pe/DetailsPanelPE.m index a93a1bc3..e0ed66c1 100644 --- a/cocoa/pe/DetailsPanel.m +++ b/cocoa/pe/DetailsPanelPE.m @@ -10,10 +10,16 @@ http://www.hardcoded.net/licenses/bsd_license #import "NSNotificationAdditions.h" #import "NSImageAdditions.h" #import "PyDupeGuru.h" -#import "DetailsPanel.h" +#import "DetailsPanelPE.h" #import "Consts.h" @implementation DetailsPanelPE + +@synthesize dupeImage; +@synthesize dupeProgressIndicator; +@synthesize refImage; +@synthesize refProgressIndicator; + - (id)initWithApp:(PyDupeGuru *)aApp { self = [super initWithPyRef:[aApp detailsPanel]]; diff --git a/cocoa/pe/dupeguru.xcodeproj/project.pbxproj b/cocoa/pe/dupeguru.xcodeproj/project.pbxproj index 3b22362f..94eeec63 100644 --- a/cocoa/pe/dupeguru.xcodeproj/project.pbxproj +++ b/cocoa/pe/dupeguru.xcodeproj/project.pbxproj @@ -12,7 +12,6 @@ CE05339C12E5DA350029EF25 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05339512E5DA350029EF25 /* MainMenu.xib */; }; CE05339D12E5DA350029EF25 /* ProblemDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05339712E5DA350029EF25 /* ProblemDialog.xib */; }; CE05339E12E5DA350029EF25 /* ResultWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE05339912E5DA350029EF25 /* ResultWindow.xib */; }; - CE0533A712E5DA4D0029EF25 /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE0533A312E5DA4D0029EF25 /* DetailsPanel.xib */; }; CE0533A812E5DA4D0029EF25 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE0533A512E5DA4D0029EF25 /* Preferences.xib */; }; CE0533AB12E5DA6A0029EF25 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = CE0533A912E5DA6A0029EF25 /* Localizable.strings */; }; CE073F6309CAE1A3005C1D2F /* help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* help */; }; @@ -75,6 +74,7 @@ CE9292B815B9FA5200C6D7F6 /* HSFairwareReminder_UI.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9292B115B9FA5200C6D7F6 /* HSFairwareReminder_UI.m */; }; CE9292B915B9FA5200C6D7F6 /* ProgressController_UI.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9292B315B9FA5200C6D7F6 /* ProgressController_UI.m */; }; CE95865F112C516400F95FD2 /* StatsLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE95865D112C516400F95FD2 /* StatsLabel.m */; }; + CE9ACBA015BB3D8D00E94337 /* DetailsPanel_UI.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9ACB9F15BB3D8D00E94337 /* DetailsPanel_UI.m */; }; CE9EA7561122C96C008CD2BC /* HSGUIController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7441122C96C008CD2BC /* HSGUIController.m */; }; CE9EA7571122C96C008CD2BC /* HSOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA7461122C96C008CD2BC /* HSOutline.m */; }; CE9EA7591122C96C008CD2BC /* NSEventAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9EA74A1122C96C008CD2BC /* NSEventAdditions.m */; }; @@ -85,7 +85,7 @@ CEA8F336142BC9AB00A6DFAC /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEA8F335142BC9AB00A6DFAC /* Quartz.framework */; }; CEA8F33A142BC9D400A6DFAC /* HSQuicklook.m in Sources */ = {isa = PBXBuildFile; fileRef = CEA8F339142BC9D400A6DFAC /* HSQuicklook.m */; }; CEC9DB4C12CCAA7D003102F0 /* HSAboutBox.m in Sources */ = {isa = PBXBuildFile; fileRef = CEC9DB4B12CCAA7D003102F0 /* HSAboutBox.m */; }; - CECA899D09DB132E00A3D774 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CECA899B09DB132E00A3D774 /* DetailsPanel.m */; }; + CECA899D09DB132E00A3D774 /* DetailsPanelPE.m in Sources */ = {isa = PBXBuildFile; fileRef = CECA899B09DB132E00A3D774 /* DetailsPanelPE.m */; }; CECB2AC513D867AD0081E295 /* about.xib in Resources */ = {isa = PBXBuildFile; fileRef = CECB2AC113D867AD0081E295 /* about.xib */; }; CECB2AC613D867AD0081E295 /* ErrorReportWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CECB2AC313D867AD0081E295 /* ErrorReportWindow.xib */; }; CED3BC1515767AFB0028F3C9 /* PyDeletionOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = CED3BC1415767AFB0028F3C9 /* PyDeletionOptions.m */; }; @@ -125,7 +125,6 @@ CE03DD6914FBD31300E998AC /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ../base/ru.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CE03DD6A14FBD31300E998AC /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ../base/ru.lproj/ProblemDialog.xib; sourceTree = ""; }; CE03DD6B14FBD31300E998AC /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ../base/ru.lproj/ResultWindow.xib; sourceTree = ""; }; - CE03DD7214FBD33600E998AC /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ru.lproj/DetailsPanel.xib; sourceTree = ""; }; CE03DD7314FBD33600E998AC /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ru.lproj/Preferences.xib; sourceTree = ""; }; CE03DD7614FBD34600E998AC /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ../base/ru.lproj/Localizable.strings; sourceTree = ""; }; CE05339412E5DA350029EF25 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/DirectoryPanel.xib; sourceTree = SOURCE_ROOT; }; @@ -136,14 +135,11 @@ CE0533A012E5DA420029EF25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; }; CE0533A112E5DA420029EF25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/ProblemDialog.xib; sourceTree = SOURCE_ROOT; }; CE0533A212E5DA420029EF25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/ResultWindow.xib; sourceTree = SOURCE_ROOT; }; - CE0533A412E5DA4D0029EF25 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/DetailsPanel.xib; sourceTree = ""; }; CE0533A612E5DA4D0029EF25 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/Preferences.xib; sourceTree = ""; }; CE0533AA12E5DA6A0029EF25 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = ../base/en.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; }; CE0533AC12E5DA790029EF25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = ../base/fr.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; }; - CE0533AD12E5DAAD0029EF25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = fr.lproj/DetailsPanel.xib; sourceTree = ""; }; CE0533AE12E5DAAD0029EF25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = fr.lproj/Preferences.xib; sourceTree = ""; }; CE073F5409CAE1A3005C1D2F /* help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = help; path = ../../build/help; sourceTree = SOURCE_ROOT; }; - CE09AF4A15A2851100BD431C /* pt_BR */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = pt_BR; path = pt_BR.lproj/DetailsPanel.xib; sourceTree = ""; }; CE09AF4B15A2851100BD431C /* pt_BR */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = pt_BR; path = pt_BR.lproj/Preferences.xib; sourceTree = ""; }; CE09AF4E15A2852600BD431C /* pt_BR */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = pt_BR; path = ../base/pt_BR.lproj/DeletionOptions.xib; sourceTree = ""; }; CE09AF4F15A2852600BD431C /* pt_BR */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = pt_BR; path = ../base/pt_BR.lproj/DirectoryPanel.xib; sourceTree = ""; }; @@ -182,7 +178,6 @@ CE6044EB0FE6796200B71262 /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailsPanel.m; path = ../base/DetailsPanel.m; sourceTree = SOURCE_ROOT; }; CE63D9D21461EDC000A8CADD /* locale */ = {isa = PBXFileReference; lastKnownFileType = folder; name = locale; path = ../../build/locale; sourceTree = ""; }; CE653CF314169F2C0058A022 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_CN; path = ../base/zh_CN.lproj/Localizable.strings; sourceTree = ""; }; - CE653CF61416A0140058A022 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = zh_CN.lproj/DetailsPanel.xib; sourceTree = ""; }; CE653CF71416A0140058A022 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = zh_CN.lproj/Preferences.xib; sourceTree = ""; }; CE653CFA1416A0260058A022 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/DirectoryPanel.xib; sourceTree = ""; }; CE653CFC1416A0260058A022 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/MainMenu.xib; sourceTree = ""; }; @@ -245,7 +240,6 @@ CE78759F13CDFA7100F23771 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; }; CE7875A013CDFA7100F23771 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/ProblemDialog.xib; sourceTree = SOURCE_ROOT; }; CE7875A113CDFA7100F23771 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/ResultWindow.xib; sourceTree = SOURCE_ROOT; }; - CE7875A513CDFAB900F23771 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = de.lproj/DetailsPanel.xib; sourceTree = ""; }; CE7875A613CDFAB900F23771 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = de.lproj/Preferences.xib; sourceTree = ""; }; CE7A69B3146443A00007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = ../base/it.lproj/Localizable.strings; sourceTree = ""; }; CE7A69B9146443AD0007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/DirectoryPanel.xib; sourceTree = ""; }; @@ -253,7 +247,6 @@ CE7A69BC146443AD0007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CE7A69BD146443AD0007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/ProblemDialog.xib; sourceTree = ""; }; CE7A69BE146443AD0007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/ResultWindow.xib; sourceTree = ""; }; - CE7A69C5146443B90007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = it.lproj/DetailsPanel.xib; sourceTree = ""; }; CE7A69C6146443B90007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = it.lproj/Preferences.xib; sourceTree = ""; }; CE7D24991423B0BD002E2297 /* HSPopUpList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSPopUpList.h; sourceTree = ""; }; CE7D249A1423B0BD002E2297 /* HSPopUpList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSPopUpList.m; sourceTree = ""; }; @@ -290,7 +283,6 @@ CE905DED14C638A500C0ECEF /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CE905DEE14C638A500C0ECEF /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/ProblemDialog.xib; sourceTree = ""; }; CE905DEF14C638A500C0ECEF /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/ResultWindow.xib; sourceTree = ""; }; - CE905DF614C638B000C0ECEF /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = uk.lproj/DetailsPanel.xib; sourceTree = ""; }; CE905DF714C638B000C0ECEF /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = uk.lproj/Preferences.xib; sourceTree = ""; }; CE9292A815B9FA5200C6D7F6 /* HSAboutBox_UI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSAboutBox_UI.h; sourceTree = ""; }; CE9292A915B9FA5200C6D7F6 /* HSAboutBox_UI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSAboutBox_UI.m; sourceTree = ""; }; @@ -306,6 +298,8 @@ CE9292B315B9FA5200C6D7F6 /* ProgressController_UI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProgressController_UI.m; sourceTree = ""; }; CE95865C112C516400F95FD2 /* StatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StatsLabel.h; path = ../base/StatsLabel.h; sourceTree = SOURCE_ROOT; }; CE95865D112C516400F95FD2 /* StatsLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StatsLabel.m; path = ../base/StatsLabel.m; sourceTree = SOURCE_ROOT; }; + CE9ACB9E15BB3D8D00E94337 /* DetailsPanel_UI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DetailsPanel_UI.h; sourceTree = ""; }; + CE9ACB9F15BB3D8D00E94337 /* DetailsPanel_UI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DetailsPanel_UI.m; sourceTree = ""; }; CE9EA7431122C96C008CD2BC /* HSGUIController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSGUIController.h; sourceTree = ""; }; CE9EA7441122C96C008CD2BC /* HSGUIController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSGUIController.m; sourceTree = ""; }; CE9EA7451122C96C008CD2BC /* HSOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSOutline.h; sourceTree = ""; }; @@ -325,8 +319,8 @@ CEA8F339142BC9D400A6DFAC /* HSQuicklook.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSQuicklook.m; path = ../../cocoalib/HSQuicklook.m; sourceTree = ""; }; CEC9DB4A12CCAA7D003102F0 /* HSAboutBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSAboutBox.h; path = ../../cocoalib/HSAboutBox.h; sourceTree = SOURCE_ROOT; }; CEC9DB4B12CCAA7D003102F0 /* HSAboutBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSAboutBox.m; path = ../../cocoalib/HSAboutBox.m; sourceTree = SOURCE_ROOT; }; - CECA899A09DB132E00A3D774 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = DetailsPanel.h; sourceTree = ""; }; - CECA899B09DB132E00A3D774 /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = DetailsPanel.m; sourceTree = ""; }; + CECA899A09DB132E00A3D774 /* DetailsPanelPE.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = DetailsPanelPE.h; sourceTree = ""; }; + CECA899B09DB132E00A3D774 /* DetailsPanelPE.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = DetailsPanelPE.m; sourceTree = ""; }; CED3BC1315767AFB0028F3C9 /* PyDeletionOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyDeletionOptions.h; sourceTree = ""; }; CED3BC1415767AFB0028F3C9 /* PyDeletionOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PyDeletionOptions.m; sourceTree = ""; }; CED3BC1715767B0E0028F3C9 /* DeletionOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DeletionOptions.h; path = ../base/DeletionOptions.h; sourceTree = ""; }; @@ -346,7 +340,6 @@ CEE6D5491491130D0087CDFC /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CEE6D54A1491130D0087CDFC /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/ProblemDialog.xib; sourceTree = ""; }; CEE6D54B1491130D0087CDFC /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/ResultWindow.xib; sourceTree = ""; }; - CEE6D553149113190087CDFC /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = hy.lproj/DetailsPanel.xib; sourceTree = ""; }; CEE6D554149113190087CDFC /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = hy.lproj/Preferences.xib; sourceTree = ""; }; CEE6D557149113250087CDFC /* hy */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hy; path = ../base/hy.lproj/Localizable.strings; sourceTree = ""; }; CEE6D560149113570087CDFC /* HSColumns.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSColumns.h; sourceTree = ""; }; @@ -361,7 +354,6 @@ CEEE15871460328400783E91 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CEEE15881460328400783E91 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/ProblemDialog.xib; sourceTree = ""; }; CEEE15891460328400783E91 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/ResultWindow.xib; sourceTree = ""; }; - CEEE15901460329000783E91 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = cs.lproj/DetailsPanel.xib; sourceTree = ""; }; CEEE15911460329000783E91 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = cs.lproj/Preferences.xib; sourceTree = ""; }; CEF12A7C124DFD400087B51D /* HSTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSTableView.h; path = ../../cocoalib/views/HSTableView.h; sourceTree = SOURCE_ROOT; }; CEF12A7D124DFD400087B51D /* HSTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSTableView.m; path = ../../cocoalib/views/HSTableView.m; sourceTree = SOURCE_ROOT; }; @@ -391,8 +383,8 @@ CE381C9509914ACE003581CE /* AppDelegate.h */, CE381C9409914ACE003581CE /* AppDelegate.m */, CE848A1809DD85810004CB44 /* Consts.h */, - CECA899A09DB132E00A3D774 /* DetailsPanel.h */, - CECA899B09DB132E00A3D774 /* DetailsPanel.m */, + CECA899A09DB132E00A3D774 /* DetailsPanelPE.h */, + CECA899B09DB132E00A3D774 /* DetailsPanelPE.m */, CE68EE6509ABC48000971085 /* DirectoryPanel.h */, CE68EE6609ABC48000971085 /* DirectoryPanel.m */, CE381C9B09914ADF003581CE /* ResultWindow.h */, @@ -478,7 +470,6 @@ CE05339712E5DA350029EF25 /* ProblemDialog.xib */, CE7857951511019400174D51 /* IgnoreListDialog.xib */, CE05339912E5DA350029EF25 /* ResultWindow.xib */, - CE0533A312E5DA4D0029EF25 /* DetailsPanel.xib */, CE0533A512E5DA4D0029EF25 /* Preferences.xib */, CE7D24A71423B123002E2297 /* PrioritizeDialog.xib */, CED3BC1A15767B200028F3C9 /* DeletionOptions.xib */, @@ -489,6 +480,8 @@ CE75017B14C477B100E2A349 /* autogen */ = { isa = PBXGroup; children = ( + CE9ACB9E15BB3D8D00E94337 /* DetailsPanel_UI.h */, + CE9ACB9F15BB3D8D00E94337 /* DetailsPanel_UI.m */, CE75017C14C477B100E2A349 /* ObjP.h */, CE75017D14C477B100E2A349 /* ObjP.m */, CE75017E14C477B100E2A349 /* PyColumns.h */, @@ -736,7 +729,6 @@ CE05339C12E5DA350029EF25 /* MainMenu.xib in Resources */, CE05339D12E5DA350029EF25 /* ProblemDialog.xib in Resources */, CE05339E12E5DA350029EF25 /* ResultWindow.xib in Resources */, - CE0533A712E5DA4D0029EF25 /* DetailsPanel.xib in Resources */, CE0533A812E5DA4D0029EF25 /* Preferences.xib in Resources */, CE0533AB12E5DA6A0029EF25 /* Localizable.strings in Resources */, CECB2AC513D867AD0081E295 /* about.xib in Resources */, @@ -761,7 +753,7 @@ CE381C9609914ACE003581CE /* AppDelegate.m in Sources */, CE381C9C09914ADF003581CE /* ResultWindow.m in Sources */, CE68EE6809ABC48000971085 /* DirectoryPanel.m in Sources */, - CECA899D09DB132E00A3D774 /* DetailsPanel.m in Sources */, + CECA899D09DB132E00A3D774 /* DetailsPanelPE.m in Sources */, CE80DB2E0FC192D60086DCA6 /* Dialogs.m in Sources */, CE80DB310FC192D60086DCA6 /* ProgressController.m in Sources */, CE80DB350FC192D60086DCA6 /* Utils.m in Sources */, @@ -821,6 +813,7 @@ CE9292B715B9FA5200C6D7F6 /* HSErrorReportWindow_UI.m in Sources */, CE9292B815B9FA5200C6D7F6 /* HSFairwareReminder_UI.m in Sources */, CE9292B915B9FA5200C6D7F6 /* ProgressController_UI.m in Sources */, + CE9ACBA015BB3D8D00E94337 /* DetailsPanel_UI.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -895,23 +888,6 @@ name = ResultWindow.xib; sourceTree = SOURCE_ROOT; }; - CE0533A312E5DA4D0029EF25 /* DetailsPanel.xib */ = { - isa = PBXVariantGroup; - children = ( - CE0533A412E5DA4D0029EF25 /* en */, - CE0533AD12E5DAAD0029EF25 /* fr */, - CE7875A513CDFAB900F23771 /* de */, - CE653CF61416A0140058A022 /* zh_CN */, - CEEE15901460329000783E91 /* cs */, - CE7A69C5146443B90007D927 /* it */, - CEE6D553149113190087CDFC /* hy */, - CE905DF614C638B000C0ECEF /* uk */, - CE03DD7214FBD33600E998AC /* ru */, - CE09AF4A15A2851100BD431C /* pt_BR */, - ); - name = DetailsPanel.xib; - sourceTree = SOURCE_ROOT; - }; CE0533A512E5DA4D0029EF25 /* Preferences.xib */ = { isa = PBXVariantGroup; children = ( diff --git a/cocoa/pe/en.lproj/DetailsPanel.strings b/cocoa/pe/en.lproj/DetailsPanel.strings deleted file mode 100644 index 8baff404..00000000 --- a/cocoa/pe/en.lproj/DetailsPanel.strings +++ /dev/null @@ -1,18 +0,0 @@ - -/* Class = "NSPanel"; title = "Details of Selected File"; ObjectID = "5"; */ -"5.title" = "Details of Selected File"; - -/* Class = "NSTableColumn"; headerCell.title = "Selected"; ObjectID = "9"; */ -"9.headerCell.title" = "Selected"; - -/* Class = "NSTableColumn"; headerCell.title = "Reference"; ObjectID = "10"; */ -"10.headerCell.title" = "Reference"; - -/* Class = "NSTableColumn"; headerCell.title = "Attribute"; ObjectID = "11"; */ -"11.headerCell.title" = "Attribute"; - -/* Class = "NSTextFieldCell"; title = "Selected"; ObjectID = "33"; */ -"33.title" = "Selected"; - -/* Class = "NSTextFieldCell"; title = "Reference"; ObjectID = "35"; */ -"35.title" = "Reference"; diff --git a/cocoa/pe/en.lproj/DetailsPanel.xib b/cocoa/pe/en.lproj/DetailsPanel.xib deleted file mode 100644 index d5dc4e26..00000000 --- a/cocoa/pe/en.lproj/DetailsPanel.xib +++ /dev/null @@ -1,846 +0,0 @@ - - - - 1060 - 11B26 - 1617 - 1138 - 566.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 1617 - - - NSScroller - NSSplitView - NSTableHeaderView - NSScrollView - NSImageView - NSTextFieldCell - NSProgressIndicator - NSTableView - NSImageCell - NSCustomObject - NSCustomView - NSView - NSWindowTemplate - NSTextField - NSTableColumn - - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - DetailsPanelPE - - - FirstResponder - - - NSApplication - - - 155 - 2 - {{634, 317}, {593, 398}} - -260571136 - Details of Selected File - - NSPanel - - - View - - - {451, 161} - - - 256 - - - - 266 - - - - 2304 - - - - 256 - {591, 147} - - - 2 - YES - - - 256 - {591, 17} - - - - - - - -2147483392 - {{-26, 0}, {16, 17}} - - - - - - 0 - 74 - 40 - 1000 - - 75628096 - 2048 - Attribute - - LucidaGrande - 11 - 3100 - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - 3 - MAA - - - - - 337772096 - 2048 - - - - 6 - System - controlBackgroundColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - - - 2 - YES - - - - 1 - 260 - 40 - 1000 - - 75628096 - 2048 - Selected - - - - - - 337772096 - 2048 - - - - - - 3 - YES - - - - 2 - 248 - 56.4755859375 - 1000 - - 75628096 - 2048 - Reference - - - 6 - System - headerColor - - 3 - MQA - - - - - - 337772096 - 2048 - - - - - - 3 - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 14 - 1111523328 - - - 1 - 15 - 0 - YES - 0 - 1 - - - {{1, 17}, {591, 147}} - - - - - - 4 - - - - -2147483392 - {{-30, 17}, {15, 147}} - - - - _doScroller: - 0.91874998807907104 - - - - -2147483392 - {{-100, -100}, {394, 15}} - - - 1 - - _doScroller: - 0.96332520246505737 - - - - 2304 - - - - {{1, 0}, {591, 17}} - - - - - - 4 - - - - {{0, 233}, {593, 165}} - - - - 133650 - - - - - - QSAAAEEgAABBgAAAQYAAAA - - - - 274 - - - - 256 - - - - 266 - {{-3, 201}, {294, 17}} - - - YES - - 67239424 - 138412032 - Selected - - LucidaGrande - 13 - 1044 - - - - 6 - System - controlColor - - - - - - - - 274 - - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - {288, 193} - - - YES - - 130560 - 33554432 - - NSImage - NSApplicationIcon - - 0 - 0 - 0 - NO - - YES - - - - 1289 - - {{255, 201}, {16, 16}} - - - 28938 - 100 - - - {291, 225} - - - NSView - - - - 256 - - - - 266 - {{-3, 203}, {295, 17}} - - - YES - - 67239424 - 138412032 - Reference - - - - - - - - - 274 - - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - {289, 195} - - - YES - - 130560 - 33554432 - - 0 - 0 - 0 - NO - - YES - - - - 1289 - - {{257, 203}, {16, 16}} - - - 28938 - 100 - - - {{300, 0}, {293, 225}} - - - NSView - - - {593, 225} - - - YES - - - {593, 398} - - - - {{0, 0}, {1440, 878}} - {451, 177} - {10000000000000, 10000000000000} - DetailsPanel - YES - - - - - - - window - - - - 12 - - - - detailsTable - - - - 13 - - - - refImage - - - - 25 - - - - dupeImage - - - - 26 - - - - dupeProgressIndicator - - - - 30 - - - - refProgressIndicator - - - - 31 - - - - dataSource - - - - 43 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - 5 - - - - - - details - - - 6 - - - - - - - - - 7 - - - - - - - - - - - 8 - - - - - - - - - - 9 - - - - - - - - 10 - - - - - - - - 11 - - - - - - - - 20 - - - - - - - - - 18 - - - - - - - - - - 14 - - - - - - - - 16 - - - - - - - - 27 - - - - - 19 - - - - - - - - - - 15 - - - - - - - - 17 - - - - - - - - 29 - - - - - 33 - - - - - 34 - - - - - 35 - - - - - 36 - - - - - 37 - - - - - 38 - - - - - 39 - - - - - 40 - - - - - 41 - - - - - 42 - - - - - -3 - - - Application - - - - - 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 - {{88, 453}, {593, 398}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 43 - - - - - DetailsPanel - HSWindowController - - detailsTable - NSTableView - - - detailsTable - - detailsTable - NSTableView - - - - IBProjectSource - ./Classes/DetailsPanel.h - - - - DetailsPanelPE - DetailsPanel - - NSImageView - NSProgressIndicator - NSImageView - NSProgressIndicator - - - - dupeImage - NSImageView - - - dupeProgressIndicator - NSProgressIndicator - - - refImage - NSImageView - - - refProgressIndicator - NSProgressIndicator - - - - IBProjectSource - ./Classes/DetailsPanelPE.h - - - - HSWindowController - NSWindowController - - IBProjectSource - ./Classes/HSWindowController.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - NSApplicationIcon - {128, 128} - - - diff --git a/cocoa/pe/ui/details_panel.py b/cocoa/pe/ui/details_panel.py new file mode 100644 index 00000000..0fbd2186 --- /dev/null +++ b/cocoa/pe/ui/details_panel.py @@ -0,0 +1,74 @@ +ownerclass = 'DetailsPanelPE' +ownerimport = 'DetailsPanelPE.h' + +result = Panel(593, 398, "Details of Selected File") +table = TableView(result) +split = SplitView(result, 2, vertical=True) +leftSplit, rightSplit = split.subviews +selectedLabel = Label(leftSplit, "Selected") +selectedImage = ImageView(leftSplit, 'NSApplicationIcon') +leftSpinner = ProgressIndicator(leftSplit) +referenceLabel = Label(rightSplit, "Reference") +referenceImage = ImageView(rightSplit, 'NSApplicationIcon') +rightSpinner = ProgressIndicator(rightSplit) + +owner.detailsTable = table +owner.dupeImage = selectedImage +owner.dupeProgressIndicator = leftSpinner +owner.refImage = referenceImage +owner.refProgressIndicator = rightSpinner +table.dataSource = owner + +result.style = PanelStyle.Utility +result.xProportion = 0.6 +result.yProportion = 0.6 +result.canMinimize = False +result.autosaveName = 'DetailsPanel' +result.minSize = Size(451, 240) + +table.allowsColumnReordering = False +table.allowsColumnSelection = False +table.allowsMultipleSelection = False +table.font = Font(FontFamily.System, FontSize.SmallSystem) +table.rowHeight = 14 +table.editable = False +col = table.addColumn('0', "Attribute", 70) +col.autoResizable = True +col = table.addColumn('1', "Selected", 198) +col.autoResizable = True +col = table.addColumn('2', "Reference", 172) +col.autoResizable = True +table.height = 165 + +sides = [ + (leftSplit, selectedLabel, selectedImage, leftSpinner), + (rightSplit, referenceLabel, referenceImage, rightSpinner), +] +for subSplit, label, image, spinner in sides: + label.alignment = TextAlignment.Center + spinner.style = const.NSProgressIndicatorSpinningStyle + spinner.controlSize = const.NSSmallControlSize + spinner.displayedWhenStopped = False + + subSplit.ignoreMargin = True + label.packToCorner(Pack.UpperLeft) + label.fill(Pack.Right) + label.setAnchor(Pack.UpperLeft, growX=True) + image.packRelativeTo(label, Pack.Below) + image.fill(Pack.Right) + image.fill(Pack.Below) + 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.setAnchor(Pack.UpperLeft, growX=True) + +split.packRelativeTo(table, Pack.Below) +split.fill(Pack.Right) +split.fill(Pack.Below) +split.setAnchor(Pack.UpperLeft, growX=True, growY=True) +