[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [gluon/creator-distributionsupport-shreya] creator/plugins/docks/distributiondock: upload initially
From: Shreya Pandit <shreya () shreyapandit ! com>
Date: 2012-08-16 9:38:02
Message-ID: 20120816093802.4CBE5A6094 () git ! kde ! org
[Download RAW message or body]
Git commit 4795077e9bcec5a18417cf7aacf605ab19402e48 by Shreya Pandit.
Committed on 16/08/2012 at 11:20.
Pushed by pandit into branch 'creator-distributionsupport-shreya'.
upload initially with name and category,set counter for tracing
M +99 -101 creator/plugins/docks/distributiondock/distributiondock.ui
M +24 -22 creator/plugins/docks/distributiondock/distributionwizard/distributionwizard.cpp
M +1 -0 creator/plugins/docks/distributiondock/distributionwizard/distributionwizard.h
http://commits.kde.org/gluon/4795077e9bcec5a18417cf7aacf605ab19402e48
diff --git a/creator/plugins/docks/distributiondock/distributiondock.ui \
b/creator/plugins/docks/distributiondock/distributiondock.ui index 6f79b55..82f395d \
100644
--- a/creator/plugins/docks/distributiondock/distributiondock.ui
+++ b/creator/plugins/docks/distributiondock/distributiondock.ui
@@ -20,7 +20,7 @@
<item>
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
- <number>1</number>
+ <number>2</number>
</property>
<widget class="QWidget" name="loginPage">
<layout class="QVBoxLayout" name="verticalLayout_11">
@@ -290,112 +290,110 @@
</layout>
</widget>
<widget class="QWidget" name="welcomePage">
- <widget class="QPushButton" name="loginChanged">
+ <widget class="QGroupBox" name="groupBox">
<property name="geometry">
<rect>
- <x>10</x>
- <y>50</y>
- <width>91</width>
- <height>24</height>
+ <x>-10</x>
+ <y>-10</y>
+ <width>461</width>
+ <height>391</height>
</rect>
</property>
- <property name="text">
- <string>Change</string>
+ <property name="title">
+ <string/>
</property>
- <property name="flat">
- <bool>false</bool>
- </property>
- </widget>
- <widget class="QPushButton" name="versionControl">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>80</y>
- <width>131</width>
- <height>24</height>
- </rect>
- </property>
- <property name="text">
- <string>Upload Newer Version</string>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QPushButton" name="checkHistory">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>110</y>
- <width>131</width>
- <height>24</height>
- </rect>
- </property>
- <property name="text">
- <string>Check Revision History</string>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QPushButton" name="uploadNew">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>140</y>
- <width>111</width>
- <height>24</height>
- </rect>
- </property>
- <property name="text">
- <string>Upload a new game</string>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QPushButton" name="changeDetails">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>170</y>
- <width>121</width>
- <height>24</height>
- </rect>
- </property>
- <property name="text">
- <string>Change Game Details</string>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QWidget" name="horizontalLayoutWidget">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>211</width>
- <height>31</height>
- </rect>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout_6">
- <item>
- <widget class="QLabel" name="label_13">
- <property name="text">
- <string>You are logged in as </string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="loginName">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- </layout>
+ <widget class="QWidget" name="horizontalLayoutWidget">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>20</y>
+ <width>301</width>
+ <height>31</height>
+ </rect>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <item>
+ <widget class="QLabel" name="label_13">
+ <property name="text">
+ <string>You are logged in as </string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="loginName">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="loginChanged">
+ <property name="text">
+ <string>Change</string>
+ </property>
+ <property name="flat">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="verticalLayoutWidget">
+ <property name="geometry">
+ <rect>
+ <x>-10</x>
+ <y>60</y>
+ <width>171</width>
+ <height>141</height>
+ </rect>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_12">
+ <item>
+ <widget class="QPushButton" name="uploadNew">
+ <property name="text">
+ <string>Upload a new game</string>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="changeDetails">
+ <property name="text">
+ <string>Change Game Details</string>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="versionControl">
+ <property name="text">
+ <string>Upload Newer Version</string>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="checkHistory">
+ <property name="text">
+ <string>Check Revision History</string>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</widget>
+ <zorder>groupBox</zorder>
+ <zorder>loginName</zorder>
+ <zorder>loginName</zorder>
</widget>
</widget>
</item>
diff --git a/creator/plugins/docks/distributiondock/distributionwizard/distributionwizard.cpp \
b/creator/plugins/docks/distributiondock/distributionwizard/distributionwizard.cpp \
index d420f44..423d3af 100644
--- a/creator/plugins/docks/distributiondock/distributionwizard/distributionwizard.cpp
+++ b/creator/plugins/docks/distributiondock/distributionwizard/distributionwizard.cpp
@@ -46,6 +46,7 @@ class DistributionWizard::DistributionWizardPrivate
DistributionWizard::DistributionWizard():QObject(),d( new \
DistributionWizardPrivate() ) {
+ countUploads = 0;
d->wizard.setupUi(&d->wizardobj);
connect(&d->wizardobj,SIGNAL(currentIdChanged( int)),this,SLOT(pageChanged(int)));
updateCategories();
@@ -53,8 +54,6 @@ DistributionWizard::DistributionWizard():QObject(),d( new \
DistributionWizardPriv }
void DistributionWizard::uploadGameArchive()
{
-// const QString id = d->ui.idEdit->text();
-
if( gameid.isEmpty() || apiKey.isEmpty() )
{
return;
@@ -67,7 +66,6 @@ void DistributionWizard::uploadGameArchive()
GluonPlayer::GameUploadJob* uploadJob = \
GluonPlayer::ServiceProvider::instance()->uploadGame( gameid, archivePath ); \
connect( uploadJob, SIGNAL(succeeded()), SLOT(editGameFinished()) );
-// connect( uploadJob, SIGNAL(failed()), SLOT(editGameFailed()) );
uploadJob->setApiKey(apiKey );
uploadJob->start();
}
@@ -83,7 +81,6 @@ DistributionWizard::~DistributionWizard()
}
void DistributionWizard::pageChanged(int pageId)
{
- qDebug()<< "Page id of new page is"<<pageId;
switch(pageId)
{
case(1):
@@ -95,31 +92,43 @@ void DistributionWizard::pageChanged(int pageId)
d->wizard.licenseComboBox->setEnabled(false);
}
break;
+
case(2):
{
if( d->wizard.gameIdEdit->text().isEmpty() )
{
gameName = d->wizard.nameEdit->text();
- chosenCategory = categoryIds.at( d->wizard.categoryComboBox->currentIndex() );
- GluonPlayer::AddGameJob* addGameJob = \
GluonPlayer::ServiceProvider::instance()->addGame( \
gameName,chosenCategory );
- connect( addGameJob, SIGNAL(succeeded()), SLOT(uploadFinished()));
-// connect( addGameJob, SIGNAL(failed()), SLOT(newGameUploadFailed()) );
- addGameJob->start();
+ chosenCategory = categoryIds.at( d->wizard.categoryComboBox->currentIndex());
+
+ if(countUploads == 0)
+ {
+ GluonPlayer::AddGameJob* addGameJob = \
GluonPlayer::ServiceProvider::instance()->addGame( gameName,chosenCategory ); + \
connect( addGameJob, SIGNAL(succeeded()), SLOT(uploadFinished())); + \
addGameJob->start(); + countUploads++;
+ }
}
}
break;
+
case(3):
- { homepage = d->wizard.nexthomePageEdit->text();
+ {
+ homepage = d->wizard.nexthomePageEdit->text();
version = d->wizard.nextversionEdit->text();
chosenLicense = licenseIds.at( d->wizard.nextlicenseComboBox->currentIndex());
- chosenCategory = categoryIds.at( d->wizard.nextCategory->currentIndex());
updateUi();
}
+
case(4):
- { description = d->wizard.descriptionEdit->toPlainText();}
+ description = d->wizard.descriptionEdit->toPlainText();
+
case(5):
- { changeLog = d->wizard.changelogEdit->toPlainText();}
+ {
+ changeLog = d->wizard.changelogEdit->toPlainText();
+ finalUploading();
+ }
break;
+
default:
break;
@@ -128,8 +137,7 @@ void DistributionWizard::pageChanged(int pageId)
void DistributionWizard::startWizard()
{
-
- d->wizardobj.show();
+ d->wizardobj.show();
}
void DistributionWizard::updateCategories()
{
@@ -142,10 +150,7 @@ void DistributionWizard::updateCategories()
void DistributionWizard::uploadFinished()
{
QString id = qobject_cast<GluonPlayer::AddGameJob*>( sender() \
)->data().toString();
-// d->wizard.gameIdEdit->setText( id );
GluonEngine::Game::instance()->gameProject()->setProperty( "id", id );
- qDebug()<<"ID OF GAME IS NOW "<<id;
-// updateUi();
}
void DistributionWizard::updateUi()
@@ -156,7 +161,6 @@ void DistributionWizard::updateUi()
QString id = GluonEngine::Game::instance()->gameProject()->property( "id" \
).toString(); d->wizard.gameIdEdit->setText( id );
gameid = id;
- qDebug()<<"IN UPDATE UI,ID OF GAME IS NOW "<<id;
if( id.isEmpty() )
{
@@ -194,7 +198,7 @@ void DistributionWizard::finalUploading()
void DistributionWizard::editGamefailed()
{
- qDebug()<< "Failed";
+ qDebug()<< "Uploading Failed";
}
void DistributionWizard::gamedetailsFetched()
@@ -203,8 +207,6 @@ void DistributionWizard::gamedetailsFetched()
d->wizard.nextversionEdit->setText( gameDetails->version() );
d->wizard.nexthomePageEdit->setText( gameDetails->homePage() );
d->wizard.licenseComboBox->setCurrentIndex( licenseIds.indexOf( \
gameDetails->license() ) );
- // d->ui.descriptionEdit->setPlainText( gameDetails->gameDescription() );
- // d->ui.changelogEdit->setPlainText( gameDetails->changelog() );
}
diff --git a/creator/plugins/docks/distributiondock/distributionwizard/distributionwizard.h \
b/creator/plugins/docks/distributiondock/distributionwizard/distributionwizard.h \
index e23c5a6..5f3e7c8 100644
--- a/creator/plugins/docks/distributiondock/distributionwizard/distributionwizard.h
+++ b/creator/plugins/docks/distributiondock/distributionwizard/distributionwizard.h
@@ -61,6 +61,7 @@ class DistributionWizard: public QObject
QString homepage;
QString version;
QString chosenLicense;
+ int countUploads;
};
#endif // DISTRIBUTIONWIZARD_H
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic