From 5532f8878b7219720de6145eabbe57efb894957c Mon Sep 17 00:00:00 2001 From: Johan Paulsson Date: Sun, 23 Mar 2014 02:48:06 +0000 Subject: Converting from GC to ARC This should only be for the osx specific code as all common files are left out. Hopefully this shouldn't introduce any problems on the other systems. --- tikzit/src/osx/Preferences.xib | 74 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 2 deletions(-) (limited to 'tikzit/src/osx/Preferences.xib') diff --git a/tikzit/src/osx/Preferences.xib b/tikzit/src/osx/Preferences.xib index 8247c8d..155cf71 100644 --- a/tikzit/src/osx/Preferences.xib +++ b/tikzit/src/osx/Preferences.xib @@ -126,6 +126,28 @@ YES 0 + + + CBA2626C-DD4C-4ADD-BD5D-26D21216D9A8 + + Custom Nodes + Custom Nodes + + + + NSImage + customshape + + + + {0, 0} + {0, 0} + YES + YES + 4 + YES + 0 + F85FE7C2-9847-4E58-8BF6-BE334E918CA7 @@ -149,15 +171,17 @@ 0 - + + + @@ -329,6 +353,17 @@ _NS:9 NSView + + + 12 + + {557, 354} + + + + _NS:9 + NSView + YES @@ -407,6 +442,22 @@ 121 + + + customNodeView + + + + 123 + + + + switchView: + + + + 125 + delegate @@ -496,6 +547,7 @@ + @@ -744,6 +796,16 @@ + + 122 + + + + + 124 + + + @@ -758,6 +820,8 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin @@ -794,7 +858,7 @@ - 121 + 125 @@ -813,12 +877,17 @@ + NSView NSView NSView NSView NSView + + customNodeView + NSView + engineView NSView @@ -859,6 +928,7 @@ {32, 32} {15, 15} + {32, 32} {32, 32} {32, 32} {32, 32} -- cgit v1.2.3 From 08be64f38faef12393854ee4da484b144752d77e Mon Sep 17 00:00:00 2001 From: Johan Paulsson Date: Tue, 25 Mar 2014 21:34:12 +0000 Subject: gui: adding a couple of preference options Added preference options for autocompletion and inspectors on top. --- tikzit/English.lproj/PropertyInspector.xib | 4548 +++++--------------------- tikzit/src/osx/PreferenceController.m | 6 +- tikzit/src/osx/Preferences.xib | 301 +- tikzit/src/osx/PropertyInspectorController.m | 7 +- tikzit/src/osx/StylePaletteController.m | 7 +- tikzit/src/osx/TikzFormatter.m | 4 + 6 files changed, 1052 insertions(+), 3821 deletions(-) (limited to 'tikzit/src/osx/Preferences.xib') diff --git a/tikzit/English.lproj/PropertyInspector.xib b/tikzit/English.lproj/PropertyInspector.xib index 91e30c3..9f19b5c 100644 --- a/tikzit/English.lproj/PropertyInspector.xib +++ b/tikzit/English.lproj/PropertyInspector.xib @@ -1,3779 +1,769 @@ - - - - 1070 - 12C60 - 2844 - 1187.34 - 625.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 2844 - - - IBCustomFormatter - NSArrayController - NSBox - NSButton - NSButtonCell - NSComboBox - NSComboBoxCell - NSCustomObject - NSCustomView - NSScrollView - NSScroller - NSTableColumn - NSTableHeaderView - NSTableView - NSTextField - NSTextFieldCell - NSView - NSWindowTemplate - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - PropertyInspectorController - - - FirstResponder - - - NSApplication - - - 151 - 2 - {{1219, 531}, {193, 256}} - -1540357120 - Property Inspector - NSPanel - - - {200, 230} - - - 256 - - - - 274 - {193, 256} - - - SFBInspectorView - - - {193, 256} - - - - {{0, 0}, {1920, 1200}} - {200, 246} - {10000000000000, 10000000000000} - YES - - - - 268 - - - - 268 - - - - 2304 - - - - 256 - {183, 74} - - - YES - NO - YES - - - 256 - {183, 17} - - - - - - - -2147483392 - {{224, 0}, {16, 17}} - - - - - 85 - 40 - 1000 - - 75497536 - 2048 - Key/Atom - - LucidaGrande - 11 - 3100 - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - 3 - MAA - - - - - 337641536 - 2048 - Text Cell - - LucidaGrande - 11 - 16 - - - - 6 - System - controlBackgroundColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - - - 3 - YES - YES - - - - 92 - 40 - 1000 - - 75497536 - 2048 - Value - - - - - - 337641536 - 2048 - Text Cell - - - - - - 3 - YES - YES - - - - 3 - 2 - - 3 - MQA - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - -700448768 - - - 4 - 15 - 0 - YES - 0 - 1 - - - {{1, 17}, {183, 74}} - - - - - 4 - - - - -2147483392 - {{224, 17}, {15, 102}} - - - NO - - _doScroller: - 0.87903225806451613 - - - - -2147483392 - {{1, 75}, {183, 16}} - - - NO - 1 - - _doScroller: - 0.99450549450549453 - - - - 2304 - - - - {{1, 0}, {183, 17}} - - - - - 4 - - - {{4, 31}, {185, 92}} - - - 133682 - - - - - QSAAAEEgAABBmAAAQZgAAA - 0.25 - 4 - 1 - - - - 268 - {{54, 127}, {134, 19}} - - - YES - - -1804599231 - 272630784 - - - - YES - - 6 - System - textBackgroundColor - - - - 6 - System - textColor - - - - NO - - - - 292 - {{53, 3}, {26, 26}} - - - YES - - -2080374784 - 134217728 - - - LucidaGrande - 13 - 1044 - - - -2033434624 - 162 - - NSImage - NSRemoveTemplate - - - - 400 - 75 - - NO - - - - 292 - {{28, 3}, {26, 26}} - - - YES - - -2080374784 - 134217728 - a - - LucidaGrande - 9 - 16 - - - -2033434624 - 162 - - NSImage - NSAddTemplate - - - - 400 - 75 - - NO - - - - 292 - {{4, 3}, {26, 26}} - - - YES - - -2080374784 - 134217728 - - - - -2032386048 - 162 - - - - 400 - 75 - - NO - - - - 268 - {{7, 128}, {38, 14}} - - - YES - - 68157504 - 272630784 - Label - - LucidaGrande-Bold - 11 - 16 - - - - 6 - System - controlColor - - - - - NO - - - {193, 152} - - - NSView - - - - 268 - - - - 268 - - - - 2304 - - - - 256 - {183, 74} - - - YES - NO - YES - - - 256 - {183, 17} - - - - - - - -2147483392 - {{224, 0}, {16, 17}} - - - - - 85 - 40 - 1000 - - 75497536 - 2048 - Key/Atom - - - 3 - MC4zMzMzMzI5ODU2AA - - - - - 337641536 - 2048 - Text Cell - - - - - - 3 - YES - YES - - - - 92 - 40 - 1000 - - 75497536 - 2048 - Value - - - - - - 337641536 - 2048 - Text Cell - - - - - - 3 - YES - YES - - - - 3 - 2 - - - 17 - -700448768 - - - 4 - 15 - 0 - YES - 0 - 1 - - - {{1, 17}, {183, 74}} - - - - - 4 - - - - -2147483392 - {{224, 17}, {15, 102}} - - - NO - - _doScroller: - 0.87903225806451613 - - - - -2147483392 - {{1, 75}, {183, 16}} - - - NO - 1 - - _doScroller: - 0.99450549450549453 - - - - 2304 - - - - {{1, 0}, {183, 17}} - - - - - 4 - - - {{4, 33}, {185, 92}} - - - 133682 - - - - - QSAAAEEgAABBmAAAQZgAAA - 0.25 - 4 - 1 - - - - 292 - {{53, 4}, {26, 26}} - - - YES - - -2080374784 - 134217728 - - - - -2033434624 - 162 - - - - 400 - 75 - - NO - - - - 292 - {{28, 4}, {26, 26}} - - - YES - - -2080374784 - 134217728 - a - - - -2033434624 - 162 - - - - 400 - 75 - - NO - - - - 292 - {{4, 4}, {26, 26}} - - - YES - - -2080374784 - 134217728 - - - - -2032386048 - 162 - - - - 400 - 75 - - NO - - - {193, 130} - - - NSView - - - - 268 - - - - 268 - {{59, 152}, {133, 26}} - - - _NS:9 - YES - - 342884416 - 272630784 - - - _NS:9 - - YES - - - 5 - YES - YES - - - - 274 - {13, 0} - - - _NS:24 - YES - NO - YES - - - 10 - 10 - 1000 - - 75497472 - 0 - - - LucidaGrande - 12 - 16 - - - 3 - MC4zMzMzMzI5ODU2AA - - - - - 338690112 - 1024 - - - YES - - - - 3 - YES - - - - 3 - 2 - - - 19 - tableViewAction: - -765427712 - - - - 1 - 15 - 0 - YES - 0 - 1 - - - NO - - - - 268 - {{59, 178}, {133, 26}} - - - _NS:9 - YES - - 342884416 - 272630784 - - - _NS:9 - - YES - - - 5 - YES - YES - - - - 274 - {13, 0} - - - _NS:24 - YES - NO - YES - - - 10 - 10 - 1000 - - 75497472 - 0 - - - - 3 - MC4zMzMzMzI5ODU2AA - - - - - 338690112 - 1024 - - - YES - - - - 3 - YES - - - - 3 - 2 - - - 19 - tableViewAction: - -765427712 - - - - 1 - 15 - 0 - YES - 0 - 1 - - - NO - - - - 12 - {{4, 146}, {185, 5}} - - - {0, 0} - - 67108864 - 0 - Box - - - - 3 - MCAwLjgwMDAwMDAxMTkAA - - - 3 - 2 - 0 - NO - - - - 268 - {{55, 107}, {134, 19}} - - - YES - - -1804599231 - 272630784 - - - - YES - - - - NO - - - - 268 - {{12, 159}, {42, 14}} - - - YES - - 68157504 - 272630784 - Target - - - - - - NO - - - - 268 - {{12, 185}, {42, 14}} - - - YES - - 68157504 - 272630784 - Source - - - - - - NO - - - - 268 - {{4, 202}, {51, 14}} - - - YES - - 68157504 - 272630784 - Anchors - - - - - - NO - - - - 268 - {{8, 107}, {38, 14}} - - - YES - - 68157504 - 272630784 - Label - - - - - - NO - - - - 268 - {{3, 126}, {82, 18}} - - - YES - - 67108864 - 0 - Child Node - - - 1211912448 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - NO - - - - 268 - - - - 2304 - - - - 256 - {183, 44} - - - YES - NO - YES - - - 256 - {183, 17} - - - - - - - -2147483392 - {{224, 0}, {16, 17}} - - - - 85 - 40 - 1000 - - 75497536 - 2048 - Key/Atom - - - 3 - MC4zMzMzMzI5ODU2AA - - - - - 337641536 - 2048 - Text Cell - - - - - - 3 - YES - YES - - - - 92 - 40 - 1000 - - 75497536 - 2048 - Value - - - - - - 337641536 - 2048 - Text Cell - - - - - - 3 - YES - YES - - - - 3 - 2 - - - 17 - -700448768 - - - 4 - 15 - 0 - YES - 0 - 1 - - - {{1, 17}, {183, 44}} - - - - - 4 - - - - -2147483392 - {{224, 17}, {15, 102}} - - - NO - - _doScroller: - 0.87903225806451613 - - - - -2147483392 - {{1, 45}, {183, 16}} - - - NO - 1 - - _doScroller: - 0.99450549450549453 - - - - 2304 - - - - {{1, 0}, {183, 17}} - - - - - 4 - - - {{4, 37}, {185, 62}} - - - 133682 - - - - - QSAAAEEgAABBmAAAQZgAAA - 0.25 - 4 - 1 - - - - 268 - - - - 2304 - - - - 256 - {183, 74} - - - YES - NO - YES - - - 256 - {183, 17} - - - - - - - -2147483392 - {{224, 0}, {16, 17}} - - - - - 85 - 40 - 1000 - - 75497536 - 2048 - Key/Atom - - - 3 - MC4zMzMzMzI5ODU2AA - - - - - 337641536 - 2048 - Text Cell - - - - - - 3 - YES - YES - - - - 92 - 40 - 1000 - - 75497536 - 2048 - Value - - - - - - 337641536 - 2048 - Text Cell - - - - - - 3 - YES - YES - - - - 3 - 2 - - - 17 - -700448768 - - - 4 - 15 - 0 - YES - 0 - 1 - - - {{1, 17}, {183, 74}} - - - - - 4 - - - - -2147483392 - {{224, 17}, {15, 102}} - - - NO - - _doScroller: - 0.87903225806451613 - - - - -2147483392 - {{1, 75}, {183, 16}} - - - NO - 1 - - _doScroller: - 0.99450549450549453 - - - - 2304 - - - - {{1, 0}, {183, 17}} - - - - - 4 - - - {{4, 247}, {185, 92}} - - - 133682 - - - - - QSAAAEEgAABBmAAAQZgAAA - 0.25 - 4 - 1 - - - - 292 - {{53, 8}, {26, 26}} - - - YES - - -2080374784 - 134217728 - - - - -2033434624 - 162 - - - - 400 - 75 - - NO - - - - 292 - {{28, 8}, {26, 26}} - - - YES - - -2080374784 - 134217728 - a - - - -2033434624 - 162 - - - - 400 - 75 - - NO - - - - 292 - {{4, 8}, {26, 26}} - - - YES - - -2080374784 - 134217728 - - - - -2032386048 - 162 - - - - 400 - 75 - - NO - - - - 292 - {{53, 218}, {26, 26}} - - - YES - - -2080374784 - 134217728 - - - - -2033434624 - 162 - - - - 400 - 75 - - NO - - - - 292 - {{28, 218}, {26, 26}} - - - YES - - -2080374784 - 134217728 - a - - - -2033434624 - 162 - - - - 400 - 75 - - NO - - - - 292 - {{4, 218}, {26, 26}} - - - YES - - -2080374784 - 134217728 - - - - -2032386048 - 162 - - - - 400 - 75 - - NO - - - {193, 344} - - - NSView - - - - key - value - isAtom - - Property - YES - - YES - YES - YES - YES - YES - - - - key - value - isAtom - - Property - YES - - YES - YES - YES - YES - YES - - - - key - value - isAtom - - Property - YES - - YES - YES - YES - YES - YES - - - - key - value - isAtom - - Property - YES - - YES - YES - YES - YES - YES - - - - label - - Node - YES - - YES - YES - YES - YES - YES - - - - edgeNode - - Edge - YES - - YES - YES - YES - YES - YES - - - - 268 - {51, 14} - - YES - - 68157504 - 272630784 - Anchors - - - - - - NO - - - - 268 - {134, 19} - YES - - -1804599231 - 272630784 - - - - YES - - - - NO - - - YES - - YES - YES - YES - YES - YES - - - YES - - YES - YES - YES - YES - YES - - - - - - - - nodePropertiesView - - - - 188 - - - - nodeDataArrayController - - - - 282 - - - - addNodeProperty: - - - - 348 - - - - addNodeAtom: - - - - 349 - - - - graphDataArrayController - - - - 350 - - - - addGraphProperty: - - - - 351 - - - - addGraphAtom: - - - - 352 - - - - graphPropertiesView - - - - 354 - - - - removeGraphProperty: - - - - 358 - - - - removeNodeProperty: - - - - 359 - - - - edgePropertiesView - - - - 389 - - - - edgeDataArrayController - - - - 390 - - - - addEdgeProperty: - - - - 391 - - - - addEdgeAtom: - - - - 392 - - - - removeEdgeProperty: - - - - 393 - - - - addEdgeNodeProperty: - - - - 449 - - - - addEdgeNodeAtom: - - - - 450 - - - - removeEdgeNodeProperty: - - - - 451 - - - - edgeNodeDataArrayController - - - - 452 - - - - edgeNodeLabelField - - - - 453 - - - - edgeNodeCheckbox - - - - 454 - - - - propertyInspectorView - - - - 464 - - - - window - - - - 567 - - - - selectedNodesArrayController - - - - 583 - - - - selectedEdgesArrayController - - - - 586 - - - - refreshDocument: - - - - 596 - - - - sourceAnchorNamesArrayController - - - - 678 - - - - targetAnchorNamesArrayController - - - - 682 - - - - sourceAnchorComboBox - - - - 716 - - - - targetAnchorComboBox - - - - 717 - - - - delegate - - - - 584 - - - - value: selection.label - - - - - - value: selection.label - value - selection.label - - Multiple Values - NilToEmptyStringTransformer - - 2 - - - 644 - - - - formatter - - - - 719 - - - - enabled: canAdd - - - - - - enabled: canAdd - enabled - canAdd - 2 - - - 615 - - - - enabled: canRemove - - - - - - enabled: canRemove - enabled - canRemove - 2 - - - 297 - - - - content: arrangedObjects - - - - - - content: arrangedObjects - content - arrangedObjects - 2 - - - 278 - - - - delegate - - - - 290 - - - - enabled: isEditable - - - - - - enabled: isEditable - enabled - isEditable - 2 - - - 622 - - - - selectionIndexes: selectionIndexes - - - - - - selectionIndexes: selectionIndexes - selectionIndexes - selectionIndexes - - 2 - - - 650 - - - - value: arrangedObjects.key - - - - - - value: arrangedObjects.key - value - arrangedObjects.key - 2 - - - 274 - - - - value: arrangedObjects.value - - - - - - value: arrangedObjects.value - value - arrangedObjects.value - 2 - - - 277 - - - - enabled: arrangedObjects.isAtom - - - - - - enabled: arrangedObjects.isAtom - enabled - arrangedObjects.isAtom - - NSValueTransformerName - NSNegateBoolean - - 2 - - - 281 - - - - formatter - - - - 733 - - - - formatter - - - - 734 - - - - enabled: canAdd - - - - - - enabled: canAdd - enabled - canAdd - 2 - - - 618 - - - - enabled: canRemove - - - - - - enabled: canRemove - enabled - canRemove - 2 - - - 347 - - - - enabled: canAdd - - - - - - enabled: canAdd - enabled - canAdd - 2 - - - 643 - - - - enabled: canAdd - - - - - - enabled: canAdd - enabled - canAdd - 2 - - - 640 - - - - delegate - - - - 331 - - - - content: arrangedObjects - - - - - - content: arrangedObjects - content - arrangedObjects - 2 - - - 346 - - - - enabled: isEditable - - - - - - enabled: isEditable - enabled - isEditable - 2 - - - 638 - - - - selectionIndexes: selectionIndexes - - - - - - selectionIndexes: selectionIndexes - selectionIndexes - selectionIndexes - - 2 - - - 652 - - - - enabled: arrangedObjects.isAtom - - - - - - enabled: arrangedObjects.isAtom - enabled - arrangedObjects.isAtom - - NSValueTransformerName - NSNegateBoolean - - 2 - - - 356 - - - - value: arrangedObjects.value - - - - - - value: arrangedObjects.value - value - arrangedObjects.value - 2 - - - 357 - - - - value: arrangedObjects.key - - - - - - value: arrangedObjects.key - value - arrangedObjects.key - - NSValueTransformerName - NilToEmptyStringTransformer - - 2 - - - 645 - - - - formatter - - - - 728 - - - - formatter - - - - 727 - - - - enabled: canAdd - - - - - - enabled: canAdd - enabled - canAdd - 2 - - - 612 - - - - enabled: canAdd - - - - - - enabled: canAdd - enabled - canAdd - 2 - - - 624 - - - - enabled: canRemove - - - - - - enabled: canRemove - enabled - canRemove - 2 - - - 394 - - - - delegate - - - - 382 - - - - content: arrangedObjects - - - - - - content: arrangedObjects - content - arrangedObjects - 2 - - - 401 - - - - enabled: isEditable - - - - - - enabled: isEditable - enabled - isEditable - 2 - - - 630 - - - - selectionIndexes: selectionIndexes - - - - - - selectionIndexes: selectionIndexes - selectionIndexes - selectionIndexes - - 2 - - - 654 - - - - value: arrangedObjects.key - - - - - - value: arrangedObjects.key - value - arrangedObjects.key - - NSValueTransformerName - NilToEmptyStringTransformer - - 2 - - - 646 - - - - value: arrangedObjects.value - - - - - - value: arrangedObjects.value - value - arrangedObjects.value - 2 - - - 405 - - - - enabled: arrangedObjects.isAtom - - - - - - enabled: arrangedObjects.isAtom - enabled - arrangedObjects.isAtom - - NSValueTransformerName - NSNegateBoolean - - 2 - - - 467 - - - - formatter - - - - 730 - - - - formatter - - - - 729 - - - - delegate - - - - 421 - - - - content: arrangedObjects - - - - - - content: arrangedObjects - content - arrangedObjects - 2 - - - 443 - - - - enabled: isEditable - - - - - - enabled: isEditable - enabled - isEditable - 2 - - - 632 - - - - selectionIndexes: selectionIndexes - - - - - - selectionIndexes: selectionIndexes - selectionIndexes - selectionIndexes - - 2 - - - 656 - - - - formatter - - - - 724 - - - - value: arrangedObjects.value - - - - - - value: arrangedObjects.value - value - arrangedObjects.value - 2 - - - 445 - - - - enabled: arrangedObjects.isAtom - - - - - - enabled: arrangedObjects.isAtom - enabled - arrangedObjects.isAtom - - NSValueTransformerName - NSNegateBoolean - - 2 - - - 459 - - - - value: arrangedObjects.key - - - - - - value: arrangedObjects.key - value - arrangedObjects.key - - NSValueTransformerName - NilToEmptyStringTransformer - - 2 - - - 647 - - - - formatter - - - - 731 - - - - formatter - - - - 732 - - - - enabled: canAdd - - - - - - enabled: canAdd - enabled - canAdd - 2 - - - 626 - - - - enabled: canAdd - - - - - - enabled: canAdd - enabled - canAdd - 2 - - - 628 - - - - enabled: canRemove - - - - - - enabled: canRemove - enabled - canRemove - 2 - - - 460 - - - - value: selection.hasEdgeNode - - - - - - value: selection.hasEdgeNode - value - selection.hasEdgeNode - 2 - - - 595 - - - - delegate - - - - 440 - - - - enabled: selection.hasEdgeNode - - - - - - enabled: selection.hasEdgeNode - enabled - selection.hasEdgeNode - 2 - - - 636 - - - - value: selection.edgeNode.label - - - - - - value: selection.edgeNode.label - value - selection.edgeNode.label - - NSValueTransformerName - NilToEmptyStringTransformer - - 2 - - - 648 - - - - formatter - - - - 723 - - - - contentArray: selectedNodes - - - - - - contentArray: selectedNodes - contentArray - selectedNodes - 2 - - - 577 - - - - contentArray: selectedEdges - - - - - - contentArray: selectedEdges - contentArray - selectedEdges - 2 - - - 589 - - - - enabled: selection.hasEdgeNode - - - - - - enabled: selection.hasEdgeNode - enabled - selection.hasEdgeNode - 2 - - - 661 - - - - value: selection.edgeNode.label - - - - - - value: selection.edgeNode.label - value - selection.edgeNode.label - - NSValueTransformerName - NilToEmptyStringTransformer - - 2 - - - 662 - - - - delegate - - - - 663 - - - - content: arrangedObjects - - - - - - content: arrangedObjects - content - arrangedObjects - 2 - - - 707 - - - - contentValues: arrangedObjects - - - - - - contentValues: arrangedObjects - contentValues - arrangedObjects - - 2 - - - 708 - - - - value: selection.sourceAnchor - - - - - - value: selection.sourceAnchor - value - selection.sourceAnchor - - 2 - - - 709 - - - - delegate - - - - 714 - - - - formatter - - - - 726 - - - - content: arrangedObjects - - - - - - content: arrangedObjects - content - arrangedObjects - 2 - - - 710 - - - - contentValues: arrangedObjects - - - - - - contentValues: arrangedObjects - contentValues - arrangedObjects - - 2 - - - 711 - - - - value: selection.targetAnchor - - - - - - value: selection.targetAnchor - value - selection.targetAnchor - - 2 - - - 713 - - - - delegate - - - - 715 - - - - formatter - - - - 725 - - - - content - - - - 675 - - - - contentArray: sourceAnchorNames - - - - - - contentArray: sourceAnchorNames - contentArray - sourceAnchorNames - 2 - - - 680 - - - - contentArray: targetAnchorNames - - - - - - contentArray: targetAnchorNames - contentArray - targetAnchorNames - 2 - - - 684 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 185 - - - - - - - - - - - Node Properties View - - - 189 - - - - - - - - 190 - - - - - 191 - - - - - - - - 192 - - - - - 206 - - - - - - - - 207 - - - - - - - - 208 - - - - - 209 - - - - - 258 - - - - - - - - - - - 259 - - - - - 260 - - - - - 261 - - - - - - - - - 262 - - - - - 263 - - - - - - - - 264 - - - - - - - - 265 - - - - - 266 - - - - - 272 - - - Node Data Array Controller - - - 283 - - - - - - - - 284 - - - - - 301 - - - - - - - - - Graph Properties View - - - 302 - - - - - - - - 303 - - - - - - - - 304 - - - - - - - - - - - 307 - - - - - - - - 314 - - - - - 317 - - - - - 318 - - - - - - - - - 319 - - - - - 320 - - - - - 321 - - - - - - - - 322 - - - - - - - - 323 - - - - - 324 - - - - - 325 - - - - - 326 - - - - - 343 - - - Graph Data Array Controller - - - 360 - - - Edge Data Array Controller - - - 361 - - - - - - - - - - - - - - - - - - - - - - Edge Properties View - - - 362 - - - - - - - - 363 - - - - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 366 - - - - - 367 - - - - - 368 - - - - - 369 - - - - - 370 - - - - - - - - - 371 - - - - - 372 - - - - - - - - 373 - - - - - - - - 374 - - - - - 375 - - - - - 376 - - - - - 408 - - - - - - - - - - - 409 - - - - - 410 - - - - - - - - - 411 - - - - - 412 - - - - - 413 - - - - - - - - 414 - - - - - - - - 415 - - - - - 416 - - - - - 422 - - - - - - - - 423 - - - - - - - - 424 - - - - - - - - 425 - - - - - 426 - - - - - 427 - - - - - 434 - - - - - - - - 435 - - - - - 436 - - - - - - - - 437 - - - - - - - - 438 - - - - - 439 - - - - - 441 - - - - - 442 - - - Edge Node Data Array Controller - - - 461 - - - - - - - - 462 - - - - - - - - 463 - - - - - 575 - - - Selected Nodes Array Controller - - - 585 - - - Selected Edges Array Controller - - - 657 - - - - - - - - 658 - - - - - - - - 659 - - - - - 660 - - - - - 664 - - - - - - - - 665 - - - - - 666 - - - - - - - - 667 - - - - - 668 - - - - - - - - 669 - - - - - 670 - - - - - - - - 671 - - - - - 672 - - - - - - - - 673 - - - - - 674 - - - Source Anchor Names Array Controller - - - 681 - - - Target Anchor Names Array Controller - - - 718 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - {{624, 540}, {193, 256}} - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - TikzFormatter - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 734 - - - - - FirstResponder - - id - id - - - - applyStyleToSelectedNodes: - id - - - clearStyleOfSelectedNodes: - id - - - - IBUserSource - - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - {8, 8} - {8, 8} - {15, 15} - - - - - - NSFormatter - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Multiple Values + NilToEmptyStringTransformer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NilToEmptyStringTransformer + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NilToEmptyStringTransformer + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NilToEmptyStringTransformer + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NilToEmptyStringTransformer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + key + value + isAtom + + + + + key + value + isAtom + + + + + key + value + isAtom + + + + + key + value + isAtom + + + + + label + + + + + + + + edgeNode + + + + + + + + + + + + + + + + + + + + + + + + + + + NilToEmptyStringTransformer + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tikzit/src/osx/PreferenceController.m b/tikzit/src/osx/PreferenceController.m index 099bf48..e785358 100644 --- a/tikzit/src/osx/PreferenceController.m +++ b/tikzit/src/osx/PreferenceController.m @@ -104,9 +104,9 @@ [[[self window] contentView] replaceSubview:customNodeView with:[customNodeController view]]; customNodeView = [customNodeController view]; - [[self window] setContentSize:[preambleView frame].size]; - [[[self window] contentView] addSubview:preambleView]; - currentViewTag = 3; + [[self window] setContentSize:[engineView frame].size]; + [[[self window] contentView] addSubview:engineView]; + currentViewTag = 1; } - (IBAction)switchView:(id)sender { diff --git a/tikzit/src/osx/Preferences.xib b/tikzit/src/osx/Preferences.xib index 155cf71..1be3f9f 100644 --- a/tikzit/src/osx/Preferences.xib +++ b/tikzit/src/osx/Preferences.xib @@ -2,13 +2,13 @@ 1070 - 13A603 - 4514 - 1265 - 695.00 + 13C64 + 5053 + 1265.19 + 697.40 com.apple.InterfaceBuilder.CocoaPlugin - 4514 + 5053 IBNSLayoutConstraint @@ -100,7 +100,7 @@ {0, 0} YES YES - 0 + 1 YES 0 @@ -179,8 +179,8 @@ + - @@ -202,33 +202,33 @@ 268 - + 268 - {{18, 15}, {214, 18}} + {{18, 106}, {219, 18}} _NS:9 YES - + -2080374784 268435456 - Bring preview window to focus + Keep inspector windows on top .LucidaGrandeUI 13 1044 _NS:9 - + 1211912448 2 - + NSImage NSSwitch - + NSSwitch @@ -238,10 +238,64 @@ NO + + + 268 + {{18, 126}, {168, 18}} + + + + _NS:9 + YES + + -2080374784 + 268435456 + Autocomplete brackets + + _NS:9 + + 1211912448 + 2 + + + + + 200 + 25 + + NO + + + + 268 + {{18, 18}, {214, 18}} + + + + _NS:9 + YES + + -2080374784 + 268435456 + Bring preview window to focus + + _NS:9 + + 1211912448 + 2 + + + + + 200 + 25 + + NO + 268 - {{20, 39}, {440, 22}} + {{20, 42}, {440, 22}} @@ -280,7 +334,7 @@ 268 - {{18, 69}, {140, 17}} + {{18, 72}, {140, 17}} @@ -313,10 +367,10 @@ 1 - {480, 96} + {480, 162} - + _NS:9 NSView @@ -498,6 +552,38 @@ 62 + + + value: values.net.sourceforge.tikzit.autocomplete + + + + + + value: values.net.sourceforge.tikzit.autocomplete + value + values.net.sourceforge.tikzit.autocomplete + 2 + + + 149 + + + + value: values.net.sourceforge.tikzit.inspectorsontop + + + + + + value: values.net.sourceforge.tikzit.inspectorsontop + value + values.net.sourceforge.tikzit.inspectorsontop + 2 + + + 150 + @@ -565,6 +651,24 @@ 13 + + + 4 + 0 + + 4 + 1 + 1 + + 20 + + 1000 + + 8 + 23 + 3 + NO + 3 @@ -572,6 +676,7 @@ 4 1 + 1 8 @@ -589,6 +694,7 @@ 5 1 + 1 20 @@ -606,6 +712,7 @@ 6 1 + 1 20 @@ -623,6 +730,7 @@ 4 1 + 1 8 @@ -640,6 +748,7 @@ 5 1 + 1 20 @@ -650,43 +759,101 @@ 3 NO - + - 3 + 5 0 - 3 + 5 1 + 1 + + 20 + + 1000 + + 0 + 29 + 3 + NO + + + + 5 + 0 + + 5 + 1 + 1 - 10 + 0.0 + + 1000 + + 6 + 24 + 2 + NO + + + + 3 + 0 + + 4 + 1 + 1 + + 6 1000 - 3 - 9 + 6 + 24 3 NO - - + + 5 0 - + 5 1 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + NO + + + + 3 + 0 + + 3 + 1 + 1 20 1000 - 0 - 29 + 8 + 23 3 NO + + @@ -714,11 +881,6 @@ - - 31 - - - 32 @@ -806,6 +968,57 @@ + + 126 + + + + + 127 + + + + + + + + 128 + + + + + 130 + + + + + 131 + + + + + + + + 132 + + + + + 134 + + + + + 135 + + + + + 153 + + + @@ -822,23 +1035,37 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + - + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -858,7 +1085,7 @@ - 125 + 153 diff --git a/tikzit/src/osx/PropertyInspectorController.m b/tikzit/src/osx/PropertyInspectorController.m index 981f746..039a30f 100644 --- a/tikzit/src/osx/PropertyInspectorController.m +++ b/tikzit/src/osx/PropertyInspectorController.m @@ -56,7 +56,12 @@ [self setTargetAnchorNames: [[NSMutableArray alloc] initWithArray:[@"north south west east" componentsSeparatedByString:@" "]]]; - [[self window] setLevel:NSNormalWindowLevel]; + if ([[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.inspectorsontop"] == YES) { + [[self window] setLevel:NSFloatingWindowLevel]; + } else { + [[self window] setLevel:NSNormalWindowLevel]; + } + [self showWindow:self]; return self; } diff --git a/tikzit/src/osx/StylePaletteController.m b/tikzit/src/osx/StylePaletteController.m index 8f87bd9..4fe46be 100644 --- a/tikzit/src/osx/StylePaletteController.m +++ b/tikzit/src/osx/StylePaletteController.m @@ -50,7 +50,12 @@ if (nodeStyles == nil) nodeStyles = [NSMutableArray array]; if (edgeStyles == nil) edgeStyles = [NSMutableArray array]; - [[self window] setLevel:NSNormalWindowLevel]; + if ([[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.inspectorsontop"] == YES) { + [[self window] setLevel:NSFloatingWindowLevel]; + } else { + [[self window] setLevel:NSNormalWindowLevel]; + } + [self showWindow:self]; } diff --git a/tikzit/src/osx/TikzFormatter.m b/tikzit/src/osx/TikzFormatter.m index 9e45cb6..cb0865d 100644 --- a/tikzit/src/osx/TikzFormatter.m +++ b/tikzit/src/osx/TikzFormatter.m @@ -50,6 +50,10 @@ NSRange addedRange; NSString *addedString; + if(![[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.autocomplete"]){ + return YES; + } + addedRange = NSMakeRange(origSelRange.location, proposedSelRangePtr->location - origSelRange.location); addedString = [*partialStringPtr substringWithRange: addedRange]; -- cgit v1.2.3