mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-04 13:17:34 +02:00
Code Issues Releases Wiki Activity

TWK-471: Show config UI for resolvers that have one as soon as you add the resolver

Browse Source
This commit is contained in:
Leo Franchi
2011-10-02 17:38:23 -04:00
parent 5594e25dcf
commit 2de19a1c94
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/resolversmodel.cpp
View File

@@ -28,7 +28,6 @@
#include "utils/logger.h" #include "utils/logger.h"
ResolversModel::ResolversModel( QObject* parent ) ResolversModel::ResolversModel( QObject* parent )
: QAbstractListModel( parent ) : QAbstractListModel( parent )
{ {
@@ -135,6 +134,11 @@ ResolversModel::addResolver( const QString& resolver, bool enable )
Tomahawk::ExternalResolver* res = Tomahawk::Pipeline::instance()->addScriptResolver( resolver, enable ); Tomahawk::ExternalResolver* res = Tomahawk::Pipeline::instance()->addScriptResolver( resolver, enable );
connect( res, SIGNAL( changed() ), this, SLOT( resolverChanged() ) ); connect( res, SIGNAL( changed() ), this, SLOT( resolverChanged() ) );
endInsertRows(); endInsertRows();
if ( res->configUI() )
emit openConfig( res->filePath() );
else
m_waitingForLoad << resolver;
} }
void void
@@ -177,6 +181,12 @@ ResolversModel::resolverChanged()
qDebug() << "Got resolverChanged signal, does it have a config UI yet?" << res->configUI(); qDebug() << "Got resolverChanged signal, does it have a config UI yet?" << res->configUI();
const QModelIndex idx = index( Tomahawk::Pipeline::instance()->scriptResolvers().indexOf( res ), 0, QModelIndex() ); const QModelIndex idx = index( Tomahawk::Pipeline::instance()->scriptResolvers().indexOf( res ), 0, QModelIndex() );
emit dataChanged( idx, idx ); emit dataChanged( idx, idx );
if ( m_waitingForLoad.contains( res->filePath() ) )
{
m_waitingForLoad.remove( res->filePath() );
emit openConfig( res->filePath() );
}
} }
} }

7
src/resolversmodel.h
View File

@@ -22,7 +22,7 @@
#include <QModelIndex> #include <QModelIndex>
#include <QStringList> #include <QStringList>
#include <QSet>
class ResolversModel : public QAbstractListModel class ResolversModel : public QAbstractListModel
{ {
@@ -49,11 +49,16 @@ public:
void removeResolver( const QString& resolver ); void removeResolver( const QString& resolver );
void saveScriptResolvers(); void saveScriptResolvers();
signals:
void openConfig( const QString& filePath );
private slots: private slots:
void resolverChanged(); void resolverChanged();
private: private:
void addInstalledResolvers(); void addInstalledResolvers();
QSet<QString> m_waitingForLoad;
}; };
#endif // RESOLVERSMODEL_H #endif // RESOLVERSMODEL_H

1
src/settingsdialog.cpp
View File

@@ -200,6 +200,7 @@ SettingsDialog::SettingsDialog( QWidget *parent )
m_resolversModel = new ResolversModel( this ); m_resolversModel = new ResolversModel( this );
ui->scriptList->setModel( m_resolversModel ); ui->scriptList->setModel( m_resolversModel );
ui->scriptList->setVerticalScrollMode( QAbstractItemView::ScrollPerPixel ); ui->scriptList->setVerticalScrollMode( QAbstractItemView::ScrollPerPixel );
connect( m_resolversModel, SIGNAL( openConfig( QString ) ), SLOT( openResolverConfig( QString ) ) );
#ifdef LIBATTICA_FOUND #ifdef LIBATTICA_FOUND
connect( ui->getMoreResolvers, SIGNAL( clicked() ), this, SLOT( getMoreResolvers() ) ); connect( ui->getMoreResolvers, SIGNAL( clicked() ), this, SLOT( getMoreResolvers() ) );