From f9ced08e6dd9ad192197dab9ade30fc5bcd43ea5 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Fri, 13 Jan 2012 10:20:46 -0500 Subject: [PATCH] Fixed the mess I had to introduce earlier to make selectable list work by using objp's new inheritance capabilities. --HG-- branch : objp --- build.py | 14 ++++---- cocoa/base/PrioritizeDialog.h | 3 +- cocoa/base/PrioritizeDialog.m | 2 +- cocoa/base/PrioritizeList.h | 2 +- cocoa/base/PrioritizeList.m | 14 ++++---- cocoa/inter/details_panel.py | 4 +-- cocoa/inter/directory_outline.py | 6 ++-- cocoa/inter/extra_fairware_reminder.py | 4 +-- cocoa/inter/prioritize_dialog.py | 4 +-- cocoa/inter/prioritize_list.py | 2 -- cocoa/inter/stats_label.py | 4 +-- cocoa/se/dg_cocoa.py | 1 + cocoa/se/dupeguru.xcodeproj/project.pbxproj | 36 ++++++++++++--------- 13 files changed, 49 insertions(+), 47 deletions(-) diff --git a/build.py b/build.py index c79e704a..f3513172 100644 --- a/build.py +++ b/build.py @@ -179,19 +179,21 @@ def build_cocoa_bridging_interfaces(): import objp.p2o add_to_pythonpath('cocoa') add_to_pythonpath('cocoalib') - from cocoa.inter2 import PyColumns2, ColumnsView + from cocoa.inter2 import (PyGUIObject2, PyColumns2, ColumnsView, PyOutline2, OutlineView, + PySelectableList2, SelectableListView) from inter.details_panel import PyDetailsPanel, DetailsPanelView from inter.directory_outline import PyDirectoryOutline, DirectoryOutlineView from inter.extra_fairware_reminder import PyExtraFairwareReminder, ExtraFairwareReminderView from inter.prioritize_dialog import PyPrioritizeDialog, PrioritizeDialogView from inter.prioritize_list import PyPrioritizeList, PrioritizeListView from inter.stats_label import PyStatsLabel, StatsLabelView - allclasses = [PyColumns2, PyDetailsPanel, PyDirectoryOutline, PyExtraFairwareReminder, - PyPrioritizeDialog, PyPrioritizeList, PyStatsLabel] + allclasses = [PyGUIObject2, PyColumns2, PyOutline2, PySelectableList2, PyDetailsPanel, + PyDirectoryOutline, PyExtraFairwareReminder, PyPrioritizeDialog, PyPrioritizeList, + PyStatsLabel] for class_ in allclasses: - objp.o2p.generate_objc_code(class_, 'cocoa/autogen') - allclasses = [ColumnsView, DetailsPanelView, DirectoryOutlineView, ExtraFairwareReminderView, - PrioritizeDialogView, PrioritizeListView, StatsLabelView] + objp.o2p.generate_objc_code(class_, 'cocoa/autogen', inherit=True) + allclasses = [ColumnsView, OutlineView, SelectableListView, DetailsPanelView, DirectoryOutlineView, + ExtraFairwareReminderView, PrioritizeDialogView, PrioritizeListView, StatsLabelView] for class_ in allclasses: clsspec = objp.o2p.spec_from_python_class(class_) clsname = class_.__name__ diff --git a/cocoa/base/PrioritizeDialog.h b/cocoa/base/PrioritizeDialog.h index 0e85b827..3003da72 100644 --- a/cocoa/base/PrioritizeDialog.h +++ b/cocoa/base/PrioritizeDialog.h @@ -21,8 +21,7 @@ http://www.hardcoded.net/licenses/bsd_license PyPrioritizeDialog *py; HSPopUpList2 *categoryPopUp; - // XXX Just to make it work temporarily, fix this asap (support to be HSSelectableList) - PrioritizeList *criteriaList; + HSSelectableList2 *criteriaList; PrioritizeList *prioritizationList; } - (id)init; diff --git a/cocoa/base/PrioritizeDialog.m b/cocoa/base/PrioritizeDialog.m index 6f2c8668..2e32af1b 100644 --- a/cocoa/base/PrioritizeDialog.m +++ b/cocoa/base/PrioritizeDialog.m @@ -17,7 +17,7 @@ http://www.hardcoded.net/licenses/bsd_license py = [[PyPrioritizeDialog alloc] initWithModel:findHackishModel(@"prioritize_dialog")]; [py bindCallback:createCallback(@"PrioritizeDialogView", self)]; categoryPopUp = [[HSPopUpList2 alloc] initWithPyRef:[[self py] categoryList] popupView:categoryPopUpView]; - criteriaList = [[PrioritizeList alloc] initWithPyRef:[[self py] criteriaList] tableView:criteriaTableView]; + criteriaList = [[HSSelectableList2 alloc] initWithPyRef:[[self py] criteriaList] tableView:criteriaTableView]; prioritizationList = [[PrioritizeList alloc] initWithPyRef:[[self py] prioritizationList] tableView:prioritizationTableView]; [py connect]; return self; diff --git a/cocoa/base/PrioritizeList.h b/cocoa/base/PrioritizeList.h index c1571376..bc3c1eee 100644 --- a/cocoa/base/PrioritizeList.h +++ b/cocoa/base/PrioritizeList.h @@ -12,5 +12,5 @@ http://www.hardcoded.net/licenses/bsd_license @interface PrioritizeList : HSSelectableList2 {} - (id)initWithPyRef:(PyObject *)aPyRef tableView:(NSTableView *)aTableView; -- (PyPrioritizeList *)py; +- (PyPrioritizeList *)model; @end \ No newline at end of file diff --git a/cocoa/base/PrioritizeList.m b/cocoa/base/PrioritizeList.m index f1c902b1..47452278 100644 --- a/cocoa/base/PrioritizeList.m +++ b/cocoa/base/PrioritizeList.m @@ -13,16 +13,16 @@ http://www.hardcoded.net/licenses/bsd_license @implementation PrioritizeList - (id)initWithPyRef:(PyObject *)aPyRef tableView:(NSTableView *)aTableView { - PyPrioritizeList *model = [[PyPrioritizeList alloc] initWithModel:aPyRef]; - self = [super initWithPy:model tableView:aTableView]; - [model bindCallback:createCallback(@"PrioritizeListView", self)]; - [model release]; + PyPrioritizeList *m = [[PyPrioritizeList alloc] initWithModel:aPyRef]; + self = [super initWithModel:m tableView:aTableView]; + [m bindCallback:createCallback(@"PrioritizeListView", self)]; + [m release]; return self; } -- (PyPrioritizeList *)py +- (PyPrioritizeList *)model { - return (PyPrioritizeList *)py; + return (PyPrioritizeList *)model; } - (void)setView:(NSTableView *)aTableView @@ -54,7 +54,7 @@ http://www.hardcoded.net/licenses/bsd_license NSPasteboard* pboard = [info draggingPasteboard]; NSData* rowData = [pboard dataForType:DGPrioritizeIndexPasteboardType]; NSIndexSet* rowIndexes = [NSKeyedUnarchiver unarchiveObjectWithData:rowData]; - [[self py] moveIndexes:[Utils indexSet2Array:rowIndexes] toIndex:row]; + [[self model] moveIndexes:[Utils indexSet2Array:rowIndexes] toIndex:row]; return YES; } @end \ No newline at end of file diff --git a/cocoa/inter/details_panel.py b/cocoa/inter/details_panel.py index 4ac39d9a..b2d17851 100644 --- a/cocoa/inter/details_panel.py +++ b/cocoa/inter/details_panel.py @@ -1,9 +1,9 @@ -from cocoa.inter2 import PyGUIObject, GUIObjectView +from cocoa.inter2 import PyGUIObject2, GUIObjectView class DetailsPanelView(GUIObjectView): pass -class PyDetailsPanel(PyGUIObject): +class PyDetailsPanel(PyGUIObject2): def numberOfRows(self) -> int: return self.model.row_count() diff --git a/cocoa/inter/directory_outline.py b/cocoa/inter/directory_outline.py index d88f98ac..57832b25 100644 --- a/cocoa/inter/directory_outline.py +++ b/cocoa/inter/directory_outline.py @@ -1,12 +1,10 @@ from objp.util import dontwrap -from cocoa.inter2 import PyOutline, GUIObjectView +from cocoa.inter2 import PyOutline2, GUIObjectView class DirectoryOutlineView(GUIObjectView): pass -class PyDirectoryOutline(PyOutline): - FOLLOW_PROTOCOLS = ['PyOutline2'] - +class PyDirectoryOutline(PyOutline2): def addDirectory_(self, path: str): self.model.add_directory(path) diff --git a/cocoa/inter/extra_fairware_reminder.py b/cocoa/inter/extra_fairware_reminder.py index 47b9871c..af87e557 100644 --- a/cocoa/inter/extra_fairware_reminder.py +++ b/cocoa/inter/extra_fairware_reminder.py @@ -1,5 +1,5 @@ from objp.util import dontwrap -from cocoa.inter2 import PyGUIObject +from cocoa.inter2 import PyGUIObject2 class ExtraFairwareReminderView: def startTimer(self): pass @@ -7,7 +7,7 @@ class ExtraFairwareReminderView: def setButtonText_(self, text: str): pass; def enableButton(self): pass -class PyExtraFairwareReminder(PyGUIObject): +class PyExtraFairwareReminder(PyGUIObject2): def start(self): self.model.start() diff --git a/cocoa/inter/prioritize_dialog.py b/cocoa/inter/prioritize_dialog.py index 63da1de2..769bc026 100644 --- a/cocoa/inter/prioritize_dialog.py +++ b/cocoa/inter/prioritize_dialog.py @@ -1,10 +1,10 @@ from objp.util import pyref -from cocoa.inter2 import PyGUIObject, GUIObjectView +from cocoa.inter2 import PyGUIObject2, GUIObjectView class PrioritizeDialogView(GUIObjectView): pass -class PyPrioritizeDialog(PyGUIObject): +class PyPrioritizeDialog(PyGUIObject2): def categoryList(self) -> pyref: return self.model.category_list diff --git a/cocoa/inter/prioritize_list.py b/cocoa/inter/prioritize_list.py index 47ff752e..5d525bc9 100644 --- a/cocoa/inter/prioritize_list.py +++ b/cocoa/inter/prioritize_list.py @@ -4,7 +4,5 @@ class PrioritizeListView(SelectableListView): pass class PyPrioritizeList(PySelectableList2): - FOLLOW_PROTOCOLS = ['PySelectableList2'] - def moveIndexes_toIndex_(self, indexes: list, dest_index: int): self.model.move_indexes(indexes, dest_index) diff --git a/cocoa/inter/stats_label.py b/cocoa/inter/stats_label.py index b36fbcb0..f484d7be 100644 --- a/cocoa/inter/stats_label.py +++ b/cocoa/inter/stats_label.py @@ -1,9 +1,9 @@ -from cocoa.inter2 import PyGUIObject, GUIObjectView +from cocoa.inter2 import PyGUIObject2, GUIObjectView class StatsLabelView(GUIObjectView): pass -class PyStatsLabel(PyGUIObject): +class PyStatsLabel(PyGUIObject2): def display(self) -> str: return self.model.display diff --git a/cocoa/se/dg_cocoa.py b/cocoa/se/dg_cocoa.py index 42329cbb..0985dbf8 100644 --- a/cocoa/se/dg_cocoa.py +++ b/cocoa/se/dg_cocoa.py @@ -8,6 +8,7 @@ from hscommon.trans import install_gettext_trans_under_cocoa install_gettext_trans_under_cocoa() from cocoa.inter import signature +from cocoa.inter2 import PySelectableList2 from core.scanner import ScanType diff --git a/cocoa/se/dupeguru.xcodeproj/project.pbxproj b/cocoa/se/dupeguru.xcodeproj/project.pbxproj index 3c7e220e..3d633d17 100644 --- a/cocoa/se/dupeguru.xcodeproj/project.pbxproj +++ b/cocoa/se/dupeguru.xcodeproj/project.pbxproj @@ -35,6 +35,8 @@ CE548CC614BF903D00D180CB /* PyPrioritizeDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = CE548CC314BF903D00D180CB /* PyPrioritizeDialog.m */; }; CE548CC714BF903D00D180CB /* PyPrioritizeList.m in Sources */ = {isa = PBXBuildFile; fileRef = CE548CC514BF903D00D180CB /* PyPrioritizeList.m */; }; CE54A87E148046F9008EEA77 /* HSColumns.m in Sources */ = {isa = PBXBuildFile; fileRef = CE54A87D148046F9008EEA77 /* HSColumns.m */; }; + CE587E9A14C07BCF004CA031 /* PyOutline2.m in Sources */ = {isa = PBXBuildFile; fileRef = CE587E9814C07BCF004CA031 /* PyOutline2.m */; }; + CE587E9E14C0801F004CA031 /* PySelectableList2.m in Sources */ = {isa = PBXBuildFile; fileRef = CE587E9D14C0801F004CA031 /* PySelectableList2.m */; }; CE647E571173024A006D28BA /* ProblemDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = CE647E551173024A006D28BA /* ProblemDialog.m */; }; CE665B3013225ADD003F5CFB /* ExtraFairwareReminder.m in Sources */ = {isa = PBXBuildFile; fileRef = CE665B2E13225ADD003F5CFB /* ExtraFairwareReminder.m */; }; CE665B3313225AF8003F5CFB /* ExtraFairwareReminder.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE665B3113225AF8003F5CFB /* ExtraFairwareReminder.xib */; }; @@ -46,7 +48,6 @@ CE76FDC6111EE37C006618EA /* NSTableViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDC3111EE37C006618EA /* NSTableViewAdditions.m */; }; CE76FDCF111EE38E006618EA /* HSGUIController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDC9111EE38E006618EA /* HSGUIController.m */; }; CE76FDD4111EE3A7006618EA /* DirectoryOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDD2111EE3A7006618EA /* DirectoryOutline.m */; }; - CE76FDDF111EE42F006618EA /* HSOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDDE111EE42F006618EA /* HSOutline.m */; }; CE76FDF7111EE561006618EA /* NSEventAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE76FDF6111EE561006618EA /* NSEventAdditions.m */; }; CE79638612536C94008D405B /* FairwareReminder.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE79638412536C94008D405B /* FairwareReminder.xib */; }; CE79638C12536F4E008D405B /* HSFairwareReminder.m in Sources */ = {isa = PBXBuildFile; fileRef = CE79638B12536F4E008D405B /* HSFairwareReminder.m */; }; @@ -63,6 +64,7 @@ CE9777CD141F8C2500C13FB5 /* PrioritizeDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9777CC141F8C2500C13FB5 /* PrioritizeDialog.m */; }; CE9777D1141F8CB400C13FB5 /* PrioritizeDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE9777CF141F8CB400C13FB5 /* PrioritizeDialog.xib */; }; CE9D842A14BE2AE900184165 /* PyExtraFairwareReminder.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9D842914BE2AE900184165 /* PyExtraFairwareReminder.m */; }; + CE9FC22D14C080CF005C31FD /* PyGUIObject2.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9FC22C14C080CF005C31FD /* PyGUIObject2.m */; }; CEA175CA1461E8E600776591 /* locale in Resources */ = {isa = PBXBuildFile; fileRef = CEA175C91461E8E600776591 /* locale */; }; CEA450B814BDDFD7002DAAF2 /* dg_cocoa.py in Resources */ = {isa = PBXBuildFile; fileRef = CEA450B714BDDFD7002DAAF2 /* dg_cocoa.py */; }; CEBE4D74111F0EE1009AAC6D /* HSWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CEBE4D73111F0EE1009AAC6D /* HSWindowController.m */; }; @@ -137,7 +139,6 @@ CE1D091514BE0C6400CA6B8C /* ObjP.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ObjP.m; sourceTree = ""; }; CE1D091614BE0C6400CA6B8C /* PyStatsLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyStatsLabel.h; sourceTree = ""; }; CE1D091714BE0C6400CA6B8C /* PyStatsLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PyStatsLabel.m; sourceTree = ""; }; - CE275C4A14BF6C3700265960 /* PyOutline2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyOutline2.h; sourceTree = ""; }; CE275C4C14BF6C5600265960 /* HSColumns2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSColumns2.h; sourceTree = ""; }; CE275C4D14BF6C5600265960 /* HSColumns2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSColumns2.m; sourceTree = ""; }; CE275C4E14BF6C5600265960 /* HSOutline2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSOutline2.h; sourceTree = ""; }; @@ -167,7 +168,6 @@ CE5335FA142BBFAF008E5374 /* HSQuicklook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSQuicklook.h; path = ../../cocoalib/HSQuicklook.h; sourceTree = ""; }; CE5335FB142BBFAF008E5374 /* HSQuicklook.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSQuicklook.m; path = ../../cocoalib/HSQuicklook.m; sourceTree = ""; }; CE533602142BC034008E5374 /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = System/Library/Frameworks/Quartz.framework; sourceTree = SDKROOT; }; - CE548CBB14BF8FFE00D180CB /* PySelectableList2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PySelectableList2.h; sourceTree = ""; }; CE548CBC14BF902000D180CB /* HSPopUpList2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSPopUpList2.h; sourceTree = ""; }; CE548CBD14BF902000D180CB /* HSPopUpList2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSPopUpList2.m; sourceTree = ""; }; CE548CBE14BF902000D180CB /* HSSelectableList2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSSelectableList2.h; sourceTree = ""; }; @@ -178,6 +178,10 @@ CE548CC514BF903D00D180CB /* PyPrioritizeList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PyPrioritizeList.m; sourceTree = ""; }; CE54A87C148046F9008EEA77 /* HSColumns.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSColumns.h; sourceTree = ""; }; CE54A87D148046F9008EEA77 /* HSColumns.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSColumns.m; sourceTree = ""; }; + CE587E9714C07BCF004CA031 /* PyOutline2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyOutline2.h; sourceTree = ""; }; + CE587E9814C07BCF004CA031 /* PyOutline2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PyOutline2.m; sourceTree = ""; }; + CE587E9C14C0801F004CA031 /* PySelectableList2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PySelectableList2.h; sourceTree = ""; }; + CE587E9D14C0801F004CA031 /* PySelectableList2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PySelectableList2.m; 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; }; CE647E561173024A006D28BA /* PyProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyProblemDialog.h; path = ../base/PyProblemDialog.h; sourceTree = SOURCE_ROOT; }; @@ -200,11 +204,8 @@ CE76FDC8111EE38E006618EA /* HSGUIController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSGUIController.h; sourceTree = ""; }; CE76FDC9111EE38E006618EA /* HSGUIController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSGUIController.m; sourceTree = ""; }; CE76FDCD111EE38E006618EA /* PyGUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyGUI.h; sourceTree = ""; }; - CE76FDCE111EE38E006618EA /* PyOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyOutline.h; sourceTree = ""; }; CE76FDD1111EE3A7006618EA /* DirectoryOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryOutline.h; path = ../base/DirectoryOutline.h; sourceTree = SOURCE_ROOT; }; CE76FDD2111EE3A7006618EA /* DirectoryOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DirectoryOutline.m; path = ../base/DirectoryOutline.m; sourceTree = SOURCE_ROOT; }; - CE76FDDD111EE42F006618EA /* HSOutline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSOutline.h; sourceTree = ""; }; - CE76FDDE111EE42F006618EA /* HSOutline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSOutline.m; sourceTree = ""; }; CE76FDF5111EE561006618EA /* NSEventAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSEventAdditions.h; path = ../../cocoalib/NSEventAdditions.h; sourceTree = SOURCE_ROOT; }; CE76FDF6111EE561006618EA /* NSEventAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSEventAdditions.m; path = ../../cocoalib/NSEventAdditions.m; sourceTree = SOURCE_ROOT; }; CE79638212536C6E008D405B /* PyFairware.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyFairware.h; path = ../../cocoalib/PyFairware.h; sourceTree = SOURCE_ROOT; }; @@ -248,6 +249,8 @@ CE9777D0141F8CB400C13FB5 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CE9D842814BE2AE900184165 /* PyExtraFairwareReminder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyExtraFairwareReminder.h; sourceTree = ""; }; CE9D842914BE2AE900184165 /* PyExtraFairwareReminder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PyExtraFairwareReminder.m; sourceTree = ""; }; + CE9FC22B14C080CF005C31FD /* PyGUIObject2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyGUIObject2.h; sourceTree = ""; }; + CE9FC22C14C080CF005C31FD /* PyGUIObject2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PyGUIObject2.m; sourceTree = ""; }; CEA175C91461E8E600776591 /* locale */ = {isa = PBXFileReference; lastKnownFileType = folder; name = locale; path = ../../build/locale; sourceTree = ""; }; CEA450B714BDDFD7002DAAF2 /* dg_cocoa.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = dg_cocoa.py; path = ../../build/dg_cocoa.py; sourceTree = ""; }; CEB57990146ADC5100EDF7D7 /* HSConsts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSConsts.h; path = ../../cocoalib/HSConsts.h; sourceTree = ""; }; @@ -260,7 +263,6 @@ CECFFF2013CDF8D0003A4518 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/ProblemDialog.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 = ""; }; - CED569C614BF312900C6AC25 /* PyGUI2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyGUI2.h; sourceTree = ""; }; CED64CEB145EF06000572B00 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = ../base/cs.lproj/Localizable.strings; sourceTree = ""; }; CED64CF8145EF07700572B00 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/DetailsPanel.xib; sourceTree = ""; }; CED64CF9145EF07700572B00 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/DirectoryPanel.xib; sourceTree = ""; }; @@ -413,8 +415,12 @@ CE1D091314BE0C6400CA6B8C /* autogen */ = { isa = PBXGroup; children = ( - CE1D091414BE0C6400CA6B8C /* ObjP.h */, - CE1D091514BE0C6400CA6B8C /* ObjP.m */, + CE9FC22B14C080CF005C31FD /* PyGUIObject2.h */, + CE9FC22C14C080CF005C31FD /* PyGUIObject2.m */, + CE587E9714C07BCF004CA031 /* PyOutline2.h */, + CE587E9814C07BCF004CA031 /* PyOutline2.m */, + CE587E9C14C0801F004CA031 /* PySelectableList2.h */, + CE587E9D14C0801F004CA031 /* PySelectableList2.m */, CE3A3B4714BF19B8007898AB /* PyDetailsPanel.h */, CE3A3B4814BF19B8007898AB /* PyDetailsPanel.m */, CE9D842814BE2AE900184165 /* PyExtraFairwareReminder.h */, @@ -429,6 +435,8 @@ CE548CC314BF903D00D180CB /* PyPrioritizeDialog.m */, CE548CC414BF903D00D180CB /* PyPrioritizeList.h */, CE548CC514BF903D00D180CB /* PyPrioritizeList.m */, + CE1D091414BE0C6400CA6B8C /* ObjP.h */, + CE1D091514BE0C6400CA6B8C /* ObjP.m */, ); name = autogen; path = ../autogen; @@ -459,8 +467,6 @@ CE275C4D14BF6C5600265960 /* HSColumns2.m */, CEBE4D72111F0EE1009AAC6D /* HSWindowController.h */, CEBE4D73111F0EE1009AAC6D /* HSWindowController.m */, - CE76FDDD111EE42F006618EA /* HSOutline.h */, - CE76FDDE111EE42F006618EA /* HSOutline.m */, CE275C4E14BF6C5600265960 /* HSOutline2.h */, CE275C4F14BF6C5600265960 /* HSOutline2.m */, CE76FDC8111EE38E006618EA /* HSGUIController.h */, @@ -481,10 +487,6 @@ children = ( CE275C5B14BF71FE00265960 /* PyColumns.h */, CE76FDCD111EE38E006618EA /* PyGUI.h */, - CED569C614BF312900C6AC25 /* PyGUI2.h */, - CE76FDCE111EE38E006618EA /* PyOutline.h */, - CE275C4A14BF6C3700265960 /* PyOutline2.h */, - CE548CBB14BF8FFE00D180CB /* PySelectableList2.h */, CE8C53B61173248F0011B41F /* PyTable.h */, ); name = proxies; @@ -691,7 +693,6 @@ CE76FDC6111EE37C006618EA /* NSTableViewAdditions.m in Sources */, CE76FDCF111EE38E006618EA /* HSGUIController.m in Sources */, CE76FDD4111EE3A7006618EA /* DirectoryOutline.m in Sources */, - CE76FDDF111EE42F006618EA /* HSOutline.m in Sources */, CE76FDF7111EE561006618EA /* NSEventAdditions.m in Sources */, CEBE4D74111F0EE1009AAC6D /* HSWindowController.m in Sources */, CE91F216113BC22D0010360B /* StatsLabel.m in Sources */, @@ -719,6 +720,9 @@ CE548CC114BF902000D180CB /* HSSelectableList2.m in Sources */, CE548CC614BF903D00D180CB /* PyPrioritizeDialog.m in Sources */, CE548CC714BF903D00D180CB /* PyPrioritizeList.m in Sources */, + CE587E9A14C07BCF004CA031 /* PyOutline2.m in Sources */, + CE587E9E14C0801F004CA031 /* PySelectableList2.m in Sources */, + CE9FC22D14C080CF005C31FD /* PyGUIObject2.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };