From 7d6ca1150d70c17469e48d71920dfe6083e1a719 Mon Sep 17 00:00:00 2001 From: David Llewellyn-Jones Date: Sun, 15 Jul 2018 17:31:15 +0100 Subject: [PATCH] Add icons and images dependent on device resolution --- generate.sh | 35 ++++++ harbour-pedalo.pro | 9 +- icons/108x108/harbour-pedalo.png | Bin 7433 -> 3683 bytes icons/128x128/harbour-pedalo.png | Bin 9004 -> 4625 bytes icons/172x172/harbour-pedalo.png | Bin 12765 -> 6608 bytes icons/256x256/harbour-pedalo.png | Bin 0 -> 10787 bytes icons/86x86/harbour-pedalo.png | Bin 5835 -> 2944 bytes inputs/harbour-pedalo.svg | 134 ++++++++++++++++++++ inputs/pedalo-title.svg | 210 +++++++++++++++++++++++++++++++ qml/pages/About.qml | 2 +- src/harbour-pedalo.cpp | 2 + src/imageprovider.cpp | 38 ++++++ src/imageprovider.h | 17 +++ src/settings.cpp | 30 +++++ src/settings.h | 4 + 15 files changed, 477 insertions(+), 4 deletions(-) create mode 100755 generate.sh create mode 100644 icons/256x256/harbour-pedalo.png create mode 100644 inputs/harbour-pedalo.svg create mode 100644 inputs/pedalo-title.svg create mode 100644 src/imageprovider.cpp create mode 100644 src/imageprovider.h diff --git a/generate.sh b/generate.sh new file mode 100755 index 0000000..170bbf4 --- /dev/null +++ b/generate.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +# Generate graphics at different resolutions for different devices +# 1.0 (jolla phone), 1.25 (jolla c), 1.5 (tablet), 1.75 (xperia) +ratios="1.0 1.25 1.5 1.75 2.0" + +# Generate app icons +sizes="86 108 128 172 256" +for size in ${sizes}; do + mkdir -p "./icons/${size}x${size}" + inkscape -z -e "./icons/${size}x${size}/harbour-pedalo.png" -w $size -h $size "inputs/harbour-pedalo.svg" +done + +# Create the ratio directories +for ratio in ${ratios}; do + mkdir -p "./qml/images/z${ratio}" +done + +# Function for generating PNG images +function generate { + basex=$1 + basey=$2 + names=$3 + for ratio in ${ratios}; do + sizex=`echo "${ratio} * ${basex}" | bc` + sizey=`echo "${ratio} * ${basey}" | bc` + for name in ${names}; do + inkscape -z -e "./qml/images/z${ratio}/${name}.png" -w ${sizex} -h ${sizey} "inputs/${name}.svg" + done + done +} + +# Generate titles +generate 303 86 "pedalo-title" + diff --git a/harbour-pedalo.pro b/harbour-pedalo.pro index e50d930..9033b75 100644 --- a/harbour-pedalo.pro +++ b/harbour-pedalo.pro @@ -25,12 +25,14 @@ DEFINES += "VERSION_MAJOR=$$VERSION_MAJOR" \ "VERSION=\\\"$$VERSION\\\"" CONFIG += sailfishapp - +PKGCONFIG += mlite5 +B SOURCES += src/harbour-pedalo.cpp \ src/journey.cpp \ src/journeymodel.cpp \ src/status.cpp \ - src/settings.cpp + src/settings.cpp \ + src/imageprovider.cpp DISTFILES += qml/harbour-pedalo.qml \ qml/cover/CoverPage.qml \ @@ -66,4 +68,5 @@ HEADERS += \ src/journeymodel.h \ src/status.h \ src/settings.h \ - src/harbour-pedalo.h + src/harbour-pedalo.h \ + src/imageprovider.h diff --git a/icons/108x108/harbour-pedalo.png b/icons/108x108/harbour-pedalo.png index ab10628d3741e1893912e2a304931b55c8c43cf7..079936c3f927634336a00428b993d65588573b5d 100644 GIT binary patch delta 3682 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 Hu0mjfp95I$ diff --git a/icons/128x128/harbour-pedalo.png b/icons/128x128/harbour-pedalo.png index 54375c53cbe19c8ff70ed0c2b435707a7f8a5db5..f3f691a44804406c0e72442a05f564ae82d25924 100644 GIT binary patch literal 4625 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 literal 9004 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 A4gdfE diff --git a/icons/172x172/harbour-pedalo.png b/icons/172x172/harbour-pedalo.png index 36eee58569097cff9011308279775e3f40a72175..bb2136e82e479c04a5861980b927f0a5c9335440 100644 GIT binary patch literal 6608 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
    3*BJ-*)G#D0C>ZP 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 diff --git a/icons/256x256/harbour-pedalo.png b/icons/256x256/harbour-pedalo.png new file mode 100644 index 0000000000000000000000000000000000000000..0671eb9d80092ab15ecef019d9265b8f4fb63123 GIT binary patch literal 10787 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 literal 5835 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 + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/inputs/pedalo-title.svg b/inputs/pedalo-title.svg new file mode 100644 index 0000000..0a08a3f --- /dev/null +++ b/inputs/pedalo-title.svg @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/qml/pages/About.qml b/qml/pages/About.qml index df656ee..f732dd2 100644 --- a/qml/pages/About.qml +++ b/qml/pages/About.qml @@ -30,7 +30,7 @@ Page { Image { anchors.topMargin: Theme.paddingLarge anchors.horizontalCenter: parent.horizontalCenter - source : Qt.resolvedUrl("image://theme/icon-m-cloud-download") + source : Qt.resolvedUrl("image://pedalo/pedalo-title") } Label { diff --git a/src/harbour-pedalo.cpp b/src/harbour-pedalo.cpp index a4218cd..216240d 100644 --- a/src/harbour-pedalo.cpp +++ b/src/harbour-pedalo.cpp @@ -9,6 +9,7 @@ #include "journeymodel.h" #include "status.h" #include "settings.h" +#include "imageprovider.h" #include "harbour-pedalo.h" @@ -44,6 +45,7 @@ int main(int argc, char *argv[]) journeys.importFromFile(file); QScopedPointer view(SailfishApp::createView()); + view->engine()->addImageProvider(QLatin1String("pedalo"), new ImageProvider(Settings::getInstance())); view->setSource(SailfishApp::pathTo("qml/harbour-pedalo.qml")); QQmlContext *ctxt = view->rootContext(); diff --git a/src/imageprovider.cpp b/src/imageprovider.cpp new file mode 100644 index 0000000..431fd23 --- /dev/null +++ b/src/imageprovider.cpp @@ -0,0 +1,38 @@ +#include +#include +#include +#include +#include +#include "settings.h" + +#include "imageprovider.h" + +ImageProvider::ImageProvider(Settings const & settings) : QQuickImageProvider(QQuickImageProvider::Pixmap) { + imageDir = settings.getImageDir(); +} + +QPixmap ImageProvider::requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) { + QPixmap image; + QStringList parts = id.split('?'); + QPixmap sourcePixmap(imageDir + parts.at(0) + ".png"); + + if (size) { + *size = sourcePixmap.size(); + } + if (parts.length() > 1) { + if (QColor::isValidColor(parts.at(1))) { + QPainter painter(&sourcePixmap); + painter.setCompositionMode(QPainter::CompositionMode_SourceIn); + painter.fillRect(sourcePixmap.rect(), parts.at(1)); + painter.end(); + } + } + if (requestedSize.width() > 0 && requestedSize.height() > 0) { + image = sourcePixmap.scaled(requestedSize.width(), requestedSize.height(), Qt::IgnoreAspectRatio); + } + else { + image = sourcePixmap; + } + + return image; +} diff --git a/src/imageprovider.h b/src/imageprovider.h new file mode 100644 index 0000000..bc62fbf --- /dev/null +++ b/src/imageprovider.h @@ -0,0 +1,17 @@ +#ifndef IMAGEPROVIDER_H +#define IMAGEPROVIDER_H + +#include +#include +#include "settings.h" + +class ImageProvider : public QQuickImageProvider { +public: + explicit ImageProvider(Settings const & settings); + + QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize); +private: + QString imageDir; +}; + +#endif // IMAGEPROVIDER_H diff --git a/src/settings.cpp b/src/settings.cpp index 0998d37..b1755a7 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1,6 +1,8 @@ #include #include #include +#include +#include #include "settings.h" @@ -10,6 +12,27 @@ Settings::Settings(QObject *parent) : QObject(parent), settings(this), mainStatus(nullptr) { + QScopedPointer ratioItem(new MGConfItem("/desktop/sailfish/silica/theme_pixel_ratio")); + pixelRatio = ratioItem->value(1.0).toDouble(); + QString dir; + if (pixelRatio > 1.75) { + dir = "2.0"; + } + else if (pixelRatio > 1.5) { + dir = "1.75"; + } + else if (pixelRatio > 1.25) { + dir = "1.5"; + } + else if (pixelRatio > 1.0) { + dir = "1.25"; + } + else { + dir = "1.0"; + } + + imageDir = SailfishApp::pathTo("qml/images/z" + dir).toString(QUrl::RemoveScheme) + "/"; + qDebug() << "Image folder: " << imageDir; } Settings::~Settings() { @@ -36,6 +59,13 @@ QString Settings::getConfigDir() { return QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation); } +QString Settings::getImageDir() const { + return imageDir; +} +QString Settings::getImageUrl(const QString &id) const { + return imageDir + id + ".png"; +} + void Settings::setMainStatus(Status &value) { mainStatus = &value; } diff --git a/src/settings.h b/src/settings.h index 2390d89..5dc4fa9 100644 --- a/src/settings.h +++ b/src/settings.h @@ -19,6 +19,8 @@ public: static QObject * provider(QQmlEngine *engine, QJSEngine *scriptEngine); Q_INVOKABLE static QString getConfigDir(); + Q_INVOKABLE QString getImageDir() const; + Q_INVOKABLE QString getImageUrl(const QString &id) const; void loadSettings(); void saveSettings(); @@ -31,6 +33,8 @@ public slots: private: static Settings * instance; QSettings settings; + double pixelRatio; + QString imageDir; // Configurable values Status * mainStatus; -- 2.25.1