From 34ee2f6382d68b7f3110b33463016ff334790cab Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Thu, 17 May 2018 15:05:09 +0100
Subject: [PATCH] [ui] Move the save and hash tooltips to the toolbar parent

* Also fix a .loc typo
---
 res/localization/rufus.loc |  2 +-
 src/rufus.c                | 13 ++-----------
 src/rufus.rc               | 10 +++++-----
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/res/localization/rufus.loc b/res/localization/rufus.loc
index d190777e..f8763b63 100644
--- a/res/localization/rufus.loc
+++ b/res/localization/rufus.loc
@@ -456,7 +456,7 @@ t MSG_219 "NTFS Fixup: %d%% completed"
 # eg. "Formatting (UDF) - Estimated duration 3:21..."
 # NB: if "estimated duration" is too long, just use "estimated" or an abbreviation
 t MSG_220 "Formatting (%s) - estimated duration %d:%02d..."
-t MSG_221 "Setting Label (This may take while)..."
+t MSG_221 "Setting Label (This may take a while)..."
 # Parameter: the file system. eg. "Formatting (NTFS)..."
 t MSG_222 "Formatting (%s)..."
 t MSG_223 "NTFS Fixup (Checkdisk)..."
diff --git a/src/rufus.c b/src/rufus.c
index ecdafa03..ef6a6719 100644
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -2673,6 +2673,8 @@ static void InitDialog(HWND hDlg)
 	CreateTooltip(hLabel, lmprintf(MSG_159), -1);
 	CreateTooltip(hAdvancedDeviceToolbar, lmprintf(MSG_160), -1);
 	CreateTooltip(hAdvancedFormatToolbar, lmprintf(MSG_160), -1);
+	CreateTooltip(hSaveToolbar, lmprintf(MSG_304), -1);
+	CreateTooltip(hHashToolbar, lmprintf(MSG_272), -1);
 	CreateTooltip(GetDlgItem(hDlg, IDC_BAD_BLOCKS), lmprintf(MSG_161), -1);
 	CreateTooltip(GetDlgItem(hDlg, IDC_QUICK_FORMAT), lmprintf(MSG_162), -1);
 	CreateTooltip(hBootType, lmprintf(MSG_164), -1);
@@ -3523,17 +3525,6 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
 				utf8_to_wchar_no_alloc(lmprintf(MSG_303), wtooltip, ARRAYSIZE(wtooltip));
 				lpttt->lpszText = wtooltip;
 				break;
-			case IDC_SAVE:
-				utf8_to_wchar_no_alloc(lmprintf(MSG_304), wtooltip, ARRAYSIZE(wtooltip));
-				lpttt->lpszText = wtooltip;
-				break;
-			case IDC_HASH:
-				utf8_to_wchar_no_alloc(lmprintf(MSG_272), wtooltip, ARRAYSIZE(wtooltip));
-				lpttt->lpszText = wtooltip;
-				break;
-			default:
-				uprintf("TTN_GETDISPINFO called for unknown toolbar button!");
-				break;
 			}
 			break;
 		}
diff --git a/src/rufus.rc b/src/rufus.rc
index bfda2bcf..f7b07749 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.0.1284"
+CAPTION "Rufus 3.0.1285"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -389,8 +389,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,0,1284,0
- PRODUCTVERSION 3,0,1284,0
+ FILEVERSION 3,0,1285,0
+ PRODUCTVERSION 3,0,1285,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -407,13 +407,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.0.1284"
+            VALUE "FileVersion", "3.0.1285"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.0.1284"
+            VALUE "ProductVersion", "3.0.1285"
         END
     END
     BLOCK "VarFileInfo"