changeset 289:4ca7562dd246

* Add icon loader that automatically inverts icons where appropriate for
  (slightly) better display on a dark background

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/widgets/IconLoader.cpp	Fri Jul 13 13:19:15 2007 +0000
@@ -0,0 +1,116 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Sonic Visualiser
+    An audio file viewer and annotation editor.
+    Centre for Digital Music, Queen Mary, University of London.
+    This file copyright 2007 QMUL.
+    
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
+*/
+
+#include "IconLoader.h"
+
+#include <QPixmap>
+#include <QApplication>
+#include <QPainter>
+#include <QPalette>
+
+static const char *autoInvertExceptions[] = {
+    // These are the icons that look OK in their default colours, even
+    // in a colour scheme with a black background.  (They may also be
+    // icons that would look worse if we tried to auto-invert them.)
+    // If we have icons that look bad when auto-inverted but that are
+    // not suitable for use without being inverted, we'll need to
+    // supply inverted versions -- the loader will load xx_inverse.png
+    // in preference to xx.png if a dark background is found.)
+    "fileclose",
+    "filenew-22",
+    "filenew",
+    "fileopen-22",
+    "fileopen",
+    "fileopenaudio",
+    "fileopensession",
+    "filesave-22",
+    "filesave",
+    "filesaveas-22",
+    "filesaveas",
+    "help",
+    "editcut",
+    "editcopy",
+    "editpaste",
+    "editdelete",
+    "exit",
+    "zoom-fit",
+    "zoom-in",
+    "zoom-out",
+    "zoom"
+};
+
+QIcon
+IconLoader::load(QString name)
+{
+    QPixmap pmap(loadPixmap(name));
+    if (pmap.isNull()) return QIcon();
+    else return QIcon(pmap);
+}
+
+QPixmap
+IconLoader::loadPixmap(QString name)
+{
+    QColor bg = QApplication::palette().window().color();
+    if (bg.red() + bg.green() + bg.blue() > 384) { // light background
+        QPixmap pmap(QString(":icons/%1").arg(name));
+        if (pmap.isNull()) {
+            pmap = QPixmap(QString(":icons/%1.png").arg(name));
+        }
+        return pmap;
+    }
+
+    QPixmap pmap(QString(":icons/%1").arg(name));
+    if (pmap.isNull()) {
+        pmap = QPixmap(QString(":icons/%1_inverse.png").arg(name));
+        if (pmap.isNull()) {
+            pmap = QPixmap(QString(":icons/%1.png").arg(name));
+        }
+    }
+    if (pmap.isNull()) return pmap;
+
+    for (int i = 0; i < sizeof(autoInvertExceptions)/
+                        sizeof(autoInvertExceptions[0]); ++i) {
+        if (autoInvertExceptions[i] == name) {
+            return pmap;
+        }
+    }
+
+    // No suitable inverted icon found for black background; try to
+    // auto-invert the default one
+
+    QImage img = pmap.toImage().convertToFormat(QImage::Format_ARGB32);
+
+    for (int y = 0; y < img.height(); ++y) {
+        for (int x = 0; x < img.width(); ++x) {
+
+            QRgb rgba = img.pixel(x, y);
+            QColor colour = QColor
+                (qRed(rgba), qGreen(rgba), qBlue(rgba), qAlpha(rgba));
+
+            int alpha = colour.alpha();
+            if (colour.saturation() < 5 && colour.alpha() > 10) {
+                colour.setHsv(colour.hue(),
+                              colour.saturation(),
+                              255 - colour.value());
+                colour.setAlpha(alpha);
+                img.setPixel(x, y, colour.rgba());
+            }
+        }
+    }
+
+    pmap = QPixmap::fromImage(img);
+    return pmap;
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/widgets/IconLoader.h	Fri Jul 13 13:19:15 2007 +0000
@@ -0,0 +1,33 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Sonic Visualiser
+    An audio file viewer and annotation editor.
+    Centre for Digital Music, Queen Mary, University of London.
+    This file copyright 2007 QMUL.
+    
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
+*/
+
+#ifndef _ICON_LOADER_H_
+#define _ICON_LOADER_H_
+
+#include <QIcon>
+
+class IconLoader
+{
+public:
+    IconLoader() { }
+    virtual ~IconLoader() { }
+
+    QIcon load(QString name);
+    QPixmap loadPixmap(QString name);
+};
+
+#endif
+
+	

--- a/widgets/PropertyStack.cpp	Thu Jul 12 21:10:43 2007 +0000
+++ b/widgets/PropertyStack.cpp	Fri Jul 13 13:19:15 2007 +0000
@@ -20,6 +20,7 @@
 #include "layer/Layer.h"
 #include "layer/LayerFactory.h"
 #include "widgets/NotifyingTabBar.h"
+#include "widgets/IconLoader.h"
 
 #include <QIcon>
 #include <QTabWidget>
@@ -126,7 +127,7 @@
 
 	QString iconName = container->getPropertyContainerIconName();
 
-	QIcon icon(QString(":/icons/%1.png").arg(iconName));
+        QIcon icon(IconLoader().load(iconName));
 	if (icon.isNull()) {
 	    addTab(box, shortName);
 	} else {

--- a/widgets/widgets.pro	Thu Jul 12 21:10:43 2007 +0000
+++ b/widgets/widgets.pro	Fri Jul 13 13:19:15 2007 +0000
@@ -17,6 +17,7 @@
 HEADERS += AudioDial.h \
            ColourNameDialog.h \
            Fader.h \
+           IconLoader.h \
            ItemEditDialog.h \
            KeyReference.h \
            LayerTree.h \
@@ -40,6 +41,7 @@
 SOURCES += AudioDial.cpp \
            ColourNameDialog.cpp \
            Fader.cpp \
+           IconLoader.cpp \
            ItemEditDialog.cpp \
            KeyReference.cpp \
            LayerTree.cpp \