Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-05-28 17:41:37 +00:00
Code Issues Projects Releases Wiki Activity

Rename funcs/vars to remove 'slot5' word

Browse Source
This commit is contained in:
tomcw 2022-11-17 20:55:58 +00:00
parent a3c43b7a69
commit 63bd198ed0
6 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/Configuration/PageDisk.cpp
View File

@ -183,7 +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);
CheckDlgButton(hWnd, IDC_DISKII_STATUS_ENABLE, Win32Frame::GetWin32Frame().GetWindowedModeShowDiskiiStatus() ? BST_CHECKED : BST_UNCHECKED);
const UINT slot = SLOT6;
if (GetCardMgr().QuerySlot(slot) == CT_Disk2) // NB. SLOT6 not setup in m_PropertySheetHelper.GetConfigNew().m_Slot[]
@ -282,18 +282,17 @@ void CPageDisk::DlgOK(HWND hWnd)
}
Win32Frame& win32Frame = Win32Frame::GetWin32Frame();
const bool bNewDiskiiSlot5Status = IsDlgButtonChecked(hWnd, IDC_DISKII_STATUS_ENABLE) ? true : false;
const bool bNewDiskiiStatus = IsDlgButtonChecked(hWnd, IDC_DISKII_STATUS_ENABLE) ? true : false;
if (win32Frame.GetWindowedModeShowDiskiiSlot5Status() != bNewDiskiiSlot5Status)
if (win32Frame.GetWindowedModeShowDiskiiStatus() != bNewDiskiiStatus)
{
REGSAVE(REGVALUE_SHOW_DISKII_STATUS, bNewDiskiiSlot5Status ? 1 : 0);
win32Frame.SetWindowedModeShowDiskiiSlot5Status(bNewDiskiiSlot5Status);
REGSAVE(REGVALUE_SHOW_DISKII_STATUS, bNewDiskiiStatus ? 1 : 0);
win32Frame.SetWindowedModeShowDiskiiStatus(bNewDiskiiStatus);
if (!win32Frame.IsFullScreen())
win32Frame.FrameRefreshStatus(DRAW_BACKGROUND | DRAW_LEDS | DRAW_DISK_STATUS);
}
m_PropertySheetHelper.PostMsgAfterClose(hWnd, m_Page);
}

2
source/FrameBase.h
View File

@ -28,7 +28,7 @@ public:
virtual void FrameSetCursorPosByMousePos() = 0;
virtual void SetFullScreenShowSubunitStatus(bool bShow) = 0;
virtual void SetWindowedModeShowDiskiiSlot5Status(bool bShow) = 0;
virtual void SetWindowedModeShowDiskiiStatus(bool bShow) = 0;
virtual bool GetBestDisplayResolutionForFullScreen(UINT& bestWidth, UINT& bestHeight, UINT userSpecifiedWidth=0, UINT userSpecifiedHeight=0) = 0;
virtual int SetViewportScale(int nNewScale, bool bForce = false) = 0;
virtual void SetAltEnterToggleFullScreen(bool mode) = 0;

2
source/Utilities.cpp
View File

@ -194,7 +194,7 @@ void LoadConfiguration(bool loadImages)
GetFrame().SetFullScreenShowSubunitStatus(dwTmp ? true : false);
if (REGLOAD(TEXT(REGVALUE_SHOW_DISKII_STATUS), &dwTmp))
GetFrame().SetWindowedModeShowDiskiiSlot5Status(dwTmp ? true : false);
GetFrame().SetWindowedModeShowDiskiiStatus(dwTmp ? true : false);
if(REGLOAD(TEXT(REGVALUE_THE_FREEZES_F8_ROM), &dwTmp))
GetPropertySheet().SetTheFreezesF8Rom(dwTmp);

4
source/Windows/Win32Frame.cpp
View File

@ -72,8 +72,8 @@ Win32Frame::Win32Frame()
// Set g_nViewportScale, g_nViewportCX, g_nViewportCY & buttonx, buttony
SetViewportScale(kDEFAULT_VIEWPORT_SCALE, true);
// Set m_showDiskiiSlot5Status, m_redrawDiskiiSlot5Status
SetWindowedModeShowDiskiiSlot5Status(false);
// Set m_showDiskiiStatus, m_redrawDiskiiStatus
SetWindowedModeShowDiskiiStatus(false);
}
void Win32Frame::VideoCreateDIBSection(bool resetVideoState)

8
source/Windows/Win32Frame.h
View File

