Revision: 2971
http://skim-app.svn.sourceforge.net/skim-app/?rev=2971&view=rev
Author: hofman
Date: 2007-09-22 03:23:14 -0700 (Sat, 22 Sep 2007)
Log Message:
-----------
Create secondary PDFView lazily, no need to load it with the nib as it might
nit even be needed. And we cannot initialize it in the nib anyway, due to
PDFKit bugs.
Modified Paths:
--------------
trunk/Dutch.lproj/MainWindow.nib/classes.nib
trunk/Dutch.lproj/MainWindow.nib/info.nib
trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib
trunk/English.lproj/MainWindow.nib/classes.nib
trunk/English.lproj/MainWindow.nib/info.nib
trunk/English.lproj/MainWindow.nib/keyedobjects.nib
trunk/French.lproj/MainWindow.nib/classes.nib
trunk/French.lproj/MainWindow.nib/info.nib
trunk/French.lproj/MainWindow.nib/keyedobjects.nib
trunk/Italian.lproj/MainWindow.nib/classes.nib
trunk/Italian.lproj/MainWindow.nib/info.nib
trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
Modified: trunk/Dutch.lproj/MainWindow.nib/classes.nib
===================================================================
--- trunk/Dutch.lproj/MainWindow.nib/classes.nib 2007-09-22 09:38:58 UTC
(rev 2970)
+++ trunk/Dutch.lproj/MainWindow.nib/classes.nib 2007-09-22 10:23:14 UTC
(rev 2971)
@@ -144,8 +144,6 @@
rightSideView = NSView;
scaleField = NSTextField;
searchField = NSSearchField;
- secondaryPdfEdgeView = BDSKEdgeView;
- secondaryPdfView = SKSecondaryPDFView;
snapshotArrayController = NSArrayController;
snapshotTableView = SKSnapshotTableView;
snapshotView = NSView;
Modified: trunk/Dutch.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-09-22 09:38:58 UTC (rev
2970)
+++ trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-09-22 10:23:14 UTC (rev
2971)
@@ -22,8 +22,6 @@
<string>610 420 220 442 0 0 1440 938 </string>
<key>694</key>
<string>610 420 220 442 0 0 1440 938 </string>
- <key>760</key>
- <string>560 470 320 342 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
Modified: trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/MainWindow.nib/classes.nib
===================================================================
--- trunk/English.lproj/MainWindow.nib/classes.nib 2007-09-22 09:38:58 UTC
(rev 2970)
+++ trunk/English.lproj/MainWindow.nib/classes.nib 2007-09-22 10:23:14 UTC
(rev 2971)
@@ -144,8 +144,6 @@
rightSideView = NSView;
scaleField = NSTextField;
searchField = NSSearchField;
- secondaryPdfEdgeView = BDSKEdgeView;
- secondaryPdfView = SKSecondaryPDFView;
snapshotArrayController = NSArrayController;
snapshotTableView = SKSnapshotTableView;
snapshotView = NSView;
Modified: trunk/English.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/English.lproj/MainWindow.nib/info.nib 2007-09-22 09:38:58 UTC (rev
2970)
+++ trunk/English.lproj/MainWindow.nib/info.nib 2007-09-22 10:23:14 UTC (rev
2971)
@@ -22,8 +22,6 @@
<string>610 420 220 442 0 0 1440 938 </string>
<key>694</key>
<string>610 420 220 442 0 0 1440 938 </string>
- <key>760</key>
- <string>560 470 320 342 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
@@ -31,16 +29,15 @@
<array/>
<key>IBOpenObjects</key>
<array>
+ <integer>694</integer>
<integer>168</integer>
- <integer>314</integer>
- <integer>502</integer>
- <integer>5</integer>
- <integer>687</integer>
<integer>224</integer>
- <integer>760</integer>
+ <integer>5</integer>
<integer>256</integer>
+ <integer>687</integer>
<integer>511</integer>
- <integer>694</integer>
+ <integer>502</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/classes.nib
===================================================================
--- trunk/French.lproj/MainWindow.nib/classes.nib 2007-09-22 09:38:58 UTC
(rev 2970)
+++ trunk/French.lproj/MainWindow.nib/classes.nib 2007-09-22 10:23:14 UTC
(rev 2971)
@@ -144,8 +144,6 @@
rightSideView = NSView;
scaleField = NSTextField;
searchField = NSSearchField;
- secondaryPdfEdgeView = BDSKEdgeView;
- secondaryPdfView = SKSecondaryPDFView;
snapshotArrayController = NSArrayController;
snapshotTableView = SKSnapshotTableView;
snapshotView = NSView;
Modified: trunk/French.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/French.lproj/MainWindow.nib/info.nib 2007-09-22 09:38:58 UTC (rev
2970)
+++ trunk/French.lproj/MainWindow.nib/info.nib 2007-09-22 10:23:14 UTC (rev
2971)
@@ -22,8 +22,6 @@
<string>690 581 220 442 0 0 1600 1178 </string>
<key>694</key>
<string>690 581 220 442 0 0 1600 1178 </string>
- <key>760</key>
- <string>560 470 320 342 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
@@ -31,10 +29,9 @@
<array/>
<key>IBOpenObjects</key>
<array>
+ <integer>502</integer>
<integer>256</integer>
<integer>5</integer>
- <integer>760</integer>
- <integer>502</integer>
<integer>314</integer>
</array>
<key>IBSystem Version</key>
Modified: trunk/French.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/MainWindow.nib/classes.nib
===================================================================
--- trunk/Italian.lproj/MainWindow.nib/classes.nib 2007-09-22 09:38:58 UTC
(rev 2970)
+++ trunk/Italian.lproj/MainWindow.nib/classes.nib 2007-09-22 10:23:14 UTC
(rev 2971)
@@ -144,8 +144,6 @@
rightSideView = NSView;
scaleField = NSTextField;
searchField = NSSearchField;
- secondaryPdfEdgeView = BDSKEdgeView;
- secondaryPdfView = SKSecondaryPDFView;
snapshotArrayController = NSArrayController;
snapshotTableView = SKSnapshotTableView;
snapshotView = NSView;
Modified: trunk/Italian.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Italian.lproj/MainWindow.nib/info.nib 2007-09-22 09:38:58 UTC (rev
2970)
+++ trunk/Italian.lproj/MainWindow.nib/info.nib 2007-09-22 10:23:14 UTC (rev
2971)
@@ -22,8 +22,6 @@
<string>610 420 220 442 0 0 1440 938 </string>
<key>677</key>
<string>610 420 220 442 0 0 1440 938 </string>
- <key>743</key>
- <string>560 470 320 342 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
@@ -33,13 +31,12 @@
<array>
<integer>256</integer>
<integer>168</integer>
- <integer>743</integer>
- <integer>677</integer>
- <integer>511</integer>
- <integer>502</integer>
+ <integer>224</integer>
<integer>314</integer>
<integer>5</integer>
- <integer>224</integer>
+ <integer>511</integer>
+ <integer>677</integer>
+ <integer>502</integer>
<integer>676</integer>
</array>
<key>IBSystem Version</key>
Modified: trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2007-09-22 09:38:58 UTC (rev 2970)
+++ trunk/SKMainWindowController.h 2007-09-22 10:23:14 UTC (rev 2971)
@@ -73,9 +73,10 @@
IBOutlet SKSplitView *pdfSplitView;
IBOutlet BDSKEdgeView *pdfEdgeView;
IBOutlet SKPDFView *pdfView;
- IBOutlet BDSKEdgeView *secondaryPdfEdgeView;
- IBOutlet SKSecondaryPDFView *secondaryPdfView;
+ BDSKEdgeView *secondaryPdfEdgeView;
+ SKSecondaryPDFView *secondaryPdfView;
+
IBOutlet NSView *leftSideContentView;
IBOutlet NSView *leftSideView;
IBOutlet BDSKEdgeView *leftSideEdgeView;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-09-22 09:38:58 UTC (rev 2970)
+++ trunk/SKMainWindowController.m 2007-09-22 10:23:14 UTC (rev 2971)
@@ -251,6 +251,7 @@
[scaleSheetController release];
[passwordSheetController release];
[bookmarkSheetController release];
+ [secondaryPdfEdgeView release];
[super dealloc];
}
@@ -269,8 +270,6 @@
[rightSideCollapsibleView setMinSize:NSMakeSize(111.0,
NSHeight([rightSideCollapsibleView frame]))];
[pdfEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask |
BDSKMinYEdgeMask];
- [secondaryPdfEdgeView setEdges:BDSKEveryEdgeMask];
- [secondaryPdfEdgeView setColor:[NSColor lightGrayColor]
forEdge:NSMaxYEdge];
[leftSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
[rightSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
@@ -298,7 +297,6 @@
[rightSideContentView addSubview:rightSideView];
[pdfView setFrame:[[pdfEdgeView contentView] bounds]];
- [secondaryPdfView setFrame:[[secondaryPdfEdgeView contentView] bounds]];
if (usesDrawers) {
leftSideDrawer = [[NSDrawer alloc]
initWithContentSize:[leftSideContentView frame].size preferredEdge:NSMinXEdge];
@@ -350,7 +348,6 @@
[pdfView setShouldAntiAlias:[sud boolForKey:SKShouldAntiAliasKey]];
[pdfView setGreekingThreshold:[sud floatForKey:SKGreekingThresholdKey]];
[pdfView setBackgroundColor:[sud colorForKey:SKBackgroundColorKey]];
- [secondaryPdfView setBackgroundColor:[pdfView backgroundColor]];
if ([sud objectForKey:SKLeftSidePaneWidthKey]) {
float width = [sud floatForKey:SKLeftSidePaneWidthKey];
@@ -918,6 +915,8 @@
[pdfView setDocument:document];
[[pdfView document] setDelegate:self];
+ [secondaryPdfView setDocument:document];
+
[self registerForDocumentNotifications];
[self updatePageLabelsAndOutline];
@@ -1969,22 +1968,33 @@
} else {
- NSRect ignored, frame1, frame2;
+ NSRect frame1, frame2, tmpFrame = [pdfSplitView bounds];
- frame1 = [pdfSplitView bounds];
- NSDivideRect(frame1, &frame1, &frame2, roundf(0.7 * NSHeight(frame1)),
NSMaxYEdge);
- NSDivideRect(frame2, &ignored, &frame2, [pdfSplitView
dividerThickness], NSMaxYEdge);
+ NSDivideRect(tmpFrame, &frame1, &frame2, roundf(0.7 *
NSHeight(tmpFrame)), NSMaxYEdge);
+ NSDivideRect(frame2, &tmpFrame, &frame2, [pdfSplitView
dividerThickness], NSMaxYEdge);
[pdfEdgeView setFrame:frame1];
- [secondaryPdfEdgeView setFrame:frame2];
- [pdfSplitView addSubview:secondaryPdfEdgeView];
+ if (secondaryPdfView == nil) {
+ secondaryPdfEdgeView = [[BDSKEdgeView alloc] initWithFrame:frame2];
+ [secondaryPdfEdgeView setEdges:BDSKEveryEdgeMask];
+ [secondaryPdfEdgeView setColor:[NSColor lightGrayColor]
forEdge:NSMaxYEdge];
+ secondaryPdfView = [[SKSecondaryPDFView alloc]
initWithFrame:[[secondaryPdfEdgeView contentView] bounds]];
+ [secondaryPdfView setAutoresizingMask:NSViewWidthSizable |
NSViewHeightSizable];
+ [secondaryPdfEdgeView addSubview:secondaryPdfView];
+ [secondaryPdfView release];
+ [pdfSplitView addSubview:secondaryPdfEdgeView];
+ // Because of a PDFView bug, display properties can not be changed
before it is placed in a window
+ [secondaryPdfView setBackgroundColor:[pdfView backgroundColor]];
+ [secondaryPdfView setDisplaysPageBreaks:NO];
+ [secondaryPdfView setAutoScales:YES];
+ [secondaryPdfView setDocument:[pdfView document]];
+ } else {
+ [secondaryPdfEdgeView setFrame:frame2];
+ [pdfSplitView addSubview:secondaryPdfEdgeView];
+ }
- [secondaryPdfView setDocument:[pdfView document]];
- [secondaryPdfView setDisplaysPageBreaks:NO];
- [secondaryPdfView setAutoScales:YES];
[secondaryPdfView layoutDocumentView];
- [secondaryPdfView goToPage:[pdfView currentPage]];
[self performSelector:@selector(scrollSecondaryPdfView) withObject:nil
afterDelay:0.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
