Merge pull request #918 from Kellermorph/fix-colour-selection

Persist QColorDialog custom colors across application restarts
Merge pull request #919 from jp2images/feature-icon-themes
2026-09-20 07:14:13 +02:00 · 2026-09-18 19:36:25 +02:00 · 2026-09-18 19:00:47 +02:00 · 2026-09-18 18:54:11 +02:00 · 2026-09-18 18:52:04 +02:00 · 2026-09-18 18:28:48 +02:00
214 changed files with 660 additions and 45 deletions
@@ -3,6 +3,7 @@
 <RCC version="1.0">
    <qresource prefix="/ico">
        <file>themes/qet/index.theme</file>
+        <file>themes/qet-dark/index.theme</file>
        <file alias="themes/qet/16x16/application-exit.png">16x16/application-exit.png</file>
        <file alias="themes/qet/16x16/arrow-left-double.png">16x16/arrow-left-double.png</file>
        <file alias="themes/qet/16x16/arrow-left.png">16x16/arrow-left.png</file>
@@ -281,5 +282,205 @@
        <file alias="themes/qet/scalable/ellipse-to-bezier.svg">generated/ellipse-to-bezier.svg</file>
        <file alias="themes/qet/scalable/rect-to-bezier.svg">generated/rect-to-bezier.svg</file>
        <file alias="themes/qet/scalable/rect-to-polyline.svg">generated/rect-to-polyline.svg</file>
