mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-03-28 11:42:42 +01:00
Added placeholder text to invite lineedits. Also make compile on Mac.
This commit is contained in:
parent
20cd15662e
commit
0804152eaa
@ -98,6 +98,12 @@ TwitterSipPlugin::connectionState() const
|
||||
return m_state;
|
||||
}
|
||||
|
||||
QString
|
||||
TwitterSipPlugin::inviteString() const
|
||||
{
|
||||
return tr( "Enter Twitter username" );
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
TwitterSipPlugin::checkSettings()
|
||||
|
@ -50,6 +50,7 @@ public:
|
||||
|
||||
virtual bool isValid() const;
|
||||
virtual Tomahawk::Accounts::Account::ConnectionState connectionState() const;
|
||||
virtual QString inviteString() const;
|
||||
|
||||
signals:
|
||||
void stateChanged( Tomahawk::Accounts::Account::ConnectionState );
|
||||
|
@ -191,6 +191,12 @@ XmppSipPlugin::~XmppSipPlugin()
|
||||
delete m_client;
|
||||
}
|
||||
|
||||
QString
|
||||
XmppSipPlugin::inviteString() const
|
||||
{
|
||||
return tr( "Enter Jabber or Google ID" );
|
||||
}
|
||||
|
||||
|
||||
InfoSystem::InfoPluginPtr
|
||||
XmppSipPlugin::infoPlugin()
|
||||
|
@ -64,6 +64,7 @@ public:
|
||||
|
||||
//FIXME: Make this more correct
|
||||
virtual bool isValid() const { return true; }
|
||||
virtual QString inviteString() const;
|
||||
|
||||
Tomahawk::InfoSystem::InfoPluginPtr infoPlugin();
|
||||
|
||||
|
@ -57,6 +57,12 @@ SipPlugin::serviceName() const
|
||||
return m_account->accountServiceName();
|
||||
}
|
||||
|
||||
QString
|
||||
SipPlugin::inviteString() const
|
||||
{
|
||||
return QString();
|
||||
}
|
||||
|
||||
|
||||
#ifndef ENABLE_HEADLESS
|
||||
|
||||
|
@ -52,6 +52,7 @@ public:
|
||||
virtual bool isValid() const = 0;
|
||||
virtual const QString friendlyName() const;
|
||||
virtual const QString serviceName() const;
|
||||
virtual QString inviteString() const;
|
||||
#ifndef ENABLE_HEADLESS
|
||||
virtual QMenu* menu();
|
||||
#endif
|
||||
|
@ -273,5 +273,7 @@ AccountWidget::setupConnections( const QPersistentModelIndex& idx, int accountId
|
||||
this, SLOT( changeAccountConnectionState( bool ) ) );
|
||||
connect( m_inviteButton, SIGNAL( clicked() ),
|
||||
this, SLOT( sendInvite() ) );
|
||||
|
||||
m_inviteEdit->setPlaceholderText( account->sipPlugin()->inviteString() );
|
||||
}
|
||||
}
|
||||
|
@ -25,7 +25,7 @@
|
||||
#include <QVBoxLayout>
|
||||
|
||||
#ifdef QT_MAC_USE_COCOA
|
||||
#include "SourceTreePopupDialog_mac.h"
|
||||
#include "widgets/SourceTreePopupDialog_mac.h"
|
||||
#endif
|
||||
|
||||
AccountsPopupWidget::AccountsPopupWidget( QWidget* parent )
|
||||
|
Loading…
x
Reference in New Issue
Block a user