Skip to content

Commit

Permalink
New app icon and supported more format, bugfix and log verbosity.
Browse files Browse the repository at this point in the history
  • Loading branch information
@sbarex
sbarex committed Nov 23, 2021
1 parent 36a586b commit 16473a8
Show file tree
Hide file tree
Showing 55 changed files with 874 additions and 504 deletions.
18 changes: 9 additions & 9 deletions Application/Assets.xcassets/AppIcon.appiconset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,55 +6,55 @@
"size" : "16x16"
},
{
"filename" : "Icon-MacOS-16x16@2x.png",
"filename" : "icon_16x16@2x@2x-1.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "16x16"
},
{
"filename" : "Icon-MacOS-16x16@2x-1.png",
"filename" : "icon_16x16@2x@2x.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "32x32"
},
{
"filename" : "Icon-MacOS-32x32@2x.png",
"filename" : "icon_32x32@2x@2x.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "32x32"
},
{
"filename" : "Icon-MacOS-128x128@1x.png",
"filename" : "icon_128x128.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "128x128"
},
{
"filename" : "Icon-MacOS-128x128@2x.png",
"filename" : "icon_128x128@2x@2x-1.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "128x128"
},
{
"filename" : "Icon-MacOS-128x128@2x-1.png",
"filename" : "icon_128x128@2x@2x.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "256x256"
},
{
"filename" : "Icon-MacOS-256x256@2x-1.png",
"filename" : "icon_256x256@2x@2x-1.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "256x256"
},
{
"filename" : "Icon-MacOS-256x256@2x.png",
"filename" : "icon_256x256@2x@2x.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "512x512"
},
{
"filename" : "Icon-MacOS-512x512@2x.png",
"filename" : "icon_512x512@2x@2x.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "512x512"
Expand Down
Binary file removed Application/Assets.xcassets/AppIcon.appiconset/Icon-MacOS-128x128@1x.png
View file
Binary file not shown.
Binary file removed Application/Assets.xcassets/AppIcon.appiconset/Icon-MacOS-128x128@2x-1.png
View file
Binary file not shown.
Binary file removed Application/Assets.xcassets/AppIcon.appiconset/Icon-MacOS-128x128@2x.png
View file
Binary file not shown.
Binary file removed Application/Assets.xcassets/AppIcon.appiconset/Icon-MacOS-16x16@2x-1.png
View file
Binary file not shown.
Binary file removed Application/Assets.xcassets/AppIcon.appiconset/Icon-MacOS-16x16@2x.png
View file
Binary file not shown.
Binary file removed Application/Assets.xcassets/AppIcon.appiconset/Icon-MacOS-256x256@2x-1.png
View file
Binary file not shown.
Binary file removed Application/Assets.xcassets/AppIcon.appiconset/Icon-MacOS-256x256@2x.png
View file
Binary file not shown.
Binary file removed Application/Assets.xcassets/AppIcon.appiconset/Icon-MacOS-32x32@2x.png
View file
Binary file not shown.
Binary file removed Application/Assets.xcassets/AppIcon.appiconset/Icon-MacOS-512x512@2x.png
View file
Binary file not shown.
Binary file added Application/Assets.xcassets/AppIcon.appiconset/icon_128x128.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Application/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x@2x-1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Application/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Application/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x@2x-1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Application/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Application/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x@2x-1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Application/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Application/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Application/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
154 changes: 150 additions & 4 deletions Application/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,25 @@
</array>
</dict>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>public.text</string>
</array>
<key>UTTypeDescription</key>
<string>Haml document</string>
<key>UTTypeIdentifier</key>
<string>info.haml.haml</string>
<key>UTTypeReferenceURL</key>
<string>http://haml.info</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
<array>
<string>haml</string>
</array>
</dict>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
Expand Down Expand Up @@ -783,6 +802,19 @@
</array>
</dict>
</dict>
<dict>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
<array>
<string>haml</string>
</array>
</dict>
<key>UTTypeDescription</key>
<string>Haml document</string>
<key>UTTypeIdentifier</key>
<string>info.haml.haml</string>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
Expand Down Expand Up @@ -872,6 +904,25 @@
</array>
</dict>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>public.plain-text</string>
</array>
<key>UTTypeDescription</key>
<string>Less stylesheet</string>
<key>UTTypeIdentifier</key>
<string>org.lesscss.less</string>
<key>UTTypeReferenceURL</key>
<string>http://lesscss.org</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
<array>
<string>less</string>
</array>
</dict>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
Expand Down Expand Up @@ -1337,6 +1388,45 @@
</array>
</dict>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>public.plain-text</string>
</array>
<key>UTTypeDescription</key>
<string>RubyGems Gemspec file</string>
<key>UTTypeIdentifier</key>
<string>org.rubygems.gemspec</string>
<key>UTTypeReferenceURL</key>
<string>http://guides.rubygems.org/specification-reference/</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
<array>
<string>gemspec</string>
</array>
</dict>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>public.source-code</string>
</array>
<key>UTTypeDescription</key>
<string>Rust source</string>
<key>UTTypeIdentifier</key>
<string>org.rust-lang.rust</string>
<key>UTTypeReferenceURL</key>
<string>http://rust-lang.org</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
<array>
<string>rs</string>
<string>rlib</string>
</array>
</dict>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
Expand Down Expand Up @@ -1572,6 +1662,26 @@
</array>
</dict>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>public.plain-text</string>
</array>
<key>UTTypeDescription</key>
<string>Yaml document</string>
<key>UTTypeIdentifier</key>
<string>org.yaml.yaml</string>
<key>UTTypeReferenceURL</key>
<string>http://yaml.org</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
<array>
<string>yml</string>
<string>yaml</string>
</array>
</dict>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
Expand Down Expand Up @@ -1622,6 +1732,23 @@
</array>
</dict>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>public.plain-text</string>
</array>
<key>UTTypeDescription</key>
<string>Property file</string>
<key>UTTypeIdentifier</key>
<string>public.properties</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
<array>
<string>properties</string>
</array>
</dict>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
Expand Down Expand Up @@ -1661,17 +1788,36 @@
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>public.plain-text</string>
<string>public.text</string>
</array>
<key>UTTypeDescription</key>
<string>Property file</string>
<string>TSX script</string>
<key>UTTypeIdentifier</key>
<string>public.properties</string>
<string>public.tsx</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
<array>
<string>properties</string>
<string>tsx</string>
</array>
</dict>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>public.script</string>
</array>
<key>UTTypeDescription</key>
<string>TypeScript script</string>
<key>UTTypeIdentifier</key>
<string>public.typescript</string>
<key>UTTypeReferenceURL</key>
<string>http://typescriptlang.org/</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
<array>
<string>ts</string>
</array>
</dict>
</dict>
Expand Down
19 changes: 11 additions & 8 deletions Application/PlainSettingsView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ class PlainSettingsView: NSView, SettingsSplitViewElement {
@IBOutlet weak var editButton: NSButton!
@IBOutlet weak var upButton: NSButton!
@IBOutlet weak var downButton: NSButton!
@IBOutlet weak var dumpButton: NSButton!
@IBOutlet weak var binaryPopupButton: NSPopUpButton!
@IBOutlet weak var binaryLabel: NSTextField!

var settings: Settings? {
return SCSHWrapper.shared.settings
Expand Down Expand Up @@ -53,14 +54,20 @@ class PlainSettingsView: NSView, SettingsSplitViewElement {
self.tableView.doubleAction = #selector(self.handleDoublClickTable(_:))
initSettings()
self.tableView.reloadData()

if #available(macOS 12.0, *) {
binaryLabel.stringValue = "Images, audios, movies and PDF files are always displayed."
} else {
binaryLabel.stringValue = "Images are always displayed."
}
}

deinit {
}

@discardableResult
func initSettings() -> Bool {
self.dumpButton?.state = (settings?.isDumpPlainData ?? false) ? .on : .off
self.binaryPopupButton.selectItem(at: settings?.isDumpPlainData ?? true ? 1 : 0)
self.tableView?.reloadData()
return true
}
Expand Down Expand Up @@ -165,12 +172,8 @@ class PlainSettingsView: NSView, SettingsSplitViewElement {
updateControls()
}

@IBAction func handleDumpButton(_ sender: NSButton) {
guard let settings = settings else {
return
}

settings.isDumpPlainData = !settings.isDumpPlainData
@IBAction func handleBinaryButton(_ sender: NSPopUpButton) {
settings?.isDumpPlainData = sender.indexOfSelectedItem == 1
}
}

Expand Down
Loading

0 comments on commit 16473a8

Please sign in to comment.