From 4f23d1fc8b331c3726ef130e0f34fe65b1bdbeb7 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Sat, 3 Dec 2011 23:51:07 +0000 Subject: [PATCH] [ui] added icon to title bar * also added inadvertently removed 16x16 image to .ico --- rufus.c | 6 ++++++ rufus.ico | Bin 16398 -> 17542 bytes rufus.rc | 12 ++++++------ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/rufus.c b/rufus.c index 3f27ac9e..c56548f9 100644 --- a/rufus.c +++ b/rufus.c @@ -590,6 +590,7 @@ static void EnableControls(BOOL bEnable) static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { HDC hDC; + HICON hSmallIcon, hBigIcon; DRAWITEMSTRUCT* pDI; int nDeviceIndex, fs; DWORD DeviceNum; @@ -623,6 +624,11 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA hDC = GetDC(hDlg); fScale = GetDeviceCaps(hDC, LOGPIXELSX) / 96.0f; ReleaseDC(hDlg, hDC); + // Create the title bar icon + hSmallIcon = (HICON)LoadImage(hMainInstance, MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 16, 16, 0); + SendMessage (hDlg, WM_SETICON, ICON_SMALL, (LPARAM)hSmallIcon); + hBigIcon = (HICON)LoadImage(hMainInstance, MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 32, 32, 0); + SendMessage (hDlg, WM_SETICON, ICON_BIG, (LPARAM)hBigIcon); // Create the status line CreateStatusBar(); // Display the version in the right area of the status bar diff --git a/rufus.ico b/rufus.ico index b1d228f93eaeff4a117a2cb0fcba317b07b89a07..09913990ae35493a0bbddf209c76714fcdf10ea5 100644 GIT binary patch literal 17542 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 MSLdI~Y&2Z_A1KHkxBvhE literal 16398 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://github.com/pbatard/rufus",IDC_ABOUT_RUFUS_URL, "SysLink",WS_TABSTOP,46,47,114,9 - LTEXT "Version 1.0.0 (Build 63)",IDC_STATIC,46,19,78,8 + LTEXT "Version 1.0.0 (Build 64)",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 @@ -162,8 +162,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,63 - PRODUCTVERSION 1,0,0,63 + FILEVERSION 1,0,0,64 + PRODUCTVERSION 1,0,0,64 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -180,13 +180,13 @@ BEGIN BEGIN VALUE "CompanyName", "akeo.ie" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.0.0.63" + VALUE "FileVersion", "1.0.0.64" 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.0.0.63" + VALUE "ProductVersion", "1.0.0.64" END END BLOCK "VarFileInfo" @@ -212,7 +212,7 @@ IDI_ICON ICON "rufus.ico" STRINGTABLE BEGIN - IDS_VERSION "Rufus v1.0.0.63" + IDS_VERSION "Rufus v1.0.0.64" END #endif // English resources