eroesch/msg-desktop
1
0
Fork 0
forked from MSG/msg-desktop
Code Pull requests Activity

Compare commits

base: eroesch:main
Branches Tags
eroesch:main
MSG:main
eroesch:msg-desktop_v0.1.0
MSG:msg-desktop_v0.1.0
..
compare: MSG:main
Branches Tags
MSG:main
eroesch:main
MSG:msg-desktop_v0.1.0
eroesch:msg-desktop_v0.1.0

No commits in common. "main" and "main" have entirely different histories.
main ... main

12 changed files with 132 additions and 224 deletions
Show stats Expand all files Collapse all files

4
MSG Desktop.xcodeproj/project.pbxproj
View file

@ -397,7 +397,7 @@
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"MSG Desktop/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"MSG Desktop/Preview Content\"";
DEVELOPMENT_TEAM = RN94J52F92; DEVELOPMENT_TEAM = C8Z9PRF4VH;
ENABLE_HARDENED_RUNTIME = YES; ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
@ -424,7 +424,7 @@
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"MSG Desktop/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"MSG Desktop/Preview Content\"";
DEVELOPMENT_TEAM = RN94J52F92; DEVELOPMENT_TEAM = C8Z9PRF4VH;
ENABLE_HARDENED_RUNTIME = YES; ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;

BIN
MSG Desktop/Assets.xcassets/AppStatusBar.imageset/1024.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 207 KiB

BIN
MSG Desktop/Assets.xcassets/AppStatusBar.imageset/512@1x.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 100 KiB

BIN
MSG Desktop/Assets.xcassets/AppStatusBar.imageset/512@2x.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 207 KiB

23
MSG Desktop/Assets.xcassets/AppStatusBar.imageset/Contents.json vendored
View file

