feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Ovi store wizard: Reject vendor names containing Nokia

Browse Source 
And UI text review

Reviewed-by: primrose mbanefo
This commit is contained in:
Leena Miettinen
2011-03-04 17:16:03 +01:00
parent 2d9de93361
commit 4969c64c22
6 changed files with 58 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp
View File

@@ -188,10 +188,15 @@ QString S60PublisherOvi::localisedVendorNames() const
bool S60PublisherOvi::isVendorNameValid(const QString &vendorName) const
{
//Check the given vendor name
// vendorName cannot containg "Nokia"
if (vendorName.trimmed().contains(Constants::REJECTED_VENDOR_NAMES_NOKIA, Qt::CaseInsensitive))
return false;
// vendorName cannot be any of the rejected vendor names
foreach (const QString &rejectedVendorName, m_rejectedVendorNames)
if (vendorName.trimmed().compare(rejectedVendorName, Qt::CaseInsensitive) == 0)
return false;
return true;
}

4
src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.ui
View File

@@ -17,7 +17,7 @@
<item row="0" column="0">
<widget class="QLabel" name="chooseBuildConfigLabel">
<property name="text">
<string>Choose a build configuration</string>
<string>Choose a build configuration:</string>
</property>
</widget>
</item>
@@ -41,7 +41,7 @@
<widget class="QLabel" name="label">
<property name="text">
<string>Only Qt versions above 4.6.3 are made available in this wizard.
This is because previous Qt Versions have limitations in building suitable sis files.</string>
Previous Qt versions have limitations in building suitable SIS files.</string>
</property>
</widget>
</item>

52
src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp
View File

