Commit 81528bb9 authored by Primrose Mbanefo's avatar Primrose Mbanefo
Browse files

Ovi Store Wizard: Qwizard -> Wizard

Snuck in an update to vendorinfo too
parent 505256fa
......@@ -55,27 +55,26 @@ enum PageId { BuildSettingsPageId, UploadSettingsPageId, ResultPageId };
MaemoPublishingWizardFremantleFree::MaemoPublishingWizardFremantleFree(const Project *project,
QWidget *parent) :
QWizard(parent),
Wizard(parent),
m_project(project),
m_publisher(new MaemoPublisherFremantleFree(project, this))
{
setOption(NoCancelButton, false);
const QString titleText
= tr("Publishing to Fremantle's \"Extras-devel free\" Repository");
setWindowTitle(tr("Publishing to Fremantle's \"Extras-devel free\" Repository"));
m_buildSettingsPage
= new MaemoPublishingBuildSettingsPageFremantleFree(project, m_publisher);
m_buildSettingsPage->setTitle(titleText);
m_buildSettingsPage->setSubTitle(tr("Build Settings"));
m_buildSettingsPage->setTitle(tr("Build Settings"));
setPage(BuildSettingsPageId, m_buildSettingsPage);
m_uploadSettingsPage
= new MaemoPublishingUploadSettingsPageFremantleFree(m_publisher);
m_uploadSettingsPage->setTitle(titleText);
m_uploadSettingsPage->setSubTitle(tr("Upload Settings"));
m_uploadSettingsPage->setTitle(tr("Upload Settings"));
m_uploadSettingsPage->setCommitPage(true);
setPage(UploadSettingsPageId, m_uploadSettingsPage);
m_resultPage = new MaemoPublishingResultPageFremantleFree(m_publisher);
m_resultPage->setTitle(titleText);
m_resultPage->setSubTitle(tr("Result"));
m_resultPage->setTitle(tr("Result"));
setPage(ResultPageId, m_resultPage);
}
......
......@@ -41,7 +41,7 @@
#ifndef MAEMOPUBLISHINGWIZARDFREMANTLEFREE_H
#define MAEMOPUBLISHINGWIZARDFREMANTLEFREE_H
#include <QtGui/QWizard>
#include <utils/wizard.h>
namespace ProjectExplorer {
class Project;
......@@ -54,7 +54,7 @@ class MaemoPublisherFremantleFree;
class MaemoPublishingUploadSettingsPageFremantleFree;
class MaemoPublishingBuildSettingsPageFremantleFree;
class MaemoPublishingWizardFremantleFree : public QWizard
class MaemoPublishingWizardFremantleFree : public Utils::Wizard
{
Q_OBJECT
public:
......
......@@ -108,9 +108,9 @@ void S60PublisherOvi::setVendorName(const QString &vendorName)
m_vendorName = vendorName;
}
void S60PublisherOvi::setLocalVendorName(const QString &localVendorName)
void S60PublisherOvi::setLocalVendorNames(const QString &localVendorNames)
{
m_localVendorName = localVendorName;
m_localVendorNames = localVendorNames;
}
void S60PublisherOvi::setAppUid(const QString &appuid)
......@@ -271,7 +271,7 @@ void S60PublisherOvi::updateProFile(const QString &var, const QString &values)
void S60PublisherOvi::updateProFile()
{
updateProFile("vendorinfo","%{\""+ m_vendorName + "\"} :\""+ m_localVendorName+ "\"");
updateProFile("vendorinfo", "\"%{\\\"" + m_localVendorNames + "\\\"}\" \":\\\"" + m_vendorName + "\\\"\"" );
updateProFile("TARGET.UID3", m_appUid);
}
......
......@@ -130,7 +130,7 @@ public:
bool hasSucceeded();
void setVendorName(const QString &vendorName);
void setLocalVendorName(const QString &localVendorName);
void setLocalVendorNames(const QString &localVendorNames);
void setAppUid(const QString &appuid);
signals:
......@@ -163,7 +163,7 @@ private:
QStringList m_capabilitiesForCertifiedSigned;
QStringList m_capabilitesForManufacturerApproved;
QString m_vendorName;
QString m_localVendorName;
QString m_localVendorNames;
QString m_appUid;
bool m_finishedAndSuccessful;
......
......@@ -169,7 +169,7 @@ void S60PublishingSisSettingsPageOvi::localisedVendorNamesChanged()
"It is recommended to also not use the default name of 'Vendor'/'Vendor-EN', or to leave the entry blank. <br>"
"see <a href=\"http://www.forum.nokia.com/Distribute/Packaging_and_signing.xhtml\">Packaging and Signing</a> for guidelines.<br>")
.arg(wrongVendorNames.join(", ")));
m_publisher->setVendorName(ui->localisedVendorNamesLineEdit->text());
m_publisher->setLocalVendorNames(ui->localisedVendorNamesLineEdit->text());
}
void S60PublishingSisSettingsPageOvi::qtVersionChanged()
......
......@@ -51,7 +51,7 @@ namespace Qt4ProjectManager {
namespace Internal {
S60PublishingWizardOvi::S60PublishingWizardOvi(const Project *project, QWidget *parent) :
QWizard(parent),
Wizard(parent),
m_publisher(new S60PublisherOvi(this))
{
setWindowTitle(tr("Publishing to Ovi Store"));
......
......@@ -42,7 +42,7 @@
#ifndef S60PUBLISHINGWIZARDOVI_H
#define S60PUBLISHINGWIZARDOVI_H
#include <QtGui/QWizard>
#include <utils/wizard.h>
namespace ProjectExplorer {
class Project;
......@@ -55,7 +55,7 @@ class S60PublishingBuildSettingsPageOvi;
class S60PublishingSisSettingsPageOvi;
class S60PublishingResultsPageOvi;
class S60PublishingWizardOvi : public QWizard
class S60PublishingWizardOvi : public Utils::Wizard
{
Q_OBJECT
public:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment