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

EmeraldLoc · Sep 23, 2022 · 8e249d9 · 8e249d9
1 parent 877637a
commit 8e249d9
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 87 deletions.
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
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() }
         }
     }
 }
-
-*/