From dbe6af78d907732396ceef9a6e31b41bb5d7f498 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Tue, 22 May 2012 12:30:22 +0100 Subject: [PATCH] [ui] provide tooltips for all options * Closes #84 --- src/rufus.c | 27 ++++++++++++++++++++++----- src/rufus.h | 2 +- src/rufus.rc | 12 ++++++------ src/stdlg.c | 2 +- 4 files changed, 30 insertions(+), 13 deletions(-) diff --git a/src/rufus.c b/src/rufus.c index 3492a2e0..39ff90dc 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -1321,8 +1321,8 @@ void InitDialog(HWND hDlg) // Fill up the DOS type dropdown IGNORE_RETVAL(ComboBox_SetItemData(hDOSType, ComboBox_AddStringU(hDOSType, "MS-DOS"), DT_WINME)); IGNORE_RETVAL(ComboBox_SetCurSel(hDOSType, DT_WINME)); - // Fill up the MBR disk IDs ("9 IDs should be enough for anybody") - for (i=0x80; i<=0x88; i++) { + // Fill up the MBR masqueraded disk IDs ("8 disks should be enough for anybody") + for (i=0x80; i<=0x87; i++) { sprintf(tmp, "0x%02x", i); IGNORE_RETVAL(ComboBox_SetItemData(hDiskID, ComboBox_AddStringU(hDiskID, tmp), i)); } @@ -1366,9 +1366,26 @@ void InitDialog(HWND hDlg) SendMessage(hSelectISO, BCM_SETIMAGELIST, 0, (LPARAM)&bi_iso); SendMessage(GetDlgItem(hDlg, IDC_ADVANCED), BCM_SETIMAGELIST, 0, (LPARAM)&bi_down); - CreateTooltip(hSelectISO, "Click to select...", -1); - CreateTooltip(GetDlgItem(hDlg, IDC_SET_ICON), "Create an autorun.inf on the target drive, to set the icon. " - "Also allow the display of non-English labels.", 10000); + + // Set the various tooltips + CreateTooltip(hCapacity, "Size of the current USB drive", -1); + CreateTooltip(hClusterSize, "Minimum size that each data block will occupy", -1); + CreateTooltip(hLabel, "Use this field to set the drive label\nInternational characters are accepted", -1); + CreateTooltip(GetDlgItem(hDlg, IDC_ADVANCED), "Toggle advanced options", -1); + CreateTooltip(GetDlgItem(hDlg, IDC_BADBLOCKS), "Test the device for bad blocks using a set byte pattern", -1); + CreateTooltip(GetDlgItem(hDlg, IDC_QUICKFORMAT), "Unchek this box to use the \"slow\" format method", -1); + CreateTooltip(hDOS, "Check this box to make the USB drive bootable", -1); + CreateTooltip(hDOSType, "Type of boot", -1); + CreateTooltip(hSelectISO, "Click to select an ISO...", -1); + CreateTooltip(GetDlgItem(hDlg, IDC_SET_ICON), "Check this box to allow the display of international labels " + "as well as set a device icon (through autorun.inf)", 10000); + CreateTooltip(GetDlgItem(hDlg, IDC_RUFUS_MBR), "Install an MBR that allows boot selection and can masquerade the BIOS USB drive ID", 10000); + CreateTooltip(hDiskID, "If not 0x80, masquerade USB drive to a different ID:\n0x81 = masquerade as 2nd disk, 0x82 = 3rd disk, etc.\n" + "This is mostly used for XP/WinPE 1.0 boot" , 10000); + CreateTooltip(GetDlgItem(hDlg, IDC_EXTRA_PARTITION), "Create an extra hidden partition and try to align partitions boundaries.\n" + "This can improve boot detection for older BIOSes", -1); + CreateTooltip(GetDlgItem(hDlg, IDC_START), "Format the drive. This will DESTROY any data on it", -1); + CreateTooltip(GetDlgItem(hDlg, IDC_ABOUT), "Licensing information and credits", -1); ToggleAdvanced(); // We start in advanced mode => go to basic mode } diff --git a/src/rufus.h b/src/rufus.h index 1cf84047..1db714d2 100644 --- a/src/rufus.h +++ b/src/rufus.h @@ -32,7 +32,7 @@ #define DRIVE_INDEX_MIN 0x80 #define DRIVE_INDEX_MAX 0xC0 #define MAX_DRIVES 16 -#define MAX_TOOLTIPS 16 +#define MAX_TOOLTIPS 32 #define MAX_PROGRESS (0xFFFF-1) // leave room for 1 more for insta-progress workaround #define PROPOSEDLABEL_TOLERANCE 0.10 #define FS_DEFAULT FS_FAT32 diff --git a/src/rufus.rc b/src/rufus.rc index 9ed3473f..5bbef2b9 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 206, 316 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Rufus v1.2.0.174" +CAPTION "Rufus v1.2.0.175" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,278,50,14 @@ -76,7 +76,7 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP CONTROL "http://rufus.akeo.ie",IDC_ABOUT_RUFUS_URL, "SysLink",WS_TABSTOP,46,47,114,9 - LTEXT "Version 1.2.0 (Build 174)",IDC_STATIC,46,19,78,8 + LTEXT "Version 1.2.0 (Build 175)",IDC_STATIC,46,19,78,8 PUSHBUTTON "License...",IDC_ABOUT_LICENSE,46,175,50,14,WS_GROUP EDITTEXT IDC_ABOUT_COPYRIGHTS,46,107,235,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL LTEXT "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8 @@ -221,8 +221,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,0,174 - PRODUCTVERSION 1,2,0,174 + FILEVERSION 1,2,0,175 + PRODUCTVERSION 1,2,0,175 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -239,13 +239,13 @@ BEGIN BEGIN VALUE "CompanyName", "akeo.ie" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.2.0.174" + VALUE "FileVersion", "1.2.0.175" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.2.0.174" + VALUE "ProductVersion", "1.2.0.175" END END BLOCK "VarFileInfo" diff --git a/src/stdlg.c b/src/stdlg.c index f50cc9ab..6a10c2bd 100644 --- a/src/stdlg.c +++ b/src/stdlg.c @@ -801,7 +801,7 @@ void DestroyAllTooltips(void) } } -/* Compute the width of a device list entry */ +/* Compute the width of a dropdown list entry */ LONG GetEntryWidth(HWND hDropDown, const char *entry) { HDC hDC;