Skip to content

Commit 16473a8

Browse files
committed
New app icon and supported more format, bugfix and log verbosity.
1 parent 36a586b commit 16473a8

Some content is hidden

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

55 files changed

+874
-504
lines changed

Application/Assets.xcassets/AppIcon.appiconset/Contents.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -6,55 +6,55 @@
66
"size" : "16x16"
77
},
88
{
9-
"filename" : "Icon-MacOS-16x16@2x.png",
9+
"filename" : "icon_16x16@2x@2x-1.png",
1010
"idiom" : "mac",
1111
"scale" : "2x",
1212
"size" : "16x16"
1313
},
1414
{
15-
"filename" : "Icon-MacOS-16x16@2x-1.png",
15+
"filename" : "icon_16x16@2x@2x.png",
1616
"idiom" : "mac",
1717
"scale" : "1x",
1818
"size" : "32x32"
1919
},
2020
{
21-
"filename" : "Icon-MacOS-32x32@2x.png",
21+
"filename" : "icon_32x32@2x@2x.png",
2222
"idiom" : "mac",
2323
"scale" : "2x",
2424
"size" : "32x32"
2525
},
2626
{
27-
"filename" : "Icon-MacOS-128x128@1x.png",
27+
"filename" : "icon_128x128.png",
2828
"idiom" : "mac",
2929
"scale" : "1x",
3030
"size" : "128x128"
3131
},
3232
{
33-
"filename" : "Icon-MacOS-128x128@2x.png",
33+
"filename" : "icon_128x128@2x@2x-1.png",
3434
"idiom" : "mac",
3535
"scale" : "2x",
3636
"size" : "128x128"
3737
},
3838
{
39-
"filename" : "Icon-MacOS-128x128@2x-1.png",
39+
"filename" : "icon_128x128@2x@2x.png",
4040
"idiom" : "mac",
4141
"scale" : "1x",
4242
"size" : "256x256"
4343
},
4444
{
45-
"filename" : "Icon-MacOS-256x256@2x-1.png",
45+
"filename" : "icon_256x256@2x@2x-1.png",
4646
"idiom" : "mac",
4747
"scale" : "2x",
4848
"size" : "256x256"
4949
},
5050
{
51-
"filename" : "Icon-MacOS-256x256@2x.png",
51+
"filename" : "icon_256x256@2x@2x.png",
5252
"idiom" : "mac",
5353
"scale" : "1x",
5454
"size" : "512x512"
5555
},
5656
{
57-
"filename" : "Icon-MacOS-512x512@2x.png",
57+
"filename" : "icon_512x512@2x@2x.png",
5858
"idiom" : "mac",
5959
"scale" : "2x",
6060
"size" : "512x512"
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading

Application/Info.plist

+150-4
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,25 @@
386386
</array>
387387
</dict>
388388
</dict>
389+
<dict>
390+
<key>UTTypeConformsTo</key>
391+
<array>
392+
<string>public.text</string>
393+
</array>
394+
<key>UTTypeDescription</key>
395+
<string>Haml document</string>
396+
<key>UTTypeIdentifier</key>
397+
<string>info.haml.haml</string>
398+
<key>UTTypeReferenceURL</key>
399+
<string>http://haml.info</string>
400+
<key>UTTypeTagSpecification</key>
401+
<dict>
402+
<key>public.filename-extension</key>
403+
<array>
404+
<string>haml</string>
405+
</array>
406+
</dict>
407+
</dict>
389408
<dict>
390409
<key>UTTypeConformsTo</key>
391410
<array>
@@ -783,6 +802,19 @@
783802
</array>
784803
</dict>
785804
</dict>
805+
<dict>
806+
<key>UTTypeTagSpecification</key>
807+
<dict>
808+
<key>public.filename-extension</key>
809+
<array>
810+
<string>haml</string>
811+
</array>
812+
</dict>
813+
<key>UTTypeDescription</key>
814+
<string>Haml document</string>
815+
<key>UTTypeIdentifier</key>
816+
<string>info.haml.haml</string>
817+
</dict>
786818
<dict>
787819
<key>UTTypeConformsTo</key>
788820
<array>
@@ -872,6 +904,25 @@
872904
</array>
873905
</dict>
874906
</dict>
907+
<dict>
908+
<key>UTTypeConformsTo</key>
909+
<array>
910+
<string>public.plain-text</string>
911+
</array>
912+
<key>UTTypeDescription</key>
913+
<string>Less stylesheet</string>
914+
<key>UTTypeIdentifier</key>
915+
<string>org.lesscss.less</string>
916+
<key>UTTypeReferenceURL</key>
917+
<string>http://lesscss.org</string>
918+
<key>UTTypeTagSpecification</key>
919+
<dict>
920+
<key>public.filename-extension</key>
921+
<array>
922+
<string>less</string>
923+
</array>
924+
</dict>
925+
</dict>
875926
<dict>
876927
<key>UTTypeConformsTo</key>
877928
<array>
@@ -1337,6 +1388,45 @@
13371388
</array>
13381389
</dict>
13391390
</dict>
1391+
<dict>
1392+
<key>UTTypeConformsTo</key>
1393+
<array>
1394+
<string>public.plain-text</string>
1395+
</array>
1396+
<key>UTTypeDescription</key>
1397+
<string>RubyGems Gemspec file</string>
1398+
<key>UTTypeIdentifier</key>
1399+
<string>org.rubygems.gemspec</string>
1400+
<key>UTTypeReferenceURL</key>
1401+
<string>http://guides.rubygems.org/specification-reference/</string>
1402+
<key>UTTypeTagSpecification</key>
1403+
<dict>
1404+
<key>public.filename-extension</key>
1405+
<array>
1406+
<string>gemspec</string>
1407+
</array>
1408+
</dict>
1409+
</dict>
1410+
<dict>
1411+
<key>UTTypeConformsTo</key>
1412+
<array>
1413+
<string>public.source-code</string>
1414+
</array>
1415+
<key>UTTypeDescription</key>
1416+
<string>Rust source</string>
1417+
<key>UTTypeIdentifier</key>
1418+
<string>org.rust-lang.rust</string>
1419+
<key>UTTypeReferenceURL</key>
1420+
<string>http://rust-lang.org</string>
1421+
<key>UTTypeTagSpecification</key>
1422+
<dict>
1423+
<key>public.filename-extension</key>
1424+
<array>
1425+
<string>rs</string>
1426+
<string>rlib</string>
1427+
</array>
1428+
</dict>
1429+
</dict>
13401430
<dict>
13411431
<key>UTTypeConformsTo</key>
13421432
<array>
@@ -1572,6 +1662,26 @@
15721662
</array>
15731663
</dict>
15741664
</dict>
1665+
<dict>
1666+
<key>UTTypeConformsTo</key>
1667+
<array>
1668+
<string>public.plain-text</string>
1669+
</array>
1670+
<key>UTTypeDescription</key>
1671+
<string>Yaml document</string>
1672+
<key>UTTypeIdentifier</key>
1673+
<string>org.yaml.yaml</string>
1674+
<key>UTTypeReferenceURL</key>
1675+
<string>http://yaml.org</string>
1676+
<key>UTTypeTagSpecification</key>
1677+
<dict>
1678+
<key>public.filename-extension</key>
1679+
<array>
1680+
<string>yml</string>
1681+
<string>yaml</string>
1682+
</array>
1683+
</dict>
1684+
</dict>
15751685
<dict>
15761686
<key>UTTypeConformsTo</key>
15771687
<array>
@@ -1622,6 +1732,23 @@
16221732
</array>
16231733
</dict>
16241734
</dict>
1735+
<dict>
1736+
<key>UTTypeConformsTo</key>
1737+
<array>
1738+
<string>public.plain-text</string>
1739+
</array>
1740+
<key>UTTypeDescription</key>
1741+
<string>Property file</string>
1742+
<key>UTTypeIdentifier</key>
1743+
<string>public.properties</string>
1744+
<key>UTTypeTagSpecification</key>
1745+
<dict>
1746+
<key>public.filename-extension</key>
1747+
<array>
1748+
<string>properties</string>
1749+
</array>
1750+
</dict>
1751+
</dict>
16251752
<dict>
16261753
<key>UTTypeConformsTo</key>
16271754
<array>
@@ -1661,17 +1788,36 @@
16611788
<dict>
16621789
<key>UTTypeConformsTo</key>
16631790
<array>
1664-
<string>public.plain-text</string>
1791+
<string>public.text</string>
16651792
</array>
16661793
<key>UTTypeDescription</key>
1667-
<string>Property file</string>
1794+
<string>TSX script</string>
16681795
<key>UTTypeIdentifier</key>
1669-
<string>public.properties</string>
1796+
<string>public.tsx</string>
16701797
<key>UTTypeTagSpecification</key>
16711798
<dict>
16721799
<key>public.filename-extension</key>
16731800
<array>
1674-
<string>properties</string>
1801+
<string>tsx</string>
1802+
</array>
1803+
</dict>
1804+
</dict>
1805+
<dict>
1806+
<key>UTTypeConformsTo</key>
1807+
<array>
1808+
<string>public.script</string>
1809+
</array>
1810+
<key>UTTypeDescription</key>
1811+
<string>TypeScript script</string>
1812+
<key>UTTypeIdentifier</key>
1813+
<string>public.typescript</string>
1814+
<key>UTTypeReferenceURL</key>
1815+
<string>http://typescriptlang.org/</string>
1816+
<key>UTTypeTagSpecification</key>
1817+
<dict>
1818+
<key>public.filename-extension</key>
1819+
<array>
1820+
<string>ts</string>
16751821
</array>
16761822
</dict>
16771823
</dict>

Application/PlainSettingsView.swift

+11-8
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ class PlainSettingsView: NSView, SettingsSplitViewElement {
1616
@IBOutlet weak var editButton: NSButton!
1717
@IBOutlet weak var upButton: NSButton!
1818
@IBOutlet weak var downButton: NSButton!
19-
@IBOutlet weak var dumpButton: NSButton!
19+
@IBOutlet weak var binaryPopupButton: NSPopUpButton!
20+
@IBOutlet weak var binaryLabel: NSTextField!
2021

2122
var settings: Settings? {
2223
return SCSHWrapper.shared.settings
@@ -53,14 +54,20 @@ class PlainSettingsView: NSView, SettingsSplitViewElement {
5354
self.tableView.doubleAction = #selector(self.handleDoublClickTable(_:))
5455
initSettings()
5556
self.tableView.reloadData()
57+
58+
if #available(macOS 12.0, *) {
59+
binaryLabel.stringValue = "Images, audios, movies and PDF files are always displayed."
60+
} else {
61+
binaryLabel.stringValue = "Images are always displayed."
62+
}
5663
}
5764

5865
deinit {
5966
}
6067

6168
@discardableResult
6269
func initSettings() -> Bool {
63-
self.dumpButton?.state = (settings?.isDumpPlainData ?? false) ? .on : .off
70+
self.binaryPopupButton.selectItem(at: settings?.isDumpPlainData ?? true ? 1 : 0)
6471
self.tableView?.reloadData()
6572
return true
6673
}
@@ -165,12 +172,8 @@ class PlainSettingsView: NSView, SettingsSplitViewElement {
165172
updateControls()
166173
}
167174

168-
@IBAction func handleDumpButton(_ sender: NSButton) {
169-
guard let settings = settings else {
170-
return
171-
}
172-
173-
settings.isDumpPlainData = !settings.isDumpPlainData
175+
@IBAction func handleBinaryButton(_ sender: NSPopUpButton) {
176+
settings?.isDumpPlainData = sender.indexOfSelectedItem == 1
174177
}
175178
}
176179

0 commit comments

Comments
 (0)