Revision: 3347
http://skim-app.svn.sourceforge.net/skim-app/?rev=3347&view=rev
Author: hofman
Date: 2008-01-07 11:19:53 -0800 (Mon, 07 Jan 2008)
Log Message:
-----------
Swap in PDFView after initial load of the PDF. Hopefully this fixes setup and
load problems on Leopard.
Modified Paths:
--------------
trunk/English.lproj/MainWindow.nib/info.nib
trunk/English.lproj/MainWindow.nib/keyedobjects.nib
trunk/SKMainWindowController.m
Modified: trunk/English.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/English.lproj/MainWindow.nib/info.nib 2008-01-06 22:52:25 UTC (rev
3346)
+++ trunk/English.lproj/MainWindow.nib/info.nib 2008-01-07 19:19:53 UTC (rev
3347)
@@ -26,6 +26,8 @@
<string>610 420 220 442 0 0 1440 938 </string>
<key>830</key>
<string>662 590 115 102 0 0 1440 938 </string>
+ <key>855</key>
+ <string>642 484 188 210 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
<string>489.0</string>
@@ -33,17 +35,18 @@
<array/>
<key>IBOpenObjects</key>
<array>
- <integer>796</integer>
+ <integer>314</integer>
<integer>830</integer>
- <integer>511</integer>
- <integer>256</integer>
<integer>168</integer>
- <integer>314</integer>
- <integer>5</integer>
+ <integer>855</integer>
+ <integer>796</integer>
<integer>224</integer>
+ <integer>687</integer>
+ <integer>511</integer>
<integer>694</integer>
- <integer>687</integer>
<integer>502</integer>
+ <integer>5</integer>
+ <integer>256</integer>
</array>
<key>IBSystem Version</key>
<string>8S165</string>
Modified: trunk/English.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2008-01-06 22:52:25 UTC (rev 3346)
+++ trunk/SKMainWindowController.m 2008-01-07 19:19:53 UTC (rev 3347)
@@ -406,8 +406,6 @@
[[self window] setFrame:[[NSScreen mainScreen] visibleFrame]
display:NO];
}
- [[self window] makeFirstResponder:[pdfView documentView]];
-
// Set up the PDF
[self applyPDFSettings:hasWindowSetup ? savedNormalSetup : [sud
dictionaryForKey:SKDefaultPDFDisplaySettingsKey]];
@@ -477,9 +475,14 @@
// windowControllerDidLoadNib: is not called automatically because the
document overrides makeWindowControllers
[[self document] windowControllerDidLoadNib:self];
+ [pdfView setFrame:[[pdfEdgeView contentView] bounds]];
+ [pdfEdgeView addSubview:pdfView];
+
// this is mainly needed when the pdf auto-scales
- [pdfView layoutDocumentView];
+ //[pdfView layoutDocumentView];
+ [[self window] makeFirstResponder:[pdfView documentView]];
+
// Show/hide left side pane if necessary
if ([sud boolForKey:SKOpenContentsPaneOnlyForTOCKey] && [self
leftSidePaneIsOpen] == (pdfOutline == nil))
[self toggleLeftSidePane:self];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
