claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into fullscreenstaticonqt

Browse Source
This commit is contained in:
Cacodemon345
2022-02-16 16:16:04 +06:00
parent 9e0ca23060 6a6187e104
commit e90ad59074
10 changed files with 87 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/win/win_about.c
View File

@@ -63,5 +63,5 @@ AboutDialogCreate(HWND hwnd)
TaskDialogIndirect(&tdconfig, &i, NULL, NULL);
if (i == IDOK)
ShellExecute(hwnd, L"open", L"https://" EMU_SITE, NULL, NULL, SW_SHOW);
ShellExecute(hwnd, L"open", L"https://" EMU_SITE_W, NULL, NULL, SW_SHOW);
}

2
src/win/win_toolbar.c
View File

@@ -120,7 +120,7 @@ ToolBarUpdatePause(int pause)
static TBBUTTON buttons[] = {
{ PAUSE, IDM_ACTION_PAUSE, TBSTATE_ENABLED, BTNS_BUTTON, { 0 }, 0, 0 },
{ HARD_RESET, IDM_ACTION_HRESET, TBSTATE_ENABLED, BTNS_BUTTON, { 0 }, 0, 0 },
{ ACPI_SHUTDOWN, 0, TBSTATE_INDETERMINATE, BTNS_BUTTON, { 0 }, 0, 0 },
{ ACPI_SHUTDOWN, 0, TBSTATE_HIDDEN, BTNS_BUTTON, { 0 }, 0, 0 },
{ 0, 0, TBSTATE_INDETERMINATE, BTNS_SEP, { 0 }, 0, 0 },
{ CTRL_ALT_DEL, IDM_ACTION_RESET_CAD, TBSTATE_ENABLED, BTNS_BUTTON, { 0 }, 0, 0 },
{ CTRL_ALT_ESC, IDM_ACTION_CTRL_ALT_ESC, TBSTATE_ENABLED, BTNS_BUTTON, { 0 }, 0, 0 },

11
src/win/win_ui.c
View File

@@ -575,7 +575,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
break;
case IDM_DOCS:
ShellExecute(hwnd, L"open", EMU_DOCS_URL, NULL, NULL, SW_SHOW);
ShellExecute(hwnd, L"open", EMU_DOCS_URL_W, NULL, NULL, SW_SHOW);
break;
case IDM_UPDATE_ICONS:
@@ -1172,6 +1172,7 @@ ui_init(int nCmdShow)
int bRet;
TASKDIALOGCONFIG tdconfig = {0};
TASKDIALOG_BUTTON tdbuttons[] = {{IDCANCEL, MAKEINTRESOURCE(IDS_2119)}};
uint32_t helper_lang;
/* Load DPI related Windows 10 APIs */
user32_handle = dynld_module("user32.dll", user32_imports);
@@ -1205,6 +1206,12 @@ ui_init(int nCmdShow)
return(6);
}
/* Load the desired language */
helper_lang = lang_id;
lang_id = 0;
set_language(helper_lang);
win_settings_open(NULL);
return(0);
}
@@ -1322,7 +1329,7 @@ ui_init(int nCmdShow)
}
/* Load the desired language */
uint32_t helper_lang = lang_id;
helper_lang = lang_id;
lang_id = 0;
set_language(helper_lang);