mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-22 13:43:11 +02:00
Cleanup
This commit is contained in:
@@ -36,7 +36,7 @@ DelegateConfigWrapper::DelegateConfigWrapper( Tomahawk::Accounts::Account* accou
|
|||||||
, m_errorLabel( new QLabel( this ) )
|
, m_errorLabel( new QLabel( this ) )
|
||||||
, m_deleted( false )
|
, m_deleted( false )
|
||||||
{
|
{
|
||||||
setWindowTitle( tr("%1 Config" ).arg( account->accountFriendlyName() ) );
|
setWindowTitle( tr("%1 Config", "Window title for account config windows" ).arg( account->accountFriendlyName() ) );
|
||||||
QVBoxLayout* v = new QVBoxLayout( this );
|
QVBoxLayout* v = new QVBoxLayout( this );
|
||||||
v->setContentsMargins( 0, 0, 0, 0 );
|
v->setContentsMargins( 0, 0, 0, 0 );
|
||||||
v->addWidget( m_widget );
|
v->addWidget( m_widget );
|
||||||
@@ -124,7 +124,7 @@ DelegateConfigWrapper::closed( QAbstractButton* b )
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
m_errorLabel->setText( "" );
|
m_errorLabel->setText( QString() );
|
||||||
m_account->testConfig();
|
m_account->testConfig();
|
||||||
}
|
}
|
||||||
else if ( b == m_deleteButton )
|
else if ( b == m_deleteButton )
|
||||||
@@ -158,7 +158,7 @@ DelegateConfigWrapper::updateSizeHint()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void DelegateConfigWrapper::showEvent(QShowEvent* event)
|
void DelegateConfigWrapper::showEvent( QShowEvent* event )
|
||||||
{
|
{
|
||||||
// TODO: would be cool to load the data only on show event instead of on widget creation
|
// TODO: would be cool to load the data only on show event instead of on widget creation
|
||||||
m_initialData = m_widget->readData();
|
m_initialData = m_widget->readData();
|
||||||
|
@@ -524,7 +524,6 @@ void ResolverAccount::testConfig()
|
|||||||
if ( resolver )
|
if ( resolver )
|
||||||
{
|
{
|
||||||
QVariantMap data = resolver->loadDataFromWidgets();
|
QVariantMap data = resolver->loadDataFromWidgets();
|
||||||
tLog() << "config data: " << data;
|
|
||||||
ScriptJob* job = resolver->scriptObject()->invoke( "_testConfig", data );
|
ScriptJob* job = resolver->scriptObject()->invoke( "_testConfig", data );
|
||||||
connect( job, SIGNAL( done( QVariantMap ) ), SLOT( onTestConfig( QVariantMap ) ) );
|
connect( job, SIGNAL( done( QVariantMap ) ), SLOT( onTestConfig( QVariantMap ) ) );
|
||||||
job->start();
|
job->start();
|
||||||
|
@@ -137,17 +137,14 @@ JSResolverHelper::log( const QString& message )
|
|||||||
void
|
void
|
||||||
JSResolverHelper::addTrackResults( const QVariantMap& results )
|
JSResolverHelper::addTrackResults( const QVariantMap& results )
|
||||||
{
|
{
|
||||||
tLog() << "Resolver reporting results:" << m_resolver->name() << results;
|
|
||||||
|
|
||||||
Q_ASSERT( results["results"].toMap().isEmpty() );
|
Q_ASSERT( results["results"].toMap().isEmpty() );
|
||||||
|
|
||||||
QList< Tomahawk::result_ptr > tracks = m_resolver->scriptAccount()->parseResultVariantList( results.value("results").toList() );
|
QList< Tomahawk::result_ptr > tracks = m_resolver->scriptAccount()->parseResultVariantList( results.value("results").toList() );
|
||||||
|
|
||||||
foreach( const result_ptr& track, tracks )
|
foreach( const result_ptr& track, tracks )
|
||||||
{
|
{
|
||||||
tLog() << "Found result: " << track->track()->track() << "by" << track->track()->artist();
|
|
||||||
track->setResolvedByResolver( m_resolver );
|
track->setResolvedByResolver( m_resolver );
|
||||||
track->setFriendlySource( "FOOBAR" );
|
track->setFriendlySource( m_resolver->name() );
|
||||||
}
|
}
|
||||||
|
|
||||||
QString qid = results.value("qid").toString();
|
QString qid = results.value("qid").toString();
|
||||||
|
@@ -227,7 +227,6 @@ ScriptAccount::scriptPluginFactory( const QString& type, const scriptobject_ptr&
|
|||||||
{
|
{
|
||||||
if ( type == "linkGenerator" )
|
if ( type == "linkGenerator" )
|
||||||
{
|
{
|
||||||
tLog() << "Got link generator plugin";
|
|
||||||
ScriptLinkGeneratorPlugin* lgp = new ScriptLinkGeneratorPlugin( object );
|
ScriptLinkGeneratorPlugin* lgp = new ScriptLinkGeneratorPlugin( object );
|
||||||
Utils::LinkGenerator::instance()->addPlugin( lgp );
|
Utils::LinkGenerator::instance()->addPlugin( lgp );
|
||||||
}
|
}
|
||||||
|
@@ -240,7 +240,6 @@ ScriptCollection::parseMetaData( const QVariantMap& metadata )
|
|||||||
int intType = type.toInt( &ok );
|
int intType = type.toInt( &ok );
|
||||||
if ( ok )
|
if ( ok )
|
||||||
{
|
{
|
||||||
tLog() << intType;
|
|
||||||
m_browseCapabilities << static_cast< BrowseCapability >( intType );
|
m_browseCapabilities << static_cast< BrowseCapability >( intType );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -176,7 +176,6 @@ ScriptInfoPlugin::parseSupportedTypes( const QVariant& variant )
|
|||||||
{
|
{
|
||||||
results.insert( static_cast< Tomahawk::InfoSystem::InfoType >( intType ) );
|
results.insert( static_cast< Tomahawk::InfoSystem::InfoType >( intType ) );
|
||||||
}
|
}
|
||||||
tLog() << type << intType;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return results;
|
return results;
|
||||||
|
@@ -345,7 +345,6 @@ CollectionViewPage::restoreViewMode()
|
|||||||
CollectionViewPageMode mode = (CollectionViewPageMode) modeNumber;
|
CollectionViewPageMode mode = (CollectionViewPageMode) modeNumber;
|
||||||
if ( mode == CollectionViewPage::Columns && !m_collection->browseCapabilities().contains( Collection::CapabilityBrowseArtists ) )
|
if ( mode == CollectionViewPage::Columns && !m_collection->browseCapabilities().contains( Collection::CapabilityBrowseArtists ) )
|
||||||
{
|
{
|
||||||
tLog() << Q_FUNC_INFO << 0;
|
|
||||||
if ( m_collection->browseCapabilities().contains( Collection::CapabilityBrowseAlbums ) )
|
if ( m_collection->browseCapabilities().contains( Collection::CapabilityBrowseAlbums ) )
|
||||||
setCurrentMode( CollectionViewPage::Albums );
|
setCurrentMode( CollectionViewPage::Albums );
|
||||||
else if ( m_collection->browseCapabilities().contains( Collection::CapabilityBrowseTracks ) )
|
else if ( m_collection->browseCapabilities().contains( Collection::CapabilityBrowseTracks ) )
|
||||||
@@ -353,14 +352,12 @@ CollectionViewPage::restoreViewMode()
|
|||||||
}
|
}
|
||||||
else if ( mode == CollectionViewPage::Albums && !m_collection->browseCapabilities().contains( Collection::CapabilityBrowseAlbums ) )
|
else if ( mode == CollectionViewPage::Albums && !m_collection->browseCapabilities().contains( Collection::CapabilityBrowseAlbums ) )
|
||||||
{
|
{
|
||||||
tLog() << Q_FUNC_INFO << 1;
|
|
||||||
if ( m_collection->browseCapabilities().contains( Collection::CapabilityBrowseTracks ) )
|
if ( m_collection->browseCapabilities().contains( Collection::CapabilityBrowseTracks ) )
|
||||||
setCurrentMode( CollectionViewPage::Flat );
|
setCurrentMode( CollectionViewPage::Flat );
|
||||||
else
|
else
|
||||||
setCurrentMode( CollectionViewPage::Columns );
|
setCurrentMode( CollectionViewPage::Columns );
|
||||||
} else if ( mode == CollectionViewPage::Flat && !m_collection->browseCapabilities().contains( Collection::CapabilityBrowseTracks ) )
|
} else if ( mode == CollectionViewPage::Flat && !m_collection->browseCapabilities().contains( Collection::CapabilityBrowseTracks ) )
|
||||||
{
|
{
|
||||||
tLog() << Q_FUNC_INFO << 2;
|
|
||||||
if ( m_collection->browseCapabilities().contains( Collection::CapabilityBrowseArtists ) )
|
if ( m_collection->browseCapabilities().contains( Collection::CapabilityBrowseArtists ) )
|
||||||
setCurrentMode( CollectionViewPage::Columns );
|
setCurrentMode( CollectionViewPage::Columns );
|
||||||
else if ( m_collection->browseCapabilities().contains( Collection::CapabilityBrowseAlbums ) )
|
else if ( m_collection->browseCapabilities().contains( Collection::CapabilityBrowseAlbums ) )
|
||||||
|
Reference in New Issue
Block a user