added version info

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

6 files changed, 55 insertions, 87 deletions

diff --git a/plugins/Db_autobackups/res/db_autobackups.rc b/plugins/Db_autobackups/res/db_autobackups.rc
index 2fb8964153..e04f8eb650 100644
--- a/plugins/Db_autobackups/res/db_autobackups.rc
+++ b/plugins/Db_autobackups/res/db_autobackups.rc
@@ -36,52 +36,6 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,58,39,67,12

 END

 

-

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

-//

-// DESIGNINFO

-//

-

-#ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO 

-BEGIN

-    IDD_COPYPROGRESS, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 179

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 51

-    END

-END

-#endif    // APSTUDIO_INVOKED

-

-

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

-//

-// Icon

-//

-

-// Icon with lowest ID value placed first to ensure application icon

-// remains consistent on all systems.

-IDI_ICON1               ICON                    "backup.ico"

-#endif    // Russian resources

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

-

-

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

-// English (U.S.) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

-#ifdef _WIN32

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page(1252)

-#endif //_WIN32

-

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

-//

-// Dialog

-//

-

 IDD_OPTIONS DIALOGEX 0, 0, 271, 193

 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD

 FONT 8, "MS Shell Dlg", 0, 0, 0x0

@@ -127,6 +81,14 @@ END
 #ifdef APSTUDIO_INVOKED

 GUIDELINES DESIGNINFO 

 BEGIN

+    IDD_COPYPROGRESS, DIALOG

+    BEGIN

+        LEFTMARGIN, 7

+        RIGHTMARGIN, 179

+        TOPMARGIN, 7

+        BOTTOMMARGIN, 51

+    END

+

     IDD_OPTIONS, DIALOG

     BEGIN

         LEFTMARGIN, 6

@@ -141,6 +103,19 @@ END
 #endif    // APSTUDIO_INVOKED

 

 

+/////////////////////////////////////////////////////////////////////////////

+//

+// Icon

+//

+

+// Icon with lowest ID value placed first to ensure application icon

+// remains consistent on all systems.

+IDI_ICON1               ICON                    "backup.ico"

+

+#endif    // Russian resources

+/////////////////////////////////////////////////////////////////////////////

+

+

 #ifdef APSTUDIO_INVOKED

 /////////////////////////////////////////////////////////////////////////////

 //

@@ -165,10 +140,6 @@ END
 

 #endif    // APSTUDIO_INVOKED

 

-#endif    // English (U.S.) resources

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

-

-

 

 #ifndef APSTUDIO_INVOKED

 /////////////////////////////////////////////////////////////////////////////

diff --git a/plugins/Db_autobackups/res/version.rc b/plugins/Db_autobackups/res/version.rc
index 30fac5ce35..5bfbab4754 100644
--- a/plugins/Db_autobackups/res/version.rc
+++ b/plugins/Db_autobackups/res/version.rc
@@ -1,15 +1,12 @@
+// Microsoft Visual C++ generated resource script.

+//

 #ifdef APSTUDIO_INVOKED

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

 #endif //APSTUDIO_INVOKED

 

-#include <windows.h>

+#include "afxres.h"

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

 

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

-//

-// Version

-//

-

 VS_VERSION_INFO VERSIONINFO

  FILEVERSION __FILEVERSION_STRING

  PRODUCTVERSION __FILEVERSION_STRING

@@ -20,23 +17,22 @@ VS_VERSION_INFO VERSIONINFO
  FILEFLAGS 0x0L

 #endif

  FILEOS 0x4L

- FILETYPE 0x2L

+ FILETYPE 0x0L

  FILESUBTYPE 0x0L

 BEGIN

     BLOCK "StringFileInfo"

     BEGIN

-        BLOCK "041904b0"

+        BLOCK "000004b0"

         BEGIN

-            VALUE "FileDescription", __PLUGIN_DESC

-            VALUE "FileVersion", __VERSION_STRING

-            VALUE "LegalCopyright", __COPYRIGHTS

-            VALUE "OriginalFilename", "db_autobackups.dll"

+            VALUE "FileDescription", __DESCRIPTION

+            VALUE "InternalName", __PLUGIN_NAME

+            VALUE "LegalCopyright", __COPYRIGHT

+            VALUE "OriginalFilename", __FILENAME

             VALUE "ProductName", __PLUGIN_NAME

-            VALUE "ProductVersion", __VERSION_STRING

         END

     END

     BLOCK "VarFileInfo"

     BEGIN

-        VALUE "Translation", 0x419, 1200

