From bb0836d9f53344ee8f20a5c4efd3e8d5199fe844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Sch=C3=BCmann?= Date: Thu, 25 Dec 2014 00:43:22 +0000 Subject: SendSS: * added unique icons to capture mode selection tabs (also fixed German spelling error on "description" abbreviation "desc" in file names and defines) git-svn-id: http://svn.miranda-ng.org/main/trunk@11618 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SendScreenshotPlus/res/resource.rc | 4 ++-- plugins/SendScreenshotPlus/res/ssDescOff.ico | Bin 0 -> 5430 bytes plugins/SendScreenshotPlus/res/ssDescOn.ico | Bin 0 -> 5430 bytes plugins/SendScreenshotPlus/res/ssDeskOff.ico | Bin 5430 -> 0 bytes plugins/SendScreenshotPlus/res/ssDeskOn.ico | Bin 5430 -> 0 bytes plugins/SendScreenshotPlus/src/Main.cpp | 8 ++++---- plugins/SendScreenshotPlus/src/UMainForm.cpp | 21 ++++++++++----------- plugins/SendScreenshotPlus/src/global.h | 4 ++-- plugins/SendScreenshotPlus/src/resource.h | 4 ++-- 9 files changed, 20 insertions(+), 21 deletions(-) create mode 100644 plugins/SendScreenshotPlus/res/ssDescOff.ico create mode 100644 plugins/SendScreenshotPlus/res/ssDescOn.ico delete mode 100644 plugins/SendScreenshotPlus/res/ssDeskOff.ico delete mode 100644 plugins/SendScreenshotPlus/res/ssDeskOn.ico (limited to 'plugins/SendScreenshotPlus') diff --git a/plugins/SendScreenshotPlus/res/resource.rc b/plugins/SendScreenshotPlus/res/resource.rc index 83d8045da7..883416174a 100644 --- a/plugins/SendScreenshotPlus/res/resource.rc +++ b/plugins/SendScreenshotPlus/res/resource.rc @@ -177,8 +177,8 @@ IDI_ARROWR ICON "ssArrow_Right.ico" IDI_DOWNARROW ICON "ssDownarrow.ico" //IDI_OVERLAYOFF ICON "overlay_disabled.ico" //IDI_OVERLAYON ICON "overlay_enabled.ico" -IDI_DESK ICON "ssDeskOff.ico" -IDI_DESKON ICON "ssDeskOn.ico" +IDI_DESC ICON "ssDescOff.ico" +IDI_DESCON ICON "ssDescOn.ico" IDI_DEL ICON "ssDelOff.ico" IDI_DELON ICON "ssDelOn.ico" IDI_UPDATE ICON "ssUpdate.ico" diff --git a/plugins/SendScreenshotPlus/res/ssDescOff.ico b/plugins/SendScreenshotPlus/res/ssDescOff.ico new file mode 100644 index 0000000000..74fbe068d7 Binary files /dev/null and b/plugins/SendScreenshotPlus/res/ssDescOff.ico differ diff --git a/plugins/SendScreenshotPlus/res/ssDescOn.ico b/plugins/SendScreenshotPlus/res/ssDescOn.ico new file mode 100644 index 0000000000..1d7ba8f459 Binary files /dev/null and b/plugins/SendScreenshotPlus/res/ssDescOn.ico differ diff --git a/plugins/SendScreenshotPlus/res/ssDeskOff.ico b/plugins/SendScreenshotPlus/res/ssDeskOff.ico deleted file mode 100644 index 74fbe068d7..0000000000 Binary files a/plugins/SendScreenshotPlus/res/ssDeskOff.ico and /dev/null differ diff --git a/plugins/SendScreenshotPlus/res/ssDeskOn.ico b/plugins/SendScreenshotPlus/res/ssDeskOn.ico deleted file mode 100644 index 1d7ba8f459..0000000000 Binary files a/plugins/SendScreenshotPlus/res/ssDeskOn.ico and /dev/null differ diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp index be7537d8eb..23d5ac51ba 100644 --- a/plugins/SendScreenshotPlus/src/Main.cpp +++ b/plugins/SendScreenshotPlus/src/Main.cpp @@ -36,17 +36,17 @@ HANDLE g_hNetlibUser=0;//!< Netlib Register User FI_INTERFACE* FIP=NULL; int hLangpack;//Miranda NG langpack used by translate functions, filled by mir_getLP() -IconItem ICONS[]={ +IconItem ICONS[ICO_END_]={ {LPGEN("Main Icon"),"main",IDI_MAIN,32}, {LPGEN("Main Icon"),"mainxs",IDI_MAIN}, {LPGEN("Target Cursor"),"target",IDI_TARGET,32}, {LPGEN("Target Desktop"),"monitor",IDI_MONITOR,32}, }; -IconItem ICONS_BTN[]={ +IconItem ICONS_BTN[ICO_BTN_END_]={ {LPGEN("Help"),"help",IDI_HELP}, {LPGEN("Open Folder"),"folder",IDI_FOLDER}, - {LPGEN("Description off"),"desk",IDI_DESK}, - {LPGEN("Description on"),"deskon",IDI_DESKON}, + {LPGEN("Description off"),"desc",IDI_DESC}, + {LPGEN("Description on"),"descon",IDI_DESCON}, {LPGEN("Delete off"),"del",IDI_DEL}, {LPGEN("Delete on"),"delon",IDI_DELON}, {LPGEN("Prev"),"arrowl",IDI_ARROWL}, diff --git a/plugins/SendScreenshotPlus/src/UMainForm.cpp b/plugins/SendScreenshotPlus/src/UMainForm.cpp index 7be8822ce0..61a14a291b 100644 --- a/plugins/SendScreenshotPlus/src/UMainForm.cpp +++ b/plugins/SendScreenshotPlus/src/UMainForm.cpp @@ -196,10 +196,10 @@ void TfrmMain::wmInitdialog(WPARAM wParam, LPARAM lParam) { /// create Image list for tab control if(!m_himlTab){ //m_himlTab = ImageList_Create(16, 16, PluginConfig.m_bIsXP ? ILC_COLOR32 | ILC_MASK : ILC_COLOR8 | ILC_MASK, 2, 0); - m_himlTab = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 2, 0); - ImageList_AddIcon(m_himlTab, GetIcon(ICO_MAINXS)); /// @note : use custom icon for each capture tab? -// ImageList_AddIcon(m_himlTab, GetIcon(ICO_MAINXS)); -// ImageList_AddIcon(m_himlTab, GetIcon(ICO_MAINXS)); + m_himlTab = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 0, 1); + ImageList_AddIcon(m_himlTab, GetIcon(ICO_TARGET)); + ImageList_AddIcon(m_himlTab, GetIcon(ICO_MONITOR)); + ImageList_AddIcon(m_himlTab, GetIconBtn(ICO_BTN_FOLDER)); } /// create the tab control. @@ -212,11 +212,10 @@ void TfrmMain::wmInitdialog(WPARAM wParam, LPARAM lParam) { itab.hwndMain = m_hWnd; itab.hwndTab = m_hwndTab; itab.tcih.mask = TCIF_PARAM|TCIF_TEXT|TCIF_IMAGE; - itab.tcih.iImage = 0; /// Add a tab for each of the three child dialog boxes. itab.tcih.pszText = TranslateT("Window"); -// itab.tcih.iImage = 0; + itab.tcih.iImage = 0; itab.hwndTabPage = CreateDialogParam(g_hSendSS,MAKEINTRESOURCE(IDD_UMain_CaptureWindow),m_hWnd,DlgProc_CaptureTabPage,IDD_UMain_CaptureWindow); TabCtrl_InsertItem(m_hwndTab,0,&itab); /// get tab boundaries (required after 1st tab) @@ -230,7 +229,7 @@ void TfrmMain::wmInitdialog(WPARAM wParam, LPARAM lParam) { CheckDlgButton(itab.hwndTabPage, ID_chkClientArea, m_opt_chkClientArea ? BST_CHECKED : BST_UNCHECKED); itab.tcih.pszText = TranslateT("Desktop"); -// itab.tcih.iImage = 1; + itab.tcih.iImage = 1; itab.hwndTabPage = CreateDialogParam(g_hSendSS,MAKEINTRESOURCE(IDD_UMain_CaptureDesktop),m_hWnd,DlgProc_CaptureTabPage,IDD_UMain_CaptureDesktop); TabCtrl_InsertItem(m_hwndTab,1,&itab); SetWindowPos(itab.hwndTabPage,HWND_TOP,rcTab.left,rcTab.top,rcTab.right,rcTab.bottom,0); @@ -253,7 +252,7 @@ void TfrmMain::wmInitdialog(WPARAM wParam, LPARAM lParam) { PostMessage(m_hWnd, WM_COMMAND, MAKEWPARAM(ID_edtCaption, CBN_SELCHANGE),(LPARAM)hCtrl); itab.tcih.pszText = TranslateT("File"); -// itab.tcih.iImage = 2; + itab.tcih.iImage = 2; itab.hwndTabPage = CreateDialogParam(g_hSendSS,MAKEINTRESOURCE(IDD_UMain_CaptureFile),m_hWnd,DlgProc_CaptureTabPage,IDD_UMain_CaptureFile); TabCtrl_InsertItem(m_hwndTab,2,&itab); SetWindowPos(itab.hwndTabPage,HWND_TOP,rcTab.left,rcTab.top,rcTab.right,rcTab.bottom,0); @@ -339,7 +338,7 @@ void TfrmMain::wmInitdialog(WPARAM wParam, LPARAM lParam) { if (hCtrl = GetDlgItem(m_hWnd, ID_chkDesc)) { SendDlgItemMessage(m_hWnd, ID_chkDesc, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Fill description textbox."), MBBF_TCHAR); - HICON hIcon = GetIconBtn(m_opt_btnDesc ? ICO_BTN_DESKON : ICO_BTN_DESK); + HICON hIcon = GetIconBtn(m_opt_btnDesc ? ICO_BTN_DESCON : ICO_BTN_DESC); SendMessage(hCtrl, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon); SetWindowText(hCtrl, hIcon ? _T("") : _T("D")); SendMessage(hCtrl, BM_SETCHECK, m_opt_btnDesc ? BST_CHECKED : BST_UNCHECKED, NULL); @@ -408,7 +407,7 @@ void TfrmMain::wmCommand(WPARAM wParam, LPARAM lParam) { break; case ID_chkDesc:{ m_opt_btnDesc=!m_opt_btnDesc; - HICON hIcon=GetIconBtn(m_opt_btnDesc?ICO_BTN_DESKON:ICO_BTN_DESK); + HICON hIcon=GetIconBtn(m_opt_btnDesc?ICO_BTN_DESCON:ICO_BTN_DESC); SendMessage((HWND)lParam,BM_SETIMAGE,IMAGE_ICON,(LPARAM)hIcon); break;} case ID_chkDeleteAfterSend:{ @@ -872,7 +871,7 @@ void TfrmMain::cboxSendByChange() { Button_Enable(GetDlgItem(m_hWnd, ID_chkDeleteAfterSend), bState); bState = (itemFlag & SS_DLG_DESCRIPTION); - hIcon = GetIconBtn(m_opt_btnDesc ? ICO_BTN_DESKON : ICO_BTN_DESK); + hIcon = GetIconBtn(m_opt_btnDesc ? ICO_BTN_DESCON : ICO_BTN_DESC); SendDlgItemMessage(m_hWnd, ID_chkDesc, BM_SETIMAGE, IMAGE_ICON, (LPARAM)(bState ? hIcon : 0)); Button_Enable(GetDlgItem(m_hWnd, ID_chkDesc), bState); } diff --git a/plugins/SendScreenshotPlus/src/global.h b/plugins/SendScreenshotPlus/src/global.h index 1eff333a91..112939c454 100644 --- a/plugins/SendScreenshotPlus/src/global.h +++ b/plugins/SendScreenshotPlus/src/global.h @@ -133,8 +133,8 @@ enum{ ICO_END_, ICO_BTN_HELP=0, ICO_BTN_FOLDER, - ICO_BTN_DESK, - ICO_BTN_DESKON, + ICO_BTN_DESC, + ICO_BTN_DESCON, ICO_BTN_DEL, ICO_BTN_DELON, ICO_BTN_ARROWL, diff --git a/plugins/SendScreenshotPlus/src/resource.h b/plugins/SendScreenshotPlus/src/resource.h index 3a053f1f60..80fcdff47a 100644 --- a/plugins/SendScreenshotPlus/src/resource.h +++ b/plugins/SendScreenshotPlus/src/resource.h @@ -37,8 +37,8 @@ #define IDI_ARROWR 196 //#define IDI_OVERLAYON 198 //#define IDI_OVERLAYOFF 199 -#define IDI_DESK 200 -#define IDI_DESKON 201 +#define IDI_DESC 200 +#define IDI_DESCON 201 #define IDI_DEL 202 #define IDI_DELON 203 #define IDI_UPDATE 204 -- cgit v1.2.3