Add Part Color Swatch Enhancement

Author: RayJr2

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 
 project(BrickSuite
-    VERSION 0.3.0
+    VERSION 0.4.0
     LANGUAGES CXX
 )
 
@@ -731,6 +731,12 @@ if(BUILD_TESTING)
     )
     target_link_libraries(PartRelationshipImportTest PRIVATE Qt6::Core Qt6::Sql ZLIB::ZLIB)
     add_test(NAME PartRelationshipImport COMMAND PartRelationshipImportTest)
+    qt_add_executable(ColorComboHelperTest EXCLUDE_FROM_ALL
+        tests/ColorComboHelperTest.cpp
+        src/ui/helpers/ColorComboHelper.h src/ui/helpers/ColorComboHelper.cpp
+    )
+    target_link_libraries(ColorComboHelperTest PRIVATE Qt6::Widgets)
+    add_test(NAME ColorComboHelper COMMAND ColorComboHelperTest -platform offscreen)
 endif()
 
 if(WIN32)

resources/help/inventory.html

@@ -2,6 +2,7 @@
 <h1>My Inventory</h1><p>My Inventory tracks loose physical pieces. A row identifies an exact Part and Color together with quantity, Storage, Manufacturer, Condition, and Ownership.</p><img src="images/inventory_overview.png" alt="My Inventory">
 <h2>Search and filter</h2><p>Enter a Part number or name in <b>Search</b>, optionally choose Category, Color, Storage, or Manufacturer, then choose <b>Search</b>. Filters combine. Choose the corresponding <b>All...</b> value to remove a filter.</p><p>If Add Part is opened while a specific Storage filter is active, that visible filter becomes the initial destination. Otherwise BrickSuite may reuse the most recent successful Add/import destination for this Workspace during the current application session. Closing BrickSuite clears this session memory.</p>
 <h2>Add a loose part</h2><ol><li>Choose <b>Add Part...</b>. The dialog is non-modal, so it may remain open while you consult Parts Catalog or Part Reference.</li><li>Enter a Part number, or send a selected part from Parts Catalog or <b>Tools → Part Reference...</b>.</li><li>Review the resolved Part and Category. For a BrickLink identifier, enable <b>Try BrickLink ID</b> to resolve through known cross-references.</li><li>Select Color, an active Inventory-capable leaf Storage location, Manufacturer, Condition, Ownership, and Quantity.</li><li>Add the entry and verify the resulting row.</li></ol><img src="images/inventory_add.png" alt="Add Part dialog"><p><b>Show all colors</b> includes colors beyond those currently associated with the resolved Part.</p><p><b>Remember Part</b> retains the resolved Part for the next entry. <b>Keep Open</b> controls whether the dialog stays open after a successful addition. The options are independent: one reuses identity and the other reuses the window.</p><div class="note"><b>If resolution fails:</b> verify Parts Catalog was imported, try the exact Rebrickable number, or use Try BrickLink ID for a BrickLink number. Part Reference cannot add a part absent from the local catalog.</div>
+<p>Add Part's Color list shows a square swatch of the stored catalog color beside its name. Swatches stay the same in Light and Dark themes. Colors with missing or invalid hex data remain selectable without a swatch.</p>
 <h2>Parts Catalog or Part Reference?</h2><p>Use <a href="parts_catalog.html"><b>Parts Catalog</b></a> for complete database search, categories, colors, external identities, relationships, and Details. Use <a href="part_reference.html"><b>Part Reference</b></a> for visual family browsing and supported dimension grids. Both can send an exact local identity to Add Part.</p>
 <h2>Actions for an existing row</h2><img src="images/inventory_actions.png" alt="Inventory Actions menu"><ul><li><b>Details</b> shows current inventory and Part information.</li><li><b>Edit</b> changes supported descriptive attributes.</li><li><b>Move</b> transfers a chosen quantity to another active Inventory-capable leaf and records both locations.</li><li><b>Correct Entry...</b> adjusts a wrong stored count. Review the intended correction; do not use Move for a count correction.</li><li><b>Remove Entry...</b> deliberately removes quantity and records the operation. It is not the same as Mark Lost.</li><li><b>Mark Lost...</b> records physically missing pieces that may later be returned through Lost / Found.</li><li><b>View History</b> shows additions, corrections, removals, moves, imports, Build activity, and Lost/Found events.</li></ul><img src="images/inventory_move.png" alt="Move Inventory"><img src="images/inventory_history.png" alt="Inventory History">
 <h2>Import and receive inventory</h2><p><b>Import CSV</b> supports previewed Rebrickable Append, Replace, Subtract, and Compare Only. Select the operation and physical attributes, review projected quantities and errors, and only then apply. Compare Only never changes BrickSuite.</p><p>Supported BrickOwl order receiving also produces a preview with identity and color status. Committing valid rows is transactional and records history; cancelling makes no changes.</p>

src/ui/helpers/ColorComboHelper.cpp

@@ -23,6 +23,8 @@
 #include <QColor>
 #include <QComboBox>
 #include <QPalette>
+#include <QIcon>
+#include <QPixmap>
 
 #include <algorithm>
 #include <cmath>
