Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2026-04-20 00:17:16 +00:00
Code Issues Projects Releases Wiki Activity

WIP: 'Reset all to Default' button: confirm reboot & fix: Custom mono color

Browse Source
This commit is contained in:
tomcw
2026-01-18 20:10:37 +00:00
parent 443ceebcf1
commit 8e7254e981
8 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/Configuration/PageConfig.cpp
+24 -3
View File
@@ -105,7 +105,19 @@ INT_PTR CPageConfig::DlgProcInternal(HWND hWnd, UINT message, WPARAM wparam, LPA
break;
case IDC_MONOCOLOR:
Win32Frame::GetWin32Frame().ChooseMonochromeColor();
{
CHOOSECOLOR cc;
memset(&cc, 0, sizeof(CHOOSECOLOR));
cc.lStructSize = sizeof(CHOOSECOLOR);
cc.hwndOwner = GetFrame().g_hFrameWindow;
cc.rgbResult = m_PropertySheetHelper.GetConfigNew().m_monochromeRGB;
cc.lpCustColors = m_customColors + 1;
cc.Flags = CC_RGBINIT | CC_SOLIDCOLOR;
if (ChooseColor(&cc))
{
m_PropertySheetHelper.GetConfigNew().m_monochromeRGB = cc.rgbResult;
}
}
break;
case IDC_CHECK_CONFIRM_REBOOT:
@@ -210,6 +222,8 @@ void CPageConfig::InitOptions(HWND hWnd)
m_PropertySheetHelper.FillComboBox(hWnd, IDC_COMPUTER, m_ComputerChoices, nCurrentChoice);
CheckDlgButton(hWnd, IDC_CHECK_CONFIRM_REBOOT, m_PropertySheetHelper.GetConfigNew().m_confirmReboot ? BST_CHECKED : BST_UNCHECKED);
//
SendDlgItemMessage(hWnd, IDC_SLIDER_MASTER_VOLUME, TBM_SETRANGE, TRUE, MAKELONG(VOLUME_MIN, VOLUME_MAX));
@@ -219,8 +233,6 @@ void CPageConfig::InitOptions(HWND hWnd)
//
CheckDlgButton(hWnd, IDC_CHECK_CONFIRM_REBOOT, GetFrame().g_bConfirmReboot ? BST_CHECKED : BST_UNCHECKED);
m_PropertySheetHelper.FillComboBox(hWnd, IDC_VIDEOTYPE, GetVideo().GetVideoChoices(), m_PropertySheetHelper.GetConfigNew().m_videoType);
const VideoStyle_e style = m_PropertySheetHelper.GetConfigNew().m_videoStyle;
CheckDlgButton(hWnd, IDC_CHECK_HALF_SCAN_LINES, GetVideo().IsVideoStyle(style, VS_HALF_SCANLINES) ? BST_CHECKED : BST_UNCHECKED);
@@ -289,6 +301,14 @@ void CPageConfig::DlgOK(HWND hWnd)
bVideoReinit = true;
}
if (m_PropertySheetHelper.GetConfigOld().m_monochromeRGB != m_PropertySheetHelper.GetConfigNew().m_monochromeRGB)
{
GetVideo().SetMonochromeRGB(m_PropertySheetHelper.GetConfigNew().m_monochromeRGB);
bVideoReinit = true;
}
//
const bool isNewVideoRate50Hz = IsDlgButtonChecked(hWnd, IDC_CHECK_50HZ_VIDEO) != 0;
const bool isCurrentVideoRate50Hz = GetVideo().GetVideoRefreshRate() == VR_50HZ;
if (isCurrentVideoRate50Hz != isNewVideoRate50Hz)
@@ -402,6 +422,7 @@ void CPageConfig::ResetAllToDefault(HWND hWnd)
m_PropertySheetHelper.GetConfigNew().m_Apple2Type = apple2Type;
m_PropertySheetHelper.GetConfigNew().m_CpuType = ProbeMainCpuDefault(apple2Type);
m_PropertySheetHelper.GetConfigNew().m_confirmReboot = kConfirmReboot_Default;
m_PropertySheetHelper.GetConfigNew().m_masterVolume = kUserVolume_Default;
m_PropertySheetHelper.GetConfigNew().m_videoType = VT_DEFAULT;