Revision: 14024
http://sourceforge.net/p/skim-app/code/14024
Author: hofman
Date: 2024-01-29 15:42:05 +0000 (Mon, 29 Jan 2024)
Log Message:
-----------
Don't create toolbarController in nib, just in code
Modified Paths:
--------------
trunk/MainWindow.xib
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
Modified: trunk/MainWindow.xib
===================================================================
--- trunk/MainWindow.xib 2024-01-29 15:08:05 UTC (rev 14023)
+++ trunk/MainWindow.xib 2024-01-29 15:42:05 UTC (rev 14024)
@@ -18,7 +18,6 @@
<outlet property="rightSideController" destination="1544"
id="1546"/>
<outlet property="splitView" destination="1385" id="1448"/>
<outlet property="statusBar" destination="2Zw-iS-Qai"
id="5oD-6z-7iD"/>
- <outlet property="toolbarController" destination="1551"
id="1553"/>
<outlet property="window" destination="5" id="18"/>
</connections>
</customObject>
@@ -116,10 +115,5 @@
<outlet property="mainController" destination="-2" id="1548"/>
</connections>
</customObject>
- <customObject id="1551" customClass="SKMainToolbarController">
- <connections>
- <outlet property="mainController" destination="-2" id="1552"/>
- </connections>
- </customObject>
</objects>
</document>
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2024-01-29 15:08:05 UTC (rev 14023)
+++ trunk/SKMainWindowController.h 2024-01-29 15:42:05 UTC (rev 14024)
@@ -215,8 +215,6 @@
@property (nonatomic, nullable, strong) IBOutlet SKLeftSideViewController
*leftSideController;
@property (nonatomic, nullable, strong) IBOutlet SKRightSideViewController
*rightSideController;
-@property (nonatomic, nullable, strong) IBOutlet SKMainToolbarController
*toolbarController;
-
@property (nonatomic, nullable, strong) IBOutlet NSView *leftSideContentView,
*rightSideContentView;
@property (nonatomic, nullable, readonly) NSString *searchString;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2024-01-29 15:08:05 UTC (rev 14023)
+++ trunk/SKMainWindowController.m 2024-01-29 15:42:05 UTC (rev 14024)
@@ -215,7 +215,7 @@
@implementation SKMainWindowController
-@synthesize mainWindow, splitView, centerContentView, pdfSplitView,
pdfContentView, statusBar, pdfView, secondaryPdfView, leftSideController,
rightSideController, toolbarController, leftSideContentView,
rightSideContentView, presentationNotesDocument, presentationNotesOffset,
notes, thumbnails, snapshots, searchResults, groupedSearchResults, tags,
rating, pageLabel, interactionMode, placeholderPdfDocument;
+@synthesize mainWindow, splitView, centerContentView, pdfSplitView,
pdfContentView, statusBar, pdfView, secondaryPdfView, leftSideController,
rightSideController, leftSideContentView, rightSideContentView,
presentationNotesDocument, presentationNotesOffset, notes, thumbnails,
snapshots, searchResults, groupedSearchResults, tags, rating, pageLabel,
interactionMode, placeholderPdfDocument;
@dynamic pdfDocument, presentationOptions, presentationUndoManager,
selectedNotes, hasNotes, widgetProperties, autoScales, leftSidePaneState,
rightSidePaneState, findPaneState, leftSidePaneIsOpen, rightSidePaneIsOpen,
recentInfoNeedsUpdate, searchString, hasOverview, notesMenu;
+ (void)initialize {
@@ -332,6 +332,8 @@
[pdfView setMaxScaleFactor:20.0];
// Set up the tool bar
+ toolbarController = [[SKMainToolbarController alloc] init];
+ [toolbarController setMainController:self];
[toolbarController setupToolbar];
// Set up the window
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