@@ -31,7 +33,8 @@ int ColorComboHelper::addColorItem(
     QComboBox* comboBox,
     const QString& name,
     int colorId,
-    const QString& rgbHex)
+    const QString& rgbHex,
+    bool showCatalogSwatch)
 {
     if (!comboBox)
         return -1;
@@ -54,6 +57,24 @@ int ColorComboHelper::addColorItem(
     if (!sourceColor.isValid())
         return index;
 
+    if (showCatalogSwatch) {
+        QPixmap swatch(16, 16);
+        swatch.fill(sourceColor);
+        QIcon icon;
+        // Catalog color is data: never let Qt synthesize a tinted selected
+        // or disabled variant from the current UI palette.
+        for (const auto mode : {QIcon::Normal, QIcon::Disabled, QIcon::Active, QIcon::Selected}) {
+            icon.addPixmap(swatch, mode, QIcon::Off);
+            icon.addPixmap(swatch, mode, QIcon::On);
+        }
+        comboBox->setItemIcon(index, icon);
+
+        // The swatch now carries the catalog color. Leave the name on the
+        // combo's palette-driven foreground so normal and selected text use
+        // BrickSuite's theme-aware Text and HighlightedText colors.
+        return index;
+    }
+
     const QColor backgroundColor =
         comboBox->palette().color(
             QPalette::Base);
@@ -186,4 +207,4 @@ double ColorComboHelper::contrastRatio(
     return
         (lighter + 0.05) /
         (darker + 0.05);
-}
+}

src/ui/helpers/ColorComboHelper.h

@@ -32,7 +32,8 @@ class ColorComboHelper
         QComboBox* comboBox,
         const QString& name,
         int colorId,
-        const QString& rgbHex);
+        const QString& rgbHex,
+        bool showCatalogSwatch = false);
 
     static QColor readableColor(
         const QColor& sourceColor,
@@ -45,4 +46,4 @@ class ColorComboHelper
     static double contrastRatio(
         const QColor& foreground,
         const QColor& background);
-};
+};

src/ui/inventory/AddInventoryDialog.cpp

@@ -687,7 +687,7 @@ void AddInventoryDialog::loadAllColors()
     const QList<Color> colors = repository.getAll();
 
     for (const Color& color : colors) {
-        ColorComboHelper::addColorItem(m_colorCombo, color.name(), color.id(), color.rgb());
+        ColorComboHelper::addColorItem(m_colorCombo, color.name(), color.id(), color.rgb(), true);
     }
 
     m_colorCombo->setEnabled(true);
@@ -713,7 +713,7 @@ void AddInventoryDialog::applyKnownColors(int preferredColorId)
         // The internal BrickSuite Color ID remains the
         // combo item's user data.
         //
-        ColorComboHelper::addColorItem(m_colorCombo, color.name(), color.id(), color.rgb());
+        ColorComboHelper::addColorItem(m_colorCombo, color.name(), color.id(), color.rgb(), true);
     }
 
     m_colorCombo->setEnabled(true);

tests/ColorComboHelperTest.cpp

@@ -0,0 +1,50 @@
+#include "../src/ui/helpers/ColorComboHelper.h"
+
+#include <QApplication>
+#include <QComboBox>
+#include <QDebug>
+#include <QImage>
+#include <QPalette>
+
+int main(int argc, char** argv)
+{
+    QApplication app(argc, argv);
+    QComboBox combo;
+    for (const QColor background : {QColor(Qt::white), QColor(Qt::black)}) {
+        QPalette palette = combo.palette();
+        palette.setColor(QPalette::Base, background);
+        combo.setPalette(palette);
+        combo.clear();
+        for (const QString hex : {QString("FFFFFF"), QString("#000000"), QString(" 12aBcD ")}) {
+            const int index = ColorComboHelper::addColorItem(&combo, hex, 42, hex, true);
+            QString normalized = hex.trimmed();
+            if (!normalized.startsWith('#')) normalized.prepend('#');
+            const QColor expected(normalized);
+            if (combo.itemData(index).toInt() != 42 || combo.itemText(index) != hex) return 1;
+            if (combo.itemData(index, Qt::ForegroundRole).isValid()) return 6;
+            for (const auto mode : {QIcon::Normal, QIcon::Disabled, QIcon::Active, QIcon::Selected}) {
+                const QImage image = combo.itemIcon(index).pixmap(16, 16, mode).toImage();
+                if (image.isNull() || image.pixelColor(8, 8) != expected) return 2;
+            }
+        }
+        for (const QString hex : {QString(), QString("not-hex"), QString("#GGGGGG")}) {
+            const int index = ColorComboHelper::addColorItem(&combo, "Unknown", 99, hex, true);
+            combo.setCurrentIndex(index);
+            if (!combo.itemIcon(index).isNull() || combo.currentData().toInt() != 99
+                || combo.currentText() != "Unknown") return 3;
+        }
+        const int plain = ColorComboHelper::addColorItem(&combo, "Other dialog", 7, "FF0000");
+        if (!combo.itemIcon(plain).isNull() || combo.itemData(plain).toInt() != 7) return 4;
+        // A palette change must not recolor an already populated swatch.
+        palette.setColor(QPalette::Base, background == QColor(Qt::white) ? Qt::black : Qt::white);
+        palette.setColor(QPalette::Text, background == QColor(Qt::white) ? Qt::white : Qt::black);
+        palette.setColor(QPalette::HighlightedText, background == QColor(Qt::white) ? Qt::black : Qt::white);
+        combo.setPalette(palette);
+        if (combo.itemIcon(0).pixmap(16, 16).toImage().pixelColor(8, 8) != QColor(Qt::white)) return 5;
+        if (combo.itemData(0, Qt::ForegroundRole).isValid()
+            || combo.palette().color(QPalette::Text) != palette.color(QPalette::Text)
+            || combo.palette().color(QPalette::HighlightedText) != palette.color(QPalette::HighlightedText)) return 7;
+    }
+    qInfo() << "Color combo swatch validation passed.";
+    return 0;
+}