SendSS:

* removed some unused stuff, icons, code etc. (resource.rc/h, Main, mir_icolib)
* improved define names IDI_ICON2 and IDI_ICON3 (resource.rc/h)
* unified ssCamera_1.ico and ssCamera_2.ico to ssCamera.ico (resource.rc/h)
! fixed ssMonitor.ico blurriness.

git-svn-id: http://svn.miranda-ng.org/main/trunk@8940 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

9 files changed, 37 insertions, 42 deletions

diff --git a/plugins/SendScreenshotPlus/res/resource.rc b/plugins/SendScreenshotPlus/res/resource.rc
index 2668b70c27..52fe583187 100644
--- a/plugins/SendScreenshotPlus/res/resource.rc
+++ b/plugins/SendScreenshotPlus/res/resource.rc
@@ -111,7 +111,7 @@ BEGIN
     EDITTEXT        ID_edtSize,52,28,43,13,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY
     CONTROL         "C&lient Area",ID_chkClientArea,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,100,30,62,8,WS_EX_RIGHT
     CTEXT           "Target Tool",ID_lblDropInfo,162,1,51,8
-    ICON            IDI_ICON2,ID_imgTarget,174,12,29,29,SS_NOTIFY | SS_CENTERIMAGE | SS_SUNKEN | WS_GROUP
+    ICON            IDI_TARGET,ID_imgTarget,174,12,29,29,SS_NOTIFY | SS_CENTERIMAGE | SS_SUNKEN | WS_GROUP
 END
 
 IDD_UMain_CaptureDesktop DIALOGEX 0, 0, 214, 48
@@ -122,7 +122,7 @@ BEGIN
     COMBOBOX        ID_edtCaption,4,12,158,30,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_TABSTOP
     RTEXT           "Size (HxW):",ID_edtSizeLabel,0,30,50,8
     EDITTEXT        ID_edtSize,52,28,43,13,ES_AUTOHSCROLL | ES_READONLY
-    ICON            IDI_ICON3,ID_imgTarget,174,12,29,29,SS_NOTIFY | SS_CENTERIMAGE | SS_SUNKEN | WS_GROUP
+    ICON            IDI_MONITOR,ID_imgTarget,174,12,29,29,SS_NOTIFY | SS_CENTERIMAGE | SS_SUNKEN | WS_GROUP
 END
 
 IDD_UResultForm DIALOGEX 0, 0, 300, 87
@@ -146,17 +146,16 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_MAIN           ICON                    "ssCamera_1.ico"
-IDI_ICON1          ICON                    "ssCamera_2.ico"
+IDI_MAIN           ICON                    "ssCamera.ico"
 IDI_DEFAULT        ICON                    "ssDefault.ico"
-IDI_ICON2          ICON                    "ssTarget.ico"
-IDI_ICON3          ICON                    "ssMonitor.ico"
+IDI_TARGET         ICON                    "ssTarget.ico"
+IDI_MONITOR        ICON                    "ssMonitor.ico"
 IDI_HELP           ICON                    "sshelp.ico"
 IDI_FOLDERO        ICON                    "ssOpen.ico"
 IDI_ARROWL         ICON                    "ssArrow_Left.ico"
 IDI_ARROWR         ICON                    "ssArrow_Right.ico"
-IDI_OVERLAYOFF     ICON                    "overlay_disabled.ico"
-IDI_OVERLAYON      ICON                    "overlay_enabled.ico"
+//IDI_OVERLAYOFF     ICON                    "overlay_disabled.ico"
+//IDI_OVERLAYON      ICON                    "overlay_enabled.ico"
 IDI_DESKOFF        ICON                    "ssDeskOff.ico"
 IDI_DESKON         ICON                    "ssDeskOn.ico"
 IDI_DELOFF         ICON                    "ssDelOff.ico"
@@ -164,7 +163,7 @@ IDI_DELON          ICON                    "ssDelOn.ico"
 IDI_UPDATE         ICON                    "ssUpdate.ico"
 IDI_OK             ICON                    "ssOk.ico"
 IDI_CLOSE          ICON                    "ssClose.ico"
-IDI_APPLY          ICON                    "ssApply.ico"
+//IDI_APPLY          ICON                    "ssApply.ico"
 IDI_EDIT           ICON                    "ssEdit.ico"
 IDI_DOWNARROW      ICON                    "ssDownarrow.ico"
 
@@ -173,8 +172,8 @@ IDI_DOWNARROW      ICON                    "ssDownarrow.ico"
 // Bitmap
 //
 
