From 8bd660019939f6d02dc6a8021487f1d9e2ac2600 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sun, 24 Jan 2016 16:40:15 +0900 Subject: [PATCH] ShellExtension: Add 48x48 icons --- ShellExtension/Resource.h | 4 +++- ShellExtension/ShellExtension.rc | 10 ++++++---- ShellExtension/WinMerge48.bmp | Bin 0 -> 6966 bytes ShellExtension/WinMergeDir48.bmp | Bin 0 -> 6966 bytes ShellExtension/WinMergeShell.cpp | 4 ++-- 5 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 ShellExtension/WinMerge48.bmp create mode 100644 ShellExtension/WinMergeDir48.bmp diff --git a/ShellExtension/Resource.h b/ShellExtension/Resource.h index b1bef6029..287b0c8c3 100644 --- a/ShellExtension/Resource.h +++ b/ShellExtension/Resource.h @@ -18,12 +18,14 @@ #define IDB_WINMERGEDIR 203 #define IDB_WINMERGE32 204 #define IDB_WINMERGEDIR32 205 +#define IDB_WINMERGE48 206 +#define IDB_WINMERGEDIR48 207 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 204 +#define _APS_NEXT_RESOURCE_VALUE 208 #define _APS_NEXT_COMMAND_VALUE 32768 #define _APS_NEXT_CONTROL_VALUE 201 #define _APS_NEXT_SYMED_VALUE 111 diff --git a/ShellExtension/ShellExtension.rc b/ShellExtension/ShellExtension.rc index 44db38604..eb5f82db9 100644 --- a/ShellExtension/ShellExtension.rc +++ b/ShellExtension/ShellExtension.rc @@ -299,8 +299,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,16,5,8 - PRODUCTVERSION 1,16,5,8 + FILEVERSION 1,16,5,9 + PRODUCTVERSION 1,16,5,9 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -317,12 +317,12 @@ BEGIN BEGIN VALUE "CompanyName", "http://www.geocities.co.jp/SiliconValley-SanJose/8165/winmerge.html" VALUE "FileDescription", "WinMerge Shell Integration library" - VALUE "FileVersion", "1.16.5.8" + VALUE "FileVersion", "1.16.5.9" VALUE "InternalName", "ShellExtension" VALUE "LegalCopyright", "Copyright 2003-2016" VALUE "OriginalFilename", "ShellExtension.DLL" VALUE "ProductName", "WinMerge Shell Integration library" - VALUE "ProductVersion", "1.16.5.8" + VALUE "ProductVersion", "1.16.5.9" END END BLOCK "VarFileInfo" @@ -346,8 +346,10 @@ IDR_WINMERGESHELL REGISTRY "WinMergeShell.rgs" IDB_WINMERGE BITMAP "WinMerge.bmp" IDB_WINMERGE32 BITMAP "WinMerge32.bmp" +IDB_WINMERGE48 BITMAP "WinMerge48.bmp" IDB_WINMERGEDIR BITMAP "WinMergeDir.bmp" IDB_WINMERGEDIR32 BITMAP "WinMergeDir32.bmp" +IDB_WINMERGEDIR48 BITMAP "WinMergeDir48.bmp" ///////////////////////////////////////////////////////////////////////////// // diff --git a/ShellExtension/WinMerge48.bmp b/ShellExtension/WinMerge48.bmp new file mode 100644 index 0000000000000000000000000000000000000000..918893210c09bd07654d1602249b223a2d175531 GIT binary patch literal 6966 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 literal 0 HcmV?d00001 diff --git a/ShellExtension/WinMergeDir48.bmp b/ShellExtension/WinMergeDir48.bmp new file mode 100644 index 0000000000000000000000000000000000000000..843d7b1043c0478a6c2706560aac7f0bcfd4125d GIT binary patch literal 6966 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 z z#mxOj8Uh3J*wkTIE;Q@pW>{s0b%+rLr#XxXXlA1s(9p?^DiI(6OQ^7LM91yZO|~h? zbplcgU`QM7d;BOqKk|I@J(vFPor!hnq|U0bn)nF&ceApx#A5N%e17}NBQ{&r-6Q_X zf$E^(;wcu@poPHgBPQ5lHUS{k(>Ep#=z^d@Yu2mGTDeIrF)4*c1=k>D86-40YuKRI zwxxcHzkOnCsIR&xGxuJ2L2`H#E{oJ&))M-D(e;x+9D~8|3_ich;qf$IoNPMt(IIeZ zgLO)?4gw-rWibLpW@Rzzu((EIg!o43BrF<-xda`nOGAGG4roeZpTflSXO+iv?K8IEER9K}3OtV=8t(B;gG|$!odx9`T{ecyRzB!?`_j ze|yy4*3kDWZk+=s7Z`@0Ne1KdtBjn7LtuXZuWP{9TTDi?8J?8|hy#)bWRXT{R0*+! z5m90Oh>imirbR=k0|!`e(uexex%fnbUeg$Uusik$qyCPJ(QAS=D&a(X)c)c`KNgDx z?(})cESv+LCows&I-j`IcTmIZnqiGj(T4HY z-WxCSn{JsDgKx~$ejm%sfnXx+J8YOhFC_3%{IEZPeAYm$1!v)Yl z7B~cf(-6PrnpP%gP4(!w`SDa|wpvJ4Pt$-hfDBLuy!>2v*U#@iSj<-kc zD^A36=EbVXrpZG4G@oY+{@MS)i(Jq;<4(3m?kP?7XEK?;6d9X7fYMLKwO!yN-31Xm X9`6?Vx0hpZbyiQ}h1^!K@*6 literal 0 HcmV?d00001 diff --git a/ShellExtension/WinMergeShell.cpp b/ShellExtension/WinMergeShell.cpp index 398a5a481..6eee1d017 100644 --- a/ShellExtension/WinMergeShell.cpp +++ b/ShellExtension/WinMergeShell.cpp @@ -191,8 +191,8 @@ CWinMergeShell::CWinMergeShell() m_dwMenuState = 0; int cx = GetSystemMetrics(SM_CXMENUCHECK); int cy = GetSystemMetrics(SM_CYMENUCHECK); - int id_fileicon = cx > 16 ? IDB_WINMERGE32 : IDB_WINMERGE; - int id_diricon = cx > 16 ? IDB_WINMERGEDIR32 : IDB_WINMERGEDIR; + int id_fileicon = cx > 16 ? (cx > 32 ? IDB_WINMERGE48 : IDB_WINMERGE32) : IDB_WINMERGE; + int id_diricon = cx > 16 ? (cx > 32 ? IDB_WINMERGEDIR48 : IDB_WINMERGEDIR32) : IDB_WINMERGEDIR; // compress or stretch icon bitmap according to menu item height HBITMAP hMergeBmp = (HBITMAP)LoadImage(_Module.GetModuleInstance(), MAKEINTRESOURCE(id_fileicon), IMAGE_BITMAP, -- 2.11.0