Make sure to use default text and document-close icons

Signed-off-by: Geoff Hutchison <geoff.hutchison@gmail.com>
OpenChemistry · Feb 11, 2025 · 93ea617 · 93ea617
1 parent 3ae0eec
commit 93ea617
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/avogadro/qtgui/icons/fallback/32x32/document-close.png b/avogadro/qtgui/icons/fallback/32x32/document-close.png
diff --git 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 <QtCore/QFileInfo>
 #include <QtGui/QColor>
 #include <QtGui/QIcon>
+#include <QtGui/QPalette>
 
 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
@@ -2,6 +2,7 @@
     <qresource prefix="/">
         <file>icons/fallback/32x32/cross.png</file>
         <file>icons/fallback/32x32/dashed-preview.png</file>
+        <file>icons/fallback/32x32/document-close.png</file>
         <file>icons/fallback/32x32/document-export.png</file>
         <file>icons/fallback/32x32/document-import.png</file>
         <file>icons/fallback/32x32/document-new.png</file>
@@ -17,6 +18,7 @@
         <file>icons/fallback/32x32/edit-paste.png</file>
         <file>icons/fallback/32x32/edit-delete.png</file>
         <file>icons/fallback/32x32/help-about.png</file>
+        <file>icons/fallback/64x64/document-close.png</file>
         <file>icons/fallback/64x64/document-export.png</file>
         <file>icons/fallback/64x64/document-import.png</file>
         <file>icons/fallback/64x64/document-new.png</file>