From 01563588f0781298cdf28b38b974be1ddaf07326 Mon Sep 17 00:00:00 2001 From: "Axel D." Date: Fri, 5 Aug 2016 20:44:12 +0200 Subject: [PATCH] GUI amended: * Read-only field added showing selected ISO file. * Input elements reorganized to reflect workflow * Revised one-column layout to become two-column layout, having the main window fit 800*600 pixels. --- res/localization/rufus.loc | 63 +++++++++++++++++++++--------- src/localization.h | 2 +- src/localization_data.h | 2 + src/resource.h | 3 +- src/rufus.c | 76 +++++++------------------------------ src/rufus.h | 1 + src/rufus.rc | 78 +++++++++++++++++++------------------- 7 files changed, 104 insertions(+), 121 deletions(-) diff --git a/res/localization/rufus.loc b/res/localization/rufus.loc index de361dd6..780f9e43 100644 --- a/res/localization/rufus.loc +++ b/res/localization/rufus.loc @@ -5476,26 +5476,52 @@ v 1.0.20 b "en-US" g IDD_DIALOG -s IDD_DIALOG +30,0 -s IDS_FORMAT_OPTIONS_GRP +29,0 -s IDC_PROGRESS +30,0 +s IDD_DIALOG +60,0 +s IDS_DEVICE_TXT +28,0 s IDC_DEVICE +28,0 -s IDC_PARTITION_TYPE +28,0 -s IDC_FILESYSTEM +28,0 -s IDC_CLUSTERSIZE +28,0 -s IDC_LABEL +28,0 +s IDS_FORMAT_OPTIONS_GRP +29,0 +s IDC_BADBLOCKS +29,0 +m IDC_NBPASSES +30,0 +s IDC_QUICKFORMAT +30,0 +s IDC_BOOT +32,0 +m IDC_BOOTTYPE +30,0 +m IDC_SELECT_ISO +29,0 +s IDC_SOURCE +30,0 +s IDC_WINDOWS_INSTALL +30,0 +s IDC_WINDOWS_TO_GO +30,0 +s IDC_SET_ICON +30,0 s IDS_ADVANCED_OPTIONS_GRP +29,0 s IDC_ENABLE_FIXED_DISKS +30,0 s IDC_EXTRA_PARTITION +30,0 s IDC_RUFUS_MBR +25,0 -m IDC_NBPASSES +30,0 -s IDC_BOOT +32,0 -m IDC_BOOTTYPE +30,0 -m IDC_SELECT_ISO +30,0 -s IDC_INFO +30,0 m IDC_DISK_ID +30,0 -m IDC_START +28,0 -m IDCANCEL +28,0 + +s IDS_PARTITION_TYPE_TXT +28,0 +m IDS_PARTITION_TYPE_TXT +30,0 +s IDC_PARTITION_TYPE +28,0 +m IDC_PARTITION_TYPE +30,0 +s IDS_FILESYSTEM_TXT +28,0 +m IDS_FILESYSTEM_TXT +30,0 +s IDC_FILESYSTEM +28,0 +m IDC_FILESYSTEM +30,0 +s IDS_CLUSTERSIZE_TXT +28,0 +m IDS_CLUSTERSIZE_TXT +30,0 +s IDC_CLUSTERSIZE +28,0 +m IDC_CLUSTERSIZE +30,0 +s IDS_LABEL_TXT +28,0 +m IDS_LABEL_TXT +30,0 +s IDC_LABEL +28,0 +m IDC_LABEL +30,0 +s IDC_INFO +29,0 +m IDC_INFO +30,0 +s IDC_PROGRESS +29,0 +m IDC_PROGRESS +30,0 +m IDC_ABOUT +30,0 +m IDC_LOG +30,0 +s IDC_TEST +30,0 +m IDC_TEST +30,0 +m IDC_START +59,0 +m IDCANCEL +59,0 t IDS_DEVICE_TXT "Laufwerk" t IDS_PARTITION_TYPE_TXT "Partitionsschema und Typ des Zielsystems" @@ -5508,7 +5534,7 @@ t IDC_QUICKFORMAT "Schnellformatierung" t IDC_BOOT "Startfähiges Laufwerk erstellen mit" t IDC_SET_ICON "Erweiterte Bezeichnung und Symbole erstellen" t IDC_ABOUT "Über..." -t IDC_LOG "Log" +t IDC_LOG "Protokoll" t IDCANCEL "Schließen" t IDC_START "Start" t IDS_ADVANCED_OPTIONS_GRP "Erweiterte Einstellungen" @@ -5516,6 +5542,7 @@ t IDC_ENABLE_FIXED_DISKS "USB-Festplatten anzeigen" t IDC_EXTRA_PARTITION "Fix für ältere BIOSe verwenden (zus. Partition, usw.)" t IDC_RUFUS_MBR "Rufus MBR benutzen mit BIOS ID" t IDC_WINDOWS_INSTALL "Standard Windows-Installation" + g IDD_ABOUTBOX t IDD_ABOUTBOX "Über Rufus" t IDC_ABOUT_LICENSE "Lizenz" @@ -5534,11 +5561,11 @@ t IDYES "Ja" t IDNO "Nein" g IDD_LOG -t IDD_LOG "Log" -t IDC_LOG_SAVE "Log speichern" +t IDD_LOG "Protokoll" +t IDC_LOG_SAVE "Speichern" s IDC_LOG_SAVE +12,0 m IDC_LOG_SAVE -12,0 -t IDC_LOG_CLEAR "Log löschen" +t IDC_LOG_CLEAR "Löschen" m IDC_LOG_CLEAR -12,0 t IDCANCEL "Schließen" diff --git a/src/localization.h b/src/localization.h index ddb0f01d..5b32d522 100644 --- a/src/localization.h +++ b/src/localization.h @@ -124,7 +124,7 @@ enum loc_command_type { }; typedef struct loc_cmd_struct { - uint8_t command; + enum loc_command_type command; uint8_t unum_size; uint16_t line_nr; int ctrl_id; // Also used as the attributes mask diff --git a/src/localization_data.h b/src/localization_data.h index b277d29f..b766f1ce 100644 --- a/src/localization_data.h +++ b/src/localization_data.h @@ -36,6 +36,7 @@ const loc_control_id control_id[] = { LOC_CTRL(IDD_UPDATE_POLICY), LOC_CTRL(IDD_NEW_VERSION), LOC_CTRL(IDD_CHECKSUM), + LOC_CTRL(IDS_DEVICE_TXT), LOC_CTRL(IDC_DEVICE), LOC_CTRL(IDC_FILESYSTEM), LOC_CTRL(IDC_START), @@ -52,6 +53,7 @@ const loc_control_id control_id[] = { LOC_CTRL(IDC_NBPASSES), LOC_CTRL(IDC_TEST), LOC_CTRL(IDC_SELECT_ISO), + LOC_CTRL(IDC_SOURCE), LOC_CTRL(IDC_SET_ICON), LOC_CTRL(IDC_RUFUS_MBR), LOC_CTRL(IDC_INFO), diff --git a/src/resource.h b/src/resource.h index b5fa74e2..ab069a54 100644 --- a/src/resource.h +++ b/src/resource.h @@ -134,6 +134,7 @@ #define IDC_SELECTION_LINE 1076 #define IDC_SELECTION_CHOICE1 1077 #define IDC_SELECTION_CHOICE2 1078 +#define IDC_SOURCE 1079 #define IDS_DEVICE_TXT 2000 #define IDS_PARTITION_TYPE_TXT 2001 #define IDS_FILESYSTEM_TXT 2002 @@ -446,7 +447,7 @@ #define _APS_NO_MFC 1 #define _APS_NEXT_RESOURCE_VALUE 505 #define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1079 +#define _APS_NEXT_CONTROL_VALUE 1080 #define _APS_NEXT_SYMED_VALUE 4000 #endif #endif diff --git a/src/rufus.c b/src/rufus.c index e53bf3dd..68f766a3 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -1054,6 +1054,7 @@ DWORD WINAPI ISOScanThread(LPVOID param) SetFSFromISO(); SetMBRProps(); SetProposedLabel(ComboBox_GetCurSel(hDeviceList)); + SendMessage(hMainDialog, UM_SET_ISO_IMAGE, 0, 0); } else { SendMessage(hMainDialog, WM_COMMAND, (CBN_SELCHANGE<<16) | IDC_FILESYSTEM, ComboBox_GetCurSel(hFileSystem)); @@ -1095,53 +1096,8 @@ static void SetPassesTooltip(void) // Toggle "advanced" mode static void ToggleAdvanced(BOOL enable) { - // Compute the shift according to the weird values we measured at different scales: - // {1.0, 82}, {1.25, 88}, {1.5, 90}, {2.0, 96}, {2.5, 94} (Seriously, WTF is wrong with your scaling Microsoft?!?!) - // https://www.wolframalpha.com/input/?i=cubic+fit+{1%2C82}%2C{1.25%2C88}%2C{1.5%2C90}%2C{2%2C96}%2C{2.5%2C94} - float dialog_shift = -3.22807f*fScale*fScale*fScale + 6.69173f*fScale*fScale + 15.8822f*fScale + 62.9737f; - RECT rect; - POINT point; int toggle; - if (!enable) - 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_STATUS_TOOLBAR, 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); -#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, NULL, 0, 0, point.x, point.y, SWP_NOZORDER); - // 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 = enable?SW_SHOW:SW_HIDE; ShowWindow(GetDlgItem(hMainDialog, IDC_ENABLE_FIXED_DISKS), toggle); @@ -1188,22 +1144,7 @@ static void ToggleToGo(void) 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_STATUS_TOOLBAR, 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); @@ -1668,12 +1609,13 @@ void InitDialog(HWND hDlg) else if (s16 >= 20) s16 = 24; - // Create the font and brush for the Info edit box + // Create the font and brush for the Source and Info edit box hInfoFont = CreateFontA(lfHeight, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, DEFAULT_CHARSET, 0, 0, PROOF_QUALITY, 0, (nWindowsVersion >= WINDOWS_VISTA)?"Segoe UI":"Arial Unicode MS"); SendDlgItemMessageA(hDlg, IDC_INFO, WM_SETFONT, (WPARAM)hInfoFont, TRUE); + SendDlgItemMessageA(hDlg, IDC_SOURCE, WM_SETFONT, (WPARAM)hInfoFont, TRUE); hInfoBrush = CreateSolidBrush(GetSysColor(COLOR_BTNFACE)); - + // Create the title bar icon SetTitleBarIcon(hDlg); GetWindowTextA(hDlg, tmp, sizeof(tmp)); @@ -1830,7 +1772,7 @@ void InitDialog(HWND hDlg) // Subclass the Info box so that we can align its text vertically info_original_proc = (WNDPROC)SetWindowLongPtr(hInfo, GWLP_WNDPROC, (LONG_PTR)InfoCallback); - // Set the icons on the the buttons + // Set the icons on the buttons if ((pfImageList_Create != NULL) && (pfImageList_ReplaceIcon != NULL)) { bi_iso.himl = pfImageList_Create(i16, i16, ILC_COLOR32 | ILC_MASK, 1, 0); @@ -2310,6 +2252,7 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA } } FormatStatus = 0; + SetDlgItemText(hDlg, IDC_SOURCE, L""); // clear ISO file path label until ISO file has been positively scanned if (CreateThread(NULL, 0, ISOScanThread, NULL, 0, NULL) == NULL) { uprintf("Unable to start ISO scanning thread"); FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|APPERR(ERROR_CANT_START_THREAD); @@ -2670,6 +2613,13 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA SetTaskbarProgressState(TASKBAR_NORMAL); break; + case UM_SET_ISO_IMAGE: + // set ISO file path label + wbuffer = utf8_to_wchar(image_path ? image_path : ""); + SetDlgItemText(hDlg, IDC_SOURCE, wbuffer); + safe_free(wbuffer); + break; + case UM_NO_UPDATE: Notification(MSG_INFO, NULL, lmprintf(MSG_243), lmprintf(MSG_247)); // Need to manually set focus back to "Check Now" for tabbing to work diff --git a/src/rufus.h b/src/rufus.h index 59e42c68..77e4f606 100644 --- a/src/rufus.h +++ b/src/rufus.h @@ -147,6 +147,7 @@ enum user_message_type { UM_MEDIA_CHANGE, UM_PROGRESS_INIT, UM_PROGRESS_EXIT, + UM_SET_ISO_IMAGE, UM_NO_UPDATE, UM_SET_PARTITION_SCHEME_TOOLTIP, // Start of the WM IDs for the language menu items diff --git a/src/rufus.rc b/src/rufus.rc index 6fa74b5f..69c680c5 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -30,7 +30,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // Dialog // -IDD_DIALOG DIALOGEX 12, 12, 242, 376 +IDD_DIALOG DIALOGEX 12, 12, 447, 211 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_ACCEPTFILES CAPTION "Rufus 2.10.975" @@ -38,40 +38,41 @@ FONT 8, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 COMBOBOX IDC_DEVICE,8,17,226,33,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Partition scheme and target system type",IDS_PARTITION_TYPE_TXT,9,35,222,8 - COMBOBOX IDC_PARTITION_TYPE,8,46,226,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "File system",IDS_FILESYSTEM_TXT,9,64,222,10 - COMBOBOX IDC_FILESYSTEM,8,75,226,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Cluster size",IDS_CLUSTERSIZE_TXT,9,93,222,10 - 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,12,ES_AUTOHSCROLL - GROUPBOX "Format Options",IDS_FORMAT_OPTIONS_GRP,7,149,227,89 - PUSHBUTTON "",IDC_ADVANCED,220,148,14,10,BS_ICON - 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,184,75,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "...",IDC_SELECT_ISO,207,183,21,14,BS_ICON + GROUPBOX "Format Options",IDS_FORMAT_OPTIONS_GRP,8,36,227,106 + PUSHBUTTON "",IDC_ADVANCED,221,36,14,10,BS_ICON + CONTROL "Check device for bad blocks",IDC_BADBLOCKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,49,112,10 + COMBOBOX IDC_NBPASSES,130,47,100,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Quick format",IDC_QUICKFORMAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,61,121,10 + CONTROL "Create a bootable disk using",IDC_BOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,73,112,10 + COMBOBOX IDC_BOOTTYPE,130,72,75,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "...",IDC_SELECT_ISO,210,72,21,14,BS_ICON + EDITTEXT IDC_SOURCE,24,87,206,12,ES_AUTOHSCROLL | ES_READONLY 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 + "Button",BS_AUTORADIOBUTTON | WS_GROUP,24,102,205,8 + CONTROL "Windows To Go",IDC_WINDOWS_TO_GO,"Button",BS_AUTORADIOBUTTON,24,113,205,8 CONTROL "Create extended label and icon files",IDC_SET_ICON, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,221,216,10 - GROUPBOX "Advanced Options",IDS_ADVANCED_OPTIONS_GRP,7,233,227,55 - CONTROL "List USB Hard Drives",IDC_ENABLE_FIXED_DISKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,246,216,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,124,216,10 + GROUPBOX "Advanced Options",IDS_ADVANCED_OPTIONS_GRP,8,137,227,55 + CONTROL "List USB Hard Drives",IDC_ENABLE_FIXED_DISKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,149,216,10 CONTROL "Add fixes for old BIOSes (extra partition, align, etc.)",IDC_EXTRA_PARTITION, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,258,216,10 - CONTROL "Use Rufus MBR with BIOS ID",IDC_RUFUS_MBR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,271,112,10 - COMBOBOX IDC_DISK_ID,128,269,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,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 - DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 - PUSHBUTTON "Close",IDCANCEL,183,339,50,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,161,216,10 + CONTROL "Use Rufus MBR with BIOS ID",IDC_RUFUS_MBR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,174,112,10 + COMBOBOX IDC_DISK_ID,130,172,100,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Partition scheme and target system type",IDS_PARTITION_TYPE_TXT,246,6,189,8 + COMBOBOX IDC_PARTITION_TYPE,244,17,196,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "File system",IDS_FILESYSTEM_TXT,246,35,192,10 + COMBOBOX IDC_FILESYSTEM,244,46,196,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Cluster size",IDS_CLUSTERSIZE_TXT,246,64,192,10 + COMBOBOX IDC_CLUSTERSIZE,244,75,196,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "New volume label",IDS_LABEL_TXT,246,92,192,10 + EDITTEXT IDC_LABEL,244,102,196,12,ES_AUTOHSCROLL + EDITTEXT IDC_INFO,244,119,195,12,ES_CENTER | ES_READONLY | NOT WS_BORDER,WS_EX_STATICEDGE + CONTROL "",IDC_PROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,244,132,195,8 + PUSHBUTTON "About...",IDC_ABOUT,244,151,50,14 + PUSHBUTTON "Log",IDC_LOG,300,151,49,14 + PUSHBUTTON "T",IDC_TEST,427,151,12,14,NOT WS_VISIBLE + DEFPUSHBUTTON "Start",IDC_START,334,176,50,14 + PUSHBUTTON "Close",IDCANCEL,390,176,50,14 END IDD_ABOUTBOX DIALOGEX 0, 0, 319, 237 @@ -80,8 +81,8 @@ CAPTION "About Rufus" FONT 8, "Segoe UI Symbol", 400, 0, 0x0 BEGIN ICON IDI_ICON,IDC_ABOUT_ICON,11,8,20,20 - CONTROL "",IDC_ABOUT_BLURB,"RichEdit20W",ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY,45,7,268,107 - CONTROL "",IDC_ABOUT_COPYRIGHTS,"RichEdit20W",ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_TABSTOP,46,115,267,91,WS_EX_STATICEDGE + CONTROL "",IDC_ABOUT_BLURB,"RichEdit20W",0x884,45,7,268,107 + CONTROL "",IDC_ABOUT_COPYRIGHTS,"RichEdit20W",WS_VSCROLL | WS_TABSTOP | 0x804,46,115,267,91,WS_EX_STATICEDGE 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 DEFPUSHBUTTON "OK",IDOK,251,215,50,14,WS_GROUP @@ -157,7 +158,7 @@ FONT 8, "Segoe UI Symbol", 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",ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_TABSTOP,46,8,235,132,WS_EX_STATICEDGE + CONTROL "",IDC_POLICY,"RichEdit20W",WS_VSCROLL | WS_TABSTOP | 0x804,46,8,235,132,WS_EX_STATICEDGE GROUPBOX "Settings",IDS_UPDATE_SETTINGS_GRP,45,145,165,46 LTEXT "Check for updates",IDS_UPDATE_FREQUENCY_TXT,51,159,76,11 COMBOBOX IDC_UPDATE_FREQUENCY,133,155,66,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -192,12 +193,12 @@ END // TEXTINCLUDE // -1 TEXTINCLUDE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE +2 TEXTINCLUDE BEGIN "#ifndef _USING_V110_SDK71_\r\n" "#define _USING_V110_SDK71_\r\n" @@ -209,7 +210,7 @@ BEGIN "\0" END -3 TEXTINCLUDE +3 TEXTINCLUDE BEGIN "\r\n" "#ifdef RUFUS_LOC\r\n" @@ -277,6 +278,7 @@ GUIDELINES DESIGNINFO BEGIN IDD_DIALOG, DIALOG BEGIN + BOTTOMMARGIN, 210 END IDD_ABOUTBOX, DIALOG