[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [gluon/creator-distributionsupport-shreya] creator/plugins: Moving wizard to docks/distributiondock/
From: Shreya Pandit <shreya () shreyapandit ! com>
Date: 2012-08-16 7:57:11
Message-ID: 20120816075711.2D8D2A6094 () git ! kde ! org
[Download RAW message or body]
Git commit f559dac825d9bc966c7f0ff5d3cd7ce762957871 by Shreya Pandit.
Committed on 15/08/2012 at 11:30.
Pushed by pandit into branch 'creator-distributionsupport-shreya'.
Moving wizard to docks/distributiondock/
M +2 -1 creator/plugins/docks/distributiondock/CMakeLists.txt
M +2 -3 creator/plugins/docks/distributiondock/distributiondock.cpp
R +6 -7 creator/plugins/docks/distributiondock/distributionwizard/CMakeLists.txt \
[from: creator/plugins/tools/distributionwizard/CMakeLists.txt - 058% similarity] R \
+10 -9 creator/plugins/docks/distributiondock/distributionwizard/distributionwizard.cpp \
[from: creator/plugins/tools/distributionwizard/distributionwizard.cpp - 089% \
similarity] R +0 -1 \
creator/plugins/docks/distributiondock/distributionwizard/distributionwizard.h [from: \
creator/plugins/tools/distributionwizard/distributionwizard.h - 099% similarity] R \
+0 -0 creator/plugins/docks/distributiondock/distributionwizard/distributionwizard.ui \
[from: creator/plugins/tools/distributionwizard/distributionwizard.ui - 100% \
similarity] R +2 -2 \
creator/plugins/docks/distributiondock/distributionwizard/gluon_creator_dockplugin_distributionwizard.desktop \
[from: creator/plugins/tools/distributionwizard/gluon_creator_toolplugin_distributionwizard.desktop \
- 082% similarity] A +1 -0 creator/plugins/docks/test/test.cpp [License: \
Trivial file] M +1 -2 creator/plugins/tools/CMakeLists.txt
http://commits.kde.org/gluon/f559dac825d9bc966c7f0ff5d3cd7ce762957871
diff --git a/creator/plugins/docks/distributiondock/CMakeLists.txt \
b/creator/plugins/docks/distributiondock/CMakeLists.txt index b4aaac5..12a933a 100644
--- a/creator/plugins/docks/distributiondock/CMakeLists.txt
+++ b/creator/plugins/docks/distributiondock/CMakeLists.txt
@@ -1,12 +1,13 @@
set(distributiondock_SRCS
distributiondock.cpp
distributiondockplugin.cpp
- ../../tools/distributionwizard/distributionwizard.cpp
+ distributionwizard/distributionwizard.cpp
)
kde4_add_ui_files(
distributiondock_SRCS
distributiondock.ui
+ distributionwizard/distributionwizard.ui
)
kde4_add_plugin(gluon_creator_dockplugin_distributiondock ${distributiondock_SRCS})
diff --git a/creator/plugins/docks/distributiondock/distributiondock.cpp \
b/creator/plugins/docks/distributiondock/distributiondock.cpp index 5b31789..c4e9fb8 \
100644
--- a/creator/plugins/docks/distributiondock/distributiondock.cpp
+++ b/creator/plugins/docks/distributiondock/distributiondock.cpp
@@ -39,9 +39,8 @@
#include <QtGui/QPushButton>
#include <QtCore/QStateMachine>
#include <QtCore/QHistoryState>
-#include <../../tools/distributionwizard/distributionwizard.h>
-
-using namespace GluonCreator;
+#include "distributionwizard/distributionwizard.h"
+using namespace GluonCreator;
class DistributionDock::DistributionDockPrivate
{
diff --git a/creator/plugins/tools/distributionwizard/CMakeLists.txt \
b/creator/plugins/docks/distributiondock/distributionwizard/CMakeLists.txt similarity \
index 58% rename from creator/plugins/tools/distributionwizard/CMakeLists.txt
rename to creator/plugins/docks/distributiondock/distributionwizard/CMakeLists.txt
index b6a9f48..4cc792a 100644
--- a/creator/plugins/tools/distributionwizard/CMakeLists.txt
+++ b/creator/plugins/docks/distributiondock/distributionwizard/CMakeLists.txt
@@ -1,4 +1,3 @@
-
set(distributionwizard_SRCS
distributionwizard.cpp
)
@@ -9,19 +8,19 @@ kde4_add_ui_files(
distributionwizard.ui
)
+kde4_add_plugin(gluon_creator_dockplugin_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
+install(TARGETS gluon_creator_dockplugin_distributionwizard
DESTINATION ${PLUGIN_INSTALL_DIR}
)
-target_link_libraries(gluon_creator_toolplugin_distributionwizard \
${GLUON_CREATOR_LIBS} ${GLUON_PLAYER_LIBS}) \
+target_link_libraries(gluon_creator_dockplugin_distributionwizard \
${GLUON_CREATOR_LIBS} ${GLUON_PLAYER_LIBS})
-install(FILES gluon_creator_toolplugin_distributionwizard.desktop
+install(FILES gluon_creator_dockplugin_distributionwizard.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
diff --git a/creator/plugins/tools/distributionwizard/distributionwizard.cpp \
b/creator/plugins/docks/distributiondock/distributionwizard/distributionwizard.cpp \
similarity index 89% rename from \
creator/plugins/tools/distributionwizard/distributionwizard.cpp rename to \
creator/plugins/docks/distributiondock/distributionwizard/distributionwizard.cpp \
index c6a8971..db35576 100644
--- a/creator/plugins/tools/distributionwizard/distributionwizard.cpp
+++ b/creator/plugins/docks/distributiondock/distributionwizard/distributionwizard.cpp
@@ -18,7 +18,9 @@
*/
#include "distributionwizard.h"
+#include <ui_distributionwizard.h>
#include <player/lib/serviceprovider.h>
+#include <engine/game.h>
#include <player/lib/addgamejob.h>
#include <player/lib/categorylistjob.h>
#include <player/lib/editgamejob.h>
@@ -27,7 +29,6 @@
#include <player/lib/gamedetailsjob.h>
#include <player/lib/gameuploadjob.h>
#include <player/lib/archive/archiver.h>
-#include "ui_distributionwizard.h"
#include <QDebug>
@@ -45,8 +46,8 @@ class DistributionWizard::DistributionWizardPrivate
DistributionWizard::DistributionWizard():QObject(),d( new \
DistributionWizardPrivate() ) {
d->wizard.setupUi(&d->wizardobj);
-// updateCategories();
- // updateLicenses();
+ // updateCategories();
+// updateLicenses();
}
DistributionWizard::~DistributionWizard()
@@ -61,23 +62,23 @@ void DistributionWizard::startWizard()
}
void DistributionWizard::updateCategories()
{
- /* GluonPlayer::CategoryListJob* categoryListJob = \
GluonPlayer::ServiceProvider::instance()->fetchCategories(); + /* \
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())); +/* GluonPlayer::AddGameJob* addGameJob \
= GluonPlayer::ServiceProvider::instance()->addGame(d->wizard.nameEdit->text(),categoryIds.at( \
d->wizard.categoryComboBox->currentIndex())); connect( addGameJob, \
SIGNAL(succeeded()), SLOT(uploadFinished()));
-// connect( addGameJob, SIGNAL(failed()), SLOT(newGameUploadFailed()) );
-// addGameJob->start();*/
+ // connect( addGameJob, SIGNAL(failed()), SLOT(newGameUploadFailed()) );
+ addGameJob->start();*/
}
void DistributionWizard::uploadFinished()
{
-/* QString id = qobject_cast<GluonPlayer::AddGameJob*>( sender() \
)->data().toString();
- wizard.gameIdEdit->setText( id );
+ /* QString id = qobject_cast<GluonPlayer::AddGameJob*>( sender() \
)->data().toString(); + d->wizard.gameIdEdit->setText( id );
GluonEngine::Game::instance()->gameProject()->setProperty( "id", id );
updateUi();
emit gameUploadFinished();*/
diff --git a/creator/plugins/tools/distributionwizard/distributionwizard.h \
b/creator/plugins/docks/distributiondock/distributionwizard/distributionwizard.h \
similarity index 99% rename from \
creator/plugins/tools/distributionwizard/distributionwizard.h rename to \
creator/plugins/docks/distributiondock/distributionwizard/distributionwizard.h index \
3a5a8f4..f49ab50 100644
--- a/creator/plugins/tools/distributionwizard/distributionwizard.h
+++ b/creator/plugins/docks/distributiondock/distributionwizard/distributionwizard.h
@@ -28,7 +28,6 @@ class QWizard;
class DistributionWizard: public QObject
{
Q_OBJECT
-
public:
DistributionWizard();
virtual ~DistributionWizard();
diff --git a/creator/plugins/tools/distributionwizard/distributionwizard.ui \
b/creator/plugins/docks/distributiondock/distributionwizard/distributionwizard.ui \
similarity index 100% rename from \
creator/plugins/tools/distributionwizard/distributionwizard.ui rename to \
creator/plugins/docks/distributiondock/distributionwizard/distributionwizard.ui
diff --git a/creator/plugins/tools/distributionwizard/gluon_creator_toolplugin_distributionwizard.desktop \
b/creator/plugins/docks/distributiondock/distributionwizard/gluon_creator_dockplugin_distributionwizard.desktop
similarity index 82%
rename from creator/plugins/tools/distributionwizard/gluon_creator_toolplugin_distributionwizard.desktop
rename to creator/plugins/docks/distributiondock/distributionwizard/gluon_creator_dockplugin_distributionwizard.desktop
index 2910eca..48e30d7 100644
--- a/creator/plugins/tools/distributionwizard/gluon_creator_toolplugin_distributionwizard.desktop
+++ b/creator/plugins/docks/distributiondock/distributionwizard/gluon_creator_dockplugin_distributionwizard.desktop
@@ -9,11 +9,11 @@ Icon=gluon
Type=Service
ServiceTypes=GluonCreator/Plugin
-X-KDE-Library=gluon_creator_toolplugin_distributionwizard
+X-KDE-Library=gluon_creator_dockplugin_distributionwizard
X-KDE-GluonCreatorPluginVersion=1
X-KDE-PluginInfo-Author=Arjen Hiemstra
X-KDE-PluginInfo-Email=djfreestyler@gmail.com
-X-KDE-PluginInfo-Name=gluon_creator_toolplugin_projectinspector
+X-KDE-PluginInfo-Name=gluon_creator_dockplugin_projectinspector
X-KDE-PluginInfo-Version=0.1
X-KDE-PluginInfo-Website=http://gluon.gamingfreedom.org
X-KDE-PluginInfo-Category=tool
diff --git a/creator/plugins/docks/test/test.cpp \
b/creator/plugins/docks/test/test.cpp new file mode 100644
index 0000000..8d1c8b6
--- /dev/null
+++ b/creator/plugins/docks/test/test.cpp
@@ -0,0 +1 @@
+
diff --git a/creator/plugins/tools/CMakeLists.txt \
b/creator/plugins/tools/CMakeLists.txt index befb51b..4b3fc51 100644
--- a/creator/plugins/tools/CMakeLists.txt
+++ b/creator/plugins/tools/CMakeLists.txt
@@ -1,5 +1,4 @@
-#add_subdirectory(projectinspector)
-add_subdirectory(distributionwizard)
+add_subdirectory(projectinspector)
if(BUILD_GLUON_CREATOR_VCS)
add_subdirectory(vcs)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic