[Skim-app-commit] SF.net SVN: skim-app:[13214] trunk/SKMainDocument.m

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

Revision: 13214
          http://sourceforge.net/p/skim-app/code/13214
Author:   hofman
Date:     2023-01-10 15:30:47 +0000 (Tue, 10 Jan 2023)
Log Message:
-----------
set export option before loading export accessory view

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

Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m      2023-01-10 15:09:11 UTC (rev 13213)
+++ trunk/SKMainDocument.m      2023-01-10 15:30:47 UTC (rev 13214)
@@ -349,6 +349,11 @@
 - (BOOL)prepareSavePanel:(NSSavePanel *)savePanel {
     BOOL success = [super prepareSavePanel:savePanel];
     if (success && mdFlags.exportUsingPanel) {
+        NSString *lastExportedType = [[NSUserDefaults standardUserDefaults] 
stringForKey:SKLastExportedTypeKey];
+        NSInteger lastExportedOption = [[NSUserDefaults standardUserDefaults] 
integerForKey:SKLastExportedOptionKey];
+        
+        mdFlags.exportOption = lastExportedOption;
+        
         exportAccessoryController = [[SKExportAccessoryController alloc] init];
         [exportAccessoryController setRepresentedObject:self];
         [exportAccessoryController setSavePanel:savePanel];
@@ -364,14 +369,11 @@
         [formatPopUpButton setTarget:self];
         [savePanel setAccessoryView:accessoryView];
         
-        NSString *lastExportedType = [[NSUserDefaults standardUserDefaults] 
stringForKey:SKLastExportedTypeKey];
-        NSInteger lastExportedOption = [[NSUserDefaults standardUserDefaults] 
integerForKey:SKLastExportedOptionKey];
         NSInteger idx = lastExportedType ? [formatPopUpButton 
indexOfItemWithRepresentedObject:lastExportedType] : -1;
         if (idx == -1) {
             idx = [formatPopUpButton indexOfItemWithRepresentedObject:[self 
fileType]];
-            lastExportedOption = SKExportOptionDefault;
+            [self setExportOption:SKExportOptionDefault];
         }
-        [self setExportOption:lastExportedOption];
         [formatPopUpButton selectItemAtIndex:MAX(idx, 0)];
         // update the last selected type and option view
         [self changeExportType:formatPopUpButton];

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