From 6d3e329a6a5f13d10d7acc8304ba279355376b9c Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Fri, 25 Aug 2017 18:13:55 +0200 Subject: [PATCH] Set application icon and show logo in QWidget style --- CMakeLists.txt | 3 ++- demo/CMakeLists.txt | 2 +- demo/src/main.cpp | 18 ++++++++++++++---- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e07180b..76b200a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,7 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG Test OPTIONAL_COMPONENTS Widgets + Svg Quick ) find_package(Qt5QuickControls2 EXACT ${Qt5Core_VERSION}) @@ -56,7 +57,7 @@ add_subdirectory(src) enable_testing() add_subdirectory(tests) -if(Qt5Widgets_FOUND) +if(Qt5Widgets_FOUND AND Qt5Svg_FOUND) add_subdirectory(demo) endif() diff --git a/demo/CMakeLists.txt b/demo/CMakeLists.txt index 2ec573a..3cb699c 100644 --- a/demo/CMakeLists.txt +++ b/demo/CMakeLists.txt @@ -58,7 +58,7 @@ add_custom_command( add_custom_target(rust_target DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/rust/${RUST_TARGET_DIR}/librust.a") list(APPEND DemoLibs "${CMAKE_CURRENT_SOURCE_DIR}/rust/${RUST_TARGET_DIR}/librust.a") -list(APPEND DemoLibs Qt5::Widgets) +list(APPEND DemoLibs Qt5::Widgets Qt5::Svg) if (Qt5Quick_FOUND) list(APPEND DemoLibs Qt5::Quick) endif() diff --git a/demo/src/main.cpp b/demo/src/main.cpp index 132203e..c280adf 100644 --- a/demo/src/main.cpp +++ b/demo/src/main.cpp @@ -25,11 +25,13 @@ #include #include #include -#include #include #include #include +#include +#include #include +#include #include #include #include @@ -153,9 +155,16 @@ QWidget* createStyleTab(Models* models, QWidget* tabs, QComboBox* box, } }; box->connect(box, &QComboBox::currentTextChanged, box, f); -// box->setCurrentText(style); -// f(style); - return box; + + QSvgWidget* logo = new QSvgWidget("/home/oever/src/rust_qt_binding_generator/logo.svg"); + logo->setFixedSize(logo->renderer()->defaultSize()); + + QWidget* tab = new QWidget; + QVBoxLayout *layout = new QVBoxLayout; + layout->addWidget(box); + layout->addWidget(logo); + tab->setLayout(layout); + return tab; } QWidget* createObjectTab(Models* models) { @@ -290,6 +299,7 @@ void createWidgets(Models* models, const QString& initialStyle, int main (int argc, char *argv[]) { QApplication app(argc, argv); + app.setWindowIcon(QIcon(":/logo.svg")); #ifdef QT_QUICK_LIB qmlRegisterType("org.qtproject.example", 1, 0, "SortFilterProxyModel");