summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/SendScreenshotPlus/res/resource.rc4
-rw-r--r--plugins/SendScreenshotPlus/res/ssDescOff.ico (renamed from plugins/SendScreenshotPlus/res/ssDeskOff.ico)bin5430 -> 5430 bytes
-rw-r--r--plugins/SendScreenshotPlus/res/ssDescOn.ico (renamed from plugins/SendScreenshotPlus/res/ssDeskOn.ico)bin5430 -> 5430 bytes
-rw-r--r--plugins/SendScreenshotPlus/src/Main.cpp8
-rw-r--r--plugins/SendScreenshotPlus/src/UMainForm.cpp21
-rw-r--r--plugins/SendScreenshotPlus/src/global.h4
-rw-r--r--plugins/SendScreenshotPlus/src/resource.h4
7 files changed, 20 insertions, 21 deletions
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/ssDeskOff.ico b/plugins/SendScreenshotPlus/res/ssDescOff.ico
index 74fbe068d7..74fbe068d7 100644
--- a/plugins/SendScreenshotPlus/res/ssDeskOff.ico
+++ b/plugins/SendScreenshotPlus/res/ssDescOff.ico
Binary files differ
diff --git a/plugins/SendScreenshotPlus/res/ssDeskOn.ico b/plugins/SendScreenshotPlus/res/ssDescOn.ico
index 1d7ba8f459..1d7ba8f459 100644
--- a/plugins/SendScreenshotPlus/res/ssDeskOn.ico
+++ b/plugins/SendScreenshotPlus/res/ssDescOn.ico
Binary files 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 05:30:21 +0000