mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-17 19:37:09 +02:00
Code Issues Releases Wiki Activity

Merge pull request #256 from willstott101/google_hint_link

Browse Source 
Added a link of users with restrictive security settings on google
This commit is contained in:
Christian Muehlhaeuser
2014-09-21 19:53:39 +02:00
parent 7c1c62cfde 8ca7de8ac2
commit 0fa0f6c620
4 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/accounts/google/GoogleWrapper.cpp
View File

@@ -94,6 +94,12 @@ GoogleWrapper::GoogleWrapper ( const QString& pluginID )
config->m_ui->xmppServer->setText( "talk.google.com" ); config->m_ui->xmppServer->setText( "talk.google.com" );
config->m_ui->xmppPort->setValue( 5222 ); config->m_ui->xmppPort->setValue( 5222 );
config->m_ui->groupBoxXmppAdvanced->hide(); config->m_ui->groupBoxXmppAdvanced->hide();
config->m_ui->serviceHint->show();
config->m_ui->serviceHint->setText("<html><head/><body><p>" +
tr( "You may need to change your " ) +
"<a href=\"https://www.google.com/settings/security/lesssecureapps\"><span style=\" text-decoration: underline; color:#0000ff;\">" +
tr( "Google Account settings" ) + "</span></a>" +
tr( " to login." ) + "</p></body></html>");
m_onlinePixmap = QPixmap( ":/google-account/gmail-logo.png" ); m_onlinePixmap = QPixmap( ":/google-account/gmail-logo.png" );
m_offlinePixmap = QPixmap( ":/google-account/gmail-offline-logo.png" ); m_offlinePixmap = QPixmap( ":/google-account/gmail-offline-logo.png" );

4
src/accounts/xmpp/XmppAccount.cpp
View File

@@ -23,6 +23,7 @@
#include "sip/SipPlugin.h" #include "sip/SipPlugin.h"
#include "XmppInfoPlugin.h" #include "XmppInfoPlugin.h"
#include "accounts/AccountConfigWidget.h" #include "accounts/AccountConfigWidget.h"
#include "ui_XmppConfigWidget.h"
#include <QtPlugin> #include <QtPlugin>
@@ -47,6 +48,9 @@ XmppAccount::XmppAccount( const QString &accountId )
m_configWidget = QPointer< AccountConfigWidget >( new XmppConfigWidget( this, 0 ) ); m_configWidget = QPointer< AccountConfigWidget >( new XmppConfigWidget( this, 0 ) );
XmppConfigWidget* config = static_cast< XmppConfigWidget* >( m_configWidget.data() );
config->m_ui->serviceHint->hide();
m_onlinePixmap = QPixmap( ":/xmpp-account/xmpp-icon.png" ); m_onlinePixmap = QPixmap( ":/xmpp-account/xmpp-icon.png" );
m_offlinePixmap = QPixmap( ":/xmpp-account/xmpp-offline-icon.png" ); m_offlinePixmap = QPixmap( ":/xmpp-account/xmpp-offline-icon.png" );
} }

1
src/accounts/xmpp/XmppConfigWidget.h
View File

@@ -66,6 +66,7 @@ private:
bool m_disableChecksForGoogle; bool m_disableChecksForGoogle;
friend class GoogleWrapper; // So google wrapper can modify the labels and text friend class GoogleWrapper; // So google wrapper can modify the labels and text
friend class XmppAccount; // So xmpp 'wrapper' can modify the labels and text
}; };
} }

27
src/accounts/xmpp/XmppConfigWidget.ui
View File

@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>451</width> <width>451</width>
<height>337</height> <height>448</height>
</rect> </rect>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
@@ -413,6 +413,31 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="serviceHint">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</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> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">