+        VALUE "Translation", 0x0, 1200

     END

 END

diff --git a/plugins/Db_autobackups/src/backup.cpp b/plugins/Db_autobackups/src/backup.cpp
index 1677b18f15..1922212386 100644
--- a/plugins/Db_autobackups/src/backup.cpp
+++ b/plugins/Db_autobackups/src/backup.cpp
@@ -1,5 +1,4 @@
 #include "headers.h"

-#include <commctrl.h>

 

 TCHAR dbname[MAX_PATH];

 

diff --git a/plugins/Db_autobackups/src/headers.h b/plugins/Db_autobackups/src/headers.h
index 966bdcde73..30cacb4ee5 100644
--- a/plugins/Db_autobackups/src/headers.h
+++ b/plugins/Db_autobackups/src/headers.h
@@ -2,28 +2,26 @@
 #define _HEADERS_H

 

 #define _CRT_SECURE_NO_DEPRECATE

-#define MIRANDA_VER 0x0A00

 

-#include <m_stdhdr.h>

 #include <windows.h>

 #include <shlobj.h>

 #include <time.h>

-#include <commctrl.h>

 

-#include <m_system.h>

 #include <newpluginapi.h>

 #include <m_clist.h>

 #include <m_database.h>

 #include <m_langpack.h>

-#include <m_utils.h>

 #include <m_options.h>

 #include <m_popup.h>

 #include <m_icolib.h>

-#include "m_folders.h"

 #include <win2k.h>

 

+#include <m_folders.h>

+#include <m_trigger.h>

+

 #include "options.h"

 #include "resource.h"

+#include "version.h"

 

 #define MS_AB_BACKUP		"AB/Backup"

 #define MS_AB_BACKUPTRGR	"AB/Backuptrg"

diff --git a/plugins/Db_autobackups/src/main.cpp b/plugins/Db_autobackups/src/main.cpp
index b2c5a7a7e3..93865adbcd 100644
--- a/plugins/Db_autobackups/src/main.cpp
+++ b/plugins/Db_autobackups/src/main.cpp
@@ -1,6 +1,4 @@
 #include "headers.h"

-#include "version.h"

-#include "m_trigger.h"

 

 HINSTANCE hInst;

 

@@ -14,14 +12,14 @@ HANDLE hServices[3];
 PLUGININFOEX pluginInfo={

 	sizeof(PLUGININFOEX),

 	__PLUGIN_NAME,

-	__VERSION_DWORD,

-	__PLUGIN_DESC,

-	"chaos.persei, sje, Kildor, Billy_Bons",

-	"chaos.persei@gmail.com",

-	__COPYRIGHTS,

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

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

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,

-	// {81C220A6-0226-4ad6-BFCA-217B17A16053}

+	// {81C220A6-0226-4Ad6-BFCA-217B17A16053}

 	{0x81c220a6, 0x226, 0x4ad6, {0xbf, 0xca, 0x21, 0x7b, 0x17, 0xa1, 0x60, 0x53}}

 };

 

diff --git a/plugins/Db_autobackups/src/version.h b/plugins/Db_autobackups/src/version.h
index e7151dfccb..8ff124185c 100644
--- a/plugins/Db_autobackups/src/version.h
+++ b/plugins/Db_autobackups/src/version.h
@@ -1,8 +1,14 @@
-#define __FILEVERSION_STRING	0,0,0,8

-#define __VERSION_STRING		"0.0.0.8"

-#define __VERSION_DWORD			0x00000008

+#define __MAJOR_VERSION				0

+#define __MINOR_VERSION				0

+#define __RELEASE_NUM				0

+#define __BUILD_NUM					8

 

-#define __PLUGIN_NAME_BASE		"DB Autobackuper"

-#define __PLUGIN_NAME			__PLUGIN_NAME_BASE

-#define __PLUGIN_DESC			__PLUGIN_NAME_BASE " plugin."

-#define __COPYRIGHTS			"© 2005-2011 chaos.persei, sje, Kildor, Billy_Bons, Vasilich"

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+

+#define __PLUGIN_NAME				"Db autobackuper"

+#define __FILENAME					"Db_autobackups.dll"

+#define __DESCRIPTION 				"Db autobackuper plugin."

+#define __AUTHOR					"chaos.persei, sje, Kildor, Billy_Bons"

+#define __AUTHOREMAIL				"chaos.persei@gmail.com"

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

+#define __COPYRIGHT					"© 2005-2011 chaos.persei, sje, Kildor, Billy_Bons, Vasilich"