mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of git://github.com/tomahawk-player/tomahawk

Browse Source 
Conflicts:
	src/resolvers/qtscriptresolver.h
This commit is contained in:
Dominik Schmidt
2011-06-24 08:25:50 +02:00
parent cbd8caa171 e0cd07c442
commit bfec4043f6
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libtomahawk/contextMenu.cpp
View File

@@ -58,7 +58,7 @@ ContextMenu::setQueries( const QList<Tomahawk::query_ptr>& queries )
m_queries.clear(); m_queries.clear();
m_queries << queries; m_queries << queries;
if ( m_supportedActions & ActionPlay ) if ( m_supportedActions & ActionPlay && itemCount() == 1 )
m_sigmap->setMapping( addAction( tr( "&Play" ) ), ActionPlay ); m_sigmap->setMapping( addAction( tr( "&Play" ) ), ActionPlay );
if ( m_supportedActions & ActionQueue ) if ( m_supportedActions & ActionQueue )
@@ -102,7 +102,7 @@ ContextMenu::setAlbums( const QList<Tomahawk::album_ptr>& albums )
m_albums.clear(); m_albums.clear();
m_albums << albums; m_albums << albums;
if ( m_supportedActions & ActionPlay ) if ( m_supportedActions & ActionPlay && itemCount() == 1 )
m_sigmap->setMapping( addAction( tr( "&Play" ) ), ActionPlay ); m_sigmap->setMapping( addAction( tr( "&Play" ) ), ActionPlay );
if ( m_supportedActions & ActionQueue ) if ( m_supportedActions & ActionQueue )
@@ -141,7 +141,7 @@ ContextMenu::setArtists( const QList<Tomahawk::artist_ptr>& artists )
m_artists.clear(); m_artists.clear();
m_artists << artists; m_artists << artists;
if ( m_supportedActions & ActionPlay ) if ( m_supportedActions & ActionPlay && itemCount() == 1 )
m_sigmap->setMapping( addAction( tr( "&Play" ) ), ActionPlay ); m_sigmap->setMapping( addAction( tr( "&Play" ) ), ActionPlay );
if ( m_supportedActions & ActionQueue ) if ( m_supportedActions & ActionQueue )

6
src/resolvers/qtscriptresolver.cpp
View File

@@ -24,18 +24,20 @@
#include "sourcelist.h" #include "sourcelist.h"
#include "utils/tomahawkutils.h" #include "utils/tomahawkutils.h"
QtScriptResolverHelper::QtScriptResolverHelper( const QString& scriptPath, QObject* parent ): QObject(parent)
QtScriptResolverHelper::QtScriptResolverHelper( const QString& scriptPath, QObject* parent )
: QObject( parent )
{ {
m_scriptPath = scriptPath; m_scriptPath = scriptPath;
} }
QString QString
QtScriptResolverHelper::readFile( const QString& fileName ) QtScriptResolverHelper::readFile( const QString& fileName )
{ {
QString path = QFileInfo( m_scriptPath ).absolutePath(); QString path = QFileInfo( m_scriptPath ).absolutePath();
// remove directories // remove directories
QString cleanedFileName = QFileInfo( fileName ).fileName(); QString cleanedFileName = QFileInfo( fileName ).fileName();
QString absoluteFilePath = path.append( "/" ).append( cleanedFileName ); QString absoluteFilePath = path.append( "/" ).append( cleanedFileName );
QFile file( absoluteFilePath ); QFile file( absoluteFilePath );

1
src/resolvers/qtscriptresolver.h
View File

@@ -93,6 +93,7 @@ public:
virtual QWidget* configUI() const { return 0; } // TODO support properly for qtscript resolvers too! virtual QWidget* configUI() const { return 0; } // TODO support properly for qtscript resolvers too!
virtual void saveConfig() {} virtual void saveConfig() {}
public slots: public slots:
virtual void resolve( const Tomahawk::query_ptr& query ); virtual void resolve( const Tomahawk::query_ptr& query );
virtual void stop(); virtual void stop();