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

Add more api for qtscriptresolvers

This commit is contained in:
Dominik Schmidt
2011-06-27 04:22:40 +02:00
parent 931ed5b918
commit bf46ca7b71
2 changed files with 12 additions and 0 deletions

View File

@@ -97,5 +97,6 @@
<file>./data/sql/dbmigrate-22_to_23.sql</file> <file>./data/sql/dbmigrate-22_to_23.sql</file>
<file>./data/sql/dbmigrate-23_to_24.sql</file> <file>./data/sql/dbmigrate-23_to_24.sql</file>
<file>./data/sql/dbmigrate-24_to_25.sql</file> <file>./data/sql/dbmigrate-24_to_25.sql</file>
<file>./data/js/tomahawk.js</file>
</qresource> </qresource>
</RCC> </RCC>

View File

@@ -111,10 +111,21 @@ QtScriptResolver::QtScriptResolver( const QString& scriptPath )
} }
m_engine->mainFrame()->setHtml( "<html><body></body></html>" ); m_engine->mainFrame()->setHtml( "<html><body></body></html>" );
// add c++ part of tomahawk javascript library
m_engine->mainFrame()->addToJavaScriptWindowObject( "Tomahawk", m_resolverHelper ); m_engine->mainFrame()->addToJavaScriptWindowObject( "Tomahawk", m_resolverHelper );
// add rest of it
QFile jslib( RESPATH "js/tomahawk.js" );
jslib.open( QIODevice::ReadOnly );
m_engine->mainFrame()->evaluateJavaScript( jslib.readAll() );
jslib.close();
// execute resolver
m_engine->mainFrame()->evaluateJavaScript( scriptFile.readAll() ); m_engine->mainFrame()->evaluateJavaScript( scriptFile.readAll() );
scriptFile.close(); scriptFile.close();
QVariantMap m = resolverSettings(); QVariantMap m = resolverSettings();
m_name = m.value( "name" ).toString(); m_name = m.value( "name" ).toString();
m_weight = m.value( "weight", 0 ).toUInt(); m_weight = m.value( "weight", 0 ).toUInt();