From 817c026720ba858fc52ae581d3cc126cc5ee10fe Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Mon, 12 Jan 2015 00:34:09 +0000 Subject: [PATCH] [ui] enable ToGo selection through a radio button * Part of #126 --- res/localization/rufus.loc | 4 + src/resource.h | 2 + src/rufus.c | 98 +++++++++++++++++--- src/rufus.h | 2 +- src/rufus.rc | 184 +++++++++++++++++++------------------ 5 files changed, 190 insertions(+), 100 deletions(-) diff --git a/res/localization/rufus.loc b/res/localization/rufus.loc index 83fc8fe7..762474bc 100644 --- a/res/localization/rufus.loc +++ b/res/localization/rufus.loc @@ -67,6 +67,10 @@ t IDS_FORMAT_OPTIONS_GRP "Format Options" t IDC_BADBLOCKS "Check device for bad blocks" t IDC_QUICKFORMAT "Quick format" t IDC_BOOT "Create a bootable disk using" +t IDC_WINDOWS_INSTALL "Standard Windows installation" +# Only translate if Microsoft has a specific name for http://en.wikipedia.org/wiki/Windows_To_Go in your language +# Otherwise, you can add a parenthesis eg. "Windows To Go (hint at what it does)" and/or use the tooltip (MSG_???) +t IDC_WINDOWS_TO_GO "Windows To Go" t IDC_SET_ICON "Create extended label and icon files" t IDC_ABOUT "About..." t IDC_LOG "Log" diff --git a/src/resource.h b/src/resource.h index 093cf2d2..4348ec48 100644 --- a/src/resource.h +++ b/src/resource.h @@ -105,6 +105,8 @@ #define IDS_ADVANCED_OPTIONS_GRP 1044 #define IDC_LOG 1045 #define IDC_LANG 1046 +#define IDC_WINDOWS_INSTALL 1047 +#define IDC_WINDOWS_TO_GO 1048 #define IDC_LOG_EDIT 1050 #define IDC_LOG_SAVE 1051 #define IDC_LOG_CLEAR 1052 diff --git a/src/rufus.c b/src/rufus.c index e8210e68..af7afa3c 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -128,7 +128,7 @@ HWND hLogDlg = NULL, hProgress = NULL, hInfo, hDiskID; BOOL use_own_c32[NB_OLD_C32] = {FALSE, FALSE}, detect_fakes = TRUE, mbr_selected_by_user = FALSE; BOOL iso_op_in_progress = FALSE, format_op_in_progress = FALSE, right_to_left_mode = FALSE; BOOL enable_HDDs = FALSE, advanced_mode = TRUE, force_update = FALSE, use_fake_units = TRUE; -BOOL allow_dual_uefi_bios = FALSE, enable_vmdk = FALSE; +BOOL allow_dual_uefi_bios = FALSE, enable_vmdk = FALSE, togo_mode = TRUE; int dialog_showing = 0; uint16_t rufus_version[4], embedded_sl_version[2]; char embedded_sl_version_str[2][12] = { "?.??", "?.??" }; @@ -985,12 +985,11 @@ out: } // Move a control along the Y axis according to the advanced mode setting -void MoveCtrlY(HWND hDlg, int nID, float vertical_shift) { - ResizeMoveCtrl(hDlg, GetDlgItem(hDlg, nID), 0, - (int)(advanced_mode?vertical_shift:-vertical_shift), 0, 0); +static __inline void MoveCtrlY(HWND hDlg, int nID, float vertical_shift) { + ResizeMoveCtrl(hDlg, GetDlgItem(hDlg, nID), 0, (int)vertical_shift, 0, 0); } -void SetPassesTooltip(void) +static void SetPassesTooltip(void) { const unsigned char pattern[] = BADBLOCK_PATTERNS; CreateTooltip(hNBPasses, lmprintf(MSG_153 + ComboBox_GetCurSel(hNBPasses), @@ -998,21 +997,23 @@ void SetPassesTooltip(void) } // Toggle "advanced" mode -void ToggleAdvanced(void) +static void ToggleAdvanced(void) { - float dialog_shift = 80.0f; + float dialog_shift = 82.0f; RECT rect; POINT point; int toggle; advanced_mode = !advanced_mode; + if (!advanced_mode) + dialog_shift = -dialog_shift; // Increase or decrease the Window size GetWindowRect(hMainDialog, &rect); point.x = (rect.right - rect.left); point.y = (rect.bottom - rect.top); MoveWindow(hMainDialog, rect.left, rect.top, point.x, - point.y + (int)(fScale*(advanced_mode?dialog_shift:-dialog_shift)), TRUE); + point.y + (int)(fScale*dialog_shift), TRUE); // Move the status bar up or down MoveCtrlY(hMainDialog, IDC_STATUS, dialog_shift); @@ -1031,13 +1032,13 @@ void ToggleAdvanced(void) point.x = (rect.right - rect.left); point.y = (rect.bottom - rect.top); MoveWindow(hLogDlg, rect.left, rect.top, point.x, - point.y + (int)(fScale*(advanced_mode?dialog_shift:-dialog_shift)), TRUE); + point.y + (int)(fScale*dialog_shift), TRUE); MoveCtrlY(hLogDlg, IDC_LOG_CLEAR, dialog_shift); MoveCtrlY(hLogDlg, IDC_LOG_SAVE, dialog_shift); MoveCtrlY(hLogDlg, IDCANCEL, dialog_shift); GetWindowRect(hLog, &rect); point.x = (rect.right - rect.left); - point.y = (rect.bottom - rect.top) + (int)(fScale*(advanced_mode?dialog_shift:-dialog_shift)); + point.y = (rect.bottom - rect.top) + (int)(fScale*dialog_shift); SetWindowPos(hLog, 0, 0, 0, point.x, point.y, 0); // Don't forget to scroll the edit to the bottom after resize SendMessage(hLog, EM_LINESCROLL, 0, SendMessage(hLog, EM_GETLINECOUNT, 0, 0)); @@ -1052,10 +1053,12 @@ void ToggleAdvanced(void) // Toggle the up/down icon SendMessage(GetDlgItem(hMainDialog, IDC_ADVANCED), BCM_SETIMAGELIST, 0, (LPARAM)(advanced_mode?&bi_up:&bi_down)); + + InvalidateRect(hMainDialog, NULL, TRUE); } // Toggle DD Image mode -void ToggleImage(BOOL enable) +static void ToggleImage(BOOL enable) { EnableWindow(GetDlgItem(hMainDialog, IDC_QUICKFORMAT), enable); EnableWindow(GetDlgItem(hMainDialog, IDC_PARTITION_TYPE), enable); @@ -1066,6 +1069,74 @@ void ToggleImage(BOOL enable) EnableWindow(GetDlgItem(hMainDialog, IDC_SET_ICON), enable); } +// Toggle the Windows To Go radio choice +static void ToggleToGo(void) +{ + float dialog_shift = 38.0f; + RECT rect; + POINT point; + int toggle; + + togo_mode = !togo_mode; + if (!togo_mode) + dialog_shift = -dialog_shift; + + // Increase or decrease the Window size + GetWindowRect(hMainDialog, &rect); + point.x = (rect.right - rect.left); + point.y = (rect.bottom - rect.top); + MoveWindow(hMainDialog, rect.left, rect.top, point.x, + point.y + (int)(fScale*dialog_shift), TRUE); + + // Move the controls up or down + MoveCtrlY(hMainDialog, IDC_STATUS, dialog_shift); + MoveCtrlY(hMainDialog, IDC_START, dialog_shift); + MoveCtrlY(hMainDialog, IDC_INFO, dialog_shift); + MoveCtrlY(hMainDialog, IDC_PROGRESS, dialog_shift); + MoveCtrlY(hMainDialog, IDC_ABOUT, dialog_shift); + MoveCtrlY(hMainDialog, IDC_LOG, dialog_shift); + MoveCtrlY(hMainDialog, IDCANCEL, dialog_shift); + MoveCtrlY(hMainDialog, IDC_SET_ICON, dialog_shift); + MoveCtrlY(hMainDialog, IDS_ADVANCED_OPTIONS_GRP, dialog_shift); + MoveCtrlY(hMainDialog, IDC_ENABLE_FIXED_DISKS, dialog_shift); + MoveCtrlY(hMainDialog, IDC_EXTRA_PARTITION, dialog_shift); + MoveCtrlY(hMainDialog, IDC_RUFUS_MBR, dialog_shift); + MoveCtrlY(hMainDialog, IDC_DISK_ID, dialog_shift); + ResizeMoveCtrl(hMainDialog, GetDlgItem(hMainDialog, IDS_FORMAT_OPTIONS_GRP), 0, 0, 0, (int)dialog_shift); + +#ifdef RUFUS_TEST + MoveCtrlY(hMainDialog, IDC_TEST, dialog_shift); +#endif + + // And do the same for the log dialog while we're at it + GetWindowRect(hLogDlg, &rect); + point.x = (rect.right - rect.left); + point.y = (rect.bottom - rect.top); + MoveWindow(hLogDlg, rect.left, rect.top, point.x, + point.y + (int)(fScale*dialog_shift), TRUE); + MoveCtrlY(hLogDlg, IDC_LOG_CLEAR, dialog_shift); + MoveCtrlY(hLogDlg, IDC_LOG_SAVE, dialog_shift); + MoveCtrlY(hLogDlg, IDCANCEL, dialog_shift); + GetWindowRect(hLog, &rect); + point.x = (rect.right - rect.left); + point.y = (rect.bottom - rect.top) + (int)(fScale*dialog_shift); + SetWindowPos(hLog, 0, 0, 0, point.x, point.y, 0); + // Don't forget to scroll the edit to the bottom after resize + SendMessage(hLog, EM_LINESCROLL, 0, SendMessage(hLog, EM_GETLINECOUNT, 0, 0)); + + // Hide or show the various advanced options + toggle = togo_mode?SW_SHOW:SW_HIDE; + ShowWindow(GetDlgItem(hMainDialog, IDC_WINDOWS_INSTALL), toggle); + ShowWindow(GetDlgItem(hMainDialog, IDC_WINDOWS_TO_GO), toggle); + + // Reset the radio button choice + Button_SetCheck(GetDlgItem(hMainDialog, IDC_WINDOWS_INSTALL), BST_CHECKED); + Button_SetCheck(GetDlgItem(hMainDialog, IDC_WINDOWS_TO_GO), BST_UNCHECKED); + + // Need to invalidate, else we may get artifacts + InvalidateRect(hMainDialog, NULL, TRUE); +} + static BOOL BootCheck(void) { int i, fs, bt, dt, r; @@ -1564,6 +1635,7 @@ void InitDialog(HWND hDlg) // TODO: add new tooltips ToggleAdvanced(); // We start in advanced mode => go to basic mode + ToggleToGo(); // Process commandline parameters if (iso_provided) { @@ -1718,6 +1790,7 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA apply_localization(IDD_DIALOG, hDlg); SetUpdateCheck(); advanced_mode = TRUE; + togo_mode = TRUE; // Create the log window (hidden) first_log_display = TRUE; log_displayed = FALSE; @@ -1871,6 +1944,8 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA break; #ifdef RUFUS_TEST case IDC_TEST: + ToggleToGo(); +#if 0 if (format_thid != NULL) { return (INT_PTR)TRUE; } @@ -1918,6 +1993,7 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA } if (format_thid == NULL) format_op_in_progress = FALSE; +#endif break; #endif case IDC_LANG: diff --git a/src/rufus.h b/src/rufus.h index b5094efa..562c014c 100644 --- a/src/rufus.h +++ b/src/rufus.h @@ -37,7 +37,7 @@ #define COMPANY_NAME "Akeo Consulting" #define STR_NO_LABEL "NO_LABEL" #define LEFT_TO_RIGHT_MARK "‎" // Yes, there is a character between the quotes! -#define RIGHT_TO_LEFT_MARK "‏" +#define RIGHT_TO_LEFT_MARK "‏" // Yes, there is a character between the quotes! #define DRIVE_ACCESS_TIMEOUT 15000 // How long we should retry drive access (in ms) #define DRIVE_ACCESS_RETRIES 60 // How many times we should retry #define DRIVE_INDEX_MIN 0x00000080 diff --git a/src/rufus.rc b/src/rufus.rc index 925ce1d7..cd7d84c7 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -30,12 +30,12 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // Dialog // -IDD_DIALOG DIALOGEX 12, 12, 242, 354 +IDD_DIALOG DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus 2.0.0.569" +CAPTION "Rufus 2.0.0.570" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Start",IDC_START,127,314,50,14 + DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 PUSHBUTTON "...",IDC_SELECT_ISO,207,182,21,14,BS_ICON LTEXT "Device",IDS_DEVICE_TXT,9,6,208,8 PUSHBUTTON "",IDC_LANG,217,2,17,13,BS_TOP | BS_FLAT @@ -48,27 +48,29 @@ BEGIN COMBOBOX IDC_CLUSTERSIZE,8,104,226,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "New volume label",IDS_LABEL_TXT,9,121,222,10 EDITTEXT IDC_LABEL,8,131,226,13,ES_AUTOHSCROLL - GROUPBOX "Format Options",IDS_FORMAT_OPTIONS_GRP,7,149,227,65 + GROUPBOX "Format Options",IDS_FORMAT_OPTIONS_GRP,7,149,227,89 PUSHBUTTON "",IDC_ADVANCED,15,148,14,10,BS_TOP | BS_FLAT CONTROL "Check device for bad blocks",IDC_BADBLOCKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,161,112,10 COMBOBOX IDC_NBPASSES,128,159,100,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Quick format",IDC_QUICKFORMAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,173,121,10 CONTROL "Create a bootable disk using",IDC_BOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,185,112,10 COMBOBOX IDC_BOOTTYPE,128,183,75,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Standard Windows installation",IDC_WINDOWS_INSTALL,"Button",BS_AUTORADIOBUTTON | WS_GROUP,23,198,205,8 + CONTROL "Windows To Go",IDC_WINDOWS_TO_GO,"Button",BS_AUTORADIOBUTTON,23,210,205,8 CONTROL "Create extended label and icon files",IDC_SET_ICON, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,198,216,10 - GROUPBOX "Advanced Options",IDS_ADVANCED_OPTIONS_GRP,7,210,227,54 - CONTROL "List USB Hard Drives",IDC_ENABLE_FIXED_DISKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,222,216,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,221,216,10 + GROUPBOX "Advanced Options",IDS_ADVANCED_OPTIONS_GRP,7,234,227,55 + CONTROL "List USB Hard Drives",IDC_ENABLE_FIXED_DISKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,247,216,10 CONTROL "Add fixes for old BIOSes (extra partition, align, etc.)",IDC_EXTRA_PARTITION, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,235,216,10 - CONTROL "Use Rufus MBR with BIOS ID",IDC_RUFUS_MBR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,248,112,10 - COMBOBOX IDC_DISK_ID,128,246,100,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_PROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,8,273,225,9 - EDITTEXT IDC_INFO,8,291,225,11,ES_CENTER | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - PUSHBUTTON "About...",IDC_ABOUT,8,314,50,14 - PUSHBUTTON "Log",IDC_LOG,63,314,21,14 - PUSHBUTTON "T",IDC_TEST,90,314,12,14,NOT WS_VISIBLE - PUSHBUTTON "Close",IDCANCEL,183,314,50,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,259,216,10 + CONTROL "Use Rufus MBR with BIOS ID",IDC_RUFUS_MBR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,272,112,10 + COMBOBOX IDC_DISK_ID,128,270,100,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_PROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,8,298,225,9 + EDITTEXT IDC_INFO,8,316,225,12,ES_CENTER | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE + PUSHBUTTON "About...",IDC_ABOUT,8,339,50,14 + PUSHBUTTON "Log",IDC_LOG,63,339,21,14 + PUSHBUTTON "T",IDC_TEST,90,339,12,14,NOT WS_VISIBLE + PUSHBUTTON "Close",IDCANCEL,183,339,50,14 END IDD_ABOUTBOX DIALOGEX 0, 0, 319, 237 @@ -93,15 +95,15 @@ BEGIN EDITTEXT IDC_LICENSE_TEXT,7,7,321,176,ES_MULTILINE | ES_READONLY | WS_VSCROLL END -IDD_LOG DIALOGEX 0, 0, 366, 354 +IDD_LOG DIALOGEX 0, 0, 366, 376 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION CAPTION "Log" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN - EDITTEXT IDC_LOG_EDIT,0,0,366,324,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL,WS_EX_STATICEDGE - PUSHBUTTON "Clear Log",IDC_LOG_CLEAR,198,331,50,14 - PUSHBUTTON "Save Log",IDC_LOG_SAVE,253,331,50,14 - DEFPUSHBUTTON "Close Log",IDCANCEL,308,331,50,14 + EDITTEXT IDC_LOG_EDIT,0,0,366,346,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL,WS_EX_STATICEDGE + PUSHBUTTON "Clear Log",IDC_LOG_CLEAR,198,354,50,14 + PUSHBUTTON "Save Log",IDC_LOG_SAVE,253,354,50,14 + DEFPUSHBUTTON "Close Log",IDCANCEL,308,354,50,14 END IDD_NOTIFICATION DIALOGEX 0, 0, 263, 63 @@ -153,12 +155,12 @@ BEGIN EDITTEXT IDC_DOWNLOAD_URL,15,191,351,13,ES_AUTOHSCROLL | ES_READONLY END -IDD_DIALOG_XP DIALOGEX 12, 12, 242, 354 +IDD_DIALOG_XP DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus 2.0.0.569" +CAPTION "Rufus 2.0.0.570" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Start",IDC_START,127,314,50,14 + DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 PUSHBUTTON "...",IDC_SELECT_ISO,207,182,21,14,BS_ICON LTEXT "Device",IDS_DEVICE_TXT,9,6,208,8 PUSHBUTTON "",IDC_LANG,217,2,17,13,BS_TOP | BS_FLAT @@ -171,27 +173,29 @@ BEGIN COMBOBOX IDC_CLUSTERSIZE,8,104,226,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "New volume label",IDS_LABEL_TXT,9,121,222,10 EDITTEXT IDC_LABEL,8,131,226,13,ES_AUTOHSCROLL - GROUPBOX "Format Options",IDS_FORMAT_OPTIONS_GRP,7,149,227,65 + GROUPBOX "Format Options",IDS_FORMAT_OPTIONS_GRP,7,149,227,89 PUSHBUTTON "",IDC_ADVANCED,15,148,14,10,BS_TOP | BS_FLAT CONTROL "Check device for bad blocks",IDC_BADBLOCKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,161,112,10 COMBOBOX IDC_NBPASSES,128,159,100,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Quick format",IDC_QUICKFORMAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,173,121,10 CONTROL "Create a bootable disk using",IDC_BOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,185,112,10 COMBOBOX IDC_BOOTTYPE,128,183,75,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Standard Windows installation",IDC_WINDOWS_INSTALL,"Button",BS_AUTORADIOBUTTON | WS_GROUP,23,198,205,8 + CONTROL "Windows To Go",IDC_WINDOWS_TO_GO,"Button",BS_AUTORADIOBUTTON,23,210,205,8 CONTROL "Create extended label and icon files",IDC_SET_ICON, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,198,216,10 - GROUPBOX "Advanced Options",IDS_ADVANCED_OPTIONS_GRP,7,210,227,54 - CONTROL "List USB Hard Drives",IDC_ENABLE_FIXED_DISKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,222,216,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,221,216,10 + GROUPBOX "Advanced Options",IDS_ADVANCED_OPTIONS_GRP,7,234,227,55 + CONTROL "List USB Hard Drives",IDC_ENABLE_FIXED_DISKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,247,216,10 CONTROL "Add fixes for old BIOSes (extra partition, align, etc.)",IDC_EXTRA_PARTITION, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,235,216,10 - CONTROL "Use Rufus MBR with BIOS ID",IDC_RUFUS_MBR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,248,112,10 - COMBOBOX IDC_DISK_ID,128,246,100,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_PROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,8,273,225,9 - EDITTEXT IDC_INFO,8,291,225,11,ES_CENTER | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - PUSHBUTTON "About...",IDC_ABOUT,8,314,50,14 - PUSHBUTTON "Log",IDC_LOG,63,314,21,14 - PUSHBUTTON "T",IDC_TEST,90,314,12,14,NOT WS_VISIBLE - PUSHBUTTON "Close",IDCANCEL,183,314,50,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,259,216,10 + CONTROL "Use Rufus MBR with BIOS ID",IDC_RUFUS_MBR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,272,112,10 + COMBOBOX IDC_DISK_ID,128,270,100,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_PROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,8,298,225,9 + EDITTEXT IDC_INFO,8,316,225,12,ES_CENTER | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE + PUSHBUTTON "About...",IDC_ABOUT,8,339,50,14 + PUSHBUTTON "Log",IDC_LOG,63,339,21,14 + PUSHBUTTON "T",IDC_TEST,90,339,12,14,NOT WS_VISIBLE + PUSHBUTTON "Close",IDCANCEL,183,339,50,14 END IDD_ABOUTBOX_XP DIALOGEX 0, 0, 319, 237 @@ -216,15 +220,15 @@ BEGIN EDITTEXT IDC_LICENSE_TEXT,7,7,321,176,ES_MULTILINE | ES_READONLY | WS_VSCROLL END -IDD_LOG_XP DIALOGEX 0, 0, 366, 354 +IDD_LOG_XP DIALOGEX 0, 0, 366, 376 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION CAPTION "Log" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - EDITTEXT IDC_LOG_EDIT,0,0,366,324,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL,WS_EX_STATICEDGE - PUSHBUTTON "Clear Log",IDC_LOG_CLEAR,198,331,50,14 - PUSHBUTTON "Save Log",IDC_LOG_SAVE,253,331,50,14 - DEFPUSHBUTTON "Close Log",IDCANCEL,308,331,50,14 + EDITTEXT IDC_LOG_EDIT,0,0,366,346,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL,WS_EX_STATICEDGE + PUSHBUTTON "Clear Log",IDC_LOG_CLEAR,198,354,50,14 + PUSHBUTTON "Save Log",IDC_LOG_SAVE,253,354,50,14 + DEFPUSHBUTTON "Close Log",IDCANCEL,308,354,50,14 END IDD_NOTIFICATION_XP DIALOGEX 0, 0, 263, 63 @@ -276,13 +280,13 @@ BEGIN EDITTEXT IDC_DOWNLOAD_URL,15,191,351,13,ES_AUTOHSCROLL | ES_READONLY END -IDD_DIALOG_RTL DIALOGEX 12, 12, 242, 354 +IDD_DIALOG_RTL DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 2.0.0.569" +CAPTION "Rufus 2.0.0.570" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Start",IDC_START,127,314,50,14 + DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 PUSHBUTTON "...",IDC_SELECT_ISO,207,182,21,14,BS_ICON LTEXT "Device",IDS_DEVICE_TXT,9,6,208,8 PUSHBUTTON "",IDC_LANG,217,2,17,13,BS_TOP | BS_FLAT @@ -295,27 +299,29 @@ BEGIN COMBOBOX IDC_CLUSTERSIZE,8,104,226,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "New volume label",IDS_LABEL_TXT,9,121,222,10 EDITTEXT IDC_LABEL,8,131,226,13,ES_AUTOHSCROLL - GROUPBOX "Format Options",IDS_FORMAT_OPTIONS_GRP,7,149,227,65 + GROUPBOX "Format Options",IDS_FORMAT_OPTIONS_GRP,7,149,227,89 PUSHBUTTON "",IDC_ADVANCED,15,148,14,10,BS_TOP | BS_FLAT CONTROL "Check device for bad blocks",IDC_BADBLOCKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,161,112,10 COMBOBOX IDC_NBPASSES,128,159,100,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Quick format",IDC_QUICKFORMAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,173,121,10 CONTROL "Create a bootable disk using",IDC_BOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,185,112,10 COMBOBOX IDC_BOOTTYPE,128,183,75,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Standard Windows installation",IDC_WINDOWS_INSTALL,"Button",BS_AUTORADIOBUTTON | WS_GROUP,23,198,205,8 + CONTROL "Windows To Go",IDC_WINDOWS_TO_GO,"Button",BS_AUTORADIOBUTTON,23,210,205,8 CONTROL "Create extended label and icon files",IDC_SET_ICON, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,198,216,10 - GROUPBOX "Advanced Options",IDS_ADVANCED_OPTIONS_GRP,7,210,227,54 - CONTROL "List USB Hard Drives",IDC_ENABLE_FIXED_DISKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,222,216,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,221,216,10 + GROUPBOX "Advanced Options",IDS_ADVANCED_OPTIONS_GRP,7,234,227,55 + CONTROL "List USB Hard Drives",IDC_ENABLE_FIXED_DISKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,247,216,10 CONTROL "Add fixes for old BIOSes (extra partition, align, etc.)",IDC_EXTRA_PARTITION, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,235,216,10 - CONTROL "Use Rufus MBR with BIOS ID",IDC_RUFUS_MBR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,248,112,10 - COMBOBOX IDC_DISK_ID,128,246,100,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_PROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,8,273,225,9 - EDITTEXT IDC_INFO,8,291,225,11,ES_CENTER | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - PUSHBUTTON "About...",IDC_ABOUT,8,314,50,14 - PUSHBUTTON "Log",IDC_LOG,63,314,21,14 - PUSHBUTTON "T",IDC_TEST,90,314,12,14,NOT WS_VISIBLE - PUSHBUTTON "Close",IDCANCEL,183,314,50,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,259,216,10 + CONTROL "Use Rufus MBR with BIOS ID",IDC_RUFUS_MBR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,272,112,10 + COMBOBOX IDC_DISK_ID,128,270,100,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_PROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,8,298,225,9 + EDITTEXT IDC_INFO,8,316,225,12,ES_CENTER | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE + PUSHBUTTON "About...",IDC_ABOUT,8,339,50,14 + PUSHBUTTON "Log",IDC_LOG,63,339,21,14 + PUSHBUTTON "T",IDC_TEST,90,339,12,14,NOT WS_VISIBLE + PUSHBUTTON "Close",IDCANCEL,183,339,50,14 END IDD_ABOUTBOX_RTL DIALOGEX 0, 0, 319, 237 @@ -342,16 +348,16 @@ BEGIN EDITTEXT IDC_LICENSE_TEXT,7,7,321,176,ES_RIGHT | ES_MULTILINE | ES_READONLY | WS_VSCROLL,WS_EX_RIGHT | WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR END -IDD_LOG_RTL DIALOGEX 0, 0, 366, 354 +IDD_LOG_RTL DIALOGEX 0, 0, 366, 376 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION EXSTYLE WS_EX_APPWINDOW | WS_EX_LAYOUTRTL CAPTION "Log" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN - EDITTEXT IDC_LOG_EDIT,0,0,366,324,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL,WS_EX_STATICEDGE - PUSHBUTTON "Clear Log",IDC_LOG_CLEAR,198,331,50,14 - PUSHBUTTON "Save Log",IDC_LOG_SAVE,253,331,50,14 - DEFPUSHBUTTON "Close Log",IDCANCEL,308,331,50,14 + EDITTEXT IDC_LOG_EDIT,0,0,366,346,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL,WS_EX_STATICEDGE + PUSHBUTTON "Clear Log",IDC_LOG_CLEAR,198,354,50,14 + PUSHBUTTON "Save Log",IDC_LOG_SAVE,253,354,50,14 + DEFPUSHBUTTON "Close Log",IDCANCEL,308,354,50,14 END IDD_NOTIFICATION_RTL DIALOGEX 0, 0, 263, 63 @@ -406,13 +412,13 @@ BEGIN EDITTEXT IDC_DOWNLOAD_URL,15,191,351,13,ES_AUTOHSCROLL | ES_READONLY END -IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 242, 354 +IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 2.0.0.569" +CAPTION "Rufus 2.0.0.570" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Start",IDC_START,127,314,50,14 + DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 PUSHBUTTON "...",IDC_SELECT_ISO,207,182,21,14,BS_ICON LTEXT "Device",IDS_DEVICE_TXT,9,6,208,8 PUSHBUTTON "",IDC_LANG,217,2,17,13,BS_TOP | BS_FLAT @@ -425,27 +431,29 @@ BEGIN COMBOBOX IDC_CLUSTERSIZE,8,104,226,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "New volume label",IDS_LABEL_TXT,9,121,222,10 EDITTEXT IDC_LABEL,8,131,226,13,ES_AUTOHSCROLL - GROUPBOX "Format Options",IDS_FORMAT_OPTIONS_GRP,7,149,227,65 + GROUPBOX "Format Options",IDS_FORMAT_OPTIONS_GRP,7,149,227,89 PUSHBUTTON "",IDC_ADVANCED,15,148,14,10,BS_TOP | BS_FLAT CONTROL "Check device for bad blocks",IDC_BADBLOCKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,161,112,10 COMBOBOX IDC_NBPASSES,128,159,100,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Quick format",IDC_QUICKFORMAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,173,121,10 CONTROL "Create a bootable disk using",IDC_BOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,185,112,10 COMBOBOX IDC_BOOTTYPE,128,183,75,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Standard Windows installation",IDC_WINDOWS_INSTALL,"Button",BS_AUTORADIOBUTTON | WS_GROUP,23,198,205,8 + CONTROL "Windows To Go",IDC_WINDOWS_TO_GO,"Button",BS_AUTORADIOBUTTON,23,210,205,8 CONTROL "Create extended label and icon files",IDC_SET_ICON, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,198,216,10 - GROUPBOX "Advanced Options",IDS_ADVANCED_OPTIONS_GRP,7,210,227,54 - CONTROL "List USB Hard Drives",IDC_ENABLE_FIXED_DISKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,222,216,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,221,216,10 + GROUPBOX "Advanced Options",IDS_ADVANCED_OPTIONS_GRP,7,234,227,55 + CONTROL "List USB Hard Drives",IDC_ENABLE_FIXED_DISKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,247,216,10 CONTROL "Add fixes for old BIOSes (extra partition, align, etc.)",IDC_EXTRA_PARTITION, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,235,216,10 - CONTROL "Use Rufus MBR with BIOS ID",IDC_RUFUS_MBR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,248,112,10 - COMBOBOX IDC_DISK_ID,128,246,100,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_PROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,8,273,225,9 - EDITTEXT IDC_INFO,8,291,225,11,ES_CENTER | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - PUSHBUTTON "About...",IDC_ABOUT,8,314,50,14 - PUSHBUTTON "Log",IDC_LOG,63,314,21,14 - PUSHBUTTON "T",IDC_TEST,90,314,12,14,NOT WS_VISIBLE - PUSHBUTTON "Close",IDCANCEL,183,314,50,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,259,216,10 + CONTROL "Use Rufus MBR with BIOS ID",IDC_RUFUS_MBR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,272,112,10 + COMBOBOX IDC_DISK_ID,128,270,100,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_PROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,8,298,225,9 + EDITTEXT IDC_INFO,8,316,225,12,ES_CENTER | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE + PUSHBUTTON "About...",IDC_ABOUT,8,339,50,14 + PUSHBUTTON "Log",IDC_LOG,63,339,21,14 + PUSHBUTTON "T",IDC_TEST,90,339,12,14,NOT WS_VISIBLE + PUSHBUTTON "Close",IDCANCEL,183,339,50,14 END IDD_ABOUTBOX_RTL_XP DIALOGEX 0, 0, 319, 237 @@ -472,16 +480,16 @@ BEGIN EDITTEXT IDC_LICENSE_TEXT,7,7,321,176,ES_RIGHT | ES_MULTILINE | ES_READONLY | WS_VSCROLL,WS_EX_RIGHT | WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR END -IDD_LOG_RTL_XP DIALOGEX 0, 0, 366, 354 +IDD_LOG_RTL_XP DIALOGEX 0, 0, 366, 376 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION EXSTYLE WS_EX_APPWINDOW | WS_EX_LAYOUTRTL CAPTION "Log" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - EDITTEXT IDC_LOG_EDIT,0,0,366,324,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL,WS_EX_STATICEDGE - PUSHBUTTON "Clear Log",IDC_LOG_CLEAR,198,331,50,14 - PUSHBUTTON "Save Log",IDC_LOG_SAVE,253,331,50,14 - DEFPUSHBUTTON "Close Log",IDCANCEL,308,331,50,14 + EDITTEXT IDC_LOG_EDIT,0,0,366,346,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL,WS_EX_STATICEDGE + PUSHBUTTON "Clear Log",IDC_LOG_CLEAR,198,354,50,14 + PUSHBUTTON "Save Log",IDC_LOG_SAVE,253,354,50,14 + DEFPUSHBUTTON "Close Log",IDCANCEL,308,354,50,14 END IDD_NOTIFICATION_RTL_XP DIALOGEX 0, 0, 263, 63 @@ -661,8 +669,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,0,569 - PRODUCTVERSION 2,0,0,569 + FILEVERSION 2,0,0,570 + PRODUCTVERSION 2,0,0,570 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -679,13 +687,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "2.0.0.569" + VALUE "FileVersion", "2.0.0.570" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", " 2011-2015 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "2.0.0.569" + VALUE "ProductVersion", "2.0.0.570" END END BLOCK "VarFileInfo"