kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-10-14 09:14:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Always use Qt's own colour dialog

Browse Source 
On GTK desktops (Mint, XFCE, GNOME) Qt hands QColorDialog to GTK's
chooser. Its "Custom" row is a recent-colours list kept by GTK: every
colour picked is pushed in on the left and the oldest drops out, so a
user's saved wire colours are lost (forum topic 3190). It also ignores
the custom colours QET saves (#918) and has no swatch grid for the
double-click to accept (#1172).

Pass DontUseNativeDialog at every colour dialog, so all platforms get
the dialog Windows already shows: 16 custom slots that change only on
"Add to Custom Colors", saved across restarts.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
ispyisail
2026-10-07 20:53:11 +13:00
parent 437729df15
commit 72b215bb23
9 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/ui/conductorcolortoolbutton.cpp
+1
View File
@@ -220,6 +220,7 @@ void ConductorColorToolButton::chooseOtherColor()
{
QColorDialog dialog(m_current, this);
dialog.setWindowTitle(tr("Choisir une couleur de conducteur"));
dialog.setOption(QColorDialog::DontUseNativeDialog);
ColorDialogDoubleClick::install(&dialog);
if (dialog.exec() == QDialog::Accepted && dialog.selectedColor().isValid()) {
applyColor(dialog.selectedColor());
sources/ui/configpage/guidespropertieswidget.cpp
+2 -1
View File
@@ -96,7 +96,8 @@ void GuidesPropertiesWidget::addGuide() {
colorBtn->setStyleSheet(QString("background-color: %1; color: white; font-weight: bold;").arg(defaultColor.name()));
connect(colorBtn, &QPushButton::clicked, [this, colorBtn]() {
QColor c = QColorDialog::getColor(colorBtn->property("color").value<QColor>(), this);
QColor c = QColorDialog::getColor(colorBtn->property("color").value<QColor>(), this,
QString(), QColorDialog::DontUseNativeDialog);
if (c.isValid()) {
colorBtn->setProperty("color", c);
colorBtn->setStyleSheet(QString("background-color: %1; color: white; font-weight: bold;").arg(c.name()));
sources/ui/diagrambgcolorbutton.cpp
+2 -1
View File
@@ -186,7 +186,8 @@ void DiagramBgColorToolButton::applySystemColor()
void DiagramBgColorToolButton::chooseOtherColor()
{
const QColor c = QColorDialog::getColor(m_current, this,
tr("Choisir une couleur de fond"));
tr("Choisir une couleur de fond"),
QColorDialog::DontUseNativeDialog);
if (c.isValid()) {
applyColor(c);
}
sources/ui/dynamicelementtextmodel.cpp
+2 -1
View File
@@ -1729,7 +1729,8 @@ QWidget *DynamicTextItemDelegate::createEditor(
* handling, so it didn't crash). Resolving the dialog
* before returning removes the second, competing teardown
* path entirely. */
QColor color = QColorDialog::getColor(index.data(Qt::EditRole).value<QColor>(), parent);
QColor color = QColorDialog::getColor(index.data(Qt::EditRole).value<QColor>(), parent,
QString(), QColorDialog::DontUseNativeDialog);
QWidget *w = new QWidget(parent);
if (color.isValid())
{
sources/ui/nokde/kcolorbutton.cpp
+2 -1
View File
@@ -48,7 +48,8 @@ void KColorButton::setColor(const QColor &color)
void KColorButton::chooseColor()
{
const auto selected = QColorDialog::getColor(m_color, this);
const auto selected = QColorDialog::getColor(m_color, this, QString(),
QColorDialog::DontUseNativeDialog);
if (!selected.isValid() || selected == m_color) {
return;
}