From 28cfa5a94eb896e2d110eef4abc1cdd7324fd78d Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Mon, 23 Apr 2018 17:41:05 +0100 Subject: [PATCH] [ui] preserve Windows To Go dropdown when switching language * Also fix incorrect version number from German translation --- ChangeLog.txt | 11 ++++++++++- res/localization/rufus.loc | 2 +- src/rufus.c | 23 ++++++++++++----------- src/rufus.rc | 10 +++++----- 4 files changed, 28 insertions(+), 18 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 32eed73c..e0371da3 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,12 @@ +o Version 3.0 (2018.??.??) + UI redesign to follow the flow of user operations (with thanks to Fahad Al-Riyami for the concept) + Drop XP and Vista platform support + Switch all downloads to SSL and use rufus.ie as base URL + Improve support of efi.img files on Linux ISOs + Fix delays when querying floppy drives during device enumeration + Improve translation support and remove manual positioning + Internal fixes and improvements + o Version 2.18 (2017.11.07) Ensure that the same drive is reselected on device refresh Add a cheat mode to cycle the USB port of currently selected device @@ -7,7 +16,7 @@ o Version 2.18 (2017.11.07) Update grub4dos to latest IMPORTANT: THIS IS THE LAST RELEASE TO SUPPORT WINDOWS XP AND WINDOWS VISTA - FUTURE RUFUS RELEASES WILL *NO LONGER* BE COMPATIBLE WITH THESE PLATFORMS + SUBSEQUENT RUFUS RELEASES ARE *NO LONGER* COMPATIBLE WITH THESE PLATFORMS o Version 2.17 (2017.09.12) Add support for Debian 9 live ISOs in UEFI mode diff --git a/res/localization/rufus.loc b/res/localization/rufus.loc index 490c2a25..95b89003 100644 --- a/res/localization/rufus.loc +++ b/res/localization/rufus.loc @@ -5428,7 +5428,7 @@ t MSG_305 "Utilisez cette option pour indiquer si vous voulez utiliser ce pĂ©rip ################################################################################ l "de-DE" "German (Deutsch)" 0x0407, 0x0807, 0x0c07, 0x1007, 0x1407 -v 1.0.22 +v 1.0.23 b "en-US" g IDD_DIALOG diff --git a/src/rufus.c b/src/rufus.c index 2ef273eb..b993768f 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -635,7 +635,16 @@ static void SetMBRProps(void) static void SetToGo(void) { - if (((bt != BT_IMAGE) && (display_togo_option)) || ((bt == BT_IMAGE) && (HAS_WINTOGO(img_report)) && (!display_togo_option))) { + HWND hCtrl = GetDlgItem(hMainDialog, IDC_IMAGE_OPTION); + + // Populate the dropdown + IGNORE_RETVAL(ComboBox_ResetContent(hCtrl)); + IGNORE_RETVAL(ComboBox_SetItemData(hCtrl, ComboBox_AddStringU(hCtrl, lmprintf(MSG_117)), FALSE)); + IGNORE_RETVAL(ComboBox_SetItemData(hCtrl, ComboBox_AddStringU(hCtrl, lmprintf(MSG_118)), TRUE)); + IGNORE_RETVAL(ComboBox_SetCurSel(hCtrl, windows_to_go_selection)); + + if ((((bt != BT_IMAGE) || (image_path == NULL)) && (display_togo_option)) || + ((bt == BT_IMAGE) && (HAS_WINTOGO(img_report)) && (!display_togo_option))) { ToggleImageOption(); } } @@ -1260,7 +1269,6 @@ static void ToggleAdvancedFormatOptions(BOOL enable) // Toggle the Image Option dropdown (Windows To Go or Casper settings) static void ToggleImageOption(void) { - HWND hCtrl; int i, shift = row_height; // Windows To Go mode is only available for Windows 8 or later due to the lack // of an ISO mounting API on previous versions. @@ -1269,14 +1277,7 @@ static void ToggleImageOption(void) return; display_togo_option = !display_togo_option; - if (display_togo_option) { - hCtrl = GetDlgItem(hMainDialog, IDC_IMAGE_OPTION); - // Populate the dropdown - IGNORE_RETVAL(ComboBox_ResetContent(hCtrl)); - IGNORE_RETVAL(ComboBox_SetItemData(hCtrl, ComboBox_AddStringU(hCtrl, lmprintf(MSG_117)), FALSE)); - IGNORE_RETVAL(ComboBox_SetItemData(hCtrl, ComboBox_AddStringU(hCtrl, lmprintf(MSG_118)), TRUE)); - IGNORE_RETVAL(ComboBox_SetCurSel(hCtrl, windows_to_go_selection)); - } else + if (!display_togo_option) shift = -shift; format_vpos += shift; status_vpos += shift; @@ -2670,7 +2671,7 @@ static void InitDialog(HWND hDlg) ToggleAdvancedDeviceOptions(FALSE); if (!advanced_mode_format) ToggleAdvancedFormatOptions(FALSE); - ToggleImageOption(); + SetToGo(); // Process commandline parameters if (iso_provided) { diff --git a/src/rufus.rc b/src/rufus.rc index d959d58a..3905f0b5 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 232, 326 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_ACCEPTFILES -CAPTION "Rufus 3.0.1258" +CAPTION "Rufus 3.0.1259" FONT 9, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP @@ -371,8 +371,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,0,1258,0 - PRODUCTVERSION 3,0,1258,0 + FILEVERSION 3,0,1259,0 + PRODUCTVERSION 3,0,1259,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -389,13 +389,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "3.0.1258" + VALUE "FileVersion", "3.0.1259" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.0.1258" + VALUE "ProductVersion", "3.0.1259" END END BLOCK "VarFileInfo"