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/import_10.vcxproj | 3 +++ plugins/Import/import_10.vcxproj.filters | 5 +++++ plugins/Import/res/resource.rc | 21 ++++++++++++--------- plugins/Import/src/miranda.cpp | 12 ++++++++++-- plugins/Import/src/resource.h | 4 +++- plugins/Import/src/version.h | 4 ++-- 6 files changed, 35 insertions(+), 14 deletions(-) (limited to 'plugins/Import') diff --git a/plugins/Import/import_10.vcxproj b/plugins/Import/import_10.vcxproj index 5bf2b3c549..aef8e4e4ca 100644 --- a/plugins/Import/import_10.vcxproj +++ b/plugins/Import/import_10.vcxproj @@ -215,6 +215,9 @@ + + + diff --git a/plugins/Import/import_10.vcxproj.filters b/plugins/Import/import_10.vcxproj.filters index bb697a541b..f2c0146a43 100644 --- a/plugins/Import/import_10.vcxproj.filters +++ b/plugins/Import/import_10.vcxproj.filters @@ -56,4 +56,9 @@ Resource Files + + + Resource Files + + \ No newline at end of file diff --git a/plugins/Import/res/resource.rc b/plugins/Import/res/resource.rc index 5f10bdcc0b..7347583494 100644 --- a/plugins/Import/res/resource.rc +++ b/plugins/Import/res/resource.rc @@ -85,17 +85,20 @@ BEGIN CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,-7,115,234,1 END -IDD_OPTIONS DIALOGEX 0, 0, 220, 114 +IDD_OPTIONS DIALOGEX 0, 0, 220, 120 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN + CONTROL "Import all settings, contacts and all messages",IDC_RADIO_COMPLETE, + "Button",BS_AUTORADIOBUTTON | BS_LEFT | BS_TOP | WS_TABSTOP,8,8,206,10 + LTEXT "Makes precise copy of the original profile",IDC_STATIC,27,18,187,16 CONTROL "Import all contacts and all messages",IDC_RADIO_ALL, - "Button",BS_AUTORADIOBUTTON | BS_LEFT | BS_TOP | WS_TABSTOP,7,10,206,11 - CONTROL "Only import contacts",IDC_RADIO_CONTACTS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,42,206,10 - CONTROL "Custom import",IDC_RADIO_CUSTOM,"Button",BS_AUTORADIOBUTTON | WS_DISABLED | WS_TABSTOP,7,74,206,10 - LTEXT "Select this if you want to import as much data as possible. This is the recommended option.",IDC_STATIC_ALL,26,20,187,16 - LTEXT "Select this if you want to import contacts but don't want to import any message history.",IDC_STATIC_CONTACTS,26,52,187,16 - LTEXT "Select this if you want to customize what to import.",IDC_STATIC_CUSTOM,26,84,187,16,WS_DISABLED + "Button",BS_AUTORADIOBUTTON | BS_LEFT | BS_TOP | WS_TABSTOP,8,38,206,10 + LTEXT "Select this if you want to import as much data as possible. This is the recommended option.",IDC_STATIC_ALL,26,48,187,16 + CONTROL "Only import contacts",IDC_RADIO_CONTACTS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,68,206,10 + LTEXT "Select this if you want to import contacts but don't want to import any message history.",IDC_STATIC_CONTACTS,26,78,187,16 + CONTROL "Custom import",IDC_RADIO_CUSTOM,"Button",BS_AUTORADIOBUTTON | WS_DISABLED | WS_TABSTOP,7,98,206,10 + LTEXT "Select this if you want to customize what to import.",IDC_STATIC_CUSTOM,26,108,187,8,WS_DISABLED END IDD_ADVOPTIONS DIALOGEX 0, 0, 220, 114 @@ -126,7 +129,7 @@ BEGIN END IDD_ACCMERGE DIALOGEX 0, 0, 312, 150 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Choose appropriate accounts for import" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN @@ -197,7 +200,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 213 TOPMARGIN, 7 - BOTTOMMARGIN, 111 + BOTTOMMARGIN, 117 END IDD_ADVOPTIONS, DIALOG 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