Fixes related with 7fc01c9

7 files changed, 11 insertions, 43 deletions

diff --git a/plugins/CloudFile/res/resource.rc b/plugins/CloudFile/res/resource.rc
index 53021dfa69..ac6165d105 100644
--- a/plugins/CloudFile/res/resource.rc
+++ b/plugins/CloudFile/res/resource.rc
@@ -109,8 +109,8 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,75,62,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,136,62,50,14
     LTEXT           "Enter authorization code:",IDC_STATIC,7,33,179,8
-    LTEXT           "To allow Miranda NG access to %s account:",IDC_AUTH_TEXT,7,7,140,8
-    PUSHBUTTON      "Authorize",IDC_OAUTH_AUTHORIZE,58,17,74,14
+    LTEXT           "To allow Miranda NG access to %s:",IDC_AUTH_TEXT,7,7,179,8
+    CONTROL         "Go to this link",IDC_OAUTH_AUTHORIZE,"Hyperlink",WS_GROUP | WS_TABSTOP | 0x1,7,18,179,8
 END
 
 
diff --git a/plugins/CloudFile/src/oauth.cpp b/plugins/CloudFile/src/oauth.cpp
index 1f837f021d..9ecd3a9ab8 100644
--- a/plugins/CloudFile/src/oauth.cpp
+++ b/plugins/CloudFile/src/oauth.cpp
@@ -15,14 +15,14 @@ COAuthDlg::COAuthDlg(CCloudService *service, const char *authUrl, pThreadFuncOwn
 
 void COAuthDlg::OnInitDialog()
 {
-	/*CCtrlBase *ctrl = FindControl(IDC_AUTH_TEXT);
-	ptrW format(ctrl->GetText());
+	CCtrlLabel &ctrl = *(CCtrlLabel*)FindControl(IDC_AUTH_TEXT);
+	ptrW format(ctrl.GetText());
 	wchar_t text[MAX_PATH];
 	mir_snwprintf(text, (const wchar_t*)format, m_service->GetUserName());
-	ctrl->SetText(text);*/
+	ctrl.SetText(text);
 }
 
-void COAuthDlg::Auth_OnClick(CCtrlButton*)
+void COAuthDlg::Auth_OnClick(CCtrlHyperlink*)
 {
 	if (SUCCEEDED(OleInitialize(NULL))) {
 		CComPtr<IWebBrowser2> browser;
diff --git a/plugins/CloudFile/src/oauth.h b/plugins/CloudFile/src/oauth.h
index cbc4b3855e..e38ae45fa3 100644
--- a/plugins/CloudFile/src/oauth.h
+++ b/plugins/CloudFile/src/oauth.h
@@ -8,14 +8,14 @@ private:
 	const char *m_authUrl;
 	pThreadFuncOwner m_requestAccessTokenThread;
 
-	CCtrlButton m_authorize;
+	CCtrlHyperlink m_authorize;
 	CCtrlEdit m_code;
 	CCtrlButton m_ok;
 
 protected:
 	void OnInitDialog() override;
 
-	void Auth_OnClick(CCtrlButton*);
+	void Auth_OnClick(CCtrlHyperlink*);
 	void Code_OnChange(CCtrlBase*);
 	void Ok_OnClick(CCtrlButton*);
 
diff --git a/plugins/CloudFile/src/resource.h b/plugins/CloudFile/src/resource.h
index 5a625809ca..aa5daf96da 100644
--- a/plugins/CloudFile/src/resource.h
+++ b/plugins/CloudFile/src/resource.h
@@ -29,7 +29,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        132
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1032
+#define _APS_NEXT_CONTROL_VALUE         1033
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif
diff --git a/plugins/CloudFile/src/transfers.cpp b/plugins/CloudFile/src/transfers.cpp
index b72c934abb..c70dbcf33f 100644
--- a/plugins/CloudFile/src/transfers.cpp
+++ b/plugins/CloudFile/src/transfers.cpp
@@ -8,7 +8,7 @@ INT_PTR CCloudService::SendFileInterceptor(WPARAM, LPARAM lParam)
 	for (auto &service : Services) {
 		auto it = service->InterceptedContacts.find(pccsd->hContact);
 		if (it == service->InterceptedContacts.end())
-			return CALLSERVICE_NOTFOUND;
+			continue;
 		service->InterceptedContacts.erase(it);
 		return (INT_PTR)service->SendFile(pccsd->hContact, (wchar_t*)pccsd->wParam, (wchar_t**)pccsd->lParam);
 	}
diff --git a/plugins/MirLua/src/mlua_options.cpp b/plugins/MirLua/src/mlua_options.cpp
index 9a4438d408..2a7d141e41 100644
--- a/plugins/MirLua/src/mlua_options.cpp
+++ b/plugins/MirLua/src/mlua_options.cpp
@@ -1,23 +1,5 @@
 #include "stdafx.h"

 

-CCtrlScriptList::CCtrlScriptList(CDlgBase* dlg, int ctrlId)

-	: CCtrlListView(dlg, ctrlId)

-{

-}

-

-BOOL CCtrlScriptList::OnNotify(int idCtrl, NMHDR *pnmh)

-{

-	if (pnmh->code == NM_CLICK)

-	{

-		TEventInfo evt = { this, pnmh };

-		OnClick(&evt);

-		return TRUE;

-	}

-	return CCtrlListView::OnNotify(idCtrl, pnmh);

-}

-

-/****************************************/

-

 CMLuaOptions::CMLuaOptions(int idDialog)

 	: CPluginDlgBase(g_hInstance, idDialog, MODULE),

 	m_popupOnError(this, IDC_POPUPONERROR),

diff --git a/plugins/MirLua/src/mlua_options.h b/plugins/MirLua/src/mlua_options.h
index 5d36188604..a8168d70da 100644
--- a/plugins/MirLua/src/mlua_options.h
+++ b/plugins/MirLua/src/mlua_options.h
@@ -3,20 +3,6 @@
 

 #include <m_gui.h>

 

-class CCtrlScriptList : public CCtrlListView

-{

-private:

-	typedef CCtrlListView CSuper;

-

-protected:

-	BOOL OnNotify(int idCtrl, NMHDR *pnmh);

-

-public:

-	CCtrlScriptList(CDlgBase* dlg, int ctrlId);

-

-	CCallback<TEventInfo> OnClick;

-};

-

 class CMLuaOptions : public CPluginDlgBase

 {

 private:

@@ -24,7 +10,7 @@ private:
 	CCtrlCheck m_popupOnObsolete;

 

 	bool isScriptListInit;

-	CCtrlScriptList m_scripts;

+	CCtrlListView m_scripts;

 	CCtrlButton m_reload;

 

 	void LoadScripts();