Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated Qt frontend to download resource package directly from google code and cleaned up the transition between the QML and Wagic interfaces

Browse Source
This commit is contained in:
Xawotihs
2011-12-29 23:42:20 +00:00
parent 8d6566da0f
commit e17b75cf34
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JGE/src/Qtmain.cpp
+5 -4
View File
@@ -79,7 +79,6 @@ public slots:
void displayStateChanged(const QDBusMessage &message); void displayStateChanged(const QDBusMessage &message);
#endif //Q_WS_MAEMO_5 #endif //Q_WS_MAEMO_5
protected: protected:
void initializeGL(); void initializeGL();
@@ -664,17 +663,19 @@ int main(int argc, char* argv[])
qDebug() << "Current path : " << QCoreApplication::applicationDirPath (); qDebug() << "Current path : " << QCoreApplication::applicationDirPath ();
QScopedPointer<QmlApplicationViewer> viewer(QmlApplicationViewer::create()); QScopedPointer<QmlApplicationViewer> viewer(QmlApplicationViewer::create());
// FIXME with something actually useful FileDownloader fileDownloader(QUrl("http://wagic.googlecode.com/files/core_017.zip"),
FileDownloader fileDownloader(QUrl("http://wagic.googlecode.com/files/wagic_0.16.0meego0_armel.deb"), "w00t.dat", 0); QDir::toNativeSeparators(QDir::homePath()) + "/.wagic/core_017.zip", 0);
if(!fileDownloader.isDone()){ if(!fileDownloader.isDone()){
app->connect(&fileDownloader, SIGNAL(downloaded()), SLOT(quit()));
viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto); viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
viewer->setMainQmlFile(QLatin1String("qml/QmlWagic/main.qml")); viewer->setMainQmlFile(QLatin1String("qml/QmlWagic/main.qml"));
viewer->rootContext()->setContextProperty("fileDownloader", &fileDownloader); viewer->rootContext()->setContextProperty("fileDownloader", &fileDownloader);
viewer->showExpanded(); viewer->showExpanded();
// FIXME we're actually have to close the QML app to start the native app...
app->exec(); app->exec();
viewer->close();
} }
g_launcher = new JGameLauncher(); g_launcher = new JGameLauncher();