From d8cab321e7428d723ef4fdbe0de947303589e8a0 Mon Sep 17 00:00:00 2001 From: aunsane Date: Tue, 9 May 2017 23:37:16 +0300 Subject: CloudFile: fix options --- plugins/CloudFile/src/options.cpp | 3 +++ plugins/CloudFile/src/options.h | 1 + plugins/CloudFile/src/resource.h | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) (limited to 'plugins/CloudFile/src') diff --git a/plugins/CloudFile/src/options.cpp b/plugins/CloudFile/src/options.cpp index ca9a860962..11abf03c01 100644 --- a/plugins/CloudFile/src/options.cpp +++ b/plugins/CloudFile/src/options.cpp @@ -3,6 +3,7 @@ COptionsMain::COptionsMain() : CPluginDlgBase(hInstance, IDD_OPTIONS_MAIN, MODULE), m_defaultService(this, IDC_DEFAULTSERVICE), + m_doNothingOnConflict(this, IDC_DONOTHINGONCONFLICT), m_renameOnConflict(this, IDC_RENAMEONCONFLICT), m_repalceOnConflict(this, IDC_REPLACEONCONFLICT), m_urlAutoSend(this, IDC_URL_AUTOSEND), @@ -41,6 +42,8 @@ void COptionsMain::OnInitDialog() m_renameOnConflict.SetState(TRUE); else if (strategy == OnConflict::REPLACE) m_repalceOnConflict.SetState(TRUE); + else + m_doNothingOnConflict.SetState(TRUE); } void COptionsMain::OnApply() diff --git a/plugins/CloudFile/src/options.h b/plugins/CloudFile/src/options.h index a0fd102c7d..7b16de5db6 100644 --- a/plugins/CloudFile/src/options.h +++ b/plugins/CloudFile/src/options.h @@ -6,6 +6,7 @@ class COptionsMain : public CPluginDlgBase private: CCtrlCombo m_defaultService; + CCtrlCheck m_doNothingOnConflict; CCtrlCheck m_renameOnConflict; CCtrlCheck m_repalceOnConflict; diff --git a/plugins/CloudFile/src/resource.h b/plugins/CloudFile/src/resource.h index 90d32f5162..384581fb4f 100644 --- a/plugins/CloudFile/src/resource.h +++ b/plugins/CloudFile/src/resource.h @@ -14,7 +14,7 @@ #define IDC_OAUTH_AUTHORIZE 122 #define IDD_OPTIONS_MAIN 1000 #define IDC_DEFAULTSERVICE 1001 -#define IDC_DONOTHING 1010 +#define IDC_DONOTHINGONCONFLICT 1010 #define IDC_RENAMEONCONFLICT 1011 #define IDC_REPLACEONCONFLICT 1012 #define IDC_URL_ISTEMPORARY 1021 -- cgit v1.2.3