From 886d5e6f982d65f8d4f9a13ec52cce049fe4757f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 19 Mar 2015 22:25:22 +0000 Subject: Import: an option added to support profile mirroring (precise copy) git-svn-id: http://svn.miranda-ng.org/main/trunk@12438 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Import/src/miranda.cpp | 12 ++++++++++-- plugins/Import/src/resource.h | 4 +++- plugins/Import/src/version.h | 4 ++-- 3 files changed, 15 insertions(+), 5 deletions(-) (limited to 'plugins/Import/src') diff --git a/plugins/Import/src/miranda.cpp b/plugins/Import/src/miranda.cpp index 1b6a3a0b6a..f75450299a 100644 --- a/plugins/Import/src/miranda.cpp +++ b/plugins/Import/src/miranda.cpp @@ -150,13 +150,14 @@ INT_PTR CALLBACK MirandaOptionsPageProc(HWND hwndDlg, UINT message, WPARAM wPara switch (message) { case WM_INITDIALOG: TranslateDialogDefault(hwndDlg); + EnableWindow(GetDlgItem(hwndDlg, IDC_RADIO_COMPLETE), TRUE); EnableWindow(GetDlgItem(hwndDlg, IDC_RADIO_ALL), TRUE); EnableWindow(GetDlgItem(hwndDlg, IDC_STATIC_ALL), TRUE); EnableWindow(GetDlgItem(hwndDlg, IDC_RADIO_CONTACTS), TRUE); EnableWindow(GetDlgItem(hwndDlg, IDC_STATIC_CONTACTS), TRUE); EnableWindow(GetDlgItem(hwndDlg, IDC_RADIO_CUSTOM), TRUE); EnableWindow(GetDlgItem(hwndDlg, IDC_STATIC_CUSTOM), TRUE); - CheckDlgButton(hwndDlg, IDC_RADIO_ALL, BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_RADIO_COMPLETE, BST_CHECKED); return TRUE; case WM_COMMAND: @@ -166,9 +167,16 @@ INT_PTR CALLBACK MirandaOptionsPageProc(HWND hwndDlg, UINT message, WPARAM wPara break; case IDOK: + if (IsDlgButtonChecked(hwndDlg, IDC_RADIO_COMPLETE)) { + nImportOption = IMPORT_CUSTOM; + nCustomOptions = INT32_MAX; + PostMessage(GetParent(hwndDlg), WIZM_GOTOPAGE, IDD_PROGRESS, (LPARAM)ProgressPageProc); + break; + } + if (IsDlgButtonChecked(hwndDlg, IDC_RADIO_ALL)) { nImportOption = IMPORT_ALL; - nCustomOptions = 0;//IOPT_MSGSENT|IOPT_MSGRECV|IOPT_URLSENT|IOPT_URLRECV; + nCustomOptions = 0; PostMessage(GetParent(hwndDlg), WIZM_GOTOPAGE, IDD_PROGRESS, (LPARAM)ProgressPageProc); break; } diff --git a/plugins/Import/src/resource.h b/plugins/Import/src/resource.h index 51b449a810..1120c1a773 100644 --- a/plugins/Import/src/resource.h +++ b/plugins/Import/src/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by d:\miranda-ng\plugins\Import\res\resource.rc +// Used by D:\miranda-ng\plugins\Import\res\resource.rc // #define IDC_BACK 3 #define IDD_WIZARD 101 @@ -27,7 +27,9 @@ #define IDC_STATIC_ALL 1019 #define IDC_STATIC_CONTACTS 1020 #define IDC_STATIC_CUSTOM 1021 +#define IDC_RADIO_COMPLETE 1022 #define IDC_DATETIMEPICKER 1023 +#define IDC_STATIC_ALL2 1023 #define IDC_IN_FT 1024 #define IDC_CONTACTS 1025 #define IDC_SYSTEM 1026 diff --git a/plugins/Import/src/version.h b/plugins/Import/src/version.h index ef02658ff6..53912d96e5 100644 --- a/plugins/Import/src/version.h +++ b/plugins/Import/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0 #define __MINOR_VERSION 95 -#define __RELEASE_NUM 3 -#define __BUILD_NUM 4 +#define __RELEASE_NUM 4 +#define __BUILD_NUM 1 #include -- cgit v1.2.3