X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Ficonutils.cpp;h=b58368e453bb90ccaa2d80fdd1c04eff5827fd4c;hb=HEAD;hp=b975411159ff0ef638b3d557c6086363e969c778;hpb=29f9a13b38a0547b70236d24300668385e1dbf6e;p=minitube

diff --git a/src/iconutils.cpp b/src/iconutils.cpp
index b975411..5246272 100644
--- a/src/iconutils.cpp
+++ b/src/iconutils.cpp
@@ -19,60 +19,134 @@ along with Minitube.  If not, see <http://www.gnu.org/licenses/>.
 $END_LICENSE */
 
 #include "iconutils.h"
+#include "mainwindow.h"
 #include <QAction>
 
+namespace {
+
+void addIconFile(QIcon &icon,
+                 const QString &filename,
+                 int size,
+                 QIcon::Mode mode = QIcon::Normal,
+                 QIcon::State state = QIcon::Off) {
+    if (QFile::exists(filename)) {
+        icon.addFile(filename, QSize(size, size), mode, state);
+    }
+}
+
+QVector<int> sizes;
+
+} // namespace
+
+void IconUtils::setSizes(const QVector<int> &value) {
+    sizes = value;
+}
+
 QIcon IconUtils::fromTheme(const QString &name) {
-    const QLatin1String symbolic("-symbolic");
+    static const QLatin1String symbolic("-symbolic");
     if (name.endsWith(symbolic)) return QIcon::fromTheme(name);
-    QIcon icon;
-    icon = QIcon::fromTheme(name + symbolic);
+    QIcon icon = QIcon::fromTheme(name + symbolic);
     if (icon.isNull()) return QIcon::fromTheme(name);
     return icon;
 }
 
