Revision: 2727
http://skim-app.svn.sourceforge.net/skim-app/?rev=2727&view=rev
Author: hofman
Date: 2007-08-27 07:11:14 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
Adjust size of page columns so they page numbers exactly fit.
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
trunk/SKThumbnailTableView.m
Modified: trunk/Dutch.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-08-27 12:57:56 UTC (rev
2726)
+++ trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-08-27 14:11:14 UTC (rev
2727)
@@ -29,6 +29,12 @@
<array>
<integer>208</integer>
</array>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>314</integer>
+ <integer>502</integer>
+ <integer>224</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-08-27 12:57:56 UTC (rev
2726)
+++ trunk/English.lproj/MainWindow.nib/info.nib 2007-08-27 14:11:14 UTC (rev
2727)
@@ -32,19 +32,19 @@
<key>IBOpenObjects</key>
<array>
<integer>256</integer>
+ <integer>633</integer>
<integer>5</integer>
- <integer>208</integer>
+ <integer>224</integer>
+ <integer>553</integer>
<integer>694</integer>
- <integer>314</integer>
- <integer>585</integer>
+ <integer>687</integer>
<integer>502</integer>
- <integer>633</integer>
<integer>168</integer>
- <integer>224</integer>
- <integer>553</integer>
+ <integer>539</integer>
+ <integer>208</integer>
<integer>511</integer>
- <integer>687</integer>
- <integer>539</integer>
+ <integer>585</integer>
+ <integer>314</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-08-27 12:57:56 UTC (rev
2726)
+++ trunk/French.lproj/MainWindow.nib/info.nib 2007-08-27 14:11:14 UTC (rev
2727)
@@ -31,16 +31,16 @@
</array>
<key>IBOpenObjects</key>
<array>
- <integer>224</integer>
- <integer>661</integer>
<integer>511</integer>
- <integer>168</integer>
+ <integer>256</integer>
<integer>633</integer>
<integer>314</integer>
+ <integer>224</integer>
<integer>660</integer>
+ <integer>661</integer>
+ <integer>168</integer>
<integer>502</integer>
<integer>5</integer>
- <integer>256</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
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-08-27 12:57:56 UTC (rev
2726)
+++ trunk/Italian.lproj/MainWindow.nib/info.nib 2007-08-27 14:11:14 UTC (rev
2727)
@@ -31,19 +31,19 @@
</array>
<key>IBOpenObjects</key>
<array>
- <integer>539</integer>
- <integer>628</integer>
+ <integer>168</integer>
+ <integer>314</integer>
+ <integer>511</integer>
<integer>677</integer>
<integer>5</integer>
- <integer>676</integer>
+ <integer>539</integer>
<integer>502</integer>
<integer>553</integer>
+ <integer>628</integer>
+ <integer>256</integer>
+ <integer>224</integer>
<integer>208</integer>
- <integer>224</integer>
- <integer>314</integer>
- <integer>256</integer>
- <integer>511</integer>
- <integer>168</integer>
+ <integer>676</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-08-27 12:57:56 UTC (rev 2726)
+++ trunk/SKMainWindowController.m 2007-08-27 14:11:14 UTC (rev 2727)
@@ -793,14 +793,33 @@
[self resetThumbnails];
[self updateThumbnailSelection];
+ NSTableColumn *tableColumn = [[thumbnailTableView tableColumns]
objectAtIndex:1];
+ id cell = [tableColumn dataCell];
+ float labelWidth = 0.0;
+ int i, count = [document pageCount];
+
[self willChangeValueForKey:@"pageLabels"];
[pageLabels removeAllObjects];
- int i, count = [document pageCount];
for (i = 0; i < count; i++) {
NSString *label = [[document pageAtIndex:i] label];
[pageLabels addObject:label ? label : @""];
+ [cell setStringValue:label];
+ labelWidth = fmax(labelWidth, [cell cellSize].width);
}
[self didChangeValueForKey:@"pageLabels"];
+
+ [tableColumn setMinWidth:labelWidth];
+ [tableColumn setMaxWidth:labelWidth];
+ [thumbnailTableView sizeToFit];
+ tableColumn = [[outlineView tableColumns] objectAtIndex:1];
+ [tableColumn setMinWidth:labelWidth];
+ [tableColumn setMaxWidth:labelWidth];
+ [outlineView sizeToFit];
+ tableColumn = [[snapshotTableView tableColumns] objectAtIndex:1];
+ [tableColumn setMinWidth:labelWidth];
+ [tableColumn setMaxWidth:labelWidth];
+ [snapshotTableView sizeToFit];
+
[[thumbnailTableView typeSelectHelper] rebuildTypeSelectSearchCache];
NSEnumerator *setupEnum = [snapshotDicts objectEnumerator];
Modified: trunk/SKThumbnailTableView.m
===================================================================
--- trunk/SKThumbnailTableView.m 2007-08-27 12:57:56 UTC (rev 2726)
+++ trunk/SKThumbnailTableView.m 2007-08-27 14:11:14 UTC (rev 2727)
@@ -175,6 +175,12 @@
return [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber
numberWithBool:hasWindow], @"hasWindow", [self stringValue], @"label", nil];
}
+- (NSSize)cellSize {
+ NSSize size = [super cellSize];
+ size.width = fmax(size.width, 12.0);
+ return size;
+}
+
- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
NSRect textRect, imageRect, ignored;
NSDivideRect(cellFrame, &textRect, &imageRect, 17.0, NSMinYEdge);
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: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
