Revision: 2531
http://skim-app.svn.sourceforge.net/skim-app/?rev=2531&view=rev
Author: hofman
Date: 2007-07-19 06:13:20 -0700 (Thu, 19 Jul 2007)
Log Message:
-----------
Give up on setting up splitview in IB, it's too buggy. Insert subviews
programatically. Also cut off side border of tableviews at the edge of the
screen.
Modified Paths:
--------------
trunk/English.lproj/MainWindow.nib/classes.nib
trunk/English.lproj/MainWindow.nib/info.nib
trunk/English.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/English.lproj/MainWindow.nib/classes.nib
===================================================================
--- trunk/English.lproj/MainWindow.nib/classes.nib 2007-07-19 10:06:06 UTC
(rev 2530)
+++ trunk/English.lproj/MainWindow.nib/classes.nib 2007-07-19 13:13:20 UTC
(rev 2531)
@@ -121,10 +121,10 @@
findEdgeView = BDSKEdgeView;
findTableView = NSTableView;
findView = NSView;
- leftSideBox = NSBox;
leftSideButton = NSSegmentedControl;
leftSideCollapsibleView = BDSKCollapsibleView;
leftSideContentBox = NSBox;
+ leftSideContentView = NSView;
leftSideEdgeView = BDSKEdgeView;
markupPopUpButton = BDSKImagePopUpButton;
noteArrayController = NSArrayController;
@@ -144,10 +144,10 @@
progressBar = NSProgressIndicator;
progressField = NSTextField;
progressSheet = NSWindow;
- rightSideBox = NSBox;
rightSideButton = NSSegmentedControl;
rightSideCollapsibleView = BDSKCollapsibleView;
rightSideContentBox = NSBox;
+ rightSideContentView = NSView;
rightSideEdgeView = BDSKEdgeView;
scaleField = NSTextField;
searchField = NSSearchField;
Modified: trunk/English.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/English.lproj/MainWindow.nib/info.nib 2007-07-19 10:06:06 UTC (rev
2530)
+++ trunk/English.lproj/MainWindow.nib/info.nib 2007-07-19 13:13:20 UTC (rev
2531)
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>206 62 564 296 0 0 1440 938 </string>
+ <string>180 125 582 462 0 0 1440 938 </string>
<key>IBEditorPositions</key>
<dict>
<key>168</key>
@@ -18,6 +18,10 @@
<string>610 420 220 442 0 0 1440 938 </string>
<key>511</key>
<string>610 420 220 442 0 0 1440 938 </string>
+ <key>687</key>
+ <string>590 400 260 482 0 0 1440 938 </string>
+ <key>694</key>
+ <string>590 400 260 482 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
@@ -27,18 +31,20 @@
</array>
<key>IBOpenObjects</key>
<array>
+ <integer>256</integer>
<integer>511</integer>
- <integer>539</integer>
+ <integer>5</integer>
+ <integer>687</integer>
+ <integer>208</integer>
+ <integer>314</integer>
+ <integer>502</integer>
<integer>585</integer>
- <integer>314</integer>
<integer>224</integer>
- <integer>256</integer>
+ <integer>694</integer>
+ <integer>633</integer>
<integer>168</integer>
- <integer>208</integer>
- <integer>633</integer>
<integer>553</integer>
- <integer>5</integer>
- <integer>502</integer>
+ <integer>539</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/English.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/MainWindow.nib/classes.nib
===================================================================
--- trunk/Italian.lproj/MainWindow.nib/classes.nib 2007-07-19 10:06:06 UTC
(rev 2530)
+++ trunk/Italian.lproj/MainWindow.nib/classes.nib 2007-07-19 13:13:20 UTC
(rev 2531)
@@ -121,10 +121,10 @@
findEdgeView = BDSKEdgeView;
findTableView = NSTableView;
findView = NSView;
- leftSideBox = NSBox;
leftSideButton = NSSegmentedControl;
leftSideCollapsibleView = BDSKCollapsibleView;
leftSideContentBox = NSBox;
+ leftSideContentView = NSView;
leftSideEdgeView = BDSKEdgeView;
markupPopUpButton = BDSKImagePopUpButton;
noteArrayController = NSArrayController;
@@ -144,10 +144,10 @@
progressBar = NSProgressIndicator;
progressField = NSTextField;
progressSheet = NSWindow;
- rightSideBox = NSBox;
rightSideButton = NSSegmentedControl;
rightSideCollapsibleView = BDSKCollapsibleView;
rightSideContentBox = NSBox;
+ rightSideContentView = NSView;
rightSideEdgeView = BDSKEdgeView;
scaleField = NSTextField;
searchField = NSSearchField;
Modified: trunk/Italian.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Italian.lproj/MainWindow.nib/info.nib 2007-07-19 10:06:06 UTC (rev
2530)
+++ trunk/Italian.lproj/MainWindow.nib/info.nib 2007-07-19 13:13:20 UTC (rev
2531)
@@ -3,21 +3,25 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>32 110 564 296 0 0 1440 938 </string>
+ <string>49 101 539 409 0 0 1440 938 </string>
<key>IBEditorPositions</key>
<dict>
<key>168</key>
<string>601 521 237 239 0 0 1440 938 </string>
<key>224</key>
- <string>402 294 220 442 0 0 1024 746 </string>
+ <string>610 420 220 442 0 0 1440 938 </string>
<key>256</key>
<string>402 294 220 442 0 0 1024 746 </string>
<key>314</key>
- <string>402 294 220 442 0 0 1024 746 </string>
+ <string>610 420 220 442 0 0 1440 938 </string>
<key>502</key>
- <string>402 294 220 442 0 0 1024 746 </string>
+ <string>610 420 220 442 0 0 1440 938 </string>
<key>511</key>
<string>610 420 220 442 0 0 1440 938 </string>
+ <key>676</key>
+ <string>610 420 220 442 0 0 1440 938 </string>
+ <key>677</key>
+ <string>610 420 220 442 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
@@ -27,13 +31,18 @@
</array>
<key>IBOpenObjects</key>
<array>
- <integer>168</integer>
- <integer>628</integer>
+ <integer>502</integer>
<integer>5</integer>
- <integer>208</integer>
+ <integer>539</integer>
+ <integer>676</integer>
+ <integer>314</integer>
<integer>553</integer>
- <integer>539</integer>
+ <integer>677</integer>
<integer>511</integer>
+ <integer>628</integer>
+ <integer>168</integer>
+ <integer>224</integer>
+ <integer>208</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-07-19 10:06:06 UTC (rev 2530)
+++ trunk/SKMainWindowController.h 2007-07-19 13:13:20 UTC (rev 2531)
@@ -68,14 +68,14 @@
IBOutlet BDSKEdgeView *pdfContentBox;
IBOutlet NSBox *leftSideContentBox;
- IBOutlet NSBox *leftSideBox;
+ IBOutlet NSView *leftSideContentView;
IBOutlet BDSKEdgeView *leftSideEdgeView;
IBOutlet BDSKCollapsibleView *leftSideCollapsibleView;
IBOutlet NSSegmentedControl *leftSideButton;
IBOutlet NSSearchField *searchField;
IBOutlet NSBox *rightSideContentBox;
- IBOutlet NSBox *rightSideBox;
+ IBOutlet NSView *rightSideContentView;
IBOutlet BDSKEdgeView *rightSideEdgeView;
IBOutlet BDSKCollapsibleView *rightSideCollapsibleView;
IBOutlet NSSegmentedControl *rightSideButton;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-07-19 10:06:06 UTC (rev 2530)
+++ trunk/SKMainWindowController.m 2007-07-19 13:13:20 UTC (rev 2531)
@@ -241,34 +241,10 @@
[pdfContentBox setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask |
BDSKMinYEdgeMask];
[findEdgeView setEdges:BDSKMaxXEdgeMask];
- [leftSideEdgeView setEdges:BDSKMaxXEdgeMask];
- [rightSideEdgeView setEdges:BDSKMinXEdgeMask];
+ [leftSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
+ [rightSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
- [pdfView setFrame:[[pdfContentBox contentView] bounds]];
-
- float width = NSWidth([leftSideContentBox frame]);
- NSRect frame = [leftSideBox frame];
- frame.size.width = width;
- [leftSideBox setFrame:frame];
- frame = [leftSideEdgeView frame];
- frame.size.width = width;
- [leftSideEdgeView setFrame:frame];
- frame = [currentLeftSideView frame];
- frame.size.width = width;
- [currentLeftSideView setFrame:frame];
-
- width = NSWidth([rightSideContentBox frame]);
- frame = [rightSideBox frame];
- frame.size.width = width;
- [rightSideBox setFrame:frame];
- frame = [rightSideEdgeView frame];
- frame.size.width = width;
- [rightSideEdgeView setFrame:frame];
- frame = [currentRightSideView frame];
- frame.size.width = width;
- [currentRightSideView setFrame:frame];
-
- frame = [leftSideButton frame];
+ NSRect frame = [leftSideButton frame];
frame.size.height = SEGMENTED_CONTROL_HEIGHT;
[leftSideButton setFrame:frame];
[[leftSideButton cell] setToolTip:NSLocalizedString(@"View Thumbnails",
@"Tool tip message") forSegment:SKThumbnailSidePaneState];
@@ -280,6 +256,17 @@
[[rightSideButton cell] setToolTip:NSLocalizedString(@"View Notes", @"Tool
tip message") forSegment:SKNoteSidePaneState];
[[rightSideButton cell] setToolTip:NSLocalizedString(@"View Snapshots",
@"Tool tip message") forSegment:SKSnapshotSidePaneState];
+ [leftSideContentView retain];
+ [leftSideContentView setFrame:[leftSideContentBox bounds]];
+ [leftSideContentBox addSubview:leftSideContentView];
+ [leftSideContentView release];
+ [rightSideContentView retain];
+ [rightSideContentView setFrame:[rightSideContentBox bounds]];
+ [rightSideContentBox addSubview:rightSideContentView];
+ [rightSideContentView release];
+
+ [pdfView setFrame:[[pdfContentBox contentView] bounds]];
+
[self displayOutlineView];
[self displayNoteView];
@@ -1855,9 +1842,9 @@
[leftSideWindow moveToScreen:screen];
}
- if ([[mainWindow firstResponder] isDescendantOf:leftSideBox])
+ if ([[mainWindow firstResponder] isDescendantOf:leftSideContentView])
[mainWindow makeFirstResponder:nil];
- [leftSideWindow setMainView:leftSideBox];
+ [leftSideWindow setMainView:leftSideContentView];
[leftSideWindow setInitialFirstResponder:searchField];
[leftSideEdgeView setEdges:BDSKNoEdgeMask];
@@ -1888,9 +1875,9 @@
[rightSideWindow moveToScreen:screen];
}
- if ([[mainWindow firstResponder] isDescendantOf:rightSideBox])
+ if ([[mainWindow firstResponder] isDescendantOf:rightSideContentView])
[mainWindow makeFirstResponder:nil];
- [rightSideWindow setMainView:rightSideBox];
+ [rightSideWindow setMainView:rightSideContentView];
[rightSideEdgeView setEdges:BDSKNoEdgeMask];
@@ -1907,18 +1894,18 @@
}
- (void)hideLeftSideWindow {
- if ([[leftSideBox window] isEqual:leftSideWindow]) {
+ if ([[leftSideContentView window] isEqual:leftSideWindow]) {
[leftSideWindow orderOut:self];
- if ([[leftSideWindow firstResponder] isDescendantOf:leftSideBox])
+ if ([[leftSideWindow firstResponder]
isDescendantOf:leftSideContentView])
[leftSideWindow makeFirstResponder:nil];
- [leftSideBox retain]; // leftSideBox is removed from its old superview
in the process
- [leftSideBox setFrame:[leftSideContentBox bounds]];
- [leftSideContentBox addSubview:leftSideBox];
- [leftSideBox release];
+ [leftSideContentView retain]; // leftSideContentView is removed from
its old superview in the process
+ [leftSideContentView setFrame:[leftSideContentBox bounds]];
+ [leftSideContentBox addSubview:leftSideContentView];
+ [leftSideContentView release];
- [leftSideEdgeView setEdges:BDSKMaxXEdgeMask];
- [findEdgeView setEdges:BDSKMaxXEdgeMask];
+ [leftSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
+ [findEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
if ([self isPresentation]) {
[self setLeftSidePaneState:savedLeftSidePaneState];
@@ -1930,17 +1917,17 @@
}
- (void)hideRightSideWindow {
- if ([[rightSideBox window] isEqual:rightSideWindow]) {
+ if ([[rightSideContentView window] isEqual:rightSideWindow]) {
[rightSideWindow orderOut:self];
- if ([[rightSideWindow firstResponder] isDescendantOf:rightSideBox])
+ if ([[rightSideWindow firstResponder]
isDescendantOf:rightSideContentView])
[rightSideWindow makeFirstResponder:nil];
- [rightSideBox retain]; // rightSideBox is removed from its old
superview in the process
- [rightSideBox setFrame:[rightSideContentBox bounds]];
- [rightSideContentBox addSubview:rightSideBox];
- [rightSideBox release];
+ [rightSideContentView retain]; // rightSideContentView is removed from
its old superview in the process
+ [rightSideContentView setFrame:[rightSideContentBox bounds]];
+ [rightSideContentBox addSubview:rightSideContentView];
+ [rightSideContentView release];
- [rightSideEdgeView setEdges:BDSKMinXEdgeMask];
+ [rightSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
if ([self isPresentation]) {
[rightSideWindow setLevel:NSFloatingWindowLevel];
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 DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
