Revision: 14697
http://sourceforge.net/p/skim-app/code/14697
Author: hofman
Date: 2024-11-15 22:30:56 +0000 (Fri, 15 Nov 2024)
Log Message:
-----------
make preference window controller an ivar of app controller
Modified Paths:
--------------
trunk/SKApplicationController.h
trunk/SKApplicationController.m
trunk/SKPreferenceController.h
trunk/SKPreferenceController.m
Modified: trunk/SKApplicationController.h
===================================================================
--- trunk/SKApplicationController.h 2024-11-15 19:15:13 UTC (rev 14696)
+++ trunk/SKApplicationController.h 2024-11-15 22:30:56 UTC (rev 14697)
@@ -44,7 +44,7 @@
extern NSString *SKPageLabelsChangedNotification;
-@class SKBookmark, SKDownload, SKReleaseNotesController,
SKInfoWindowController;
+@class SKBookmark, SKDownload, SKPreferenceController,
SKReleaseNotesController, SKInfoWindowController;
@interface SKApplicationController : NSObject <SKApplicationDelegate,
HIDRemoteDelegate, NSMenuDelegate> {
NSMenu *noteColumnsMenu;
@@ -53,6 +53,7 @@
BOOL didCheckReopen;
BOOL remoteScrolling;
id activity;
+ SKPreferenceController *preferenceController;
SKReleaseNotesController *releaseNotesController;
SKInfoWindowController *infoWindowController;
}
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2024-11-15 19:15:13 UTC (rev 14696)
+++ trunk/SKApplicationController.m 2024-11-15 22:30:56 UTC (rev 14697)
@@ -302,7 +302,9 @@
}
- (IBAction)showPreferencePanel:(id)sender{
- [[SKPreferenceController sharedPrefenceController] showWindow:self];
+ if (preferenceController == nil)
+ preferenceController = [[SKPreferenceController alloc] init];
+ [preferenceController showWindow:self];
}
- (IBAction)showReleaseNotes:(id)sender{
Modified: trunk/SKPreferenceController.h
===================================================================
--- trunk/SKPreferenceController.h 2024-11-15 19:15:13 UTC (rev 14696)
+++ trunk/SKPreferenceController.h 2024-11-15 22:30:56 UTC (rev 14697)
@@ -55,8 +55,6 @@
@property (nonatomic, nullable, strong) IBOutlet NSButton *resetButton,
*resetAllButton;
-@property (class, nonatomic, readonly) SKPreferenceController
*sharedPrefenceController;
-
- (IBAction)resetAll:(nullable id)sender;
- (IBAction)resetCurrent:(nullable id)sender;
Modified: trunk/SKPreferenceController.m
===================================================================
--- trunk/SKPreferenceController.m 2024-11-15 19:15:13 UTC (rev 14696)
+++ trunk/SKPreferenceController.m 2024-11-15 22:30:56 UTC (rev 14697)
@@ -71,13 +71,6 @@
@synthesize resetButton, resetAllButton;
-+ (SKPreferenceController *)sharedPrefenceController {
- static SKPreferenceController *sharedPrefenceController = nil;
- if (sharedPrefenceController == nil)
- sharedPrefenceController = [[self alloc] init];
- return sharedPrefenceController;
-}
-
- (instancetype)init {
self = [super initWithWindowNibName:@"PreferenceWindow"];
if (self) {
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