+        <file>themes/qet-dark/16x16/arrow-left-double.png</file>
+        <file>themes/qet-dark/16x16/arrow-left.png</file>
+        <file>themes/qet-dark/16x16/arrow-right-double.png</file>
+        <file>themes/qet-dark/16x16/arrow-right.png</file>
+        <file>themes/qet-dark/16x16/circle.png</file>
+        <file>themes/qet-dark/16x16/conductor-edit.png</file>
+        <file>themes/qet-dark/16x16/configure-toolbars.png</file>
+        <file>themes/qet-dark/16x16/configure.png</file>
+        <file>themes/qet-dark/16x16/diagram.png</file>
+        <file>themes/qet-dark/16x16/dialog-cancel.png</file>
+        <file>themes/qet-dark/16x16/dialog-ok.png</file>
+        <file>themes/qet-dark/16x16/document-export.png</file>
+        <file>themes/qet-dark/16x16/document-import.png</file>
+        <file>themes/qet-dark/16x16/document-new.png</file>
+        <file>themes/qet-dark/16x16/document-open-recent.png</file>
+        <file>themes/qet-dark/16x16/document-print-frame.png</file>
+        <file>themes/qet-dark/16x16/document-print.png</file>
+        <file>themes/qet-dark/16x16/document-save-all.png</file>
+        <file>themes/qet-dark/16x16/document-save-as.png</file>
+        <file>themes/qet-dark/16x16/document-save.png</file>
+        <file>themes/qet-dark/16x16/edit-clear-locationbar-ltr.png</file>
+        <file>themes/qet-dark/16x16/edit-clear-locationbar-rtl.png</file>
+        <file>themes/qet-dark/16x16/edit-clear.png</file>
+        <file>themes/qet-dark/16x16/edit-copy.png</file>
+        <file>themes/qet-dark/16x16/edit-cut.png</file>
+        <file>themes/qet-dark/16x16/edit-download.png</file>
+        <file>themes/qet-dark/16x16/edit-paste.png</file>
+        <file>themes/qet-dark/16x16/edit-redo.png</file>
+        <file>themes/qet-dark/16x16/edit-rename.png</file>
+        <file>themes/qet-dark/16x16/edit-select-all.png</file>
+        <file>themes/qet-dark/16x16/edit-select-invert.png</file>
+        <file>themes/qet-dark/16x16/edit-table-cell-merge.png</file>
+        <file>themes/qet-dark/16x16/edit-undo.png</file>
+        <file>themes/qet-dark/16x16/element-delete.png</file>
+        <file>themes/qet-dark/16x16/element-edit.png</file>
+        <file>themes/qet-dark/16x16/element-new.png</file>
+        <file>themes/qet-dark/16x16/element.png</file>
+        <file>themes/qet-dark/16x16/endline-circle.png</file>
+        <file>themes/qet-dark/16x16/endline-diamond.png</file>
+        <file>themes/qet-dark/16x16/endline-none.png</file>
+        <file>themes/qet-dark/16x16/endline-simple.png</file>
+        <file>themes/qet-dark/16x16/endline-triangle.png</file>
+        <file>themes/qet-dark/16x16/flip.png</file>
+        <file>themes/qet-dark/16x16/folder-delete.png</file>
+        <file>themes/qet-dark/16x16/folder-edit.png</file>
+        <file>themes/qet-dark/16x16/folder-new.png</file>
+        <file>themes/qet-dark/16x16/folder-open.png</file>
+        <file>themes/qet-dark/16x16/folder-show-all.png</file>
+        <file>themes/qet-dark/16x16/folder.png</file>
+        <file>themes/qet-dark/16x16/folio-delete.png</file>
+        <file>themes/qet-dark/16x16/folio-new.png</file>
+        <file>themes/qet-dark/16x16/folio-properties.png</file>
+        <file>themes/qet-dark/16x16/folio-ref-coming.png</file>
+        <file>themes/qet-dark/16x16/go-company.png</file>
+        <file>themes/qet-dark/16x16/go-down-double.png</file>
+        <file>themes/qet-dark/16x16/go-down.png</file>
+        <file>themes/qet-dark/16x16/go-home.png</file>
+        <file>themes/qet-dark/16x16/go-up-double.png</file>
+        <file>themes/qet-dark/16x16/go-up.png</file>
+        <file>themes/qet-dark/16x16/grid.png</file>
+        <file>themes/qet-dark/16x16/help-contents.png</file>
+        <file>themes/qet-dark/16x16/help-donate.png</file>
+        <file>themes/qet-dark/16x16/item-cancel.png</file>
+        <file>themes/qet-dark/16x16/item-copy.png</file>
+        <file>themes/qet-dark/16x16/item-move.png</file>
+        <file>themes/qet-dark/16x16/kdenlive-show-video.png</file>
+        <file>themes/qet-dark/16x16/label.png</file>
+        <file>themes/qet-dark/16x16/list-add.png</file>
+        <file>themes/qet-dark/16x16/list-remove.png</file>
+        <file>themes/qet-dark/16x16/masquer.png</file>
+        <file>themes/qet-dark/16x16/mirror.png</file>
+        <file>themes/qet-dark/16x16/move.png</file>
+        <file>themes/qet-dark/16x16/object-group.png</file>
+        <file>themes/qet-dark/16x16/object-rotate-right.png</file>
+        <file>themes/qet-dark/16x16/orientations.png</file>
+        <file>themes/qet-dark/16x16/preferences-desktop-user.png</file>
+        <file>themes/qet-dark/16x16/select.png</file>
+        <file>themes/qet-dark/16x16/table-of-content.png</file>
+        <file>themes/qet-dark/16x16/terminal.png</file>
+        <file>themes/qet-dark/16x16/text-xml.png</file>
+        <file>themes/qet-dark/16x16/transform-rotate.png</file>
+        <file>themes/qet-dark/16x16/view-fullscreen.png</file>
+        <file>themes/qet-dark/16x16/view-restore.png</file>
+        <file>themes/qet-dark/16x16/window-new.png</file>
+        <file>themes/qet-dark/16x16/zoom-draw.png</file>
+        <file>themes/qet-dark/16x16/zoom-fit-best.png</file>
+        <file>themes/qet-dark/16x16/zoom-in.png</file>
+        <file>themes/qet-dark/16x16/zoom-original.png</file>
+        <file>themes/qet-dark/16x16/zoom-out.png</file>
+        <file>themes/qet-dark/22x22/Actions-player-time-icon.png</file>
+        <file>themes/qet-dark/22x22/all_pages.png</file>
+        <file>themes/qet-dark/22x22/applications-development-translation.png</file>
+        <file>themes/qet-dark/22x22/arc.png</file>
+        <file>themes/qet-dark/22x22/arrow-left-double.png</file>
+        <file>themes/qet-dark/22x22/arrow-left.png</file>
+        <file>themes/qet-dark/22x22/arrow-right-double.png</file>
+        <file>themes/qet-dark/22x22/arrow-right.png</file>
+        <file>themes/qet-dark/22x22/configure-toolbars.png</file>
+        <file>themes/qet-dark/22x22/configure.png</file>
+        <file>themes/qet-dark/22x22/diagram.png</file>
+        <file>themes/qet-dark/22x22/diagram_add.png</file>
+        <file>themes/qet-dark/22x22/folio-new.png</file>
+        <file>themes/qet-dark/22x22/diagram_bg.png</file>
+        <file>themes/qet-dark/22x22/diagram_del.png</file>
+        <file>themes/qet-dark/22x22/folio-delete.png</file>
+        <file>themes/qet-dark/22x22/dialog-cancel.png</file>
+        <file>themes/qet-dark/22x22/dialog-information.png</file>
+        <file>themes/qet-dark/22x22/folio-properties.png</file>
+        <file>themes/qet-dark/22x22/dialog-ok.png</file>
+        <file>themes/qet-dark/22x22/document-export.png</file>
+        <file>themes/qet-dark/22x22/document-import.png</file>
+        <file>themes/qet-dark/22x22/document-new.png</file>
+        <file>themes/qet-dark/22x22/document-open-recent.png</file>
+        <file>themes/qet-dark/22x22/document-print-frame.png</file>
+        <file>themes/qet-dark/22x22/document-print.png</file>
+        <file>themes/qet-dark/22x22/document-save-all.png</file>
+        <file>themes/qet-dark/22x22/document-save-as.png</file>
+        <file>themes/qet-dark/22x22/document-save.png</file>
+        <file>themes/qet-dark/22x22/edit-clear-locationbar-ltr.png</file>
+        <file>themes/qet-dark/22x22/edit-clear-locationbar-rtl.png</file>
+        <file>themes/qet-dark/22x22/edit-clear.png</file>
+        <file>themes/qet-dark/22x22/edit-copy.png</file>
+        <file>themes/qet-dark/22x22/edit-cut.png</file>
+        <file>themes/qet-dark/22x22/edit-paste.png</file>
+        <file>themes/qet-dark/22x22/edit-redo.png</file>
+        <file>themes/qet-dark/22x22/edit-rename.png</file>
+        <file>themes/qet-dark/22x22/edit-select-all.png</file>
+        <file>themes/qet-dark/22x22/edit-table-cell-merge.png</file>
+        <file>themes/qet-dark/22x22/edit-undo.png</file>
+        <file>themes/qet-dark/22x22/element-delete.png</file>
+        <file>themes/qet-dark/22x22/element-edit.png</file>
+        <file>themes/qet-dark/22x22/element-new.png</file>
+        <file>themes/qet-dark/22x22/ellipse.png</file>
+        <file>themes/qet-dark/22x22/folder-delete.png</file>
+        <file>themes/qet-dark/22x22/folder-edit.png</file>
+        <file>themes/qet-dark/22x22/folder-new.png</file>
+        <file>themes/qet-dark/22x22/folder-open.png</file>
+        <file>themes/qet-dark/22x22/go-company.png</file>
+        <file>themes/qet-dark/22x22/go-down.png</file>
+        <file>themes/qet-dark/22x22/go-home.png</file>
+        <file>themes/qet-dark/22x22/go-up.png</file>
+        <file>themes/qet-dark/22x22/grid.png</file>
+        <file>themes/qet-dark/22x22/insert-image.png</file>
+        <file>themes/qet-dark/22x22/label.png</file>
+        <file>themes/qet-dark/22x22/landscape.png</file>
+        <file>themes/qet-dark/22x22/line.png</file>
+        <file>themes/qet-dark/22x22/list-add.png</file>
+        <file>themes/qet-dark/22x22/list-remove.png</file>
+        <file>themes/qet-dark/22x22/lower.png</file>
+        <file>themes/qet-dark/22x22/move.png</file>
+        <file>themes/qet-dark/22x22/names.png</file>
+        <file>themes/qet-dark/22x22/object-locked.png</file>
+        <file>themes/qet-dark/22x22/object-rotate-right.png</file>
+        <file>themes/qet-dark/22x22/object-unlocked.png</file>
+        <file>themes/qet-dark/22x22/pdf-import.png</file>
+        <file>themes/qet-dark/22x22/polygon.png</file>
+        <file>themes/qet-dark/22x22/portrait.png</file>
+        <file>themes/qet-dark/22x22/preferences-desktop-user.png</file>
+        <file>themes/qet-dark/22x22/raise.png</file>
+        <file>themes/qet-dark/22x22/rectangle.png</file>
+        <file>themes/qet-dark/22x22/restaurer.png</file>
+        <file>themes/qet-dark/22x22/select.png</file>
+        <file>themes/qet-dark/22x22/single_page.png</file>
+        <file>themes/qet-dark/22x22/start.png</file>
+        <file>themes/qet-dark/22x22/text-xml.png</file>
+        <file>themes/qet-dark/22x22/text.png</file>
+        <file>themes/qet-dark/22x22/textfield.png</file>
+        <file>themes/qet-dark/22x22/transform-scale.png</file>
+        <file>themes/qet-dark/22x22/two_pages.png</file>
+        <file>themes/qet-dark/22x22/view-fit-window.png</file>
+        <file>themes/qet-dark/22x22/view-fullscreen.png</file>
+        <file>themes/qet-dark/22x22/view-restore.png</file>
+        <file>themes/qet-dark/22x22/view_fit_width.png</file>
+        <file>themes/qet-dark/22x22/window-new.png</file>
+        <file>themes/qet-dark/22x22/zoom-draw.png</file>
+        <file>themes/qet-dark/22x22/zoom-fit-best.png</file>
+        <file>themes/qet-dark/22x22/zoom-in.png</file>
+        <file>themes/qet-dark/22x22/zoom-original.png</file>
+        <file>themes/qet-dark/22x22/zoom-out.png</file>
+        <file>themes/qet-dark/32x32/format-text-bold.png</file>
+        <file>themes/qet-dark/32x32/format-text-color.png</file>
+        <file>themes/qet-dark/32x32/format-text-italic.png</file>
+        <file>themes/qet-dark/32x32/format-text-underline.png</file>
+        <file>themes/qet-dark/32x32/insert-link.png</file>
+        <file>themes/qet-dark/32x32/printer.png</file>
+        <file>themes/qet-dark/32x32/text-xml.png</file>
+        <file>themes/qet-dark/48x48/user-away-extended.png</file>
+        <file>themes/qet-dark/48x48/user-away.png</file>
+        <file>themes/qet-dark/48x48/view-pim-journal.png</file>
+        <file>themes/qet-dark/128x128/plasmagik.png</file>
+        <file>themes/qet-dark/128x128/printer.png</file>
+        <file>themes/qet-dark/128x128/settings.png</file>
+        <file>themes/qet-dark/scalable/edit-opacity.svg</file>
+        <file>themes/qet-dark/scalable/image-flip-horizontal.svg</file>
+        <file>themes/qet-dark/scalable/image-flip-vertical.svg</file>
+        <file>themes/qet-dark/scalable/draw-bezier-curves.svg</file>
+        <file>themes/qet-dark/scalable/transform-crop.svg</file>
+        <file>themes/qet-dark/scalable/ellipse-to-bezier.svg</file>
+        <file>themes/qet-dark/scalable/rect-to-bezier.svg</file>
+        <file>themes/qet-dark/scalable/rect-to-polyline.svg</file>
    </qresource>
 </RCC>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Laurent Trinques	2da516667e	Merge pull request #918 from Kellermorph/fix-colour-selection Linux build and tests / Build and test (Qt 6, Debug) (push) Failing after 1m41s Details Persist QColorDialog custom colors across application restarts	2026-09-18 19:36:25 +02:00
