1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-05 13:47:26 +02:00

* Moved some files to libtomahawk.

This commit is contained in:
Lucas Lira Gomes
2012-05-29 19:40:17 -03:00
parent 2a5d061dee
commit 9fe91d6af1
14 changed files with 24 additions and 20 deletions

View File

@@ -68,8 +68,6 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui}
sourcetree/items/GroupItem.cpp sourcetree/items/GroupItem.cpp
sourcetree/items/HistoryItem.cpp sourcetree/items/HistoryItem.cpp
utils/GuiHelpers.cpp
accounts/lastfm/LastFmAccount.cpp accounts/lastfm/LastFmAccount.cpp
accounts/lastfm/LastFmConfig.cpp accounts/lastfm/LastFmConfig.cpp
accounts/lastfm/LastFmInfoPlugin.cpp accounts/lastfm/LastFmInfoPlugin.cpp
@@ -82,13 +80,9 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui}
AudioControls.cpp AudioControls.cpp
SettingsDialog.cpp SettingsDialog.cpp
DiagnosticsDialog.cpp DiagnosticsDialog.cpp
AccountDelegate.cpp
SettingsListDelegate.cpp SettingsListDelegate.cpp
DelegateConfigWrapper.cpp
TomahawkWindow.cpp TomahawkWindow.cpp
LoadXSPFDialog.cpp LoadXSPFDialog.cpp
AccountFactoryWrapper.cpp
AccountFactoryWrapperDelegate.cpp
SocialWidget.cpp SocialWidget.cpp
) )
@@ -107,7 +101,6 @@ SET( tomahawkUI ${tomahawkUI}
AudioControls.ui AudioControls.ui
LoadXSPFDialog.ui LoadXSPFDialog.ui
AccountFactoryWrapper.ui
SocialWidget.ui SocialWidget.ui
) )
@@ -122,7 +115,6 @@ INCLUDE_DIRECTORIES(
network network
sourcetree sourcetree
topbar topbar
utils
libtomahawk libtomahawk
mac mac

View File

@@ -32,16 +32,16 @@
#include "AtticaManager.h" #include "AtticaManager.h"
#include "TomahawkApp.h" #include "TomahawkApp.h"
#include "TomahawkSettings.h" #include "TomahawkSettings.h"
#include "DelegateConfigWrapper.h" #include "accounts/DelegateConfigWrapper.h"
#include "MusicScanner.h" #include "MusicScanner.h"
#include "Pipeline.h" #include "Pipeline.h"
#include "Resolver.h" #include "Resolver.h"
#include "ExternalResolverGui.h" #include "ExternalResolverGui.h"
#include "utils/TomahawkUtilsGui.h" #include "utils/TomahawkUtilsGui.h"
#include "GuiHelpers.h" #include "utils/GuiHelpers.h"
#include "ScanManager.h" #include "ScanManager.h"
#include "SettingsListDelegate.h" #include "SettingsListDelegate.h"
#include "AccountDelegate.h" #include "accounts/AccountDelegate.h"
#include "database/Database.h" #include "database/Database.h"
#include "network/Servent.h" #include "network/Servent.h"
#include "utils/AnimatedSpinner.h" #include "utils/AnimatedSpinner.h"
@@ -51,7 +51,7 @@
#include <accounts/AccountModelFilterProxy.h> #include <accounts/AccountModelFilterProxy.h>
#include <accounts/ResolverAccount.h> #include <accounts/ResolverAccount.h>
#include "utils/Logger.h" #include "utils/Logger.h"
#include "AccountFactoryWrapper.h" #include "accounts/AccountFactoryWrapper.h"
#include "accounts/spotify/SpotifyAccount.h" #include "accounts/spotify/SpotifyAccount.h"
#include "ui_ProxyDialog.h" #include "ui_ProxyDialog.h"

View File

@@ -191,6 +191,10 @@ set( libSources
accounts/AccountModel.cpp accounts/AccountModel.cpp
accounts/AccountModelFilterProxy.cpp accounts/AccountModelFilterProxy.cpp
accounts/ResolverAccount.cpp accounts/ResolverAccount.cpp
accounts/AccountDelegate.cpp
accounts/DelegateConfigWrapper.cpp
accounts/AccountFactoryWrapper.cpp
accounts/AccountFactoryWrapperDelegate.cpp
sip/SipPlugin.cpp sip/SipPlugin.cpp
sip/SipHandler.cpp sip/SipHandler.cpp
sip/SipInfo.cpp sip/SipInfo.cpp
@@ -288,6 +292,7 @@ set( libSources
utils/Qnr_IoDeviceStream.cpp utils/Qnr_IoDeviceStream.cpp
utils/XspfLoader.cpp utils/XspfLoader.cpp
utils/TomahawkCache.cpp utils/TomahawkCache.cpp
utils/GuiHelpers.cpp
thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp
thirdparty/kdsingleapplicationguard/kdsharedmemorylocker.cpp thirdparty/kdsingleapplicationguard/kdsharedmemorylocker.cpp
@@ -311,6 +316,7 @@ set( libUI ${libUI}
playlist/QueueView.ui playlist/QueueView.ui
context/ContextWidget.ui context/ContextWidget.ui
infobar/InfoBar.ui infobar/InfoBar.ui
accounts/AccountFactoryWrapper.ui
) )
include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.. .. include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.. ..

View File

@@ -604,6 +604,7 @@ AccountDelegate::drawStatus( QPainter* painter, const QPointF& rightTopEdge, Acc
{ {
QPixmap p; QPixmap p;
QString statusText; QString statusText;
const Account::ConnectionState state = acct->connectionState(); const Account::ConnectionState state = acct->connectionState();
if ( state == Account::Connected ) if ( state == Account::Connected )
{ {

View File

@@ -19,6 +19,7 @@
#ifndef ACCOUNTDELEGATE_H #ifndef ACCOUNTDELEGATE_H
#define ACCOUNTDELEGATE_H #define ACCOUNTDELEGATE_H
#include "DllMacro.h"
#include <QStyledItemDelegate> #include <QStyledItemDelegate>
#include "accounts/AccountModel.h" #include "accounts/AccountModel.h"
@@ -31,7 +32,7 @@ namespace Accounts
class Account; class Account;
class AccountDelegate : public QStyledItemDelegate class DLLEXPORT AccountDelegate : public QStyledItemDelegate
{ {
Q_OBJECT Q_OBJECT
public: public:

View File

@@ -20,7 +20,7 @@
#include "accounts/Account.h" #include "accounts/Account.h"
#include "accounts/AccountManager.h" #include "accounts/AccountManager.h"
#include "GuiHelpers.h" #include "utils/GuiHelpers.h"
#include "AccountFactoryWrapperDelegate.h" #include "AccountFactoryWrapperDelegate.h"
#include "DelegateConfigWrapper.h" #include "DelegateConfigWrapper.h"
#include "ui_AccountFactoryWrapper.h" #include "ui_AccountFactoryWrapper.h"

View File

@@ -19,6 +19,8 @@
#ifndef ACCOUNTFACTORYWRAPPER_H #ifndef ACCOUNTFACTORYWRAPPER_H
#define ACCOUNTFACTORYWRAPPER_H #define ACCOUNTFACTORYWRAPPER_H
#include "DllMacro.h"
#include <QDialog> #include <QDialog>
#include <QModelIndex> #include <QModelIndex>
@@ -33,7 +35,7 @@ class Account;
class Ui_AccountFactoryWrapper; class Ui_AccountFactoryWrapper;
// class AccountFactoryWrapper_ // class AccountFactoryWrapper_
class AccountFactoryWrapper : public QDialog class DLLEXPORT AccountFactoryWrapper : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:

View File

@@ -22,7 +22,7 @@
#include "accounts/Account.h" #include "accounts/Account.h"
#include "accounts/AccountManager.h" #include "accounts/AccountManager.h"
#include "DelegateConfigWrapper.h" #include "accounts/DelegateConfigWrapper.h"
#include "TomahawkSettings.h" #include "TomahawkSettings.h"
namespace TomahawkUtils namespace TomahawkUtils
@@ -169,4 +169,4 @@ openAccountConfig( Tomahawk::Accounts::Account* account, QWidget* parent, bool s
} // namespace TomahawkUtils } // namespace TomahawkUtils
#include "GuiHelpers.moc" #include "GuiHelpers.moc"

View File

@@ -19,6 +19,8 @@
#ifndef TOMAHAWK_GUI_HELPERS_H #ifndef TOMAHAWK_GUI_HELPERS_H
#define TOMAHAWK_GUI_HELPERS_H #define TOMAHAWK_GUI_HELPERS_H
#include "DllMacro.h"
class QWidget; class QWidget;
namespace Tomahawk { namespace Tomahawk {
namespace Accounts { namespace Accounts {
@@ -29,8 +31,8 @@ namespace Tomahawk {
namespace TomahawkUtils namespace TomahawkUtils
{ {
void createAccountFromFactory( Tomahawk::Accounts::AccountFactory*, QWidget* parent ); DLLEXPORT void createAccountFromFactory( Tomahawk::Accounts::AccountFactory*, QWidget* parent );
void openAccountConfig( Tomahawk::Accounts::Account*, QWidget* parent, bool showDelete = false ); DLLEXPORT void openAccountConfig( Tomahawk::Accounts::Account*, QWidget* parent, bool showDelete = false );
} }
#endif #endif