diff --git a/avogadro/qtgui/icons/fallback/32x32/document-close.png b/avogadro/qtgui/icons/fallback/32x32/document-close.png new file mode 100644 index 0000000000..8dd7bafdd1 Binary files /dev/null and b/avogadro/qtgui/icons/fallback/32x32/document-close.png differ diff --git a/avogadro/qtgui/moleculemodel.cpp b/avogadro/qtgui/moleculemodel.cpp index e163e1c39a..26b84e9085 100644 --- a/avogadro/qtgui/moleculemodel.cpp +++ b/avogadro/qtgui/moleculemodel.cpp @@ -3,18 +3,20 @@ This source code is released under the 3-Clause BSD License, (see "LICENSE"). ******************************************************************************/ -#include "molecule.h" #include "moleculemodel.h" +#include "molecule.h" #include #include #include +#include namespace Avogadro::QtGui { MoleculeModel::MoleculeModel(QObject* p) : QAbstractItemModel(p), m_activeMolecule(nullptr) -{} +{ +} QModelIndex MoleculeModel::parent(const QModelIndex&) const { @@ -115,14 +117,16 @@ QVariant MoleculeModel::data(const QModelIndex& idx, int role) const case Qt::ForegroundRole: if (mol == m_activeMolecule) return QVariant(QColor(Qt::red)); - else - return QVariant(QColor(Qt::black)); + else { + const QPalette defaultPalette; + return QVariant(defaultPalette.color(QPalette::WindowText)); + } default: return QVariant(); } } else if (idx.column() == 1) { if (role == Qt::DecorationRole) - return QIcon(":/icons/fallback/32x32/edit-delete.png"); + return QIcon::fromTheme("document-close"); } return QVariant(); } @@ -197,4 +201,4 @@ void MoleculeModel::itemChanged() } } -} // namespace Avogadro +} // namespace Avogadro::QtGui diff --git a/avogadro/qtgui/qtgui.qrc b/avogadro/qtgui/qtgui.qrc index 534c109c31..bae1c680d8 100644 --- a/avogadro/qtgui/qtgui.qrc +++ b/avogadro/qtgui/qtgui.qrc @@ -2,6 +2,7 @@ icons/fallback/32x32/cross.png icons/fallback/32x32/dashed-preview.png + icons/fallback/32x32/document-close.png icons/fallback/32x32/document-export.png icons/fallback/32x32/document-import.png icons/fallback/32x32/document-new.png @@ -17,6 +18,7 @@ icons/fallback/32x32/edit-paste.png icons/fallback/32x32/edit-delete.png icons/fallback/32x32/help-about.png + icons/fallback/64x64/document-close.png icons/fallback/64x64/document-export.png icons/fallback/64x64/document-import.png icons/fallback/64x64/document-new.png