From 81528bb9b269816e98320f294a4e9cfb50e1f6c0 Mon Sep 17 00:00:00 2001 From: Primrose Mbanefo Date: Wed, 2 Mar 2011 17:07:47 +0100 Subject: [PATCH] Ovi Store Wizard: Qwizard -> Wizard Snuck in an update to vendorinfo too --- .../maemopublishingwizardfremantlefree.cpp | 17 ++++++++--------- .../maemopublishingwizardfremantlefree.h | 4 ++-- .../qt-s60/s60publisherovi.cpp | 6 +++--- .../qt4projectmanager/qt-s60/s60publisherovi.h | 4 ++-- .../qt-s60/s60publishingsissettingspageovi.cpp | 2 +- .../qt-s60/s60publishingwizardovi.cpp | 2 +- .../qt-s60/s60publishingwizardovi.h | 4 ++-- 7 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingwizardfremantlefree.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopublishingwizardfremantlefree.cpp index f9670af714f..dbb9d58d70a 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingwizardfremantlefree.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemopublishingwizardfremantlefree.cpp @@ -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); } diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingwizardfremantlefree.h b/src/plugins/qt4projectmanager/qt-maemo/maemopublishingwizardfremantlefree.h index bb3e681f87b..1519ddc3adb 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingwizardfremantlefree.h +++ b/src/plugins/qt4projectmanager/qt-maemo/maemopublishingwizardfremantlefree.h @@ -41,7 +41,7 @@ #ifndef MAEMOPUBLISHINGWIZARDFREMANTLEFREE_H #define MAEMOPUBLISHINGWIZARDFREMANTLEFREE_H -#include +#include 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: diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp index bab925f2872..41b24f16ebf 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp @@ -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); } diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.h b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.h index ba0d4eecef4..a7035adb1f5 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.h @@ -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; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp index 46c200eff36..4546db5a055 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp @@ -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.
" "see Packaging and Signing for guidelines.
") .arg(wrongVendorNames.join(", "))); - m_publisher->setVendorName(ui->localisedVendorNamesLineEdit->text()); + m_publisher->setLocalVendorNames(ui->localisedVendorNamesLineEdit->text()); } void S60PublishingSisSettingsPageOvi::qtVersionChanged() diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingwizardovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publishingwizardovi.cpp index e7e35c3c219..be40db30ada 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingwizardovi.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingwizardovi.cpp @@ -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")); diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingwizardovi.h b/src/plugins/qt4projectmanager/qt-s60/s60publishingwizardovi.h index 5cef13b950f..3ac9c51d013 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingwizardovi.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingwizardovi.h @@ -42,7 +42,7 @@ #ifndef S60PUBLISHINGWIZARDOVI_H #define S60PUBLISHINGWIZARDOVI_H -#include +#include 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: