From ccbec1ea1c080d76b85fef65c6fb18d861e063bf Mon Sep 17 00:00:00 2001
From: Dart Raiden <wowemuh@gmail.com>
Date: Sat, 2 Apr 2016 18:56:06 +0000
Subject: Twitter: clarify massage about account reset; tune resources
git-svn-id: http://svn.miranda-ng.org/main/trunk@16578 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
protocols/Twitter/res/twitter.rc | 22 +++++++++++-----------
protocols/Twitter/src/connection.cpp | 2 +-
2 files changed, 12 insertions(+), 12 deletions(-)
(limited to 'protocols')
diff --git a/protocols/Twitter/res/twitter.rc b/protocols/Twitter/res/twitter.rc
index c696bba542..f16fe948e6 100644
--- a/protocols/Twitter/res/twitter.rc
+++ b/protocols/Twitter/res/twitter.rc
@@ -55,14 +55,14 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- LTEXT "Server:",IDC_STATIC,0,27,53,12
- COMBOBOX IDC_SERVER,54,27,131,12,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Server:",IDC_STATIC,0,32,53,8
+ COMBOBOX IDC_SERVER,54,30,131,12,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
CONTROL "Create a new Twitter account",IDC_NEWACCOUNTLINK,
- "Hyperlink",WS_TABSTOP,0,72,174,12
- EDITTEXT IDC_GROUP,54,49,131,12,ES_AUTOHSCROLL
- LTEXT "Default group:",IDC_STATIC,0,50,54,14
+ "Hyperlink",WS_TABSTOP,0,75,174,12
+ EDITTEXT IDC_GROUP,54,52,131,12,ES_AUTOHSCROLL
+ LTEXT "Default group:",IDC_STATIC,0,53,54,14
LTEXT "Username:",IDC_STATIC,0,9,51,13
- LTEXT "<Sign in to link your Twitter account>",IDC_USERNAME,55,9,122,15
+ LTEXT "<Sign in to link your Twitter account>",IDC_USERNAME,55,9,122,18
END
IDD_TWEET DIALOGEX 0, 0, 186, 64
@@ -82,10 +82,10 @@ EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "Miscellaneous options",IDC_MISC,17,14,269,82
- CONTROL "Use group chat for Twitter feed",IDC_CHATFEED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,28,133,10
+ CONTROL "Use group chat for Twitter feed",IDC_CHATFEED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,28,183,10
LTEXT "Base URL:",IDC_STATIC,25,43,41,8
- COMBOBOX IDC_BASEURL,72,41,89,30,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
- LTEXT "Polling rate:",IDC_STATIC,25,60,41,8
+ COMBOBOX IDC_BASEURL,72,41,95,30,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Polling rate:",IDC_STATIC,25,60,42,8
LTEXT "Once every",IDC_STATIC,72,60,40,8
EDITTEXT IDC_POLLRATE,113,58,30,14,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "sec",IDC_STATIC,148,60,19,8
@@ -125,8 +125,8 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "OK",IDOK,133,73,50,14
PUSHBUTTON "Cancel",IDCANCEL,192,73,50,14
- EDITTEXT IDC_PIN,50,42,154,14,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
- LTEXT "Enter the PIN provided by Twitter to complete your sign in. This is a one time process until you recreate your Miranda Twitter account.",IDC_STATIC,19,14,217,23
+ EDITTEXT IDC_PIN,50,44,154,14,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+ LTEXT "Enter the PIN provided by Twitter to complete your sign in. This is a one time process until you recreate your Miranda Twitter account.",IDC_STATIC,11,14,225,25
END
diff --git a/protocols/Twitter/src/connection.cpp b/protocols/Twitter/src/connection.cpp
index 04b29bf133..1fda6d3cb1 100644
--- a/protocols/Twitter/src/connection.cpp
+++ b/protocols/Twitter/src/connection.cpp
@@ -290,7 +290,7 @@ bool TwitterProto::NegotiateConnection()
debugLogA("**NegotiateConnection - Setting Consumer Keys and verifying creds...");
if (screenName.empty()) {
- ShowPopup(TranslateT("You're missing the Nick key in the database. This isn't really a big deal, but you'll notice some minor quirks (self contact in list, no group chat outgoing message highlighting, etc). To fix it either add it manually or reset your Twitter account in the Miranda account options"));
+ ShowPopup(TranslateT("You're missing the Nick key in the database. This isn't really a big deal, but you'll notice some minor quirks (self contact in list, no group chat outgoing message highlighting, etc). To fix it either add it manually or recreate your Miranda Twitter account"));
debugLogA("**NegotiateConnection - Missing the Nick key in the database. Everything will still work, but it's nice to have");
}
--
cgit v1.2.3