[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [gluon/creator-distributionsupport-shreya] creator/plugins: some CMake thing
From: Shreya Pandit <shreya () shreyapandit ! com>
Date: 2012-08-14 17:44:07
Message-ID: 20120814174407.42282A6094 () git ! kde ! org
[Download RAW message or body]
Git commit 6e52ba29d0ce4f178182c8b81dde458f32c49313 by Shreya Pandit.
Committed on 14/08/2012 at 19:43.
Pushed by pandit into branch 'creator-distributionsupport-shreya'.
some CMake thing
M +1 -1 creator/plugins/docks/distributiondock/distributiondock.cpp
M +2 -4 creator/plugins/tools/distributionwizard/CMakeLists.txt
M +101 -4 creator/plugins/tools/distributionwizard/distributionwizard.cpp
M +15 -3 creator/plugins/tools/distributionwizard/distributionwizard.h
M +20 -17 creator/plugins/tools/distributionwizard/distributionwizard.ui
http://commits.kde.org/gluon/6e52ba29d0ce4f178182c8b81dde458f32c49313
diff --git a/creator/plugins/docks/distributiondock/distributiondock.cpp \
b/creator/plugins/docks/distributiondock/distributiondock.cpp index 9ab27fd..5b31789 \
100644
--- a/creator/plugins/docks/distributiondock/distributiondock.cpp
+++ b/creator/plugins/docks/distributiondock/distributiondock.cpp
@@ -297,7 +297,7 @@ void DistributionDock::initGuiStates()
d->uploadingState->assignProperty( d->ui.createUpdateButton, "text", i18n( \
"Uploading" ) );
d->uploadingState->assignProperty( d->ui.gamePage, "enabled", false );
- d->loggedOutState->addTransition( d->ui.loginButton, SIGNAL(clicked()), \
d->loggingInState ); + d->loggedOutState->addTransition( d->ui.loginButton, \
SIGNAL(clicked()), d->loggingInState);
d->loggingInState->addTransition( GluonPlayer::ServiceProvider::instance(), \
SIGNAL(loginFinished()), d->loggedInState );
d->loggingInState->addTransition( GluonPlayer::ServiceProvider::instance(), \
SIGNAL(loginFailed()), d->loggedOutState );
d->fetchingState->addTransition( this, SIGNAL(switchToCreateMode()), \
d->createState );
diff --git a/creator/plugins/tools/distributionwizard/CMakeLists.txt \
b/creator/plugins/tools/distributionwizard/CMakeLists.txt index e904c99..b6a9f48 \
100644
--- a/creator/plugins/tools/distributionwizard/CMakeLists.txt
+++ b/creator/plugins/tools/distributionwizard/CMakeLists.txt
@@ -9,15 +9,13 @@ kde4_add_ui_files(
distributionwizard.ui
)
-kde4_add_plugin(gluon_creator_toolplugin_distributionwizard \
${distributionwizard_SRCS})
-
include_directories(
- # ${CMAKE_CURRENT_SOURCE_DIR}
+# ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${GLUON_PLAYER_INCLUDE_DIRS}
)
-
+kde4_add_plugin(gluon_creator_toolplugin_distributionwizard \
${distributionwizard_SRCS})
install(TARGETS gluon_creator_toolplugin_distributionwizard
DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/creator/plugins/tools/distributionwizard/distributionwizard.cpp \
b/creator/plugins/tools/distributionwizard/distributionwizard.cpp index \
c20fda7..c6a8971 100644
--- a/creator/plugins/tools/distributionwizard/distributionwizard.cpp
+++ b/creator/plugins/tools/distributionwizard/distributionwizard.cpp
@@ -18,19 +18,116 @@
*/
#include "distributionwizard.h"
-DistributionWizard::DistributionWizard()
+#include <player/lib/serviceprovider.h>
+#include <player/lib/addgamejob.h>
+#include <player/lib/categorylistjob.h>
+#include <player/lib/editgamejob.h>
+#include <player/lib/gamedetaillistjob.h>
+#include <player/lib/licensejob.h>
+#include <player/lib/gamedetailsjob.h>
+#include <player/lib/gameuploadjob.h>
+#include <player/lib/archive/archiver.h>
+#include "ui_distributionwizard.h"
+
+#include <QDebug>
+
+class DistributionWizard::DistributionWizardPrivate
{
- wizard.setupUi(&wizardobj);
+ public:
+ DistributionWizardPrivate()
+ {
+ }
+ Ui::Wizard wizard;
+ QWizard wizardobj;
+
+};
+
+DistributionWizard::DistributionWizard():QObject(),d( new \
DistributionWizardPrivate() ) +{
+ d->wizard.setupUi(&d->wizardobj);
+// updateCategories();
+ // updateLicenses();
}
DistributionWizard::~DistributionWizard()
{
- delete this;
+ delete d;
}
void DistributionWizard::startWizard()
{
- wizardobj.show();
+
+ d->wizardobj.show();
+}
+void DistributionWizard::updateCategories()
+{
+ /* GluonPlayer::CategoryListJob* categoryListJob = \
GluonPlayer::ServiceProvider::instance()->fetchCategories(); + connect( \
categoryListJob, SIGNAL(succeeded()), SLOT(categoriesFetched()) ); + \
categoryListJob->start();*/ +}
+
+void DistributionWizard::uploadGame()
+{
+/* GluonPlayer::AddGameJob* addGameJob = \
GluonPlayer::ServiceProvider::instance()->addGame(wizard.nameEdit->text(),categoryIds.at( \
wizard.categoryComboBox->currentIndex())); + connect( addGameJob, \
SIGNAL(succeeded()), SLOT(uploadFinished())); +// connect( addGameJob, \
SIGNAL(failed()), SLOT(newGameUploadFailed()) ); +// addGameJob->start();*/
+}
+
+void DistributionWizard::uploadFinished()
+{
+/* QString id = qobject_cast<GluonPlayer::AddGameJob*>( sender() \
)->data().toString(); + wizard.gameIdEdit->setText( id );
+ GluonEngine::Game::instance()->gameProject()->setProperty( "id", id );
+ updateUi();
+ emit gameUploadFinished();*/
+}
+
+void DistributionWizard::updateUi()
+{
+/* GluonPlayer::GameDetailsJob* gameDetailsJob = \
GluonPlayer::ServiceProvider::instance()->fetchOneGame( id ); + connect( \
gameDetailsJob, SIGNAL(succeeded()), SLOT(gameDetailsFetched()) ) ; + \
gameDetailsJob->start();*/ +
+}
+
+void DistributionWizard::categoriesFetched()
+{
+/* QList<GluonPlayer::CategoryItem*> categories = \
qobject_cast<GluonPlayer::CategoryListJob*>( sender() )->data().value< \
QList<GluonPlayer::CategoryItem*> >(); + wizard.categoryComboBox->clear();
+ categoryIds.clear();
+
+ foreach( GluonPlayer::CategoryItem * category, categories )
+ {
+ QString categoryString = category->name();
+ if( categoryString.startsWith( QLatin1String("Gluon"), Qt::CaseInsensitive ) \
) + {
+ categoryIds.append( category->id() );
+ wizard.categoryComboBox->addItem( categoryString );
+ }
+ }
+*/
+}
+
+void DistributionWizard::updateLicenses()
+{
+ /* GluonPlayer::LicenseJob* licenseJob = \
GluonPlayer::ServiceProvider::instance()->fetchLicenses(); + connect( licenseJob, \
SIGNAL(succeeded()), SLOT(licensesFetched()) ); + licenseJob->start();*/
+}
+
+
+void DistributionWizard::licensesFetched()
+{/*
+ QList<GluonPlayer::LicenseItem*> licenses = \
qobject_cast<GluonPlayer::LicenseJob*>( sender() )->data().value< \
QList<GluonPlayer::LicenseItem*> >(); + wizard.licenseComboBox->clear();
+ licenseIds.clear();
+
+ foreach( GluonPlayer::LicenseItem * license, licenses )
+ {
+ licenseIds.append( license->id() );
+ wizard.licenseComboBox->addItem( license->licenseName() );
+ }*/
}
#include "distributionwizard.moc"
diff --git a/creator/plugins/tools/distributionwizard/distributionwizard.h \
b/creator/plugins/tools/distributionwizard/distributionwizard.h index \
b9f0a32..3a5a8f4 100644
--- a/creator/plugins/tools/distributionwizard/distributionwizard.h
+++ b/creator/plugins/tools/distributionwizard/distributionwizard.h
@@ -20,7 +20,6 @@
#define DISTRIBUTIONWIZARD_H
#include "mainwindow.h"
-#include "../../../build/creator/plugins/tools/distributionwizard/ui_distributionwizard.h"
#include <QWizard>
#include <QWizardPage>
@@ -34,8 +33,21 @@ class DistributionWizard: public QObject
DistributionWizard();
virtual ~DistributionWizard();
void startWizard();
- Ui::Wizard wizard;
- QWizard wizardobj;
+ void updateCategories();
+ void updateLicenses();
+ void uploadGame();
+ void updateUi();
+ class DistributionWizardPrivate;
+ DistributionWizardPrivate* const d;
+
+ public slots:
+ void categoriesFetched();
+ void uploadFinished();
+ void licensesFetched();
+ private:
+ QStringList categoryIds;
+ QStringList licenseIds;
+
};
#endif // DISTRIBUTIONWIZARD_H
diff --git a/creator/plugins/tools/distributionwizard/distributionwizard.ui \
b/creator/plugins/tools/distributionwizard/distributionwizard.ui index \
81d3e1b..17a2f15 100644
--- a/creator/plugins/tools/distributionwizard/distributionwizard.ui
+++ b/creator/plugins/tools/distributionwizard/distributionwizard.ui
@@ -9,8 +9,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>496</width>
- <height>317</height>
+ <width>524</width>
+ <height>350</height>
</rect>
</property>
<property name="windowTitle">
@@ -58,8 +58,8 @@
<rect>
<x>10</x>
<y>-20</y>
- <width>361</width>
- <height>171</height>
+ <width>381</width>
+ <height>201</height>
</rect>
</property>
<property name="title">
@@ -71,7 +71,7 @@
<x>10</x>
<y>20</y>
<width>160</width>
- <height>131</height>
+ <height>161</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
@@ -90,16 +90,16 @@
</widget>
</item>
<item>
- <widget class="QLabel" name="label_6">
+ <widget class="QLabel" name="label_7">
<property name="text">
- <string>Version</string>
+ <string>Name</string>
</property>
</widget>
</item>
<item>
- <widget class="QLabel" name="label_7">
+ <widget class="QLabel" name="label_6">
<property name="text">
- <string>TextLabel</string>
+ <string>Version</string>
</property>
</widget>
</item>
@@ -125,24 +125,27 @@
<x>190</x>
<y>20</y>
<width>160</width>
- <height>135</height>
+ <height>162</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
- <widget class="QLineEdit" name="lineEdit"/>
+ <widget class="QLineEdit" name="gameIdEdit"/>
+ </item>
+ <item>
+ <widget class="QComboBox" name="categoryComboBox"/>
</item>
<item>
- <widget class="QComboBox" name="comboBox"/>
+ <widget class="QLineEdit" name="nameEdit"/>
</item>
<item>
- <widget class="QLineEdit" name="lineEdit_2"/>
+ <widget class="QLineEdit" name="versionEdit_2"/>
</item>
<item>
- <widget class="QLineEdit" name="lineEdit_3"/>
+ <widget class="QLineEdit" name="homePageEdit"/>
</item>
<item>
- <widget class="QComboBox" name="comboBox_2"/>
+ <widget class="QComboBox" name="licenseComboBox"/>
</item>
</layout>
</widget>
@@ -152,7 +155,7 @@
<property name="subTitle">
<string>A few words about your game</string>
</property>
- <widget class="QPlainTextEdit" name="plainTextEdit">
+ <widget class="QPlainTextEdit" name="descriptionEdit">
<property name="geometry">
<rect>
<x>3</x>
@@ -167,7 +170,7 @@
<property name="subTitle">
<string>Enter Game Changelog</string>
</property>
- <widget class="QPlainTextEdit" name="plainTextEdit_2">
+ <widget class="QPlainTextEdit" name="changelogEdit">
<property name="geometry">
<rect>
<x>10</x>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic