joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-14 02:17:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix menu translation issue

Browse Source
This commit is contained in:
Wengier
2021-05-19 11:09:05 -04:00
parent 3120a8dba1
commit 390ce1079d
2 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/dos/dos.cpp
View File

@@ -48,6 +48,8 @@
#include <unistd.h>
#endif
static bool first_run=true;
extern bool use_quick_reboot, enable_config_as_shell_commands;
extern const char* RunningProgram;
extern bool log_int21, log_fileio;
extern bool sync_time, manualtime;
@@ -3446,6 +3448,28 @@ public:
mainMenu.get_item("dos_ver_edit").enable(true).refresh_item(mainMenu);
update_dos_ems_menu();
/* settings */
if (first_run) {
const Section_prop * section=static_cast<Section_prop *>(control->GetSection("dos"));
use_quick_reboot = section->Get_bool("quick reboot");
enable_config_as_shell_commands = section->Get_bool("shell configuration as commands");
startwait = section->Get_bool("startwait");
startquiet = section->Get_bool("startquiet");
winautorun=startcmd;
first_run=false;
}
#if !defined(HX_DOS)
mainMenu.get_item("mapper_quickrun").enable(true).refresh_item(mainMenu);
#endif
mainMenu.get_item("enable_a20gate").enable(true).refresh_item(mainMenu);
mainMenu.get_item("quick_reboot").check(use_quick_reboot).refresh_item(mainMenu);
mainMenu.get_item("shell_config_commands").check(enable_config_as_shell_commands).enable(true).refresh_item(mainMenu);
#if defined(WIN32) && !defined(HX_DOS)
mainMenu.get_item("dos_win_autorun").check(winautorun).enable(true).refresh_item(mainMenu);
mainMenu.get_item("dos_win_wait").check(startwait).enable(true).refresh_item(mainMenu);
mainMenu.get_item("dos_win_quiet").check(startquiet).enable(true).refresh_item(mainMenu);
#endif
if (IS_PC98_ARCH) {
void PC98_InitDefFuncRow(void);
PC98_InitDefFuncRow();
@@ -3478,6 +3502,7 @@ public:
mainMenu.get_item("dos_ems_board").enable(false).refresh_item(mainMenu);
mainMenu.get_item("dos_ems_emm386").enable(false).refresh_item(mainMenu);
mainMenu.get_item("dos_ems_false").enable(false).refresh_item(mainMenu);
mainMenu.get_item("enable_a20gate").enable(false).refresh_item(mainMenu);
#if !defined(HX_DOS)
mainMenu.get_item("mapper_quickrun").enable(false).refresh_item(mainMenu);
#endif

26
src/shell/shell.cpp
View File

@@ -45,11 +45,8 @@
#endif
#include "build_timestamp.h"
static bool first_run=true;
extern bool use_quick_reboot, mountwarning;
extern bool startcmd, startwait, startquiet, winautorun;
extern bool enable_config_as_shell_commands;
extern bool dos_shell_running_program;
extern bool dos_shell_running_program, mountwarning;
extern bool addovl, addipx;
extern const char* RunningProgram;
extern uint16_t countryNo;
@@ -1756,27 +1753,6 @@ void SHELL_Init() {
/* Setup internal DOS Variables */
dos.dta(RealMake(psp_seg,CTBUF+1));
dos.psp(psp_seg);
/* settings */
if (first_run) {
const Section_prop * section=static_cast<Section_prop *>(control->GetSection("dos"));
use_quick_reboot = section->Get_bool("quick reboot");
enable_config_as_shell_commands = section->Get_bool("shell configuration as commands");
startwait = section->Get_bool("startwait");
startquiet = section->Get_bool("startquiet");
winautorun=startcmd;
first_run=false;
}
#if !defined(HX_DOS)
mainMenu.get_item("mapper_quickrun").enable(true).refresh_item(mainMenu);
#endif
mainMenu.get_item("quick_reboot").check(use_quick_reboot).refresh_item(mainMenu);
mainMenu.get_item("shell_config_commands").check(enable_config_as_shell_commands).enable(true).refresh_item(mainMenu);
#if defined(WIN32) && !defined(HX_DOS)
mainMenu.get_item("dos_win_autorun").check(winautorun).enable(true).refresh_item(mainMenu);
mainMenu.get_item("dos_win_wait").check(startwait).enable(true).refresh_item(mainMenu);
mainMenu.get_item("dos_win_quiet").check(startquiet).enable(true).refresh_item(mainMenu);
#endif
}
/* Pfff... starting and running the shell from a configuration section INIT