From 7b1e719511bad7f12c7a9771919d4adecda9e304 Mon Sep 17 00:00:00 2001 From: Will Stott Date: Sun, 21 Sep 2014 18:19:53 +0100 Subject: [PATCH] re-named googleHint, serviceHint, and generalised --- src/accounts/google/GoogleWrapper.cpp | 7 ++++++- src/accounts/xmpp/XmppAccount.cpp | 2 +- src/accounts/xmpp/XmppConfigWidget.ui | 6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/accounts/google/GoogleWrapper.cpp b/src/accounts/google/GoogleWrapper.cpp index c0ab8cc8f..8a2f67a7e 100644 --- a/src/accounts/google/GoogleWrapper.cpp +++ b/src/accounts/google/GoogleWrapper.cpp @@ -94,7 +94,12 @@ 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(); + config->m_ui->serviceHint->show(); + config->m_ui->serviceHint->setText("

" + + tr( "You may need to change your " ) + + "" + + tr( "Google Account settings" ) + "" + + tr( " to login." ) + "

"); 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 c9ca306af..8f5b4ad64 100644 --- a/src/accounts/xmpp/XmppAccount.cpp +++ b/src/accounts/xmpp/XmppAccount.cpp @@ -49,7 +49,7 @@ 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(); + config->m_ui->serviceHint->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.ui b/src/accounts/xmpp/XmppConfigWidget.ui index 6c05a1cde..456cd84dd 100644 --- a/src/accounts/xmpp/XmppConfigWidget.ui +++ b/src/accounts/xmpp/XmppConfigWidget.ui @@ -414,15 +414,15 @@ - + 16777215 - 20 + 16777215 - <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> + <html><head/><body><p><br/></p></body></html> Qt::RichText