Fixed omm, removed ex-alo from debug repo, bug fixes and improvements.

EmeraldLoc · EmeraldLoc · commit 8e249d90c57c · 2022-09-23T16:05:55.000-05:00
diff --git a/sm_osx/Assets.xcassets/Contents.json b/sm_osx/Assets.xcassets/Contents.json
@@ -2,5 +2,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "compression-type" : "lossless"
   }
 }
diff --git a/sm_osx/Assets.xcassets/menu_bar_dark.imageset/Contents.json b/sm_osx/Assets.xcassets/menu_bar_dark.imageset/Contents.json
diff --git a/sm_osx/Assets.xcassets/menu_bar_dark.imageset/menu bar logo.svg b/sm_osx/Assets.xcassets/menu_bar_dark.imageset/menu bar logo.svg
diff --git a/sm_osx/Assets.xcassets/menu_bar_icon.imageset/Contents.json b/sm_osx/Assets.xcassets/menu_bar_icon.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "Menu Bar Icon.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/sm_osx/Assets.xcassets/menu_bar_icon.imageset/Menu Bar Icon.svg b/sm_osx/Assets.xcassets/menu_bar_icon.imageset/Menu Bar Icon.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:1.5;">
+    <g transform="matrix(1,0,0,1,-54.375,-54.375)">
+        <g transform="matrix(1,-0,-0,1,54.375,54.375)">
+            <use xlink:href="#_Image1" x="1.043" y="1.043" width="17.25px" height="17.25px" transform="matrix(0.958333,0,0,0.958333,0,0)"/>
+        </g>
+    </g>
+    <defs>
+        <image id="_Image1" width="18px" height="18px" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAACXBIWXMAAA7EAAAOxAGVKw4bAAABlElEQVQ4jY3Ty0tVURQG8N/xmmAPHGgvqegBQWAQQfSg+gMcNGtQNApJaGCCRZOGWsOaBc2UimgWOAuChCIywpEERlFUDiJIQeuGaIO1D52u91zvB4fDZq39rW+t9W2aQweeYaXwPcGmJu+DTrzBJ5zFGZzDVzzMk1rXINmKp1iP04ksxynsyw8tDUi243kqVktCtHcUNxspacUEprGlJKfbv3mBA3iM17iSSC5hMcXK0JlIhpBVMJ6qTuIavmM3NuBWA6JfOIQBtMMC+lPwLn4WJHc1IMoxiN8VnMBJsZ1xVJHhD25juYRgm7DBeTEG+/GjoOItjpdc3iw2dQHfkvoJHMwTOnAYvSl4rw5JhtlUrIoH2FjWb09KPFYS/4xHwqAZ9ojtrUI/5pUb9aqY2Qd8LKjrq9QkrsNltOEFlmriL3FfrPsVboiR7KxX9aKY0wyGsaMQy1KRHHsxh+slHejGHfG+ppIC4rV/wRFh4pmkrL0Ox3/YJZz+Xrh8RQy8mv7vNGdahPHGUgsjYhEDGBVPCfwF+PRb0lMzNBcAAAAASUVORK5CYII="/>
+    </defs>
+</svg>
diff --git a/sm_osx/GlobalFunctions.swift b/sm_osx/GlobalFunctions.swift
@@ -10,7 +10,7 @@ import UniformTypeIdentifiers
 import AppKit
 
 struct CurrentVersion {
-    public let currentVersion = "v1.2.4\n"
+    public let currentVersion = "v1.2.5\n"
 }
 
 public func isArm() -> Bool {
diff --git a/sm_osx/MenuBarCommands.swift b/sm_osx/MenuBarCommands.swift
@@ -7,11 +7,11 @@
 
 import SwiftUI
 
-
 struct MenuCommands: Commands {
     @State var existingRepo = URL(string: "")
     @Binding var updateAlert: Bool
     @Binding var showAddRepos: Bool
+    @State var launcherRepos = [LauncherRepos]()
     @StateObject var dataController: DataController
     let moc = NSManagedObjectContext(concurrencyType: .mainQueueConcurrencyType)
     
@@ -27,8 +27,14 @@ struct MenuCommands: Commands {
     }
     
     var body: some Commands {
+        
         CommandMenu("Launch") {
-            let launcherRepos = fetchLaunchers()
+            
+            Text("Entries").onAppear {
+                launcherRepos = fetchLaunchers()
+            }
+            
+            Divider()
             
             ForEach(launcherRepos) { LauncherRepo in
                 Button(LauncherRepo.title ?? "Unrecognized Repo") {
diff --git a/sm_osx/RepoView.swift b/sm_osx/RepoView.swift
@@ -45,12 +45,10 @@ struct RepoView: View {
                             }
                         }
                         
-                        if devMode {
-                            NavigationLink(destination: PatchesView(repo: .sm64ex_alo, repoView: $repoView)) {
-                                
-                                Text("sm64ex-alo")
-                                    .lineLimit(nil)
-                            }
+                        NavigationLink(destination: PatchesView(repo: .sm64ex_alo, repoView: $repoView)) {
+                            
+                            Text("sm64ex-alo")
+                                .lineLimit(nil)
                         }
                         
                         NavigationLink(destination: PatchesView(repo: .sm64ex_coop, repoView: $repoView)) {
diff --git a/sm_osx/RomView.swift b/sm_osx/RomView.swift
@@ -167,7 +167,7 @@ struct RomView: View {
         
         if repo == .sm64ex {
             if patch.contains(.omm) {
-                commandsCompile.append("cd ~/SM64Repos/\(repo) && wget https://raw.githubusercontent.com/PeachyPeachSM64/sm64ex-omm/master/patch/omm.patch && wget https://raw.githubusercontent.com/PeachyPeachSM64/sm64ex-omm/nightly/omm.mk && git apply --reject --ignore-whitespace 'omm.patch' && ")
+                commandsCompile.append("cd ~/SM64Repos/\(repo) && wget https://raw.githubusercontent.com/PeachyPeachSM64/sm64ex-omm/master/patch/omm.patch && wget https://raw.githubusercontent.com/PeachyPeachSM64/sm64ex-omm/nightly/omm.mk && wget https://raw.githubusercontent.com/PeachyPeachSM64/sm64ex-omm/nightly/omm_defines.mk && git apply --reject --ignore-whitespace 'omm.patch'; ")
             }
         
             if patch.contains(.highfps) {
diff --git a/sm_osx/sm_osxApp.swift b/sm_osx/sm_osxApp.swift
@@ -35,7 +35,7 @@ struct sm_osxApp: App {
     }
 }
 
-/*
+
 struct menuExtras: Scene {
     
     @State var dataController: DataController
@@ -85,12 +85,11 @@ struct menuExtras: Scene {
                 
                 Link("Check Latest Changelog", destination: URL(string: "https://github.com/EmeraldLoc/sm_osx/releases/latest")!)
             } label: {
-                Image("menu_bar_dark")
+                Image("menu_bar_icon")
+                    .resizable()
             }
         } else {
             return WindowGroup { EmptyView() }
         }
     }
 }
-
-*/

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,8 @@`
`2`	`2`	`"info" : {`
`3`	`3`	`"author" : "xcode",`
`4`	`4`	`"version" : 1`
	`5`	`+ },`
	`6`	`+ "properties" : {`
	`7`	`+ "compression-type" : "lossless"`
`5`	`8`	`}`
`6`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import UniformTypeIdentifiers`
`10`	`10`	`import AppKit`
`11`	`11`
`12`	`12`	`struct CurrentVersion {`
`13`		`- public let currentVersion = "v1.2.4\n"`
	`13`	`+ public let currentVersion = "v1.2.5\n"`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public func isArm() -> Bool {`
Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,10 @@ struct RepoView: View {`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`- if devMode {`
`49`		`- NavigationLink(destination: PatchesView(repo: .sm64ex_alo, repoView: $repoView)) {`
`50`		`-`
`51`		`- Text("sm64ex-alo")`
`52`		`- .lineLimit(nil)`
`53`		`- }`
	`48`	`+ NavigationLink(destination: PatchesView(repo: .sm64ex_alo, repoView: $repoView)) {`
	`49`	`+`
	`50`	`+ Text("sm64ex-alo")`
	`51`	`+ .lineLimit(nil)`
`54`	`52`	`}`
`55`	`53`
`56`	`54`	`NavigationLink(destination: PatchesView(repo: .sm64ex_coop, repoView: $repoView)) {`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ struct RomView: View {`
`167`	`167`
`168`	`168`	`if repo == .sm64ex {`
`169`	`169`	`if patch.contains(.omm) {`
`170`		`- commandsCompile.append("cd ~/SM64Repos/\(repo) && wget https://raw.githubusercontent.com/PeachyPeachSM64/sm64ex-omm/master/patch/omm.patch && wget https://raw.githubusercontent.com/PeachyPeachSM64/sm64ex-omm/nightly/omm.mk && git apply --reject --ignore-whitespace 'omm.patch' && ")`
	`170`	`+ commandsCompile.append("cd ~/SM64Repos/\(repo) && wget https://raw.githubusercontent.com/PeachyPeachSM64/sm64ex-omm/master/patch/omm.patch && wget https://raw.githubusercontent.com/PeachyPeachSM64/sm64ex-omm/nightly/omm.mk && wget https://raw.githubusercontent.com/PeachyPeachSM64/sm64ex-omm/nightly/omm_defines.mk && git apply --reject --ignore-whitespace 'omm.patch'; ")`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`if patch.contains(.highfps) {`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ struct sm_osxApp: App {`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`		`-/*`
	`38`	`+`
`39`	`39`	`struct menuExtras: Scene {`
`40`	`40`
`41`	`41`	`@State var dataController: DataController`
`@@ -85,12 +85,11 @@ struct menuExtras: Scene {`
`85`	`85`
`86`	`86`	`Link("Check Latest Changelog", destination: URL(string: "https://github.com/EmeraldLoc/sm_osx/releases/latest")!)`
`87`	`87`	`} label: {`
`88`		`- Image("menu_bar_dark")`
	`88`	`+ Image("menu_bar_icon")`
	`89`	`+ .resizable()`
`89`	`90`	`}`
`90`	`91`	`} else {`
`91`	`92`	`return WindowGroup { EmptyView() }`
`92`	`93`	`}`
`93`	`94`	`}`
`94`	`95`	`}`
`95`		`-`
`96`		`-*/`