@ -1,23 +0,0 @@
{
"images" : [
{
"filename" : "512@1x.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "512@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "1024.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

218
MSG Desktop/ContentView.swift
View file

@ -7,163 +7,131 @@
import SwiftUI import SwiftUI
struct ViewHeightKey: PreferenceKey {
static var defaultValue: CGFloat = 0
static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) {
value = nextValue()
}
}
struct ContentView: View { struct ContentView: View {
@ObservedObject var appState = AppState.shared @ObservedObject var appState = AppState.shared
private let maxLines = 300 private let maxLines = 300
@State private var showCancelButton: Bool = false @State private var showCancelButton: Bool = false
@State private var showReinitPopup = false @State private var showReinitPopup = false
@State private var showCancelPopup = false @State private var showCancelPopup = false
@State private var imageHeight: CGFloat = 0
var body: some View { var body: some View {
GeometryReader { geometry in VStack {
VStack(spacing: 10) { // Image(systemName: "globe")
// App icon // .imageScale(.large)
let appIcon = NSImage(named: NSImage.applicationIconName) // .foregroundStyle(.tint)
Image(nsImage: appIcon ?? NSImage()) let appIcon = NSImage(named: NSImage.applicationIconName)
. resizable()
.scaledToFit()
.frame(maxHeight: 150)
.background(
GeometryReader { proxy in
Color.clear
.preference(key: ViewHeightKey.self, value: proxy.size.height)
}
)
.onPreferenceChange(ViewHeightKey.self) { height in
self.imageHeight = height
}
ZStack { // Use SwiftUI's Image to display the icon
Color.black Image(nsImage: appIcon ?? NSImage())
.ignoresSafeArea() .resizable() // Optional: if you want to resize the icon
.scaledToFit() // Optional: makes sure the aspect ratio is maintained
// ScrollView fills remaining height
ScrollViewReader { proxy in
ScrollView {
LazyVStack(alignment: .leading, spacing: 0) {
let lines = appState.output.components(separatedBy: .newlines)
ForEach(lines.indices, id: \.self) { index in ScrollViewReader { proxy in
Text(lines[index]) ScrollView {
.font(.system(.body, design: .monospaced)) VStack(alignment: .leading) {
.foregroundColor(.gray) TextEditor(text: $appState.output)
.frame(maxWidth: .infinity, alignment: .leading) .font(.system(.body, design: .monospaced))
.frame(minWidth: 750, minHeight: 300)
}
Color.clear.frame(height: 1).id("bottom")
}
.padding() .padding()
} .disabled(true)
.onChange(of: appState.output) { _, _ in
trimLinesIfNeeded()
withAnimation {
proxy.scrollTo("bottom", anchor: .bottom)
}
}
// ScrollView { Text("")
// VStack(alignment: .leading) { .id("bottom")
// TextEditor(text: $appState.output)
// .font(.system(.body, design: .monospaced))
// .frame(
// width: geometry.size.width - 60,
// height: max(0, geometry.size.height - imageHeight - 120) // - rough height of button row and padding
// )
// .padding()
// .disabled(true)
//
// Text("")
// .id("bottom")
// }
// }
// .onChange(of: appState.output) { _, _ in
// trimLinesIfNeeded()
// withAnimation {
// proxy.scrollTo("bottom", anchor: .bottom)
// }
// }
} }
} }
.onChange(of: appState.output) { _, _ in
// Buttons trimLinesIfNeeded()
HStack { withAnimation {
Button("Init") { proxy.scrollTo("bottom", anchor: .bottom)
DispatchQueue.main.async { self.showCancelButton = true }
runShellCommandAsync(command: "msg machine init", outputText: $appState.output, showButton: $showCancelButton)
} }
}
Button("Reinit") { }
showReinitPopup.toggle() HStack {
Button(action: {
DispatchQueue.main.async {
self.showCancelButton = true
} }
.confirmationDialog("Are you sure?", isPresented: $showReinitPopup, titleVisibility: .visible) { runShellCommandAsync(command: "msg machine init", outputText: $appState.output, showButton: $showCancelButton)
Button("Confirm", role: .destructive) {
}) {
Text("Init")
}
Button(action: {
showReinitPopup.toggle()
}) {
Text("Reinit")
}.confirmationDialog("Are you sure?", isPresented: $showReinitPopup, titleVisibility: .visible) {
Button("Confirm", role: .destructive) {
DispatchQueue.main.async {
self.showCancelButton = true self.showCancelButton = true
runShellCommandAsync(command: "rm -rf ~/.guix && msg machine init", outputText: $appState.output, showButton: $showCancelButton) runShellCommandAsync(command: "rm -rf ~/.guix && msg machine init", outputText: $appState.output, showButton: $showCancelButton)
} }
}
Button("Cancel", role: .cancel) {}
}
Button(action: {
runShellCommandAsync(command: "msg machine start", outputText: $appState.output, showButton: nil) }) {
Text("Start")
}
if showCancelButton {
Button(action: {
showCancelPopup.toggle()
}) {
Text("Cancel")
}.confirmationDialog("Are you sure?", isPresented: $showCancelPopup, titleVisibility: .visible) {
Button("Confirm", role: .destructive) {
runShellCommandAsync(command: "kill $(ps aux | grep '[g]uile' | awk '{print $2}')", outputText: $appState.output, showButton: nil)
runShellCommandAsync(command: "kill $(ps aux | grep '[q]emu' | awk '{print $2}')", outputText: $appState.output, showButton: nil)
DispatchQueue.main.async {
self.showCancelButton = false
}
}
Button("Cancel", role: .cancel) {} Button("Cancel", role: .cancel) {}
} }
}
Button("Start") {
runShellCommandAsync(command: "msg machine start", outputText: $appState.output, showButton: nil)
}
if showCancelButton { if !showCancelButton{
Button("Cancel") { Button(action: {
showCancelPopup.toggle() runShellCommandAsync(command: "msg machine stop", outputText: $appState.output, showButton: nil) }) {
} Text("Stop")
.confirmationDialog("Are you sure?", isPresented: $showCancelPopup, titleVisibility: .visible) {
Button("Confirm", role: .destructive) {
runShellCommandAsync(command: "kill $(ps aux | grep '[g]uile' | awk '{print $2}')", outputText: $appState.output, showButton: nil)
runShellCommandAsync(command: "kill $(ps aux | grep '[q]emu' | awk '{print $2}')", outputText: $appState.output, showButton: nil)
DispatchQueue.main.async {
self.showCancelButton = false
}
}
Button("Cancel", role: .cancel) {}
}
}
if !showCancelButton {
Button("Stop") {
runShellCommandAsync(command: "msg machine stop", outputText: $appState.output, showButton: nil)
}
}
Button("Shell") {
runShellCommandAsync(
command: "osascript -e 'tell application \"Terminal\" to do script \"msg shell\"' -e 'tell application \"Terminal\" to activate'",
outputText: $appState.output,
showButton: nil
)
} }
} }
Button(action: {
runShellCommandAsync(command: "osascript -e 'tell application \"Terminal\" to do script \"msg shell\"' -e 'tell application \"Terminal\" to activate'", outputText: $appState.output, showButton: nil)
}) {
Text("Shell")
}
} }
.padding()
.frame(maxHeight: .infinity)
.onAppear {
// Silences error due to metallib on resizing of window
let device = MTLCreateSystemDefaultDevice()
_ = device?.makeDefaultLibrary()
}
} }
.padding()
.frame(width: 800, height: 400)
} }
private func trimLinesIfNeeded() { private func trimLinesIfNeeded() {
let lines = AppState.shared.output.split(separator: "\n") let lines = AppState.shared.output.split(separator: "\n")
if lines.count > maxLines {
let trimmedLines = lines.suffix(maxLines) if lines.count > maxLines {
AppState.shared.output = trimmedLines.joined(separator: "\n") _ = lines.count - maxLines
let trimmedLines = lines.suffix(maxLines)
AppState.shared.output = trimmedLines.joined(separator: "\n")
}
} }
}
} }
#Preview { #Preview {

11
MSG Desktop/MSG_Desktop.metal
View file

@ -1,11 +0,0 @@
//
// MGS_Desktop.metal
// MSG Desktop
//
// Created by Etienne Roesch on 31/03/2025.
//
#include <metal_stdlib>
using namespace metal;

70
MSG Desktop/MSG_DesktopApp.swift
View file

@ -34,7 +34,6 @@ func runShellCommandAsync(command: String, outputText: Binding<String>?, showBut
var observer: NSObjectProtocol? var observer: NSObjectProtocol?
observer = NotificationCenter.default.addObserver(forName: .NSFileHandleDataAvailable, object: fileHandle, queue: nil) { _ in observer = NotificationCenter.default.addObserver(forName: .NSFileHandleDataAvailable, object: fileHandle, queue: nil) { _ in
let data = fileHandle.availableData let data = fileHandle.availableData
if let output = String(data: data, encoding: .utf8), !output.isEmpty { if let output = String(data: data, encoding: .utf8), !output.isEmpty {
@ -60,8 +59,6 @@ func runShellCommandAsync(command: String, outputText: Binding<String>?, showBut
} }
class AppDelegate: NSObject, NSApplicationDelegate { class AppDelegate: NSObject, NSApplicationDelegate {
var window: NSWindow!
func applicationWillTerminate(_ notification: Notification) { func applicationWillTerminate(_ notification: Notification) {
runShellCommandAsync(command: "msg machine stop", outputText: nil, showButton: nil) runShellCommandAsync(command: "msg machine stop", outputText: nil, showButton: nil)
runShellCommandAsync(command: "kill $(ps aux | grep '[g]uile' | awk '{print $2}')", outputText: nil, showButton: nil) runShellCommandAsync(command: "kill $(ps aux | grep '[g]uile' | awk '{print $2}')", outputText: nil, showButton: nil)
@ -76,57 +73,40 @@ class AppDelegate: NSObject, NSApplicationDelegate {
var statusBarItem: NSStatusItem! var statusBarItem: NSStatusItem!
func applicationDidFinishLaunching(_ notification: Notification) { func applicationDidFinishLaunching(_ notification: Notification) {
statusBarItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength) statusBarItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
let contentView = ContentView() if let button = statusBarItem.button {
window = NSWindow( button.title = "MSG"
contentRect: NSRect(x: 0, y: 0, width: 800, height: 600), button.toolTip = "MSG App"
styleMask: [.titled, .closable, .resizable, .miniaturizable],
backing: .buffered,
defer: false
)
window.center()
//window.setFrameAutosaveName("MSG App") // to retain size after quitting
window.contentView = NSHostingView(rootView: contentView)
window.makeKeyAndOrderFront(nil)
if let button = statusBarItem.button {
//button.title = "MSG"
button.toolTip = "MSG App"
if let image = NSImage(named: "AppStatusBar") {
let newSize = NSSize(width: 18, height: 18)
image.size = newSize
image.isTemplate = true // Important: so it adapts to dark/light mode but we need to get B&W icons..
button.image = image
} }
button.target = self
let menu = NSMenu()
menu.addItem(NSMenuItem(title: "Quit", action: #selector(quitApp), keyEquivalent: "q"))
statusBarItem.menu = menu
} }
let menu = NSMenu() @objc func quitApp() {
let alert = NSAlert()
alert.messageText = "Are you sure you want to quit?"
alert.informativeText = "Do you want to quit the app and exit?"
alert.alertStyle = .warning
menu.addItem(NSMenuItem(title: "Quit", action: #selector(quitApp), keyEquivalent: "q")) alert.addButton(withTitle: "Quit")
alert.addButton(withTitle: "Cancel")
statusBarItem.menu = menu let response = alert.runModal()
}
@objc func quitApp() { if response == .alertFirstButtonReturn {
let alert = NSAlert() NSApplication.shared.terminate(nil)
alert.messageText = "Are you sure you want to quit?" }
alert.informativeText = "Do you want to quit the app and exit?"
alert.alertStyle = .warning
alert.addButton(withTitle: "Quit")
alert.addButton(withTitle: "Cancel")
let response = alert.runModal()
if response == .alertFirstButtonReturn {
NSApplication.shared.terminate(nil)
} }
}
} }
class AppState: ObservableObject { class AppState: ObservableObject {
@Published var output: String = "Please select an option \n" @Published var output: String = "Please select an option \n"
@ -138,6 +118,8 @@ struct MSG_DesktopApp: App {
@NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate @NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
var body: some Scene { var body: some Scene {
Settings {} // prevents crash on some macOS version WindowGroup {
ContentView()
}
} }
} }

10
README.org
View file

@ -1,4 +1,4 @@
[[./doc/images/init-example.gif]] [[./example-gifs/init-example.gif]]
* Install from tap * Install from tap
** Add Tap ** Add Tap
@ -10,11 +10,3 @@ brew tap MSG/apps https://forge.superkamiguru.org/MSG/homebrew-apps
#+begin_src sh #+begin_src sh
brew install msg-desktop brew install msg-desktop
#+end_src #+end_src
** Security & Privacy
The first time you run the app, you will need to allow it to run in the Security
& Privacy settings of your Mac. This is because the app is not signed by Apple.
You can do this by going to System Preferences > Security & Privacy > General
and clicking "Open Anyway" next to the message about the app being blocked.
[[./doc/images/macos15.3.2-security.png]]

BIN
doc/.DS_Store vendored
View file

Binary file not shown.

BIN
doc/images/macos15.3.2-security.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 61 KiB

0
doc/images/init-example.gif → example-gifs/init-example.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 MiB

After

Width:  |  Height:  |  Size: 4.4 MiB