Laurent Trinques	b62b118d45	Merge pull request #919 from jp2images/feature-icon-themes Add a "qet-dark" icon theme for dark palettes	2026-09-18 19:00:47 +02:00
Laurent Trinques	b0b7814015	Merge pull request #925 from arummler/fix-undo-stack Fix issues with undo stack	2026-09-18 18:54:11 +02:00
Laurent Trinques	c9a63b5bce	Merge pull request #921 from arummler/master-fix-group-rotation Fix: "group rotate"	2026-09-18 18:52:04 +02:00
Andre Rummler	059d179d9b	Fix: a) Project stayed in modified state even after undoing all changes. b) Saving the project deleted the undo stack.	2026-09-18 18:28:48 +02:00
Kellermorph	fa52aab149	Persist QColorDialog custom colors across application restarts Qt's QColorDialog loads custom colors from QSettings on startup but never writes them back, so user-defined colors in the color picker are lost when the application exits. Save and load the 16 custom color slots explicitly via QSettings in QETApp's constructor (after initStyle) and destructor (before other settings are flushed). This covers every QColorDialog usage in the application transparently. Also fixes a QColorDialog memory leak in DiagramView.	2026-09-18 13:53:14 +02:00
Andre Rummler	54e61d482d	Fix: "group rotate" of elements detached the conductors as those were not rotated.	2026-09-18 12:35:08 +02:00
Jeff Patterson	800ddfbcbe	Add a "qet-dark" icon theme for dark palettes 189 of QET's 266 fixed-size icons are black line art with no dark variant, so on a dark palette they were black on a dark toolbar, and Fusion's disabled rendering lightened them into something more readable than the enabled state (GitHub #466, #870; bugtracker 335 for the element panels, which keep their own fix). The theme "qet-dark" holds light-ink copies of the line-art icons in ico/themes/qet-dark, generated by misc/make_icon_themes.py. Colored icons are not copied; the theme inherits them from "qet". An icon counts as line art when fewer than 20% of its visible pixels are saturated. The copies keep hue and alpha and invert lightness, scaled so each icon's darkest ink becomes (220,220,220), the dark palette's text color. The eight SVG icons get their color replaced the same way. QETApp::applyIconTheme() picks "qet-dark" for a dark palette and "qet" otherwise. It runs from initIconTheme(), again from initStyle() once the palette is final, and on the OS color scheme switch. Icons created with QIcon::fromTheme() re-resolve on their next paint, so nothing else changes. With light-ink files, Fusion's own disabled rendering comes out dimmer than enabled with no extra code. tests/qttest/tst_qeticons: every name resolves in both themes, every dark file has light ink, and a Fusion tool button shows its icon at 3:1 in both themes with disabled weaker than enabled.	2026-09-18 05:06:51 -05:00