Revision: 2957
http://skim-app.svn.sourceforge.net/skim-app/?rev=2957&view=rev
Author: hofman
Date: 2007-09-21 05:13:12 -0700 (Fri, 21 Sep 2007)
Log Message:
-----------
Use NSView instead of NSBox for content views inside splitView. Rename some
view outlets.
Modified Paths:
--------------
trunk/Dutch.lproj/MainWindow.nib/classes.nib
trunk/Dutch.lproj/MainWindow.nib/data.dependency
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-21 11:33:30 UTC
(rev 2956)
+++ trunk/Dutch.lproj/MainWindow.nib/classes.nib 2007-09-21 12:13:12 UTC
(rev 2957)
@@ -128,10 +128,10 @@
findView = NSView;
leftSideButton = NSSegmentedControl;
leftSideCollapsibleView = BDSKCollapsibleView;
- leftSideContentBox = NSBox;
leftSideContentView = NSView;
leftSideEdgeView = BDSKEdgeView;
leftSideGradientView = BDSKGradientView;
+ leftSideView = NSView;
markupPopUpButton = BDSKImagePopUpButton;
noteArrayController = NSArrayController;
noteButton = NSSegmentedControl;
@@ -146,18 +146,18 @@
pageNumberView = NSView;
passwordField = NSTextField;
passwordSheet = NSWindow;
- pdfContentBox = BDSKEdgeView;
+ pdfEdgeView = BDSKEdgeView;
pdfSplitView = SKSplitView;
pdfView = SKPDFView;
rightSideButton = NSSegmentedControl;
rightSideCollapsibleView = BDSKCollapsibleView;
- rightSideContentBox = NSBox;
rightSideContentView = NSView;
rightSideEdgeView = BDSKEdgeView;
rightSideGradientView = BDSKGradientView;
+ rightSideView = NSView;
scaleField = NSTextField;
searchField = NSSearchField;
- secondaryPdfContentBox = BDSKEdgeView;
+ secondaryPdfEdgeView = BDSKEdgeView;
secondaryPdfView = SKSecondaryPDFView;
snapshotArrayController = NSArrayController;
snapshotTableView = SKSnapshotTableView;
Modified: trunk/Dutch.lproj/MainWindow.nib/data.dependency
===================================================================
--- trunk/Dutch.lproj/MainWindow.nib/data.dependency 2007-09-21 11:33:30 UTC
(rev 2956)
+++ trunk/Dutch.lproj/MainWindow.nib/data.dependency 2007-09-21 12:13:12 UTC
(rev 2957)
@@ -4,7 +4,6 @@
<dict>
<key>IBPaletteDependency</key>
<array>
- <string>Controllers</string>
<string>PDFKit</string>
</array>
</dict>
Modified: trunk/Dutch.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-09-21 11:33:30 UTC (rev
2956)
+++ trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-09-21 12:13:12 UTC (rev
2957)
@@ -31,6 +31,10 @@
<array>
<integer>208</integer>
</array>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>5</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/classes.nib
===================================================================
--- trunk/English.lproj/MainWindow.nib/classes.nib 2007-09-21 11:33:30 UTC
(rev 2956)
+++ trunk/English.lproj/MainWindow.nib/classes.nib 2007-09-21 12:13:12 UTC
(rev 2957)
@@ -128,10 +128,10 @@
findView = NSView;
leftSideButton = NSSegmentedControl;
leftSideCollapsibleView = BDSKCollapsibleView;
- leftSideContentBox = NSBox;
leftSideContentView = NSView;
leftSideEdgeView = BDSKEdgeView;
leftSideGradientView = BDSKGradientView;
+ leftSideView = NSView;
markupPopUpButton = BDSKImagePopUpButton;
noteArrayController = NSArrayController;
noteButton = NSSegmentedControl;
@@ -146,18 +146,18 @@
pageNumberView = NSView;
passwordField = NSTextField;
passwordSheet = NSWindow;
- pdfContentBox = BDSKEdgeView;
+ pdfEdgeView = BDSKEdgeView;
pdfSplitView = SKSplitView;
pdfView = SKPDFView;
rightSideButton = NSSegmentedControl;
rightSideCollapsibleView = BDSKCollapsibleView;
- rightSideContentBox = NSBox;
rightSideContentView = NSView;
rightSideEdgeView = BDSKEdgeView;
rightSideGradientView = BDSKGradientView;
+ rightSideView = NSView;
scaleField = NSTextField;
searchField = NSSearchField;
- secondaryPdfContentBox = BDSKEdgeView;
+ secondaryPdfEdgeView = BDSKEdgeView;
secondaryPdfView = SKSecondaryPDFView;
snapshotArrayController = NSArrayController;
snapshotTableView = SKSnapshotTableView;
Modified: trunk/English.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/English.lproj/MainWindow.nib/info.nib 2007-09-21 11:33:30 UTC (rev
2956)
+++ trunk/English.lproj/MainWindow.nib/info.nib 2007-09-21 12:13:12 UTC (rev
2957)
@@ -33,21 +33,21 @@
</array>
<key>IBOpenObjects</key>
<array>
- <integer>5</integer>
+ <integer>539</integer>
<integer>760</integer>
+ <integer>553</integer>
<integer>208</integer>
- <integer>553</integer>
+ <integer>168</integer>
<integer>224</integer>
- <integer>687</integer>
<integer>694</integer>
- <integer>633</integer>
+ <integer>256</integer>
<integer>585</integer>
<integer>511</integer>
- <integer>168</integer>
+ <integer>687</integer>
<integer>502</integer>
<integer>314</integer>
- <integer>256</integer>
- <integer>539</integer>
+ <integer>633</integer>
+ <integer>5</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-21 11:33:30 UTC
(rev 2956)
+++ trunk/French.lproj/MainWindow.nib/classes.nib 2007-09-21 12:13:12 UTC
(rev 2957)
@@ -128,10 +128,10 @@
findView = NSView;
leftSideButton = NSSegmentedControl;
leftSideCollapsibleView = BDSKCollapsibleView;
- leftSideContentBox = NSBox;
leftSideContentView = NSView;
leftSideEdgeView = BDSKEdgeView;
leftSideGradientView = BDSKGradientView;
+ leftSideView = NSView;
markupPopUpButton = BDSKImagePopUpButton;
noteArrayController = NSArrayController;
noteButton = NSSegmentedControl;
@@ -146,18 +146,18 @@
pageNumberView = NSView;
passwordField = NSTextField;
passwordSheet = NSWindow;
- pdfContentBox = BDSKEdgeView;
+ pdfEdgeView = BDSKEdgeView;
pdfSplitView = SKSplitView;
pdfView = SKPDFView;
rightSideButton = NSSegmentedControl;
rightSideCollapsibleView = BDSKCollapsibleView;
- rightSideContentBox = NSBox;
rightSideContentView = NSView;
rightSideEdgeView = BDSKEdgeView;
rightSideGradientView = BDSKGradientView;
+ rightSideView = NSView;
scaleField = NSTextField;
searchField = NSSearchField;
- secondaryPdfContentBox = BDSKEdgeView;
+ secondaryPdfEdgeView = BDSKEdgeView;
secondaryPdfView = SKSecondaryPDFView;
snapshotArrayController = NSArrayController;
snapshotTableView = SKSnapshotTableView;
Modified: trunk/French.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/French.lproj/MainWindow.nib/info.nib 2007-09-21 11:33:30 UTC (rev
2956)
+++ trunk/French.lproj/MainWindow.nib/info.nib 2007-09-21 12:13:12 UTC (rev
2957)
@@ -34,10 +34,10 @@
<key>IBOpenObjects</key>
<array>
<integer>5</integer>
- <integer>760</integer>
+ <integer>502</integer>
<integer>256</integer>
<integer>314</integer>
- <integer>502</integer>
+ <integer>760</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/classes.nib
===================================================================
--- trunk/Italian.lproj/MainWindow.nib/classes.nib 2007-09-21 11:33:30 UTC
(rev 2956)
+++ trunk/Italian.lproj/MainWindow.nib/classes.nib 2007-09-21 12:13:12 UTC
(rev 2957)
@@ -128,10 +128,10 @@
findView = NSView;
leftSideButton = NSSegmentedControl;
leftSideCollapsibleView = BDSKCollapsibleView;
- leftSideContentBox = NSBox;
leftSideContentView = NSView;
leftSideEdgeView = BDSKEdgeView;
leftSideGradientView = BDSKGradientView;
+ leftSideView = NSView;
markupPopUpButton = BDSKImagePopUpButton;
noteArrayController = NSArrayController;
noteButton = NSSegmentedControl;
@@ -146,18 +146,18 @@
pageNumberView = NSView;
passwordField = NSTextField;
passwordSheet = NSWindow;
- pdfContentBox = BDSKEdgeView;
+ pdfEdgeView = BDSKEdgeView;
pdfSplitView = SKSplitView;
pdfView = SKPDFView;
rightSideButton = NSSegmentedControl;
rightSideCollapsibleView = BDSKCollapsibleView;
- rightSideContentBox = NSBox;
rightSideContentView = NSView;
rightSideEdgeView = BDSKEdgeView;
rightSideGradientView = BDSKGradientView;
+ rightSideView = NSView;
scaleField = NSTextField;
searchField = NSSearchField;
- secondaryPdfContentBox = BDSKEdgeView;
+ secondaryPdfEdgeView = BDSKEdgeView;
secondaryPdfView = SKSecondaryPDFView;
snapshotArrayController = NSArrayController;
snapshotTableView = SKSnapshotTableView;
Modified: trunk/Italian.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Italian.lproj/MainWindow.nib/info.nib 2007-09-21 11:33:30 UTC (rev
2956)
+++ trunk/Italian.lproj/MainWindow.nib/info.nib 2007-09-21 12:13:12 UTC (rev
2957)
@@ -23,7 +23,7 @@
<key>677</key>
<string>610 420 220 442 0 0 1440 938 </string>
<key>743</key>
- <string>642 352 320 342 0 0 1440 938 </string>
+ <string>560 470 320 342 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
@@ -33,20 +33,20 @@
</array>
<key>IBOpenObjects</key>
<array>
- <integer>314</integer>
+ <integer>511</integer>
<integer>539</integer>
- <integer>168</integer>
- <integer>677</integer>
- <integer>511</integer>
- <integer>676</integer>
+ <integer>628</integer>
<integer>743</integer>
+ <integer>224</integer>
+ <integer>256</integer>
+ <integer>5</integer>
<integer>553</integer>
- <integer>5</integer>
<integer>502</integer>
+ <integer>314</integer>
+ <integer>168</integer>
+ <integer>676</integer>
<integer>208</integer>
- <integer>256</integer>
- <integer>224</integer>
- <integer>628</integer>
+ <integer>677</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2007-09-21 11:33:30 UTC (rev 2956)
+++ trunk/SKMainWindowController.h 2007-09-21 12:13:12 UTC (rev 2957)
@@ -71,22 +71,22 @@
IBOutlet SKSplitView *splitView;
IBOutlet SKPDFView *pdfView;
- IBOutlet BDSKEdgeView *pdfContentBox;
+ IBOutlet BDSKEdgeView *pdfEdgeView;
IBOutlet SKSplitView *pdfSplitView;
IBOutlet SKSecondaryPDFView *secondaryPdfView;
- IBOutlet BDSKEdgeView *secondaryPdfContentBox;
+ IBOutlet BDSKEdgeView *secondaryPdfEdgeView;
- IBOutlet NSBox *leftSideContentBox;
IBOutlet NSView *leftSideContentView;
+ IBOutlet NSView *leftSideView;
IBOutlet BDSKEdgeView *leftSideEdgeView;
IBOutlet BDSKCollapsibleView *leftSideCollapsibleView;
IBOutlet BDSKGradientView *leftSideGradientView;
IBOutlet NSSegmentedControl *leftSideButton;
IBOutlet NSSearchField *searchField;
- IBOutlet NSBox *rightSideContentBox;
IBOutlet NSView *rightSideContentView;
+ IBOutlet NSView *rightSideView;
IBOutlet BDSKEdgeView *rightSideEdgeView;
IBOutlet BDSKCollapsibleView *rightSideCollapsibleView;
IBOutlet BDSKGradientView *rightSideGradientView;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-09-21 11:33:30 UTC (rev 2956)
+++ trunk/SKMainWindowController.m 2007-09-21 12:13:12 UTC (rev 2957)
@@ -262,8 +262,8 @@
[rightSideCollapsibleView setCollapseEdges:BDSKMaxXEdgeMask |
BDSKMinYEdgeMask];
[rightSideCollapsibleView setMinSize:NSMakeSize(111.0,
NSHeight([rightSideCollapsibleView frame]))];
- [pdfContentBox setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask |
BDSKMinYEdgeMask];
- [secondaryPdfContentBox setEdges:BDSKEveryEdgeMask];
+ [pdfEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask |
BDSKMinYEdgeMask];
+ [secondaryPdfEdgeView setEdges:BDSKEveryEdgeMask];
[leftSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
[rightSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
@@ -280,25 +280,23 @@
[[rightSideButton cell] setToolTip:NSLocalizedString(@"View Snapshots",
@"Tool tip message") forSegment:SKSnapshotSidePaneState];
// This gets sometimes messed up in the nib, AppKit bug rdar://5346690
- [leftSideContentBox setAutoresizesSubviews:YES];
- [[leftSideContentBox contentView] setAutoresizesSubviews:YES];
- [rightSideContentBox setAutoresizesSubviews:YES];
- [[rightSideContentBox contentView] setAutoresizesSubviews:YES];
+ [leftSideContentView setAutoresizesSubviews:YES];
+ [rightSideContentView setAutoresizesSubviews:YES];
- [leftSideContentView setFrame:[leftSideContentBox bounds]];
- [leftSideContentBox addSubview:leftSideContentView];
- [rightSideContentView setFrame:[rightSideContentBox bounds]];
- [rightSideContentBox addSubview:rightSideContentView];
+ [leftSideView setFrame:[leftSideContentView bounds]];
+ [leftSideContentView addSubview:leftSideView];
+ [rightSideView setFrame:[rightSideContentView bounds]];
+ [rightSideContentView addSubview:rightSideView];
- [pdfView setFrame:[[pdfContentBox contentView] bounds]];
- [secondaryPdfView setFrame:[[secondaryPdfContentBox contentView] bounds]];
+ [pdfView setFrame:[[pdfEdgeView contentView] bounds]];
+ [secondaryPdfView setFrame:[[secondaryPdfEdgeView contentView] bounds]];
if (usesDrawers) {
- NSSize size = [leftSideContentBox frame].size;
+ NSSize size = [leftSideContentView frame].size;
leftSideDrawer = [[NSDrawer alloc] initWithContentSize:size
preferredEdge:NSMinXEdge];
rightSideDrawer = [[NSDrawer alloc] initWithContentSize:size
preferredEdge:NSMaxXEdge];
- [leftSideDrawer setContentView:leftSideContentBox];
- [rightSideDrawer setContentView:rightSideContentBox];
+ [leftSideDrawer setContentView:leftSideContentView];
+ [rightSideDrawer setContentView:rightSideContentView];
[leftSideDrawer setParentWindow:[self window]];
[rightSideDrawer setParentWindow:[self window]];
[leftSideEdgeView setEdges:BDSKNoEdgeMask];
@@ -353,10 +351,10 @@
if ([sud objectForKey:SKLeftSidePaneWidthKey]) {
float width = [sud floatForKey:SKLeftSidePaneWidthKey];
if (width >= 0.0) {
- frame = [leftSideContentBox frame];
+ frame = [leftSideContentView frame];
frame.size.width = width;
if (usesDrawers == NO) {
- [leftSideContentBox setFrame:frame];
+ [leftSideContentView setFrame:frame];
} else if (width > 0.0) {
[leftSideDrawer setContentSize:frame.size];
[leftSideDrawer openOnEdge:NSMinXEdge];
@@ -366,11 +364,11 @@
}
width = [sud floatForKey:SKRightSidePaneWidthKey];
if (width >= 0.0) {
- frame = [rightSideContentBox frame];
+ frame = [rightSideContentView frame];
frame.size.width = width;
frame.origin.x = NSMaxX([splitView frame]) - width;
if (usesDrawers == NO) {
- [rightSideContentBox setFrame:frame];
+ [rightSideContentView setFrame:frame];
} else if (width > 0.0) {
[rightSideDrawer setContentSize:frame.size];
[rightSideDrawer openOnEdge:NSMaxXEdge];
@@ -380,8 +378,8 @@
}
if (usesDrawers == NO) {
frame = [pdfSplitView frame];
- frame.size.width = NSWidth([splitView frame]) -
NSWidth([leftSideContentBox frame]) - NSWidth([rightSideContentBox frame]) - 2
* [splitView dividerThickness];
- frame.origin.x = NSMaxX([leftSideContentBox frame]) + [splitView
dividerThickness];
+ frame.size.width = NSWidth([splitView frame]) -
NSWidth([leftSideContentView frame]) - NSWidth([rightSideContentView frame]) -
2 * [splitView dividerThickness];
+ frame.origin.x = NSMaxX([leftSideContentView frame]) + [splitView
dividerThickness];
[pdfSplitView setFrame:frame];
}
}
@@ -551,10 +549,10 @@
if (rectString = [setup objectForKey:@"windowFrame"])
[[self window] setFrame:NSRectFromString(rectString) display:NO];
if (number = [setup objectForKey:@"leftSidePaneWidth"]) {
- frame = [leftSideContentBox frame];
+ frame = [leftSideContentView frame];
frame.size.width = [number floatValue];
if (usesDrawers == NO) {
- [leftSideContentBox setFrame:frame];
+ [leftSideContentView setFrame:frame];
} else if (NSWidth(frame) > 0.0) {
[leftSideDrawer setContentSize:frame.size];
[leftSideDrawer openOnEdge:NSMinXEdge];
@@ -563,11 +561,11 @@
}
}
if (number = [setup objectForKey:@"rightSidePaneWidth"]) {
- frame = [rightSideContentBox frame];
+ frame = [rightSideContentView frame];
frame.size.width = [number floatValue];
frame.origin.x = NSMaxX([splitView frame]) - NSWidth(frame);
if (usesDrawers == NO) {
- [rightSideContentBox setFrame:frame];
+ [rightSideContentView setFrame:frame];
} else if (NSWidth(frame) > 0.0) {
[rightSideDrawer setContentSize:frame.size];
[rightSideDrawer openOnEdge:NSMaxXEdge];
@@ -577,8 +575,8 @@
}
if (usesDrawers == NO) {
frame = [pdfSplitView frame];
- frame.size.width = NSWidth([splitView frame]) -
NSWidth([leftSideContentBox frame]) - NSWidth([rightSideContentBox frame]) - 2
* [splitView dividerThickness];
- frame.origin.x = NSMaxX([leftSideContentBox frame]) + [splitView
dividerThickness];
+ frame.size.width = NSWidth([splitView frame]) -
NSWidth([leftSideContentView frame]) - NSWidth([rightSideContentView frame]) -
2 * [splitView dividerThickness];
+ frame.origin.x = NSMaxX([leftSideContentView frame]) + [splitView
dividerThickness];
[pdfSplitView setFrame:frame];
}
@@ -591,8 +589,8 @@
NSMutableDictionary *setup = [NSMutableDictionary dictionary];
[setup setObject:NSStringFromRect([mainWindow frame])
forKey:@"windowFrame"];
- [setup setObject:[NSNumber numberWithFloat:[self leftSidePaneIsOpen] ?
NSWidth([leftSideContentBox frame]) : 0.0] forKey:@"leftSidePaneWidth"];
- [setup setObject:[NSNumber numberWithFloat:[self rightSidePaneIsOpen] ?
NSWidth([rightSideContentBox frame]) : 0.0] forKey:@"rightSidePaneWidth"];
+ [setup setObject:[NSNumber numberWithFloat:[self leftSidePaneIsOpen] ?
NSWidth([leftSideContentView frame]) : 0.0] forKey:@"leftSidePaneWidth"];
+ [setup setObject:[NSNumber numberWithFloat:[self rightSidePaneIsOpen] ?
NSWidth([rightSideContentView frame]) : 0.0] forKey:@"rightSidePaneWidth"];
[setup setObject:[NSNumber numberWithUnsignedInt:[[pdfView currentPage]
pageIndex]] forKey:@"pageIndex"];
if ([self isFullScreen] || [self isPresentation]) {
[setup addEntriesFromDictionary:savedNormalSetup];
@@ -1083,7 +1081,7 @@
else if (usesDrawers)
state = [leftSideDrawer state];
else
- state = NSWidth([leftSideContentBox frame]) > 0.0 ? NSDrawerOpenState
: NSDrawerClosedState;
+ state = NSWidth([leftSideContentView frame]) > 0.0 ? NSDrawerOpenState
: NSDrawerClosedState;
return state == NSDrawerOpenState || state == NSDrawerOpeningState;
}
@@ -1094,7 +1092,7 @@
else if (usesDrawers)
state = [rightSideDrawer state];
else
- state = NSWidth([rightSideContentBox frame]) > 0.0 ? NSDrawerOpenState
: NSDrawerClosedState;
+ state = NSWidth([rightSideContentView frame]) > 0.0 ?
NSDrawerOpenState : NSDrawerClosedState;
return state == NSDrawerOpenState || state == NSDrawerOpeningState;
}
@@ -1804,7 +1802,7 @@
frame.size.width = NSWidth(documentRect);
if (usesDrawers == NO)
- frame.size.width += NSWidth([leftSideContentBox frame]) +
NSWidth([rightSideContentBox frame]) + 2 * [splitView dividerThickness] + 2.0;
+ frame.size.width += NSWidth([leftSideContentView frame]) +
NSWidth([rightSideContentView frame]) + 2 * [splitView dividerThickness] + 2.0;
if (displayMode == kPDFDisplaySinglePage || displayMode ==
kPDFDisplayTwoUp) {
frame.size.height = NSHeight(documentRect) + 1.0;
} else {
@@ -1914,7 +1912,7 @@
[leftSideDrawer openOnEdge:NSMinXEdge];
}
} else {
- NSRect sideFrame = [leftSideContentBox frame];
+ NSRect sideFrame = [leftSideContentView frame];
NSRect pdfFrame = [pdfSplitView frame];
if ([self leftSidePaneIsOpen]) {
@@ -1932,7 +1930,7 @@
sideFrame.size.width = lastLeftSidePaneWidth;
}
pdfFrame.origin.x = NSMaxX(sideFrame) + [splitView dividerThickness];
- [leftSideContentBox setFrame:sideFrame];
+ [leftSideContentView setFrame:sideFrame];
[pdfSplitView setFrame:pdfFrame];
[splitView setNeedsDisplay:YES];
@@ -1957,7 +1955,7 @@
else
[rightSideDrawer openOnEdge:NSMaxXEdge];
} else {
- NSRect sideFrame = [rightSideContentBox frame];
+ NSRect sideFrame = [rightSideContentView frame];
NSRect pdfFrame = [pdfSplitView frame];
if ([self rightSidePaneIsOpen]) {
@@ -1973,7 +1971,7 @@
sideFrame.size.width = lastRightSidePaneWidth;
}
sideFrame.origin.x = NSMaxX(pdfFrame) + [splitView dividerThickness];
- [rightSideContentBox setFrame:sideFrame];
+ [rightSideContentView setFrame:sideFrame];
[pdfSplitView setFrame:pdfFrame];
[splitView setNeedsDisplay:YES];
@@ -2000,7 +1998,7 @@
- (IBAction)toggleSplitPDF:(id)sender {
if ([secondaryPdfView window]) {
- [secondaryPdfContentBox removeFromSuperview];
+ [secondaryPdfEdgeView removeFromSuperview];
} else {
@@ -2010,10 +2008,10 @@
NSDivideRect(frame1, &frame1, &frame2, roundf(0.7 * NSHeight(frame1)),
NSMaxYEdge);
NSDivideRect(frame2, &ignored, &frame2, [pdfSplitView
dividerThickness], NSMaxYEdge);
- [pdfContentBox setFrame:frame1];
+ [pdfEdgeView setFrame:frame1];
- [secondaryPdfContentBox setFrame:frame2];
- [pdfSplitView addSubview:secondaryPdfContentBox];
+ [secondaryPdfEdgeView setFrame:frame2];
+ [pdfSplitView addSubview:secondaryPdfEdgeView];
[secondaryPdfView setDocument:[pdfView document]];
[secondaryPdfView setDisplaysPageBreaks:NO];
@@ -2049,9 +2047,9 @@
[leftSideWindow moveToScreen:screen];
- if ([[[leftSideContentView window] firstResponder]
isDescendantOf:leftSideContentView])
- [[leftSideContentView window] makeFirstResponder:nil];
- [leftSideWindow setMainView:leftSideContentView];
+ if ([[[leftSideView window] firstResponder] isDescendantOf:leftSideView])
+ [[leftSideView window] makeFirstResponder:nil];
+ [leftSideWindow setMainView:leftSideView];
if (usesDrawers == NO) {
[leftSideEdgeView setEdges:BDSKNoEdgeMask];
@@ -2079,9 +2077,9 @@
[rightSideWindow moveToScreen:screen];
- if ([[[rightSideContentView window] firstResponder]
isDescendantOf:rightSideContentView])
- [[rightSideContentView window] makeFirstResponder:nil];
- [rightSideWindow setMainView:rightSideContentView];
+ if ([[[rightSideView window] firstResponder] isDescendantOf:rightSideView])
+ [[rightSideView window] makeFirstResponder:nil];
+ [rightSideWindow setMainView:rightSideView];
if (usesDrawers == NO) {
[rightSideEdgeView setEdges:BDSKNoEdgeMask];
@@ -2101,13 +2099,13 @@
}
- (void)hideLeftSideWindow {
- if ([[leftSideContentView window] isEqual:leftSideWindow]) {
+ if ([[leftSideView window] isEqual:leftSideWindow]) {
[leftSideWindow orderOut:self];
- if ([[leftSideWindow firstResponder]
isDescendantOf:leftSideContentView])
+ if ([[leftSideWindow firstResponder] isDescendantOf:leftSideView])
[leftSideWindow makeFirstResponder:nil];
- [leftSideContentView setFrame:[leftSideContentBox bounds]];
- [leftSideContentBox addSubview:leftSideContentView];
+ [leftSideView setFrame:[leftSideContentView bounds]];
+ [leftSideContentView addSubview:leftSideView];
if (usesDrawers == NO) {
[leftSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
@@ -2124,13 +2122,13 @@
}
- (void)hideRightSideWindow {
- if ([[rightSideContentView window] isEqual:rightSideWindow]) {
+ if ([[rightSideView window] isEqual:rightSideWindow]) {
[rightSideWindow orderOut:self];
- if ([[rightSideWindow firstResponder]
isDescendantOf:rightSideContentView])
+ if ([[rightSideWindow firstResponder] isDescendantOf:rightSideView])
[rightSideWindow makeFirstResponder:nil];
- [rightSideContentView setFrame:[rightSideContentBox bounds]];
- [rightSideContentBox addSubview:rightSideContentView];
+ [rightSideView setFrame:[rightSideContentView bounds]];
+ [rightSideContentView addSubview:rightSideView];
if (usesDrawers == NO) {
[rightSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
@@ -2395,8 +2393,8 @@
if ([[fullScreenWindow firstResponder] isDescendantOf:pdfView])
[fullScreenWindow makeFirstResponder:nil];
[pdfView disableNavigation];
- [pdfView setFrame:[[pdfContentBox contentView] bounds]];
- [pdfContentBox addSubview:pdfView]; // this should be done before
exitPresentationMode to get a smooth transition
+ [pdfView setFrame:[[pdfEdgeView contentView] bounds]];
+ [pdfEdgeView addSubview:pdfView]; // this should be done before
exitPresentationMode to get a smooth transition
if ([self isPresentation])
[self exitPresentationMode];
@@ -4910,8 +4908,8 @@
else
[self toggleRightSidePane:self];
} else if ([sender isEqual:pdfSplitView] && [[sender subviews] count] > 1)
{
- NSRect primaryFrame = [pdfContentBox frame];
- NSRect secondaryFrame = [secondaryPdfContentBox frame];
+ NSRect primaryFrame = [pdfEdgeView frame];
+ NSRect secondaryFrame = [secondaryPdfEdgeView frame];
if (NSHeight(secondaryFrame) > 0.0) {
lastSecondaryPdfViewPaneHeight = NSHeight(secondaryFrame); //
cache this
@@ -4926,8 +4924,8 @@
secondaryFrame.size.height = lastSecondaryPdfViewPaneHeight;
}
primaryFrame.origin.y = NSMaxY(secondaryFrame) + [pdfSplitView
dividerThickness];
- [pdfContentBox setFrame:primaryFrame];
- [secondaryPdfContentBox setFrame:secondaryFrame];
+ [pdfEdgeView setFrame:primaryFrame];
+ [secondaryPdfEdgeView setFrame:secondaryFrame];
[pdfSplitView setNeedsDisplay:YES];
[secondaryPdfView layoutDocumentView];
[secondaryPdfView setNeedsDisplay:YES];
@@ -4997,8 +4995,8 @@
id sender = [notification object];
if ([sender isEqual:splitView] || sender == nil) {
if ([[self window] frameAutosaveName] && settingUpWindow == NO) {
- [[NSUserDefaults standardUserDefaults]
setFloat:NSWidth([leftSideContentBox frame]) forKey:SKLeftSidePaneWidthKey];
- [[NSUserDefaults standardUserDefaults]
setFloat:NSWidth([rightSideContentBox frame]) forKey:SKRightSidePaneWidthKey];
+ [[NSUserDefaults standardUserDefaults]
setFloat:NSWidth([leftSideContentView frame]) forKey:SKLeftSidePaneWidthKey];
+ [[NSUserDefaults standardUserDefaults]
setFloat:NSWidth([rightSideContentView frame]) forKey:SKRightSidePaneWidthKey];
}
}
}
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
