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