Revision: 5572
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5572&view=rev
Author:   hofman
Date:     2009-08-20 20:38:09 +0000 (Thu, 20 Aug 2009)

Log Message:
-----------
better solution to Aquqmacs name change. Include both presets in the popup.

Modified Paths:
--------------
    trunk/SKPDFDocument.m
    trunk/SKPreferenceController.m

Modified: trunk/SKPDFDocument.m
===================================================================
--- trunk/SKPDFDocument.m       2009-08-20 20:24:47 UTC (rev 5571)
+++ trunk/SKPDFDocument.m       2009-08-20 20:38:09 UTC (rev 5572)
@@ -1596,10 +1596,8 @@
             NSFileManager *fm = [NSFileManager defaultManager];
             
             if ([editorPreset isEqualToString:@""] == NO) {
-                path = [[NSWorkspace sharedWorkspace] 
fullPathForApplication:editorPreset];
-                if (path == nil && [editorPreset isEqualToString:@"Aquamacs 
Emacs"])
-                    path = [[NSWorkspace sharedWorkspace] 
fullPathForApplication:@"Aquamacs"];
-                if (path && (appBundle = [NSBundle bundleWithPath:path])) {
+                if ((path = [[NSWorkspace sharedWorkspace] 
fullPathForApplication:editorPreset]) &&
+                    (appBundle = [NSBundle bundleWithPath:path])) {
                     [searchPaths addObject:[appBundle sharedSupportPath]];
                     [searchPaths addObject:[appBundle resourcePath]];
                     if ([editorPreset isEqualToString:@"BBEdit"] == NO)

Modified: trunk/SKPreferenceController.m
===================================================================
--- trunk/SKPreferenceController.m      2009-08-20 20:24:47 UTC (rev 5571)
+++ trunk/SKPreferenceController.m      2009-08-20 20:38:09 UTC (rev 5572)
@@ -49,9 +49,9 @@
 #define RESETTABLEKEYS_KEY @"ResettableKeys"
 
 static CGFloat SKDefaultFontSizes[] = {8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 
16.0, 18.0, 20.0, 24.0, 28.0, 32.0, 48.0, 64.0};
-static NSString *SKTeXEditors[] = {@"TextMate", @"BBEdit", @"TextWrangler", 
@"Emacs", @"Aquamacs Emacs", @"LyX", @"TeXMaker", @"AlphaX"};
-static NSString *SKTeXEditorCommands[] = {@"mate", @"bbedit", @"edit", 
@"emacsclient", @"emacsclient", @"lyxeditor", @"texmaker", @"alphac"};
-static NSString *SKTeXEditorArguments[] = {@"-l %line \"%file\"", @"+%line 
\"%file\"", @"+%line \"%file\"", @"--no-wait +%line \"%file\"", @"--no-wait 
+%line \"%file\"", @"\"%file\" %line", @"\"%file\" -line %line", @"+%line 
\"%file\""};
+static NSString *SKTeXEditors[] = {@"TextMate", @"BBEdit", @"TextWrangler", 
@"Emacs", @"Aquamacs Emacs", @"Aquamacs", @"LyX", @"TeXMaker", @"AlphaX"};
+static NSString *SKTeXEditorCommands[] = {@"mate", @"bbedit", @"edit", 
@"emacsclient", @"emacsclient", @"emacsclient", @"lyxeditor", @"texmaker", 
@"alphac"};
+static NSString *SKTeXEditorArguments[] = {@"-l %line \"%file\"", @"+%line 
\"%file\"", @"+%line \"%file\"", @"+%line \"%file\"", @"--no-wait +%line 
\"%file\"", @"--no-wait +%line \"%file\"", @"\"%file\" %line", @"\"%file\" 
-line %line", @"+%line \"%file\""};
 
 #define SKPreferenceWindowFrameAutosaveName @"SKPreferenceWindow"
 


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

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to