diff options
Diffstat (limited to 'plugins/Import/src')
| -rw-r--r-- | plugins/Import/src/miranda.cpp | 16 | ||||
| -rw-r--r-- | plugins/Import/src/resource.h | 12 | ||||
| -rw-r--r-- | plugins/Import/src/stdafx.h | 1 | ||||
| -rw-r--r-- | plugins/Import/src/wizard.cpp | 2 |
4 files changed, 19 insertions, 12 deletions
diff --git a/plugins/Import/src/miranda.cpp b/plugins/Import/src/miranda.cpp index 7d4c1e4e34..9a517d341c 100644 --- a/plugins/Import/src/miranda.cpp +++ b/plugins/Import/src/miranda.cpp @@ -178,7 +178,8 @@ void CMirandaPageDlg::SearchForLists(const wchar_t *mirandaPath, const wchar_t * CMirandaOptionsPageDlg::CMirandaOptionsPageDlg() :
CWizardPageDlg(IDD_OPTIONS),
- btnBack(this, IDC_BACK)
+ btnBack(this, IDC_BACK),
+ chkDups(this, IDC_CHECK_DUPS)
{
btnBack.OnClick = Callback(this, &CMirandaOptionsPageDlg::onClick_Back);
}
@@ -216,20 +217,24 @@ void CMirandaOptionsPageDlg::onClick_Back(CCtrlButton*) void CMirandaOptionsPageDlg::OnNext()
{
+ int iFlags = chkDups.IsChecked() ? IOPT_CHECKDUPS : 0;
+
if (IsDlgButtonChecked(m_hwnd, IDC_RADIO_COMPLETE)) {
- g_iImportOptions = IOPT_ADDUNKNOWN | IOPT_COMPLETE | IOPT_CHECKDUPS;
+ g_iImportOptions = IOPT_ADDUNKNOWN | IOPT_COMPLETE | iFlags;
PostMessage(m_hwndParent, WIZM_GOTOPAGE, IDD_PROGRESS, (LPARAM)new CProgressPageDlg());
}
else if (IsDlgButtonChecked(m_hwnd, IDC_RADIO_ALL)) {
- g_iImportOptions = IOPT_HISTORY | IOPT_SYSTEM | IOPT_GROUPS | IOPT_CONTACTS | IOPT_CHECKDUPS;
+ g_iImportOptions = IOPT_HISTORY | IOPT_SYSTEM | IOPT_GROUPS | IOPT_CONTACTS | iFlags;
PostMessage(m_hwndParent, WIZM_GOTOPAGE, IDD_PROGRESS, (LPARAM)new CProgressPageDlg());
}
else if (IsDlgButtonChecked(m_hwnd, IDC_RADIO_CONTACTS)) {
g_iImportOptions = IOPT_CONTACTS;
PostMessage(m_hwndParent, WIZM_GOTOPAGE, IDD_PROGRESS, (LPARAM)new CProgressPageDlg());
}
- else if (IsDlgButtonChecked(m_hwnd, IDC_RADIO_CUSTOM))
+ else if (IsDlgButtonChecked(m_hwnd, IDC_RADIO_CUSTOM)) {
+ g_iImportOptions = iFlags;
PostMessage(m_hwndParent, WIZM_GOTOPAGE, IDD_ADVOPTIONS, (LPARAM)new CMirandaAdvOptionsPageDlg());
+ }
}
//=======================================================================================
@@ -281,7 +286,8 @@ void CMirandaAdvOptionsPageDlg::onClick_Back(CCtrlButton*) void CMirandaAdvOptionsPageDlg::OnNext()
{
- g_iImportOptions = 0;
+ // clear all another flags but duplicates
+ g_iImportOptions &= IOPT_CHECKDUPS;
if (IsDlgButtonChecked(m_hwnd, IDC_CONTACTS))
g_iImportOptions |= IOPT_CONTACTS | IOPT_GROUPS;
diff --git a/plugins/Import/src/resource.h b/plugins/Import/src/resource.h index bc81fde5fe..42ef6867ee 100644 --- a/plugins/Import/src/resource.h +++ b/plugins/Import/src/resource.h @@ -23,10 +23,10 @@ #define IDC_FILENAME 1007
#define IDC_PROGRESS 1008
#define IDC_STATUS 1009
-#define IDC_SPLITTER 1010
-#define IDC_STATICTEXT1 1011
-#define IDC_STATICTEXT2 1012
-#define IDC_STATICTEXT3 1013
+#define IDC_SPLITTER 1010
+#define IDC_STATICTEXT1 1011
+#define IDC_STATICTEXT2 1012
+#define IDC_STATICTEXT3 1013
#define IDC_RADIO_ALL 1016
#define IDC_RADIO_CONTACTS 1017
#define IDC_RADIO_CUSTOM 1018
@@ -61,9 +61,9 @@ //
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 115
+#define _APS_NEXT_RESOURCE_VALUE 116
#define _APS_NEXT_COMMAND_VALUE 40002
-#define _APS_NEXT_CONTROL_VALUE 1044
+#define _APS_NEXT_CONTROL_VALUE 1045
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
diff --git a/plugins/Import/src/stdafx.h b/plugins/Import/src/stdafx.h index 19259ba0c0..8d2c5f3c2b 100644 --- a/plugins/Import/src/stdafx.h +++ b/plugins/Import/src/stdafx.h @@ -147,6 +147,7 @@ public: class CMirandaOptionsPageDlg : public CWizardPageDlg
{
CCtrlButton btnBack;
+ CCtrlCheck chkDups;
public:
CMirandaOptionsPageDlg();
diff --git a/plugins/Import/src/wizard.cpp b/plugins/Import/src/wizard.cpp index 869fc81bf7..8d99fcd3ab 100644 --- a/plugins/Import/src/wizard.cpp +++ b/plugins/Import/src/wizard.cpp @@ -223,7 +223,7 @@ public: {
LPMINMAXINFO lpMMI = (LPMINMAXINFO)lParam;
lpMMI->ptMinTrackSize.x = 330;
- lpMMI->ptMinTrackSize.y = 232;
+ lpMMI->ptMinTrackSize.y = 286;
}
return 1;
|