Revision: 6436
http://skim-app.svn.sourceforge.net/skim-app/?rev=6436&view=rev
Author: hofman
Date: 2010-04-08 11:31:32 +0000 (Thu, 08 Apr 2010)
Log Message:
-----------
connect mainWindow in nib
Modified Paths:
--------------
trunk/MainWindow.xib
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
Modified: trunk/MainWindow.xib
===================================================================
--- trunk/MainWindow.xib 2010-04-08 10:14:28 UTC (rev 6435)
+++ trunk/MainWindow.xib 2010-04-08 11:31:32 UTC (rev 6436)
@@ -253,6 +253,14 @@
</object>
<int key="connectionID">1553</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection"
key="connection">
+ <string
key="label">mainWindow</string>
+ <reference key="source"
ref="589428351"/>
+ <reference key="destination"
ref="117035432"/>
+ </object>
+ <int key="connectionID">1554</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -432,7 +440,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">1553</int>
+ <int key="maxID">1554</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray"
key="referencedPartialClassDescriptions">
@@ -976,6 +984,7 @@
<string>centerContentView</string>
<string>leftSideContentView</string>
<string>leftSideController</string>
+
<string>mainWindow</string>
<string>pdfContentView</string>
<string>pdfSplitView</string>
<string>rightSideContentView</string>
@@ -988,6 +997,7 @@
<string>NSView</string>
<string>NSView</string>
<string>SKLeftSideViewController</string>
+
<string>NSWindow</string>
<string>NSView</string>
<string>SKSplitView</string>
<string>NSView</string>
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2010-04-08 10:14:28 UTC (rev 6435)
+++ trunk/SKMainWindowController.h 2010-04-08 11:31:32 UTC (rev 6436)
@@ -180,6 +180,8 @@
} mwcFlags;
}
+...@property (nonatomic, retain) IBOutlet NSWindow *mainWindow;
+
@property (nonatomic, retain) IBOutlet SKSplitView *splitView;
@property (nonatomic, retain) IBOutlet NSView *centerContentView;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2010-04-08 10:14:28 UTC (rev 6435)
+++ trunk/SKMainWindowController.m 2010-04-08 11:31:32 UTC (rev 6436)
@@ -199,7 +199,7 @@
@implementation SKMainWindowController
-...@synthesize splitView, centerContentView, pdfSplitView, pdfContentView,
pdfView, leftSideController, rightSideController, toolbarController,
leftSideContentView, rightSideContentView, progressController,
presentationNotesDocument, tags, rating, pageNumber, pageLabel;
+...@synthesize mainWindow, splitView, centerContentView, pdfSplitView,
pdfContentView, pdfView, leftSideController, rightSideController,
toolbarController, leftSideContentView, rightSideContentView,
progressController, presentationNotesDocument, tags, rating, pageNumber,
pageLabel;
@dynamic pdfDocument, presentationOptions, selectedNotes, isPresentation,
isFullScreen, autoScales, leftSidePaneState, rightSidePaneState, findPaneState,
leftSidePaneIsOpen, rightSidePaneIsOpen;
+ (void)initialize {
@@ -377,9 +377,6 @@
[toolbarController setupToolbar];
// Set up the window
- // we retain as we might replace it with the full screen window
- mainWindow = [[self window] retain];
-
[self setWindowFrameAutosaveNameOrCascade:SKMainWindowFrameAutosaveName];
[[self window] setAutorecalculatesContentBorderThickness:NO
forEdge:NSMinYEdge];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit