Apple-2-Tools/Steve2
1
0
Fork 0
mirror of https://github.com/trudnai/Steve2.git synced 2024-05-31 15:41:35 +00:00
Code Issues Projects Releases Wiki Activity

Debugger StoryBoard + Some Adjustment on Pause Button

Browse Source
This commit is contained in:
tudnai 2022-10-23 22:14:35 -07:00
parent c7a3f12cc1
commit 132b95a34e
6 changed files with 1152 additions and 1045 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
A2Mac.xcodeproj/project.pbxproj
View File

@ -163,6 +163,14 @@
32799FD4264B1A5700255669 /* doc.on.clipboard.png in Copy Image Files */ = {isa = PBXBuildFile; fileRef = 32E3127224AC0AC400E61891 /* doc.on.clipboard.png */; };
32799FD5264B1A5700255669 /* dotmatrix_effect.png in Copy Image Files */ = {isa = PBXBuildFile; fileRef = 323D04432490B3930086A901 /* dotmatrix_effect.png */; };
32799FD6264B1A5700255669 /* scanlines.png in Copy Image Files */ = {isa = PBXBuildFile; fileRef = 323D04452490BA1E0086A901 /* scanlines.png */; };
327B75C0290645EC00A86A71 /* Debugger.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 327B75BE290645EC00A86A71 /* Debugger.storyboard */; };
327B75C1290645EC00A86A71 /* Debugger.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 327B75BE290645EC00A86A71 /* Debugger.storyboard */; };
327B75C2290645EC00A86A71 /* Debugger.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 327B75BE290645EC00A86A71 /* Debugger.storyboard */; };
327B75C3290645EC00A86A71 /* Debugger.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 327B75BE290645EC00A86A71 /* Debugger.storyboard */; };
327B75D729064FDC00A86A71 /* DebuggerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 327B75D629064FDC00A86A71 /* DebuggerViewController.swift */; };
327B75D829064FDC00A86A71 /* DebuggerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 327B75D629064FDC00A86A71 /* DebuggerViewController.swift */; };
327B75D929064FDC00A86A71 /* DebuggerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 327B75D629064FDC00A86A71 /* DebuggerViewController.swift */; };
327B75DA29064FDC00A86A71 /* DebuggerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 327B75D629064FDC00A86A71 /* DebuggerViewController.swift */; };
32877F8D24ADA6AF003A940D /* joystick.png in Copy Image Files */ = {isa = PBXBuildFile; fileRef = 32877F8C24ADA6AF003A940D /* joystick.png */; };
3296223224A6622C002DEB78 /* apple_original_logo_design.png in Copy Image Files */ = {isa = PBXBuildFile; fileRef = 3296223124A6622C002DEB78 /* apple_original_logo_design.png */; };
3296223524A709CE002DEB78 /* disk_ii_motor_w_floppy.sfx in Resources */ = {isa = PBXBuildFile; fileRef = 3296223324A709CE002DEB78 /* disk_ii_motor_w_floppy.sfx */; };
@ -668,6 +676,8 @@
3277D7A2273C603600749544 /* DisplayScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisplayScrollView.swift; sourceTree = "<group>"; };
32799FDA264B1A5700255669 /* Steve ][ Debug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Steve ][ Debug.app"; sourceTree = BUILT_PRODUCTS_DIR; };
32799FDB264B1A5700255669 /* Steve ][ copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Steve ][ copy-Info.plist"; path = "/Users/trudnai/Dropbox/Projects/A2Mac/Steve ][ copy-Info.plist"; sourceTree = "<absolute>"; };
327B75BF290645EC00A86A71 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Debugger.storyboard; sourceTree = "<group>"; };
327B75D629064FDC00A86A71 /* DebuggerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DebuggerViewController.swift; sourceTree = "<group>"; };
32877F8C24ADA6AF003A940D /* joystick.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = joystick.png; sourceTree = "<group>"; };
3296223124A6622C002DEB78 /* apple_original_logo_design.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = apple_original_logo_design.png; sourceTree = "<group>"; };
3296223324A709CE002DEB78 /* disk_ii_motor_w_floppy.sfx */ = {isa = PBXFileReference; lastKnownFileType = file; path = disk_ii_motor_w_floppy.sfx; sourceTree = "<group>"; };
@ -1144,6 +1154,7 @@
32BFFB5C22EACC630003B53F /* ViewController.swift */,
32C6995127C5439300D0F25D /* Debugger.swift */,
323D042F24898AB70086A901 /* PreferencesViewController.swift */,
327B75D629064FDC00A86A71 /* DebuggerViewController.swift */,
323D04312489BFD80086A901 /* PreferencesWindowController.swift */,
32B18435233F10BC00DBB4AB /* Shaders.metal */,
32C4532D233345420000EBA1 /* MonitorView.swift */,
@ -1153,6 +1164,7 @@
32DBF7632334657900DD50E7 /* HiRes.swift */,
32EDB7A123272CA80073AF2D /* fail1.txt */,
32BFFB6022EACC660003B53F /* Main.storyboard */,
327B75BE290645EC00A86A71 /* Debugger.storyboard */,
321D9BDB287373000036E22F /* Main_copy.storyboard */,
323D042D248980600086A901 /* Preferences.storyboard */,
32C45305232E3EEF0000EBA1 /* RepeatingTimer.swift */,
@ -1502,6 +1514,7 @@
3268B99227DEAC84003FBDCC /* 077-0019 Apple IIe Diagnostic Card - English.rom in Resources */,
32799F90264B1A5700255669 /* Preferences.storyboard in Resources */,
32799F91264B1A5700255669 /* Steve2Icon.icns in Resources */,
327B75C1290645EC00A86A71 /* Debugger.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -1516,6 +1529,7 @@
3268B99127DEAC84003FBDCC /* 077-0019 Apple IIe Diagnostic Card - English.rom in Resources */,
323D042E248980600086A901 /* Preferences.storyboard in Resources */,
320F2A8824CFD74100671B35 /* Steve2Icon.icns in Resources */,
327B75C0290645EC00A86A71 /* Debugger.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -1523,6 +1537,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
327B75C2290645EC00A86A71 /* Debugger.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -1530,6 +1545,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
327B75C3290645EC00A86A71 /* Debugger.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -1621,6 +1637,7 @@
32799F86264B1A5700255669 /* HiRes.swift in Sources */,
32799F87264B1A5700255669 /* LoRes.swift in Sources */,
32C6995327C5439300D0F25D /* Debugger.swift in Sources */,
327B75D829064FDC00A86A71 /* DebuggerViewController.swift in Sources */,
32799F88264B1A5700255669 /* RepeatingTimer.swift in Sources */,
32A6AAFA266AEDF50023257A /* mmio.c in Sources */,
32799F8A264B1A5700255669 /* MonitorView.swift in Sources */,
@ -1656,6 +1673,7 @@
32C6995227C5439300D0F25D /* Debugger.swift in Sources */,
32C45306232E3EEF0000EBA1 /* RepeatingTimer.swift in Sources */,
32A6AAF0266AEDF40023257A /* mmio.c in Sources */,
327B75D729064FDC00A86A71 /* DebuggerViewController.swift in Sources */,
32C4532E233345430000EBA1 /* MonitorView.swift in Sources */,
3277D7A3273C603600749544 /* DisplayScrollView.swift in Sources */,
32A6AB1B266B19680023257A /* hires.c in Sources */,
@ -1667,6 +1685,7 @@
buildActionMask = 2147483647;
files = (
32BFFB6E22EACC660003B53F /* A2MacTests.swift in Sources */,
327B75D929064FDC00A86A71 /* DebuggerViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -1675,6 +1694,7 @@
buildActionMask = 2147483647;
files = (
32BFFB7922EACC660003B53F /* A2MacUITests.swift in Sources */,
327B75DA29064FDC00A86A71 /* DebuggerViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -1758,6 +1778,14 @@
name = LaunchScreen.storyboard;
sourceTree = "<group>";
};
327B75BE290645EC00A86A71 /* Debugger.storyboard */ = {
isa = PBXVariantGroup;
children = (
327B75BF290645EC00A86A71 /* Base */,
);
name = Debugger.storyboard;
sourceTree = "<group>";
};
32BFFB6022EACC660003B53F /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (

8
A2Mac/AppDelegate.swift
View File

@ -128,10 +128,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
let storyboard = NSStoryboard(name: NSStoryboard.Name("Preferences"), bundle: nil)
preferencesController = storyboard.instantiateInitialController() as? PreferencesWindowController
}
if ( preferencesController != nil ) {
preferencesController?.showWindow(sender)
}
// let debuggerStoryboard = NSStoryboard.init(name: NSStoryboard.Name("Debugger"), bundle: nil)
// let debuggerControler = debuggerStoryboard.instantiateController(withIdentifier: NSStoryboard.SceneIdentifier("debuggerWindowController")) as! NSWindowController
// debuggerControler.showWindow(self)
}
@IBAction func PowerOn(_ sender: Any) {

1064
A2Mac/Base.lproj/Debugger.storyboard Normal file
View File

File diff suppressed because it is too large Load Diff

1036
A2Mac/Base.lproj/Main.storyboard
View File

File diff suppressed because it is too large Load Diff

41
A2Mac/DebuggerViewController.swift Normal file
View File

@ -0,0 +1,41 @@
//
// PreferencesViewController.swift
// Steve ][
//
// Created by Tamas Rudnai on 6/4/20.
// Copyright © 2019, 2020 Tamas Rudnai. All rights reserved.
//
// This file is part of Steve ][ -- The Apple ][ Emulator.
//
// Steve ][ is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Steve ][ is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Steve ][. If not, see <https://www.gnu.org/licenses/>.
//
import Cocoa
class DebuggerViewController: NSViewController {
override func viewDidLoad() {
super.viewDidLoad()
self.preferredContentSize = NSMakeSize(self.view.frame.size.width, self.view.frame.size.height)
}
override func viewDidAppear() {
super.viewDidAppear()
// // Update window title with the active TableView Title
// self.parent?.view.window?.title = self.title!
}
}

20
A2Mac/ToolBarController.swift
View File

@ -105,7 +105,13 @@ class ToolBarController: NSWindowController, NSWindowDelegate {
func windowWillExitFullScreen(_ notification: Notification) {
setDisplayWindowed()
}
let offLabel = "Off\u{A0}\u{A0}\u{A0}\u{A0}\u{A0}\u{A0}\u{A0}\u{A0}"
let pauseLabel = "Pause\u{A0}\u{A0}\u{A0}"
let resumeLabel = "Resume"
override func windowDidLoad() {
let isWindowFullscreen = window?.styleMask.contains(.fullSizeContentView) ?? false
if isWindowFullscreen {
@ -114,7 +120,7 @@ class ToolBarController: NSWindowController, NSWindowDelegate {
PauseToolbarItem.isEnabled = false;
PauseButton.state = .off
PauseToolbarItem.label = "Off"
PauseToolbarItem.label = offLabel
}
@IBAction func PowerOn(_ sender: Any) {
@ -122,14 +128,14 @@ class ToolBarController: NSWindowController, NSWindowDelegate {
case cpuState_inited, cpuState_unknown:
PauseToolbarItem.isEnabled = true;
PauseButton.state = .on
PauseToolbarItem.label = "Pause"
PauseToolbarItem.label = pauseLabel
ViewController.current?.PowerOn(sender)
default:
PauseToolbarItem.isEnabled = false;
PauseButton.state = .off
PauseToolbarItem.label = "Off"
PauseToolbarItem.label = offLabel
ViewController.current?.PowerOff(sender)
}
@ -141,18 +147,18 @@ class ToolBarController: NSWindowController, NSWindowDelegate {
switch cpuState {
case cpuState_halted:
PauseButton.state = .on
PauseToolbarItem.label = "Pause"
PauseToolbarItem.label = pauseLabel
ViewController.current?.Pause(sender)
case cpuState_running:
PauseButton.state = .off
PauseToolbarItem.label = "Resume"
PauseToolbarItem.label = resumeLabel
ViewController.current?.Pause(sender)
default:
PauseToolbarItem.isEnabled = false;
PauseButton.state = .off
PauseToolbarItem.label = "Off"
PauseToolbarItem.label = offLabel
break
}