Disable menu if showing nag window
This commit is contained in:
parent
929635c6de
commit
527ad040b0
|
@ -41,6 +41,7 @@ void RegisterUISettings (void)
|
||||||
AddUISetting(UserInterface_AlwaysOnTop, new CSettingTypeApplication("Settings", "Always on top", (uint32_t)false));
|
AddUISetting(UserInterface_AlwaysOnTop, new CSettingTypeApplication("Settings", "Always on top", (uint32_t)false));
|
||||||
AddUISetting(UserInterface_ShowStatusBar, new CSettingTypeApplication("Settings", "Show Status Bar", true));
|
AddUISetting(UserInterface_ShowStatusBar, new CSettingTypeApplication("Settings", "Show Status Bar", true));
|
||||||
AddUISetting(UserInterface_ExitFullscreenOnLoseFocus, new CSettingTypeApplication("Settings", "Exit Full Screen On Lose Focus", false));
|
AddUISetting(UserInterface_ExitFullscreenOnLoseFocus, new CSettingTypeApplication("Settings", "Exit Full Screen On Lose Focus", false));
|
||||||
|
AddUISetting(UserInterface_ShowingNagWindow, new CSettingTypeApplication("Settings", "Showing Nag Window", false));
|
||||||
|
|
||||||
AddUISetting(RomBrowser_Enabled, new CSettingTypeApplication("Rom Browser", "Rom Browser", true));
|
AddUISetting(RomBrowser_Enabled, new CSettingTypeApplication("Rom Browser", "Rom Browser", true));
|
||||||
AddUISetting(RomBrowser_ColoumnsChanged, new CSettingTypeTempBool(false));
|
AddUISetting(RomBrowser_ColoumnsChanged, new CSettingTypeTempBool(false));
|
||||||
|
|
|
@ -32,6 +32,7 @@ enum UISettingID
|
||||||
UserInterface_AlwaysOnTop,
|
UserInterface_AlwaysOnTop,
|
||||||
UserInterface_ShowStatusBar,
|
UserInterface_ShowStatusBar,
|
||||||
UserInterface_ExitFullscreenOnLoseFocus,
|
UserInterface_ExitFullscreenOnLoseFocus,
|
||||||
|
UserInterface_ShowingNagWindow,
|
||||||
|
|
||||||
RomBrowser_Enabled,
|
RomBrowser_Enabled,
|
||||||
RomBrowser_ColoumnsChanged,
|
RomBrowser_ColoumnsChanged,
|
||||||
|
|
|
@ -20,6 +20,7 @@ CMainMenu::CMainMenu(CMainGui * hMainWindow) :
|
||||||
m_ChangeSettingList.push_back(GameRunning_LimitFPS);
|
m_ChangeSettingList.push_back(GameRunning_LimitFPS);
|
||||||
m_ChangeUISettingList.push_back(UserInterface_InFullScreen);
|
m_ChangeUISettingList.push_back(UserInterface_InFullScreen);
|
||||||
m_ChangeUISettingList.push_back(UserInterface_AlwaysOnTop);
|
m_ChangeUISettingList.push_back(UserInterface_AlwaysOnTop);
|
||||||
|
m_ChangeUISettingList.push_back(UserInterface_ShowingNagWindow);
|
||||||
m_ChangeSettingList.push_back(UserInterface_ShowCPUPer);
|
m_ChangeSettingList.push_back(UserInterface_ShowCPUPer);
|
||||||
m_ChangeSettingList.push_back(Logging_GenerateLog);
|
m_ChangeSettingList.push_back(Logging_GenerateLog);
|
||||||
m_ChangeSettingList.push_back(Debugger_RecordExecutionTimes);
|
m_ChangeSettingList.push_back(Debugger_RecordExecutionTimes);
|
||||||
|
@ -1317,6 +1318,13 @@ void CMainMenu::FillOutMenu(HMENU hMenu)
|
||||||
if (RomLoading) { Item.SetItemEnabled(false); }
|
if (RomLoading) { Item.SetItemEnabled(false); }
|
||||||
MainTitleMenu.push_back(Item);
|
MainTitleMenu.push_back(Item);
|
||||||
|
|
||||||
|
if (UISettingsLoadBool(UserInterface_ShowingNagWindow))
|
||||||
|
{
|
||||||
|
for (MenuItemList::iterator MenuItem = MainTitleMenu.begin(); MenuItem != MainTitleMenu.end(); MenuItem++)
|
||||||
|
{
|
||||||
|
MenuItem->SetItemEnabled(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
AddMenu(hMenu, MainTitleMenu);
|
AddMenu(hMenu, MainTitleMenu);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -794,9 +794,17 @@ void CRomBrowser::RomList_OpenRom(uint32_t /*pnmh*/)
|
||||||
}
|
}
|
||||||
pRomInfo = &m_RomInfo[lvItem.lParam];
|
pRomInfo = &m_RomInfo[lvItem.lParam];
|
||||||
|
|
||||||
if (!pRomInfo) { return; }
|
if (!pRomInfo)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
m_StopRefresh = true;
|
m_StopRefresh = true;
|
||||||
|
|
||||||
|
if (UISettingsLoadBool(UserInterface_ShowingNagWindow))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if ((CPath(pRomInfo->szFullFileName).GetExtension() != "ndd") && (CPath(pRomInfo->szFullFileName).GetExtension() != "d64"))
|
if ((CPath(pRomInfo->szFullFileName).GetExtension() != "ndd") && (CPath(pRomInfo->szFullFileName).GetExtension() != "d64"))
|
||||||
CN64System::RunFileImage(pRomInfo->szFullFileName);
|
CN64System::RunFileImage(pRomInfo->szFullFileName);
|
||||||
else
|
else
|
||||||
|
|
|
@ -39,10 +39,12 @@ void CSupportWindow::Show(HWND hParent, bool Delay)
|
||||||
}
|
}
|
||||||
m_hParent = hParent;
|
m_hParent = hParent;
|
||||||
m_this = this;
|
m_this = this;
|
||||||
|
UISettingsSaveBool(UserInterface_ShowingNagWindow, true);
|
||||||
::SetTimer(nullptr, 0, 2500, TimerProc);
|
::SetTimer(nullptr, 0, 2500, TimerProc);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
UISettingsSaveBool(UserInterface_ShowingNagWindow, true);
|
||||||
DoModal(hParent);
|
DoModal(hParent);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -169,6 +171,7 @@ LRESULT CSupportWindow::OnTimer(UINT /*uMsg*/, WPARAM wParam, LPARAM /*lParam*/,
|
||||||
|
|
||||||
LRESULT CSupportWindow::OnCloseCmd(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
|
LRESULT CSupportWindow::OnCloseCmd(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
|
||||||
{
|
{
|
||||||
|
UISettingsSaveBool(UserInterface_ShowingNagWindow, false);
|
||||||
EndDialog(wID);
|
EndDialog(wID);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
@ -186,6 +189,7 @@ LRESULT CSupportWindow::OnEnterCode(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndC
|
||||||
EnterCodeWindow.DoModal(m_hWnd);
|
EnterCodeWindow.DoModal(m_hWnd);
|
||||||
if (m_Support.Validated())
|
if (m_Support.Validated())
|
||||||
{
|
{
|
||||||
|
UISettingsSaveBool(UserInterface_ShowingNagWindow, false);
|
||||||
EndDialog(wID);
|
EndDialog(wID);
|
||||||
}
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
Loading…
Reference in New Issue