diff --git a/cocoa/base/ProblemDialog.h b/cocoa/base/ProblemDialog.h index dd28bc47..c558dbeb 100644 --- a/cocoa/base/ProblemDialog.h +++ b/cocoa/base/ProblemDialog.h @@ -21,5 +21,6 @@ http://www.hardcoded.net/licenses/bsd_license - (id)initWithPy:(PyApp *)aPy; - (PyProblemDialog *)py; +- (void)initializeColumns; - (IBAction)revealSelected:(id)sender; @end \ No newline at end of file diff --git a/cocoa/base/ProblemDialog.m b/cocoa/base/ProblemDialog.m index 05097146..e66c30d9 100644 --- a/cocoa/base/ProblemDialog.m +++ b/cocoa/base/ProblemDialog.m @@ -15,6 +15,7 @@ http://www.hardcoded.net/licenses/bsd_license self = [super initWithNibName:@"ProblemDialog" pyClassName:@"PyProblemDialog" pyParent:aPy]; [self window]; //So the detailsTable is initialized. problemTable = [[HSTable alloc] initWithPyClassName:@"PyProblemTable" pyParent:[self py] view:problemTableView]; + [self initializeColumns]; [self connect]; [problemTable connect]; return self; @@ -33,6 +34,16 @@ http://www.hardcoded.net/licenses/bsd_license return (PyProblemDialog *)py; } +- (void)initializeColumns +{ + HSColumnDef defs[] = { + {@"path", 202, 40, 0, NO, nil}, + {@"msg", 228, 40, 0, NO, nil}, + nil + }; + [[problemTable columns] initializeColumns:defs]; +} + - (IBAction)revealSelected:(id)sender { [[self py] revealSelected]; diff --git a/cocoa/base/ResultTable.h b/cocoa/base/ResultTable.h index c7c0a6d9..9106dd00 100644 --- a/cocoa/base/ResultTable.h +++ b/cocoa/base/ResultTable.h @@ -9,17 +9,14 @@ http://www.hardcoded.net/licenses/bsd_license #import #import #import "HSTable.h" -#import "HSColumns.h" #import "PyResultTable.h" @interface ResultTable : HSTable { NSSet *_deltaColumns; - HSColumns *columns; } - (id)initWithPy:(id)aPy view:(NSTableView *)aTableView; - (PyResultTable *)py; -- (HSColumns *)columns; - (BOOL)powerMarkerMode; - (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode; - (BOOL)deltaValuesMode; diff --git a/cocoa/base/ResultTable.m b/cocoa/base/ResultTable.m index 15c63e55..9bee8d13 100644 --- a/cocoa/base/ResultTable.m +++ b/cocoa/base/ResultTable.m @@ -21,7 +21,6 @@ http://www.hardcoded.net/licenses/bsd_license - (id)initWithPy:(id)aPy view:(NSTableView *)aTableView { self = [super initWithPy:aPy view:aTableView]; - columns = [[HSColumns alloc] initWithPy:[[self py] columns] tableView:aTableView]; _deltaColumns = [[NSSet setWithArray:[[self py] deltaColumns]] retain]; [self connect]; return self; @@ -30,7 +29,6 @@ http://www.hardcoded.net/licenses/bsd_license - (void)dealloc { [self disconnect]; - [columns release]; [_deltaColumns release]; [super dealloc]; } @@ -61,11 +59,6 @@ http://www.hardcoded.net/licenses/bsd_license } /* Public */ -- (HSColumns *)columns -{ - return columns; -} - - (BOOL)powerMarkerMode { return [[self py] powerMarkerMode]; diff --git a/cocoa/base/cs.lproj/ProblemDialog.strings b/cocoa/base/cs.lproj/ProblemDialog.strings index 1a50ce64..70d784bc 100755 --- a/cocoa/base/cs.lproj/ProblemDialog.strings +++ b/cocoa/base/cs.lproj/ProblemDialog.strings @@ -5,12 +5,6 @@ /* Class = "NSTextFieldCell"; title = "There were problems processing some (or all) of the files. The cause of these problems are described in the table below. Those files were not removed from your results."; ObjectID = "4"; */ "4.title" = "Při zpracování některých (nebo všech) souborů se vyskytly problémy. Jejich příčina je popsána v tabulce dole. Dotčené soubory nebyli odstraněny z výsledků."; -/* Class = "NSTableColumn"; headerCell.title = "File Path"; ObjectID = "10"; */ -"10.headerCell.title" = "Cesta k souboru"; - -/* Class = "NSTableColumn"; headerCell.title = "Error Message"; ObjectID = "11"; */ -"11.headerCell.title" = "Chybové hlášení"; - /* Class = "NSButtonCell"; title = "Close"; ObjectID = "19"; */ "19.title" = "Zavřít"; diff --git a/cocoa/base/de.lproj/ProblemDialog.strings b/cocoa/base/de.lproj/ProblemDialog.strings index 8ef48688..3f762f65 100644 --- a/cocoa/base/de.lproj/ProblemDialog.strings +++ b/cocoa/base/de.lproj/ProblemDialog.strings @@ -5,12 +5,6 @@ /* Class = "NSTextFieldCell"; title = "There were problems processing some (or all) of the files. The cause of these problems are described in the table below. Those files were not removed from your results."; ObjectID = "4"; */ "4.title" = "Es gab Probleme bei der Verarbeitung einiger (aller) Dateien. Der Grund der Probleme ist unten in der Tabelle beschrieben."; -/* Class = "NSTableColumn"; headerCell.title = "File Path"; ObjectID = "10"; */ -"10.headerCell.title" = "Dateipfad"; - -/* Class = "NSTableColumn"; headerCell.title = "Error Message"; ObjectID = "11"; */ -"11.headerCell.title" = "Fehlermeldung"; - /* Class = "NSButtonCell"; title = "Close"; ObjectID = "19"; */ "19.title" = "Schließen"; diff --git a/cocoa/base/en.lproj/ProblemDialog.strings b/cocoa/base/en.lproj/ProblemDialog.strings index 4ea83266..56d9173c 100644 --- a/cocoa/base/en.lproj/ProblemDialog.strings +++ b/cocoa/base/en.lproj/ProblemDialog.strings @@ -5,12 +5,6 @@ /* Class = "NSTextFieldCell"; title = "There were problems processing some (or all) of the files. The cause of these problems are described in the table below. Those files were not removed from your results."; ObjectID = "4"; */ "4.title" = "There were problems processing some (or all) of the files. The cause of these problems are described in the table below. Those files were not removed from your results."; -/* Class = "NSTableColumn"; headerCell.title = "File Path"; ObjectID = "10"; */ -"10.headerCell.title" = "File Path"; - -/* Class = "NSTableColumn"; headerCell.title = "Error Message"; ObjectID = "11"; */ -"11.headerCell.title" = "Error Message"; - /* Class = "NSButtonCell"; title = "Close"; ObjectID = "19"; */ "19.title" = "Close"; diff --git a/cocoa/base/en.lproj/ProblemDialog.xib b/cocoa/base/en.lproj/ProblemDialog.xib index 5a3d5ac4..ec0266c5 100644 --- a/cocoa/base/en.lproj/ProblemDialog.xib +++ b/cocoa/base/en.lproj/ProblemDialog.xib @@ -2,32 +2,34 @@ 1060 - 11B26 - 1617 - 1138 - 566.00 + 11C74 + 1938 + 1138.23 + 567.00 com.apple.InterfaceBuilder.CocoaPlugin - 1617 + 1938 - NSScroller - NSTableHeaderView - NSButton - NSScrollView - NSTextFieldCell - NSButtonCell - NSTableView - NSCustomObject + NSTextField NSView NSWindowTemplate - NSTextField - NSTableColumn + NSScrollView + NSCustomObject + NSTableView + NSTableHeaderView + NSButtonCell + NSButton + NSScroller + NSTextFieldCell com.apple.InterfaceBuilder.CocoaPlugin - + + PluginDependencyRecalculationVersion + + ProblemDialog @@ -77,11 +79,11 @@ MC42NjY2NjY2NjY3AA - + 6 System controlTextColor - + 3 MAA @@ -118,81 +120,7 @@ - - - path - 202 - 40 - 1000 - - 75628096 - 2048 - File Path - - LucidaGrande - 11 - 3100 - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - - - - 337772096 - 2048 - Text Cell - - LucidaGrande - 11 - 16 - - - - 6 - System - controlBackgroundColor - - - - - 3 - YES - - - - msg - 228 - 40 - 1000 - - 75628096 - 2048 - Error Message - - - - - - 337772096 - 2048 - Text Cell - - - - - - 3 - YES - - - + 3 2 @@ -225,7 +153,12 @@ - + + 6 + System + controlBackgroundColor + + 4 @@ -352,14 +285,6 @@ 24 - - - performClose: - - - - 25 - problemTableView @@ -368,6 +293,14 @@ 26 + + + performClose: + + + + 25 + @@ -451,10 +384,7 @@ 8 - - - - + @@ -462,32 +392,6 @@ - - 10 - - - - - - - - 11 - - - - - - - - 12 - - - - - 13 - - - 18 @@ -523,10 +427,6 @@ com.apple.InterfaceBuilder.CocoaPlugin {{477, 306}, {480, 309}} - 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 @@ -596,7 +496,7 @@ com.apple.InterfaceBuilder.CocoaPlugin.macosx - + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 diff --git a/cocoa/base/fr.lproj/ProblemDialog.strings b/cocoa/base/fr.lproj/ProblemDialog.strings index f394aca7..5dd60825 100644 --- a/cocoa/base/fr.lproj/ProblemDialog.strings +++ b/cocoa/base/fr.lproj/ProblemDialog.strings @@ -5,12 +5,6 @@ /* Class = "NSTextFieldCell"; title = "There were problems processing some (or all) of the files. The cause of these problems are described in the table below. Those files were not removed from your results."; ObjectID = "4"; */ "4.title" = "Des problèmes ont été rencontrés lors du traitement de certains fichiers. La nature de ces problèmes est décrite dans la liste ci-dessous. Ces fichiers n'ont pas été retirés des résultats."; -/* Class = "NSTableColumn"; headerCell.title = "File Path"; ObjectID = "10"; */ -"10.headerCell.title" = "Chemin du fichier"; - -/* Class = "NSTableColumn"; headerCell.title = "Error Message"; ObjectID = "11"; */ -"11.headerCell.title" = "Message d'erreur"; - /* Class = "NSButtonCell"; title = "Close"; ObjectID = "19"; */ "19.title" = "Fermer"; diff --git a/cocoa/base/it.lproj/ProblemDialog.strings b/cocoa/base/it.lproj/ProblemDialog.strings index 05a4c430..8f9c1ff4 100644 --- a/cocoa/base/it.lproj/ProblemDialog.strings +++ b/cocoa/base/it.lproj/ProblemDialog.strings @@ -5,12 +5,6 @@ /* Class = "NSTextFieldCell"; title = "There were problems processing some (or all) of the files. The cause of these problems are described in the table below. Those files were not removed from your results."; ObjectID = "4"; */ "4.title" = "Sono stati riscontrati dei problemi elaborando alcuni (o tutti) i file. La causa di questi problemi è descritta nella tabella sottostante. Questi file non stati rimossi dai vostri risultati."; -/* Class = "NSTableColumn"; headerCell.title = "File Path"; ObjectID = "10"; */ -"10.headerCell.title" = "Percorso del file"; - -/* Class = "NSTableColumn"; headerCell.title = "Error Message"; ObjectID = "11"; */ -"11.headerCell.title" = "Messaggio di errore"; - /* Class = "NSButtonCell"; title = "Close"; ObjectID = "19"; */ "19.title" = "Chiudi"; diff --git a/cocoa/base/zh_CN.lproj/ProblemDialog.strings b/cocoa/base/zh_CN.lproj/ProblemDialog.strings index a9b246a5..b09eec5c 100644 --- a/cocoa/base/zh_CN.lproj/ProblemDialog.strings +++ b/cocoa/base/zh_CN.lproj/ProblemDialog.strings @@ -5,12 +5,6 @@ /* Class = "NSTextFieldCell"; title = "There were problems processing some (or all) of the files. The cause of these problems are described in the table below. Those files were not removed from your results."; ObjectID = "4"; */ "4.title" = "在处理部分或全部文件时发现问题。产生问题的原因在下表中进行描述。这些文件将不会从结果中移除。"; -/* Class = "NSTableColumn"; headerCell.title = "File Path"; ObjectID = "10"; */ -"10.headerCell.title" = "文件路径"; - -/* Class = "NSTableColumn"; headerCell.title = "Error Message"; ObjectID = "11"; */ -"11.headerCell.title" = "错误信息"; - /* Class = "NSButtonCell"; title = "Close"; ObjectID = "19"; */ "19.title" = "关闭";