-IDB_Bmp1                BITMAP                  "UEditForm_nvr_1.bmp"
-IDB_Bmp2                BITMAP                  "UEditForm_nvr_2.bmp"
+//IDB_Bmp1                BITMAP                  "UEditForm_nvr_1.bmp"
+//IDB_Bmp2                BITMAP                  "UEditForm_nvr_2.bmp"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/SendScreenshotPlus/res/ssCamera_1.ico b/plugins/SendScreenshotPlus/res/ssCamera.ico
index f0b6a45c36..f0b6a45c36 100644
--- a/plugins/SendScreenshotPlus/res/ssCamera_1.ico
+++ b/plugins/SendScreenshotPlus/res/ssCamera.ico
diff --git a/plugins/SendScreenshotPlus/res/ssCamera_2.ico b/plugins/SendScreenshotPlus/res/ssCamera_2.ico
deleted file mode 100644
index 655e12e740..0000000000
--- a/plugins/SendScreenshotPlus/res/ssCamera_2.ico
+++ /dev/null
diff --git a/plugins/SendScreenshotPlus/res/ssMonitor.ico b/plugins/SendScreenshotPlus/res/ssMonitor.ico
index 32ac2b2db9..9d83906e4d 100644
--- a/plugins/SendScreenshotPlus/res/ssMonitor.ico
+++ b/plugins/SendScreenshotPlus/res/ssMonitor.ico
diff --git a/plugins/SendScreenshotPlus/src/CSendImageShack.h b/plugins/SendScreenshotPlus/src/CSendImageShack.h
index d7a2e21b91..92e928c9bc 100644
--- a/plugins/SendScreenshotPlus/src/CSendImageShack.h
+++ b/plugins/SendScreenshotPlus/src/CSendImageShack.h
@@ -39,7 +39,6 @@ class CSendImageShack : public CSend {
 		int Send();
 		int SendSilent() {m_bAsync=m_Silent=true; return Send();};
 		char* GetURL(){return m_Url;};
-		char* GetError(){return mir_t2a(m_ErrorMsg);};
 
 	protected:
 		char*					m_pszFileName;
diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp
index 51e51a9f92..782b4ba403 100644
--- a/plugins/SendScreenshotPlus/src/Main.cpp
+++ b/plugins/SendScreenshotPlus/src/Main.cpp
@@ -52,8 +52,6 @@ PLUGININFOEX pluginInfo={
 	{0xed39af7c, 0xbecd, 0x404e, {0x94, 0x99, 0x4d, 0x04, 0xf7, 0x11, 0xb9, 0xcb}}
 };
 
-//static char szSendSS[]=SZ_SENDSS;
-
 HANDLE hsvc_SendScreenshot=0;
 HANDLE hsvc_SendDesktop=0;
 HANDLE hsvc_EditBitmap=0;
@@ -288,7 +286,7 @@ INT_PTR service_Send2ImageShack(WPARAM wParam, LPARAM lParam) {
 	if (cSend->GetURL()) {
 		result=mir_strdup(cSend->GetURL());
 	}else{
-		result=cSend->GetError();
+		result=mir_t2a(cSend->GetErrorMsg());
 	}
 	delete cSend;
 	return (INT_PTR)result;
diff --git a/plugins/SendScreenshotPlus/src/mir_icolib.cpp b/plugins/SendScreenshotPlus/src/mir_icolib.cpp
index f1ea82c0ca..e4f198081a 100644
--- a/plugins/SendScreenshotPlus/src/mir_icolib.cpp
+++ b/plugins/SendScreenshotPlus/src/mir_icolib.cpp
@@ -43,13 +43,13 @@ static ICODESC icoDesc[] =
 {
 	// common
 	{ ICO_COMMON_SSWINDOW1,	LPGEN("Screenshot Icon1"),	SECT_COMMON,	IDI_MAIN,			1 },
-	{ ICO_COMMON_SSWINDOW2,	LPGEN("Screenshot Icon2"),	SECT_COMMON,	IDI_ICON1,			0 },
-	{ ICO_COMMON_SSTARGET,	LPGEN("Target Cursor"),		SECT_COMMON,	IDI_ICON2,			1 },
-	{ ICO_COMMON_SSMONITOR,	LPGEN("Target Desktop"),	SECT_COMMON,	IDI_ICON3,			1 },
+	{ 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 },
 	// overlays
-	{ ICO_BTN_OVERLAYON,	LPGEN("Overlay on"),		SECT_OVERLAY,	IDI_OVERLAYON,		0 },
-	{ ICO_BTN_OVERLAYOFF,	LPGEN("Overlay off"),		SECT_OVERLAY,	IDI_OVERLAYOFF,		0 },
+//	{ ICO_BTN_OVERLAYON,	LPGEN("Overlay on"),		SECT_OVERLAY,	IDI_OVERLAYON,		0 },
+//	{ ICO_BTN_OVERLAYOFF,	LPGEN("Overlay off"),		SECT_OVERLAY,	IDI_OVERLAYOFF,		0 },
 	// button icons
 	{ ICO_COMMON_SSHELP,	LPGEN("Help"),				SECT_BUTTONS,	IDI_HELP,			0 },
 	{ ICO_COMMON_SSFOLDERO,	LPGEN("Open Folder"),		SECT_BUTTONS,	IDI_FOLDERO,		0 },
@@ -62,7 +62,7 @@ static ICODESC icoDesc[] =
 	{ ICO_BTN_UPDATE,		LPGEN("Update"),			SECT_BUTTONS,	IDI_UPDATE,			0 },
 	{ ICO_BTN_OK,			LPGEN("OK"),				SECT_BUTTONS,	IDI_OK,				0 },
 	{ ICO_BTN_CANCEL,		LPGEN("Cancel"),			SECT_BUTTONS,	IDI_CLOSE,			0 },
-	{ ICO_BTN_APPLY,		LPGEN("Apply"),				SECT_BUTTONS,	IDI_APPLY,			0 },
+//	{ ICO_BTN_APPLY,		LPGEN("Apply"),				SECT_BUTTONS,	IDI_APPLY,			0 },
 	{ ICO_BTN_EDIT,			LPGEN("Edit"),				SECT_BUTTONS,	IDI_EDIT,			0 },
 	{ ICO_BTN_DOWNARROW,	LPGEN("Down arrow"),		SECT_BUTTONS,	IDI_DOWNARROW,		0 },
 };
diff --git a/plugins/SendScreenshotPlus/src/mir_icolib.h b/plugins/SendScreenshotPlus/src/mir_icolib.h
index e1ff0a1dcf..bd026b3875 100644
--- a/plugins/SendScreenshotPlus/src/mir_icolib.h
+++ b/plugins/SendScreenshotPlus/src/mir_icolib.h
@@ -47,12 +47,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #define ICO_BTN_UPDATE			MODNAME"_plug_update"
 #define ICO_BTN_OK				MODNAME"_plug_ok"
 #define ICO_BTN_CANCEL			MODNAME"_plug_cancel"
-#define ICO_BTN_APPLY			MODNAME"_plug_apply"
+//#define ICO_BTN_APPLY			MODNAME"_plug_apply"
 #define ICO_BTN_EDIT			MODNAME"_plug_edit"
 #define ICO_BTN_DOWNARROW		MODNAME"_plug_downarrow"
 
-#define ICO_BTN_OVERLAYOFF		MODNAME"_plug_SSOverlayOff"
-#define ICO_BTN_OVERLAYON		MODNAME"_plug_SSOverlayOn"
+//#define ICO_BTN_OVERLAYOFF		MODNAME"_plug_SSOverlayOff"
+//#define ICO_BTN_OVERLAYON		MODNAME"_plug_SSOverlayOn"
 
 
 void	IcoLib_LoadModule();
diff --git a/plugins/SendScreenshotPlus/src/resource.h b/plugins/SendScreenshotPlus/src/resource.h
index a788ba559f..572372d490 100644
--- a/plugins/SendScreenshotPlus/src/resource.h
+++ b/plugins/SendScreenshotPlus/src/resource.h
@@ -29,24 +29,23 @@
 #define IDR_CREDIT                      121
 #define IDI_MAIN                        190
 #define IDI_DEFAULT                     191
-#define IDI_ICON1                       192
-#define IDI_ICON2                       193
-#define IDI_ICON3                       194
-#define IDI_HELP                        195
-#define IDI_FOLDERO                     196
-#define IDI_ARROWL                      197
-#define IDI_ARROWR                      198
-#define IDI_OVERLAYON                   199
-#define IDI_OVERLAYOFF                  200
-#define IDI_DESKOFF                     201
-#define IDI_DESKON                      202
-#define IDI_DELOFF                      203
-#define IDI_DELON                       204
-#define IDI_UPDATE                      205
-#define IDI_OK                          206
-#define IDI_CLOSE                       207
-#define IDI_APPLY                       208
-#define IDI_EDIT                        209
+#define IDI_TARGET                      192
+#define IDI_MONITOR                     193
+#define IDI_HELP                        194
+#define IDI_FOLDERO                     195
+#define IDI_ARROWL                      196
+#define IDI_ARROWR                      197
+//#define IDI_OVERLAYON                   198
+//#define IDI_OVERLAYOFF                  199
+#define IDI_DESKOFF                     200
+#define IDI_DESKON                      201
+#define IDI_DELOFF                      202
+#define IDI_DELON                       203
+#define IDI_UPDATE                      204
+#define IDI_OK                          205
+#define IDI_CLOSE                       206
+//#define IDI_APPLY                       207
+#define IDI_EDIT                        208
 #define IDI_DOWNARROW                   210
 #define IDC_CAPTURETAB                  1005
 #define IDC_CREDIT                      1009