diff options
-rw-r--r-- | tikzit/TikZiT.xcodeproj/project.pbxproj | 22 | ||||
-rw-r--r-- | tikzit/src/osx/PreferenceController.h | 4 | ||||
-rw-r--r-- | tikzit/src/osx/PreferenceController.m | 28 | ||||
-rw-r--r-- | tikzit/src/osx/Preferences.xib | 135 | ||||
-rw-r--r-- | tikzit/src/osx/UpdatePreferenceController.h | 34 | ||||
-rw-r--r-- | tikzit/src/osx/UpdatePreferenceController.m | 49 | ||||
-rw-r--r-- | tikzit/src/osx/UpdatePreferencePanel.xib | 95 |
7 files changed, 328 insertions, 39 deletions
diff --git a/tikzit/TikZiT.xcodeproj/project.pbxproj b/tikzit/TikZiT.xcodeproj/project.pbxproj index 8b4df9b..0205c67 100644 --- a/tikzit/TikZiT.xcodeproj/project.pbxproj +++ b/tikzit/TikZiT.xcodeproj/project.pbxproj @@ -116,6 +116,8 @@ 55F9585C1181B09600F99434 /* PickSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F958591181B09600F99434 /* PickSupport.m */; }; 55F9585D1181B09600F99434 /* Transformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9585B1181B09600F99434 /* Transformer.m */; }; 55F9E04511FF54F000F5659E /* NSString+LatexConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */; }; + 7F18A321184C577000BC3081 /* UpdatePreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F18A320184C577000BC3081 /* UpdatePreferenceController.m */; }; + 7F18A323184C599100BC3081 /* UpdatePreferencePanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7F18A322184C599100BC3081 /* UpdatePreferencePanel.xib */; }; 7F6E2C7D16B007F000BFE20D /* EdgeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7814498C22006942FB /* EdgeStyle.m */; }; 7F6E2C7E16B0080400BFE20D /* GraphElementProperty.m in Sources */ = {isa = PBXBuildFile; fileRef = 55432E051444BF2D00401BB3 /* GraphElementProperty.m */; }; 7F6E2C7F16B0081D00BFE20D /* PropertyHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7E144999C4006942FB /* PropertyHolder.m */; }; @@ -370,6 +372,9 @@ 55F9E04311FF54F000F5659E /* NSString+LatexConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+LatexConstants.h"; path = "src/common/NSString+LatexConstants.h"; sourceTree = "<group>"; }; 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+LatexConstants.m"; path = "src/common/NSString+LatexConstants.m"; sourceTree = "<group>"; }; 55FF4E64116A401B000C22B4 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; }; + 7F18A31F184C577000BC3081 /* UpdatePreferenceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UpdatePreferenceController.h; path = src/osx/UpdatePreferenceController.h; sourceTree = "<group>"; }; + 7F18A320184C577000BC3081 /* UpdatePreferenceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UpdatePreferenceController.m; path = src/osx/UpdatePreferenceController.m; sourceTree = "<group>"; }; + 7F18A322184C599100BC3081 /* UpdatePreferencePanel.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = UpdatePreferencePanel.xib; path = src/osx/UpdatePreferencePanel.xib; sourceTree = "<group>"; }; 7F6E2C8716B0091300BFE20D /* maths.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = maths.m; path = src/common/test/maths.m; sourceTree = "<group>"; }; 7F734388184AC559002897D0 /* DraggablePDFView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DraggablePDFView.h; path = src/osx/DraggablePDFView.h; sourceTree = "<group>"; }; 7F734389184AC559002897D0 /* DraggablePDFView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DraggablePDFView.m; path = src/osx/DraggablePDFView.m; sourceTree = "<group>"; }; @@ -514,6 +519,7 @@ 55D945701165904F0044178C /* tikzitdoc.icns */, 55D945711165904F0044178C /* tikzit.icns */, 7F90E88C16DD47540069EBCD /* Preferences.xib */, + 7F18A322184C599100BC3081 /* UpdatePreferencePanel.xib */, 55391AF713D3250F007DBE71 /* Preamble.xib */, 55391AF513D324FE007DBE71 /* Preview.xib */, 55391B0013D32608007DBE71 /* PropertyInspector.xib */, @@ -686,8 +692,7 @@ 55CA997112F08281008F0368 /* TikzWindowController.m */, 553A4C58144ED3D500AA6FAC /* NilToEmptyStringTransformer.h */, 553A4C59144ED3D500AA6FAC /* NilToEmptyStringTransformer.m */, - 7F90E88A16DD47540069EBCD /* PreferenceController.h */, - 7F90E88B16DD47540069EBCD /* PreferenceController.m */, + 7F18A31E184C563800BC3081 /* Preferences */, ); name = Gui; sourceTree = "<group>"; @@ -731,6 +736,17 @@ name = StylePalette; sourceTree = "<group>"; }; + 7F18A31E184C563800BC3081 /* Preferences */ = { + isa = PBXGroup; + children = ( + 7F90E88A16DD47540069EBCD /* PreferenceController.h */, + 7F90E88B16DD47540069EBCD /* PreferenceController.m */, + 7F18A31F184C577000BC3081 /* UpdatePreferenceController.h */, + 7F18A320184C577000BC3081 /* UpdatePreferenceController.m */, + ); + name = Preferences; + sourceTree = "<group>"; + }; 7FB9BFE616B54BE300773146 /* Formatter */ = { isa = PBXGroup; children = ( @@ -845,6 +861,7 @@ 55397C8D1449ABFC006942FB /* AH_latex_tail.png in Resources */, 55397C901449AC7C006942FB /* AH_latex_head.png in Resources */, 55397C911449AC7C006942FB /* AH_plain_head.png in Resources */, + 7F18A323184C599100BC3081 /* UpdatePreferencePanel.xib in Resources */, 7F90E88E16DD47540069EBCD /* Preferences.xib in Resources */, 7F90E89116DD54440069EBCD /* UserDefaults.plist in Resources */, ); @@ -954,6 +971,7 @@ 7F781C1A16B5DE1400239826 /* ParseErrorView.m in Sources */, 7F90E88616DD29600069EBCD /* NSString+Tikz.m in Sources */, 7F90E88D16DD47540069EBCD /* PreferenceController.m in Sources */, + 7F18A321184C577000BC3081 /* UpdatePreferenceController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/tikzit/src/osx/PreferenceController.h b/tikzit/src/osx/PreferenceController.h index bc6ed67..04fd324 100644 --- a/tikzit/src/osx/PreferenceController.h +++ b/tikzit/src/osx/PreferenceController.h @@ -23,11 +23,15 @@ // #import <Cocoa/Cocoa.h> +#import "UpdatePreferenceController.h" @interface PreferenceController : NSWindowController{ IBOutlet NSView *engineView; IBOutlet NSView *generalView; + IBOutlet NSView *updateView; + + UpdatePreferenceController *updateController; int currentViewTag; } diff --git a/tikzit/src/osx/PreferenceController.m b/tikzit/src/osx/PreferenceController.m index 75d7ef7..6ccedd0 100644 --- a/tikzit/src/osx/PreferenceController.m +++ b/tikzit/src/osx/PreferenceController.m @@ -30,25 +30,7 @@ @implementation PreferenceController -- (id)initWithWindow:(NSWindow *)window -{ - self = [super initWithWindow:window]; - if (self) { - // Initialization code here. - } - - return self; -} - -- (void)windowDidLoad -{ - [super windowDidLoad]; - - // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file. -} - - (NSRect)newFrameForNewContentView:(NSView*)view { - NSWindow *window = [self window]; NSRect newFrameRect = [window frameRectForContentRect:[view frame]]; NSRect oldFrameRect = [window frame]; @@ -73,6 +55,9 @@ case 1: view = engineView; break; + case 2: + view = updateView; + break; } return view; @@ -90,6 +75,11 @@ [[self window] setContentSize:[generalView frame].size]; [[[self window] contentView] addSubview:generalView]; [[[self window] contentView] setWantsLayer:YES]; + + updateController = [[UpdatePreferenceController alloc] initWithNibName:@"UpdatePreferencePanel" bundle:nil]; + [[updateController view] setFrame:[updateView frame]]; + [[[self window] contentView] replaceSubview:updateView with:[updateController view]]; + updateView = [updateController view]; } - (IBAction)switchView:(id)sender { @@ -110,7 +100,7 @@ [[[self window] animator] setFrame:newFrame display:YES]; [NSAnimationContext endGrouping]; - + } @end diff --git a/tikzit/src/osx/Preferences.xib b/tikzit/src/osx/Preferences.xib index 1b2d0c3..3cf1677 100644 --- a/tikzit/src/osx/Preferences.xib +++ b/tikzit/src/osx/Preferences.xib @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00"> <data> - <int key="IBDocument.SystemTarget">1080</int> - <string key="IBDocument.SystemVersion">12C60</string> - <string key="IBDocument.InterfaceBuilderVersion">2840</string> - <string key="IBDocument.AppKitVersion">1187.34</string> - <string key="IBDocument.HIToolboxVersion">625.00</string> + <int key="IBDocument.SystemTarget">1070</int> + <string key="IBDocument.SystemVersion">13A603</string> + <string key="IBDocument.InterfaceBuilderVersion">4514</string> + <string key="IBDocument.AppKitVersion">1265</string> + <string key="IBDocument.HIToolboxVersion">695.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">2840</string> + <string key="NS.object.0">4514</string> </object> <array key="IBDocument.IntegratedClassDependencies"> <string>IBNSLayoutConstraint</string> @@ -60,6 +60,28 @@ <int key="NSToolbarDisplayMode">1</int> <int key="NSToolbarSizeMode">1</int> <dictionary class="NSMutableDictionary" key="NSToolbarIBIdentifiedItems"> + <object class="NSToolbarItem" key="197F9408-AFB0-404B-B2B6-4DB1250B0A80" id="585789983"> + <object class="NSMutableString" key="NSToolbarItemIdentifier"> + <characters key="NS.bytes">197F9408-AFB0-404B-B2B6-4DB1250B0A80</characters> + </object> + <string key="NSToolbarItemLabel">Update</string> + <string key="NSToolbarItemPaletteLabel">Update</string> + <string key="NSToolbarItemToolTip"/> + <nil key="NSToolbarItemView"/> + <object class="NSCustomResource" key="NSToolbarItemImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSUserAccounts</string> + </object> + <nil key="NSToolbarItemTarget"/> + <nil key="NSToolbarItemAction"/> + <string key="NSToolbarItemMinSize">{0, 0}</string> + <string key="NSToolbarItemMaxSize">{0, 0}</string> + <bool key="NSToolbarItemEnabled">YES</bool> + <bool key="NSToolbarItemAutovalidates">YES</bool> + <int key="NSToolbarItemTag">2</int> + <bool key="NSToolbarIsUserRemovable">YES</bool> + <int key="NSToolbarItemVisibilityPriority">0</int> + </object> <object class="NSToolbarItem" key="A3DDD070-5637-444B-92C6-905084CAC389" id="914743654"> <object class="NSMutableString" key="NSToolbarItemIdentifier"> <characters key="NS.bytes">A3DDD070-5637-444B-92C6-905084CAC389</characters> @@ -102,26 +124,27 @@ <int key="NSToolbarItemVisibilityPriority">0</int> </object> </dictionary> - <array key="NSToolbarIBAllowedItems"> + <array class="NSMutableArray" key="NSToolbarIBAllowedItems"> <reference ref="914743654"/> + <reference ref="585789983"/> <reference ref="641338426"/> </array> - <array key="NSToolbarIBDefaultItems"> + <array class="NSMutableArray" key="NSToolbarIBDefaultItems"> <reference ref="914743654"/> <reference ref="641338426"/> + <reference ref="585789983"/> </array> <array key="NSToolbarIBSelectableItems" id="0"/> </object> <nil key="NSUserInterfaceItemIdentifier"/> <object class="NSView" key="NSWindowView" id="1006"> <reference key="NSNextResponder"/> - <int key="NSvFlags">256</int> <string key="NSFrameSize">{480, 270}</string> <reference key="NSSuperview"/> <reference key="NSWindow"/> <reference key="NSNextKeyView"/> </object> - <string key="NSScreenRect">{{0, 0}, {1680, 1050}}</string> + <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> <string key="NSMaxSize">{10000000000000, 10000000000000}</string> <bool key="NSWindowIsRestorable">YES</bool> </object> @@ -132,7 +155,7 @@ <object class="NSButton" id="764495169"> <reference key="NSNextResponder" ref="103531975"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{18, 15}, {215, 18}}</string> + <string key="NSFrame">{{18, 15}, {214, 18}}</string> <reference key="NSSuperview" ref="103531975"/> <reference key="NSWindow"/> <reference key="NSNextKeyView"/> @@ -143,7 +166,7 @@ <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> + <string key="NSName">.LucidaGrandeUI</string> <double key="NSSize">13</double> <int key="NSfFlags">1044</int> </object> @@ -202,11 +225,12 @@ </object> </object> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + <int key="NSTextFieldAlignmentRectInsetsVersion">1</int> </object> <object class="NSTextField" id="539123669"> <reference key="NSNextResponder" ref="103531975"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 69}, {142, 17}}</string> + <string key="NSFrame">{{18, 69}, {140, 17}}</string> <reference key="NSSuperview" ref="103531975"/> <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="762565485"/> @@ -236,6 +260,7 @@ </object> </object> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + <int key="NSTextFieldAlignmentRectInsetsVersion">1</int> </object> </array> <string key="NSFrameSize">{480, 96}</string> @@ -269,6 +294,7 @@ <reference key="NSTextColor" ref="266723537"/> </object> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + <int key="NSTextFieldAlignmentRectInsetsVersion">1</int> </object> </array> <string key="NSFrameSize">{480, 96}</string> @@ -278,6 +304,17 @@ <string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSClassName">NSView</string> </object> + <object class="NSCustomView" id="661139406"> + <reference key="NSNextResponder"/> + <int key="NSvFlags">12</int> + <array class="NSMutableArray" key="NSSubviews"/> + <string key="NSFrameSize">{480, 115}</string> + <reference key="NSSuperview"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <string key="NSClassName">NSView</string> + </object> <object class="NSUserDefaultsController" id="706090457"> <bool key="NSSharedInstance">YES</bool> </object> @@ -325,6 +362,22 @@ <int key="connectionID">27</int> </object> <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">switchView:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="585789983"/> + </object> + <int key="connectionID">116</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">updateView</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="661139406"/> + </object> + <int key="connectionID">117</int> + </object> + <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">delegate</string> <reference key="source" ref="1005"/> @@ -411,6 +464,7 @@ <array class="NSMutableArray" key="children"> <reference ref="641338426"/> <reference ref="914743654"/> + <reference ref="585789983"/> </array> <reference key="parent" ref="1005"/> </object> @@ -443,6 +497,7 @@ <int key="scoringType">6</int> <float key="scoringTypeFloat">24</float> <int key="contentType">3</int> + <bool key="placeholder">NO</bool> </object> <object class="IBNSLayoutConstraint" id="116293249"> <reference key="firstItem" ref="764495169"/> @@ -456,9 +511,10 @@ </object> <float key="priority">1000</float> <reference key="containingView" ref="103531975"/> - <int key="scoringType">8</int> + <int key="scoringType">0</int> <float key="scoringTypeFloat">29</float> <int key="contentType">3</int> + <bool key="placeholder">NO</bool> </object> <object class="IBNSLayoutConstraint" id="206376115"> <reference key="firstItem" ref="103531975"/> @@ -472,9 +528,10 @@ </object> <float key="priority">1000</float> <reference key="containingView" ref="103531975"/> - <int key="scoringType">8</int> + <int key="scoringType">0</int> <float key="scoringTypeFloat">29</float> <int key="contentType">3</int> + <bool key="placeholder">NO</bool> </object> <object class="IBNSLayoutConstraint" id="921593038"> <reference key="firstItem" ref="762565485"/> @@ -491,6 +548,7 @@ <int key="scoringType">6</int> <float key="scoringTypeFloat">24</float> <int key="contentType">3</int> + <bool key="placeholder">NO</bool> </object> <object class="IBNSLayoutConstraint" id="783720041"> <reference key="firstItem" ref="762565485"/> @@ -504,9 +562,10 @@ </object> <float key="priority">1000</float> <reference key="containingView" ref="103531975"/> - <int key="scoringType">8</int> + <int key="scoringType">0</int> <float key="scoringTypeFloat">29</float> <int key="contentType">3</int> + <bool key="placeholder">NO</bool> </object> <object class="IBNSLayoutConstraint" id="338893657"> <reference key="firstItem" ref="539123669"/> @@ -523,6 +582,7 @@ <int key="scoringType">3</int> <float key="scoringTypeFloat">9</float> <int key="contentType">3</int> + <bool key="placeholder">NO</bool> </object> <object class="IBNSLayoutConstraint" id="559306534"> <reference key="firstItem" ref="539123669"/> @@ -536,9 +596,10 @@ </object> <float key="priority">1000</float> <reference key="containingView" ref="103531975"/> - <int key="scoringType">8</int> + <int key="scoringType">0</int> <float key="scoringTypeFloat">29</float> <int key="contentType">3</int> + <bool key="placeholder">NO</bool> </object> <reference ref="539123669"/> <reference ref="762565485"/> @@ -565,6 +626,7 @@ <int key="scoringType">5</int> <float key="scoringTypeFloat">22</float> <int key="contentType">2</int> + <bool key="placeholder">NO</bool> </object> <object class="IBNSLayoutConstraint" id="826972647"> <reference key="firstItem" ref="621229635"/> @@ -581,6 +643,7 @@ <int key="scoringType">5</int> <float key="scoringTypeFloat">22</float> <int key="contentType">2</int> + <bool key="placeholder">NO</bool> </object> <reference ref="621229635"/> </array> @@ -688,6 +751,17 @@ <reference key="object" ref="728277728"/> <reference key="parent" ref="103531975"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">64</int> + <reference key="object" ref="661139406"/> + <array class="NSMutableArray" key="children"/> + <reference key="parent" ref="0"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">115</int> + <reference key="object" ref="585789983"/> + <reference key="parent" ref="338765480"/> + </object> </array> </object> <dictionary class="NSMutableDictionary" key="flattenedProperties"> @@ -698,6 +772,7 @@ <string key="1.IBWindowTemplateEditedContentRect">{{357, 418}, {480, 270}}</string> <boolean value="NO" key="1.NSWindowTemplate.visibleAtLaunch"/> <string key="11.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="115.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="12.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <array key="13.IBNSViewMetadataConstraints"> <reference ref="559306534"/> @@ -738,16 +813,25 @@ <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> + <string key="64.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">62</int> + <int key="maxID">117</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <array class="NSMutableArray" key="referencedPartialClassDescriptions"> <object class="IBPartialClassDescription"> + <string key="className">NSLayoutConstraint</string> + <string key="superclassName">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">./Classes/NSLayoutConstraint.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">PreferenceController</string> <string key="superclassName">NSWindowController</string> <object class="NSMutableDictionary" key="actions"> @@ -764,6 +848,7 @@ <dictionary class="NSMutableDictionary" key="outlets"> <string key="engineView">NSView</string> <string key="generalView">NSView</string> + <string key="updateView">NSView</string> </dictionary> <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName"> <object class="IBToOneOutletInfo" key="engineView"> @@ -774,6 +859,10 @@ <string key="name">generalView</string> <string key="candidateClassName">NSView</string> </object> + <object class="IBToOneOutletInfo" key="updateView"> + <string key="name">updateView</string> + <string key="candidateClassName">NSView</string> + </object> </dictionary> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> @@ -784,11 +873,21 @@ </object> <int key="IBDocument.localizationMode">0</int> <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> + <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool> + <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> + <real value="1070" key="NS.object.0"/> + </object> + <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string> + <integer value="4600" key="NS.object.0"/> + </object> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <int key="IBDocument.defaultPropertyAccessControl">3</int> <dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> <string key="NSPreferencesGeneral">{32, 32}</string> <string key="NSSwitch">{15, 15}</string> + <string key="NSUserAccounts">{32, 32}</string> </dictionary> <bool key="IBDocument.UseAutolayout">YES</bool> </data> diff --git a/tikzit/src/osx/UpdatePreferenceController.h b/tikzit/src/osx/UpdatePreferenceController.h new file mode 100644 index 0000000..816322f --- /dev/null +++ b/tikzit/src/osx/UpdatePreferenceController.h @@ -0,0 +1,34 @@ +// +// UpdatePreferenceController.h +// TikZiT +// +// 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> +#import <Sparkle/Sparkle.h> + +@interface UpdatePreferenceController : NSViewController{ + IBOutlet SUUpdater *sharedUpdater; + IBOutlet NSDate *lastUpdate; +} + +- (IBAction)checkForUpdates:(id)sender; + +@end diff --git a/tikzit/src/osx/UpdatePreferenceController.m b/tikzit/src/osx/UpdatePreferenceController.m new file mode 100644 index 0000000..2ff270f --- /dev/null +++ b/tikzit/src/osx/UpdatePreferenceController.m @@ -0,0 +1,49 @@ +// +// UpdatePreferenceController.h +// TikZiT +// +// 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 "UpdatePreferenceController.h" + +@interface UpdatePreferenceController () + +@end + +@implementation UpdatePreferenceController + +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil +{ + self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; + if (self) { + sharedUpdater = [SUUpdater sharedUpdater]; + } + return self; +} + +- (IBAction)checkForUpdates:(id)sender{ + [sharedUpdater checkForUpdates:sender]; +} + +- (NSDate*)getLastUpdate{ + return [sharedUpdater lastUpdateCheckDate]; +} + +@end diff --git a/tikzit/src/osx/UpdatePreferencePanel.xib b/tikzit/src/osx/UpdatePreferencePanel.xib new file mode 100644 index 0000000..a9f57bd --- /dev/null +++ b/tikzit/src/osx/UpdatePreferencePanel.xib @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> + <dependencies> + <deployment defaultVersion="1070" identifier="macosx"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/> + </dependencies> + <objects> + <customObject id="-2" userLabel="File's Owner" customClass="UpdatePreferenceController"> + <connections> + <outlet property="view" destination="Rvg-HP-aJv" id="BaV-kv-ixT"/> + </connections> + </customObject> + <customObject id="QYw-wO-Hk1" customClass="SUUpdater"/> + <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/> + <customObject id="-3" userLabel="Application"/> + <customView autoresizesSubviews="NO" id="Rvg-HP-aJv"> + <rect key="frame" x="0.0" y="0.0" width="480" height="118"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + <subviews> + <button translatesAutoresizingMaskIntoConstraints="NO" id="r97-6h-YHZ"> + <rect key="frame" x="18" y="82" width="225" height="18"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + <buttonCell key="cell" type="check" title="Automatically check for updates" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="lJX-eh-125"> + <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> + <font key="font" metaFont="system"/> + </buttonCell> + <connections> + <action selector="checkForUpdates:" target="QYw-wO-Hk1" id="V6O-vN-gzU"/> + </connections> + </button> + <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rTe-Zb-gRB"> + <rect key="frame" x="247" y="77" width="75" height="26"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + <constraints> + <constraint firstAttribute="width" constant="70" id="E5t-Vq-EsW"/> + </constraints> + <popUpButtonCell key="cell" type="push" title="Hourly" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="3600" imageScaling="proportionallyDown" inset="2" id="1sH-Qj-rJY"> + <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="system"/> + <menu key="menu" title="OtherViews" id="Thn-kJ-wMh"> + <items> + <menuItem title="Hourly" state="on" tag="3600" id="pfB-GR-wmt"/> + <menuItem title="Daily" tag="86400" id="i4M-UZ-VYz"/> + <menuItem title="Weekly" tag="604800" id="xUT-n5-NQ6"/> + <menuItem title="Monthly" tag="2629800" id="6fb-Ll-N0L"/> + </items> + </menu> + </popUpButtonCell> + <connections> + <binding destination="QYw-wO-Hk1" name="enabled" keyPath="automaticallyChecksForUpdates" id="MEk-e1-13l"/> + <binding destination="QYw-wO-Hk1" name="selectedTag" keyPath="updateCheckInterval" id="ZgU-vh-YId"/> + </connections> + </popUpButton> + <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Edp-7i-rVO"> + <rect key="frame" x="151" y="40" width="179" height="32"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + <buttonCell key="cell" type="push" title="Check for update now" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="6TE-6d-y5s"> + <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="system"/> + </buttonCell> + <connections> + <action selector="checkForUpdates:" target="-2" id="3kl-5L-9j6"/> + </connections> + </button> + <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kog-eQ-eh0"> + <rect key="frame" x="18" y="20" width="444" height="14"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="center" title="Label" id="yBa-Dx-WK4"> + <font key="font" size="11" name="LucidaGrande"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> + <connections> + <binding destination="-2" name="value" keyPath="lastUpdate" id="ULc-O0-aZL"> + <dictionary key="options"> + <bool key="NSRaisesForNotApplicableKeys" value="NO"/> + <bool key="NSAllowsEditingMultipleValuesSelection" value="NO"/> + </dictionary> + </binding> + </connections> + </textFieldCell> + <connections> + <outlet property="formatter" destination="N9w-eT-NdL" id="Yn2-zV-GqY"/> + </connections> + </textField> + </subviews> + <constraints> + <constraint firstItem="r97-6h-YHZ" firstAttribute="top" secondItem="Rvg-HP-aJv" secondAttribute="top" constant="20" symbolic="YES" id="5PN-8T-E7N"/> + <constraint firstItem="rTe-Zb-gRB" firstAttribute="leading" secondItem="r97-6h-YHZ" secondAttribute="trailing" constant="8" symbolic="YES" id="JEG-EP-kMS"/> + <constraint firstItem="rTe-Zb-gRB" firstAttribute="baseline" secondItem="r97-6h-YHZ" secondAttribute="baseline" id="TAn-67-9cC"/> + <constraint firstItem="r97-6h-YHZ" firstAttribute="leading" secondItem="Rvg-HP-aJv" secondAttribute="leading" constant="20" symbolic="YES" id="o4v-st-ibG"/> + </constraints> + </customView> + <dateFormatter dateStyle="short" timeStyle="short" doesRelativeDateFormatting="YES" id="N9w-eT-NdL"/> + </objects> +</document>
\ No newline at end of file |