From 81e6526005d7c31e2e5f2d0554dabe1e863fb8be Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Mon, 7 Dec 2020 16:19:30 +0200 Subject: Use custom icons in webviewcontextmenu --- src/autogen/CMakeLists.txt | 8 +++- src/autogen/util.cpp | 47 +++++++++++++++++++++ src/autogen/util.h | 103 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 156 insertions(+), 2 deletions(-) create mode 100644 src/autogen/util.cpp create mode 100644 src/autogen/util.h (limited to 'src/autogen') diff --git a/src/autogen/CMakeLists.txt b/src/autogen/CMakeLists.txt index 66065ee..c5c7614 100644 --- a/src/autogen/CMakeLists.txt +++ b/src/autogen/CMakeLists.txt @@ -15,7 +15,9 @@ add_custom_command(OUTPUT poi_logos.h DEPENDS ${poi_logos} COMMAND ${PYTHON} ${RCC} -o=poi_logos.h dump -ns=logos ${poi_logos}) # poi_icons.h -set(poi_icons icons/arrow-left.svg icons/arrow-right.svg icons/circle-x.svg icons/refresh.svg icons/home.svg) +set(poi_icons + icons/arrow-left.svg icons/arrow-right.svg icons/circle-x.svg icons/refresh.svg icons/home.svg + icons/volume.svg icons/volume-3.svg) foreach(f ${poi_icons}) list(REMOVE_ITEM poi_icons ${f}) list(APPEND poi_icons ${ICONS_PATH}/${f}) @@ -27,5 +29,7 @@ add_custom_command(OUTPUT poi_icons.h DEPENDS ${poi_icons} add_custom_target(py_autogen DEPENDS settings.h poi_logos.h poi_icons.h) add_library(autogen INTERFACE) -target_include_directories(autogen INTERFACE ${CMAKE_CURRENT_BINARY_DIR}) +target_sources(autogen INTERFACE util.h util.cpp) +target_include_directories(autogen INTERFACE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) +target_link_libraries(autogen INTERFACE Qt5::Svg) add_dependencies(autogen py_autogen) diff --git a/src/autogen/util.cpp b/src/autogen/util.cpp new file mode 100644 index 0000000..0120be2 --- /dev/null +++ b/src/autogen/util.cpp @@ -0,0 +1,47 @@ +/* + * This file is part of smolbote. It's copyrighted by the contributors recorded + * in the version control history of the file, available from its original + * location: https://neueland.iserlohn-fortress.net/gitea/aqua/smolbote + * + * SPDX-License-Identifier: GPL-3.0 + */ + +#include "util.h" +#include +#include +#include + +#define ListSeparator QLatin1String(";") + +const QStringList Util::files(const QString &location, const QStringList &nameFilters) +{ + if(location.isEmpty()) return QStringList(); + + QStringList filelist; + + // check if location is a list of locations (contains a ';') + if(location.contains(ListSeparator)) { + const QStringList locations = location.split(ListSeparator); + + for(const QString &l : locations) { + filelist.append(Util::files(l, nameFilters)); + } + + return filelist; + } + + const QFileInfo info(location); + + // check if location is a folder + if(info.isDir()) { + const auto entryList = QDir(info.absoluteFilePath()).entryInfoList(nameFilters, QDir::Files | QDir::Readable, QDir::Time); + for(const QFileInfo &entryInfo : entryList) { + filelist.append(entryInfo.absoluteFilePath()); + } + } else if(info.isFile()) { + filelist.append(info.absoluteFilePath()); + } + + return filelist; +} + diff --git a/src/autogen/util.h b/src/autogen/util.h new file mode 100644 index 0000000..822794a --- /dev/null +++ b/src/autogen/util.h @@ -0,0 +1,103 @@ +/* + * This file is part of smolbote. It's copyrighted by the contributors recorded + * in the version control history of the file, available from its original + * location: https://neueland.iserlohn-fortress.net/gitea/aqua/smolbote + * + * SPDX-License-Identifier: GPL-3.0 + */ + +#ifndef SMOLBOTE_UTIL_H +#define SMOLBOTE_UTIL_H + +#include "poi_icons.h" +#include "poi_logos.h" +#include +#include +#include +#include +#include + +namespace Util { + +const QStringList files(const QString &location, const QStringList &nameFilters = QStringList()); + +constexpr auto AppIcon = QStyle::SP_CustomBase + 1; +constexpr auto AppWindowIcon = QStyle::SP_CustomBase + 2; + +[[nodiscard]] inline QPixmap render(const auto &data, const QSize size = QSize()) +{ + QSvgRenderer renderer; + renderer.load(QByteArray(data.data(), static_cast(data.size()))); + + QPixmap pm(size.isValid() ? size : renderer.defaultSize()); + pm.fill(Qt::transparent); + + QPainter painter(&pm); + renderer.render(&painter, pm.rect()); + + return pm; +} + +template +inline QIcon icon() +{ + using namespace std::literals; + + if constexpr(id == QStyle::SP_MediaVolume) { + auto on = render(icons::get([] { return "volume-3.svg"sv; })); + auto off = render(icons::get([] { return "volume.svg"sv; })); + QIcon m; + m.addPixmap(on, QIcon::Normal, QIcon::On); + m.addPixmap(off, QIcon::Normal, QIcon::Off); + return m; + + } else if constexpr(id >= QStyle::SP_CustomBase) { + constexpr auto data = logos::get([] { + switch(id) { + case AppIcon: + return "poi.svg"sv; + case AppWindowIcon: + return "poi_window.svg"sv; + default: + return "__unknown__"sv; + } + }); + return QIcon(render(data)); + } else { + + constexpr auto data = icons::get([] { + switch(id) { + case QStyle::SP_ArrowBack: + return "arrow-left.svg"sv; + case QStyle::SP_ArrowForward: + return "arrow-right.svg"sv; + case QStyle::SP_BrowserStop: + return "circle-x.svg"sv; + case QStyle::SP_BrowserReload: + return "refresh.svg"sv; + case QStyle::SP_DirHomeIcon: + return "home.svg"sv; + default: + return "__unknown__"sv; + } + }); + + QIcon m; + // This is a horrible hack that will one day be hopefully fixed: + // When rendering an svg, you can't actually pick a stroke color through + // QPainter::setBrush or QPainter::setPen. So instead, replace the stroke + // color in the data (stroke="currentColor") and then rerender it. + + QByteArray arr(data.data(), data.size()); + for(const auto mode : { QIcon::Normal /*, QIcon::Disabled, QIcon::Active, QIcon::Selected*/ }) { + for(const auto toggle : { QIcon::On, QIcon::Off }) { + const auto pm = render(arr.replace("currentColor", (toggle == QIcon::On ? "black" : "gray"))); + m.addPixmap(pm, mode, toggle); + } + } + return m; + } +} +} // namespace Util + +#endif // SMOLBOTE_UTIL_H -- cgit v1.2.1