[Skim-app-commit] SF.net SVN: skim-app:[13198] trunk

[hofman--- via Skim-app-commit]

Revision: 13198
          http://sourceforge.net/p/skim-app/code/13198
Author:   hofman
Date:     2023-01-03 15:09:08 +0000 (Tue, 03 Jan 2023)
Log Message:
-----------
remove unused outlet, calculate selected file type property

Modified Paths:
--------------
    trunk/SKExportAccessoryController.h
    trunk/SKExportAccessoryController.m
    trunk/SKMainDocument.m

Modified: trunk/SKExportAccessoryController.h
===================================================================
--- trunk/SKExportAccessoryController.h 2023-01-03 14:58:25 UTC (rev 13197)
+++ trunk/SKExportAccessoryController.h 2023-01-03 15:09:08 UTC (rev 13198)
@@ -40,18 +40,15 @@
 
 
 @interface SKExportAccessoryController : NSViewController {
-    NSTextField *labelField;
     NSPopUpButton *formatPopUpButton;
-    NSString *lastSelectedFileType;
     NSSavePanel *savePanel;
     BOOL hasExportOptions, allowsEmbeddedOptions;
 }
 
-@property (nonatomic, retain) IBOutlet NSTextField *labelField;
 @property (nonatomic, retain) IBOutlet NSPopUpButton *formatPopUpButton;
 
-@property (nonatomic, retain) NSString *lastSelectedFileType;
+@property (nonatomic) BOOL hasExportOptions, allowsEmbeddedOption;
+@property (nonatomic, readonly) NSString *selectedFileType;
 @property (nonatomic, retain) NSSavePanel *savePanel;
-@property (nonatomic) BOOL hasExportOptions, allowsEmbeddedOption;
 
 @end

Modified: trunk/SKExportAccessoryController.m
===================================================================
--- trunk/SKExportAccessoryController.m 2023-01-03 14:58:25 UTC (rev 13197)
+++ trunk/SKExportAccessoryController.m 2023-01-03 15:09:08 UTC (rev 13198)
@@ -45,12 +45,11 @@
 
 @implementation SKExportAccessoryController
 
-@synthesize labelField, formatPopUpButton, lastSelectedFileType, savePanel, 
hasExportOptions, allowsEmbeddedOption;
+@synthesize formatPopUpButton, savePanel, hasExportOptions, 
allowsEmbeddedOption;
+@dynamic selectedFileType;
 
 - (void)dealloc {
-    SKDESTROY(labelField);
     SKDESTROY(formatPopUpButton);
-    SKDESTROY(lastSelectedFileType);
     SKDESTROY(savePanel);
     [super dealloc];
 }
@@ -59,4 +58,8 @@
     return @"ExportAccessoryView";
 }
 
+- (NSString *)selectedFileType {
+    return [[[self formatPopUpButton] selectedItem] representedObject];
+}
+
 @end

Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m      2023-01-03 14:58:25 UTC (rev 13197)
+++ trunk/SKMainDocument.m      2023-01-03 15:09:08 UTC (rev 13198)
@@ -326,12 +326,11 @@
 }
 
 - (NSString *)fileTypeFromLastRunSavePanel {
-    return [exportAccessoryController lastSelectedFileType] ?: [super 
fileTypeFromLastRunSavePanel];
+    return [exportAccessoryController selectedFileType] ?: [super 
fileTypeFromLastRunSavePanel];
 }
 
 - (void)changeExportType:(id)sender {
-    NSString *type = [[sender selectedItem] representedObject];
-    [exportAccessoryController setLastSelectedFileType:type];
+    NSString *type = [exportAccessoryController selectedFileType];
     [[exportAccessoryController savePanel] setAllowedFileTypes:[NSArray 
arrayWithObjects:[self fileNameExtensionForType:type 
saveOperation:NSSaveToOperation], nil]];
     if ([self canAttachNotesForType:type] == NO) {
         [exportAccessoryController setHasExportOptions:NO];

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit