removed not used headers

added version info

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

6 files changed, 48 insertions, 85 deletions

diff --git a/plugins/LangMan/langman_10.vcxproj.filters b/plugins/LangMan/langman_10.vcxproj.filters
index 438fac2d70..6d7cbca488 100644
--- a/plugins/LangMan/langman_10.vcxproj.filters
+++ b/plugins/LangMan/langman_10.vcxproj.filters
@@ -44,11 +44,11 @@
     <ClInclude Include="src\utils.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="src\resource.h">

-      <Filter>Resource Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\version.h">

-      <Filter>Resource Files</Filter>

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\resource.h">

+      <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

diff --git a/plugins/LangMan/langman_11.vcxproj.filters b/plugins/LangMan/langman_11.vcxproj.filters
index 438fac2d70..6d7cbca488 100644
--- a/plugins/LangMan/langman_11.vcxproj.filters
+++ b/plugins/LangMan/langman_11.vcxproj.filters
@@ -44,11 +44,11 @@
     <ClInclude Include="src\utils.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="src\resource.h">

-      <Filter>Resource Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\version.h">

-      <Filter>Resource Files</Filter>

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\resource.h">

+      <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

diff --git a/plugins/LangMan/res/version.rc b/plugins/LangMan/res/version.rc
index 9637c95121..5bfbab4754 100644
--- a/plugins/LangMan/res/version.rc
+++ b/plugins/LangMan/res/version.rc
@@ -1,44 +1,34 @@
+// Microsoft Visual C++ generated resource script.

+//

 #ifdef APSTUDIO_INVOKED

 #error this file is not editable by Microsoft Visual C++

 #endif //APSTUDIO_INVOKED

 

-#include "..\src\version.h"

 #include "afxres.h"

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

 

-///////////////////////////////////////////////////////////////////////////// 

-//                                                                            

-// Version                                                                    

-//                                                                            

-                                                                              

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION FILE_VERSION

- PRODUCTVERSION FILE_VERSION

- FILEFLAGSMASK 0x0L

+ FILEVERSION __FILEVERSION_STRING

+ PRODUCTVERSION __FILEVERSION_STRING

+ FILEFLAGSMASK 0x17L

 #ifdef _DEBUG

  FILEFLAGS 0x1L

 #else

  FILEFLAGS 0x0L

 #endif

- FILEOS 0x40004L

- FILETYPE 0x2L

+ FILEOS 0x4L

+ FILETYPE 0x0L

  FILESUBTYPE 0x0L

 BEGIN

     BLOCK "StringFileInfo"

     BEGIN

         BLOCK "000004b0"

         BEGIN

-            VALUE "Comments", "Licensed under the terms of the GNU General Public License"

-            VALUE "FileDescription", "Language Pack Manager Plugin for Miranda NG"

-            VALUE "FileVersion", FILE_VERSION_STR

-#ifdef _UNICODE

-            VALUE "InternalName", "LangMan (Unicode)"

-#else

-            VALUE "InternalName", "LangMan"

-#endif

-            VALUE "LegalCopyright", "Copyright © 2005-2010 H. Herkenrath"

-            VALUE "OriginalFilename", "langman.dll"

-            VALUE "ProductName", "Language Pack Manager"

-            VALUE "ProductVersion", FILE_VERSION_STR

+            VALUE "FileDescription", __DESCRIPTION

+            VALUE "InternalName", __PLUGIN_NAME

+            VALUE "LegalCopyright", __COPYRIGHT

+            VALUE "OriginalFilename", __FILENAME

+            VALUE "ProductName", __PLUGIN_NAME

         END

     END

     BLOCK "VarFileInfo"

diff --git a/plugins/LangMan/src/common.h b/plugins/LangMan/src/common.h
index 4ac9deb5b5..cc0e8c041f 100644
--- a/plugins/LangMan/src/common.h
+++ b/plugins/LangMan/src/common.h
@@ -21,36 +21,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #define _CRT_SECURE_NO_WARNINGS

 

-#define __RPCASYNC_H__        /* header shows warnings in VS6 */

 #include <windows.h>

-#pragma warning(disable:4201) /* nonstandard extension used : nameless struct/union */

-#include <commctrl.h>

-#pragma warning(default:4201) /* nonstandard extension used : nameless struct/union */

 #include <ShlObj.h>

 #include <vsstyle.h>

 

-#include <tchar.h>

-#include <stdio.h>            /* for mir_snprintf() */

-#include <time.h>             /* for time() */

-

-#define MIRANDA_VER  0x0600

 #include <newpluginapi.h>

-#include <m_system.h>

-#include <m_utils.h>

-#include <m_database.h>

 #include <m_langpack.h>

 #include <m_options.h>

-#include <m_skin.h>

-#include <m_icolib.h>

-#include <m_flags.h>

 #include <m_netlib.h>

 #include <m_clist.h>

 #include <win2k.h>

 

+#include <m_flags.h>

+#include <m_langman.h>

+

 #include "langpack.h"

 #include "options.h"

-//#include "update.h"

-//#include "unzip.h"

 #include "utils.h"

 #include "resource.h"

-#include "m_langman.h"

+#include "version.h"

+

diff --git a/plugins/LangMan/src/main.cpp b/plugins/LangMan/src/main.cpp
index 3493431e9c..595d68d14f 100644
--- a/plugins/LangMan/src/main.cpp
+++ b/plugins/LangMan/src/main.cpp
@@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "common.h"

-#include "version.h"

 

 HINSTANCE hInst;

 

@@ -29,15 +28,15 @@ int hLangpack;
 

 static PLUGININFOEX pluginInfo = {

 	sizeof(PLUGININFOEX), 

-	"Language Pack Manager", 

-	PLUGIN_VERSION, 

-	"Helps you manage Language Packs of different languages.",

-	"H. Herkenrath", 

-	"hrathh@users.sourceforge.net",

-	"© 2005-2007 H. Herkenrath", 

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

+	__PLUGIN_NAME,

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

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE, 

-	// {D4BDD1EB-56F1-4a87-A187-67246EE919A2}

+	// {D4BDD1EB-56F1-4A87-A187-67246EE919A2}

 	{0xd4bdd1eb, 0x56f1, 0x4a87, {0xa1, 0x87, 0x67, 0x24, 0x6e, 0xe9, 0x19, 0xa2}}, 

 };

 

diff --git a/plugins/LangMan/src/version.h b/plugins/LangMan/src/version.h
index 2796f223f8..372ee57b4a 100644
--- a/plugins/LangMan/src/version.h
+++ b/plugins/LangMan/src/version.h
@@ -1,27 +1,14 @@
-/*

-

-'Language Pack Manager'-Plugin for Miranda IM

-

-Copyright (C) 2005-2007 H. Herkenrath

-

-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; either version 2

-of the License, or (at your option) any later version.

-

-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 (LangMan-License.txt); if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-*/

-

-#define PLUGIN_VERSION              PLUGIN_MAKE_VERSION(1, 0, 2, 3)

-#define FILE_VERSION                1, 0, 2, 3

-

-#define FILE_VERSION_STR           "1.0.2.3"

-#define USERAGENT_VERSION          "1.0.2.3"

-

+#define __MAJOR_VERSION				1

+#define __MINOR_VERSION				0

+#define __RELEASE_NUM				2

+#define __BUILD_NUM					3

+

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+

+#define __PLUGIN_NAME				"Language pack manager"

+#define __FILENAME					"LangMan.dll"

+#define __DESCRIPTION 				"Helps you manage Language Packs of different languages."

+#define __AUTHOR					"H. Herkenrath"

+#define __AUTHOREMAIL				"hrathh@users.sourceforge.net"

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

+#define __COPYRIGHT					"© 2005-2007 H. Herkenrath"