diff --git a/src/accounts/google/GoogleWrapper.cpp b/src/accounts/google/GoogleWrapper.cpp index c91bf9763..c0ab8cc8f 100644 --- a/src/accounts/google/GoogleWrapper.cpp +++ b/src/accounts/google/GoogleWrapper.cpp @@ -94,6 +94,7 @@ GoogleWrapper::GoogleWrapper ( const QString& pluginID ) config->m_ui->xmppServer->setText( "talk.google.com" ); config->m_ui->xmppPort->setValue( 5222 ); config->m_ui->groupBoxXmppAdvanced->hide(); + config->m_ui->googleHint->show(); m_onlinePixmap = QPixmap( ":/google-account/gmail-logo.png" ); m_offlinePixmap = QPixmap( ":/google-account/gmail-offline-logo.png" ); diff --git a/src/accounts/xmpp/XmppAccount.cpp b/src/accounts/xmpp/XmppAccount.cpp index 932956738..c9ca306af 100644 --- a/src/accounts/xmpp/XmppAccount.cpp +++ b/src/accounts/xmpp/XmppAccount.cpp @@ -23,6 +23,7 @@ #include "sip/SipPlugin.h" #include "XmppInfoPlugin.h" #include "accounts/AccountConfigWidget.h" +#include "ui_XmppConfigWidget.h" #include <QtPlugin> @@ -47,6 +48,9 @@ XmppAccount::XmppAccount( const QString &accountId ) m_configWidget = QPointer< AccountConfigWidget >( new XmppConfigWidget( this, 0 ) ); + XmppConfigWidget* config = static_cast< XmppConfigWidget* >( m_configWidget.data() ); + config->m_ui->googleHint->hide(); + m_onlinePixmap = QPixmap( ":/xmpp-account/xmpp-icon.png" ); m_offlinePixmap = QPixmap( ":/xmpp-account/xmpp-offline-icon.png" ); } diff --git a/src/accounts/xmpp/XmppConfigWidget.h b/src/accounts/xmpp/XmppConfigWidget.h index ec3739735..203f301a4 100644 --- a/src/accounts/xmpp/XmppConfigWidget.h +++ b/src/accounts/xmpp/XmppConfigWidget.h @@ -66,6 +66,7 @@ private: bool m_disableChecksForGoogle; friend class GoogleWrapper; // So google wrapper can modify the labels and text + friend class XmppAccount; // So xmpp 'wrapper' can modify the labels and text }; } diff --git a/src/accounts/xmpp/XmppConfigWidget.ui b/src/accounts/xmpp/XmppConfigWidget.ui index 96eacb053..6c05a1cde 100644 --- a/src/accounts/xmpp/XmppConfigWidget.ui +++ b/src/accounts/xmpp/XmppConfigWidget.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>451</width> - <height>337</height> + <height>448</height> </rect> </property> <property name="minimumSize"> @@ -413,6 +413,31 @@ </layout> </widget> </item> + <item> + <widget class="QLabel" name="googleHint"> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>20</height> + </size> + </property> + <property name="text"> + <string><html><head/><body><p>You may need to change your <a href="https://www.google.com/settings/security/lesssecureapps"><span style=" text-decoration: underline; color:#0000ff;">Google Account settings</span></a> to login.</p></body></html></string> + </property> + <property name="textFormat"> + <enum>Qt::RichText</enum> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + <property name="openExternalLinks"> + <bool>true</bool> + </property> + <property name="textInteractionFlags"> + <set>Qt::TextBrowserInteraction</set> + </property> + </widget> + </item> <item> <spacer name="verticalSpacer"> <property name="orientation">