1 files changed, 9 insertions, 59 deletions

diff --git a/protocols/VKontakte/src/vk_options.cpp b/protocols/VKontakte/src/vk_options.cpp
index 3f993f2b64..b82babbaf1 100644
--- a/protocols/VKontakte/src/vk_options.cpp
+++ b/protocols/VKontakte/src/vk_options.cpp
@@ -1,5 +1,5 @@
 /*

-Copyright (c) 2013-24 Miranda NG team (https://miranda-ng.org)

+Copyright (c) 2013-25 Miranda NG team (https://miranda-ng.org)

 

 This program is free software; you can redistribute it and/or

 modify it under the terms of the GNU General Public License

@@ -22,56 +22,34 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 class CVkAccMgrForm : public CVkDlgBase

 {

 	typedef CVkDlgBase CSuper;

-

-	CCtrlEdit m_edtLogin;

-	CCtrlEdit m_edtPassword;

 	CCtrlHyperlink m_hlLink;

-

-	pass_ptrW m_pwszOldPass;

-	ptrW m_pwszOldLogin;

+	CCtrlButton m_btnTokenReq;

 

 public:

 	CVkAccMgrForm(CVkProto *proto, HWND hwndParent) :

 		CVkDlgBase(proto, IDD_ACCMGRUI),

-		m_edtLogin(this, IDC_LOGIN),

-		m_edtPassword(this, IDC_PASSWORD),

+		m_btnTokenReq(this, IDC_TOKENREQ),

 		m_hlLink(this, IDC_URL, "https://vk.com/")

 	{

 		SetParent(hwndParent);

-

-		CreateLink(m_edtLogin, "Login", L"");

+		m_btnTokenReq.OnClick = Callback(this, &CVkAccMgrForm::On_btnTokenReq_Click);

 	}

 

 	bool OnInitDialog() override

 	{

 		CSuper::OnInitDialog();

-

-		m_pwszOldLogin = m_edtLogin.GetText();

-		m_edtLogin.SendMsg(EM_LIMITTEXT, 1024, 0);

-

-		m_pwszOldPass = m_proto->GetUserStoredPassword();

-		m_edtPassword.SetText(m_pwszOldPass);

-		m_edtPassword.SendMsg(EM_LIMITTEXT, 1024, 0);

 		return true;

 	}

 

 	bool OnApply() override

 	{

-		pass_ptrW pwszNewPass(m_edtPassword.GetText());

-		bool bPassChanged = mir_wstrcmp(m_pwszOldPass, pwszNewPass) != 0;

-		if (bPassChanged) {

-			T2Utf szRawPasswd(pwszNewPass);

-			m_proto->setString("Password", szRawPasswd);

-			pass_ptrA pszPass(szRawPasswd.detach());

-			m_pwszOldPass = pwszNewPass.detach();

-		}

-

-		ptrW pwszNewLogin(m_edtLogin.GetText());

-		if (bPassChanged || mir_wstrcmpi(m_pwszOldLogin, pwszNewLogin))

-			m_proto->ClearAccessToken();

-		m_pwszOldLogin = pwszNewLogin.detach();

 		return true;

 	}

+

+	void On_btnTokenReq_Click(CCtrlButton*)

+	{

+		m_proto->LogIn();

+	}

 };

 

 MWindow CVkProto::OnCreateAccMgrUI(MWindow hwndParent)

@@ -160,21 +138,15 @@ static vkMarkMsgAsReadMethods[] =
 

 CVkOptionAccountForm::CVkOptionAccountForm(CVkProto *proto) :

 	CVkDlgBase(proto, IDD_OPT_MAIN),

-	m_edtLogin(this, IDC_LOGIN),

-	m_edtPassword(this, IDC_PASSWORD),

-	m_hlLink(this, IDC_URL, "https://vk.com/"),

 	m_edtGroupName(this, IDC_GROUPNAME),

 	m_cbxVKLang(this, IDC_COMBO_LANGUAGE),

-	m_cbDelivery(this, IDC_DELIVERY),

 	m_cbLoadLastMessageOnMsgWindowsOpen(this, IDC_LASTHISTORYLOAD),

 	m_cbUseLocalTime(this, IDC_USE_LOCAL_TIME),

 	m_cbLoadOnlyFriends(this, IDC_LOADONLYFRIENDS),

 	m_cbxMarkAsRead(this, IDC_COMBO_MARKASREAD),

 	m_cbxSyncHistory(this, IDC_COMBO_SYNCHISTORY)

 {

-	CreateLink(m_edtLogin, "Login", L"");

 	CreateLink(m_edtGroupName, m_proto->m_vkOptions.pwszDefaultGroup);

-	CreateLink(m_cbDelivery, m_proto->m_vkOptions.bServerDelivery);

 	CreateLink(m_cbLoadLastMessageOnMsgWindowsOpen, m_proto->m_vkOptions.bLoadLastMessageOnMsgWindowsOpen);

 	CreateLink(m_cbUseLocalTime, m_proto->m_vkOptions.bUseLocalTime);

 	CreateLink(m_cbLoadOnlyFriends, m_proto->m_vkOptions.bLoadOnlyFriends);

@@ -182,13 +154,6 @@ CVkOptionAccountForm::CVkOptionAccountForm(CVkProto *proto) :
 

 bool CVkOptionAccountForm::OnInitDialog()

 {

-	m_pwszOldLogin = m_edtLogin.GetText();

-	m_edtLogin.SendMsg(EM_LIMITTEXT, 1024, 0);

-

-	m_pwszOldPass = m_proto->GetUserStoredPassword();

-	m_edtPassword.SetText(m_pwszOldPass);

-	m_edtPassword.SendMsg(EM_LIMITTEXT, 1024, 0);

-

 	m_pwszOldGroup = m_edtGroupName.GetText();

 

 	int iListIndex = MarkMsgReadOn::markOnRead;

@@ -229,19 +194,6 @@ bool CVkOptionAccountForm::OnApply()
 		m_pwszOldGroup = pwszGroupName;

 	}

 

-	pass_ptrW pwszNewPass(m_edtPassword.GetText());

-	bool bPassChanged = mir_wstrcmp(m_pwszOldPass, pwszNewPass) != 0;

-	if (bPassChanged) {

-		T2Utf szRawPasswd(pwszNewPass);

-		m_proto->setString("Password", szRawPasswd);

-		pass_ptrA pszPass(szRawPasswd.detach());

-		m_pwszOldPass = pwszNewPass;

-	}

-

-	ptrW pwszNewLogin(m_edtLogin.GetText());

-	if (bPassChanged || mir_wstrcmpi(m_pwszOldLogin, pwszNewLogin))

-		m_proto->ClearAccessToken();

-	m_pwszOldLogin = pwszNewLogin;

 	return true;

 }

 

@@ -448,7 +400,6 @@ CVkOptionViewForm::CVkOptionViewForm(CVkProto *proto) :
 	m_cbBBCForAttachmentsAdvanced(this, IDC_ATTBBC_ADV),

 	m_cbStikersAsSmyles(this, IDC_STICKERS_AS_SMYLES),

 	m_cbShortenLinksForAudio(this, IDC_SHOTEN_LINKS_FOR_AUDIO),

-	m_cbAddMessageLinkToMesWAtt(this, IDC_ADD_MES_LINK_MES_ATT),

 	m_cbUseNonStandardNotifications(this, IDC_USENOSTDPOPUPS),

 	m_cbShowBeforeEditedPostVersion(this, IDC_ADD_ORIG_VER_IN_EDITED_MES)

 {

@@ -456,7 +407,6 @@ CVkOptionViewForm::CVkOptionViewForm(CVkProto *proto) :
 	CreateLink(m_cbUseBBCOnAttacmentsAsNews, m_proto->m_vkOptions.bUseBBCOnAttacmentsAsNews);

 	CreateLink(m_cbStikersAsSmyles, m_proto->m_vkOptions.bStikersAsSmileys);

 	CreateLink(m_cbShortenLinksForAudio, m_proto->m_vkOptions.bShortenLinksForAudio);

-	CreateLink(m_cbAddMessageLinkToMesWAtt, m_proto->m_vkOptions.bAddMessageLinkToMesWAtt);

 	CreateLink(m_cbUseNonStandardNotifications, m_proto->m_vkOptions.bUseNonStandardNotifications);

 	CreateLink(m_cbShowBeforeEditedPostVersion, m_proto->m_vkOptions.bShowBeforeEditedPostVersion);