Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
84b87d8
Fix doesn't show icon bug
underthestars-zhy Mar 23, 2022
cff60e9
little update
underthestars-zhy Mar 23, 2022
f2ea862
Merge remote-tracking branch 'upstream/main'
underthestars-zhy Mar 23, 2022
c8c24b9
bug fix
underthestars-zhy Mar 23, 2022
ac086b2
choose theme
underthestars-zhy Mar 23, 2022
ce4c4a0
New tabs
underthestars-zhy Mar 23, 2022
a95d7be
Remove useless stuff
underthestars-zhy Mar 23, 2022
061faf4
Merge remote-tracking branch 'upstream/main'
underthestars-zhy Mar 24, 2022
c26d4fa
small update
underthestars-zhy Mar 24, 2022
3cb75ad
Cutom Termial Font
underthestars-zhy Mar 24, 2022
d327204
Keyboard
underthestars-zhy Mar 24, 2022
7d1f83e
Merge remote-tracking branch 'upstream/main'
underthestars-zhy Mar 24, 2022
547ba62
small change
underthestars-zhy Mar 24, 2022
ccf4336
Packages
underthestars-zhy Mar 24, 2022
68f456a
Custom Preferences Package
underthestars-zhy Mar 24, 2022
69165bb
Small changes
underthestars-zhy Mar 24, 2022
9eefbee
changes
underthestars-zhy Mar 24, 2022
72f5012
changes
underthestars-zhy Mar 24, 2022
0cb0ecd
changes
underthestars-zhy Mar 24, 2022
1173898
Bug Fix
underthestars-zhy Mar 24, 2022
79227c3
changes
underthestars-zhy Mar 24, 2022
ef4bd20
Bug Fix
underthestars-zhy Mar 24, 2022
879b6db
bug fux
underthestars-zhy Mar 24, 2022
420c275
new general appearence
underthestars-zhy Mar 24, 2022
ef28bcf
Merge remote-tracking branch 'upstream/main'
underthestars-zhy Mar 25, 2022
1661792
New Preference
underthestars-zhy Mar 25, 2022
1cb4a4a
Fix tool long problem
underthestars-zhy Mar 26, 2022
8872367
Merge remote-tracking branch 'upstream/main'
underthestars-zhy Mar 26, 2022
14a5e2e
Merge remote-tracking branch 'upstream/main'
underthestars-zhy Mar 26, 2022
48945a3
new color choose
underthestars-zhy Mar 26, 2022
7a87baa
terminal color
underthestars-zhy Mar 26, 2022
bc07c20
Merge remote-tracking branch 'upstream/main'
underthestars-zhy Mar 27, 2022
216e41c
new appearence image
underthestars-zhy Mar 27, 2022
bf77ae2
new reopen image
underthestars-zhy Mar 27, 2022
654458a
for merge
underthestars-zhy Mar 29, 2022
ceb1098
Merge remote-tracking branch 'upstream/main'
underthestars-zhy Mar 29, 2022
c103e2c
bug fux
underthestars-zhy Mar 29, 2022
444eab7
bug fix
underthestars-zhy Mar 29, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 88 additions & 8 deletions CodeEdit.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 10 additions & 1 deletion CodeEdit.xcworkspace/xcshareddata/swiftpm/Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

61 changes: 42 additions & 19 deletions CodeEdit/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//

import SwiftUI
import Preferences

class CodeEditApplication: NSApplication {
let strongDelegate = AppDelegate()
Expand Down Expand Up @@ -105,27 +106,49 @@ class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
}

// MARK: - Open windows
private lazy var preferencesWindowController = PreferencesWindowController(
panes: [
Preferences.Pane(
identifier: Preferences.PaneIdentifier.general,
title: "General",
toolbarIcon: NSImage(systemSymbolName: "gearshape", accessibilityDescription: nil)!
) {
GeneralSettingsView()
},
Preferences.Pane(
identifier: Preferences.PaneIdentifier.theme,
title: "Theme",
toolbarIcon: NSImage(systemSymbolName: "paintbrush", accessibilityDescription: nil)!
) {
ThemeSettingsView()
},
Preferences.Pane(
identifier: Preferences.PaneIdentifier.terminal,
title: "Terminal",
toolbarIcon: NSImage(systemSymbolName: "terminal", accessibilityDescription: nil)!
) {
TerminalSettingsView()
},
Preferences.Pane(
identifier: Preferences.PaneIdentifier.execution,
title: "Execution",
toolbarIcon: NSImage(systemSymbolName: "arrowtriangle.forward", accessibilityDescription: nil)!
) {
ExecutionSettingsView()
},
Preferences.Pane(
identifier: Preferences.PaneIdentifier.extension,
title: "Extensions",
toolbarIcon: NSImage(systemSymbolName: "shippingbox", accessibilityDescription: nil)!
) {
ExtensionsSettingsView()
},
]
)

@IBAction func openPreferences(_ sender: Any) {
if let window = NSApp.windows.filter({ window in
return (window.contentView as? NSHostingView<SettingsView>) != nil
}).first {
window.makeKeyAndOrderFront(self)
return
}

let window = NSWindow(
contentRect: NSRect(x: 0, y: 0, width: 500, height: 400),
styleMask: [.titled, .closable],
backing: .buffered, defer: false)
window.center()
window.toolbar = NSToolbar()
window.title = "Settings"
window.toolbarStyle = .unifiedCompact
_ = NSWindowController(window: window)
let contentView = SettingsView()
window.contentView = NSHostingView(rootView: contentView)
window.makeKeyAndOrderFront(sender)
preferencesWindowController.show()
preferencesWindowController.window?.center()
}

@IBAction func openWelcome(_ sender: Any) {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions CodeEdit/Assets.xcassets/Agate.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "CleanShot 2022-03-23 at 18.58.14@2x-1.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "CleanShot 2022-03-23 at 18.58.14@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "CleanShot 2022-03-23 at 18.58.14@2x-2.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "CleanShot 2022-03-23 at 18.55.38@2x-1.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "CleanShot 2022-03-23 at 18.55.38@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "CleanShot 2022-03-23 at 18.55.38@2x-2.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "CleanShot 2022-03-23 at 18.56.54@2x-1.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "CleanShot 2022-03-23 at 18.56.54@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "CleanShot 2022-03-23 at 18.56.54@2x-2.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions CodeEdit/Assets.xcassets/ColorPickerDefault.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"images" : [
{
"filename" : "ColorPickerDefault.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "ColorPickerDefault-1.svg",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ColorPickerDefault-2.svg",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true,
"template-rendering-intent" : "template"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions CodeEdit/Assets.xcassets/Ocean.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "CleanShot 2022-03-23 at 18.57.32@2x-1.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "CleanShot 2022-03-23 at 18.57.32@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "CleanShot 2022-03-23 at 18.57.32@2x-2.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "Settings Image - Auto.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Settings Image - Auto-1.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Settings Image - Auto-2.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "Settings Image - Dark.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Settings Image - Dark-1.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Settings Image - Dark-2.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "Settings Image - Light.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Settings Image - Light-1.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Settings Image - Light-2.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions CodeEdit/Assets.xcassets/new dark.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "new dark.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "new dark-1.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "new dark-2.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions CodeEdit/Assets.xcassets/new light.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "new light.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "new light-1.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "new light-2.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
23 changes: 23 additions & 0 deletions CodeEdit/Assets.xcassets/open dark.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "open dark.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "open dark-1.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "open dark-2.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading