mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-01-30 04:58:40 +01:00
Added a link to prompt users with restrictive security settings on google.
This commit is contained in:
parent
9893c8c9fc
commit
ee65c8d824
@ -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" );
|
||||
|
@ -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" );
|
||||
}
|
||||
|
@ -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
|
||||
};
|
||||
|
||||
}
|
||||
|
@ -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">
|
||||
|
Loading…
x
Reference in New Issue
Block a user