From 9f0b5a5df230e4d38cafc9d5710392fe12160c0b Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Tue, 25 Aug 2020 22:23:08 -0400 Subject: [PATCH] update models. --- MA2ME.xcodeproj/project.pbxproj | 284 +++-- MA2ME/AppDelegate.m | 21 +- MA2ME/ROMBrowserDelegate.m | 12 +- MA2ME/Resources/Base.lproj/Models.plist | 171 --- MA2ME/Resources/apple2gs/printer.plist | 24 - MA2ME/Resources/devices.plist | 1267 ----------------------- MA2ME/Resources/models.plist | 329 ++++++ MA2ME/SlotViewController.m | 2 +- MA2ME/mkmodels.py | 11 +- 9 files changed, 534 insertions(+), 1587 deletions(-) delete mode 100644 MA2ME/Resources/Base.lproj/Models.plist delete mode 100644 MA2ME/Resources/apple2gs/printer.plist delete mode 100644 MA2ME/Resources/devices.plist create mode 100644 MA2ME/Resources/models.plist diff --git a/MA2ME.xcodeproj/project.pbxproj b/MA2ME.xcodeproj/project.pbxproj index 3a7a6ca..87789f9 100644 --- a/MA2ME.xcodeproj/project.pbxproj +++ b/MA2ME.xcodeproj/project.pbxproj @@ -10,31 +10,52 @@ B60A6E1424EE0AE2004B7EEF /* FlippedView.m in Sources */ = {isa = PBXBuildFile; fileRef = B60A6E1324EE0AE2004B7EEF /* FlippedView.m */; }; B61099E724F5F231005CB652 /* SlotView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B61099E324F5F230005CB652 /* SlotView.xib */; }; B61099E824F5F231005CB652 /* MediaView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B61099E524F5F230005CB652 /* MediaView.xib */; }; - B64979A624EEC2D9008ABD20 /* apple2gsr1.plist in Resources */ = {isa = PBXBuildFile; fileRef = B649798F24EEC2D8008ABD20 /* apple2gsr1.plist */; }; - B64979A724EEC2D9008ABD20 /* apple2ees.plist in Resources */ = {isa = PBXBuildFile; fileRef = B649799024EEC2D8008ABD20 /* apple2ees.plist */; }; - B64979A824EEC2D9008ABD20 /* apple2p.plist in Resources */ = {isa = PBXBuildFile; fileRef = B649799124EEC2D8008ABD20 /* apple2p.plist */; }; - B64979A924EEC2D9008ABD20 /* apple2gsr0.plist in Resources */ = {isa = PBXBuildFile; fileRef = B649799224EEC2D8008ABD20 /* apple2gsr0.plist */; }; - B64979AA24EEC2DA008ABD20 /* laser2c.plist in Resources */ = {isa = PBXBuildFile; fileRef = B649799324EEC2D8008ABD20 /* laser2c.plist */; }; - B64979AB24EEC2DA008ABD20 /* ace100.plist in Resources */ = {isa = PBXBuildFile; fileRef = B649799424EEC2D8008ABD20 /* ace100.plist */; }; - B64979AC24EEC2DA008ABD20 /* apple2eeuk.plist in Resources */ = {isa = PBXBuildFile; fileRef = B649799524EEC2D8008ABD20 /* apple2eeuk.plist */; }; - B64979AD24EEC2DA008ABD20 /* las128e2.plist in Resources */ = {isa = PBXBuildFile; fileRef = B649799624EEC2D8008ABD20 /* las128e2.plist */; }; - B64979AE24EEC2DA008ABD20 /* apple2ep.plist in Resources */ = {isa = PBXBuildFile; fileRef = B649799724EEC2D8008ABD20 /* apple2ep.plist */; }; - B64979AF24EEC2DA008ABD20 /* devices.plist in Resources */ = {isa = PBXBuildFile; fileRef = B649799824EEC2D8008ABD20 /* devices.plist */; }; - B64979B024EEC2DA008ABD20 /* apple2gs.plist in Resources */ = {isa = PBXBuildFile; fileRef = B649799924EEC2D9008ABD20 /* apple2gs.plist */; }; - B64979B124EEC2DA008ABD20 /* apple2e.plist in Resources */ = {isa = PBXBuildFile; fileRef = B649799A24EEC2D9008ABD20 /* apple2e.plist */; }; - B64979B224EEC2DA008ABD20 /* apple2c.plist in Resources */ = {isa = PBXBuildFile; fileRef = B649799B24EEC2D9008ABD20 /* apple2c.plist */; }; - B64979B324EEC2DA008ABD20 /* laser128.plist in Resources */ = {isa = PBXBuildFile; fileRef = B649799C24EEC2D9008ABD20 /* laser128.plist */; }; - B64979B424EEC2DA008ABD20 /* apple2euk.plist in Resources */ = {isa = PBXBuildFile; fileRef = B649799D24EEC2D9008ABD20 /* apple2euk.plist */; }; - B64979B524EEC2DA008ABD20 /* apple2.plist in Resources */ = {isa = PBXBuildFile; fileRef = B649799E24EEC2D9008ABD20 /* apple2.plist */; }; - B64979B624EEC2DA008ABD20 /* apple3.plist in Resources */ = {isa = PBXBuildFile; fileRef = B649799F24EEC2D9008ABD20 /* apple3.plist */; }; - B64979B724EEC2DA008ABD20 /* apple2cp.plist in Resources */ = {isa = PBXBuildFile; fileRef = B64979A024EEC2D9008ABD20 /* apple2cp.plist */; }; - B64979B824EEC2DA008ABD20 /* apple1.plist in Resources */ = {isa = PBXBuildFile; fileRef = B64979A124EEC2D9008ABD20 /* apple1.plist */; }; - B64979B924EEC2DA008ABD20 /* apple2eefr.plist in Resources */ = {isa = PBXBuildFile; fileRef = B64979A224EEC2D9008ABD20 /* apple2eefr.plist */; }; - B64979BA24EEC2DA008ABD20 /* las128ex.plist in Resources */ = {isa = PBXBuildFile; fileRef = B64979A324EEC2D9008ABD20 /* las128ex.plist */; }; - B64979BB24EEC2DA008ABD20 /* apple2jp.plist in Resources */ = {isa = PBXBuildFile; fileRef = B64979A424EEC2D9008ABD20 /* apple2jp.plist */; }; - B64979BC24EEC2DA008ABD20 /* apple2ee.plist in Resources */ = {isa = PBXBuildFile; fileRef = B64979A524EEC2D9008ABD20 /* apple2ee.plist */; }; + B6109A1724F5F377005CB652 /* apple2e.plist in Resources */ = {isa = PBXBuildFile; fileRef = B61099EA24F5F36E005CB652 /* apple2e.plist */; }; + B6109A1824F5F377005CB652 /* hkc8800a.plist in Resources */ = {isa = PBXBuildFile; fileRef = B61099EB24F5F36E005CB652 /* hkc8800a.plist */; }; + B6109A1924F5F377005CB652 /* apple2ees.plist in Resources */ = {isa = PBXBuildFile; fileRef = B61099EC24F5F36E005CB652 /* apple2ees.plist */; }; + B6109A1A24F5F377005CB652 /* microeng.plist in Resources */ = {isa = PBXBuildFile; fileRef = B61099ED24F5F36E005CB652 /* microeng.plist */; }; + B6109A1B24F5F377005CB652 /* uniap2pt.plist in Resources */ = {isa = PBXBuildFile; fileRef = B61099EE24F5F36E005CB652 /* uniap2pt.plist */; }; + B6109A1C24F5F377005CB652 /* ivelultr.plist in Resources */ = {isa = PBXBuildFile; fileRef = B61099EF24F5F36E005CB652 /* ivelultr.plist */; }; + B6109A1D24F5F377005CB652 /* space84.plist in Resources */ = {isa = PBXBuildFile; fileRef = B61099F024F5F36E005CB652 /* space84.plist */; }; + B6109A1E24F5F377005CB652 /* apple2c.plist in Resources */ = {isa = PBXBuildFile; fileRef = B61099F124F5F36F005CB652 /* apple2c.plist */; }; + B6109A1F24F5F377005CB652 /* apple2jp.plist in Resources */ = {isa = PBXBuildFile; fileRef = B61099F224F5F36F005CB652 /* apple2jp.plist */; }; + B6109A2024F5F377005CB652 /* apple2euk.plist in Resources */ = {isa = PBXBuildFile; fileRef = B61099F324F5F36F005CB652 /* apple2euk.plist */; }; + B6109A2124F5F377005CB652 /* apple2ee.plist in Resources */ = {isa = PBXBuildFile; fileRef = B61099F424F5F36F005CB652 /* apple2ee.plist */; }; + B6109A2224F5F377005CB652 /* models.plist in Resources */ = {isa = PBXBuildFile; fileRef = B61099F524F5F36F005CB652 /* models.plist */; }; + B6109A2324F5F377005CB652 /* apple2gsr0.plist in Resources */ = {isa = PBXBuildFile; fileRef = B61099F624F5F36F005CB652 /* apple2gsr0.plist */; }; + B6109A2424F5F377005CB652 /* las128ex.plist in Resources */ = {isa = PBXBuildFile; fileRef = B61099F724F5F36F005CB652 /* las128ex.plist */; }; + B6109A2524F5F377005CB652 /* laser2c.plist in Resources */ = {isa = PBXBuildFile; fileRef = B61099F824F5F36F005CB652 /* laser2c.plist */; }; + B6109A2624F5F377005CB652 /* mprof3.plist in Resources */ = {isa = PBXBuildFile; fileRef = B61099F924F5F370005CB652 /* mprof3.plist */; }; + B6109A2724F5F377005CB652 /* uniap2en.plist in Resources */ = {isa = PBXBuildFile; fileRef = B61099FA24F5F370005CB652 /* uniap2en.plist */; }; + B6109A2824F5F377005CB652 /* apple2ep.plist in Resources */ = {isa = PBXBuildFile; fileRef = B61099FB24F5F370005CB652 /* apple2ep.plist */; }; + B6109A2924F5F377005CB652 /* apple2gs.plist in Resources */ = {isa = PBXBuildFile; fileRef = B61099FC24F5F370005CB652 /* apple2gs.plist */; }; + B6109A2A24F5F377005CB652 /* apple3.plist in Resources */ = {isa = PBXBuildFile; fileRef = B61099FD24F5F370005CB652 /* apple3.plist */; }; + B6109A2B24F5F377005CB652 /* elppa.plist in Resources */ = {isa = PBXBuildFile; fileRef = B61099FE24F5F370005CB652 /* elppa.plist */; }; + B6109A2C24F5F377005CB652 /* spectred.plist in Resources */ = {isa = PBXBuildFile; fileRef = B61099FF24F5F371005CB652 /* spectred.plist */; }; + B6109A2D24F5F377005CB652 /* prav8m.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A0024F5F371005CB652 /* prav8m.plist */; }; + B6109A2E24F5F377005CB652 /* apple2eefr.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A0124F5F371005CB652 /* apple2eefr.plist */; }; + B6109A2F24F5F377005CB652 /* uniap2ti.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A0224F5F371005CB652 /* uniap2ti.plist */; }; + B6109A3024F5F377005CB652 /* apple2.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A0324F5F371005CB652 /* apple2.plist */; }; + B6109A3124F5F377005CB652 /* apple1.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A0424F5F372005CB652 /* apple1.plist */; }; + B6109A3224F5F377005CB652 /* basis108.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A0524F5F372005CB652 /* basis108.plist */; }; + B6109A3324F5F377005CB652 /* apple2eeuk.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A0624F5F372005CB652 /* apple2eeuk.plist */; }; + B6109A3424F5F377005CB652 /* am64.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A0724F5F372005CB652 /* am64.plist */; }; + B6109A3524F5F377005CB652 /* ace100.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A0824F5F373005CB652 /* ace100.plist */; }; + B6109A3624F5F377005CB652 /* dodo.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A0924F5F373005CB652 /* dodo.plist */; }; + B6109A3724F5F377005CB652 /* las128e2.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A0A24F5F373005CB652 /* las128e2.plist */; }; + B6109A3824F5F377005CB652 /* maxxi.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A0B24F5F373005CB652 /* maxxi.plist */; }; + B6109A3924F5F377005CB652 /* prav8c.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A0C24F5F374005CB652 /* prav8c.plist */; }; + B6109A3A24F5F377005CB652 /* prav82.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A0D24F5F374005CB652 /* prav82.plist */; }; + B6109A3B24F5F377005CB652 /* apple2gsr1.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A0E24F5F374005CB652 /* apple2gsr1.plist */; }; + B6109A3C24F5F377005CB652 /* am100.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A0F24F5F374005CB652 /* am100.plist */; }; + B6109A3D24F5F377005CB652 /* laser128.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A1024F5F375005CB652 /* laser128.plist */; }; + B6109A3E24F5F377005CB652 /* albert.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A1124F5F375005CB652 /* albert.plist */; }; + B6109A3F24F5F377005CB652 /* agat9.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A1224F5F375005CB652 /* agat9.plist */; }; + B6109A4024F5F377005CB652 /* craft2p.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A1324F5F375005CB652 /* craft2p.plist */; }; + B6109A4124F5F377005CB652 /* apple2cp.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A1424F5F376005CB652 /* apple2cp.plist */; }; + B6109A4224F5F377005CB652 /* apple2p.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A1524F5F376005CB652 /* apple2p.plist */; }; + B6109A4324F5F377005CB652 /* agat7.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A1624F5F376005CB652 /* agat7.plist */; }; B64979C224EF6703008ABD20 /* MediaViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B64979C124EF6703008ABD20 /* MediaViewController.m */; }; - B64E15A624E9B34700E8AD3D /* Models.plist in Resources */ = {isa = PBXBuildFile; fileRef = B64E15A424E9B34700E8AD3D /* Models.plist */; }; B64E15A924EA1D5300E8AD3D /* ROMBrowserDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = B64E15A824EA1D5300E8AD3D /* ROMBrowserDelegate.m */; }; B64E15AC24EA1FD400E8AD3D /* SlotBrowserDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = B64E15AB24EA1FD400E8AD3D /* SlotBrowserDelegate.m */; }; B65593B124ECB61800722E0C /* SlotViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B65593B024ECB61800722E0C /* SlotViewController.m */; }; @@ -50,32 +71,53 @@ B60A6E1324EE0AE2004B7EEF /* FlippedView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FlippedView.m; sourceTree = ""; }; B61099E424F5F230005CB652 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/SlotView.xib; sourceTree = ""; }; B61099E624F5F230005CB652 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MediaView.xib; sourceTree = ""; }; - B649798F24EEC2D8008ABD20 /* apple2gsr1.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2gsr1.plist; sourceTree = ""; }; - B649799024EEC2D8008ABD20 /* apple2ees.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2ees.plist; sourceTree = ""; }; - B649799124EEC2D8008ABD20 /* apple2p.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2p.plist; sourceTree = ""; }; - B649799224EEC2D8008ABD20 /* apple2gsr0.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2gsr0.plist; sourceTree = ""; }; - B649799324EEC2D8008ABD20 /* laser2c.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = laser2c.plist; sourceTree = ""; }; - B649799424EEC2D8008ABD20 /* ace100.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = ace100.plist; sourceTree = ""; }; - B649799524EEC2D8008ABD20 /* apple2eeuk.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2eeuk.plist; sourceTree = ""; }; - B649799624EEC2D8008ABD20 /* las128e2.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = las128e2.plist; sourceTree = ""; }; - B649799724EEC2D8008ABD20 /* apple2ep.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2ep.plist; sourceTree = ""; }; - B649799824EEC2D8008ABD20 /* devices.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = devices.plist; sourceTree = ""; }; - B649799924EEC2D9008ABD20 /* apple2gs.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2gs.plist; sourceTree = ""; }; - B649799A24EEC2D9008ABD20 /* apple2e.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2e.plist; sourceTree = ""; }; - B649799B24EEC2D9008ABD20 /* apple2c.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2c.plist; sourceTree = ""; }; - B649799C24EEC2D9008ABD20 /* laser128.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = laser128.plist; sourceTree = ""; }; - B649799D24EEC2D9008ABD20 /* apple2euk.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2euk.plist; sourceTree = ""; }; - B649799E24EEC2D9008ABD20 /* apple2.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2.plist; sourceTree = ""; }; - B649799F24EEC2D9008ABD20 /* apple3.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple3.plist; sourceTree = ""; }; - B64979A024EEC2D9008ABD20 /* apple2cp.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2cp.plist; sourceTree = ""; }; - B64979A124EEC2D9008ABD20 /* apple1.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple1.plist; sourceTree = ""; }; - B64979A224EEC2D9008ABD20 /* apple2eefr.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2eefr.plist; sourceTree = ""; }; - B64979A324EEC2D9008ABD20 /* las128ex.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = las128ex.plist; sourceTree = ""; }; - B64979A424EEC2D9008ABD20 /* apple2jp.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2jp.plist; sourceTree = ""; }; - B64979A524EEC2D9008ABD20 /* apple2ee.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2ee.plist; sourceTree = ""; }; + B61099EA24F5F36E005CB652 /* apple2e.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2e.plist; sourceTree = ""; }; + B61099EB24F5F36E005CB652 /* hkc8800a.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = hkc8800a.plist; sourceTree = ""; }; + B61099EC24F5F36E005CB652 /* apple2ees.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2ees.plist; sourceTree = ""; }; + B61099ED24F5F36E005CB652 /* microeng.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = microeng.plist; sourceTree = ""; }; + B61099EE24F5F36E005CB652 /* uniap2pt.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = uniap2pt.plist; sourceTree = ""; }; + B61099EF24F5F36E005CB652 /* ivelultr.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = ivelultr.plist; sourceTree = ""; }; + B61099F024F5F36E005CB652 /* space84.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = space84.plist; sourceTree = ""; }; + B61099F124F5F36F005CB652 /* apple2c.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2c.plist; sourceTree = ""; }; + B61099F224F5F36F005CB652 /* apple2jp.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2jp.plist; sourceTree = ""; }; + B61099F324F5F36F005CB652 /* apple2euk.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2euk.plist; sourceTree = ""; }; + B61099F424F5F36F005CB652 /* apple2ee.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2ee.plist; sourceTree = ""; }; + B61099F524F5F36F005CB652 /* models.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = models.plist; sourceTree = ""; }; + B61099F624F5F36F005CB652 /* apple2gsr0.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2gsr0.plist; sourceTree = ""; }; + B61099F724F5F36F005CB652 /* las128ex.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = las128ex.plist; sourceTree = ""; }; + B61099F824F5F36F005CB652 /* laser2c.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = laser2c.plist; sourceTree = ""; }; + B61099F924F5F370005CB652 /* mprof3.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = mprof3.plist; sourceTree = ""; }; + B61099FA24F5F370005CB652 /* uniap2en.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = uniap2en.plist; sourceTree = ""; }; + B61099FB24F5F370005CB652 /* apple2ep.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2ep.plist; sourceTree = ""; }; + B61099FC24F5F370005CB652 /* apple2gs.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2gs.plist; sourceTree = ""; }; + B61099FD24F5F370005CB652 /* apple3.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple3.plist; sourceTree = ""; }; + B61099FE24F5F370005CB652 /* elppa.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = elppa.plist; sourceTree = ""; }; + B61099FF24F5F371005CB652 /* spectred.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = spectred.plist; sourceTree = ""; }; + B6109A0024F5F371005CB652 /* prav8m.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = prav8m.plist; sourceTree = ""; }; + B6109A0124F5F371005CB652 /* apple2eefr.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2eefr.plist; sourceTree = ""; }; + B6109A0224F5F371005CB652 /* uniap2ti.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = uniap2ti.plist; sourceTree = ""; }; + B6109A0324F5F371005CB652 /* apple2.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2.plist; sourceTree = ""; }; + B6109A0424F5F372005CB652 /* apple1.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple1.plist; sourceTree = ""; }; + B6109A0524F5F372005CB652 /* basis108.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = basis108.plist; sourceTree = ""; }; + B6109A0624F5F372005CB652 /* apple2eeuk.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2eeuk.plist; sourceTree = ""; }; + B6109A0724F5F372005CB652 /* am64.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = am64.plist; sourceTree = ""; }; + B6109A0824F5F373005CB652 /* ace100.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = ace100.plist; sourceTree = ""; }; + B6109A0924F5F373005CB652 /* dodo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = dodo.plist; sourceTree = ""; }; + B6109A0A24F5F373005CB652 /* las128e2.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = las128e2.plist; sourceTree = ""; }; + B6109A0B24F5F373005CB652 /* maxxi.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = maxxi.plist; sourceTree = ""; }; + B6109A0C24F5F374005CB652 /* prav8c.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = prav8c.plist; sourceTree = ""; }; + B6109A0D24F5F374005CB652 /* prav82.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = prav82.plist; sourceTree = ""; }; + B6109A0E24F5F374005CB652 /* apple2gsr1.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2gsr1.plist; sourceTree = ""; }; + B6109A0F24F5F374005CB652 /* am100.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = am100.plist; sourceTree = ""; }; + B6109A1024F5F375005CB652 /* laser128.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = laser128.plist; sourceTree = ""; }; + B6109A1124F5F375005CB652 /* albert.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = albert.plist; sourceTree = ""; }; + B6109A1224F5F375005CB652 /* agat9.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = agat9.plist; sourceTree = ""; }; + B6109A1324F5F375005CB652 /* craft2p.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = craft2p.plist; sourceTree = ""; }; + B6109A1424F5F376005CB652 /* apple2cp.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2cp.plist; sourceTree = ""; }; + B6109A1524F5F376005CB652 /* apple2p.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2p.plist; sourceTree = ""; }; + B6109A1624F5F376005CB652 /* agat7.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = agat7.plist; sourceTree = ""; }; B64979C024EF6703008ABD20 /* MediaViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaViewController.h; sourceTree = ""; }; B64979C124EF6703008ABD20 /* MediaViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MediaViewController.m; sourceTree = ""; }; - B64E15A524E9B34700E8AD3D /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Base; path = Base.lproj/Models.plist; sourceTree = ""; }; B64E15A724EA1D5300E8AD3D /* ROMBrowserDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ROMBrowserDelegate.h; sourceTree = ""; }; B64E15A824EA1D5300E8AD3D /* ROMBrowserDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ROMBrowserDelegate.m; sourceTree = ""; }; B64E15AA24EA1FD400E8AD3D /* SlotBrowserDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SlotBrowserDelegate.h; sourceTree = ""; }; @@ -116,30 +158,51 @@ B64E15AF24EA365E00E8AD3D /* Resources */ = { isa = PBXGroup; children = ( - B649799424EEC2D8008ABD20 /* ace100.plist */, - B64979A124EEC2D9008ABD20 /* apple1.plist */, - B649799E24EEC2D9008ABD20 /* apple2.plist */, - B649799B24EEC2D9008ABD20 /* apple2c.plist */, - B64979A024EEC2D9008ABD20 /* apple2cp.plist */, - B649799A24EEC2D9008ABD20 /* apple2e.plist */, - B64979A524EEC2D9008ABD20 /* apple2ee.plist */, - B64979A224EEC2D9008ABD20 /* apple2eefr.plist */, - B649799024EEC2D8008ABD20 /* apple2ees.plist */, - B649799524EEC2D8008ABD20 /* apple2eeuk.plist */, - B649799724EEC2D8008ABD20 /* apple2ep.plist */, - B649799D24EEC2D9008ABD20 /* apple2euk.plist */, - B649799924EEC2D9008ABD20 /* apple2gs.plist */, - B649799224EEC2D8008ABD20 /* apple2gsr0.plist */, - B649798F24EEC2D8008ABD20 /* apple2gsr1.plist */, - B64979A424EEC2D9008ABD20 /* apple2jp.plist */, - B649799124EEC2D8008ABD20 /* apple2p.plist */, - B649799F24EEC2D9008ABD20 /* apple3.plist */, - B649799824EEC2D8008ABD20 /* devices.plist */, - B649799624EEC2D8008ABD20 /* las128e2.plist */, - B64979A324EEC2D9008ABD20 /* las128ex.plist */, - B649799324EEC2D8008ABD20 /* laser2c.plist */, - B649799C24EEC2D9008ABD20 /* laser128.plist */, - B64E15A424E9B34700E8AD3D /* Models.plist */, + B6109A0824F5F373005CB652 /* ace100.plist */, + B6109A1624F5F376005CB652 /* agat7.plist */, + B6109A1224F5F375005CB652 /* agat9.plist */, + B6109A1124F5F375005CB652 /* albert.plist */, + B6109A0724F5F372005CB652 /* am64.plist */, + B6109A0F24F5F374005CB652 /* am100.plist */, + B6109A0424F5F372005CB652 /* apple1.plist */, + B6109A0324F5F371005CB652 /* apple2.plist */, + B61099F124F5F36F005CB652 /* apple2c.plist */, + B6109A1424F5F376005CB652 /* apple2cp.plist */, + B61099EA24F5F36E005CB652 /* apple2e.plist */, + B61099F424F5F36F005CB652 /* apple2ee.plist */, + B6109A0124F5F371005CB652 /* apple2eefr.plist */, + B61099EC24F5F36E005CB652 /* apple2ees.plist */, + B6109A0624F5F372005CB652 /* apple2eeuk.plist */, + B61099FB24F5F370005CB652 /* apple2ep.plist */, + B61099F324F5F36F005CB652 /* apple2euk.plist */, + B61099FC24F5F370005CB652 /* apple2gs.plist */, + B61099F624F5F36F005CB652 /* apple2gsr0.plist */, + B6109A0E24F5F374005CB652 /* apple2gsr1.plist */, + B61099F224F5F36F005CB652 /* apple2jp.plist */, + B6109A1524F5F376005CB652 /* apple2p.plist */, + B61099FD24F5F370005CB652 /* apple3.plist */, + B6109A0524F5F372005CB652 /* basis108.plist */, + B6109A1324F5F375005CB652 /* craft2p.plist */, + B6109A0924F5F373005CB652 /* dodo.plist */, + B61099FE24F5F370005CB652 /* elppa.plist */, + B61099EB24F5F36E005CB652 /* hkc8800a.plist */, + B61099EF24F5F36E005CB652 /* ivelultr.plist */, + B6109A0A24F5F373005CB652 /* las128e2.plist */, + B61099F724F5F36F005CB652 /* las128ex.plist */, + B61099F824F5F36F005CB652 /* laser2c.plist */, + B6109A1024F5F375005CB652 /* laser128.plist */, + B6109A0B24F5F373005CB652 /* maxxi.plist */, + B61099ED24F5F36E005CB652 /* microeng.plist */, + B61099F524F5F36F005CB652 /* models.plist */, + B61099F924F5F370005CB652 /* mprof3.plist */, + B6109A0C24F5F374005CB652 /* prav8c.plist */, + B6109A0024F5F371005CB652 /* prav8m.plist */, + B6109A0D24F5F374005CB652 /* prav82.plist */, + B61099F024F5F36E005CB652 /* space84.plist */, + B61099FF24F5F371005CB652 /* spectred.plist */, + B61099FA24F5F370005CB652 /* uniap2en.plist */, + B61099EE24F5F36E005CB652 /* uniap2pt.plist */, + B6109A0224F5F371005CB652 /* uniap2ti.plist */, ); path = Resources; sourceTree = ""; @@ -245,34 +308,55 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - B64979B124EEC2DA008ABD20 /* apple2e.plist in Resources */, - B64979B624EEC2DA008ABD20 /* apple3.plist in Resources */, - B64979B424EEC2DA008ABD20 /* apple2euk.plist in Resources */, - B64979B824EEC2DA008ABD20 /* apple1.plist in Resources */, - B64979AC24EEC2DA008ABD20 /* apple2eeuk.plist in Resources */, - B64979AA24EEC2DA008ABD20 /* laser2c.plist in Resources */, - B64979A724EEC2D9008ABD20 /* apple2ees.plist in Resources */, + B6109A3324F5F377005CB652 /* apple2eeuk.plist in Resources */, + B6109A2424F5F377005CB652 /* las128ex.plist in Resources */, + B6109A1D24F5F377005CB652 /* space84.plist in Resources */, + B6109A3F24F5F377005CB652 /* agat9.plist in Resources */, + B6109A3124F5F377005CB652 /* apple1.plist in Resources */, + B6109A3524F5F377005CB652 /* ace100.plist in Resources */, + B6109A3424F5F377005CB652 /* am64.plist in Resources */, B6BA258224E99BEB005FB8FF /* Assets.xcassets in Resources */, - B64979A924EEC2D9008ABD20 /* apple2gsr0.plist in Resources */, - B64979AB24EEC2DA008ABD20 /* ace100.plist in Resources */, - B64979AD24EEC2DA008ABD20 /* las128e2.plist in Resources */, - B64979AE24EEC2DA008ABD20 /* apple2ep.plist in Resources */, - B64979BB24EEC2DA008ABD20 /* apple2jp.plist in Resources */, + B6109A1724F5F377005CB652 /* apple2e.plist in Resources */, + B6109A3C24F5F377005CB652 /* am100.plist in Resources */, + B6109A2524F5F377005CB652 /* laser2c.plist in Resources */, + B6109A3D24F5F377005CB652 /* laser128.plist in Resources */, + B6109A2824F5F377005CB652 /* apple2ep.plist in Resources */, + B6109A1924F5F377005CB652 /* apple2ees.plist in Resources */, + B6109A3924F5F377005CB652 /* prav8c.plist in Resources */, + B6109A1C24F5F377005CB652 /* ivelultr.plist in Resources */, + B6109A3824F5F377005CB652 /* maxxi.plist in Resources */, + B6109A2E24F5F377005CB652 /* apple2eefr.plist in Resources */, + B6109A2C24F5F377005CB652 /* spectred.plist in Resources */, + B6109A4124F5F377005CB652 /* apple2cp.plist in Resources */, B6BA258524E99BEB005FB8FF /* MainMenu.xib in Resources */, - B64979B324EEC2DA008ABD20 /* laser128.plist in Resources */, - B64979BC24EEC2DA008ABD20 /* apple2ee.plist in Resources */, - B64979B724EEC2DA008ABD20 /* apple2cp.plist in Resources */, + B6109A3A24F5F377005CB652 /* prav82.plist in Resources */, + B6109A2024F5F377005CB652 /* apple2euk.plist in Resources */, + B6109A2F24F5F377005CB652 /* uniap2ti.plist in Resources */, + B6109A1E24F5F377005CB652 /* apple2c.plist in Resources */, + B6109A1A24F5F377005CB652 /* microeng.plist in Resources */, + B6109A3E24F5F377005CB652 /* albert.plist in Resources */, + B6109A4224F5F377005CB652 /* apple2p.plist in Resources */, + B6109A1824F5F377005CB652 /* hkc8800a.plist in Resources */, + B6109A2324F5F377005CB652 /* apple2gsr0.plist in Resources */, + B6109A2624F5F377005CB652 /* mprof3.plist in Resources */, + B6109A3224F5F377005CB652 /* basis108.plist in Resources */, + B6109A4324F5F377005CB652 /* agat7.plist in Resources */, + B6109A2B24F5F377005CB652 /* elppa.plist in Resources */, + B6109A3B24F5F377005CB652 /* apple2gsr1.plist in Resources */, + B6109A2224F5F377005CB652 /* models.plist in Resources */, + B6109A4024F5F377005CB652 /* craft2p.plist in Resources */, + B6109A1B24F5F377005CB652 /* uniap2pt.plist in Resources */, + B6109A3724F5F377005CB652 /* las128e2.plist in Resources */, B61099E824F5F231005CB652 /* MediaView.xib in Resources */, - B64979B924EEC2DA008ABD20 /* apple2eefr.plist in Resources */, - B64979B024EEC2DA008ABD20 /* apple2gs.plist in Resources */, - B64979AF24EEC2DA008ABD20 /* devices.plist in Resources */, - B64979B224EEC2DA008ABD20 /* apple2c.plist in Resources */, - B64E15A624E9B34700E8AD3D /* Models.plist in Resources */, - B64979A824EEC2D9008ABD20 /* apple2p.plist in Resources */, - B64979BA24EEC2DA008ABD20 /* las128ex.plist in Resources */, - B64979B524EEC2DA008ABD20 /* apple2.plist in Resources */, - B64979A624EEC2D9008ABD20 /* apple2gsr1.plist in Resources */, + B6109A2724F5F377005CB652 /* uniap2en.plist in Resources */, + B6109A2A24F5F377005CB652 /* apple3.plist in Resources */, + B6109A2124F5F377005CB652 /* apple2ee.plist in Resources */, + B6109A3624F5F377005CB652 /* dodo.plist in Resources */, B61099E724F5F231005CB652 /* SlotView.xib in Resources */, + B6109A2924F5F377005CB652 /* apple2gs.plist in Resources */, + B6109A1F24F5F377005CB652 /* apple2jp.plist in Resources */, + B6109A3024F5F377005CB652 /* apple2.plist in Resources */, + B6109A2D24F5F377005CB652 /* prav8m.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -312,14 +396,6 @@ name = MediaView.xib; sourceTree = ""; }; - B64E15A424E9B34700E8AD3D /* Models.plist */ = { - isa = PBXVariantGroup; - children = ( - B64E15A524E9B34700E8AD3D /* Base */, - ); - name = Models.plist; - sourceTree = ""; - }; B6BA258324E99BEB005FB8FF /* MainMenu.xib */ = { isa = PBXVariantGroup; children = ( diff --git a/MA2ME/AppDelegate.m b/MA2ME/AppDelegate.m index d632eb2..8d072fb 100644 --- a/MA2ME/AppDelegate.m +++ b/MA2ME/AppDelegate.m @@ -44,7 +44,7 @@ static NSString *kMyContext = @"kMyContext"; /* My Copy of XCode/Interface Builder barfs on NSBrowser. */ NSBundle *bundle = [NSBundle mainBundle]; - NSString *path = [bundle pathForResource: @"Models" ofType: @"plist"]; + NSString *path = [bundle pathForResource: @"models" ofType: @"plist"]; _browserItems = [NSArray arrayWithContentsOfFile: path]; NSView *view = [_window contentView]; @@ -56,14 +56,14 @@ static NSString *kMyContext = @"kMyContext"; browser = [[NSBrowser alloc] initWithFrame: frame]; [browser setMaxVisibleColumns: 2]; - [browser setTakesTitleFromPreviousColumn: YES]; - [browser setTitled: NO]; + //[browser setTakesTitleFromPreviousColumn: YES]; + //[browser setTitled: NO]; [browser setAllowsEmptySelection: NO]; [browser setDelegate: self]; [browser setAction: @selector(modelClick:)]; [view addSubview: browser]; - [browser setTitled: YES]; // NSBrowser title bug. + //[browser setTitled: YES]; // NSBrowser title bug. #if 0 frame = [_slotView frame]; @@ -207,6 +207,7 @@ static NSString * JoinArguments(NSArray *argv) { NSSize screen = [_slotController resolution]; NSString *res = [NSString stringWithFormat: @"%ux%u", (unsigned)screen.width, (unsigned)screen.height]; + NSString *aspect = [NSString stringWithFormat: @"%u:%u", (unsigned)screen.width, (unsigned)screen.height]; [argv addObject: @"-nomax"]; [argv addObject: @"-nounevenstretch"]; @@ -217,7 +218,7 @@ static NSString * JoinArguments(NSArray *argv) { [argv addObject: @"-video"]; [argv addObject: @"soft"]; [argv addObject: @"-aspect"]; - [argv addObject: @"704:462"]; + [argv addObject: aspect]; } else { [argv addObject: @"-resolution"]; [argv addObject: res]; // @"560x384"]; @@ -246,7 +247,7 @@ static NSString * JoinArguments(NSArray *argv) { -(IBAction)modelClick:(id)sender { NSDictionary *item = [self itemForBrowser: sender]; - NSString *model = [item objectForKey: @"Mame"]; + NSString *model = [item objectForKey: @"value"]; [self setMameROM: model]; @@ -269,7 +270,7 @@ static NSString * JoinArguments(NSArray *argv) { NSUInteger ix = [path indexAtPosition: i]; if (ix > [a count]) return nil; item = [a objectAtIndex: ix]; - a = [item objectForKey: @"Children"]; + a = [item objectForKey: @"children"]; } return item; @@ -282,7 +283,7 @@ static NSString * JoinArguments(NSArray *argv) { if (ix < 0) return 0; NSDictionary *item = [a objectAtIndex: ix]; - a = [item objectForKey: @"Children"]; + a = [item objectForKey: @"children"]; if (!a) return 0; } return a; @@ -297,8 +298,8 @@ static NSString * JoinArguments(NSArray *argv) { NSBrowserCell *bc = (NSBrowserCell *)cell; - [bc setStringValue: [item objectForKey: @"Name"]]; - [bc setLeaf: ![item objectForKey: @"Children"]]; + [bc setStringValue: [item objectForKey: @"description"]]; + [bc setLeaf: ![item objectForKey: @"children"]]; } diff --git a/MA2ME/ROMBrowserDelegate.m b/MA2ME/ROMBrowserDelegate.m index 601bf4a..4716c00 100644 --- a/MA2ME/ROMBrowserDelegate.m +++ b/MA2ME/ROMBrowserDelegate.m @@ -20,7 +20,7 @@ -(void)awakeFromNib { NSBundle *bundle = [NSBundle mainBundle]; - NSString *path = [bundle pathForResource: @"Models" ofType: @"plist"]; + NSString *path = [bundle pathForResource: @"models" ofType: @"plist"]; _data = [NSArray arrayWithContentsOfFile: path]; } @@ -28,7 +28,7 @@ -(IBAction)click:(id)sender { NSDictionary *item = [self itemForBrowser: sender]; - [self setModel: [item objectForKey: @"Mame"]]; + [self setModel: [item objectForKey: @"value"]]; } #pragma mark NSBrowser @@ -45,7 +45,7 @@ NSUInteger ix = [path indexAtPosition: i]; if (ix > [data count]) return nil; item = [data objectAtIndex: ix]; - data = [item objectForKey: @"Children"]; + data = [item objectForKey: @"children"]; } return item; @@ -58,7 +58,7 @@ if (ix < 0) return 0; NSDictionary *item = [data objectAtIndex: ix]; - data = [item objectForKey: @"Children"]; + data = [item objectForKey: @"children"]; if (!data) return 0; } return data; @@ -73,8 +73,8 @@ NSBrowserCell *bc = (NSBrowserCell *)cell; - [bc setStringValue: [item objectForKey: @"Name"]]; - [bc setLeaf: ![item objectForKey: @"Children"]]; + [bc setStringValue: [item objectForKey: @"description"]]; + [bc setLeaf: ![item objectForKey: @"children"]]; } diff --git a/MA2ME/Resources/Base.lproj/Models.plist b/MA2ME/Resources/Base.lproj/Models.plist deleted file mode 100644 index 0f5c6ac..0000000 --- a/MA2ME/Resources/Base.lproj/Models.plist +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - Name - Apple IIgs - Mame - apple2gs - Children - - - Name - Apple IIgs ROM 0 - Mame - apple2gsr0 - - - Name - Apple IIgs ROM 1 - Mame - apple2gsr1 - - - Name - Apple IIgs ROM 3 - Mame - apple2gs - - - - - Name - Apple IIe - Mame - apple2e - Children - - - Name - Apple IIe - Mame - apple2e - - - Name - Apple IIe (Enhanced) - Mame - apple2ee - - - Name - Apple IIe (Platinum) - Mame - apple2ep - - - Name - Apple IIe (Spain) - Mame - apple2ees - - - Name - Apple IIe (UK) - Mame - apple2euk - - - - - Name - Apple //c - Mame - apple2c - Children - - - Name - Apple //c - Mame - apple2c - - - Name - Apple //c+ - Mame - apple2cp - - - - - Name - Apple ][ - Mame - apple2 - Children - - - Name - Apple ][ - Mame - apple2 - - - Name - Apple ][+ - Mame - apple2p - - - Name - Apple ][ J-Plus - Mame - apple2jp - - - - - Name - Apple I - Mame - apple1 - - - Name - Apple /// - Mame - apple3 - - - Name - Laser //c - Mame - laser2c - - - Name - Laser 128 - Mame - laser128 - Children - - - Name - Laser 128 - Mame - laser128 - - - Name - Laser 128 EX - Mame - las128ex - - - Name - Laser 128 EX2 - Mame - las128e2 - - - - - Name - Franklin Ace 100 - Mame - ace100 - - - diff --git a/MA2ME/Resources/apple2gs/printer.plist b/MA2ME/Resources/apple2gs/printer.plist deleted file mode 100644 index 16292f6..0000000 --- a/MA2ME/Resources/apple2gs/printer.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - Name - RS232 Loopback - Mame - dec_loopback - - - Name - IE15 Terminal - Mame - ie15 - - - Name - Serial Keyboard - Mame - keyboard - - - diff --git a/MA2ME/Resources/devices.plist b/MA2ME/Resources/devices.plist deleted file mode 100644 index c19663d..0000000 --- a/MA2ME/Resources/devices.plist +++ /dev/null @@ -1,1267 +0,0 @@ - - - - - a1bus - - Name - a1bus - Description - Apple I Bus - - a1bus_slot - - Name - a1bus_slot - Description - Apple I Slot - - a1cass - - Name - a1cass - Description - Apple I cassette board - - ata_interface - - Name - ata_interface - Description - ATA Interface - - ata_slot - - Name - ata_slot - Description - ATA Connector - - cassette_image - - Name - cassette_image - Description - Cassette - - cffa1 - - Name - cffa1 - Description - CFFA Compact Flash for Apple I - - m6502 - - Name - m6502 - Description - MOS Technology 6502 - - palette - - Name - palette - Description - palette - - pia6821 - - Name - pia6821 - Description - 6821 PIA - - ram - - Name - ram - Description - RAM - - screen - - Name - screen - Description - Video Screen - - snapsot_image - - Name - snapsot_image - Description - Snapshot - - software_list - - Name - software_list - Description - Software List - - a24play - - Name - a24play - Description - 4play Joystick Card (rev. B) - - a2aesms - - Name - a2aesms - Description - Applied Engineering Super Music Synthesizer - - a2aevm80 - - Name - a2aevm80 - Description - Applied Engineering Viewmaster 80 - - a2alfam2 - - Name - a2alfam2 - Description - ALF MC1 / Apple Music II - - a2ap16 - - Name - a2ap16 - Description - IBS AP-16 80 column card - - a2ap16a - - Name - a2ap16a - Description - IBS AP-16 80 column card (alt. version) - - a2aplcrd - - Name - a2aplcrd - Description - PCPI Applicard - - a2arcbd - - Name - a2arcbd - Description - Third Millenium Engineering Arcade Board - - a2bus - - Name - a2bus - Description - Apple II Bus - - a2bus_byte8251 - - Name - a2bus_byte8251 - Description - BYTE Serial Interface (8251 based) - - a2bus_slot - - Name - a2bus_slot - Description - Apple II Slot - - a2ceyes - - Name - a2ceyes - Description - Digital Vision ComputerEyes - - a2ceyes2 - - Name - a2ceyes2 - Description - Digital Vision ComputerEyes/2 - - a2cffa02 - - Name - a2cffa02 - Description - CFFA2000 Compact Flash (6502 firmware, www.dreher.net) - - a2cffa2 - - Name - a2cffa2 - Description - CFFA2000 Compact Flash (65C02 firmware, www.dreher.net) - - a2corvus - - Name - a2corvus - Description - Corvus Flat Cable interface - - a2diskii - - Name - a2diskii - Description - Apple Disk II controller - - a2diskiing - - Name - a2diskiing - Description - Apple Disk II NG controller (16-sector) - - a2dx1 - - Name - a2dx1 - Description - Decillonix DX-1 - - a2echoii - - Name - a2echoii - Description - Street Electronics Echo II - - a2echop - - Name - a2echop - Description - Street Electronics Echo Plus - - a2ezcgi - - Name - a2ezcgi - Description - E-Z Color Graphics Interface - - a2ezcgi3 - - Name - a2ezcgi3 - Description - E-Z Color Graphics Interface (TMS9938) - - a2ezcgi5 - - Name - a2ezcgi5 - Description - E-Z Color Graphics Interface (TMS9958) - - a2gameio - - Name - a2gameio - Description - Apple II Game I/O Connector - - a2iwm - - Name - a2iwm - Description - Apple Disk II IWM controller - - a2joy - - Name - a2joy - Description - Apple II analog joysticks - - a2joyprt - - Name - a2joyprt - Description - Sirius JoyPort - - a2mcms1 - - Name - a2mcms1 - Description - Mountain Computer Music System (card 1) - - a2mcms2 - - Name - a2mcms2 - Description - Mountain Computer Music System (card 2) - - a2memexp - - Name - a2memexp - Description - Apple II Memory Expansion Card - - a2midi - - Name - a2midi - Description - 6850 MIDI card - - a2mockbd - - Name - a2mockbd - Description - Sweet Micro Systems Mockingboard - - a2mouse - - Name - a2mouse - Description - Apple II Mouse Card - - a2pdls - - Name - a2pdls - Description - Apple II paddles - - a2phasor - - Name - a2phasor - Description - Applied Engineering Phasor - - a2pic - - Name - a2pic - Description - Apple Parallel Interface Card - - a2ram16k - - Name - a2ram16k - Description - Apple II 16K Language Card - - a2ramfac - - Name - a2ramfac - Description - Applied Engineering RamFactor - - a2sam - - Name - a2sam - Description - Don't Ask Software S.A.M. - - a2scsi - - Name - a2scsi - Description - Apple II SCSI Card - - a2softcard - - Name - a2softcard - Description - Microsoft SoftCard - - a2ssbapl - - Name - a2ssbapl - Description - Multitech Industrial SSB Apple speech card - - a2ssc - - Name - a2ssc - Description - Apple Super Serial Card - - a2ssprite - - Name - a2ssprite - Description - Synetix SuperSprite - - a2surance - - Name - a2surance - Description - Applesurance Diagnostic Controller - - a2swyft - - Name - a2swyft - Description - IAI SwyftCard - - a2themill - - Name - a2themill - Description - Stellation Two The Mill - - a2thunpl - - Name - a2thunpl - Description - ThunderWare ThunderClock Plus - - a2tmstho - - Name - a2tmstho - Description - Applied Engineering TimeMaster H.O. - - a2twarp - - Name - a2twarp - Description - Applied Engineering TransWarp - - a2ultrme - - Name - a2ultrme - Description - Videx UltraTerm (enhanced //e) - - a2ulttrm - - Name - a2ulttrm - Description - Videx UltraTerm (original) - - a2video - - Name - a2video - Description - Apple II video - - a2vidtrm - - Name - a2vidtrm - Description - Videx Videoterm 80 Column Display - - a2vtc1 - - Name - a2vtc1 - Description - unknown Videoterm clone - - a2zipdrv - - Name - a2zipdrv - Description - Zip Technologies ZipDrive - - acia6850 - - Name - acia6850 - Description - MC6850 ACIA - - address_map_bank - - Name - address_map_bank - Description - Address Map Bank - - apple2com - - Name - apple2com - Description - Apple II Common Components - - apple_fdcl - - Name - apple_fdcl - Description - Apple FDC (legacy) - - ay3600 - - Name - ay3600 - Description - AY-5-3600 Keyboard Encoder - - ay8910 - - Name - ay8910 - Description - AY-3-8910A PSG - - ay8912 - - Name - ay8912 - Description - AY-3-8912A PSG - - ay8913 - - Name - ay8913 - Description - AY-3-8913 PSG - - centronics - - Name - centronics - Description - Centronics - - clock - - Name - clock - Description - Clock - - corvus_hdc - - Name - corvus_hdc - Description - Corvus Flat Cable HDC - - d2fdc - - Name - d2fdc - Description - Apple Disk II floppy controller - - dac_8bit_r2r - - Name - dac_8bit_r2r - Description - 8-Bit R-2R DAC - - diskii13 - - Name - diskii13 - Description - Apple Disk II NG controller (13-sector) - - f9334 - - Name - f9334 - Description - Fairchild 9334 Addressable Latch - - floppy_525_sd - - Name - floppy_525_sd - Description - 5.25" single density floppy drive - - floppy_apple - - Name - floppy_apple - Description - Apple Disk II - - floppy_connector - - Name - floppy_connector - Description - Floppy drive connector abstraction - - flopsnd - - Name - flopsnd - Description - Floppy sound - - harddisk_image - - Name - harddisk_image - Description - Harddisk - - hd6845s - - Name - hd6845s - Description - Hitachi HD6845S CRTC - - i8251 - - Name - i8251 - Description - Intel 8251 USART - - input_buffer - - Name - input_buffer - Description - Input Buffer - - iwm - - Name - iwm - Description - Apple IWM floppy controller - - m65c02 - - Name - m65c02 - Description - WDC W65C02 - - m68705p3 - - Name - m68705p3 - Description - Motorola MC68705P3 - - mc6809e - - Name - mc6809e - Description - Motorola MC6809E - - mc6845 - - Name - mc6845 - Description - Motorola MC6845 CRTC - - mcmseng - - Name - mcmseng - Description - Mountain Computer Music System engine - - midi_port - - Name - midi_port - Description - MIDI port - - mm5307aa - - Name - mm5307aa - Description - MM5307AA Baud Rate Generator - - mos6551 - - Name - mos6551 - Description - MOS 6551 ACIA - - msm5832 - - Name - msm5832 - Description - OKI MSM5832 RTC - - nscsi_bus - - Name - nscsi_bus - Description - SCSI Bus (new) - - nscsi_connector - - Name - nscsi_connector - Description - SCSI Connector Abstraction (new) - - output_latch - - Name - output_latch - Description - Output Latch - - picture_image - - Name - picture_image - Description - Still Image - - ptm6840 - - Name - ptm6840 - Description - MC6840 PTM - - rs232 - - Name - rs232 - Description - RS232 Port - - sn76489 - - Name - sn76489 - Description - SN76489 - - speaker - - Name - speaker - Description - Speaker - - speaker_sound_device - - Name - speaker_sound_device - Description - Filtered 1-bit DAC - - ssram128 - - Name - ssram128 - Description - Saturn Systems 128K Extended Language Card - - timer - - Name - timer - Description - Timer - - tms5220 - - Name - tms5220 - Description - TMS5220 - - tms9918a - - Name - tms9918a - Description - TMS9918A VDP - - upd1990a - - Name - upd1990a - Description - uPD1990A RTC - - v9938 - - Name - v9938 - Description - Yamaha V9938 VDP - - v9958 - - Name - v9958 - Description - Yamaha V9958 VDP - - via6522 - - Name - via6522 - Description - 6522 VIA - - volt_reg - - Name - volt_reg - Description - Voltage Regulator - - z80 - - Name - z80 - Description - Zilog Z80 - - a2focdrv - - Name - a2focdrv - Description - Parsons Engineering Focus Drive - - a3fdc - - Name - a3fdc - Description - Apple III floppy controller - - beep - - Name - beep - Description - Beep - - bitbanger - - Name - bitbanger - Description - Bitbanger - - dac - - Name - dac - Description - 1-Bit DAC - - dac_6bit_bw - - Name - dac_6bit_bw - Description - 6-Bit Binary Weighted DAC - - dec_rs232_loopback - - Name - dec_rs232_loopback - Description - RS232 Loopback (DEC 12-15336-00) - - generic_keyboard - - Name - generic_keyboard - Description - Generic Keyboard - - gfxdecode - - Name - gfxdecode - Description - gfxdecode - - ie15_cpu - - Name - ie15_cpu - Description - ie15 CPU - - ie15_device - - Name - ie15_device - Description - IE15 - - ie15_terminal - - Name - ie15_terminal - Description - IE15 Terminal - - ie15kbd - - Name - ie15kbd - Description - 15WWW-97-006 Keyboard - - ins8250 - - Name - ins8250 - Description - National Semiconductor INS8250 UART - - ipt_merge_any_hi - - Name - ipt_merge_any_hi - Description - Input Merger (any high) - - m6802 - - Name - m6802 - Description - Motorola MC6802 - - mm58167 - - Name - mm58167 - Description - National Semiconductor MM58167 RTC - - null_modem - - Name - null_modem - Description - RS232 Null Modem - - printer_image - - Name - printer_image - Description - Printer - - pseudo_terminal - - Name - pseudo_terminal - Description - Pseudo terminal - - rs232_loopback - - Name - rs232_loopback - Description - RS232 Loopback - - serial_keyboard - - Name - serial_keyboard - Description - Serial Keyboard - - serial_printer - - Name - serial_printer - Description - Serial Printer - - serial_terminal - - Name - serial_terminal - Description - Serial Terminal - - sunkbd - - Name - sunkbd - Description - Sun Keyboard Port - - sunkbd_adaptor - - Name - sunkbd_adaptor - Description - Sun Keyboard Adaptor - - swtpc8212_device - - Name - swtpc8212_device - Description - SWTPC8212 - - swtpc8212_terminal - - Name - swtpc8212_terminal - Description - SWTPC8212 Terminal - - a2eauxslot - - Name - a2eauxslot - Description - Apple IIe AUX Bus - - a2eauxslot_slot - - Name - a2eauxslot_slot - Description - Apple IIe AUX Slot - - a2eext80 - - Name - a2eext80 - Description - Apple IIe Extended 80-Column Card - - a2erwks3 - - Name - a2erwks3 - Description - Applied Engineering RamWorks III - - a2estd80 - - Name - a2estd80 - Description - Apple IIe Standard 80-Column Card - - a2hsscsi - - Name - a2hsscsi - Description - Apple II High-Speed SCSI Card - - a2pcxport - - Name - a2pcxport - Description - Applied Engineering PC Transporter - - a2vuliie - - Name - a2vuliie - Description - Applied Engineering Vulcan IDE controller (//e version) - - ds1315 - - Name - ds1315 - Description - Dallas DS1315 Phantom Time Chip - - isa8 - - Name - isa8 - Description - 8-bit ISA bus - - isa8_slot - - Name - isa8_slot - Description - 8-bit ISA slot - - pc_kbdc - - Name - pc_kbdc - Description - PC KBDC - - pc_kbdc_slot - - Name - pc_kbdc_slot - Description - PC keyboard port - - pcx_dmac - - Name - pcx_dmac - Description - PC Transporter DMAC - - pic8259 - - Name - pic8259 - Description - Intel 8259 PIC - - pit8253 - - Name - pit8253 - Description - Intel 8253 PIT - - pit_counter - - Name - pit_counter - Description - PIT Counter - - v30 - - Name - v30 - Description - NEC V30 - - a2vulcan - - Name - a2vulcan - Description - Applied Engineering Vulcan IDE controller (IIgs version) - - a2vulgld - - Name - a2vulgld - Description - Applied Engineering Vulcan Gold IDE controller (IIgs version) - - es5503 - - Name - es5503 - Description - Ensoniq ES5503 - - floppy_sonny - - Name - floppy_sonny - Description - Floppy Disk [Sony] - - iwml - - Name - iwml - Description - Apple IWM (Integrated Woz Machine) (legacy) - - m50741 - - Name - m50741 - Description - Mitsubishi M50741 - - nvram - - Name - nvram - Description - NVRAM - - scc85c30 - - Name - scc85c30 - Description - Zilog Z85C30 SCC - - w65c816 - - Name - w65c816 - Description - WDC W65C816 - - z80scc_channel - - Name - z80scc_channel - Description - Z80 SCC Channel - - m50740 - - Name - m50740 - Description - Mitsubishi M50740 - - - - diff --git a/MA2ME/Resources/models.plist b/MA2ME/Resources/models.plist new file mode 100644 index 0000000..4691b8e --- /dev/null +++ b/MA2ME/Resources/models.plist @@ -0,0 +1,329 @@ + + + + + + description + Apple I + value + apple1 + + + description + Apple ][ + value + apple2 + children + + + description + Apple ][ + value + apple2 + + + description + Apple ][+ + value + apple2p + + + description + Apple ][ J-Plus + value + apple2jp + + + + + description + Apple IIe + value + apple2e + children + + + description + Apple //e + value + apple2e + + + description + Apple //e (Spain) + value + apple2ees + + + description + Apple //e (UK) + value + apple2euk + + + description + Apple //e (Platinum) + value + apple2ep + + + description + Apple //e (enhanced) + value + apple2ee + + + description + Apple //e (enhanced, UK) + value + apple2eeuk + + + description + Apple //e (enhanced, France) + value + apple2eefr + + + + + description + Apple //c + value + apple2c + children + + + description + Apple //c + value + apple2c + + + description + Apple //c Plus + value + apple2cp + + + + + description + Apple IIgs + value + apple2gs + children + + + description + Apple IIgs (ROM00) + value + apple2gsr0 + + + description + Apple IIgs (ROM01) + value + apple2gsr1 + + + description + Apple IIgs (ROM03) + value + apple2gs + + + + + description + Apple /// + value + apple3 + + + description + Laser + value + laser128 + children + + + description + Laser 128 (version 4.2) + value + laser128 + + + description + Laser //c + value + laser2c + + + description + Laser 128ex (version 4.5) + value + las128ex + + + description + Laser 128ex2 (version 6.1) + value + las128e2 + + + + + description + II Clones + children + + + description + Franklin Ace 100 + value + ace100 + + + description + Agat-7 + value + agat7 + + + description + Agat-9 + value + agat9 + + + description + Albert + value + albert + + + description + AM100 + value + am100 + + + description + AM 64 + value + am64 + + + description + Basis 108 + value + basis108 + + + description + Craft II+ + value + craft2p + + + description + Do-Do + value + dodo + + + description + Elppa II+ + value + elppa + + + description + HKC 8800A + value + hkc8800a + + + description + Ivel Ultra + value + ivelultr + + + description + Maxxi + value + maxxi + + + description + Micro Engenho + value + microeng + + + description + Pravetz 82 + value + prav82 + + + description + Pravetz 8M + value + prav8m + + + description + Space 84 + value + space84 + + + description + Unitron AP II (in English) + value + uniap2en + + + description + Unitron AP II (in Brazilian Portuguese) + value + uniap2pt + + + description + Unitron AP II+ (Teclado Inteligente) + value + uniap2ti + + + + + description + IIe Clones + children + + + description + Microprofessor III + value + mprof3 + + + description + Pravetz 8C + value + prav8c + + + description + Spectrum ED + value + spectred + + + + + diff --git a/MA2ME/SlotViewController.m b/MA2ME/SlotViewController.m index 0af4212..373eb63 100644 --- a/MA2ME/SlotViewController.m +++ b/MA2ME/SlotViewController.m @@ -282,7 +282,7 @@ static void DeactivateMenus(NSArray *items, NSPopUpButton *button) { return; } - NSArray *r = [d objectForKey: @"Resolution"]; + NSArray *r = [d objectForKey: @"resolution"]; NSSize res = NSMakeSize(0, 0); if (r) { res.width = [(NSNumber *)[r objectAtIndex: 0 /*@"width"*/] doubleValue]; diff --git a/MA2ME/mkmodels.py b/MA2ME/mkmodels.py index 5e18f42..7e08854 100644 --- a/MA2ME/mkmodels.py +++ b/MA2ME/mkmodels.py @@ -60,11 +60,11 @@ for x in lines: def make_children(clist): global names return [ - { "name": names[x], "value": x} + { "description": names[x], "value": x} for x in clist ] -plist = [] +data = [] for x in tree: desc, value, children = x @@ -72,6 +72,9 @@ for x in tree: if value: tmp["value"] = value if children: tmp["children"] = make_children(children) - plist.append(tmp) + data.append(tmp) + +path = "Resources/models.plist" +with open(path, "w") as f: + f.write(to_plist(data)) -print(to_plist(plist))