mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-20 15:59:42 +01:00
Code Issues Releases Wiki Activity

Namespace the other account resource files as well

Browse Source
This commit is contained in:
Jeff Mitchell 2013-02-20 13:12:16 -05:00
parent 35a3511ee5
commit 6883787551
13 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/accounts/twitter/TwitterAccount.cpp
View File

@ -60,8 +60,8 @@ TwitterAccount::TwitterAccount( const QString &accountId )
m_twitterAuth = QPointer< TomahawkOAuthTwitter >( new TomahawkOAuthTwitter( TomahawkUtils::nam(), this ) );
m_onlinePixmap = QPixmap( ":/twitter-icon.png" );
m_offlinePixmap = QPixmap( ":/twitter-offline-icon.png" );
m_onlinePixmap = QPixmap( ":/twitter-account/twitter-icon.png" );
m_offlinePixmap = QPixmap( ":/twitter-account/twitter-offline-icon.png" );
}

2
src/accounts/twitter/TwitterAccount.h
View File

@ -49,7 +49,7 @@ public:
QString prettyName() const { return "Twitter"; }
QString factoryId() const { return "twitteraccount"; }
QString description() const { return tr( "Connect to your Twitter followers." ); }
QPixmap icon() const { return QPixmap( ":/twitter-icon.png" ); }
QPixmap icon() const { return QPixmap( ":/twitter-account/twitter-icon.png" ); }
AccountTypes types() const { return AccountTypes( SipType | StatusPushType ); };
Account* createAccount( const QString& pluginId = QString() );
};

2
src/accounts/twitter/TwitterConfigWidget.ui
View File

@ -50,7 +50,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="resources.qrc">:/twitter-icon.png</pixmap>
<pixmap resource="resources.qrc">:/twitter-account/twitter-icon.png</pixmap>
</property>
</widget>
</item>

2
src/accounts/twitter/resources.qrc
View File

@ -1,5 +1,5 @@
<RCC>
<qresource prefix="/">
<qresource prefix="/twitter-account">
<file>twitter-icon.png</file>
<file>twitter-offline-icon.png</file>
</qresource>

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

@ -47,8 +47,8 @@ XmppAccount::XmppAccount( const QString &accountId )
m_configWidget = QPointer< AccountConfigWidget >( new XmppConfigWidget( this, 0 ) );
m_onlinePixmap = QPixmap( ":/xmpp-icon.png" );
m_offlinePixmap = QPixmap( ":/xmpp-offline-icon.png" );
m_onlinePixmap = QPixmap( ":/xmpp-account/xmpp-icon.png" );
m_offlinePixmap = QPixmap( ":/xmpp-account/xmpp-offline-icon.png" );
}

2
src/accounts/xmpp/XmppAccount.h
View File

@ -50,7 +50,7 @@ public:
QString prettyName() const { return "Jabber (XMPP)"; }
QString description() const { return tr( "Log on to your Jabber/XMPP account to connect to your friends" ); }
QString factoryId() const { return "xmppaccount"; }
QPixmap icon() const { return QPixmap( ":/xmpp-icon.png" ); }
QPixmap icon() const { return QPixmap( ":/xmpp-account/xmpp-icon.png" ); }
AccountTypes types() const { return AccountTypes( SipType | StatusPushType ); };
Account* createAccount( const QString& pluginId = QString() );
};

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

@ -35,7 +35,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="resources.qrc">:/xmpp-icon.png</pixmap>
<pixmap resource="resources.qrc">:/xmpp-account/xmpp-icon.png</pixmap>
</property>
</widget>
</item>

8
src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp
View File

@ -40,7 +40,7 @@ GoogleWrapperFactory::createAccount( const QString& pluginId )
QPixmap
GoogleWrapperFactory::icon() const
{
return QPixmap( ":/gmail-logo.png" );
return QPixmap( ":/google-account/gmail-logo.png" );
}
GoogleWrapperSip::GoogleWrapperSip( Account* account )
@ -90,13 +90,13 @@ GoogleWrapper::GoogleWrapper ( const QString& pluginID )
config->m_ui->emailLabel->setText( tr( "Google Address:" ) );
config->m_ui->xmppBlurb->setText( tr( "Enter your Google login to connect with your friends using Tomahawk!" ) );
config->m_ui->xmppUsername->setPlaceholderText( tr( "username@gmail.com" ) );
config->m_ui->logoLabel->setPixmap( QPixmap( ":/gmail-logo.png" ) );
config->m_ui->logoLabel->setPixmap( QPixmap( ":/google-account/gmail-logo.png" ) );
config->m_ui->xmppServer->setText( "talk.google.com" );
config->m_ui->xmppPort->setValue( 5222 );
config->m_ui->groupBoxXmppAdvanced->hide();
m_onlinePixmap = QPixmap( ":/gmail-logo.png" );
m_offlinePixmap = QPixmap( ":/gmail-offline-logo.png" );
m_onlinePixmap = QPixmap( ":/google-account/gmail-logo.png" );
m_offlinePixmap = QPixmap( ":/google-account/gmail-offline-logo.png" );
}
GoogleWrapper::~GoogleWrapper()

2
src/accounts/xmpp/googlewrapper/resources.qrc
View File

@ -1,5 +1,5 @@
<RCC>
<qresource prefix="/">
<qresource prefix="/google-account">
<file>gmail-logo.png</file>
<file>gmail-offline-logo.png</file>
</qresource>

2
src/accounts/xmpp/resources.qrc
View File

@ -1,5 +1,5 @@
<RCC>
<qresource prefix="/">
<qresource prefix="/xmpp-account">
<file>xmpp-icon.png</file>
<file>xmpp-offline-icon.png</file>
</qresource>

2
src/accounts/zeroconf/ConfigWidget.ui
View File

@ -38,7 +38,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="resources.qrc">:/zeroconf-icon.png</pixmap>
<pixmap resource="resources.qrc">:/zeroconf-account/zeroconf-icon.png</pixmap>
</property>
</widget>
</item>

2
src/accounts/zeroconf/ZeroconfAccount.cpp
View File

@ -31,7 +31,7 @@ ZeroconfFactory::ZeroconfFactory()
{
#ifndef ENABLE_HEADLESS
if ( s_icon == 0 )
s_icon = new QPixmap( ":/zeroconf-icon.png" );
s_icon = new QPixmap( ":/zeroconf-account/zeroconf-icon.png" );
#endif
}

2
src/accounts/zeroconf/resources.qrc
View File

@ -1,5 +1,5 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource>
<qresource prefix="/zeroconf-account">
<file>zeroconf-icon.png</file>
</qresource>
</RCC>