@@ -139,8 +139,9 @@ void S60PublishingSisSettingsPageOvi::globalVendorNameChanged()
ui->globalVendorNameErrorLabel,
ui->globalVendorNameErrorReasonLabel,
tr("%1 is a default vendor name used for testing and development. <br>"
"The Vendor_Name field cannot be, or contain, the name 'Nokia' in it. <br>"
"It is recommended to also not use the default name of 'Vendor'/'Vendor-EN', or to leave the entry blank. <br>"
"The Vendor_Name field cannot contain the name 'Nokia'. <br>"
"You are advised against using the default names 'Vendor' and 'Vendor-EN'. <br>"
"You should also not 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("\"" + ui->globalVendorNameLineEdit->text() + "\""));
m_publisher->setVendorName(ui->globalVendorNameLineEdit->text());
@@ -160,15 +161,20 @@ void S60PublishingSisSettingsPageOvi::localisedVendorNamesChanged()
}
}
QString pluralOrSingular = tr("is a default vendor name");
if (wrongVendorNames.count() > 1)
pluralOrSingular = tr("are default vendor names");
reflectSettingState(settingState,
ui->localisedVendorNamesOkLabel,
ui->localisedVendorNamesErrorLabel,
ui->localisedVendorNamesErrorReasonLabel,
tr("%1 are default vendor names used for testing and development. <br>"
"The Vendor_Name field cannot be, or contain, the name 'Nokia' in it. <br>"
"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(", ")));
tr("%1 %2 used for testing and development. <br>"
"The Vendor_Name field cannot contain the name 'Nokia'. <br>"
"You are advised against using the default names 'Vendor' and 'Vendor-EN'. <br>"
"You should also not 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(", "), pluralOrSingular));
m_publisher->setLocalVendorNames(ui->localisedVendorNamesLineEdit->text());
}
@@ -178,15 +184,19 @@ void S60PublishingSisSettingsPageOvi::qtVersionChanged()
void S60PublishingSisSettingsPageOvi::uid3Changed()
{
QString testUID3ErrorMsg = tr("The App UID %1 is only for testing and development.<br>"
"SIS packages built with it, cannot be distributed via the OVI Store.<br>");
QString testUID3ErrorMsg = tr("The application UID %1 is only for testing and development.<br>"
"SIS packages built with it cannot be distributed via the Ovi Store.<br>");
QString symbianSignedUID3ErrorMsg = tr("The App UID %1 is a symbiansigned.com UID. <br>"
"Apps with this UID will be rejected by Ovi Sign.<br>"
"If you want to continue with this UID, sign your app on symbiansigned.com and upload the signed app to Ovi.<br>");
QString symbianSignedUID3ErrorMsg = tr("The application UID %1 is a symbiansigned.com UID. <br>"
"Applications with this UID will be rejected by "
"Application Signing Services for Ovi Store.<br>"
"If you want to continue with a symbiansigned.com UID, "
"sign your application on symbiansigned.com and upload the "
"signed application to Publish to Ovi.<br>");
QString errorMsg = tr("The App UID %1 is not an acceptable UID.<br>"
" SIS packages built with it, cannot be signed by Ovi.<br>");
QString errorMsg = tr("The application UID %1 is not an acceptable UID.<br>"
"SIS packages built with it cannot be signed by "
"Application Signing Services for Ovi Store.<br>");
if (m_publisher->isTestUID3(ui->uid3LineEdit->text())) {
errorMsg = testUID3ErrorMsg;
@@ -198,16 +208,20 @@ void S60PublishingSisSettingsPageOvi::uid3Changed()
ui->uid3OkLabel,
ui->uid3ErrorLabel,
ui->uid3ErrorReasonLabel,
tr("The App UID is a global unique indentifier of the SIS package.<br>") +
tr("The application UID is a global unique indentifier of the SIS package.<br>") +
errorMsg.arg(ui->uid3LineEdit->text()) +
tr("To get a unique App UID for your package file,<br>"
tr("To get a unique application UID for your package file,<br>"
"please register at <a href=\"http://info.publish.ovi.com/\">publish.ovi.com</a>"));
if (m_publisher->isUID3Valid(ui->uid3LineEdit->text())) {
ui->uid3WarningLabel->show();
ui->uid3WarningReasonLabel->setText("If this UID is from symbiansigned.com, It will be rejected by Ovi Sign.<br>"
"If you want to continue with this UID, sign your app on symbiansigned.com and upload the signed app to Ovi.<br>"
"It is however recommended you obtain a UID from <a href=\"http://info.publish.ovi.com/\">publish.ovi.com</a>");
ui->uid3WarningReasonLabel->setText("If this UID is from symbiansigned.com, It will be "
"rejected by Application Signing Services for Ovi Store.<br>"
"If you want to continue with a symbiansigned.com UID, "
"sign your application on symbiansigned.com and upload "
"the signed application to Publish to Ovi.<br>"
"It is, however, recommended that you obtain a UID from "
"<a href=\"http://info.publish.ovi.com/\">publish.ovi.com</a>");
ui->uid3WarningReasonLabel->show();
} else {
ui->uid3WarningLabel->hide();

10
src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.ui
View File

@@ -26,7 +26,7 @@
<item row="0" column="0">
<widget class="QLabel" name="globalVendorNameLabel">
<property name="text">
<string>Global Vendor Name</string>
<string>Global vendor name:</string>
</property>
</widget>
</item>
@@ -43,7 +43,7 @@
<item row="8" column="0">
<widget class="QLabel" name="qtVersionLabel">
<property name="text">
<string>Qt Version used in builds</string>
<string>Qt version used in builds:</string>
</property>
</widget>
</item>
@@ -76,7 +76,7 @@
<item row="12" column="0">
<widget class="QLabel" name="uid3Label">
<property name="text">
<string>App UID</string>
<string>Application UID:</string>
</property>
</widget>
</item>
@@ -100,7 +100,7 @@
<item row="18" column="0">
<widget class="QLabel" name="capabilitiesLabel">
<property name="text">
<string>Capabilities</string>
<string>Capabilities:</string>
</property>
</widget>
</item>
@@ -264,7 +264,7 @@
<item row="4" column="0">
<widget class="QLabel" name="localisedVendorNamesLabel">
<property name="text">
<string>Localised Vendor Names</string>
<string>Localised vendor names:</string>
</property>
</widget>
</item>

18
src/plugins/qt4projectmanager/qt-s60/s60publishingwizardfactories.cpp
View File

@@ -50,19 +50,21 @@ S60PublishingWizardFactoryOvi::S60PublishingWizardFactoryOvi(QObject *parent)
QString S60PublishingWizardFactoryOvi::displayName() const
{
return tr("Publish for Qt Symbian Application on Ovi Store ");
return tr("Publish Qt Symbian Applications to Ovi Store");
}
QString S60PublishingWizardFactoryOvi::description() const
{
return tr("This wizard will check your resulting sis file and "
"some of your meta data to make sure it complies with "
"Ovi Store submission regulations.\n\n"
"This wizard is used to create sis files which can be submitted to publish to Ovi.\n\n"
"It cannot be used if you are using UID3s from Symbian Signed.\n\n"
return tr("This wizard checks "
"your project file to make sure it complies with "
"Ovi Store submission criteria.\n\n"
"The wizard creates SIS files that can be submitted "
"to Publish to Ovi.\n\n"
"You cannot use it if you use application UIDs from Symbian Signed.\n\n"
"You cannot use it for the Certified Signed and Manufacturer level capabilities:\n"
"i.e. NetworkControl, MultimediaDD, CommDD, DiskAdmin, AllFiles, DRM and TCB\n\n"
"Your application will also be rejected by Ovi QA if it uses an unreleased Qt Version.");
"NetworkControl, MultimediaDD, CommDD, DiskAdmin, AllFiles, DRM and TCB.\n\n"
"Your application will also be rejected by Ovi QA if you choose "
"an unreleased Qt version on the next page.");
}
bool S60PublishingWizardFactoryOvi::canCreateWizard(const Project *project) const

4
src/plugins/qt4projectmanager/qt-s60/s60publishingwizardovi.cpp
View File

@@ -61,12 +61,12 @@ S60PublishingWizardOvi::S60PublishingWizardOvi(const Project *project, QWidget *
addPage(m_buildSettingsPage);
m_sisSettingsPage = new S60PublishingSisSettingsPageOvi(m_publisher);
m_sisSettingsPage->setTitle(tr(".Pro File Checks"));
m_sisSettingsPage->setTitle(tr("Project File Checks"));
m_sisSettingsPage->setCommitPage(true);
addPage(m_sisSettingsPage);
m_resultsPage = new S60PublishingResultsPageOvi(m_publisher);
m_resultsPage->setTitle(tr("Creating Uploadable Sis File"));
m_resultsPage->setTitle(tr("Creating an Uploadable SIS File"));
m_resultsPage->setFinalPage(true);
addPage(m_resultsPage);