Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-06-08 01:29:42 +00:00
Code Issues Projects Releases Wiki Activity

Disk Config: decouple 'Show Status' from DiskII card in slot 5

Browse Source
This commit is contained in:
tomcw 2022-11-17 20:46:09 +00:00
parent 3afcaf0d2b
commit a3c43b7a69
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resource/Applewin.rc
View File

@ -181,7 +181,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "Floppy Disk Drives",IDC_STATIC,5,7,200,125
CONTROL "&Enhanced disk access speed (all drives)",IDC_ENHANCE_DISK_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,19,135,10
CONTROL "Show status",IDC_DISKII_SLOT5_STATUS_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,19,50,10
CONTROL "Show status",IDC_DISKII_STATUS_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,19,50,10
LTEXT "Disk 1:",IDC_STATIC,10,36,23,8
LTEXT "Disk 2:",IDC_STATIC,10,53,23,8

2
resource/resource.h
View File

@ -62,7 +62,7 @@
#define IDC_SAVESTATE_BROWSE 1011
#define IDC_MONOCOLOR 1012
#define IDC_DISKII_SLOT5_ENABLE 1019
#define IDC_DISKII_SLOT5_STATUS_ENABLE 1020
#define IDC_DISKII_STATUS_ENABLE 1020
#define IDC_HDD_ENABLE 1021
#define IDC_HDD_SWAP 1022
#define IDC_PASTE_FROM_CLIPBOARD 1023

2
source/Common.h
View File

@ -67,7 +67,7 @@ enum AppMode_e
#define REGVALUE_OLD_APPLE2_TYPE "Computer Emulation" // Deprecated
#define REGVALUE_CONFIRM_REBOOT "Confirm Reboot" // Added at 1.24.1 PageConfig
#define REGVALUE_FS_SHOW_SUBUNIT_STATUS "Full-screen show subunit status"
#define REGVALUE_SHOW_DISKII_SLOT5_STATUS "Show Disk II Slot 5 status"
#define REGVALUE_SHOW_DISKII_STATUS "Show Disk II Status"
#define REGVALUE_SOUND_EMULATION "Sound Emulation"
#define REGVALUE_SPKR_VOLUME "Speaker Volume"
#define REGVALUE_MB_VOLUME "Mockingboard Volume"

7
source/Configuration/PageDisk.cpp
View File

@ -183,6 +183,7 @@ INT_PTR CPageDisk::DlgProcInternal(HWND hWnd, UINT message, WPARAM wparam, LPARA
case WM_INITDIALOG:
{
CheckDlgButton(hWnd, IDC_ENHANCE_DISK_ENABLE, GetCardMgr().GetDisk2CardMgr().GetEnhanceDisk() ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hWnd, IDC_DISKII_STATUS_ENABLE, Win32Frame::GetWin32Frame().GetWindowedModeShowDiskiiSlot5Status() ? BST_CHECKED : BST_UNCHECKED);
const UINT slot = SLOT6;
if (GetCardMgr().QuerySlot(slot) == CT_Disk2) // NB. SLOT6 not setup in m_PropertySheetHelper.GetConfigNew().m_Slot[]
@ -281,11 +282,11 @@ void CPageDisk::DlgOK(HWND hWnd)
}
Win32Frame& win32Frame = Win32Frame::GetWin32Frame();
const bool bNewDiskiiSlot5Status = IsDlgButtonChecked(hWnd, IDC_DISKII_SLOT5_STATUS_ENABLE) ? true : false;
const bool bNewDiskiiSlot5Status = IsDlgButtonChecked(hWnd, IDC_DISKII_STATUS_ENABLE) ? true : false;
if (win32Frame.GetWindowedModeShowDiskiiSlot5Status() != bNewDiskiiSlot5Status)
{
REGSAVE(REGVALUE_SHOW_DISKII_SLOT5_STATUS, bNewDiskiiSlot5Status ? 1 : 0);
REGSAVE(REGVALUE_SHOW_DISKII_STATUS, bNewDiskiiSlot5Status ? 1 : 0);
win32Frame.SetWindowedModeShowDiskiiSlot5Status(bNewDiskiiSlot5Status);
if (!win32Frame.IsFullScreen())
@ -306,11 +307,9 @@ void CPageDisk::InitOptions(HWND hWnd)
const SS_CARDTYPE cardInSlot5 = m_PropertySheetHelper.GetConfigNew().m_Slot[slot];
CheckDlgButton(hWnd, IDC_DISKII_SLOT5_ENABLE, (cardInSlot5 == CT_Disk2) ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hWnd, IDC_DISKII_SLOT5_STATUS_ENABLE, Win32Frame::GetWin32Frame().GetWindowedModeShowDiskiiSlot5Status() ? BST_CHECKED : BST_UNCHECKED);
const BOOL enable = (cardInSlot5 == CT_Disk2 || cardInSlot5 == CT_Empty) ? TRUE : FALSE;
EnableWindow(GetDlgItem(hWnd, IDC_DISKII_SLOT5_ENABLE), enable);
EnableWindow(GetDlgItem(hWnd, IDC_DISKII_SLOT5_STATUS_ENABLE), (cardInSlot5 == CT_Disk2) ? TRUE : FALSE);
if (cardInSlot5 == CT_Disk2)
InitComboFloppyDrive(hWnd, slot);

2
source/Utilities.cpp
View File

@ -193,7 +193,7 @@ void LoadConfiguration(bool loadImages)
if(REGLOAD(TEXT(REGVALUE_FS_SHOW_SUBUNIT_STATUS), &dwTmp))
GetFrame().SetFullScreenShowSubunitStatus(dwTmp ? true : false);
if (REGLOAD(TEXT(REGVALUE_SHOW_DISKII_SLOT5_STATUS), &dwTmp))
if (REGLOAD(TEXT(REGVALUE_SHOW_DISKII_STATUS), &dwTmp))
GetFrame().SetWindowedModeShowDiskiiSlot5Status(dwTmp ? true : false);
if(REGLOAD(TEXT(REGVALUE_THE_FREEZES_F8_ROM), &dwTmp))