Skip to content

Commit dd8925b

Browse files
sbarexsbarex
committed
Release 2.1.23 (72)
1 parent ad5e6ca commit dd8925b

414 files changed

Lines changed: 8188 additions & 14332 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Application/AppDelegate.swift‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,5 +307,10 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuItemValidation {
307307
alert.runModal()
308308
}
309309
}
310+
311+
@IBAction func buyMeACoffee(_ sender: Any?) {
312+
let url = URL(string: "https://www.buymeacoffee.com/sbarex")!
313+
NSWorkspace.shared.open(url)
314+
}
310315
}
311316

‎Application/Info.plist‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,25 @@
542542
</array>
543543
</dict>
544544
</dict>
545+
<dict>
546+
<key>UTTypeDescription</key>
547+
<string>Nix Expression Language</string>
548+
<key>UTTypeConformsTo</key>
549+
<array>
550+
<string>public.data</string>
551+
<string>public.item</string>
552+
<string>dyn.ah62d4rv4ge8064p2</string>
553+
</array>
554+
<key>UTTypeIdentifier</key>
555+
<string>dev.nix.source</string>
556+
<key>UTTypeTagSpecification</key>
557+
<dict>
558+
<key>public.filename-extension</key>
559+
<array>
560+
<string>nix</string>
561+
</array>
562+
</dict>
563+
</dict>
545564
<dict>
546565
<key>UTTypeConformsTo</key>
547566
<array>
@@ -1214,6 +1233,7 @@
12141233
<key>public.filename-extension</key>
12151234
<array>
12161235
<string>ly</string>
1236+
<string>ily</string>
12171237
</array>
12181238
</dict>
12191239
</dict>
@@ -2051,6 +2071,8 @@
20512071
<dict>
20522072
<key>UTTypeConformsTo</key>
20532073
<array>
2074+
<string>public.xsd</string>
2075+
<string>public.xml</string>
20542076
<string>public.item</string>
20552077
<string>dyn.ah62d4rv4ge81u6pzqz3hw</string>
20562078
<string>dyn.ah62d4rv4ge81u6k</string>
@@ -2074,6 +2096,8 @@
20742096
<dict>
20752097
<key>UTTypeConformsTo</key>
20762098
<array>
2099+
<string>public.xsd</string>
2100+
<string>publix.xml</string>
20772101
<string>public.item</string>
20782102
<string>dyn.ah62d4rv4ge81u65e</string>
20792103
</array>

‎Application/PlainSettingsView.xib‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22690"/>
66
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
77
</dependencies>
88
<objects>
@@ -285,13 +285,13 @@
285285
<subviews>
286286
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fAu-ke-YDq">
287287
<rect key="frame" x="8" y="3.5" width="16" height="15.5"/>
288-
<constraints>
289-
<constraint firstAttribute="width" constant="16" id="j37-rN-FVU"/>
290-
</constraints>
291288
<buttonCell key="cell" type="roundRect" bezelStyle="roundedRect" image="NSAddTemplate" imagePosition="left" alignment="center" imageScaling="proportionallyDown" inset="2" id="Bcb-x7-WsT">
292289
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
293290
<font key="font" metaFont="cellTitle"/>
294291
</buttonCell>
292+
<constraints>
293+
<constraint firstAttribute="width" constant="16" id="j37-rN-FVU"/>
294+
</constraints>
295295
<connections>
296296
<action selector="handleAddButton:" target="-2" id="q1B-VN-ZeB"/>
297297
</connections>
@@ -307,7 +307,7 @@
307307
</connections>
308308
</button>
309309
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Hfy-UU-ox7">
310-
<rect key="frame" x="56" y="4" width="16" height="16.5"/>
310+
<rect key="frame" x="56" y="4" width="16" height="17.5"/>
311311
<buttonCell key="cell" type="roundRect" bezelStyle="roundedRect" image="NSTouchBarComposeTemplate" imagePosition="left" alignment="center" imageScaling="proportionallyDown" inset="2" id="WXC-lV-IVj">
312312
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
313313
<font key="font" metaFont="cellTitle"/>
@@ -435,11 +435,11 @@
435435
</customView>
436436
</objects>
437437
<resources>
438-
<image name="NSAddTemplate" width="14" height="13"/>
439-
<image name="NSRemoveTemplate" width="14" height="4"/>
440-
<image name="NSTouchBarComposeTemplate" width="17" height="15"/>
441-
<image name="NSTouchBarGoDownTemplate" width="15" height="9"/>
442-
<image name="NSTouchBarGoUpTemplate" width="15" height="9"/>
438+
<image name="NSAddTemplate" width="18" height="17"/>
439+
<image name="NSRemoveTemplate" width="18" height="5"/>
440+
<image name="NSTouchBarComposeTemplate" width="21" height="21"/>
441+
<image name="NSTouchBarGoDownTemplate" width="18" height="11"/>
442+
<image name="NSTouchBarGoUpTemplate" width="18" height="11"/>
443443
<image name="aA" width="20" height="20"/>
444444
<image name="re" width="20" height="20"/>
445445
</resources>

