added version info

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

8 files changed, 31 insertions, 55 deletions

diff --git a/plugins/ModernOpt/src/Version.h b/plugins/ModernOpt/src/Version.h
new file mode 100644
index 0000000000..1a9e8788f7
--- /dev/null
+++ b/plugins/ModernOpt/src/Version.h
@@ -0,0 +1,14 @@
+#define __MAJOR_VERSION				0

+#define __MINOR_VERSION				1

+#define __RELEASE_NUM				0

+#define __BUILD_NUM					0

+

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+

+#define __PLUGIN_NAME				"ModernOpt"

+#define __FILENAME					"ModernOpt.dll"

+#define __DESCRIPTION 				"Support for new options design."

+#define __AUTHOR					"Victor Pavlychko, George Hazan"

+#define __AUTHOREMAIL				"ghazan@miranda-ng.org"

+#define __AUTHORWEB					"http://miranda-ng.org/"

+#define __COPYRIGHT					"© 2009 Victor Pavlychko, George Hazan"

diff --git a/plugins/ModernOpt/src/commonheaders.h b/plugins/ModernOpt/src/commonheaders.h
index 2d133a802e..2e01b9f39e 100644
--- a/plugins/ModernOpt/src/commonheaders.h
+++ b/plugins/ModernOpt/src/commonheaders.h
@@ -21,59 +21,29 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-// to enable all 0.8.0 core functions

-#define MIRANDA_VER 0x0A00

-

 #define WINVER 0x0501

 #define _WIN32_WINNT 0x0501

 #define _WIN32_IE 0x0501

 

 #define _CRT_SECURE_NO_WARNINGS

-#define CINTERFACE

-

-#include "m_stdhdr.h"

 

 #include <windows.h>

 #include <windowsx.h>

-#include <shlobj.h>

-#include <uxtheme.h>

-#include <commctrl.h>

-#include <stdio.h>

 #include <time.h>

-#include <stddef.h>

-#include <process.h>

-#include <io.h>

-#include <string.h>

-#include <locale.h>

-#include <direct.h>

-#include <win2k.h>

 

+#include <win2k.h>

 #include <newpluginapi.h>

-#include <m_system.h>

-#include <m_system_cpp.h>

 #include <m_database.h>

-#include <m_clc.h>

-#include <m_clui.h>

 #include <m_langpack.h>

-#include <m_clist.h>

 #include <m_clistint.h>

-#include <m_button.h>

-#include <m_protosvc.h>

 #include <m_protomod.h>

-#include <m_protocols.h>

-#include <m_options.h>

 #include <m_skin.h>

-#include <m_contacts.h>

-#include <m_message.h>

 #include <m_userinfo.h>

-#include <m_history.h>

-#include <m_addcontact.h>

-#include <m_findadd.h>

-#include <m_file.h>

-#include <m_email.h>

-#include <m_awaymsg.h>

-#include <m_idle.h>

-#include <m_ignore.h>

-#include <m_icolib.h>

+#include <m_descbutton.h>

+#include <m_iconheader.h>

+#include <m_modernopt.h>

 

 #include "resource.h"

+#include "version.h"

+#include "modernopt.h"

+#include "..\..\..\src\resource.h"

diff --git a/plugins/ModernOpt/src/main.cpp b/plugins/ModernOpt/src/main.cpp
index 4177a82724..52f71b7709 100644
--- a/plugins/ModernOpt/src/main.cpp
+++ b/plugins/ModernOpt/src/main.cpp
@@ -6,18 +6,19 @@ int hLangpack;
 

 PLUGININFOEX pluginInfoEx = {

 	sizeof(PLUGININFOEX),

-	"Support for new options design",

-	PLUGIN_MAKE_VERSION(0,1,0,0),

-	"Support for new options design.",

-	"Victor Pavlychko, George Hazan",

-	"ghazan@miranda-im.org",

-	"é 2009 Victor Pavlychko, George Hazan",

-	"http://miranda-ng.org/",

+	__PLUGIN_NAME,

+	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,

-	{ 0x621f886b, 0xa7f6, 0x457f, { 0x9d, 0x62, 0x8e, 0xe8, 0x4c, 0x27, 0x59, 0x93 }} // {621f886b-a7f6-457f-9d62-8ee84c275993}

+	// {621F886B-A7F6-457F-9D62-8EE84C275993}

+	{0x621f886b, 0xa7f6, 0x457f, {0x9d, 0x62, 0x8e, 0xe8, 0x4c, 0x27, 0x59, 0x93}}

 };

 

-BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)

+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

 {

 	hInst = hinstDLL;

 	return TRUE;

diff --git a/plugins/ModernOpt/src/modernopt.cpp b/plugins/ModernOpt/src/modernopt.cpp
index b8a2937a43..3f5a260687 100644
--- a/plugins/ModernOpt/src/modernopt.cpp
+++ b/plugins/ModernOpt/src/modernopt.cpp
@@ -24,8 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "commonheaders.h"

-#include "modernopt.h"

-#include "../../../src/resource.h"

 

 //#define MOPT_SAMPLE_PAGES

 

diff --git a/plugins/ModernOpt/src/modernopt.h b/plugins/ModernOpt/src/modernopt.h
index 728488d810..2d4f8f8791 100644
--- a/plugins/ModernOpt/src/modernopt.h
+++ b/plugins/ModernOpt/src/modernopt.h
@@ -26,10 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef MODERNOPT_H__

 #define MODERNOPT_H__ 1

 

-#include "m_descbutton.h"

-#include "m_iconheader.h"

-#include "m_modernopt.h"

-

 struct ModernOptMainPageInfo

 {

 	int		idcButton;

diff --git a/plugins/ModernOpt/src/mopt_home.cpp b/plugins/ModernOpt/src/mopt_home.cpp
index 0a74e0b4c5..df3c08d022 100644
--- a/plugins/ModernOpt/src/mopt_home.cpp
+++ b/plugins/ModernOpt/src/mopt_home.cpp
@@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "commonheaders.h"

-#include "modernopt.h"

 

 extern HMODULE hInst;

 

diff --git a/plugins/ModernOpt/src/mopt_ignore.cpp b/plugins/ModernOpt/src/mopt_ignore.cpp
index 9c0e429cae..97805ff4db 100644
--- a/plugins/ModernOpt/src/mopt_ignore.cpp
+++ b/plugins/ModernOpt/src/mopt_ignore.cpp
@@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "commonheaders.h"

-#include "modernopt.h"

 

 static HWND g_hwndModernOptIgnore = NULL;

 

diff --git a/plugins/ModernOpt/src/mopt_selector.cpp b/plugins/ModernOpt/src/mopt_selector.cpp
index 563a6779ef..f29e662a98 100644
--- a/plugins/ModernOpt/src/mopt_selector.cpp
+++ b/plugins/ModernOpt/src/mopt_selector.cpp
@@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "commonheaders.h"

-#include "modernopt.h"

 

 static void sttApplySkin(MODERNOPTOBJECT *obj, TCHAR *fn)

 {