Revision: 2935
http://skim-app.svn.sourceforge.net/skim-app/?rev=2935&view=rev
Author: hofman
Date: 2007-09-18 01:54:17 -0700 (Tue, 18 Sep 2007)
Log Message:
-----------
Use table column identifiers instead of column index.
Modified Paths:
--------------
trunk/Dutch.lproj/MainWindow.nib/info.nib
trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib
trunk/English.lproj/MainWindow.nib/info.nib
trunk/English.lproj/MainWindow.nib/keyedobjects.nib
trunk/French.lproj/MainWindow.nib/info.nib
trunk/French.lproj/MainWindow.nib/keyedobjects.nib
trunk/Italian.lproj/MainWindow.nib/info.nib
trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib
trunk/SKMainWindowController.m
Modified: trunk/Dutch.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-09-17 21:14:13 UTC (rev
2934)
+++ trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-09-18 08:54:17 UTC (rev
2935)
@@ -29,6 +29,12 @@
<array>
<integer>208</integer>
</array>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>256</integer>
+ <integer>502</integer>
+ <integer>314</integer>
+ </array>
<key>IBSystem Version</key>
<string>8R218</string>
</dict>
Modified: trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/English.lproj/MainWindow.nib/info.nib 2007-09-17 21:14:13 UTC (rev
2934)
+++ trunk/English.lproj/MainWindow.nib/info.nib 2007-09-18 08:54:17 UTC (rev
2935)
@@ -31,20 +31,20 @@
</array>
<key>IBOpenObjects</key>
<array>
+ <integer>256</integer>
+ <integer>553</integer>
+ <integer>224</integer>
+ <integer>314</integer>
+ <integer>168</integer>
+ <integer>539</integer>
+ <integer>502</integer>
+ <integer>5</integer>
+ <integer>585</integer>
<integer>687</integer>
+ <integer>208</integer>
+ <integer>694</integer>
<integer>511</integer>
- <integer>585</integer>
<integer>633</integer>
- <integer>694</integer>
- <integer>208</integer>
- <integer>168</integer>
- <integer>314</integer>
- <integer>224</integer>
- <integer>539</integer>
- <integer>256</integer>
- <integer>5</integer>
- <integer>502</integer>
- <integer>553</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/English.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/French.lproj/MainWindow.nib/info.nib 2007-09-17 21:14:13 UTC (rev
2934)
+++ trunk/French.lproj/MainWindow.nib/info.nib 2007-09-18 08:54:17 UTC (rev
2935)
@@ -11,11 +11,11 @@
<key>224</key>
<string>690 581 220 442 0 0 1600 1178 </string>
<key>256</key>
- <string>690 581 220 442 0 0 1600 1178 </string>
+ <string>610 420 220 442 0 0 1440 938 </string>
<key>314</key>
- <string>690 581 220 442 0 0 1600 1178 </string>
+ <string>610 420 220 442 0 0 1440 938 </string>
<key>502</key>
- <string>690 581 220 442 0 0 1600 1178 </string>
+ <string>610 420 220 442 0 0 1440 938 </string>
<key>511</key>
<string>690 581 220 442 0 0 1600 1178 </string>
<key>687</key>
@@ -29,6 +29,12 @@
<array>
<integer>208</integer>
</array>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>314</integer>
+ <integer>502</integer>
+ <integer>256</integer>
+ </array>
<key>IBSystem Version</key>
<string>8R218</string>
</dict>
Modified: trunk/French.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Italian.lproj/MainWindow.nib/info.nib 2007-09-17 21:14:13 UTC (rev
2934)
+++ trunk/Italian.lproj/MainWindow.nib/info.nib 2007-09-18 08:54:17 UTC (rev
2935)
@@ -31,18 +31,18 @@
</array>
<key>IBOpenObjects</key>
<array>
+ <integer>224</integer>
+ <integer>511</integer>
+ <integer>314</integer>
<integer>677</integer>
- <integer>676</integer>
+ <integer>5</integer>
<integer>539</integer>
- <integer>511</integer>
<integer>553</integer>
+ <integer>256</integer>
<integer>208</integer>
- <integer>224</integer>
- <integer>314</integer>
- <integer>5</integer>
<integer>502</integer>
+ <integer>676</integer>
<integer>628</integer>
- <integer>256</integer>
<integer>168</integer>
</array>
<key>IBSystem Version</key>
Modified: trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-09-17 21:14:13 UTC (rev 2934)
+++ trunk/SKMainWindowController.m 2007-09-18 08:54:17 UTC (rev 2935)
@@ -734,7 +734,7 @@
- (void)updatePageLabelsAndOutline {
PDFDocument *pdfDoc = [pdfView document];
- NSTableColumn *tableColumn = [[thumbnailTableView tableColumns]
objectAtIndex:1];
+ NSTableColumn *tableColumn = [thumbnailTableView
tableColumnWithIdentifier:@"page"];
id cell = [tableColumn dataCell];
float labelWidth = 0.0;
int i, count = [pdfDoc pageCount];
@@ -757,11 +757,11 @@
[tableColumn setMinWidth:labelWidth];
[tableColumn setMaxWidth:labelWidth];
[thumbnailTableView sizeToFit];
- tableColumn = [[outlineView tableColumns] objectAtIndex:1];
+ tableColumn = [outlineView tableColumnWithIdentifier:@"page"];
[tableColumn setMinWidth:labelWidth];
[tableColumn setMaxWidth:labelWidth];
[outlineView sizeToFit];
- tableColumn = [[snapshotTableView tableColumns] objectAtIndex:1];
+ tableColumn = [snapshotTableView tableColumnWithIdentifier:@"page"];
[tableColumn setMinWidth:labelWidth];
[tableColumn setMaxWidth:labelWidth];
[snapshotTableView sizeToFit];
@@ -2346,7 +2346,7 @@
- (void)documentDidBeginDocumentFind:(NSNotification *)note {
if (findPanelFind == NO) {
[findArrayController removeObjects:searchResults];
- [[[[findTableView tableColumns] objectAtIndex:1] headerCell]
setStringValue:[NSLocalizedString(@"Searching", @"Message in search table
header") stringByAppendingEllipsis]];
+ [[[findTableView tableColumnWithIdentifier:@"results"] headerCell]
setStringValue:[NSLocalizedString(@"Searching", @"Message in search table
header") stringByAppendingEllipsis]];
[[findTableView headerView] setNeedsDisplay:YES];
[statusBar setProgressIndicatorStyle:SKProgressIndicatorBarStyle];
[[statusBar progressIndicator] setMaxValue:[[note object] pageCount]];
@@ -2359,7 +2359,7 @@
if (findPanelFind == NO) {
[self willChangeValueForKey:@"searchResults"];
[self didChangeValueForKey:@"searchResults"];
- [[[[findTableView tableColumns] objectAtIndex:1] headerCell]
setStringValue:[NSString stringWithFormat:NSLocalizedString(@"%i Results",
@"Message in search table header"), [searchResults count]]];
+ [[[findTableView tableColumnWithIdentifier:@"results"] headerCell]
setStringValue:[NSString stringWithFormat:NSLocalizedString(@"%i Results",
@"Message in search table header"), [searchResults count]]];
[[findTableView headerView] setNeedsDisplay:YES];
[statusBar stopAnimation:self];
[statusBar setProgressIndicatorStyle:SKProgressIndicatorNone];
@@ -3114,7 +3114,7 @@
NSString *tcID = [tableColumn identifier];
if([tcID isEqualToString:@"label"]){
return [(PDFOutline *)item label];
- }else if([tcID isEqualToString:@"icon"]){
+ }else if([tcID isEqualToString:@"page"]){
return [[[(PDFOutline *)item destination] page] label];
}else{
[NSException raise:@"Unexpected tablecolumn identifier" format:@"
- %@ ", tcID];
@@ -3507,7 +3507,7 @@
- (float)tableView:(NSTableView *)tv heightOfRow:(int)row {
if ([tv isEqual:thumbnailTableView]) {
NSSize thumbSize = [[[thumbnails objectAtIndex:row] image] size];
- NSSize cellSize = NSMakeSize([[[tv tableColumns] objectAtIndex:0]
width],
+ NSSize cellSize = NSMakeSize([[tv tableColumnWithIdentifier:@"image"]
width],
fminf(thumbSize.height,
roundedThumbnailSize));
if (thumbSize.height < 1.0)
return 1.0;
@@ -3517,7 +3517,7 @@
return fmaxf(1.0, fminf(cellSize.width, thumbSize.width) *
thumbSize.height / thumbSize.width);
} else if ([tv isEqual:snapshotTableView]) {
NSSize thumbSize = [[[[snapshotArrayController arrangedObjects]
objectAtIndex:row] thumbnail] size];
- NSSize cellSize = NSMakeSize([[[tv tableColumns] objectAtIndex:0]
width],
+ NSSize cellSize = NSMakeSize([[tv tableColumnWithIdentifier:@"image"]
width],
fminf(thumbSize.height,
roundedSnapshotThumbnailSize));
if (thumbSize.height < 1.0)
return 1.0;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
