summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/Import/import_10.vcxproj8
-rw-r--r--plugins/Import/import_10.vcxproj.filters23
-rw-r--r--plugins/Import/import_11.vcxproj8
-rw-r--r--plugins/Import/import_11.vcxproj.filters23
-rw-r--r--plugins/Import/res/Version.rc38
-rw-r--r--plugins/Import/res/resource.rc72
-rw-r--r--plugins/Import/src/import.cpp1
-rw-r--r--plugins/Import/src/import.h20
-rw-r--r--plugins/Import/src/main.cpp20
-rw-r--r--plugins/Import/src/miranda.cpp1
-rw-r--r--plugins/Import/src/progress.cpp5
-rw-r--r--plugins/Import/src/utils.cpp2
-rw-r--r--plugins/Import/src/version.h17
-rw-r--r--plugins/Import/src/wizard.cpp1
14 files changed, 91 insertions, 148 deletions
diff --git a/plugins/Import/import_10.vcxproj b/plugins/Import/import_10.vcxproj
index 5744191ceb..6858ceae0d 100644
--- a/plugins/Import/import_10.vcxproj
+++ b/plugins/Import/import_10.vcxproj
@@ -209,15 +209,11 @@
<ItemGroup>
<ClInclude Include="src\import.h" />
<ClInclude Include="src\resource.h" />
- </ItemGroup>
- <ItemGroup>
- <None Include="docs\import-ICQ_Db_Specs.txt" />
- <None Include="docs\import-license.txt" />
- <None Include="docs\import-readme.txt" />
- <None Include="docs\import-translation.txt" />
+ <ClInclude Include="src\version.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\resource.rc" />
+ <ResourceCompile Include="res\Version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Import/import_10.vcxproj.filters b/plugins/Import/import_10.vcxproj.filters
index 7ec3d151a6..bb697a541b 100644
--- a/plugins/Import/import_10.vcxproj.filters
+++ b/plugins/Import/import_10.vcxproj.filters
@@ -13,9 +13,6 @@
<UniqueIdentifier>{e10cb216-83c1-4eb2-95ec-09f1e42a2c96}</UniqueIdentifier>
<Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
</Filter>
- <Filter Include="Documentation">
- <UniqueIdentifier>{8ad8cb39-e207-46f6-8fbf-1f5871148568}</UniqueIdentifier>
- </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\main.cpp">
@@ -47,24 +44,16 @@
<ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
- </ItemGroup>
- <ItemGroup>
- <None Include="docs\import-ICQ_Db_Specs.txt">
- <Filter>Documentation</Filter>
- </None>
- <None Include="docs\import-license.txt">
- <Filter>Documentation</Filter>
- </None>
- <None Include="docs\import-readme.txt">
- <Filter>Documentation</Filter>
- </None>
- <None Include="docs\import-translation.txt">
- <Filter>Documentation</Filter>
- </None>
+ <ClInclude Include="src\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
+ <ResourceCompile Include="res\Version.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/plugins/Import/import_11.vcxproj b/plugins/Import/import_11.vcxproj
index ffa1f96aa5..1e68c1ba90 100644
--- a/plugins/Import/import_11.vcxproj
+++ b/plugins/Import/import_11.vcxproj
@@ -213,15 +213,11 @@
<ItemGroup>
<ClInclude Include="src\import.h" />
<ClInclude Include="src\resource.h" />
- </ItemGroup>
- <ItemGroup>
- <None Include="docs\import-ICQ_Db_Specs.txt" />
- <None Include="docs\import-license.txt" />
- <None Include="docs\import-readme.txt" />
- <None Include="docs\import-translation.txt" />
+ <ClInclude Include="src\version.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\resource.rc" />
+ <ResourceCompile Include="res\Version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Import/import_11.vcxproj.filters b/plugins/Import/import_11.vcxproj.filters
index 7ec3d151a6..bb697a541b 100644
--- a/plugins/Import/import_11.vcxproj.filters
+++ b/plugins/Import/import_11.vcxproj.filters
@@ -13,9 +13,6 @@
<UniqueIdentifier>{e10cb216-83c1-4eb2-95ec-09f1e42a2c96}</UniqueIdentifier>
<Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
</Filter>
- <Filter Include="Documentation">
- <UniqueIdentifier>{8ad8cb39-e207-46f6-8fbf-1f5871148568}</UniqueIdentifier>
- </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\main.cpp">
@@ -47,24 +44,16 @@
<ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
- </ItemGroup>
- <ItemGroup>
- <None Include="docs\import-ICQ_Db_Specs.txt">
- <Filter>Documentation</Filter>
- </None>
- <None Include="docs\import-license.txt">
- <Filter>Documentation</Filter>
- </None>
- <None Include="docs\import-readme.txt">
- <Filter>Documentation</Filter>
- </None>
- <None Include="docs\import-translation.txt">
- <Filter>Documentation</Filter>
- </None>
+ <ClInclude Include="src\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
+ <ResourceCompile Include="res\Version.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/plugins/Import/res/Version.rc b/plugins/Import/res/Version.rc
new file mode 100644
index 0000000000..5bfbab4754
--- /dev/null
+++ b/plugins/Import/res/Version.rc
@@ -0,0 +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 "afxres.h"
+#include "..\src\version.h"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION __FILEVERSION_STRING
+ PRODUCTVERSION __FILEVERSION_STRING
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x0L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ 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/Import/res/resource.rc b/plugins/Import/res/resource.rc
index a77446551d..bc89df7fa1 100644
--- a/plugins/Import/res/resource.rc
+++ b/plugins/Import/res/resource.rc
@@ -1,7 +1,6 @@
// Microsoft Visual C++ generated resource script.
//
#include "..\src\resource.h"
-#include "..\src\version.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -50,6 +49,15 @@ END
/////////////////////////////////////////////////////////////////////////////
//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_IMPORT ICON "import.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
// Dialog
//
@@ -270,68 +278,6 @@ END
/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-// English (Australia) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENA)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_IMPORT ICON "import.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION __FILEVERSION_STRING
- PRODUCTVERSION __FILEVERSION_STRING
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "000004b0"
- BEGIN
- VALUE "Comments", "Licensed under the terms of the GNU General Public License"
- VALUE "CompanyName", " "
- VALUE "FileDescription", "Miranda NG Import Plugin"
- VALUE "FileVersion", __FILEVERSION_STRING
- VALUE "InternalName", "import"
- VALUE "LegalCopyright", "Copyright © 2000-2009, Martin Öberg, Richard Hughes, Dmitry Kuzkin, George Hazan"
- VALUE "OriginalFilename", "import.dll"
- VALUE "ProductName", "Miranda NG"
- VALUE "ProductVersion", __FILEVERSION_STRING
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x0, 1200
- END
-END
-
-#endif // English (Australia) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
diff --git a/plugins/Import/src/import.cpp b/plugins/Import/src/import.cpp
index c0de7cc8e3..e77334dde8 100644
--- a/plugins/Import/src/import.cpp
+++ b/plugins/Import/src/import.cpp
@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "import.h"
-#include <m_db_int.h>
time_t dwSinceDate = 0;
diff --git a/plugins/Import/src/import.h b/plugins/Import/src/import.h
index 5dbfd82cc7..f3fd07bd2f 100644
--- a/plugins/Import/src/import.h
+++ b/plugins/Import/src/import.h
@@ -20,40 +20,30 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-
-//#define _LOGGING 1
-
#define _CRT_SECURE_NO_WARNINGS
#define _CRT_NONSTDC_NO_DEPRECATE
-#define MIRANDA_VER 0x0A00
-
#define WINVER 0x0501
#define _WIN32_WINNT 0x0501
#define _WIN32_IE 0x0501
-#include <m_stdhdr.h>
-
#include <windows.h>
#include <commctrl.h> // datetimepicker
-
-#include <stddef.h>
#include <time.h>
-#include <io.h>
+#include <m_stdhdr.h>
#include <win2k.h>
#include <newpluginapi.h>
#include <m_langpack.h>
-#include <m_system.h>
#include <m_system_cpp.h>
#include <m_database.h>
-#include <m_protocols.h>
-#include <m_protosvc.h>
#include <m_protomod.h>
#include <m_icolib.h>
-#include <m_utils.h>
-#include <m_findadd.h>
#include <m_clist.h>
+#include <m_db_int.h>
+
+#include "version.h"
+#include "resource.h"
// ** Global constants
diff --git a/plugins/Import/src/main.cpp b/plugins/Import/src/main.cpp
index 627c81a424..e4ac431248 100644
--- a/plugins/Import/src/main.cpp
+++ b/plugins/Import/src/main.cpp
@@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "import.h"
-#include "version.h"
-#include "resource.h"
int nImportOption;
int nCustomOptions;
@@ -39,19 +37,19 @@ int hLangpack;
PLUGININFOEX pluginInfo =
{
sizeof(PLUGININFOEX),
- "Import contacts and messages",
- __VERSION_DWORD,
- "Imports contacts and messages from another Miranda profile or from an external program.",
- "Miranda team",
- "info@miranda-im.org",
- "© 2000-2010 Martin Öberg, Richard Hughes, Dmitry Kuzkin, 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,
//{2D77A746-00A6-4343-BFC5-F808CDD772EA}
- {0x2d77a746, 0xa6, 0x4343, { 0xbf, 0xc5, 0xf8, 0x8, 0xcd, 0xd7, 0x72, 0xea }}
+ {0x2d77a746, 0xa6, 0x4343, {0xbf, 0xc5, 0xf8, 0x8, 0xcd, 0xd7, 0x72, 0xea}}
};
-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/Import/src/miranda.cpp b/plugins/Import/src/miranda.cpp
index 33bd6964c1..71e149c0f4 100644
--- a/plugins/Import/src/miranda.cpp
+++ b/plugins/Import/src/miranda.cpp
@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "import.h"
-#include "resource.h"
void MirandaImport(HWND hdlgProgress);
diff --git a/plugins/Import/src/progress.cpp b/plugins/Import/src/progress.cpp
index 8856fa837e..8769ba9bd2 100644
--- a/plugins/Import/src/progress.cpp
+++ b/plugins/Import/src/progress.cpp
@@ -20,12 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include <windows.h>
-#include <stdio.h>
-#include <commctrl.h>
-
#include "import.h"
-#include "resource.h"
#define PROGM_START (WM_USER+100)
diff --git a/plugins/Import/src/utils.cpp b/plugins/Import/src/utils.cpp
index b06cf06881..1795b3b2c8 100644
--- a/plugins/Import/src/utils.cpp
+++ b/plugins/Import/src/utils.cpp
@@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "import.h"
-#include "version.h"
-#include "resource.h"
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/Import/src/version.h b/plugins/Import/src/version.h
index 0231d7a7ea..e10aab61b8 100644
--- a/plugins/Import/src/version.h
+++ b/plugins/Import/src/version.h
@@ -1,3 +1,14 @@
-#define __FILEVERSION_STRING 0,11,0,1
-#define __VERSION_STRING "0.11.0.1"
-#define __VERSION_DWORD PLUGIN_MAKE_VERSION(0, 11, 0, 1)
+#define __MAJOR_VERSION 0
+#define __MINOR_VERSION 11
+#define __RELEASE_NUM 0
+#define __BUILD_NUM 1
+
+#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
+
+#define __PLUGIN_NAME "Import contacts and messages"
+#define __FILENAME "Import.dll"
+#define __DESCRIPTION "Imports contacts and messages from another Miranda profile or from an external program."
+#define __AUTHOR "Miranda team"
+#define __AUTHOREMAIL "info@miranda-im.org"
+#define __AUTHORWEB "http://miranda-ng.org/"
+#define __COPYRIGHT "© 2000-2010 Martin \xd6" "berg, Richard Hughes, Dmitry Kuzkin, George Hazan"
diff --git a/plugins/Import/src/wizard.cpp b/plugins/Import/src/wizard.cpp
index 92e411a145..8a4b71faf3 100644
--- a/plugins/Import/src/wizard.cpp
+++ b/plugins/Import/src/wizard.cpp
@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "import.h"
-#include "resource.h"
INT_PTR CALLBACK WizardIntroPageProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 13:06:44 +0000