‎Application/SettingsView.swift‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ class SettingsView: NSView, SettingsSplitViewElement {
5757
@IBOutlet weak var dataLimitTextField: NSTextField!
5858
@IBOutlet weak var dataLimitPopupButton: NSPopUpButton!
5959
@IBOutlet weak var EOLSwitch: NSSwitch!
60+
@IBOutlet weak var aboutSwitch: NSSwitch!
6061
@IBOutlet weak var debugSwitch: NSSwitch!
6162
@IBOutlet weak var vcsCheckBox: NSButton!
6263
@IBOutlet weak var vcsSwitch: NSSwitch!
@@ -86,6 +87,7 @@ class SettingsView: NSView, SettingsSplitViewElement {
8687
gridView.cell(for: customCSSCheckBox)?.row?.isHidden = !isAdvancedSettingsVisible || settings?.format != .html
8788

8889
gridView.cell(for: argumentsCheckBox)?.row?.isHidden = !isAdvancedSettingsVisible
90+
gridView.cell(for: aboutSwitch)?.row?.isHidden = !isAdvancedSettingsVisible
8991
gridView.cell(for: debugSwitch)?.row?.isHidden = !isAdvancedSettingsVisible
9092
gridView.cell(for: vcsSwitch)?.row?.isHidden = !isAdvancedSettingsVisible
9193
gridView.cell(for: EOLSwitch)?.row?.isHidden = !isAdvancedSettingsVisible
@@ -242,6 +244,7 @@ class SettingsView: NSView, SettingsSplitViewElement {
242244
gridView.cell(for: syntaxPopupButton)?.row?.isHidden = true
243245
gridView.cell(for: lspButton)?.row?.isHidden = true
244246

247+
gridView.cell(for: aboutSwitch)?.row?.isHidden = !isAdvancedSettingsVisible
245248
gridView.cell(for: debugSwitch)?.row?.isHidden = !isAdvancedSettingsVisible
246249
gridView.cell(for: vcsSwitch)?.row?.isHidden = !isAdvancedSettingsVisible
247250
gridView.cell(for: EOLSwitch)?.row?.isHidden = !isAdvancedSettingsVisible
@@ -295,6 +298,7 @@ class SettingsView: NSView, SettingsSplitViewElement {
295298
interactiveCheckBox.isEnabled = false
296299
interactiveSwitch.isEnabled = false
297300

301+
aboutSwitch.isEnabled = false
298302
debugSwitch.isEnabled = false
299303

300304
vcsCheckBox.isEnabled = false
@@ -394,6 +398,10 @@ class SettingsView: NSView, SettingsSplitViewElement {
394398
vcsSwitch.isEnabled = true
395399

396400
if let settings = settings as? Settings {
401+
aboutSwitch.isEnabled = true
402+
aboutSwitch.state = settings.isAboutVisible ? .on : .off
403+
gridView.cell(for: aboutSwitch)?.row?.isHidden = !self.isAdvancedSettingsVisible
404+
397405
debugSwitch.isEnabled = true
398406
debugSwitch.state = settings.isDebug ? .on : .off
399407
gridView.cell(for: debugSwitch)?.row?.isHidden = !self.isAdvancedSettingsVisible
@@ -428,6 +436,7 @@ class SettingsView: NSView, SettingsSplitViewElement {
428436
qlHeightField.integerValue = settings.qlWindowHeight ?? 800
429437
self.handleQLSizeChanged(self.qlSizeSwitch)
430438
} else {
439+
gridView.cell(for: aboutSwitch)?.row?.isHidden = true
431440
gridView.cell(for: debugSwitch)?.row?.isHidden = true
432441

433442
vcsCheckBox.imagePosition = .imageLeft
@@ -678,6 +687,12 @@ class SettingsView: NSView, SettingsSplitViewElement {
678687
}
679688
}
680689

690+
@IBAction func onAboutChanged(_ sender: Any) {
691+
if let settings = self.settings as? Settings {
692+
settings.isAboutVisible = self.aboutSwitch.state == .on
693+
}
694+
}
695+
681696
@IBAction func onDebugChanged(_ sender: Any) {
682697
if let settings = self.settings as? Settings {
683698
settings.isDebug = self.debugSwitch.state == .on

0 commit comments

Comments
 (0)