From e84f4c2b63f9cf85b35082a31fe6144c34d63eb0 Mon Sep 17 00:00:00 2001 From: Sergey Bolhovskoy Date: Tue, 11 Nov 2014 19:25:56 +0000 Subject: VKontakte: fix for "Use Local Time" setting remove IDI_ICON1 preprocessor define fix "Password:" label position version bump git-svn-id: http://svn.miranda-ng.org/main/trunk@10956 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/VKontakte/res/resource.rc | 2 +- protocols/VKontakte/src/resource.h | 1 - protocols/VKontakte/src/version.h | 2 +- protocols/VKontakte/src/vk_proto.cpp | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) (limited to 'protocols') diff --git a/protocols/VKontakte/res/resource.rc b/protocols/VKontakte/res/resource.rc index 6368efe05c..f1d9f30f89 100644 --- a/protocols/VKontakte/res/resource.rc +++ b/protocols/VKontakte/res/resource.rc @@ -155,7 +155,7 @@ BEGIN GROUPBOX "Login settings",IDC_STATIC,4,8,293,50 RTEXT "E-mail or phone number:",IDC_STATIC,12,16,150,10 EDITTEXT IDC_LOGIN,167,15,121,12,ES_AUTOHSCROLL - RTEXT "Password:",IDC_STATIC,4,28,158,10 + RTEXT "Password:",IDC_STATIC,12,28,150,10 EDITTEXT IDC_PASSWORD,167,28,121,12,ES_PASSWORD | ES_AUTOHSCROLL CONTROL "Open VKontakte site",IDC_URL,"Hyperlink",WS_TABSTOP,59,43,174,11 GROUPBOX "Local settings",IDC_STATIC,4,59,293,77 diff --git a/protocols/VKontakte/src/resource.h b/protocols/VKontakte/src/resource.h index 9239bea5d2..1a2e567e6c 100644 --- a/protocols/VKontakte/src/resource.h +++ b/protocols/VKontakte/src/resource.h @@ -16,7 +16,6 @@ #define IDI_ABUSE 114 #define IDI_VISITPROFILE 115 #define IDI_HISTORY 116 -#define IDI_ICON1 117 #define IDI_BROADCAST 117 #define IDI_KEYS 203 #define IDC_LOGIN 1001 diff --git a/protocols/VKontakte/src/version.h b/protocols/VKontakte/src/version.h index 0e7fd82216..011a23b197 100644 --- a/protocols/VKontakte/src/version.h +++ b/protocols/VKontakte/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0 #define __MINOR_VERSION 1 #define __RELEASE_NUM 0 -#define __BUILD_NUM 26 +#define __BUILD_NUM 27 #include diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp index 56b90c9dfa..9b433c10ce 100644 --- a/protocols/VKontakte/src/vk_proto.cpp +++ b/protocols/VKontakte/src/vk_proto.cpp @@ -65,7 +65,7 @@ CVkProto::CVkProto(const char *szModuleName, const TCHAR *ptszUserName) : m_bHideChats = getBool("HideChats", true); m_bMesAsUnread = getBool("MesAsUnread", false); m_bAutoSyncHistory = getBool("AutoSyncHistory", true); - m_bUseLocalTime = getBool("LocalTime", false); + m_bUseLocalTime = getBool("UseLocalTime", false); m_bReportAbuse = getBool("ReportAbuseOnBanUser", false); m_bClearServerHistory = getBool("ClearServerHistoryOnBanUser", false); m_bRemoveFromFrendlist = getBool("RemoveFromFrendlistOnBanUser", false); -- cgit v1.2.3