From 2be12ff3b628a966605d09fe447da85c4593605d Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Wed, 12 Nov 2014 02:38:13 +0000 Subject: [PATCH] [ui] use "Segoe UI" as default font on Vista and later * Greatly improves the display of non western character sets, such as CJK. * Note: Since I'm no longer willing to go the extra mile for XP, the way we handle the non availability of the Segoe font there is by doing the lazy thing and duplicating all our UI resources, in a similar way as what we do for RTL, and setting them with the old "MS Shell Dlg". * Also update some Syslinux V5 refs to Syslinux V6. * Closes #308 --- src/format.c | 4 +- src/resource.h | 32 +++- src/rufus.c | 17 +- src/rufus.h | 4 +- src/rufus.rc | 469 ++++++++++++++++++++++++++++++++++++++----------- src/stdlg.c | 10 +- src/syslinux.c | 4 +- 7 files changed, 415 insertions(+), 125 deletions(-) diff --git a/src/format.c b/src/format.c index 93675540..968148bd 100644 --- a/src/format.c +++ b/src/format.c @@ -911,7 +911,7 @@ static BOOL WriteMBR(HANDLE hPhysicalDrive) } else if ( (dt == DT_ISO) && (iso_report.has_kolibrios) && (fs == FS_FAT32)) { uprintf(using_msg, "KolibriOS"); r = write_kolibri_mbr(&fake_fd); - } else if ( (dt == DT_SYSLINUX_V4) || (dt == DT_SYSLINUX_V5) || ((dt == DT_ISO) && ((fs == FS_FAT16) || (fs == FS_FAT32))) ) { + } else if ( (dt == DT_SYSLINUX_V4) || (dt == DT_SYSLINUX_V6) || ((dt == DT_ISO) && ((fs == FS_FAT16) || (fs == FS_FAT32))) ) { uprintf(using_msg, "Syslinux"); r = write_syslinux_mbr(&fake_fd); } else if (dt == DT_REACTOS) { @@ -1553,7 +1553,7 @@ DWORD WINAPI FormatThread(void* param) } // We must close and unlock the volume to write files to it safe_unlockclose(hLogicalVolume); - } else if ( (dt == DT_SYSLINUX_V4) || (dt == DT_SYSLINUX_V5) || ((dt == DT_ISO) && ((fs == FS_FAT16) || (fs == FS_FAT32))) ) { + } else if ( (dt == DT_SYSLINUX_V4) || (dt == DT_SYSLINUX_V6) || ((dt == DT_ISO) && ((fs == FS_FAT16) || (fs == FS_FAT32))) ) { if (!InstallSyslinux(DriveIndex, drive_name[0], fs)) { FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|ERROR_INSTALL_FAILURE; } diff --git a/src/resource.h b/src/resource.h index f6a03494..a18a81ae 100644 --- a/src/resource.h +++ b/src/resource.h @@ -13,14 +13,30 @@ #define IDI_ICON 110 #define IDI_UP 111 #define IDI_DOWN 112 -#define RTL_IDD_DIALOG 201 -#define RTL_IDD_ABOUTBOX 202 -#define RTL_IDD_NOTIFICATION 203 -#define RTL_IDD_LICENSE 204 -#define RTL_IDD_ISO_EXTRACT 205 -#define RTL_IDD_LOG 206 -#define RTL_IDD_UPDATE_POLICY 207 -#define RTL_IDD_NEW_VERSION 208 +#define IDD_DIALOG_XP 151 +#define IDD_ABOUTBOX_XP 152 +#define IDD_NOTIFICATION_XP 153 +#define IDD_LICENSE_XP 154 +#define IDD_ISO_EXTRACT_XP 155 +#define IDD_LOG_XP 156 +#define IDD_UPDATE_POLICY_XP 157 +#define IDD_NEW_VERSION_XP 158 +#define IDD_DIALOG_RTL 201 +#define IDD_ABOUTBOX_RTL 202 +#define IDD_NOTIFICATION_RTL 203 +#define IDD_LICENSE_RTL 204 +#define IDD_ISO_EXTRACT_RTL 205 +#define IDD_LOG_RTL 206 +#define IDD_UPDATE_POLICY_RTL 207 +#define IDD_NEW_VERSION_RTL 208 +#define IDD_DIALOG_RTL_XP 251 +#define IDD_ABOUTBOX_RTL_XP 252 +#define IDD_NOTIFICATION_RTL_XP 253 +#define IDD_LICENSE_RTL_XP 254 +#define IDD_ISO_EXTRACT_RTL_XP 255 +#define IDD_LOG_RTL_XP 256 +#define IDD_UPDATE_POLICY_RTL_XP 257 +#define IDD_NEW_VERSION_RTL_XP 258 #define IDR_FD_COMMAND_COM 300 #define IDR_FD_KERNEL_SYS 301 #define IDR_FD_DISPLAY_EXE 302 diff --git a/src/rufus.c b/src/rufus.c index 278d9063..7fbccd54 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -1244,7 +1244,7 @@ static BOOL BootCheck(void) } } } - } else if (dt == DT_SYSLINUX_V5) { + } else if (dt == DT_SYSLINUX_V6) { IGNORE_RETVAL(_chdirU(app_dir)); IGNORE_RETVAL(_mkdir(FILES_DIR)); IGNORE_RETVAL(_chdir(FILES_DIR)); @@ -1497,6 +1497,7 @@ void ShowLanguageMenu(HWND hDlg) void SetBoot(int fs, int bt) { int i; + char tmp[32]; IGNORE_RETVAL(ComboBox_ResetContent(hBootType)); if ((bt == BT_BIOS) && ((fs == FS_FAT16) || (fs == FS_FAT32))) { @@ -1507,8 +1508,10 @@ void SetBoot(int fs, int bt) IGNORE_RETVAL(ComboBox_SetItemData(hBootType, ComboBox_AddStringU(hBootType, lmprintf(MSG_095)), DT_IMG)); // If needed (advanced mode) also append a Syslinux option if ( (bt == BT_BIOS) && (((fs == FS_FAT16) || (fs == FS_FAT32) || (fs == FS_NTFS)) && (advanced_mode)) ) { - IGNORE_RETVAL(ComboBox_SetItemData(hBootType, ComboBox_AddStringU(hBootType, "Syslinux 4"), DT_SYSLINUX_V4)); - IGNORE_RETVAL(ComboBox_SetItemData(hBootType, ComboBox_AddStringU(hBootType, "Syslinux 6"), DT_SYSLINUX_V5)); + static_sprintf(tmp, "Syslinux %s", embedded_sl_version_str[0]); + IGNORE_RETVAL(ComboBox_SetItemData(hBootType, ComboBox_AddStringU(hBootType, tmp), DT_SYSLINUX_V4)); + static_sprintf(tmp, "Syslinux %s", embedded_sl_version_str[1]); + IGNORE_RETVAL(ComboBox_SetItemData(hBootType, ComboBox_AddStringU(hBootType, tmp), DT_SYSLINUX_V6)); IGNORE_RETVAL(ComboBox_SetItemData(hBootType, ComboBox_AddStringU(hBootType, "ReactOS"), DT_REACTOS)); } if ((!advanced_mode) && (selection_default >= DT_SYSLINUX_V4)) { @@ -1599,7 +1602,7 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA // Create the log window (hidden) first_log_display = TRUE; log_displayed = FALSE; - hLogDlg = CreateDialogW(hMainInstance, MAKEINTRESOURCEW(IDD_LOG + IDD_IS_RTL), hDlg, (DLGPROC)LogProc); + hLogDlg = CreateDialogW(hMainInstance, MAKEINTRESOURCEW(IDD_LOG + IDD_OFFSET), hDlg, (DLGPROC)LogProc); InitDialog(hDlg); GetUSBDevices(0); CheckForUpdates(FALSE); @@ -2017,7 +2020,7 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA // You'd think that Windows would let you instantiate a modeless dialog wherever // but you'd be wrong. It must be done in the main callback, hence the custom message. if (!IsWindow(hISOProgressDlg)) { - hISOProgressDlg = CreateDialogW(hMainInstance, MAKEINTRESOURCEW(IDD_ISO_EXTRACT + IDD_IS_RTL), + hISOProgressDlg = CreateDialogW(hMainInstance, MAKEINTRESOURCEW(IDD_ISO_EXTRACT + IDD_OFFSET), hDlg, (DLGPROC)ISOProc); // The window is not visible by default but takes focus => restore it @@ -2316,11 +2319,11 @@ relaunch: * WS_EX_RTLREADING, WS_EX_RIGHT, WS_EX_LAYOUTRTL, WS_EX_LEFTSCROLLBAR and ES_RIGHT will * work... and there's no way to toggle ES_RIGHT at runtime anyway. * So, just like Microsoft advocates, we go through a massive duplication of all our RC - * dialogs (our RTL dialogs having their IDD's offset by +100 - see IDD_IS_RTL), just to + * dialogs (our RTL dialogs having their IDD's offset by +100 - see IDD_OFFSET), just to * add a handful of stupid flags. And of course, we also have to go through a whole other * exercise just so that our RTL and non RTL duplicated dialogs are kept in sync... */ - hDlg = CreateDialogW(hInstance, MAKEINTRESOURCEW(IDD_DIALOG + IDD_IS_RTL), NULL, MainCallback); + hDlg = CreateDialogW(hInstance, MAKEINTRESOURCEW(IDD_DIALOG + IDD_OFFSET), NULL, MainCallback); if (hDlg == NULL) { MessageBoxU(NULL, "Could not create Window", "DialogBox failure", MB_ICONSTOP|MB_IS_RTL|MB_SYSTEMMODAL); goto out; diff --git a/src/rufus.h b/src/rufus.h index 53e49a9c..76685deb 100644 --- a/src/rufus.h +++ b/src/rufus.h @@ -74,7 +74,7 @@ #endif #define IsChecked(CheckBox_ID) (IsDlgButtonChecked(hMainDialog, CheckBox_ID) == BST_CHECKED) #define MB_IS_RTL (right_to_left_mode?MB_RTLREADING:0) -#define IDD_IS_RTL (right_to_left_mode?100:0) +#define IDD_OFFSET ((right_to_left_mode?100:0) + ((nWindowsVersion <= WINDOWS_XP)?50:0)) #define safe_free(p) do {free((void*)p); p = NULL;} while(0) #define safe_min(a, b) min((size_t)(a), (size_t)(b)) @@ -184,7 +184,7 @@ enum dos_type { DT_ISO, DT_IMG, DT_SYSLINUX_V4, // Start of indexes that only display in advanced mode - DT_SYSLINUX_V5, + DT_SYSLINUX_V6, DT_REACTOS, DT_MAX }; diff --git a/src/rufus.rc b/src/rufus.rc index 20163aac..8a01568f 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -30,63 +30,63 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // Dialog // -IDD_DIALOG DIALOGEX 12, 12, 206, 329 +IDD_DIALOG DIALOGEX 12, 12, 227, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus 1.5.0.538" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 +CAPTION "Rufus 1.5.0.539" +FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Start",IDC_START,94,291,50,14 - PUSHBUTTON "Close",IDCANCEL,148,291,50,14 + DEFPUSHBUTTON "Start",IDC_START,113,291,50,14 + LTEXT "Device",IDS_DEVICE_TXT,9,6,193,8 + PUSHBUTTON "",IDC_LANG,204,2,16,13,BS_TOP | BS_FLAT + COMBOBOX IDC_DEVICE,8,17,211,33,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Partition scheme and target system type",IDS_PARTITION_TYPE_TXT,9,35,207,8 + COMBOBOX IDC_PARTITION_TYPE,8,46,211,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "File system",IDS_FILESYSTEM_TXT,9,64,207,10 + COMBOBOX IDC_FILESYSTEM,8,75,211,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Cluster size",IDS_CLUSTERSIZE_TXT,9,93,207,10 + COMBOBOX IDC_CLUSTERSIZE,8,104,211,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "New volume label",IDS_LABEL_TXT,9,121,207,10 + EDITTEXT IDC_LABEL,8,131,211,13,ES_AUTOHSCROLL + GROUPBOX "Format Options ",IDS_FORMAT_OPTIONS_GRP,7,149,212,65 + PUSHBUTTON "",IDC_ADVANCED,68,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,60,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,60,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "...",IDC_SELECT_ISO,192,182,22,14,BS_ICON + CONTROL "Create extended label and icon files",IDC_SET_ICON,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,198,201,10 + GROUPBOX "Advanced Options",IDS_ADVANCED_OPTIONS_GRP,7,210,212,54 + CONTROL "List USB Hard Drives",IDC_ENABLE_FIXED_DISKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,222,201,10 + CONTROL "Add fixes for old BIOSes (extra partition, align, etc.)",IDC_EXTRA_PARTITION,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,235,201,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,85,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_PROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,8,272,210,9 PUSHBUTTON "About...",IDC_ABOUT,8,291,50,14 - PUSHBUTTON "Log",IDC_LOG,62,291,18,14 - PUSHBUTTON "T",IDC_TEST,80,291,12,14,NOT WS_VISIBLE - COMBOBOX IDC_DEVICE,8,17,190,33,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Device",IDS_DEVICE_TXT,9,6,171,8 - COMBOBOX IDC_FILESYSTEM,8,75,190,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "File system",IDS_FILESYSTEM_TXT,9,64,186,10 - COMBOBOX IDC_PARTITION_TYPE,8,46,190,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Partition scheme and target system type",IDS_PARTITION_TYPE_TXT,9,35,186,8 - COMBOBOX IDC_CLUSTERSIZE,8,104,190,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Cluster size",IDS_CLUSTERSIZE_TXT,9,93,186,10 - GROUPBOX "Format Options ",IDS_FORMAT_OPTIONS_GRP,7,149,191,66 - LTEXT "New volume label",IDS_LABEL_TXT,9,121,186,10 - EDITTEXT IDC_LABEL,8,131,190,13,ES_AUTOHSCROLL - CONTROL "Check device for bad blocks",IDC_BADBLOCKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,161,101,10 - CONTROL "Quick format",IDC_QUICKFORMAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,173,106,10 - CONTROL "Create a bootable disk using",IDC_BOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,185,104,10 - CONTROL "Create extended label and icon files",IDC_SET_ICON, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,198,181,10 - CONTROL "",IDC_PROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,8,272,189,9 - COMBOBOX IDC_NBPASSES,119,159,49,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_BOOTTYPE,119,183,49,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "...",IDC_SELECT_ISO,171,182,22,14,BS_ICON - CONTROL "Use Rufus MBR with BIOS ID",IDC_RUFUS_MBR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,248,106,10 - PUSHBUTTON "",IDC_ADVANCED,63,148,14,10,BS_TOP | BS_FLAT - GROUPBOX "Advanced Options",IDS_ADVANCED_OPTIONS_GRP,7,210,191,54 - COMBOBOX IDC_DISK_ID,119,246,73,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Add fixes for old BIOSes (extra partition, align, etc.)",IDC_EXTRA_PARTITION, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,235,181,10 - CONTROL "List USB Hard Drives",IDC_ENABLE_FIXED_DISKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,222,181,10 - PUSHBUTTON "",IDC_LANG,183,2,15,13,BS_TOP | BS_FLAT + PUSHBUTTON "Log",IDC_LOG,63,291,21,14 + PUSHBUTTON "T",IDC_TEST,90,291,12,14,NOT WS_VISIBLE + PUSHBUTTON "Close",IDCANCEL,168,291,50,14 END -IDD_ABOUTBOX DIALOGEX 0, 0, 319, 229 +IDD_ABOUTBOX DIALOGEX 0, 0, 319, 237 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "About Rufus" -FONT 8, "MS Shell Dlg", 400, 0, 0x0 +FONT 8, "Segoe UI", 400, 0, 0x0 BEGIN ICON IDI_ICON,IDC_ABOUT_ICON,11,8,20,20 - DEFPUSHBUTTON "OK",IDOK,251,207,50,14,WS_GROUP - PUSHBUTTON "License",IDC_ABOUT_LICENSE,46,207,50,14,WS_GROUP - CONTROL "",IDC_ABOUT_COPYRIGHTS,"RichEdit20W",ES_MULTILINE | ES_READONLY | WS_VSCROLL,46,107,267,90,WS_EX_STATICEDGE - CONTROL "",IDC_ABOUT_BLURB,"RichEdit20W",ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_TABSTOP,45,7,268,99 - PUSHBUTTON "Updates",IDC_ABOUT_UPDATES,100,207,50,14,NOT WS_VISIBLE | WS_GROUP + DEFPUSHBUTTON "OK",IDOK,251,215,50,14,WS_GROUP + PUSHBUTTON "License",IDC_ABOUT_LICENSE,46,215,50,14,WS_GROUP + PUSHBUTTON "Updates",IDC_ABOUT_UPDATES,100,215,50,14,NOT WS_VISIBLE | WS_GROUP + CONTROL "",IDC_ABOUT_BLURB,"RichEdit20W",ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_TABSTOP,45,7,268,107 + CONTROL "",IDC_ABOUT_COPYRIGHTS,"RichEdit20W",ES_MULTILINE | ES_READONLY | WS_VSCROLL,46,115,267,91,WS_EX_STATICEDGE END IDD_ISO_EXTRACT DIALOGEX 0, 0, 262, 66 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Copying ISO files..." -FONT 8, "MS Shell Dlg", 400, 0, 0x1 +FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN LTEXT "Opening ISO image - please wait...",IDC_ISO_FILENAME,8,10,246,13,SS_PATHELLIPSIS CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,7,26,247,8 @@ -96,7 +96,7 @@ END IDD_LICENSE DIALOGEX 0, 0, 335, 205 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Rufus License" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 +FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Close",IDCANCEL,278,187,50,14 EDITTEXT IDC_LICENSE_TEXT,7,7,321,176,ES_MULTILINE | ES_READONLY | WS_VSCROLL @@ -105,7 +105,7 @@ END IDD_LOG DIALOGEX 0, 0, 366, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Log" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 +FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN EDITTEXT IDC_LOG_EDIT,0,0,366,301,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL,WS_EX_STATICEDGE PUSHBUTTON "Clear Log",IDC_LOG_CLEAR,198,308,50,14 @@ -116,7 +116,7 @@ END IDD_NOTIFICATION DIALOGEX 0, 0, 263, 63 STYLE DS_SETFONT | DS_FIXEDSYS | DS_NOFAILCREATE | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME CAPTION "Rufus" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 +FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN LTEXT "",IDC_NOTIFICATION_LINE,0,0,263,39 CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,0,0,263,38 @@ -130,7 +130,7 @@ END IDD_UPDATE_POLICY DIALOGEX 0, 0, 287, 198 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Update policy and settings" -FONT 8, "MS Shell Dlg", 400, 0, 0x0 +FONT 8, "Segoe UI", 400, 0, 0x0 BEGIN ICON IDI_ICON,IDC_ABOUT_ICON,11,8,20,20 DEFPUSHBUTTON "Close",IDCANCEL,221,172,50,14,WS_GROUP @@ -147,6 +147,138 @@ END IDD_NEW_VERSION DIALOGEX 0, 0, 384, 268 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Check For Updates - Rufus" +FONT 8, "Segoe UI", 400, 0, 0x0 +BEGIN + PUSHBUTTON "Close",IDCANCEL,167,244,50,14,WS_GROUP + CONTROL "",IDC_RELEASE_NOTES,"RichEdit20W",ES_MULTILINE | ES_READONLY | WS_VSCROLL,15,77,352,88,WS_EX_STATICEDGE + DEFPUSHBUTTON "Download",IDC_DOWNLOAD,293,211,74,14,WS_GROUP + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,15,212,270,11 + GROUPBOX "Release Notes",IDS_NEW_VERSION_NOTES_GRP,8,63,367,111 + LTEXT "A newer version is available. Please download the latest version!",IDS_NEW_VERSION_AVAIL_TXT,10,32,366,8 + LTEXT "[...]",IDC_YOUR_VERSION,10,8,366,8 + LTEXT "[...]",IDC_LATEST_VERSION,10,19,366,8 + CTEXT "Click here to go to the website",IDC_WEBSITE,10,49,366,9,SS_NOTIFY + GROUPBOX "Download",IDS_NEW_VERSION_DOWNLOAD_GRP,8,177,367,58 + EDITTEXT IDC_DOWNLOAD_URL,15,191,351,13,ES_AUTOHSCROLL | ES_READONLY +END + +IDD_DIALOG_XP DIALOGEX 12, 12, 227, 329 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Rufus 1.5.0.539" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Start",IDC_START,113,291,50,14 + LTEXT "Device",IDS_DEVICE_TXT,9,6,193,8 + PUSHBUTTON "",IDC_LANG,204,2,16,13,BS_TOP | BS_FLAT + COMBOBOX IDC_DEVICE,8,17,211,33,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Partition scheme and target system type",IDS_PARTITION_TYPE_TXT,9,35,207,8 + COMBOBOX IDC_PARTITION_TYPE,8,46,211,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "File system",IDS_FILESYSTEM_TXT,9,64,207,10 + COMBOBOX IDC_FILESYSTEM,8,75,211,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Cluster size",IDS_CLUSTERSIZE_TXT,9,93,207,10 + COMBOBOX IDC_CLUSTERSIZE,8,104,211,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "New volume label",IDS_LABEL_TXT,9,121,207,10 + EDITTEXT IDC_LABEL,8,131,211,13,ES_AUTOHSCROLL + GROUPBOX "Format Options ",IDS_FORMAT_OPTIONS_GRP,7,149,212,65 + PUSHBUTTON "",IDC_ADVANCED,68,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,60,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,60,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "...",IDC_SELECT_ISO,192,182,22,14,BS_ICON + CONTROL "Create extended label and icon files",IDC_SET_ICON,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,198,201,10 + GROUPBOX "Advanced Options",IDS_ADVANCED_OPTIONS_GRP,7,210,212,54 + CONTROL "List USB Hard Drives",IDC_ENABLE_FIXED_DISKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,222,201,10 + CONTROL "Add fixes for old BIOSes (extra partition, align, etc.)",IDC_EXTRA_PARTITION,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,235,201,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,85,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_PROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,8,272,210,9 + PUSHBUTTON "About...",IDC_ABOUT,8,291,50,14 + PUSHBUTTON "Log",IDC_LOG,63,291,21,14 + PUSHBUTTON "T",IDC_TEST,90,291,12,14,NOT WS_VISIBLE + PUSHBUTTON "Close",IDCANCEL,168,291,50,14 +END + +IDD_ABOUTBOX_XP DIALOGEX 0, 0, 319, 237 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About Rufus" +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + ICON IDI_ICON,IDC_ABOUT_ICON,11,8,20,20 + DEFPUSHBUTTON "OK",IDOK,251,215,50,14,WS_GROUP + PUSHBUTTON "License",IDC_ABOUT_LICENSE,46,215,50,14,WS_GROUP + PUSHBUTTON "Updates",IDC_ABOUT_UPDATES,100,215,50,14,NOT WS_VISIBLE | WS_GROUP + CONTROL "",IDC_ABOUT_BLURB,"RichEdit20W",ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_TABSTOP,45,7,268,107 + CONTROL "",IDC_ABOUT_COPYRIGHTS,"RichEdit20W",ES_MULTILINE | ES_READONLY | WS_VSCROLL,46,115,267,91,WS_EX_STATICEDGE +END + +IDD_ISO_EXTRACT_XP DIALOGEX 0, 0, 262, 66 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "Copying ISO files..." +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "Opening ISO image - please wait...",IDC_ISO_FILENAME,8,10,246,13,SS_PATHELLIPSIS + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,7,26,247,8 + PUSHBUTTON "Cancel",IDC_ISO_ABORT,111,43,50,14 +END + +IDD_LICENSE_XP DIALOGEX 0, 0, 335, 205 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Rufus License" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Close",IDCANCEL,278,187,50,14 + EDITTEXT IDC_LICENSE_TEXT,7,7,321,176,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + +IDD_LOG_XP DIALOGEX 0, 0, 366, 329 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "Log" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + EDITTEXT IDC_LOG_EDIT,0,0,366,301,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL,WS_EX_STATICEDGE + PUSHBUTTON "Clear Log",IDC_LOG_CLEAR,198,308,50,14 + PUSHBUTTON "Save Log",IDC_LOG_SAVE,253,308,50,14 + DEFPUSHBUTTON "Close Log",IDCANCEL,308,308,50,14 +END + +IDD_NOTIFICATION_XP DIALOGEX 0, 0, 263, 63 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_NOFAILCREATE | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME +CAPTION "Rufus" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_NOTIFICATION_LINE,0,0,263,39 + CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,0,0,263,38 + ICON 32516,IDC_NOTIFICATION_ICON,6,6,20,20 + LTEXT "",IDC_NOTIFICATION_TEXT,35,10,219,20 + DEFPUSHBUTTON "No",IDNO,206,44,50,14 + PUSHBUTTON "More information",IDC_MORE_INFO,8,44,76,14,NOT WS_VISIBLE + PUSHBUTTON "Yes",IDYES,154,44,50,14,NOT WS_VISIBLE +END + +IDD_UPDATE_POLICY_XP DIALOGEX 0, 0, 287, 198 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Update policy and settings" +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + ICON IDI_ICON,IDC_ABOUT_ICON,11,8,20,20 + DEFPUSHBUTTON "Close",IDCANCEL,221,172,50,14,WS_GROUP + CONTROL "",IDC_POLICY,"RichEdit20W",WS_VSCROLL | 0x804,46,8,235,130,WS_EX_STATICEDGE + COMBOBOX IDC_UPDATE_FREQUENCY,133,155,66,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Check for updates:",IDS_UPDATE_FREQUENCY_TXT,52,157,80,11 + LTEXT "Include beta versions:",IDS_INCLUDE_BETAS_TXT,52,173,80,11 + COMBOBOX IDC_INCLUDE_BETAS,133,171,36,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Settings",IDS_UPDATE_SETTINGS_GRP,45,145,161,46 + PUSHBUTTON "Check Now",IDC_CHECK_NOW,221,154,50,14 + GROUPBOX "",IDS_CHECK_NOW_GRP,210,145,71,46 +END + +IDD_NEW_VERSION_XP DIALOGEX 0, 0, 384, 268 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Check For Updates - Rufus" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN PUSHBUTTON "Close",IDCANCEL,167,244,50,14,WS_GROUP @@ -162,62 +294,202 @@ BEGIN EDITTEXT IDC_DOWNLOAD_URL,15,191,351,13,ES_AUTOHSCROLL | ES_READONLY END -RTL_IDD_DIALOG DIALOGEX 12, 12, 206, 329 +IDD_DIALOG_RTL DIALOGEX 12, 12, 227, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 1.5.0.538" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 +CAPTION "Rufus 1.5.0.539" +FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Start",IDC_START,94,291,50,14 - PUSHBUTTON "Close",IDCANCEL,148,291,50,14 + DEFPUSHBUTTON "Start",IDC_START,113,291,50,14 + LTEXT "Device",IDS_DEVICE_TXT,9,6,193,8 + PUSHBUTTON "",IDC_LANG,204,2,16,13,BS_TOP | BS_FLAT + COMBOBOX IDC_DEVICE,8,17,211,33,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Partition scheme and target system type",IDS_PARTITION_TYPE_TXT,9,35,207,8 + COMBOBOX IDC_PARTITION_TYPE,8,46,211,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "File system",IDS_FILESYSTEM_TXT,9,64,207,10 + COMBOBOX IDC_FILESYSTEM,8,75,211,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Cluster size",IDS_CLUSTERSIZE_TXT,9,93,207,10 + COMBOBOX IDC_CLUSTERSIZE,8,104,211,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "New volume label",IDS_LABEL_TXT,9,121,207,10 + EDITTEXT IDC_LABEL,8,131,211,13,ES_AUTOHSCROLL + GROUPBOX "Format Options ",IDS_FORMAT_OPTIONS_GRP,7,149,212,65 + PUSHBUTTON "",IDC_ADVANCED,68,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,60,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,60,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "...",IDC_SELECT_ISO,192,182,22,14,BS_ICON + CONTROL "Create extended label and icon files",IDC_SET_ICON,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,198,201,10 + GROUPBOX "Advanced Options",IDS_ADVANCED_OPTIONS_GRP,7,210,212,54 + CONTROL "List USB Hard Drives",IDC_ENABLE_FIXED_DISKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,222,201,10 + CONTROL "Add fixes for old BIOSes (extra partition, align, etc.)",IDC_EXTRA_PARTITION,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,235,201,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,85,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_PROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,8,272,210,9 PUSHBUTTON "About...",IDC_ABOUT,8,291,50,14 - PUSHBUTTON "Log",IDC_LOG,62,291,18,14 - PUSHBUTTON "T",IDC_TEST,80,291,12,14,NOT WS_VISIBLE - COMBOBOX IDC_DEVICE,8,17,190,33,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Device",IDS_DEVICE_TXT,9,6,171,8 - COMBOBOX IDC_FILESYSTEM,8,75,190,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "File system",IDS_FILESYSTEM_TXT,9,64,186,10 - COMBOBOX IDC_PARTITION_TYPE,8,46,190,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Partition scheme and target system type",IDS_PARTITION_TYPE_TXT,9,35,186,8 - COMBOBOX IDC_CLUSTERSIZE,8,104,190,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Cluster size",IDS_CLUSTERSIZE_TXT,9,93,186,10 - GROUPBOX "Format Options ",IDS_FORMAT_OPTIONS_GRP,7,149,191,66 - LTEXT "New volume label",IDS_LABEL_TXT,9,121,186,10 - EDITTEXT IDC_LABEL,8,131,190,13,ES_AUTOHSCROLL - CONTROL "Check device for bad blocks",IDC_BADBLOCKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,161,101,10 - CONTROL "Quick format",IDC_QUICKFORMAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,173,106,10 - CONTROL "Create a bootable disk using",IDC_BOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,185,104,10 - CONTROL "Create extended label and icon files",IDC_SET_ICON, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,198,181,10 - CONTROL "",IDC_PROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,8,272,189,9 - COMBOBOX IDC_NBPASSES,119,159,49,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_BOOTTYPE,119,183,49,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "...",IDC_SELECT_ISO,171,182,22,14,BS_ICON - CONTROL "Use Rufus MBR with BIOS ID",IDC_RUFUS_MBR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,248,106,10 - PUSHBUTTON "",IDC_ADVANCED,63,148,14,10,BS_TOP | BS_FLAT - GROUPBOX "Advanced Options",IDS_ADVANCED_OPTIONS_GRP,7,210,191,54 - COMBOBOX IDC_DISK_ID,119,246,73,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Add fixes for old BIOSes (extra partition, align, etc.)",IDC_EXTRA_PARTITION, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,235,181,10 - CONTROL "List USB Hard Drives",IDC_ENABLE_FIXED_DISKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,222,181,10 - PUSHBUTTON "",IDC_LANG,183,2,15,13,BS_TOP | BS_FLAT + PUSHBUTTON "Log",IDC_LOG,63,291,21,14 + PUSHBUTTON "T",IDC_TEST,90,291,12,14,NOT WS_VISIBLE + PUSHBUTTON "Close",IDCANCEL,168,291,50,14 END -RTL_IDD_ABOUTBOX DIALOGEX 0, 0, 319, 229 +IDD_ABOUTBOX_RTL DIALOGEX 0, 0, 319, 237 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL +CAPTION "About Rufus" +FONT 8, "Segoe UI", 400, 0, 0x0 +BEGIN + ICON IDI_ICON,IDC_ABOUT_ICON,11,8,20,20 + DEFPUSHBUTTON "OK",IDOK,251,215,50,14,WS_GROUP + PUSHBUTTON "License",IDC_ABOUT_LICENSE,46,215,50,14,WS_GROUP + PUSHBUTTON "Updates",IDC_ABOUT_UPDATES,100,215,50,14,NOT WS_VISIBLE | WS_GROUP + CONTROL "",IDC_ABOUT_BLURB,"RichEdit20W",ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_TABSTOP,45,7,268,107 + CONTROL "",IDC_ABOUT_COPYRIGHTS,"RichEdit20W",ES_MULTILINE | ES_READONLY | WS_VSCROLL,46,115,267,91,WS_EX_STATICEDGE +END + +IDD_ISO_EXTRACT_RTL DIALOGEX 0, 0, 262, 66 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL +CAPTION "Copying ISO files..." +FONT 8, "Segoe UI", 400, 0, 0x1 +BEGIN + LTEXT "Opening ISO image - please wait...",IDC_ISO_FILENAME,8,10,246,13,SS_PATHELLIPSIS + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,7,26,247,8 + PUSHBUTTON "Cancel",IDC_ISO_ABORT,111,43,50,14 +END + +IDD_LICENSE_RTL DIALOGEX 0, 0, 335, 205 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL +CAPTION "Rufus License" +FONT 8, "Segoe UI", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Close",IDCANCEL,278,187,50,14 + 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, 329 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | 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,301,ES_RIGHT | ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL,WS_EX_RIGHT | WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR | WS_EX_STATICEDGE + PUSHBUTTON "Clear Log",IDC_LOG_CLEAR,198,308,50,14 + PUSHBUTTON "Save Log",IDC_LOG_SAVE,253,308,50,14 + DEFPUSHBUTTON "Close Log",IDCANCEL,308,308,50,14 +END + +IDD_NOTIFICATION_RTL DIALOGEX 0, 0, 263, 63 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_NOFAILCREATE | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME +EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL +CAPTION "Rufus" +FONT 8, "Segoe UI", 400, 0, 0x1 +BEGIN + LTEXT "",IDC_NOTIFICATION_LINE,0,0,263,39 + CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,0,0,263,38 + ICON 32516,IDC_NOTIFICATION_ICON,6,6,20,20 + LTEXT "",IDC_NOTIFICATION_TEXT,35,10,219,20 + DEFPUSHBUTTON "No",IDNO,206,44,50,14 + PUSHBUTTON "More information",IDC_MORE_INFO,8,44,76,14,NOT WS_VISIBLE + PUSHBUTTON "Yes",IDYES,154,44,50,14,NOT WS_VISIBLE +END + +IDD_UPDATE_POLICY_RTL DIALOGEX 0, 0, 287, 198 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL +CAPTION "Update policy and settings" +FONT 8, "Segoe UI", 400, 0, 0x0 +BEGIN + ICON IDI_ICON,IDC_ABOUT_ICON,11,8,20,20 + DEFPUSHBUTTON "Close",IDCANCEL,221,172,50,14,WS_GROUP + CONTROL "",IDC_POLICY,"RichEdit20W",WS_VSCROLL | 0x804,46,8,235,130,WS_EX_STATICEDGE + COMBOBOX IDC_UPDATE_FREQUENCY,133,155,66,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Check for updates:",IDS_UPDATE_FREQUENCY_TXT,52,157,80,11 + LTEXT "Include beta versions:",IDS_INCLUDE_BETAS_TXT,52,173,80,11 + COMBOBOX IDC_INCLUDE_BETAS,133,171,36,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Settings",IDS_UPDATE_SETTINGS_GRP,45,145,161,46 + PUSHBUTTON "Check Now",IDC_CHECK_NOW,221,154,50,14 + GROUPBOX "",IDS_CHECK_NOW_GRP,210,145,71,46 +END + +IDD_NEW_VERSION_RTL DIALOGEX 0, 0, 384, 268 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL +CAPTION "Check For Updates - Rufus" +FONT 8, "Segoe UI", 400, 0, 0x0 +BEGIN + PUSHBUTTON "Close",IDCANCEL,167,244,50,14,WS_GROUP + CONTROL "",IDC_RELEASE_NOTES,"RichEdit20W",ES_MULTILINE | ES_READONLY | WS_VSCROLL,15,77,352,88,WS_EX_STATICEDGE + DEFPUSHBUTTON "Download",IDC_DOWNLOAD,293,211,74,14,WS_GROUP + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,15,212,270,11 + GROUPBOX "Release Notes",IDS_NEW_VERSION_NOTES_GRP,8,63,367,111 + LTEXT "A newer version is available. Please download the latest version!",IDS_NEW_VERSION_AVAIL_TXT,10,32,366,8 + LTEXT "[...]",IDC_YOUR_VERSION,10,8,366,8 + LTEXT "[...]",IDC_LATEST_VERSION,10,19,366,8 + CTEXT "Click here to go to the website",IDC_WEBSITE,10,49,366,9,SS_NOTIFY + GROUPBOX "Download",IDS_NEW_VERSION_DOWNLOAD_GRP,8,177,367,58 + EDITTEXT IDC_DOWNLOAD_URL,15,191,351,13,ES_AUTOHSCROLL | ES_READONLY +END + +IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 227, 329 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL +CAPTION "Rufus 1.5.0.539" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Start",IDC_START,113,291,50,14 + LTEXT "Device",IDS_DEVICE_TXT,9,6,193,8 + PUSHBUTTON "",IDC_LANG,204,2,16,13,BS_TOP | BS_FLAT + COMBOBOX IDC_DEVICE,8,17,211,33,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Partition scheme and target system type",IDS_PARTITION_TYPE_TXT,9,35,207,8 + COMBOBOX IDC_PARTITION_TYPE,8,46,211,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "File system",IDS_FILESYSTEM_TXT,9,64,207,10 + COMBOBOX IDC_FILESYSTEM,8,75,211,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Cluster size",IDS_CLUSTERSIZE_TXT,9,93,207,10 + COMBOBOX IDC_CLUSTERSIZE,8,104,211,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "New volume label",IDS_LABEL_TXT,9,121,207,10 + EDITTEXT IDC_LABEL,8,131,211,13,ES_AUTOHSCROLL + GROUPBOX "Format Options ",IDS_FORMAT_OPTIONS_GRP,7,149,212,65 + PUSHBUTTON "",IDC_ADVANCED,68,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,60,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,60,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "...",IDC_SELECT_ISO,192,182,22,14,BS_ICON + CONTROL "Create extended label and icon files",IDC_SET_ICON,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,198,201,10 + GROUPBOX "Advanced Options",IDS_ADVANCED_OPTIONS_GRP,7,210,212,54 + CONTROL "List USB Hard Drives",IDC_ENABLE_FIXED_DISKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,222,201,10 + CONTROL "Add fixes for old BIOSes (extra partition, align, etc.)",IDC_EXTRA_PARTITION,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,235,201,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,85,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_PROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,8,272,210,9 + PUSHBUTTON "About...",IDC_ABOUT,8,291,50,14 + PUSHBUTTON "Log",IDC_LOG,63,291,21,14 + PUSHBUTTON "T",IDC_TEST,90,291,12,14,NOT WS_VISIBLE + PUSHBUTTON "Close",IDCANCEL,168,291,50,14 +END + +IDD_ABOUTBOX_RTL_XP DIALOGEX 0, 0, 319, 237 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL CAPTION "About Rufus" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN ICON IDI_ICON,IDC_ABOUT_ICON,11,8,20,20 - DEFPUSHBUTTON "OK",IDOK,251,207,50,14,WS_GROUP - PUSHBUTTON "License",IDC_ABOUT_LICENSE,46,207,50,14,WS_GROUP - CONTROL "",IDC_ABOUT_COPYRIGHTS,"RichEdit20W",ES_RIGHT | ES_MULTILINE | ES_READONLY | WS_VSCROLL,46,107,267,90,WS_EX_STATICEDGE | WS_EX_RTLREADING - CONTROL "",IDC_ABOUT_BLURB,"RichEdit20W",ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_TABSTOP,45,7,268,99 - PUSHBUTTON "Updates",IDC_ABOUT_UPDATES,100,207,50,14,NOT WS_VISIBLE | WS_GROUP + DEFPUSHBUTTON "OK",IDOK,251,215,50,14,WS_GROUP + PUSHBUTTON "License",IDC_ABOUT_LICENSE,46,215,50,14,WS_GROUP + PUSHBUTTON "Updates",IDC_ABOUT_UPDATES,100,215,50,14,NOT WS_VISIBLE | WS_GROUP + CONTROL "",IDC_ABOUT_BLURB,"RichEdit20W",ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_TABSTOP,45,7,268,107 + CONTROL "",IDC_ABOUT_COPYRIGHTS,"RichEdit20W",ES_MULTILINE | ES_READONLY | WS_VSCROLL,46,115,267,91,WS_EX_STATICEDGE END -RTL_IDD_ISO_EXTRACT DIALOGEX 0, 0, 262, 66 +IDD_ISO_EXTRACT_RTL_XP DIALOGEX 0, 0, 262, 66 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL CAPTION "Copying ISO files..." @@ -228,7 +500,7 @@ BEGIN PUSHBUTTON "Cancel",IDC_ISO_ABORT,111,43,50,14 END -RTL_IDD_LICENSE DIALOGEX 0, 0, 335, 205 +IDD_LICENSE_RTL_XP DIALOGEX 0, 0, 335, 205 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL CAPTION "Rufus License" @@ -238,7 +510,7 @@ 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 -RTL_IDD_LOG DIALOGEX 0, 0, 366, 329 +IDD_LOG_RTL_XP DIALOGEX 0, 0, 366, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION EXSTYLE WS_EX_APPWINDOW | WS_EX_LAYOUTRTL CAPTION "Log" @@ -250,7 +522,7 @@ BEGIN DEFPUSHBUTTON "Close Log",IDCANCEL,308,308,50,14 END -RTL_IDD_NOTIFICATION DIALOGEX 0, 0, 263, 63 +IDD_NOTIFICATION_RTL_XP DIALOGEX 0, 0, 263, 63 STYLE DS_SETFONT | DS_FIXEDSYS | DS_NOFAILCREATE | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL CAPTION "Rufus" @@ -265,7 +537,7 @@ BEGIN PUSHBUTTON "Yes",IDYES,154,44,50,14,NOT WS_VISIBLE END -RTL_IDD_UPDATE_POLICY DIALOGEX 0, 0, 287, 198 +IDD_UPDATE_POLICY_RTL_XP DIALOGEX 0, 0, 287, 198 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL CAPTION "Update policy and settings" @@ -283,7 +555,7 @@ BEGIN GROUPBOX "",IDS_CHECK_NOW_GRP,210,145,71,46 END -RTL_IDD_NEW_VERSION DIALOGEX 0, 0, 384, 268 +IDD_NEW_VERSION_RTL_XP DIALOGEX 0, 0, 384, 268 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL CAPTION "Check For Updates - Rufus" @@ -302,7 +574,6 @@ BEGIN EDITTEXT IDC_DOWNLOAD_URL,15,191,351,13,ES_AUTOHSCROLL | ES_READONLY END - #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // @@ -428,8 +699,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,5,0,538 - PRODUCTVERSION 1,5,0,538 + FILEVERSION 1,5,0,539 + PRODUCTVERSION 1,5,0,539 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -446,13 +717,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.5.0.538" + VALUE "FileVersion", "1.5.0.539" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2014 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.5.0.538" + VALUE "ProductVersion", "1.5.0.539" END END BLOCK "VarFileInfo" diff --git a/src/stdlg.c b/src/stdlg.c index cc469102..32b351a4 100644 --- a/src/stdlg.c +++ b/src/stdlg.c @@ -560,10 +560,10 @@ INT_PTR CALLBACK AboutCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lP EndDialog(hDlg, LOWORD(wParam)); return (INT_PTR)TRUE; case IDC_ABOUT_LICENSE: - DialogBoxW(hMainInstance, MAKEINTRESOURCEW(IDD_LICENSE + IDD_IS_RTL), hDlg, LicenseCallback); + DialogBoxW(hMainInstance, MAKEINTRESOURCEW(IDD_LICENSE + IDD_OFFSET), hDlg, LicenseCallback); break; case IDC_ABOUT_UPDATES: - DialogBoxW(hMainInstance, MAKEINTRESOURCEW(IDD_UPDATE_POLICY + IDD_IS_RTL), hDlg, UpdateCallback); + DialogBoxW(hMainInstance, MAKEINTRESOURCEW(IDD_UPDATE_POLICY + IDD_OFFSET), hDlg, UpdateCallback); break; } break; @@ -575,7 +575,7 @@ INT_PTR CreateAboutBox(void) { INT_PTR r; dialog_showing++; - r = DialogBoxW(hMainInstance, MAKEINTRESOURCEW(IDD_ABOUTBOX + IDD_IS_RTL), hMainDialog, AboutCallback); + r = DialogBoxW(hMainInstance, MAKEINTRESOURCEW(IDD_ABOUTBOX + IDD_OFFSET), hMainDialog, AboutCallback); dialog_showing--; return r; } @@ -714,7 +714,7 @@ BOOL Notification(int type, const notification_info* more_info, char* title, cha hMessageIcon = LoadIcon(NULL, IDI_INFORMATION); break; } - ret = (DialogBoxW(hMainInstance, MAKEINTRESOURCEW(IDD_NOTIFICATION + IDD_IS_RTL), hMainDialog, NotificationCallback) == IDYES); + ret = (DialogBoxW(hMainInstance, MAKEINTRESOURCEW(IDD_NOTIFICATION + IDD_OFFSET), hMainDialog, NotificationCallback) == IDYES); safe_free(szMessageText); dialog_showing--; return ret; @@ -1293,7 +1293,7 @@ INT_PTR CALLBACK NewVersionCallback(HWND hDlg, UINT message, WPARAM wParam, LPAR void DownloadNewVersion(void) { - DialogBoxW(hMainInstance, MAKEINTRESOURCEW(IDD_NEW_VERSION + IDD_IS_RTL), hMainDialog, NewVersionCallback); + DialogBoxW(hMainInstance, MAKEINTRESOURCEW(IDD_NEW_VERSION + IDD_OFFSET), hMainDialog, NewVersionCallback); } void SetTitleBarIcon(HWND hDlg) diff --git a/src/syslinux.c b/src/syslinux.c index 62b88c21..ce7341d7 100644 --- a/src/syslinux.c +++ b/src/syslinux.c @@ -96,7 +96,7 @@ BOOL InstallSyslinux(DWORD drive_index, char drive_letter, int fs_type) uint32_t ldlinux_cluster; int i, nsectors; int dt = (int)ComboBox_GetItemData(hBootType, ComboBox_GetCurSel(hBootType)); - BOOL use_v5 = (dt == DT_SYSLINUX_V5) || ((dt == DT_ISO) && (SL_MAJOR(iso_report.sl_version) >= 5)); + BOOL use_v5 = (dt == DT_SYSLINUX_V6) || ((dt == DT_ISO) && (SL_MAJOR(iso_report.sl_version) >= 5)); PrintStatus(0, TRUE, MSG_234, (dt == DT_ISO)?iso_report.sl_version_str:embedded_sl_version_str[use_v5?1:0]); @@ -272,7 +272,7 @@ map_done: uprintf("Successfully wrote Syslinux boot record\n"); - if (dt == DT_SYSLINUX_V5) { + if (dt == DT_SYSLINUX_V6) { IGNORE_RETVAL(_chdirU(app_dir)); static_sprintf(path, "%s/%s-%s", FILES_DIR, syslinux, embedded_sl_version_str[1]); IGNORE_RETVAL(_chdir(path));