-QIcon IconUtils::fromResources(const QString &name) {
-    QIcon icon = QIcon(QString(":/images/%1.png").arg(name));
-    if (!icon.isNull()) {
-        icon.addPixmap(IconUtils::pixmap(QString(":/images/%1_active.png").arg(name)), QIcon::Active);
-        icon.addPixmap(IconUtils::pixmap(QString(":/images/%1_selected.png").arg(name)), QIcon::Selected);
-        icon.addPixmap(IconUtils::pixmap(QString(":/images/%1_disabled.png").arg(name)), QIcon::Disabled);
+QIcon IconUtils::fromResources(const char *name) {
+    qDebug() << "Creating icon" << name;
+    static const QLatin1String normal("_normal");
+    static const QLatin1String active("_active");
+    static const QLatin1String selected("_selected");
+    static const QLatin1String disabled("_disabled");
+    static const QLatin1String checked("_checked");
+    static const QLatin1String ext(".png");
+
+    QString path = QStringLiteral(":/icons/");
+
+    if (MainWindow::instance()->palette().window().color().value() > 128)
+        path += QLatin1String("light/");
+    else
+        path += QLatin1String("dark/");
+
+    QIcon icon;
+
+    // WARN keep these sizes updated with what we really use
+    for (int size : qAsConst(sizes)) {
+        const QString pathAndName =
+                path + QString::number(size) + QLatin1Char('/') + QLatin1String(name);
+        QString iconFilename = pathAndName + normal + ext;
+        if (QFile::exists(iconFilename)) {
+            addIconFile(icon, iconFilename, size);
+            addIconFile(icon, pathAndName + active + ext, size, QIcon::Active);
+            addIconFile(icon, pathAndName + selected + ext, size, QIcon::Selected);
+            addIconFile(icon, pathAndName + disabled + ext, size, QIcon::Disabled);
+            addIconFile(icon, pathAndName + checked + ext, size, QIcon::Normal, QIcon::On);
+        }
     }
     return icon;
 }
 
-QIcon IconUtils::icon(const QString &name) {
-#if defined(APP_MAC) || defined(APP_WIN)
-    return fromResources(name);
-#else
-    QIcon icon = fromTheme(name);
+QIcon IconUtils::icon(const char *name) {
+    static QMap<QByteArray, QIcon> cache = [] {
+        qDebug() << "Init icon cache";
+        QMap<QByteArray, QIcon> c;
+        QObject::connect(qApp, &QApplication::paletteChanged, qApp, [&c]() {
+            qDebug() << "Clearing icon cache";
+            c.clear();
+        });
+        return c;
+    }();
+
+    auto i = cache.constFind(QByteArray::fromRawData(name, strlen(name)));
+    if (i != cache.constEnd()) return i.value();
+
+    QIcon icon;
+#ifdef APP_UBUNTU_NO
+    icon = fromTheme(name);
     if (icon.isNull()) icon = fromResources(name);
-    return icon;
+#else
+    icon = fromResources(name);
 #endif
+
+    cache.insert(QByteArray(name), icon);
+    return icon;
 }
 
-QIcon IconUtils::icon(const QStringList &names) {
+QIcon IconUtils::icon(const QVector<const char *> &names) {
     QIcon icon;
-    foreach (const QString &name, names) {
+    for (auto name : names) {
         icon = IconUtils::icon(name);
         if (!icon.availableSizes().isEmpty()) break;
     }
     return icon;
 }
 
-QIcon IconUtils::tintedIcon(const QString &name, const QColor &color, QList<QSize> sizes) {
+QPixmap IconUtils::iconPixmap(const char *name,
+                              int size,
+                              const QColor &background,
+                              const qreal pixelRatio) {
+    QString path = QStringLiteral(":/icons/");
+    if (background.value() > 128)
+        path += QLatin1String("light/");
+    else
+        path += QLatin1String("dark/");
+    path += QString::number(size) + QLatin1Char('/') + QLatin1String(name) +
+            QLatin1String("_normal.png");
+    return IconUtils::pixmap(path, pixelRatio);
+}
+
+QIcon IconUtils::tintedIcon(const char *name, const QColor &color, const QVector<QSize> &sizes) {
     QIcon i = IconUtils::icon(name);
     QIcon t;
-    if (sizes.isEmpty()) sizes = i.availableSizes();
-    foreach (const QSize &size, sizes) {
+    // if (sizes.isEmpty()) sizes = i.availableSizes();
+    for (const QSize &size : sizes) {
         QPixmap pixmap = i.pixmap(size);
-        QImage tintedImage = tinted(pixmap.toImage(), color);
-        t.addPixmap(QPixmap::fromImage(tintedImage));
+        tint(pixmap, color);
+        t.addPixmap(pixmap);
     }
     return t;
 }
 
-QIcon IconUtils::tintedIcon(const QString &name, const QColor &color, const QSize &size) {
-    return IconUtils::tintedIcon(name, color, QList<QSize>() << size);
+QIcon IconUtils::tintedIcon(const char *name, const QColor &color, const QSize &size) {
+    return IconUtils::tintedIcon(name, color, QVector<QSize>() << size);
 }
 
 QImage IconUtils::grayscaled(const QImage &image) {
@@ -86,8 +160,7 @@ QImage IconUtils::grayscaled(const QImage &image) {
     return img;
 }
 
-QImage IconUtils::tinted(const QImage &image, const QColor &color,
-                         QPainter::CompositionMode mode) {
+QImage IconUtils::tinted(const QImage &image, const QColor &color, QPainter::CompositionMode mode) {
     QImage img(image.size(), QImage::Format_ARGB32_Premultiplied);
     QPainter painter(&img);
     painter.drawImage(0, 0, grayscaled(image));
@@ -98,31 +171,29 @@ QImage IconUtils::tinted(const QImage &image, const QColor &color,
     return img;
 }
 
-void IconUtils::setupAction(QAction *action) {
-    // never autorepeat.
-    // unexperienced users tend to keep keys pressed for a "long" time
-    action->setAutoRepeat(false);
-
-    // show keyboard shortcuts in the status bar
-    if (!action->shortcut().isEmpty())
-        action->setStatusTip(action->statusTip() +
-                             " (" +
-                             action->shortcut().toString(QKeySequence::NativeText) +
-                             ")");
+void IconUtils::tint(QPixmap &pixmap, const QColor &color, QPainter::CompositionMode mode) {
+    QPainter painter(&pixmap);
+    painter.setCompositionMode(mode);
+    painter.fillRect(pixmap.rect(), color);
 }
 
-QPixmap IconUtils::pixmap(const QString &name) {
+QPixmap IconUtils::pixmap(const char *name, const qreal pixelRatio) {
+    return pixmap(QString::fromLatin1(name), pixelRatio);
+}
+
+QPixmap IconUtils::pixmap(const QString &filename, const qreal pixelRatio) {
     // Check if a "@2x" file exists
-    QString fileName = name;
-    if (qApp->devicePixelRatio() > 1.0) {
-        int dotIndex = fileName.lastIndexOf(QLatin1Char('.'));
+    if (pixelRatio > 1.0) {
+        int dotIndex = filename.lastIndexOf(QLatin1Char('.'));
         if (dotIndex != -1) {
-            QString at2xfileName = fileName;
-            at2xfileName.insert(dotIndex, QStringLiteral("@2x"));
-            if (QFile::exists(at2xfileName))
-                fileName = at2xfileName;
+            QString at2xfileName = filename;
+            at2xfileName.insert(dotIndex, QLatin1String("@2x"));
+            if (QFile::exists(at2xfileName)) {
+                QPixmap pixmap(at2xfileName);
+                pixmap.setDevicePixelRatio(pixelRatio);
+                return pixmap;
+            }
         }
     }
-
-    return QPixmap(fileName);
+    return QPixmap(filename);
 }