From 06ed8f1f4bdd4f842f0a84261423043b9ba0a0d4 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 24 Jul 2015 11:00:55 +0000 Subject: import: common project git-svn-id: http://svn.miranda-ng.org/main/trunk@14671 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Import/src/import.cpp | 2 +- plugins/Import/src/import.h | 110 ---------------------------------------- plugins/Import/src/main.cpp | 2 +- plugins/Import/src/miranda.cpp | 2 +- plugins/Import/src/progress.cpp | 2 +- plugins/Import/src/stdafx.cpp | 18 ------- plugins/Import/src/stdafx.cxx | 18 +++++++ plugins/Import/src/stdafx.h | 109 +++++++++++++++++++++++++++++++++++++++ plugins/Import/src/utils.cpp | 2 +- plugins/Import/src/wizard.cpp | 2 +- 10 files changed, 133 insertions(+), 134 deletions(-) delete mode 100644 plugins/Import/src/import.h delete mode 100644 plugins/Import/src/stdafx.cpp create mode 100644 plugins/Import/src/stdafx.cxx create mode 100644 plugins/Import/src/stdafx.h (limited to 'plugins/Import/src') diff --git a/plugins/Import/src/import.cpp b/plugins/Import/src/import.cpp index ddaa811273..5127e56e0d 100644 --- a/plugins/Import/src/import.cpp +++ b/plugins/Import/src/import.cpp @@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "import.h" +#include "stdafx.h" #define SetProgress(n) SendMessage(hdlgProgress,PROGM_SETPROGRESS,n,0) diff --git a/plugins/Import/src/import.h b/plugins/Import/src/import.h deleted file mode 100644 index 4e412862cb..0000000000 --- a/plugins/Import/src/import.h +++ /dev/null @@ -1,110 +0,0 @@ -/* - -Import plugin for Miranda NG - -Copyright (ñ) 2012-15 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; 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; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#define _CRT_SECURE_NO_WARNINGS -#define _CRT_NONSTDC_NO_DEPRECATE - -#include -#include // datetimepicker - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "version.h" -#include "resource.h" - -// ** Global constants - -#define IMPORT_MODULE "MIMImport" // Module name -#define IMPORT_SERVICE "MIMImport/Import" // Service for menu item - -// Keys -#define IMP_KEY_FR "FirstRun" // First run - - -#define WIZM_GOTOPAGE (WM_USER+10) //wParam=resource id, lParam=dlgproc -#define WIZM_DISABLEBUTTON (WM_USER+11) //wParam=0:back, 1:next, 2:cancel -#define WIZM_SETCANCELTEXT (WM_USER+12) //lParam=(char*)newText -#define WIZM_ENABLEBUTTON (WM_USER+13) //wParam=0:back, 1:next, 2:cancel - -#define PROGM_SETPROGRESS (WM_USER+10) //wParam=0..100 -#define PROGM_ADDMESSAGE (WM_USER+11) //lParam=(char*)szText - -#define ICQOSCPROTONAME "ICQ" -#define MSNPROTONAME "MSN" -#define YAHOOPROTONAME "YAHOO" -#define NSPPROTONAME "NET_SEND" -#define ICQCORPPROTONAME "ICQ Corp" -#define AIMPROTONAME "AIM" - -// Custom import options -#define IOPT_ADDUNKNOWN 0x00000001 -#define IOPT_MSGSENT 0x00000002 -#define IOPT_MSGRECV 0x00000004 -#define IOPT_URLSENT 0x00000008 -#define IOPT_URLRECV 0x00000010 -#define IOPT_AUTHREQ 0x00000020 -#define IOPT_ADDED 0x00000040 -#define IOPT_FILESENT 0x00000080 -#define IOPT_FILERECV 0x00000100 -#define IOPT_OTHERSENT 0x00000200 -#define IOPT_OTHERRECV 0x00000400 -#define IOPT_SYSTEM 0x00000800 -#define IOPT_CONTACTS 0x00001000 -#define IOPT_GROUPS 0x00002000 -#define IOPT_SYS_SETTINGS 0x00004000 - -#define IOPT_HISTORY 0x000007FE - -void AddMessage(const TCHAR* fmt, ...); - -INT_PTR CALLBACK WizardIntroPageProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK ProgressPageProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK MirandaPageProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK MirandaOptionsPageProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK MirandaAdvOptionsPageProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK FinishedPageProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); - -bool IsDuplicateEvent(MCONTACT hContact, DBEVENTINFO dbei); - -int CreateGroup(const TCHAR* name, MCONTACT hContact); - -extern HINSTANCE hInst; -extern HWND hdlgProgress, hwndAccMerge; -extern int nImportOptions; -extern TCHAR importFile[]; -extern time_t dwSinceDate; - -HICON GetIcon(int iIconId, bool size = false); -HANDLE GetIconHandle(int iIconId); -void RegisterIcons(void); diff --git a/plugins/Import/src/main.cpp b/plugins/Import/src/main.cpp index d588c56c25..4882015f5d 100644 --- a/plugins/Import/src/main.cpp +++ b/plugins/Import/src/main.cpp @@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "import.h" +#include "stdafx.h" int nImportOptions; diff --git a/plugins/Import/src/miranda.cpp b/plugins/Import/src/miranda.cpp index 4d9e697389..4fff7dcce1 100644 --- a/plugins/Import/src/miranda.cpp +++ b/plugins/Import/src/miranda.cpp @@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "import.h" +#include "stdafx.h" time_t dwSinceDate = 0; diff --git a/plugins/Import/src/progress.cpp b/plugins/Import/src/progress.cpp index 21d310c6c8..bb301ac6c2 100644 --- a/plugins/Import/src/progress.cpp +++ b/plugins/Import/src/progress.cpp @@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "import.h" +#include "stdafx.h" #define PROGM_START (WM_USER+100) diff --git a/plugins/Import/src/stdafx.cpp b/plugins/Import/src/stdafx.cpp deleted file mode 100644 index 1c1fbececc..0000000000 --- a/plugins/Import/src/stdafx.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright (C) 2012-15 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 "import.h" \ No newline at end of file diff --git a/plugins/Import/src/stdafx.cxx b/plugins/Import/src/stdafx.cxx new file mode 100644 index 0000000000..6fb37564b7 --- /dev/null +++ b/plugins/Import/src/stdafx.cxx @@ -0,0 +1,18 @@ +/* +Copyright (C) 2012-15 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 "stdafx.h" \ No newline at end of file diff --git a/plugins/Import/src/stdafx.h b/plugins/Import/src/stdafx.h new file mode 100644 index 0000000000..94b311fbaa --- /dev/null +++ b/plugins/Import/src/stdafx.h @@ -0,0 +1,109 @@ +/* + +Import plugin for Miranda NG + +Copyright (ñ) 2012-15 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; 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; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +*/ + +#define _CRT_NONSTDC_NO_DEPRECATE + +#include +#include // datetimepicker + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "version.h" +#include "resource.h" + +// ** Global constants + +#define IMPORT_MODULE "MIMImport" // Module name +#define IMPORT_SERVICE "MIMImport/Import" // Service for menu item + +// Keys +#define IMP_KEY_FR "FirstRun" // First run + + +#define WIZM_GOTOPAGE (WM_USER+10) //wParam=resource id, lParam=dlgproc +#define WIZM_DISABLEBUTTON (WM_USER+11) //wParam=0:back, 1:next, 2:cancel +#define WIZM_SETCANCELTEXT (WM_USER+12) //lParam=(char*)newText +#define WIZM_ENABLEBUTTON (WM_USER+13) //wParam=0:back, 1:next, 2:cancel + +#define PROGM_SETPROGRESS (WM_USER+10) //wParam=0..100 +#define PROGM_ADDMESSAGE (WM_USER+11) //lParam=(char*)szText + +#define ICQOSCPROTONAME "ICQ" +#define MSNPROTONAME "MSN" +#define YAHOOPROTONAME "YAHOO" +#define NSPPROTONAME "NET_SEND" +#define ICQCORPPROTONAME "ICQ Corp" +#define AIMPROTONAME "AIM" + +// Custom import options +#define IOPT_ADDUNKNOWN 0x00000001 +#define IOPT_MSGSENT 0x00000002 +#define IOPT_MSGRECV 0x00000004 +#define IOPT_URLSENT 0x00000008 +#define IOPT_URLRECV 0x00000010 +#define IOPT_AUTHREQ 0x00000020 +#define IOPT_ADDED 0x00000040 +#define IOPT_FILESENT 0x00000080 +#define IOPT_FILERECV 0x00000100 +#define IOPT_OTHERSENT 0x00000200 +#define IOPT_OTHERRECV 0x00000400 +#define IOPT_SYSTEM 0x00000800 +#define IOPT_CONTACTS 0x00001000 +#define IOPT_GROUPS 0x00002000 +#define IOPT_SYS_SETTINGS 0x00004000 + +#define IOPT_HISTORY 0x000007FE + +void AddMessage(const TCHAR* fmt, ...); + +INT_PTR CALLBACK WizardIntroPageProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK ProgressPageProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK MirandaPageProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK MirandaOptionsPageProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK MirandaAdvOptionsPageProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK FinishedPageProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam); + +bool IsDuplicateEvent(MCONTACT hContact, DBEVENTINFO dbei); + +int CreateGroup(const TCHAR* name, MCONTACT hContact); + +extern HINSTANCE hInst; +extern HWND hdlgProgress, hwndAccMerge; +extern int nImportOptions; +extern TCHAR importFile[]; +extern time_t dwSinceDate; + +HICON GetIcon(int iIconId, bool size = false); +HANDLE GetIconHandle(int iIconId); +void RegisterIcons(void); diff --git a/plugins/Import/src/utils.cpp b/plugins/Import/src/utils.cpp index 3c48c93462..94791da056 100644 --- a/plugins/Import/src/utils.cpp +++ b/plugins/Import/src/utils.cpp @@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "import.h" +#include "stdafx.h" ///////////////////////////////////////////////////////////////////////////////////////// // Creates a group with a specified name in the diff --git a/plugins/Import/src/wizard.cpp b/plugins/Import/src/wizard.cpp index 86b419365d..05328ce8d6 100644 --- a/plugins/Import/src/wizard.cpp +++ b/plugins/Import/src/wizard.cpp @@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "import.h" +#include "stdafx.h" INT_PTR CALLBACK WizardIntroPageProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) { -- cgit v1.2.3