@ -40,7 +40,7 @@ public:
virtual void FrameSetCursorPosByMousePos();
virtual void SetFullScreenShowSubunitStatus(bool bShow);
virtual void SetWindowedModeShowDiskiiSlot5Status(bool bShow);
virtual void SetWindowedModeShowDiskiiStatus(bool bShow);
virtual bool GetBestDisplayResolutionForFullScreen(UINT& bestWidth, UINT& bestHeight, UINT userSpecifiedWidth = 0, UINT userSpecifiedHeight = 0);
virtual int SetViewportScale(int nNewScale, bool bForce = false);
virtual void SetAltEnterToggleFullScreen(bool mode);
@ -62,7 +62,7 @@ public:
virtual std::shared_ptr<NetworkBackend> CreateNetworkBackend(const std::string& interfaceName);
bool GetFullScreenShowSubunitStatus(void);
bool GetWindowedModeShowDiskiiSlot5Status(void);
bool GetWindowedModeShowDiskiiStatus(void);
int GetFullScreenOffsetX(void);
int GetFullScreenOffsetY(void);
bool IsFullScreen(void);
@ -142,8 +142,8 @@ private:
bool g_bFrameActive;
bool g_windowMinimized;
bool g_bFullScreen_ShowSubunitStatus;
bool m_showDiskiiSlot5Status;
bool m_redrawDiskiiSlot5Status;
bool m_showDiskiiStatus;
bool m_redrawDiskiiStatus;
int g_win_fullscreen_offsetx;
int g_win_fullscreen_offsety;
UINT m_bestWidthForFullScreen;

20
source/Windows/WinFrame.cpp
View File

@ -520,21 +520,21 @@ void Win32Frame::SetFullScreenShowSubunitStatus(bool bShow)
g_bFullScreen_ShowSubunitStatus = bShow;
}
bool Win32Frame::GetWindowedModeShowDiskiiSlot5Status(void)
bool Win32Frame::GetWindowedModeShowDiskiiStatus(void)
{
return m_showDiskiiSlot5Status;
return m_showDiskiiStatus;
}
void Win32Frame::SetWindowedModeShowDiskiiSlot5Status(bool bShow)
void Win32Frame::SetWindowedModeShowDiskiiStatus(bool bShow)
{
m_showDiskiiSlot5Status = bShow;
m_redrawDiskiiSlot5Status = true;
m_showDiskiiStatus = bShow;
m_redrawDiskiiStatus = true;
SetSlotUIOffsets();
}
void Win32Frame::SetSlotUIOffsets(void)
{
if (m_showDiskiiSlot5Status)
if (m_showDiskiiStatus)
{
yOffsetSlot5Label = D2FullUI::yOffsetSlot5Label;
yOffsetSlot5LEDNumbers = D2FullUI::yOffsetSlot5LEDNumbers;
@ -779,7 +779,7 @@ void Win32Frame::FrameDrawDiskStatus( HDC passdc )
else
{
// NB. Only draw Track/Sector if 2x windowed
if (g_nViewportScale == 1 || !GetWindowedModeShowDiskiiSlot5Status())
if (g_nViewportScale == 1 || !GetWindowedModeShowDiskiiStatus())
return;
DrawTrackSector(dc, SLOT6, nDrive1Track, g_nSector[SLOT6][0], nDrive2Track, g_nSector[SLOT6][1]);
@ -893,9 +893,9 @@ void Win32Frame::DrawStatusArea(HDC passdc, int drawflags)
if (g_nViewportScale > 1 && GetCardMgr().QuerySlot(SLOT5) == CT_Disk2)
{
if (m_redrawDiskiiSlot5Status)
if (m_redrawDiskiiStatus)
{
m_redrawDiskiiSlot5Status = false;
m_redrawDiskiiStatus = false;
// Erase background (Slot6's TrackInfo + SectorInfo + "Slot 5" + LEDs + TrackInfo + SectorInfo)
SelectObject(dc, GetStockObject(NULL_PEN));
@ -1655,7 +1655,7 @@ LRESULT Win32Frame::WndProc(
}
else if (pInfo->hdr.idFrom == TTID_SLOT6_TRK_SEC_INFO || pInfo->hdr.idFrom == TTID_SLOT5_TRK_SEC_INFO)
{
if (!GetWindowedModeShowDiskiiSlot5Status())
if (!GetWindowedModeShowDiskiiStatus())
break;
SendMessage(pInfo->hdr.hwndFrom, TTM_SETMAXTIPWIDTH, 0, 200);