summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Paulsson <gonz@users.sourceforge.net>2013-02-27 11:44:58 +0000
committerJohan Paulsson <gonz@users.sourceforge.net>2013-02-27 11:44:58 +0000
commit2ecc0bb27275481f7093fd869eda6b3fc11971f0 (patch)
tree3d44f072e2da37fd1cdb4d7e6f0180963862e502
parent8408fed8718c5aafc89a7e22c3791904d505a425 (diff)
osx gui moved latex settings to preferences
-rw-r--r--tikzit/English.lproj/UserDefaults.plist6
-rw-r--r--tikzit/src/osx/AppDelegate.m20
-rw-r--r--tikzit/src/osx/PreferenceController.h16
-rw-r--r--tikzit/src/osx/PreferenceController.m19
-rw-r--r--tikzit/src/osx/Preferences.xib233
-rw-r--r--tikzit/src/osx/PreviewController.m27
6 files changed, 227 insertions, 94 deletions
diff --git a/tikzit/English.lproj/UserDefaults.plist b/tikzit/English.lproj/UserDefaults.plist
index 374f6ef..cdd5c8f 100644
--- a/tikzit/English.lproj/UserDefaults.plist
+++ b/tikzit/English.lproj/UserDefaults.plist
@@ -2,7 +2,9 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
- <key>testDefaultsHandler</key>
- <string>foo</string>
+ <key>net.sourceforge.tikzit.pdflatexpath</key>
+ <string>/usr/texbin/pdflatex</string>
+ <key>net.sourceforge.tikzit.previewfocus</key>
+ <false/>
</dict>
</plist>
diff --git a/tikzit/src/osx/AppDelegate.m b/tikzit/src/osx/AppDelegate.m
index ad1d407..87d3ae0 100644
--- a/tikzit/src/osx/AppDelegate.m
+++ b/tikzit/src/osx/AppDelegate.m
@@ -77,34 +77,14 @@
}
+ (void)setDefaults{
- NSLog(@"Setting defaults...");
-
NSString *userDefaultsValuesPath;
NSDictionary *userDefaultsValuesDict;
- NSDictionary *initialValuesDict;
- NSArray *resettableUserDefaultsKeys;
- // load the default values for the user defaults
userDefaultsValuesPath=[[NSBundle mainBundle] pathForResource:@"UserDefaults"
ofType:@"plist"];
userDefaultsValuesDict=[NSDictionary dictionaryWithContentsOfFile:userDefaultsValuesPath];
- NSLog(@"Defaults dict: %@",userDefaultsValuesDict);
-
- // set them in the standard user defaults
[[NSUserDefaults standardUserDefaults] registerDefaults:userDefaultsValuesDict];
-
- // if your application supports resetting a subset of the defaults to
- // factory values, you should set those values
- // in the shared user defaults controller
- //resettableUserDefaultsKeys=[NSArray arrayWithObjects:@"Value1",@"Value2",@"Value3",nil];
- //initialValuesDict=[userDefaultsValuesDict dictionaryWithValuesForKeys:resettableUserDefaultsKeys];
-
- // Set the initial values in the shared user defaults controller
- //[[NSUserDefaultsController sharedUserDefaultsController] setInitialValues:initialValuesDict];
-
-
- NSLog(@"Done with defaults...");
}
- (void)applicationWillTerminate:(NSNotification *)notification {
diff --git a/tikzit/src/osx/PreferenceController.h b/tikzit/src/osx/PreferenceController.h
index 9143851..bc6ed67 100644
--- a/tikzit/src/osx/PreferenceController.h
+++ b/tikzit/src/osx/PreferenceController.h
@@ -5,6 +5,22 @@
// Created by Karl Johan Paulsson on 26/02/2013.
// Copyright (c) 2013 Aleks Kissinger. All rights reserved.
//
+//
+// This file is part of TikZiT.
+//
+// TikZiT is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// TikZiT is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with TikZiT. If not, see <http://www.gnu.org/licenses/>.
+//
#import <Cocoa/Cocoa.h>
diff --git a/tikzit/src/osx/PreferenceController.m b/tikzit/src/osx/PreferenceController.m
index e2c9984..75d7ef7 100644
--- a/tikzit/src/osx/PreferenceController.m
+++ b/tikzit/src/osx/PreferenceController.m
@@ -5,6 +5,22 @@
// Created by Karl Johan Paulsson on 26/02/2013.
// Copyright (c) 2013 Aleks Kissinger. All rights reserved.
//
+//
+// This file is part of TikZiT.
+//
+// TikZiT is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// TikZiT is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with TikZiT. If not, see <http://www.gnu.org/licenses/>.
+//
#import "PreferenceController.h"
@@ -19,8 +35,6 @@
self = [super initWithWindow:window];
if (self) {
// Initialization code here.
- NSLog(@"preference controller is running...");
- NSLog(@"Test defaults: %@",[[NSUserDefaults standardUserDefaults] valueForKey:@"testDefaultsHandler"]);
}
return self;
@@ -87,7 +101,6 @@
NSRect newFrame = [self newFrameForNewContentView:view];
-
[NSAnimationContext beginGrouping];
if ([[NSApp currentEvent] modifierFlags] & NSShiftKeyMask)
diff --git a/tikzit/src/osx/Preferences.xib b/tikzit/src/osx/Preferences.xib
index 7184328..1b2d0c3 100644
--- a/tikzit/src/osx/Preferences.xib
+++ b/tikzit/src/osx/Preferences.xib
@@ -3,15 +3,17 @@
<data>
<int key="IBDocument.SystemTarget">1080</int>
<string key="IBDocument.SystemVersion">12C60</string>
- <string key="IBDocument.InterfaceBuilderVersion">2843</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2840</string>
<string key="IBDocument.AppKitVersion">1187.34</string>
<string key="IBDocument.HIToolboxVersion">625.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">2843</string>
+ <string key="NS.object.0">2840</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBNSLayoutConstraint</string>
+ <string>NSButton</string>
+ <string>NSButtonCell</string>
<string>NSCustomObject</string>
<string>NSCustomView</string>
<string>NSTextField</string>
@@ -100,7 +102,7 @@
<int key="NSToolbarItemVisibilityPriority">0</int>
</object>
</dictionary>
- <array class="NSMutableArray" key="NSToolbarIBAllowedItems">
+ <array key="NSToolbarIBAllowedItems">
<reference ref="914743654"/>
<reference ref="641338426"/>
</array>
@@ -119,7 +121,7 @@
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
</object>
- <string key="NSScreenRect">{{0, 0}, {1600, 1200}}</string>
+ <string key="NSScreenRect">{{0, 0}, {1680, 1050}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
@@ -127,25 +129,57 @@
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSTextField" id="762565485">
+ <object class="NSButton" id="764495169">
<reference key="NSNextResponder" ref="103531975"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{20, 32}, {96, 22}}</string>
+ <string key="NSFrame">{{18, 15}, {215, 18}}</string>
<reference key="NSSuperview" ref="103531975"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="186397132">
- <int key="NSCellFlags">-1804599231</int>
- <int key="NSCellFlags2">272630784</int>
- <string key="NSContents"/>
+ <object class="NSButtonCell" key="NSCell" id="292348615">
+ <int key="NSCellFlags">-2080374784</int>
+ <int key="NSCellFlags2">268435456</int>
+ <string key="NSContents">Bring preview window to focus</string>
<object class="NSFont" key="NSSupport" id="924461577">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
<string key="NSCellIdentifier">_NS:9</string>
+ <reference key="NSControlView" ref="764495169"/>
+ <int key="NSButtonFlags">1211912448</int>
+ <int key="NSButtonFlags2">2</int>
+ <object class="NSCustomResource" key="NSNormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSSwitch</string>
+ </object>
+ <object class="NSButtonImageSource" key="NSAlternateImage">
+ <string key="NSImageName">NSSwitch</string>
+ </object>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ </object>
+ <object class="NSTextField" id="762565485">
+ <reference key="NSNextResponder" ref="103531975"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{20, 39}, {440, 22}}</string>
+ <reference key="NSSuperview" ref="103531975"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="764495169"/>
+ <string key="NSReuseIdentifierKey">_NS:9</string>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="186397132">
+ <int key="NSCellFlags">-1804599231</int>
+ <int key="NSCellFlags2">272630784</int>
+ <string key="NSContents"/>
+ <reference key="NSSupport" ref="924461577"/>
+ <string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="762565485"/>
<bool key="NSDrawsBackground">YES</bool>
<object class="NSColor" key="NSBackgroundColor">
@@ -172,7 +206,7 @@
<object class="NSTextField" id="539123669">
<reference key="NSNextResponder" ref="103531975"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 69}, {47, 17}}</string>
+ <string key="NSFrame">{{17, 69}, {142, 17}}</string>
<reference key="NSSuperview" ref="103531975"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="762565485"/>
@@ -181,7 +215,7 @@
<object class="NSTextFieldCell" key="NSCell" id="459248896">
<int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">272630784</int>
- <string key="NSContents">Engine</string>
+ <string key="NSContents">pdfLaTeX source path</string>
<reference key="NSSupport" ref="924461577"/>
<string key="NSCellIdentifier">_NS:1535</string>
<reference key="NSControlView" ref="539123669"/>
@@ -300,19 +334,35 @@
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
- <string key="label">value: values.testDefaultsHandlerOther</string>
+ <string key="label">value: values.net.sourceforge.tikzit.pdflatexpath</string>
<reference key="source" ref="186397132"/>
<reference key="destination" ref="706090457"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="186397132"/>
<reference key="NSDestination" ref="706090457"/>
- <string key="NSLabel">value: values.testDefaultsHandlerOther</string>
+ <string key="NSLabel">value: values.net.sourceforge.tikzit.pdflatexpath</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">values.net.sourceforge.tikzit.pdflatexpath</string>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">54</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">value: values.net.sourceforge.tikzit.previewfocus</string>
+ <reference key="source" ref="292348615"/>
+ <reference key="destination" ref="706090457"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="292348615"/>
+ <reference key="NSDestination" ref="706090457"/>
+ <string key="NSLabel">value: values.net.sourceforge.tikzit.previewfocus</string>
<string key="NSBinding">value</string>
- <string key="NSKeyPath">values.testDefaultsHandlerOther</string>
+ <string key="NSKeyPath">values.net.sourceforge.tikzit.previewfocus</string>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
- <int key="connectionID">52</int>
+ <int key="connectionID">62</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
@@ -378,8 +428,24 @@
<int key="objectID">13</int>
<reference key="object" ref="103531975"/>
<array class="NSMutableArray" key="children">
- <object class="IBNSLayoutConstraint" id="783720041">
- <reference key="firstItem" ref="762565485"/>
+ <object class="IBNSLayoutConstraint" id="728277728">
+ <reference key="firstItem" ref="764495169"/>
+ <int key="firstAttribute">3</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="762565485"/>
+ <int key="secondAttribute">4</int>
+ <float key="multiplier">1</float>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">8</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="103531975"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="116293249">
+ <reference key="firstItem" ref="764495169"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="103531975"/>
@@ -394,20 +460,52 @@
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
- <object class="IBNSLayoutConstraint" id="716469509">
+ <object class="IBNSLayoutConstraint" id="206376115">
+ <reference key="firstItem" ref="103531975"/>
+ <int key="firstAttribute">6</int>
+ <int key="relation">0</int>
+ <reference key="secondItem" ref="762565485"/>
+ <int key="secondAttribute">6</int>
+ <float key="multiplier">1</float>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">20</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="103531975"/>
+ <int key="scoringType">8</int>
+ <float key="scoringTypeFloat">29</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="921593038">
<reference key="firstItem" ref="762565485"/>
<int key="firstAttribute">3</int>
<int key="relation">0</int>
+ <reference key="secondItem" ref="539123669"/>
+ <int key="secondAttribute">4</int>
+ <float key="multiplier">1</float>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">8</double>
+ </object>
+ <float key="priority">1000</float>
+ <reference key="containingView" ref="103531975"/>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">3</int>
+ </object>
+ <object class="IBNSLayoutConstraint" id="783720041">
+ <reference key="firstItem" ref="762565485"/>
+ <int key="firstAttribute">5</int>
+ <int key="relation">0</int>
<reference key="secondItem" ref="103531975"/>
- <int key="secondAttribute">3</int>
+ <int key="secondAttribute">5</int>
<float key="multiplier">1</float>
- <object class="IBLayoutConstant" key="constant">
- <double key="value">42</double>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">20</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="103531975"/>
- <int key="scoringType">3</int>
- <float key="scoringTypeFloat">9</float>
+ <int key="scoringType">8</int>
+ <float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="338893657">
@@ -444,6 +542,7 @@
</object>
<reference ref="539123669"/>
<reference ref="762565485"/>
+ <reference ref="764495169"/>
</array>
<reference key="parent" ref="0"/>
</object>
@@ -538,22 +637,6 @@
<reference key="object" ref="762565485"/>
<array class="NSMutableArray" key="children">
<reference ref="186397132"/>
- <object class="IBNSLayoutConstraint" id="995764589">
- <reference key="firstItem" ref="762565485"/>
- <int key="firstAttribute">7</int>
- <int key="relation">0</int>
- <nil key="secondItem"/>
- <int key="secondAttribute">0</int>
- <float key="multiplier">1</float>
- <object class="IBLayoutConstant" key="constant">
- <double key="value">96</double>
- </object>
- <float key="priority">1000</float>
- <reference key="containingView" ref="762565485"/>
- <int key="scoringType">3</int>
- <float key="scoringTypeFloat">9</float>
- <int key="contentType">1</int>
- </object>
</array>
<reference key="parent" ref="103531975"/>
</object>
@@ -563,16 +646,6 @@
<reference key="parent" ref="762565485"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">34</int>
- <reference key="object" ref="995764589"/>
- <reference key="parent" ref="762565485"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">35</int>
- <reference key="object" ref="716469509"/>
- <reference key="parent" ref="103531975"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">36</int>
<reference key="object" ref="783720041"/>
<reference key="parent" ref="103531975"/>
@@ -582,6 +655,39 @@
<reference key="object" ref="706090457"/>
<reference key="parent" ref="0"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">55</int>
+ <reference key="object" ref="921593038"/>
+ <reference key="parent" ref="103531975"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">56</int>
+ <reference key="object" ref="206376115"/>
+ <reference key="parent" ref="103531975"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">57</int>
+ <reference key="object" ref="764495169"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="292348615"/>
+ </array>
+ <reference key="parent" ref="103531975"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">58</int>
+ <reference key="object" ref="292348615"/>
+ <reference key="parent" ref="764495169"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">59</int>
+ <reference key="object" ref="116293249"/>
+ <reference key="parent" ref="103531975"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">60</int>
+ <reference key="object" ref="728277728"/>
+ <reference key="parent" ref="103531975"/>
+ </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -596,8 +702,11 @@
<array key="13.IBNSViewMetadataConstraints">
<reference ref="559306534"/>
<reference ref="338893657"/>
- <reference ref="716469509"/>
<reference ref="783720041"/>
+ <reference ref="921593038"/>
+ <reference ref="206376115"/>
+ <reference ref="116293249"/>
+ <reference ref="728277728"/>
</array>
<string key="13.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array class="NSMutableArray" key="14.IBNSViewMetadataConstraints">
@@ -616,23 +725,25 @@
<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="30.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="31.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <array key="32.IBNSViewMetadataConstraints">
- <reference ref="995764589"/>
- </array>
<boolean value="NO" key="32.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="32.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="33.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="34.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="35.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="36.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="39.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="55.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="NO" key="57.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+ <string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="59.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="60.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">52</int>
+ <int key="maxID">62</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -675,10 +786,10 @@
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
- <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
- <string key="NS.key.0">NSPreferencesGeneral</string>
- <string key="NS.object.0">{32, 32}</string>
- </object>
+ <dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <string key="NSPreferencesGeneral">{32, 32}</string>
+ <string key="NSSwitch">{15, 15}</string>
+ </dictionary>
<bool key="IBDocument.UseAutolayout">YES</bool>
</data>
</archive>
diff --git a/tikzit/src/osx/PreviewController.m b/tikzit/src/osx/PreviewController.m
index 76c5ced..7c41562 100644
--- a/tikzit/src/osx/PreviewController.m
+++ b/tikzit/src/osx/PreviewController.m
@@ -45,7 +45,11 @@ static PreviewController *preview = nil;
// Only build one tex file at a time, so we don't get funky results.
//[latexLock lock];
[progressIndicator startAnimation:self];
-
+
+ if([[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.previewfocus"]){
+ [[preview window] makeKeyAndOrderFront:self];
+ }
+
int fnum = typesetCount++;
NSString *tex = [NSString stringWithFormat:@"%@%@%@",
@@ -57,12 +61,14 @@ static PreviewController *preview = nil;
NSString *pdfFile = [NSString stringWithFormat:@"%@/tikzit_%d.pdf", tempDir, fnum];
[tex writeToFile:texFile atomically:NO encoding:NSUTF8StringEncoding error:NULL];
+
+ NSString *pdflatexPath = [[NSUserDefaults standardUserDefaults] stringForKey:@"net.sourceforge.tikzit.pdflatexpath"];
// We run pdflatex in a bash shell to have easy access to the setup from unix-land
NSTask *latexTask = [[NSTask alloc] init];
[latexTask setCurrentDirectoryPath:tempDir];
[latexTask setLaunchPath:@"/bin/bash"];
-
+
// This assumes the user has $PATH set up to find pdflatex in either .profile
// or .bashrc. This should be improved to take other path setups into account
// and to be customisable.
@@ -70,10 +76,9 @@ static PreviewController *preview = nil;
[NSString stringWithFormat:
@"if [ -e ~/.profile ]; then source ~/.profile; fi\n"
@"if [ -e ~/.bashrc ]; then source ~/.bashrc; fi\n"
- @"pdflatex -interaction=nonstopmode -output-format=pdf -halt-on-error '%@'\n",
- texFile];
+ @"%@ -interaction=nonstopmode -output-format=pdf -halt-on-error '%@'\n", pdflatexPath, texFile];
- //NSLog(@"Telling bash: %@", latexCmd);
+ NSLog(@"Telling bash: %@", latexCmd);
NSPipe *pout = [NSPipe pipe];
NSPipe *pin = [NSPipe pipe];
@@ -94,9 +99,15 @@ static PreviewController *preview = nil;
[latexTask waitUntilExit];
if ([latexTask terminationStatus] != 0) {
- [errorTextView setHidden:YES];
- [errorText setString:[@"\nAN ERROR HAS OCCURRED, PDFLATEX SAID:\n\n" stringByAppendingString:str]];
- [errorTextView setHidden:NO];
+ if ([latexTask terminationStatus] == 127) {
+ [errorTextView setHidden:YES];
+ [errorText setString:@"\nCouldn't find pdflatex, change settings and try again."];
+ [errorTextView setHidden:NO];
+ }else{
+ [errorTextView setHidden:YES];
+ [errorText setString:[@"\nAN ERROR HAS OCCURRED, PDFLATEX SAID:\n\n" stringByAppendingString:str]];
+ [errorTextView setHidden:NO];
+ }
} else {
[errorText setString:@""];
[errorTextView setHidden:YES];