From 12160008f45b2b470d29ff475fc3e7eb3a263ebd Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Mon, 22 Feb 2016 11:11:28 +0100 Subject: Added the kube logo --- CMakeLists.txt | 1 + applications/kube-mail/main.cpp | 29 +++++++++++++++++++++- .../kube-mail/package/contents/ui/main.qml | 18 ++++++++++++++ icons/CMakeLists.txt | 8 ++++++ icons/sc-apps-kube_icon.svg | 12 +++++++++ icons/sc-apps-kube_logo.svg | 16 ++++++++++++ icons/sc-apps-kube_symbol.svg | 9 +++++++ 7 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 icons/CMakeLists.txt create mode 100644 icons/sc-apps-kube_icon.svg create mode 100644 icons/sc-apps-kube_logo.svg create mode 100644 icons/sc-apps-kube_symbol.svg diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ebcaf5b..a70344bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,3 +4,4 @@ cmake_minimum_required(VERSION 2.8.10.1) add_subdirectory(applications) add_subdirectory(framework) +add_subdirectory(icons) diff --git a/applications/kube-mail/main.cpp b/applications/kube-mail/main.cpp index 0e9556c9..5efe14ff 100644 --- a/applications/kube-mail/main.cpp +++ b/applications/kube-mail/main.cpp @@ -3,14 +3,41 @@ #include #include +#include +#include #include +class KubeImageProvider : public QQuickImageProvider +{ +public: + KubeImageProvider() + : QQuickImageProvider(QQuickImageProvider::Pixmap) + { + } + + QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) Q_DECL_OVERRIDE + { + const auto icon = QIcon::fromTheme(id); + auto expectedSize = requestedSize; + if (!icon.availableSizes().contains(requestedSize) && !icon.availableSizes().isEmpty()) { + expectedSize = icon.availableSizes().first(); + } + const auto pixmap = icon.pixmap(expectedSize); + if (size) { + *size = pixmap.size(); + } + return pixmap; + } +}; + int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); auto package = KPackage::PackageLoader::self()->loadPackage("KPackage/GenericQML", "org.kde.kube.mail"); Q_ASSERT(package.isValid()); - QQmlApplicationEngine engine(QUrl::fromLocalFile(package.filePath("mainscript"))); + QQmlApplicationEngine engine; + engine.addImageProvider(QLatin1String("kube"), new KubeImageProvider); + engine.load(QUrl::fromLocalFile(package.filePath("mainscript"))); return app.exec(); } diff --git a/applications/kube-mail/package/contents/ui/main.qml b/applications/kube-mail/package/contents/ui/main.qml index 9d341e0a..5549bcde 100644 --- a/applications/kube-mail/package/contents/ui/main.qml +++ b/applications/kube-mail/package/contents/ui/main.qml @@ -67,6 +67,24 @@ ApplicationWindow { Row { anchors.fill: parent + Rectangle { + height: parent.height + color: "transparent" + Image { + id: img + height: parent.height + fillMode: Image.PreserveAspectCrop + anchors { + verticalCenter: parent.verticalCenter + left: parent.left + leftMargin: -20 + } + source: "image://kube/kube_logo" + sourceSize.height: parent.height * 2.5 + } + width: img.width * 0.7 + } + PlasmaComponents.ToolButton { height: parent.height iconName: "mail-message-new" diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt new file mode 100644 index 00000000..d9f94bf9 --- /dev/null +++ b/icons/CMakeLists.txt @@ -0,0 +1,8 @@ +find_package(ECM 0.0.8 REQUIRED NO_MODULE) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) + +include(ECMInstallIcons) + +ecm_install_icons(ICONS sc-apps-kube_icon.svg DESTINATION share/icons) +ecm_install_icons(ICONS sc-apps-kube_symbol.svg DESTINATION share/icons) +ecm_install_icons(ICONS sc-apps-kube_logo.svg DESTINATION share/icons) diff --git a/icons/sc-apps-kube_icon.svg b/icons/sc-apps-kube_icon.svg new file mode 100644 index 00000000..da2d1e60 --- /dev/null +++ b/icons/sc-apps-kube_icon.svg @@ -0,0 +1,12 @@ + + + + + + + + + diff --git a/icons/sc-apps-kube_logo.svg b/icons/sc-apps-kube_logo.svg new file mode 100644 index 00000000..61a6c28f --- /dev/null +++ b/icons/sc-apps-kube_logo.svg @@ -0,0 +1,16 @@ + + + + + + + + + diff --git a/icons/sc-apps-kube_symbol.svg b/icons/sc-apps-kube_symbol.svg new file mode 100644 index 00000000..6d70899e --- /dev/null +++ b/icons/sc-apps-kube_symbol.svg @@ -0,0 +1,9 @@ + + + + + + + + -- cgit v1.2.3