mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-04 01:44:13 +02:00
Kellermorph
9af562fcbd
Picking a sheet (folio) background colour in the diagram editor was lost on every restart. Diagram::background_color is a static initialised to white and PaletteGraphicsView's s_custom_bg a static bool, and neither was ever written anywhere -- Diagram::toXml() carries no colour attribute either -- so closing and reopening a project always came back on the default and the choice had to be made again. Store it in QSettings under diagrameditor/sheet_background_* as a pair of values rather than one: the colour, and whether it was picked explicitly. Both halves are needed. "#ffffff, follow the system" and "#ffffff, always white" are the same colour and two behaviours -- the first is what the views invert on a dark palette -- so keeping only the colour would silently turn one into the other on the next start, which is the reported problem one step removed. The colour is written as HexRgb on purpose. The SVG export gives Diagram::background_color an alpha of 0 to render a transparent background and never puts it back, and that transient value must not be persisted as a permanently transparent sheet. Applied from main() after the headless export and scripting branch -- those return before reaching it and must keep rendering on plain white, the rule ProjectPrintWindow already enforces for printing -- and before QETApp is constructed, since that constructor already loads the projects given on the command line. The GUI export dialog is left alone: it renders through drawBackground(), so what you see is what you export, as it already was within a session. Saved at the moment the colour is applied rather than at shutdown, so neither the print window's temporary white nor the SVG export's alpha can reach it. The button's constructor now mirrors the stored state instead of always claiming "system colour", and the "recently used" list is stored alongside it. Covered by tst_sheetbackgroundsetting, which pins the custom flag and the dropped alpha -- the two rules a single stored colour would lose.
66 lines
1.9 KiB
C++
66 lines
1.9 KiB
C++
/*
|
|
Copyright 2006-2026 The QElectroTech Team
|
|
This file is part of QElectroTech.
|
|
|
|
QElectroTech 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.
|
|
|
|
QElectroTech is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#ifndef DIAGRAMBGCOLORTOOLBUTTON_H
|
|
#define DIAGRAMBGCOLORTOOLBUTTON_H
|
|
|
|
#include <QColor>
|
|
#include <QList>
|
|
#include <QToolButton>
|
|
|
|
class QETDiagramEditor;
|
|
|
|
/**
|
|
@brief The DiagramBgColorToolButton class
|
|
Color picker for the diagram sheet background, placed in the
|
|
"Affichage" toolbar. Mirrors the ConductorColorToolButton UX:
|
|
preset colors in the dropdown, "Autre couleur..." at the bottom,
|
|
and a swatch icon on the button itself.
|
|
|
|
Picking "Couleur système" clears any custom colour and lets the
|
|
dark-mode inversion handle the background as before.
|
|
*/
|
|
class DiagramBgColorToolButton : public QToolButton
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
explicit DiagramBgColorToolButton(QETDiagramEditor *editor,
|
|
QWidget *parent = nullptr);
|
|
|
|
public slots:
|
|
void updateEnabledState();
|
|
void syncFromDiagram();
|
|
|
|
private:
|
|
void rebuildMenu();
|
|
void applyColor(const QColor &color);
|
|
void applySystemColor();
|
|
void chooseOtherColor();
|
|
void rememberRecent(const QColor &color);
|
|
void persistRecent();
|
|
void setSwatch(const QColor &color);
|
|
static QIcon swatchIcon(const QColor &color);
|
|
|
|
QETDiagramEditor *m_editor = nullptr;
|
|
QList<QColor> m_recent;
|
|
QColor m_current;
|
|
bool m_is_system_color = false;
|
|
};
|
|
|
|
#endif // DIAGRAMBGCOLORTOOLBUTTON_H
|