nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[ui] fix file system being reset when switching languages

Browse source 
* Also add a <Ctrl>-<L> cheat mode to toggle the log window
This commit is contained in:
Pete Batard 2018-10-23 22:35:39 +01:00
parent 7757cab3c5
commit fd08cf4745
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/rufus.c
View file

@ -1891,6 +1891,8 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
if (selected_locale != lcmd) { if (selected_locale != lcmd) {
selected_locale = lcmd; selected_locale = lcmd;
selected_langid = get_language_id(lcmd); selected_langid = get_language_id(lcmd);
// Avoid the FS being reset on language change
selected_fs = (int)ComboBox_GetItemData(hFileSystem, ComboBox_GetCurSel(hFileSystem));
relaunch = TRUE; relaunch = TRUE;
PostMessage(hDlg, WM_COMMAND, IDCANCEL, 0); PostMessage(hDlg, WM_COMMAND, IDCANCEL, 0);
} }
@ -3104,6 +3106,11 @@ relaunch:
Edit_SetSel(hLog, 0, -1); Edit_SetSel(hLog, 0, -1);
continue; continue;
} }
// Ctrl-L => Open/Close the log
if ((GetKeyState(VK_CONTROL) & 0x8000) && (msg.message == WM_KEYDOWN) && (msg.wParam == 'L')) {
SendMessage(hMainDialog, WM_COMMAND, IDC_LOG, 0);
continue;
}
// Alt-. => Enable USB enumeration debug // Alt-. => Enable USB enumeration debug
if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == VK_OEM_PERIOD)) { if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == VK_OEM_PERIOD)) {
usb_debug = !usb_debug; usb_debug = !usb_debug;

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 232, 326 IDD_DIALOG DIALOGEX 12, 12, 232, 326
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 3.4.1413" CAPTION "Rufus 3.4.1414"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -392,8 +392,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,4,1413,0 FILEVERSION 3,4,1414,0
PRODUCTVERSION 3,4,1413,0 PRODUCTVERSION 3,4,1414,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -411,13 +411,13 @@ BEGIN
VALUE "Comments", "https://akeo.ie" VALUE "Comments", "https://akeo.ie"
VALUE "CompanyName", "Akeo Consulting" VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.4.1413" VALUE "FileVersion", "3.4.1414"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html" VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus-3.4.exe" VALUE "OriginalFilename", "rufus-3.4.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.4.1413" VALUE "ProductVersion", "3.4.1414"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"