diff options
| -rw-r--r-- | plugins/SendScreenshotPlus/res/resource.rc | 2 | ||||
| -rw-r--r-- | plugins/SendScreenshotPlus/src/mir_icolib.cpp | 17 | ||||
| -rw-r--r-- | plugins/SendScreenshotPlus/src/resource.h | 2 |
3 files changed, 6 insertions, 15 deletions
diff --git a/plugins/SendScreenshotPlus/res/resource.rc b/plugins/SendScreenshotPlus/res/resource.rc index 4dc3e547af..1f2d4285f0 100644 --- a/plugins/SendScreenshotPlus/res/resource.rc +++ b/plugins/SendScreenshotPlus/res/resource.rc @@ -154,7 +154,7 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. IDI_MAIN ICON "ssCamera.ico" -IDI_DEFAULT ICON "ssDefault.ico" +//IDI_DEFAULT ICON "ssDefault.ico" IDI_TARGET ICON "ssTarget.ico" IDI_MONITOR ICON "ssMonitor.ico" IDI_HELP ICON "sshelp.ico" diff --git a/plugins/SendScreenshotPlus/src/mir_icolib.cpp b/plugins/SendScreenshotPlus/src/mir_icolib.cpp index 61e61f9c6e..acf1a545de 100644 --- a/plugins/SendScreenshotPlus/src/mir_icolib.cpp +++ b/plugins/SendScreenshotPlus/src/mir_icolib.cpp @@ -46,7 +46,7 @@ static ICODESC icoDesc[] = { ICO_COMMON_SSWINDOW2, LPGEN("Screenshot Icon2"), SECT_COMMON, IDI_MAIN, 0 }, { ICO_COMMON_SSTARGET, LPGEN("Target Cursor"), SECT_COMMON, IDI_TARGET, 1 }, { ICO_COMMON_SSMONITOR, LPGEN("Target Desktop"), SECT_COMMON, IDI_MONITOR, 1 }, - { ICO_COMMON_SSDEFAULT, LPGEN("Default"), SECT_COMMON, IDI_DEFAULT, 0 }, + //{ ICO_COMMON_SSDEFAULT, LPGEN("Default"), SECT_COMMON, IDI_DEFAULT, 0 }, // overlays // { ICO_BTN_OVERLAYON, LPGEN("Overlay on"), SECT_OVERLAY, IDI_OVERLAYON, 0 }, // { ICO_BTN_OVERLAYOFF, LPGEN("Overlay off"), SECT_OVERLAY, IDI_OVERLAYOFF, 0 }, @@ -88,7 +88,7 @@ static ICODESC icoDesc[] = * * @return This function returns the HANDLE of the icon item. **/ -static HANDLE IcoLib_RegisterIconHandleEx(LPSTR szIconID, LPSTR szDescription, LPSTR szSection, LPTSTR szDefaultFile, int idIcon, int Size, HICON hDefIcon) +static HANDLE IcoLib_RegisterIconHandleEx(LPSTR szIconID, LPSTR szDescription, LPSTR szSection, LPTSTR szDefaultFile, int idIcon, int Size) { HANDLE hIconHandle = NULL; @@ -120,12 +120,7 @@ static HANDLE IcoLib_RegisterIconHandleEx(LPSTR szIconID, LPSTR szDescription, L } sid.ptszDefaultFile = szDefaultFile; - if (sid.ptszDefaultFile && sid.ptszDefaultFile[0]) - sid.iDefaultIndex = -idIcon; - else { - sid.hDefaultIcon = hDefIcon; - sid.iDefaultIndex = -1; - } + sid.iDefaultIndex = -idIcon; hIconHandle = Skin_AddIcon(&sid); } MIR_FREE(sid.ptszDescription); @@ -148,12 +143,8 @@ void IcoLib_LoadModule() { LPTSTR szDefaultFile = _T("Plugins\\")_T(__FILENAME); - // load default icon if required - ghDefIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_DEFAULT), IMAGE_ICON, - GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0); - for (int i = 0; i < SIZEOF(icoDesc); i++) IcoLib_RegisterIconHandleEx( icoDesc[i].pszName, icoDesc[i].pszDesc, icoDesc[i].pszSection, - szDefaultFile, icoDesc[i].idResource, icoDesc[i].size, ghDefIcon); + szDefaultFile, icoDesc[i].idResource, icoDesc[i].size); } diff --git a/plugins/SendScreenshotPlus/src/resource.h b/plugins/SendScreenshotPlus/src/resource.h index 0385d53f00..af67a83858 100644 --- a/plugins/SendScreenshotPlus/src/resource.h +++ b/plugins/SendScreenshotPlus/src/resource.h @@ -28,7 +28,7 @@ #define IDR_LICENSE 120 #define IDR_CREDIT 121 #define IDI_MAIN 190 -#define IDI_DEFAULT 191 +//#define IDI_DEFAULT 191 #define IDI_TARGET 192 #define IDI_MONITOR 193 #define IDI_HELP 194 |