From d6f51161612cf03c1aba04d0a93b963b7d486ed2 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 9 Mar 2013 11:16:24 +0000 Subject: removed not used headers added version info removed uinfo icon pack dependence git-svn-id: http://svn.miranda-ng.org/main/trunk@3933 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SendScreenshotPlus/SendSS_10.vcxproj | 16 +- .../SendScreenshotPlus/SendSS_10.vcxproj.filters | 103 ++++----- plugins/SendScreenshotPlus/SendSS_11.vcxproj | 20 +- .../SendScreenshotPlus/SendSS_11.vcxproj.filters | 103 ++++----- plugins/SendScreenshotPlus/res/resource.rc | 6 + plugins/SendScreenshotPlus/res/ssApply.ico | Bin 0 -> 1150 bytes plugins/SendScreenshotPlus/res/ssClose.ico | Bin 0 -> 1150 bytes plugins/SendScreenshotPlus/res/ssDownarrow.ico | Bin 0 -> 1150 bytes plugins/SendScreenshotPlus/res/ssEdit.ico | Bin 0 -> 1150 bytes plugins/SendScreenshotPlus/res/ssOk.ico | Bin 0 -> 1150 bytes plugins/SendScreenshotPlus/res/ssUpdate.ico | Bin 0 -> 1150 bytes plugins/SendScreenshotPlus/res/version.rc | 48 ++--- plugins/SendScreenshotPlus/src/CSend.cpp | 2 +- plugins/SendScreenshotPlus/src/CSend.h | 6 - plugins/SendScreenshotPlus/src/CSendEmail.cpp | 2 +- plugins/SendScreenshotPlus/src/CSendEmail.h | 5 - plugins/SendScreenshotPlus/src/CSendFTPFile.cpp | 2 +- plugins/SendScreenshotPlus/src/CSendFTPFile.h | 4 - plugins/SendScreenshotPlus/src/CSendFile.cpp | 2 +- plugins/SendScreenshotPlus/src/CSendFile.h | 4 - plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp | 3 +- plugins/SendScreenshotPlus/src/CSendHTTPServer.h | 4 - plugins/SendScreenshotPlus/src/CSendImageShack.cpp | 7 +- plugins/SendScreenshotPlus/src/CSendImageShack.h | 5 - plugins/SendScreenshotPlus/src/Main.cpp | 34 +-- plugins/SendScreenshotPlus/src/Main.h | 3 - plugins/SendScreenshotPlus/src/UAboutForm.cpp | 4 +- plugins/SendScreenshotPlus/src/UAboutForm.h | 2 - plugins/SendScreenshotPlus/src/UMainForm.cpp | 6 +- plugins/SendScreenshotPlus/src/UMainForm.h | 9 - plugins/SendScreenshotPlus/src/Utils.cpp | 18 +- plugins/SendScreenshotPlus/src/Utils.h | 5 - plugins/SendScreenshotPlus/src/ctrl_button.cpp | 3 +- plugins/SendScreenshotPlus/src/dlg_msgbox.cpp | 22 +- plugins/SendScreenshotPlus/src/dlg_msgbox.h | 3 - plugins/SendScreenshotPlus/src/global.h | 49 ++--- plugins/SendScreenshotPlus/src/icons.h | 112 ---------- plugins/SendScreenshotPlus/src/mir_icolib.cpp | 238 +++------------------ plugins/SendScreenshotPlus/src/mir_icolib.h | 82 +------ plugins/SendScreenshotPlus/src/mir_string.cpp | 1 - plugins/SendScreenshotPlus/src/resource.h | 6 + plugins/SendScreenshotPlus/src/stdafx.cpp | 18 ++ plugins/SendScreenshotPlus/src/version.h | 29 +-- 43 files changed, 283 insertions(+), 703 deletions(-) create mode 100644 plugins/SendScreenshotPlus/res/ssApply.ico create mode 100644 plugins/SendScreenshotPlus/res/ssClose.ico create mode 100644 plugins/SendScreenshotPlus/res/ssDownarrow.ico create mode 100644 plugins/SendScreenshotPlus/res/ssEdit.ico create mode 100644 plugins/SendScreenshotPlus/res/ssOk.ico create mode 100644 plugins/SendScreenshotPlus/res/ssUpdate.ico delete mode 100644 plugins/SendScreenshotPlus/src/icons.h create mode 100644 plugins/SendScreenshotPlus/src/stdafx.cpp (limited to 'plugins') diff --git a/plugins/SendScreenshotPlus/SendSS_10.vcxproj b/plugins/SendScreenshotPlus/SendSS_10.vcxproj index 7596d8ad77..691f9a1071 100644 --- a/plugins/SendScreenshotPlus/SendSS_10.vcxproj +++ b/plugins/SendScreenshotPlus/SendSS_10.vcxproj @@ -74,10 +74,12 @@ ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Level3 Full Size + global.h + Use gdiplus.lib;msimg32.lib;shlwapi.lib;comctl32.lib;%(AdditionalDependencies) @@ -103,6 +105,8 @@ MultiThreadedDebugDLL Level3 EditAndContinue + global.h + Use gdiplus.lib;msimg32.lib;shlwapi.lib;comctl32.lib;%(AdditionalDependencies) @@ -120,10 +124,12 @@ ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Level3 Full Size + global.h + Use gdiplus.lib;msimg32.lib;shlwapi.lib;comctl32.lib;%(AdditionalDependencies) @@ -148,6 +154,8 @@ WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) MultiThreadedDebugDLL Level3 + global.h + Use gdiplus.lib;msimg32.lib;shlwapi.lib;comctl32.lib;%(AdditionalDependencies) @@ -163,6 +171,9 @@ + + Create + @@ -179,6 +190,7 @@ + diff --git a/plugins/SendScreenshotPlus/SendSS_10.vcxproj.filters b/plugins/SendScreenshotPlus/SendSS_10.vcxproj.filters index 3747d35c3d..8b1b385dcb 100644 --- a/plugins/SendScreenshotPlus/SendSS_10.vcxproj.filters +++ b/plugins/SendScreenshotPlus/SendSS_10.vcxproj.filters @@ -1,117 +1,118 @@  - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - {2e2953d9-74f5-47c7-a652-0da67d678000} + + {3ce04f12-fd79-4893-ad53-0f2e94ac6d6e} + + + {4fafa889-f721-4d0c-9035-c5e69ee2597a} - - Class Form - - - Class Form + + Source Files - Helper + Source Files - Helper + Source Files - Helper + Source Files - Helper + Source Files - Helper + Source Files - Class Send + Source Files - Class Send + Source Files - Class Send + Source Files - Class Send + Source Files - Class Send + Source Files - Class Send + Source Files - Class Form + Source Files + + + Source Files + + + Source Files - - Class Form - - - Class Form + + Header Files - Helper + Header Files - Helper + Header Files + + + Header Files + + + Header Files - Helper + Header Files - Helper + Header Files - Helper + Header Files - - Resource Files + + Header Files - Class Send + Header Files - Class Send + Header Files - Class Send + Header Files - Class Send + Header Files - Class Send + Header Files - Class Send + Header Files - - Helper + + Header Files - - Helper + + Header Files - - Helper + + Header Files diff --git a/plugins/SendScreenshotPlus/SendSS_11.vcxproj b/plugins/SendScreenshotPlus/SendSS_11.vcxproj index 8ed5209e76..419fd82a13 100644 --- a/plugins/SendScreenshotPlus/SendSS_11.vcxproj +++ b/plugins/SendScreenshotPlus/SendSS_11.vcxproj @@ -78,10 +78,12 @@ ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Level3 Full Size + global.h + Use gdiplus.lib;msimg32.lib;shlwapi.lib;comctl32.lib;%(AdditionalDependencies) @@ -103,10 +105,12 @@ Disabled ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) MultiThreadedDebugDLL Level3 EditAndContinue + global.h + Use gdiplus.lib;msimg32.lib;shlwapi.lib;comctl32.lib;%(AdditionalDependencies) @@ -124,10 +128,12 @@ ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Level3 Full Size + global.h + Use gdiplus.lib;msimg32.lib;shlwapi.lib;comctl32.lib;%(AdditionalDependencies) @@ -149,9 +155,11 @@ Disabled ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) MultiThreadedDebugDLL Level3 + global.h + Use gdiplus.lib;msimg32.lib;shlwapi.lib;comctl32.lib;%(AdditionalDependencies) @@ -167,6 +175,9 @@ + + Create + @@ -183,6 +194,7 @@ + diff --git a/plugins/SendScreenshotPlus/SendSS_11.vcxproj.filters b/plugins/SendScreenshotPlus/SendSS_11.vcxproj.filters index 3747d35c3d..8b1b385dcb 100644 --- a/plugins/SendScreenshotPlus/SendSS_11.vcxproj.filters +++ b/plugins/SendScreenshotPlus/SendSS_11.vcxproj.filters @@ -1,117 +1,118 @@  - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - {2e2953d9-74f5-47c7-a652-0da67d678000} + + {3ce04f12-fd79-4893-ad53-0f2e94ac6d6e} + + + {4fafa889-f721-4d0c-9035-c5e69ee2597a} - - Class Form - - - Class Form + + Source Files - Helper + Source Files - Helper + Source Files - Helper + Source Files - Helper + Source Files - Helper + Source Files - Class Send + Source Files - Class Send + Source Files - Class Send + Source Files - Class Send + Source Files - Class Send + Source Files - Class Send + Source Files - Class Form + Source Files + + + Source Files + + + Source Files - - Class Form - - - Class Form + + Header Files - Helper + Header Files - Helper + Header Files + + + Header Files + + + Header Files - Helper + Header Files - Helper + Header Files - Helper + Header Files - - Resource Files + + Header Files - Class Send + Header Files - Class Send + Header Files - Class Send + Header Files - Class Send + Header Files - Class Send + Header Files - Class Send + Header Files - - Helper + + Header Files - - Helper + + Header Files - - Helper + + Header Files diff --git a/plugins/SendScreenshotPlus/res/resource.rc b/plugins/SendScreenshotPlus/res/resource.rc index a2180c615a..148cda58b2 100644 --- a/plugins/SendScreenshotPlus/res/resource.rc +++ b/plugins/SendScreenshotPlus/res/resource.rc @@ -160,6 +160,12 @@ IDI_PLUG_DESKOFF ICON "ssDeskOff.ico" IDI_PLUG_DESKON ICON "ssDeskOn.ico" IDI_PLUG_DELOFF ICON "ssDelOff.ico" IDI_PLUG_DELON ICON "ssDelOn.ico" +IDI_PLUG_UPDATE ICON "ssUpdate.ico" +IDI_PLUG_OK ICON "ssOk.ico" +IDI_PLUG_CLOSE ICON "ssClose.ico" +IDI_PLUG_APPLY ICON "ssApply.ico" +IDI_PLUG_EDIT ICON "ssEdit.ico" +IDI_PLUG_DOWNARROW ICON "ssDownarrow.ico" ///////////////////////////////////////////////////////////////////////////// // diff --git a/plugins/SendScreenshotPlus/res/ssApply.ico b/plugins/SendScreenshotPlus/res/ssApply.ico new file mode 100644 index 0000000000..a65a8c71f8 Binary files /dev/null and b/plugins/SendScreenshotPlus/res/ssApply.ico differ diff --git a/plugins/SendScreenshotPlus/res/ssClose.ico b/plugins/SendScreenshotPlus/res/ssClose.ico new file mode 100644 index 0000000000..e157cc2af9 Binary files /dev/null and b/plugins/SendScreenshotPlus/res/ssClose.ico differ diff --git a/plugins/SendScreenshotPlus/res/ssDownarrow.ico b/plugins/SendScreenshotPlus/res/ssDownarrow.ico new file mode 100644 index 0000000000..500ad48a9a Binary files /dev/null and b/plugins/SendScreenshotPlus/res/ssDownarrow.ico differ diff --git a/plugins/SendScreenshotPlus/res/ssEdit.ico b/plugins/SendScreenshotPlus/res/ssEdit.ico new file mode 100644 index 0000000000..2dc3c9d8ef Binary files /dev/null and b/plugins/SendScreenshotPlus/res/ssEdit.ico differ diff --git a/plugins/SendScreenshotPlus/res/ssOk.ico b/plugins/SendScreenshotPlus/res/ssOk.ico new file mode 100644 index 0000000000..a6777f6caa Binary files /dev/null and b/plugins/SendScreenshotPlus/res/ssOk.ico differ diff --git a/plugins/SendScreenshotPlus/res/ssUpdate.ico b/plugins/SendScreenshotPlus/res/ssUpdate.ico new file mode 100644 index 0000000000..1a3ce61b4a Binary files /dev/null and b/plugins/SendScreenshotPlus/res/ssUpdate.ico differ diff --git a/plugins/SendScreenshotPlus/res/version.rc b/plugins/SendScreenshotPlus/res/version.rc index 453bbb1742..5bfbab4754 100644 --- a/plugins/SendScreenshotPlus/res/version.rc +++ b/plugins/SendScreenshotPlus/res/version.rc @@ -1,42 +1,38 @@ +// Microsoft Visual C++ generated resource script. +// #ifdef APSTUDIO_INVOKED #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED -#include // include for version info constants +#include "afxres.h" #include "..\src\version.h" -// -// TO CHANGE VERSION INFORMATION, EDIT PROJECT OPTIONS... -// VS_VERSION_INFO VERSIONINFO - FILEVERSION __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM - PRODUCTVERSION __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM - FILEFLAGSMASK 0x3fL + FILEVERSION __FILEVERSION_STRING + PRODUCTVERSION __FILEVERSION_STRING + FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L #else FILEFLAGS 0x0L #endif - FILEOS 0x40004L - FILETYPE 0x1L + FILEOS 0x4L + FILETYPE 0x0L FILESUBTYPE 0x0L BEGIN - BLOCK "StringFileInfo" + BLOCK "StringFileInfo" BEGIN - BLOCK "040904E4" - BEGIN - VALUE "CompanyName", "" - VALUE "FileVersion", __VERSION_STRING_DOT - VALUE "FileDescription", __DESC - VALUE "InternalName", __PLUGIN_NAME - VALUE "LegalCopyright", __COPYRIGHT - VALUE "OriginalFilename", __FILENAME - VALUE "ProductName", __PLUGIN_NAME - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0409, 1252 - END + BLOCK "000004b0" + BEGIN + VALUE "FileDescription", __DESCRIPTION + VALUE "InternalName", __PLUGIN_NAME + VALUE "LegalCopyright", __COPYRIGHT + VALUE "OriginalFilename", __FILENAME + VALUE "ProductName", __PLUGIN_NAME + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END END - diff --git a/plugins/SendScreenshotPlus/src/CSend.cpp b/plugins/SendScreenshotPlus/src/CSend.cpp index 9c7a867fa7..cd874e152e 100644 --- a/plugins/SendScreenshotPlus/src/CSend.cpp +++ b/plugins/SendScreenshotPlus/src/CSend.cpp @@ -24,7 +24,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "CSend.h" +#include "global.h" //--------------------------------------------------------------------------- CSend::CSend(HWND Owner, HANDLE hContact, bool bFreeOnExit) { diff --git a/plugins/SendScreenshotPlus/src/CSend.h b/plugins/SendScreenshotPlus/src/CSend.h index 12e12e2374..da8cb16cac 100644 --- a/plugins/SendScreenshotPlus/src/CSend.h +++ b/plugins/SendScreenshotPlus/src/CSend.h @@ -27,12 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef _CSEND_H #define _CSEND_H -//--------------------------------------------------------------------------- -#include "global.h" -#include "Utils.h" -#include "dlg_msgbox.h" - - //--------------------------------------------------------------------------- #define SS_AUTOSEND 1 #define SS_DELETEAFTERSSEND 2 diff --git a/plugins/SendScreenshotPlus/src/CSendEmail.cpp b/plugins/SendScreenshotPlus/src/CSendEmail.cpp index 699e037500..f2988e4c4f 100644 --- a/plugins/SendScreenshotPlus/src/CSendEmail.cpp +++ b/plugins/SendScreenshotPlus/src/CSendEmail.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ //--------------------------------------------------------------------------- -#include "CSendEmail.h" +#include "global.h" //--------------------------------------------------------------------------- CSendEmail::CSendEmail(HWND Owner, HANDLE hContact, bool bFreeOnExit) diff --git a/plugins/SendScreenshotPlus/src/CSendEmail.h b/plugins/SendScreenshotPlus/src/CSendEmail.h index 1ec453b307..4decd8bc77 100644 --- a/plugins/SendScreenshotPlus/src/CSendEmail.h +++ b/plugins/SendScreenshotPlus/src/CSendEmail.h @@ -27,11 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef _CSEND_EMAIL_H #define _CSEND_EMAIL_H -//--------------------------------------------------------------------------- -#include "global.h" -#include "CSend.h" -#include - //--------------------------------------------------------------------------- class CSendEmail : public CSend { public: diff --git a/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp b/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp index 76dd061393..6048da9c4b 100644 --- a/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp +++ b/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ //--------------------------------------------------------------------------- -#include "CSendFTPFile.h" +#include "global.h" //--------------------------------------------------------------------------- diff --git a/plugins/SendScreenshotPlus/src/CSendFTPFile.h b/plugins/SendScreenshotPlus/src/CSendFTPFile.h index f1215501b6..d9c890fd4d 100644 --- a/plugins/SendScreenshotPlus/src/CSendFTPFile.h +++ b/plugins/SendScreenshotPlus/src/CSendFTPFile.h @@ -27,10 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef _CSEND_FTP_FILE_H #define _CSEND_FTP_FILE_H -//--------------------------------------------------------------------------- -#include "global.h" -#include "CSend.h" - //--------------------------------------------------------------------------- class CSendFTPFile : public CSend { public: diff --git a/plugins/SendScreenshotPlus/src/CSendFile.cpp b/plugins/SendScreenshotPlus/src/CSendFile.cpp index 8eca99132c..7c06b7c866 100644 --- a/plugins/SendScreenshotPlus/src/CSendFile.cpp +++ b/plugins/SendScreenshotPlus/src/CSendFile.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ //--------------------------------------------------------------------------- -#include "CSendFile.h" +#include "global.h" //--------------------------------------------------------------------------- CSendFile::CSendFile(HWND Owner, HANDLE hContact, bool bFreeOnExit) diff --git a/plugins/SendScreenshotPlus/src/CSendFile.h b/plugins/SendScreenshotPlus/src/CSendFile.h index 88225c6827..27ab2a787f 100644 --- a/plugins/SendScreenshotPlus/src/CSendFile.h +++ b/plugins/SendScreenshotPlus/src/CSendFile.h @@ -27,10 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef _CSEND_FILE_H #define _CSEND_FILE_H -//--------------------------------------------------------------------------- -#include "global.h" -#include "CSend.h" - //--------------------------------------------------------------------------- class CSendFile : public CSend { public: diff --git a/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp index 0a484b0361..bd8a543d05 100644 --- a/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp +++ b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp @@ -25,7 +25,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ //--------------------------------------------------------------------------- -#include "CSendHTTPServer.h" +#include "global.h" + INT_PTR (*g_MirCallService)(const char *, WPARAM, LPARAM)=NULL; //INT_PTR (*CallService)(const char *,WPARAM,LPARAM); diff --git a/plugins/SendScreenshotPlus/src/CSendHTTPServer.h b/plugins/SendScreenshotPlus/src/CSendHTTPServer.h index 85f6545c83..e4008e152e 100644 --- a/plugins/SendScreenshotPlus/src/CSendHTTPServer.h +++ b/plugins/SendScreenshotPlus/src/CSendHTTPServer.h @@ -27,10 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef _CSEND_HTTP_SERVER_H #define _CSEND_HTTP_SERVER_H -//--------------------------------------------------------------------------- -#include "global.h" -#include "CSend.h" - //--------------------------------------------------------------------------- class CSendHTTPServer : public CSend { public: diff --git a/plugins/SendScreenshotPlus/src/CSendImageShack.cpp b/plugins/SendScreenshotPlus/src/CSendImageShack.cpp index bc08c2b8c2..1985c1d31d 100644 --- a/plugins/SendScreenshotPlus/src/CSendImageShack.cpp +++ b/plugins/SendScreenshotPlus/src/CSendImageShack.cpp @@ -25,12 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ //--------------------------------------------------------------------------- -#include -#include -#include - -#include "CSendImageShack.h" -#include "DevKey.h" +#include "global.h" //--------------------------------------------------------------------------- CSendImageShack::CSendImageShack(HWND Owner, HANDLE hContact, bool bFreeOnExit) diff --git a/plugins/SendScreenshotPlus/src/CSendImageShack.h b/plugins/SendScreenshotPlus/src/CSendImageShack.h index 57377b0b95..d5343c711a 100644 --- a/plugins/SendScreenshotPlus/src/CSendImageShack.h +++ b/plugins/SendScreenshotPlus/src/CSendImageShack.h @@ -27,11 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef _CSEND_IMAGESHACK_H #define _CSEND_IMAGESHACK_H -//--------------------------------------------------------------------------- -#include "global.h" -#include "Utils.h" -#include "CSend.h" - //--------------------------------------------------------------------------- class CSendImageShack : public CSend { public: diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp index ec9dbc30f9..2a7c4912e1 100644 --- a/plugins/SendScreenshotPlus/src/Main.cpp +++ b/plugins/SendScreenshotPlus/src/Main.cpp @@ -24,8 +24,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -//--------------------------------------------------------------------------- -#include "main.h" +#include "global.h" // Prototypes /////////////////////////////////////////////////////////////////////////// //LIST_INTERFACE li; @@ -38,16 +37,16 @@ int hLangpack; //Information gathered by Miranda, displayed in the plugin pane of the Option Dialog PLUGININFOEX pluginInfo={ sizeof(PLUGININFOEX), - __PLUGIN_NAME, // altered here and on file listing, so as not to match original + __PLUGIN_NAME, PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), - __DESC, + __DESCRIPTION, __AUTHOR, __AUTHOREMAIL, __COPYRIGHT, __AUTHORWEB, - UNICODE_AWARE, //doesn't replace anything built-in - // {ED39AF7C-BECD-404e-9499-4D04F711B9CB} - { 0xed39af7c, 0xbecd, 0x404e, { 0x94, 0x99, 0x4d, 0x04, 0xf7, 0x11, 0xb9, 0xcb } } + UNICODE_AWARE, + // {ED39AF7C-BECD-404E-9499-4D04F711B9CB} + {0xed39af7c, 0xbecd, 0x404e, {0x94, 0x99, 0x4d, 0x04, 0xf7, 0x11, 0xb9, 0xcb}} }; //static char szSendSS[]=SZ_SENDSS; @@ -69,11 +68,9 @@ HANDLE hhook_SystemPShutdown=0; /*--------------------------------------------------------------------------- * DLL entry point - Required to store the instance handle */ -extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ hInst = hinstDLL; - // Freeing some unneeded resources - DisableThreadLibraryCalls(GetModuleHandle(_T("sendss.dll"))); - return TRUE; } @@ -82,8 +79,8 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvRe * It only returns the PLUGININFO structure, without any test on the version * @param mirandaVersion The version of the application calling this function */ -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { - myGlobals.mirandaVersion = mirandaVersion; +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +{ return &pluginInfo; } @@ -92,7 +89,8 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda * Initializes the services provided and the link to those needed * Called when the plugin is loaded into Miranda */ -extern "C" int __declspec(dllexport) Load(void) { +extern "C" int __declspec(dllexport) Load(void) +{ mir_getLP(&pluginInfo); INT_PTR result = CallService(MS_IMG_GETINTERFACE, FI_IF_VERSION, (LPARAM)&FIP); @@ -115,7 +113,8 @@ extern "C" int __declspec(dllexport) Load(void) { return 0; } -int hook_ModulesLoaded(WPARAM, LPARAM) { +int hook_ModulesLoaded(WPARAM, LPARAM) +{ myGlobals.PopUpExist = ServiceExists(MS_POPUP_ADDPOPUP); myGlobals.PopUpActionsExist = ServiceExists(MS_POPUP_REGISTERACTIONS); @@ -144,7 +143,8 @@ int hook_ModulesLoaded(WPARAM, LPARAM) { * Prepare the plugin to stop * Called by Miranda when it will exit or when the plugin gets deselected */ -extern "C" int __declspec(dllexport) Unload(void) { +extern "C" int __declspec(dllexport) Unload(void) +{ UnhookEvent(hhook_SystemPShutdown); DestroyServiceFunction(MS_SENDSS_OPENDIALOG); @@ -171,7 +171,7 @@ int hook_SystemPShutdown(WPARAM wParam, LPARAM lParam) { HANDLE NetlibInit(void) { NETLIBUSER nlu = {0}; nlu.cbSize = sizeof(nlu); - nlu.szSettingsModule = PLUGNAME; + nlu.szSettingsModule = __PLUGIN_NAME; nlu.ptszDescriptiveName = TranslateT("SendSS HTTP connections"); nlu.flags = NUF_OUTGOING|NUF_HTTPCONNS|NUF_TCHAR; //|NUF_NOHTTPSOPTION; return hNetlibUser = (HANDLE)CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu); diff --git a/plugins/SendScreenshotPlus/src/Main.h b/plugins/SendScreenshotPlus/src/Main.h index 59d7fd1c2a..a713284617 100644 --- a/plugins/SendScreenshotPlus/src/Main.h +++ b/plugins/SendScreenshotPlus/src/Main.h @@ -28,9 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MainH //--------------------------------------------------------------------------- -#include "global.h" -#include "UMainForm.h" -//#include "UEditForm.h" extern HANDLE hNetlibUser; diff --git a/plugins/SendScreenshotPlus/src/UAboutForm.cpp b/plugins/SendScreenshotPlus/src/UAboutForm.cpp index edcaaedfe5..d24a395575 100644 --- a/plugins/SendScreenshotPlus/src/UAboutForm.cpp +++ b/plugins/SendScreenshotPlus/src/UAboutForm.cpp @@ -24,7 +24,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "UAboutForm.h" +#include "global.h" //--------------------------------------------------------------------------- TfrmAbout::CHandleMapping TfrmAbout::_HandleMapping; @@ -85,7 +85,7 @@ LRESULT TfrmAbout::wmInitdialog(WPARAM wParam, LPARAM lParam) { LPTSTR pszTitle = NULL; // Headerbar LPTSTR pszPlug = mir_a2t(__PLUGIN_NAME); - LPTSTR pszVer = mir_a2t(__VERSION_STRING_DOT); + LPTSTR pszVer = mir_a2t(__VERSION_STRING); GetDlgItemText( m_hWnd, IDC_HEADERBAR, oldTitle, SIZEOF( oldTitle )); mir_sntprintf( newTitle, SIZEOF(newTitle), oldTitle, pszPlug, pszVer ); mir_freeAndNil(pszPlug); diff --git a/plugins/SendScreenshotPlus/src/UAboutForm.h b/plugins/SendScreenshotPlus/src/UAboutForm.h index c93b34c7b7..2e0042ac21 100644 --- a/plugins/SendScreenshotPlus/src/UAboutForm.h +++ b/plugins/SendScreenshotPlus/src/UAboutForm.h @@ -26,8 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef UAboutFormH #define UAboutFormH -//--------------------------------------------------------------------------- -#include "global.h" //--------------------------------------------------------------------------- class TfrmAbout{ diff --git a/plugins/SendScreenshotPlus/src/UMainForm.cpp b/plugins/SendScreenshotPlus/src/UMainForm.cpp index 8a4ab3587d..ecfb61b2e2 100644 --- a/plugins/SendScreenshotPlus/src/UMainForm.cpp +++ b/plugins/SendScreenshotPlus/src/UMainForm.cpp @@ -24,9 +24,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "UMainForm.h" -#include "UAboutForm.h" -//#include "UEditForm.h" +#include "global.h" //--------------------------------------------------------------------------- INT_PTR CALLBACK TfrmMain::DlgProc_CaptureWindow(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -354,7 +352,7 @@ LRESULT TfrmMain::wmInitdialog(WPARAM wParam, LPARAM lParam) { if (hCtrl = GetDlgItem(m_hWnd, ID_btnCapture)) { SendDlgItemMessage(m_hWnd, ID_btnCapture, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Capture"), MBF_TCHAR); - HICON hIcon = IcoLib_GetIcon(ICO_BTN_OK); + HICON hIcon = IcoLib_GetIcon(ICO_PLUG_OK); SendMessage(hCtrl, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon); SetWindowText(hCtrl, TranslateT("&Capture")); SendMessage(hCtrl, BUTTONSETDEFAULT, (WPARAM)1, NULL); diff --git a/plugins/SendScreenshotPlus/src/UMainForm.h b/plugins/SendScreenshotPlus/src/UMainForm.h index c56c5d7a99..92a2bdff47 100644 --- a/plugins/SendScreenshotPlus/src/UMainForm.h +++ b/plugins/SendScreenshotPlus/src/UMainForm.h @@ -26,15 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef UMainFormH #define UMainFormH -//--------------------------------------------------------------------------- -#include "global.h" -#include "Utils.h" -#include "CSend.h" -#include "CSendFile.h" -#include "CSendImageShack.h" -#include "CSendHTTPServer.h" -#include "CSendFTPFile.h" -#include "CSendEmail.h" #define SS_JUSTSAVE 0 #define SS_FILESEND 1 diff --git a/plugins/SendScreenshotPlus/src/Utils.cpp b/plugins/SendScreenshotPlus/src/Utils.cpp index 626cb0ce91..70eb7a11df 100644 --- a/plugins/SendScreenshotPlus/src/Utils.cpp +++ b/plugins/SendScreenshotPlus/src/Utils.cpp @@ -24,23 +24,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "Utils.h" - -//--------------------------------------------------------------------------- -extern HINSTANCE hInst; - -//--------------------------------------------------------------------------- -//Workaround for MS bug ComboBox_SelectItemData -int ComboBox_SelectItemData(HWND hwndCtl, int indexStart, LPARAM data) { - int i = 0; - for ( i ; i < ComboBox_GetCount(hwndCtl); i++) { - if(data == ComboBox_GetItemData(hwndCtl, i)) { - ComboBox_SetCurSel (hwndCtl,i); - return i; - } - } - return CB_ERR; -} +#include "global.h" //--------------------------------------------------------------------------- // MonitorInfoEnum diff --git a/plugins/SendScreenshotPlus/src/Utils.h b/plugins/SendScreenshotPlus/src/Utils.h index bbc0f2d932..5091bda811 100644 --- a/plugins/SendScreenshotPlus/src/Utils.h +++ b/plugins/SendScreenshotPlus/src/Utils.h @@ -27,9 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef UTILSH #define UTILSH -#include "global.h" -//#include -//#include #define SPP_USERPANE 1 extern FI_INTERFACE *FIP; @@ -45,8 +42,6 @@ extern HWND g_hCapture; extern HBITMAP g_hBitmap, g_hbmMask; //--------------------------------------------------------------------------- -int ComboBox_SelectItemData(HWND hwndCtl, int indexStart, LPARAM data); - size_t MonitorInfoEnum(MONITORINFOEX* & myMonitors, RECT & virtualScreen); BOOL CALLBACK MonitorInfoEnumProc(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData); diff --git a/plugins/SendScreenshotPlus/src/ctrl_button.cpp b/plugins/SendScreenshotPlus/src/ctrl_button.cpp index ad8e542fa3..6bc116dfe1 100644 --- a/plugins/SendScreenshotPlus/src/ctrl_button.cpp +++ b/plugins/SendScreenshotPlus/src/ctrl_button.cpp @@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + #include "global.h" // Used for our own cheap TrackMouseEvent @@ -419,7 +420,7 @@ static LRESULT CALLBACK Button_WndProc(HWND hwndBtn, UINT uMsg, WPARAM wParam, L bct->hFont = (HFONT)GetStockObject(DEFAULT_GUI_FONT); bct->dwStyle = cs->style; if (cs->style & MBS_DOWNARROW) - bct->arrow = IcoLib_GetIcon(ICO_BTN_DOWNARROW); + bct->arrow = IcoLib_GetIcon(ICO_PLUG_DOWNARROW); LoadTheme(bct); SetWindowLongPtr(hwndBtn, 0, (LONG_PTR)bct); if (cs->lpszName) SetWindowText(hwndBtn, cs->lpszName); diff --git a/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp b/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp index e5927051e7..504d83767b 100644 --- a/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp +++ b/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp @@ -21,7 +21,7 @@ aLONG with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "dlg_msgbox.h" +#include "global.h" typedef struct _MSGPOPUPDATA { @@ -116,7 +116,7 @@ void MakePopupAction(POPUPACTION &pa, INT id) { case IDOK: { - pa.lchIcon = IcoLib_GetIcon(ICO_BTN_OK); + pa.lchIcon = IcoLib_GetIcon(ICO_PLUG_OK); mir_strcpy(pa.lpzTitle, MODNAME"/Ok"); } break; @@ -124,63 +124,63 @@ void MakePopupAction(POPUPACTION &pa, INT id) case IDCLOSE: case IDCANCEL: { - pa.lchIcon = IcoLib_GetIcon(ICO_BTN_CANCEL); + pa.lchIcon = IcoLib_GetIcon(ICO_PLUG_CANCEL); mir_strcpy(pa.lpzTitle, MODNAME"/Cancel"); } break; case IDABORT: { - pa.lchIcon = IcoLib_GetIcon(ICO_BTN_CANCEL); + pa.lchIcon = IcoLib_GetIcon(ICO_PLUG_CANCEL); mir_strcpy(pa.lpzTitle, MODNAME"/Abort"); } break; case IDRETRY: { - pa.lchIcon = IcoLib_GetIcon(ICO_BTN_UPDATE); + pa.lchIcon = IcoLib_GetIcon(ICO_PLUG_UPDATE); mir_strcpy(pa.lpzTitle, MODNAME"/Retry"); } break; case IDIGNORE: { - pa.lchIcon = IcoLib_GetIcon(ICO_BTN_OK); + pa.lchIcon = IcoLib_GetIcon(ICO_PLUG_OK); mir_strcpy(pa.lpzTitle, MODNAME"/Ignore"); } break; case IDYES: { - pa.lchIcon = IcoLib_GetIcon(ICO_BTN_OK); + pa.lchIcon = IcoLib_GetIcon(ICO_PLUG_OK); mir_strcpy(pa.lpzTitle, MODNAME"/Yes"); } break; case IDNO: { - pa.lchIcon = IcoLib_GetIcon(ICO_BTN_CANCEL); + pa.lchIcon = IcoLib_GetIcon(ICO_PLUG_CANCEL); mir_strcpy(pa.lpzTitle, MODNAME"/No"); } break; case IDHELP: { - pa.lchIcon = IcoLib_GetIcon(ICO_BTN_CANCEL); + pa.lchIcon = IcoLib_GetIcon(ICO_PLUG_CANCEL); mir_strcpy(pa.lpzTitle, MODNAME"/Help"); } break; case IDALL: { - pa.lchIcon = IcoLib_GetIcon(ICO_BTN_OK); + pa.lchIcon = IcoLib_GetIcon(ICO_PLUG_OK); mir_strcpy(pa.lpzTitle, MODNAME"/All"); } break; case IDNONE: { - pa.lchIcon = IcoLib_GetIcon(ICO_BTN_CANCEL); + pa.lchIcon = IcoLib_GetIcon(ICO_PLUG_CANCEL); mir_strcpy(pa.lpzTitle, MODNAME"/None"); } } diff --git a/plugins/SendScreenshotPlus/src/dlg_msgbox.h b/plugins/SendScreenshotPlus/src/dlg_msgbox.h index 9376f6c2a8..4e9078d966 100644 --- a/plugins/SendScreenshotPlus/src/dlg_msgbox.h +++ b/plugins/SendScreenshotPlus/src/dlg_msgbox.h @@ -24,9 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef _DLG_MSGBOX #define _DLG_MSGBOX 1 -//--------------------------------------------------------------------------- -#include "global.h" - //--------------------------------------------------------------------------- #define SET_POPUPMSGBOX "PopupMsgBox" #define DEFVAL_POPUPMSGBOX TRUE //FALSE diff --git a/plugins/SendScreenshotPlus/src/global.h b/plugins/SendScreenshotPlus/src/global.h index 5980908922..66ee29e4a2 100644 --- a/plugins/SendScreenshotPlus/src/global.h +++ b/plugins/SendScreenshotPlus/src/global.h @@ -1,5 +1,4 @@ /* - Miranda IM: the free IM client for Microsoft* Windows* Copyright 2000-2009 Miranda ICQ/IM project, @@ -31,72 +30,60 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define _WIN32_WINNT 0x0700 #define _WIN32_IE 0x0601 +#define _CRT_SECURE_NO_WARNINGS #define OEMRESOURCE -#define MIRANDA_VER 0x0A00 -// Windows includes #include #include - -// Standard includes -#include -//#include #include -#include -#include #include -#include -#include -#include #include -#include #include +#include +#include +#include using namespace std; -// Miranda NG SDK includes #include #include #include -#include // This must be included first -#include +#include #include #include #include #include #include -#include #include #include -#include #include -#include -#include #include -#include #include -#include #include +#include -// plugins SDK #include #include #include #include -#include "icons.h" //from uiex icon pack +#include -// Project resources -#include "m_sendss.h" #include "mir_string.h" #include "mir_icolib.h" #include "ctrl_button.h" #include "dlg_msgbox.h" #include "resource.h" #include "version.h" - -#ifdef ComboBox_SelectItemData - // use Workaround for MS bug ComboBox_SelectItemData; - #undef ComboBox_SelectItemData -#endif +#include "main.h" +#include "CSend.h" +#include "CSendEmail.h" +#include "CSendFile.h" +#include "CSendFTPFile.h" +#include "CSendHTTPServer.h" +#include "CSendImageShack.h" +#include "DevKey.h" +#include "UMainForm.h" +#include "UAboutForm.h" +#include "Utils.h" #define UM_CLOSING WM_USER+1 #define UM_EVENT WM_USER+2 diff --git a/plugins/SendScreenshotPlus/src/icons.h b/plugins/SendScreenshotPlus/src/icons.h deleted file mode 100644 index 46871836bd..0000000000 --- a/plugins/SendScreenshotPlus/src/icons.h +++ /dev/null @@ -1,112 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by uinfoex_icons.rc -// -#define IDI_FIRST_ICON 101 - -// dialog inforbar -#define IDI_DLG_DETAILS 101 -#define IDI_DLG_PHONE 102 -#define IDI_DLG_EMAIL 103 - -// dialog infobar & buttons -#define IDI_ANNIVERSARY 104 -#define IDI_EXPORT 105 -#define IDI_IMPORT 106 -#define IDI_SEARCH 107 - -// common icons of details dialog pages -#define IDI_MIRANDA 108 -#define IDI_PASSWORD 109 -#define IDI_FEMALE 110 -#define IDI_MALE 111 -#define IDI_CLOCK 112 -#define IDI_MARITAL 113 - -// commonly used buttons -#define IDI_BTN_UPDATE 114 -#define IDI_BTN_OK 115 -#define IDI_BTN_CLOSE 116 -#define IDI_BTN_APPLY 117 -#define IDI_BTN_GOTO 118 -#define IDI_BTN_PHONE 119 -#define IDI_BTN_FAX 120 -#define IDI_BTN_CELLULAR 121 -#define IDI_BTN_CUSTOMPHONE 122 -#define IDI_BTN_EMAIL 123 -#define IDI_BTN_DOWNARROW 124 -#define IDI_BTN_ADD 125 -#define IDI_BTN_EDIT 126 -#define IDI_BTN_DELETE 127 -#define IDI_BTN_EXIMPORT 128 -#define IDI_BTN_BIRTHDAY_BACKUP 129 - -// details treeview icons -#define IDI_TREE_GENERAL 130 -#define IDI_TREE_ADVANCED 131 -#define IDI_TREE_COMPANY 132 -#define IDI_TREE_CONTACT 133 -#define IDI_TREE_ABOUT 134 -#define IDI_TREE_PHOTO 135 -#define IDI_TREE_ADDRESS 136 -#define IDI_TREE_NOTES 137 -#define IDI_TREE_PROFILE 138 - -// export: choose modules -#define IDI_LST_MODULES 139 -#define IDI_LST_FOLDER 140 - -// zodiac icons -#define IDI_ZOD_AQUARIUS 141 -#define IDI_ZOD_ARIES 142 -#define IDI_ZOD_CANCER 143 -#define IDI_ZOD_CAPRICORN 144 -#define IDI_ZOD_GEMINI 145 -#define IDI_ZOD_LEO 146 -#define IDI_ZOD_LIBRA 147 -#define IDI_ZOD_PISCES 148 -#define IDI_ZOD_SAGITTARIUS 149 -#define IDI_ZOD_SCORPIO 150 -#define IDI_ZOD_TAURUS 151 -#define IDI_ZOD_VIRGO 152 - -// reminder -#define IDI_BIRTHDAY 153 -#define IDI_RMD_DTB0 154 -#define IDI_RMD_DTB1 155 -#define IDI_RMD_DTB2 156 -#define IDI_RMD_DTB3 157 -#define IDI_RMD_DTB4 158 -#define IDI_RMD_DTB5 159 -#define IDI_RMD_DTB6 160 -#define IDI_RMD_DTB7 161 -#define IDI_RMD_DTB8 162 -#define IDI_RMD_DTB9 163 -#define IDI_RMD_DTBX 164 -#define IDI_RMD_DTA0 165 -#define IDI_RMD_DTA1 166 -#define IDI_RMD_DTA2 167 -#define IDI_RMD_DTA3 168 -#define IDI_RMD_DTA4 169 -#define IDI_RMD_DTA5 170 -#define IDI_RMD_DTA6 171 -#define IDI_RMD_DTA7 172 -#define IDI_RMD_DTA8 173 -#define IDI_RMD_DTA9 174 -#define IDI_RMD_DTAX 175 - -#define IDI_LASTICON 175 - -// version text -#define IDS_ICOPACKVERSION 1001 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 1002 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/plugins/SendScreenshotPlus/src/mir_icolib.cpp b/plugins/SendScreenshotPlus/src/mir_icolib.cpp index 5082fc80b8..9f23ba5f1a 100644 --- a/plugins/SendScreenshotPlus/src/mir_icolib.cpp +++ b/plugins/SendScreenshotPlus/src/mir_icolib.cpp @@ -32,7 +32,6 @@ typedef struct _ICODESC LPSTR pszName; LPSTR pszDesc; LPSTR pszSection; - BOOL bfromIconPack; WORD idResource; BYTE size; } ICODESC; @@ -43,111 +42,34 @@ HICON ghDefIcon = NULL; static ICODESC icoDesc[] = { // common - { ICO_PLUG_SSWINDOW1, "Screenshot Icon1", SECT_COMMON, 0, IDI_PLUG_MAIN, -1 }, - { ICO_PLUG_SSWINDOW2, "Screenshot Icon2", SECT_COMMON, 0, IDI_PLUG_ICON1, 0 }, - { ICO_PLUG_SSTARGET, "Target Cursor", SECT_COMMON, 0, IDI_PLUG_ICON2, 1 }, - { ICO_PLUG_SSMONITOR, "Target Desktop", SECT_COMMON, 0, IDI_PLUG_ICON3, 1 }, - { ICO_PLUG_SSDEFAULT, "Default", SECT_COMMON, 0, IDI_PLUG_DEFAULT, 0 }, + { ICO_PLUG_SSWINDOW1, "Screenshot Icon1", SECT_COMMON, IDI_PLUG_MAIN, -1 }, + { ICO_PLUG_SSWINDOW2, "Screenshot Icon2", SECT_COMMON, IDI_PLUG_ICON1, 0 }, + { ICO_PLUG_SSTARGET, "Target Cursor", SECT_COMMON, IDI_PLUG_ICON2, 1 }, + { ICO_PLUG_SSMONITOR, "Target Desktop", SECT_COMMON, IDI_PLUG_ICON3, 1 }, + { ICO_PLUG_SSDEFAULT, "Default", SECT_COMMON, IDI_PLUG_DEFAULT, 0 }, // overlays - { ICO_PLUG_OVERLAYON, "overlay on", SECT_OVERLAY, 0, IDI_PLUG_OVERLAYON, 0 }, - { ICO_PLUG_OVERLAYOFF, "overlay off", SECT_OVERLAY, 0, IDI_PLUG_OVERLAYOFF,0 }, - - // dialogs -// { ICO_DLG_DETAILS, "Details Infobar", SECT_DLG, 1, IDI_DLG_DETAILS, 48 }, -// { ICO_DLG_PHONE, "Phone Infobar", SECT_DLG, 1, IDI_DLG_PHONE, 1 }, -// { ICO_DLG_EMAIL, "E-Mail Infobar", SECT_DLG, 1, IDI_DLG_EMAIL, 1 }, + { ICO_PLUG_OVERLAYON, "overlay on", SECT_OVERLAY, IDI_PLUG_OVERLAYON, 0 }, + { ICO_PLUG_OVERLAYOFF, "overlay off", SECT_OVERLAY, IDI_PLUG_OVERLAYOFF,0 }, // button icons - { ICO_PLUG_SSHELP, "Help", SECT_BUTTONS, 0, IDI_PLUG_HELP, 0 }, - { ICO_PLUG_SSFOLDERO, "Open Folder", SECT_BUTTONS, 0, IDI_PLUG_FOLDERO, 0 }, - { ICO_PLUG_SSDESKOFF, "description off", SECT_BUTTONS, 0, IDI_PLUG_DESKOFF, 0 }, - { ICO_PLUG_SSDESKON, "description on", SECT_BUTTONS, 0, IDI_PLUG_DESKON, 0 }, - { ICO_PLUG_SSDELOFF, "delete off", SECT_BUTTONS, 0, IDI_PLUG_DELOFF, 0 }, - { ICO_PLUG_SSDELON, "delete on", SECT_BUTTONS, 0, IDI_PLUG_DELON, 0 }, - { ICO_PLUG_ARROWL, "Prev", SECT_BUTTONS, 0, IDI_PLUG_ARROWL, 0 }, - { ICO_PLUG_ARROWR, "Next", SECT_BUTTONS, 0, IDI_PLUG_ARROWR, 0 }, - - { ICO_BTN_UPDATE, "Update", SECT_BUTTONS, 1, IDI_BTN_UPDATE, 0 }, - { ICO_BTN_OK, "Ok", SECT_BUTTONS, 1, IDI_BTN_OK, 0 }, - { ICO_BTN_CANCEL, "Cancel", SECT_BUTTONS, 1, IDI_BTN_CLOSE, 0 }, - { ICO_BTN_APPLY, "Apply", SECT_BUTTONS, 1, IDI_BTN_APPLY, 0 }, -// { ICO_BTN_GOTO, "Goto", SECT_BUTTONS, 1, IDI_BTN_GOTO, 0 }, -// { ICO_BTN_EMAIL, "e-mail", SECT_BUTTONS, 1, IDI_BTN_EMAIL, 0 }, -// { ICO_BTN_DOWNARROW, "Down arrow", SECT_BUTTONS, 1, IDI_BTN_DOWNARROW, 0 }, -// { ICO_BTN_ADD, "Add", SECT_BUTTONS, 1, IDI_BTN_ADD, 0 }, - { ICO_BTN_EDIT, "Edit", SECT_BUTTONS, 1, IDI_BTN_EDIT, 0 }, -// { ICO_BTN_DELETE, "Delete", SECT_BUTTONS, 1, IDI_BTN_DELETE, 0 }, -// { ICO_BTN_SEARCH, "Search", SECT_BUTTONS, 1, IDI_SEARCH, 0 }, -// { ICO_BTN_YES, "Yes", SECT_BUTTONS, 1, IDI_BTN_YES, 0 }, -// { ICO_BTN_NO, "No", SECT_BUTTONS, 1, IDI_BTN_NO, 0 }, -// { ICO_BTN_IGNORE, "Ignore", SECT_BUTTONS, 1, IDI_BTN_IGNORE, 0 }, - + { ICO_PLUG_SSHELP, "Help", SECT_BUTTONS, IDI_PLUG_HELP, 0 }, + { ICO_PLUG_SSFOLDERO, "Open Folder", SECT_BUTTONS, IDI_PLUG_FOLDERO, 0 }, + { ICO_PLUG_SSDESKOFF, "description off", SECT_BUTTONS, IDI_PLUG_DESKOFF, 0 }, + { ICO_PLUG_SSDESKON, "description on", SECT_BUTTONS, IDI_PLUG_DESKON, 0 }, + { ICO_PLUG_SSDELOFF, "delete off", SECT_BUTTONS, IDI_PLUG_DELOFF, 0 }, + { ICO_PLUG_SSDELON, "delete on", SECT_BUTTONS, IDI_PLUG_DELON, 0 }, + { ICO_PLUG_ARROWL, "Prev", SECT_BUTTONS, IDI_PLUG_ARROWL, 0 }, + { ICO_PLUG_ARROWR, "Next", SECT_BUTTONS, IDI_PLUG_ARROWR, 0 }, + + { ICO_PLUG_UPDATE, "Update", SECT_BUTTONS, IDI_PLUG_UPDATE, 0 }, + { ICO_PLUG_OK, "Ok", SECT_BUTTONS, IDI_PLUG_OK, 0 }, + { ICO_PLUG_CANCEL, "Cancel", SECT_BUTTONS, IDI_PLUG_CLOSE, 0 }, + { ICO_PLUG_APPLY, "Apply", SECT_BUTTONS, IDI_PLUG_APPLY, 0 }, + { ICO_PLUG_EDIT, "Edit", SECT_BUTTONS, IDI_PLUG_EDIT, 0 }, + { ICO_PLUG_DOWNARROW, "Down arrow", SECT_BUTTONS, IDI_PLUG_DOWNARROW, 0 }, }; -/** - * This function finds the default iconpack file and return its path. - * - * @param - none - * - * @return This function returns the relative path to an existing icon pack. - **/ -LPTSTR IcoLib_GetDefaultIconFileName() -{ - static LPTSTR path[] = { - _T("Icons\\uinfoex_icons.dll"), - _T("Plugins\\uinfoex_icons.dll"), - _T("Customize\\Icons\\uinfoex_icons.dll") - }; - TCHAR absolute[MAX_PATH]; - - for (INT i = 0; i < SIZEOF(path); i++) { - PathToAbsoluteT(path[i], absolute); - if ( PathFileExists(absolute)) - return path[i]; - } - return NULL; -} - -/** - * This function checks the version of an iconpack. - * If the icon pack's version differs from the desired one, - * dialog with a warning is displayed. - * - * @param szIconPack - This is the path to the icon pack. - * It can be absolute or relative. - * - * @return nothing - **/ -static VOID IcoLib_CheckIconPackVersion(LPTSTR szIconPack) -{ - //if (DB::Setting::GetByte(SET_ICONS_CHECKFILEVERSION, TRUE)) - if (DBGetContactSettingByte(NULL,MODNAME,SET_ICONS_CHECKFILEVERSION, TRUE)) - { - if (szIconPack) - { - TCHAR szAbsolutePath[MAX_PATH]; - PathToAbsoluteT(szIconPack, szAbsolutePath); - - HMODULE hIconDll = LoadLibrary(szAbsolutePath); - if (hIconDll) { - CHAR szFileVersion[64]; - - if (!LoadStringA(hIconDll, IDS_ICOPACKVERSION, szFileVersion, sizeof(szFileVersion)) || - mir_strcmp(szFileVersion, "__UserInfoEx_IconPack_1.2__")) - { - MsgErr(NULL, LPGENT("Warning: Your current IconPack's version differs from the one UserInfoEx is designed for.\nSome icons may not be displayed correctly")); - } - FreeLibrary(hIconDll); - } - } - else - { - MsgErr(NULL, LPGENT("Warning: No IconPack found in one of the following directories: 'customize\\icons', 'icons' or 'plugins'!")); - } - } -} - /** * Returns a icon, identified by a name * @@ -160,59 +82,6 @@ HICON IcoLib_GetIcon(LPCSTR pszIcon, bool big) return (pszIcon) ? Skin_GetIcon(pszIcon, big) : NULL; } -/** - * Returns a icon, identified by a name - * - * @param hIconItem - this is the pointer to an IconItem structure in icolib. - * - * @return: HICON if the icon is loaded, NULL otherwise - **/ -HICON IcoLib_GetIconByHandle(HANDLE hIconItem, bool big) -{ - return Skin_GetIconByHandle(hIconItem, big); -} - -/** - * Set the icon of each control in the list - * - * @param hDlg - handle to the dialog control, that owns the controls - * @param pCtrl - list to all controls and its icon names - * @param numCtrls - number of elements in the pCtrl list - * - * @return nothing - **/ -VOID IcoLib_SetCtrlIcons(HWND hDlg, const ICONCTRL* pCtrl, BYTE numCtrls) -{ - HICON hIcon; - BYTE i; - HWND hCtrl; - - for (i = 0; i < numCtrls; i++) - { - hIcon = IcoLib_GetIcon(pCtrl[i].pszIcon); - if (pCtrl[i].idCtrl) - { - hCtrl = GetDlgItem(hDlg, pCtrl[i].idCtrl); - switch (pCtrl[i].Message) - { - case STM_SETICON: - case STM_SETIMAGE: - { - ShowWindow(hCtrl, hIcon ? SW_SHOW : SW_HIDE); - } - case BM_SETIMAGE: - { - SendMessage(hCtrl, pCtrl[i].Message, IMAGE_ICON, (LPARAM) hIcon); - } - } - } - else - { - SendMessage(hDlg, pCtrl[i].Message, ICON_BIG, (LPARAM) hIcon); - } - } -} - /** * This function manually registers a single icon from the default icon library. * @@ -268,16 +137,8 @@ static HANDLE IcoLib_RegisterIconHandleEx(LPSTR szIconID, LPSTR szDescription, L } sid.ptszDefaultFile = szDefaultFile; - if (sid.ptszDefaultFile && sid.ptszDefaultFile[0]) { - if(idIcon < IDI_FIRST_ICON || idIcon > IDI_LASTICON) { - // Icon from Plugin.dll - sid.iDefaultIndex = idIcon - IDI_PLUG_MAIN; - } - else{ - //UserinfoEx Icon pack - sid.iDefaultIndex = ICONINDEX(idIcon); - } - } + if (sid.ptszDefaultFile && sid.ptszDefaultFile[0]) + sid.iDefaultIndex = idIcon - IDI_PLUG_MAIN; else { sid.hDefaultIcon = hDefIcon; sid.iDefaultIndex = -1; @@ -289,46 +150,6 @@ static HANDLE IcoLib_RegisterIconHandleEx(LPSTR szIconID, LPSTR szDescription, L return hIconHandle; } -/** -* This function manually registers a single icon from the default icon library. -* -* @param szIconID - This is the uniquely identifying string for an icon. -* This string is the setting name in the database and should -* only use ASCII characters. -* @param szDescription - This is the description displayed in the options dialog. -* @param szSection - This is the subsection, where the icon is organized in the options dialog. -* @param idIcon - This is the ResourceID of the icon in the default file -* @param Size - This is the desired size of the icon to load. -* 0: default size for small icons (16x16) -* 1: default size for normal icons (32x32) -* -* @return This function returns the HANDLE of the icon item. -**/ -HANDLE IcoLib_RegisterIconHandle(LPSTR szIconID, LPSTR szDescription, LPSTR szSection, INT idIcon, INT Size) -{ - return IcoLib_RegisterIconHandleEx(szIconID, szDescription, szSection, IcoLib_GetDefaultIconFileName(), idIcon, Size, ghDefIcon); -} - -/** -* This function manually registers a single icon from the default icon library. -* -* @param szIconID - This is the uniquely identifying string for an icon. -* This string is the setting name in the database and should -* only use ASCII characters. -* @param szDescription - This is the description displayed in the options dialog. -* @param szSection - This is the subsection, where the icon is organized in the options dialog. -* @param idIcon - This is the ResourceID of the icon in the default file -* @param Size - This is the desired size of the icon to load. -* 0: default size for small icons (16x16) -* 1: default size for normal icons (32x32) -* -* @return This function returns the HICON of the icon itself. -**/ -HICON IcoLib_RegisterIcon(LPSTR szIconID, LPSTR szDescription, LPSTR szSection, INT idIcon, INT Size) -{ - return IcoLib_GetIconByHandle(IcoLib_RegisterIconHandle(szIconID, szDescription, szSection, idIcon, Size)); -} - /** * Add default icons to the skin library or load customized icons * @@ -338,14 +159,9 @@ HICON IcoLib_RegisterIcon(LPSTR szIconID, LPSTR szDescription, LPSTR szSection, **/ VOID IcoLib_LoadModule() { - LPTSTR szDefaultFile; LPTSTR szPluginFile; INT_PTR i; - // search for default icon file - szDefaultFile = IcoLib_GetDefaultIconFileName(); - IcoLib_CheckIconPackVersion(szDefaultFile); - szPluginFile = _T("Plugins\\")_T(__FILENAME); // load default icon if required @@ -353,10 +169,6 @@ VOID IcoLib_LoadModule() GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0); for (i = 0; i < SIZEOF(icoDesc); i++) - { - IcoLib_RegisterIconHandleEx( - icoDesc[i].pszName, icoDesc[i].pszDesc, icoDesc[i].pszSection, - icoDesc[i].bfromIconPack ? szDefaultFile : szPluginFile, icoDesc[i].idResource, icoDesc[i].size, ghDefIcon); - } + IcoLib_RegisterIconHandleEx(icoDesc[i].pszName, icoDesc[i].pszDesc, icoDesc[i].pszSection, szPluginFile, icoDesc[i].idResource, icoDesc[i].size, ghDefIcon); } diff --git a/plugins/SendScreenshotPlus/src/mir_icolib.h b/plugins/SendScreenshotPlus/src/mir_icolib.h index b80c014a07..73f1f57872 100644 --- a/plugins/SendScreenshotPlus/src/mir_icolib.h +++ b/plugins/SendScreenshotPlus/src/mir_icolib.h @@ -24,14 +24,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef _UINFOEX_ICONS_H_INCLUDED_ #define _UINFOEX_ICONS_H_INCLUDED_ 1 -#include "m_icolib.h" - // sections #define SECT_COMMON MODNAME -#define SECT_DLG MODNAME"/Dialogs" #define SECT_BUTTONS MODNAME"/Buttons" #define SECT_OVERLAY MODNAME"/overlays" -#define SECT_TOOLBAR "ToolBar" // global toolbar section as used by modern clist // icons #define ICO_PLUG_SSWINDOW1 MODNAME"_plug_SSwindow1" @@ -47,77 +43,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define ICO_PLUG_SSDESKON MODNAME"_plug_SSDeskOn" #define ICO_PLUG_SSDELOFF MODNAME"_plug_SSDelOff" #define ICO_PLUG_SSDELON MODNAME"_plug_SSDelOn" +#define ICO_PLUG_UPDATE MODNAME"_plug_update" +#define ICO_PLUG_OK MODNAME"_plug_ok" +#define ICO_PLUG_CANCEL MODNAME"_plug_cancel" +#define ICO_PLUG_APPLY MODNAME"_plug_apply" +#define ICO_PLUG_EDIT MODNAME"_plug_edit" +#define ICO_PLUG_DOWNARROW MODNAME"_plug_downarrow" #define ICO_PLUG_OVERLAYOFF MODNAME"_plug_SSOverlayOff" #define ICO_PLUG_OVERLAYON MODNAME"_plug_SSOverlayOn" -#define ICO_COMMON_IM MODNAME"_common_im" -#define ICO_COMMON_FEMALE MODNAME"_common_female" -#define ICO_COMMON_MALE MODNAME"_common_male" -#define ICO_COMMON_CLOCK MODNAME"_common_clock" -#define ICO_COMMON_MARITAL MODNAME"_common_marital" -#define ICO_COMMON_PASSWORD MODNAME"_common_password" -#define ICO_COMMON_ADDRESS MODNAME"_common_address" -#define ICO_TREE_DEFAULT MODNAME"_tree_default" #define ICO_DLG_DETAILS MODNAME"_dlg_details" -#define ICO_DLG_PHONE MODNAME"_dlg_phone" -#define ICO_DLG_EMAIL MODNAME"_dlg_email" -#define ICO_DLG_EXPORT MODNAME"_dlg_export" -#define ICO_DLG_IMPORT MODNAME"_dlg_import" -#define ICO_DLG_SEARCH MODNAME"_dlg_search" -#define ICO_LST_MODULES MODNAME"_lst_modules" -#define ICO_LST_FOLDER MODNAME"_lst_folder" -#define ICO_BTN_UPDATE MODNAME"_btn_update" -#define ICO_BTN_OK MODNAME"_btn_ok" -#define ICO_BTN_CANCEL MODNAME"_btn_cancel" -#define ICO_BTN_APPLY MODNAME"_btn_apply" -#define ICO_BTN_GOTO MODNAME"_btn_goto" -#define ICO_BTN_ADD MODNAME"_btn_add" -#define ICO_BTN_EDIT MODNAME"_btn_edit" -#define ICO_BTN_DELETE MODNAME"_btn_delete" -#define ICO_BTN_IMPORT MODNAME"_btn_import" -#define ICO_BTN_EXPORT MODNAME"_btn_export" -#define ICO_BTN_NOTES MODNAME"_btn_notes" -#define ICO_BTN_ABOUT MODNAME"_btn_about" -#define ICO_BTN_PROFILE MODNAME"_btn_profile" -#define ICO_BTN_DOWNARROW MODNAME"_btn_downarrow" -#define ICO_BTN_PHONE MODNAME"_btn_phone" -#define ICO_BTN_FAX MODNAME"_btn_fax" -#define ICO_BTN_CELLULAR MODNAME"_btn_cellular" -#define ICO_BTN_EMAIL MODNAME"_btn_email" -#define ICO_BTN_SEARCH MODNAME"_btn_search" -#define ICO_BTN_YES MODNAME"_btn_yes" -#define ICO_BTN_NO MODNAME"_btn_no" -#define ICO_BTN_IGNORE MODNAME"_btn_ignore" - -#define ICO_RMD_DTB0 MODNAME"_rmd_dtb0" -#define ICO_RMD_DTB1 MODNAME"_rmd_dtb1" -#define ICO_RMD_DTB2 MODNAME"_rmd_dtb2" -#define ICO_RMD_DTB3 MODNAME"_rmd_dtb3" -#define ICO_RMD_DTB4 MODNAME"_rmd_dtb4" -#define ICO_RMD_DTB5 MODNAME"_rmd_dtb5" -#define ICO_RMD_DTB6 MODNAME"_rmd_dtb6" -#define ICO_RMD_DTB7 MODNAME"_rmd_dtb7" -#define ICO_RMD_DTB8 MODNAME"_rmd_dtb8" -#define ICO_RMD_DTB9 MODNAME"_rmd_dtb9" -#define ICO_RMD_DTBX MODNAME"_rmd_dtbx" - -#define ICO_RMD_DTA0 MODNAME"_rmd_dta0" -#define ICO_RMD_DTA1 MODNAME"_rmd_dta1" -#define ICO_RMD_DTA2 MODNAME"_rmd_dta2" -#define ICO_RMD_DTA3 MODNAME"_rmd_dta3" -#define ICO_RMD_DTA4 MODNAME"_rmd_dta4" -#define ICO_RMD_DTA5 MODNAME"_rmd_dta5" -#define ICO_RMD_DTA6 MODNAME"_rmd_dta6" -#define ICO_RMD_DTA7 MODNAME"_rmd_dta7" -#define ICO_RMD_DTA8 MODNAME"_rmd_dta8" -#define ICO_RMD_DTA9 MODNAME"_rmd_dta9" -#define ICO_RMD_DTAX MODNAME"_rmd_dtax" - -#define SET_ICONS_CHECKFILEVERSION "CheckIconPackVersion" -#define SET_ICONS_BUTTONS "ButtonIcons" - -#define ICONINDEX(id) max((min((id), IDI_LASTICON)) - IDI_FIRST_ICON, 0) typedef struct TIconCtrl { @@ -126,13 +62,7 @@ typedef struct TIconCtrl WORD idCtrl; } ICONCTRL, *LPICONCTRL; -LPTSTR IcoLib_GetDefaultIconFileName(); -VOID IcoLib_SetCtrlIcons(HWND hDlg, const ICONCTRL* pCtrl, BYTE numCtrls); - -HANDLE IcoLib_RegisterIconHandle(LPSTR szName, LPSTR szDescription, LPSTR szSection, INT idIcon, INT Size); -HICON IcoLib_RegisterIcon(LPSTR szName, LPSTR szDescription, LPSTR szSection, INT idIcon, INT Size); HICON IcoLib_GetIcon(LPCSTR pszIcon, bool big = false); -HICON IcoLib_GetIconByHandle(HANDLE hIconItem, bool big = false); VOID IcoLib_LoadModule(); diff --git a/plugins/SendScreenshotPlus/src/mir_string.cpp b/plugins/SendScreenshotPlus/src/mir_string.cpp index 607c5f906e..362b09067f 100644 --- a/plugins/SendScreenshotPlus/src/mir_string.cpp +++ b/plugins/SendScreenshotPlus/src/mir_string.cpp @@ -26,7 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "global.h" -#include "mir_string.h" char *mir_strncpy(char *pszDest, const char *pszSrc, const size_t cchDest) { diff --git a/plugins/SendScreenshotPlus/src/resource.h b/plugins/SendScreenshotPlus/src/resource.h index c6f9742fe2..80f7ffe093 100644 --- a/plugins/SendScreenshotPlus/src/resource.h +++ b/plugins/SendScreenshotPlus/src/resource.h @@ -39,6 +39,12 @@ #define IDI_PLUG_DESKON 202 #define IDI_PLUG_DELOFF 203 #define IDI_PLUG_DELON 204 +#define IDI_PLUG_UPDATE 205 +#define IDI_PLUG_OK 206 +#define IDI_PLUG_CLOSE 207 +#define IDI_PLUG_APPLY 208 +#define IDI_PLUG_EDIT 209 +#define IDI_PLUG_DOWNARROW 210 #define IDD_UEditForm 301 #define IDC_CAPTURETAB 1005 #define IDD_MSGBOX 1008 diff --git a/plugins/SendScreenshotPlus/src/stdafx.cpp b/plugins/SendScreenshotPlus/src/stdafx.cpp new file mode 100644 index 0000000000..199436b7ed --- /dev/null +++ b/plugins/SendScreenshotPlus/src/stdafx.cpp @@ -0,0 +1,18 @@ +/* +Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org) + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation version 2 +of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "global.h" \ No newline at end of file diff --git a/plugins/SendScreenshotPlus/src/version.h b/plugins/SendScreenshotPlus/src/version.h index 85f72f59f1..0b1091cb7e 100644 --- a/plugins/SendScreenshotPlus/src/version.h +++ b/plugins/SendScreenshotPlus/src/version.h @@ -1,34 +1,17 @@ -#define PLUGNAME "Send Screenshot+" #define __MAJOR_VERSION 0 #define __MINOR_VERSION 8 #define __RELEASE_NUM 0 #define __BUILD_NUM 0 -#define __STRINGIFY(x) #x -#define __STRINGIFY2(x) __STRINGIFY(x) #define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM -#define __FILEVERSION_STRING_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM - -#define __VERSION_STRING __STRINGIFY2(__FILEVERSION_STRING) -#define __VERSION_STRING_DOT __STRINGIFY2(__FILEVERSION_STRING_DOTS) +#define __TOSTRING(x) #x +#define __VERSION_STRING __TOSTRING(__FILEVERSION_STRING) +#define __PLUGIN_NAME "Send screenshot+" #define __FILENAME "SendSS.dll" -#define __DESC "Take a screenshot and send it to a contact." +#define __DESCRIPTION "Take a screenshot and send it to a contact." #define __AUTHOR "Merlin" #define __AUTHOREMAIL "ing.u.horn@googlemail.com" -#define __COPYRIGHT "© 2010 Merlin, © 2004-2006 Sergio Vieira Rolanski" #define __AUTHORWEB "http://miranda-ng.org/" - - -#define __PLUGIN_NAME "Send Screenshot+" -#define __FLVersionURL "http://miranda-ng.org/" -#define __FLVersionPrefix "SendSS " -#define __FLUpdateURL "http://miranda-ng.org/distr/x32/Plugins/sendss.zip" -#define __BetaUpdateURL "http://miranda-ng.org/distr/x32/Plugins/sendss.zip" - -#define __BetaVersionURL "http://merlins-miranda.googlecode.com/svn/trunk/miranda/plugins/SendSS/changelog.txt" -#define __BetaVersionPrefix "SendSS Plus: " -#define __BetaChangelogURL "http://merlins-miranda.googlecode.com/svn/trunk/miranda/plugins/SendSS/changelog.txt" - -#define __USER_AGENT_STRING __PLUGIN_NAME##" v"##__VERSION_STRING_DOT - +#define __COPYRIGHT "© 2010 Merlin, 2004-2006 Sergio Vieira Rolanski" +#define __USER_AGENT_STRING __PLUGIN_NAME##" v"##__VERSION_STRING -- cgit v1.2.3