Skip to content

GitLab

F
flatpak-qt-creator
Commit 8ea3c5a4 authored by Tobias Nätterlund's avatar Tobias Nätterlund Committed by Nicolas Arnaud-Cormos
Browse files
Options

QNX: Remove the image wizard extension for BlackBerry wizards 

The icon and splashscreens are easier to configure now, with
the bar descriptor editor in place.

Change-Id: Ieaf48a5eef880c709d77af8bfc7b9e3d467c0e1e
Reviewed-by: Nicolas Arnaud-Cormos's avatarNicolas Arnaud-Cormos <nicolas@kdab.com>
parent 39e15a0e
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 620 deletions
src/plugins/qnx/bardescriptorfileimagewizardpage.cpp deleted 100644 → 0
View file @ 39e15a0e
/**************************************************************************
**
** Copyright (C) 2011 - 2013 Research In Motion
**
** Contact: Research In Motion (blackberry-qt@qnx.com)
** Contact: KDAB (info@kdab.com)
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#include "bardescriptorfileimagewizardpage.h"
#include "ui_bardescriptorfileimagewizardpage.h"
using namespace Qnx;
using namespace Qnx::Internal;
namespace {
// image sizes are likely device specific.
// those are the ones for the upcoming BB10 devices which this plugin is mainly targetted at.
enum {
// Application icon sizes.
AppIconMinWidth = 1,
AppIconMinHeight = 1,
AppIconMaxWidth = 150,
AppIconMaxHeight = 150,
// Landscape splashscreen sizes
LandscapeSplashMinWidth = 1,
LandscapeSplashMinHeight = 1,
LandscapeSplashMaxWidth = 1280,
LandscapeSplashMaxHeight = 768,
// Portrait splashscreen sizes
PortraitSplashMinWidth = 1,
PortraitSplashMinHeight = 1,
PortraitSplashMaxWidth = 768,
PortraitSplashMaxHeight = 1280
};
}
BarDescriptorFileImageWizardPage::BarDescriptorFileImageWizardPage(QWidget *parent)
: QWizardPage(parent)
, m_ui(new Ui::BarDescriptorFileImageWizardPage)
, m_iconValidationResult(Valid)
, m_landscapeSplashScreenValidationResult(Valid)
, m_portraitSplashScreenValidationResult(Valid)
{
m_ui->setupUi(this);
setTitle(tr("Images"));
const QString dialogFilter = tr("Images (*.jpg *.png)");
m_ui->icon->setExpectedKind(Utils::PathChooser::File);
m_ui->icon->setPromptDialogFilter(dialogFilter);
connect(m_ui->icon, SIGNAL(changed(QString)), this, SLOT(validateIcon(QString)));
m_ui->landscapeSplashScreen->setExpectedKind(Utils::PathChooser::File);
m_ui->landscapeSplashScreen->setPromptDialogFilter(dialogFilter);
connect(m_ui->landscapeSplashScreen, SIGNAL(changed(QString)), this, SLOT(validateLandscapeSplashScreen(QString)));
m_ui->portraitSplashScreen->setExpectedKind(Utils::PathChooser::File);
m_ui->portraitSplashScreen->setPromptDialogFilter(dialogFilter);
connect(m_ui->portraitSplashScreen, SIGNAL(changed(QString)), this, SLOT(validatePortraitSplashScreen(QString)));
}
BarDescriptorFileImageWizardPage::~BarDescriptorFileImageWizardPage()
{
delete m_ui;
}
bool BarDescriptorFileImageWizardPage::isComplete() const
{
return m_iconValidationResult == Valid
&& m_landscapeSplashScreenValidationResult == Valid
&& m_portraitSplashScreenValidationResult == Valid;
}
QString BarDescriptorFileImageWizardPage::icon() const
{
return m_ui->icon->path();
}
QString BarDescriptorFileImageWizardPage::landscapeSplashScreen() const
{
return m_ui->landscapeSplashScreen->path();
}
QString BarDescriptorFileImageWizardPage::portraitSplashScreen() const
{
return m_ui->portraitSplashScreen->path();
}
void BarDescriptorFileImageWizardPage::validateIcon(const QString &path)
{
m_iconValidationResult = validateImage(path, QSize(AppIconMinWidth, AppIconMinHeight), QSize(AppIconMaxWidth, AppIconMaxHeight));
switch (m_iconValidationResult) {
case Valid:
m_ui->iconValidationLabel->clear();
break;
case CouldNotLoad:
m_ui->iconValidationLabel->setText(tr("<font color=\"red\">Could not open '%1' for reading.</font>").arg(path));
break;
case IncorrectSize: {
const QSize size = imageSize(path);
m_ui->iconValidationLabel->setText(tr("<font color=\"red\">Incorrect icon size (%1x%2). The maximum size is "
"%3x%4 pixels.</font>")
.arg(size.width()).arg(size.height())
.arg(AppIconMaxWidth).arg(AppIconMaxHeight));
break;
}
default:
break;
}
emit completeChanged();
}
void BarDescriptorFileImageWizardPage::validateLandscapeSplashScreen(const QString &path)
{
m_landscapeSplashScreenValidationResult = validateImage(path, QSize(LandscapeSplashMinWidth, LandscapeSplashMinHeight), QSize(LandscapeSplashMaxWidth, LandscapeSplashMaxHeight));
updateSplashScreenValidationLabel();
emit completeChanged();
}
void BarDescriptorFileImageWizardPage::validatePortraitSplashScreen(const QString &path)
{
m_portraitSplashScreenValidationResult = validateImage(path, QSize(PortraitSplashMinWidth, PortraitSplashMinHeight), QSize(PortraitSplashMaxWidth, PortraitSplashMaxHeight));
updateSplashScreenValidationLabel();
emit completeChanged();
}
void BarDescriptorFileImageWizardPage::updateSplashScreenValidationLabel()
{
if (m_landscapeSplashScreenValidationResult == Valid
&& m_portraitSplashScreenValidationResult == Valid) {
m_ui->splashScreenValidationLabel->clear();
return;
}
switch (m_landscapeSplashScreenValidationResult) {
case CouldNotLoad:
m_ui->splashScreenValidationLabel->setText(tr("<font color=\"red\">Could not open '%1' for reading.</font>")
.arg(m_ui->landscapeSplashScreen->fileName().toString()));
break;
case IncorrectSize: {
const QSize size = imageSize(m_ui->landscapeSplashScreen->fileName().toString());
m_ui->splashScreenValidationLabel->setText(tr("<font color=\"red\">Incorrect landscape splash screen size (%1x%2). The maximum "
"size is %3x%4 pixels.</font>")
.arg(size.width()).arg(size.height())
.arg(LandscapeSplashMaxWidth).arg(LandscapeSplashMaxHeight));
break;
}
case Valid:
default:
break;
}
switch (m_portraitSplashScreenValidationResult) {
case CouldNotLoad:
m_ui->splashScreenValidationLabel->setText(tr("<font color=\"red\">Could not open '%1' for reading.</font>")
.arg(m_ui->portraitSplashScreen->fileName().toString()));
break;
case IncorrectSize: {
const QSize size = imageSize(m_ui->portraitSplashScreen->fileName().toString());
m_ui->splashScreenValidationLabel->setText(tr("<font color=\"red\">Incorrect portrait splash screen size (%1x%2). The maximum "
"size is %3x%4 pixels.</font>")
.arg(size.width()).arg(size.height())
.arg(PortraitSplashMaxWidth).arg(PortraitSplashMaxHeight));
break;
}
case Valid:
default:
break;
}
}
BarDescriptorFileImageWizardPage::ImageValidationResult BarDescriptorFileImageWizardPage::validateImage(const QString &path, const QSize &minimumSize, const QSize &maximumSize)
{
if (path.isEmpty())
return Valid; // Empty is ok, since <icon> and <splashscreen> entries are optional
QImage img(path);
if (img.isNull())
return CouldNotLoad;
const QSize imgSize = img.size();
if (imgSize.width() < minimumSize.width() || imgSize.height() < minimumSize.height()
|| imgSize.width() > maximumSize.width() || imgSize.height() > maximumSize.height())
return IncorrectSize;
return Valid;
}
QSize BarDescriptorFileImageWizardPage::imageSize(const QString &path)
{
QImage img(path);
if (img.isNull())
return QSize();
return img.size();
}
src/plugins/qnx/bardescriptorfileimagewizardpage.h deleted 100644 → 0
View file @ 39e15a0e
/**************************************************************************
**
** Copyright (C) 2011 - 2013 Research In Motion
**
** Contact: Research In Motion (blackberry-qt@qnx.com)
** Contact: KDAB (info@kdab.com)
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#ifndef QNX_INTERNAL_BARDESCRIPTORFILEIMAGEWIZARDPAGE_H
#define QNX_INTERNAL_BARDESCRIPTORFILEIMAGEWIZARDPAGE_H
#include <QWizardPage>
namespace Qnx {
namespace Internal {
namespace Ui {
class BarDescriptorFileImageWizardPage;
}
class BarDescriptorFileImageWizardPage : public QWizardPage
{
Q_OBJECT
public:
explicit BarDescriptorFileImageWizardPage(QWidget *parent = 0);
~BarDescriptorFileImageWizardPage();
bool isComplete() const;
QString icon() const;
QString landscapeSplashScreen() const;
QString portraitSplashScreen() const;
private slots:
void validateIcon(const QString &path);
void validateLandscapeSplashScreen(const QString &path);
void validatePortraitSplashScreen(const QString &path);
private:
enum ImageValidationResult {
Valid,
CouldNotLoad,
IncorrectSize
};
void updateSplashScreenValidationLabel();
ImageValidationResult validateImage(const QString &path, const QSize &minimumSize, const QSize &maximumSize);
QSize imageSize(const QString &path);
Ui::BarDescriptorFileImageWizardPage *m_ui;
ImageValidationResult m_iconValidationResult;
ImageValidationResult m_landscapeSplashScreenValidationResult;
ImageValidationResult m_portraitSplashScreenValidationResult;
};
} // namespace Internal
} // namespace Qnx
#endif // QNX_INTERNAL_BARDESCRIPTORFILEIMAGEWIZARDPAGE_H
src/plugins/qnx/bardescriptorfileimagewizardpage.ui deleted 100644 → 0
View file @ 39e15a0e
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Qnx::Internal::BarDescriptorFileImageWizardPage</class>
<widget class="QWizardPage" name="Qnx::Internal::BarDescriptorFileImageWizardPage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>116</height>
</rect>
</property>
<property name="windowTitle">
<string>WizardPage</string>
</property>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Icon:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Utils::PathChooser" name="icon" native="true"/>
</item>
<item row="1" column="0" colspan="2">
<widget class="QLabel" name="iconValidationLabel">
<property name="text">
<string/>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QLabel" name="label_2">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Splash screens</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Landscape:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="Utils::PathChooser" name="landscapeSplashScreen" native="true"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Portrait:</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="Utils::PathChooser" name="portraitSplashScreen" native="true"/>
</item>
<item row="5" column="0" colspan="2">
<widget class="QLabel" name="splashScreenValidationLabel">
<property name="text">
<string/>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>Utils::PathChooser</class>
<extends>QWidget</extends>
<header location="global">utils/pathchooser.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>
src/plugins/qnx/blackberrywizardextension.cpp deleted 100644 → 0
View file @ 39e15a0e
/**************************************************************************
**
** Copyright (C) 2011 - 2013 Research In Motion
**
** Contact: Research In Motion (blackberry-qt@qnx.com)
** Contact: KDAB (info@kdab.com)
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#include "blackberrywizardextension.h"
#include "bardescriptorfileimagewizardpage.h"
#include "qnxconstants.h"
#include <coreplugin/dialogs/iwizard.h>
#include <coreplugin/generatedfile.h>
#include <QFileInfo>
#include <QDomDocument>
using namespace Qnx;
using namespace Qnx::Internal;
BlackBerryWizardExtension::BlackBerryWizardExtension()
: m_imageWizardPage(0)
{
}
QList<QWizardPage *> BlackBerryWizardExtension::extensionPages(const Core::IWizard *wizard)
{
QStringList validIds;
validIds << QLatin1String(Constants::QNX_BLACKBERRY_CASCADES_WIZARD_ID);
validIds << QLatin1String(Constants::QNX_BAR_DESCRIPTOR_WIZARD_ID);
validIds << QLatin1String(Constants::QNX_BLACKBERRY_QTQUICK_APP_WIZARD_ID);
validIds << QLatin1String(Constants::QNX_BLACKBERRY_GUI_APP_WIZARD_ID);
validIds << QLatin1String(Constants::QNX_BLACKBERRY_QTQUICK2_APP_WIZARD_ID);
QList<QWizardPage*> pages;
if (!validIds.contains(wizard->id()))
return pages;
m_imageWizardPage = new BarDescriptorFileImageWizardPage;
pages << m_imageWizardPage;
return pages;
}
bool BlackBerryWizardExtension::processFiles(const QList<Core::GeneratedFile> &files, bool *removeOpenProjectAttribute, QString *errorMessage)
{
Q_UNUSED(files);
Q_UNUSED(removeOpenProjectAttribute);
Q_UNUSED(errorMessage);
return true;
}
void BlackBerryWizardExtension::applyCodeStyle(Core::GeneratedFile *file) const
{
QFileInfo fi(file->path());
if (fi.fileName() == QLatin1String("bar-descriptor.xml"))
addImagesToBarDescriptor(file);
}
void BlackBerryWizardExtension::addImagesToBarDescriptor(Core::GeneratedFile *file) const
{
QDomDocument doc;
doc.setContent(file->contents());
QDomElement docElem = doc.documentElement();
// Add asset elements
QStringList fileAssets;
fileAssets << m_imageWizardPage->icon();
fileAssets << m_imageWizardPage->landscapeSplashScreen();
fileAssets << m_imageWizardPage->portraitSplashScreen();
Q_FOREACH (const QString &asset, fileAssets) {
if (asset.isEmpty())
continue;
QDomElement assetElem = doc.createElement(QLatin1String("asset"));
assetElem.setAttribute(QLatin1String("path"), asset);
QDomText fileNameText = doc.createTextNode(QFileInfo(asset).fileName());
assetElem.appendChild(fileNameText);
docElem.appendChild(assetElem);
}
// Add icon element
if (!m_imageWizardPage->icon().isEmpty()) {
QDomElement iconElem = doc.createElement(QLatin1String("icon"));
QDomElement imageElem = doc.createElement(QLatin1String("image"));
QDomText fileNameText = doc.createTextNode(QFileInfo(m_imageWizardPage->icon()).fileName());
imageElem.appendChild(fileNameText);
iconElem.appendChild(imageElem);
docElem.appendChild(iconElem);
}
// Add splashscreen element
QString splashScreenEntry = QFileInfo(m_imageWizardPage->landscapeSplashScreen()).fileName();
if (!m_imageWizardPage->portraitSplashScreen().isEmpty())
splashScreenEntry.append(QLatin1Char(':') + QFileInfo(m_imageWizardPage->portraitSplashScreen()).fileName());
if (!splashScreenEntry.isEmpty()) {
QDomElement splashScreenElem = doc.createElement(QLatin1String("splashscreen"));
QDomText splashScreenText = doc.createTextNode(splashScreenEntry);
splashScreenElem.appendChild(splashScreenText);
docElem.appendChild(splashScreenElem);
}
file->setContents(doc.toString(4));
}
src/plugins/qnx/blackberrywizardextension.h deleted 100644 → 0
View file @ 39e15a0e
/**************************************************************************
**
** Copyright (C) 2011 - 2013 Research In Motion
**
** Contact: Research In Motion (blackberry-qt@qnx.com)
** Contact: KDAB (info@kdab.com)
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#ifndef QNX_INTERNAL_BLACKBERRYWIZARDEXTENSION_H
#define QNX_INTERNAL_BLACKBERRYWIZARDEXTENSION_H
#include <coreplugin/ifilewizardextension.h>
namespace Qnx {
namespace Internal {
class BarDescriptorFileImageWizardPage;
class BlackBerryWizardExtension : public Core::IFileWizardExtension
{
Q_OBJECT
public:
explicit BlackBerryWizardExtension();
QList<QWizardPage *> extensionPages(const Core::IWizard *wizard);
bool processFiles(const QList<Core::GeneratedFile> &files,
bool *removeOpenProjectAttribute,
QString *errorMessage);
void applyCodeStyle(Core::GeneratedFile *file) const;
private:
void addImagesToBarDescriptor(Core::GeneratedFile *file) const;
BarDescriptorFileImageWizardPage *m_imageWizardPage;
};
} // namespace Internal
} // namespace Qnx
#endif // QNX_INTERNAL_BLACKBERRYWIZARDEXTENSION_H
src/plugins/qnx/qnx.pro
View file @ 8ea3c5a4
......@@ -45,8 +45,6 @@ SOURCES += qnxplugin.cpp \
qnxqtversionfactory.cpp \
qnxqtversion.cpp \
qnxabstractqtversion.cpp \
bardescriptorfileimagewizardpage.cpp \
blackberrywizardextension.cpp \
blackberrydeviceconfiguration.cpp \
qnxdeployconfiguration.cpp \
qnxdeviceconfiguration.cpp \
......@@ -104,8 +102,6 @@ HEADERS += qnxplugin.h\
qnxqtversionfactory.h \
qnxqtversion.h \
qnxabstractqtversion.h \
bardescriptorfileimagewizardpage.h \
blackberrywizardextension.h \