From 4f397357a054372f7e755a4a1548397db77eb24a Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 4 Apr 2020 23:04:30 -0500 Subject: [PATCH 1/3] ColorPaletteEditor: use theme's list-add and list-remove icons --- src/preferences/colorpaletteeditor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/preferences/colorpaletteeditor.cpp b/src/preferences/colorpaletteeditor.cpp index 61848f1479fa..0a66cdafceaf 100644 --- a/src/preferences/colorpaletteeditor.cpp +++ b/src/preferences/colorpaletteeditor.cpp @@ -31,7 +31,7 @@ ColorPaletteEditor::ColorPaletteEditor(QWidget* parent, bool showHotcueNumbers) QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred)); pColorButtonLayout->addWidget(pExpander); - m_pRemoveColorButton = new QPushButton("-", this); + m_pRemoveColorButton = new QPushButton(QIcon::fromTheme("list-remove"), "", this); m_pRemoveColorButton->setFixedWidth(32); m_pRemoveColorButton->setToolTip(tr("Remove Color")); m_pRemoveColorButton->setDisabled(true); @@ -41,7 +41,7 @@ ColorPaletteEditor::ColorPaletteEditor(QWidget* parent, bool showHotcueNumbers) this, &ColorPaletteEditor::slotRemoveColor); - m_pAddColorButton = new QPushButton("+", this); + m_pAddColorButton = new QPushButton(QIcon::fromTheme("list-add"), "", this); m_pAddColorButton->setFixedWidth(32); m_pAddColorButton->setToolTip(tr("Add Color")); pColorButtonLayout->addWidget(m_pAddColorButton); From ba13ac6e0b32ab05d578d15296ca7bb28025247a Mon Sep 17 00:00:00 2001 From: Be Date: Sun, 5 Apr 2020 09:58:24 -0500 Subject: [PATCH 2/3] ColorPaletteEditor: check if theme has list-add/list-remove icons --- src/preferences/colorpaletteeditor.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/preferences/colorpaletteeditor.cpp b/src/preferences/colorpaletteeditor.cpp index 0a66cdafceaf..d6b1fc58c0b3 100644 --- a/src/preferences/colorpaletteeditor.cpp +++ b/src/preferences/colorpaletteeditor.cpp @@ -31,7 +31,12 @@ ColorPaletteEditor::ColorPaletteEditor(QWidget* parent, bool showHotcueNumbers) QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred)); pColorButtonLayout->addWidget(pExpander); - m_pRemoveColorButton = new QPushButton(QIcon::fromTheme("list-remove"), "", this); + QIcon removeIcon = QIcon::fromTheme("list-remove", QIcon()); + if (!removeIcon.isNull()) { + m_pRemoveColorButton = new QPushButton(removeIcon, "", this); + } else { + m_pRemoveButton = new QPushButton("-", this); + } m_pRemoveColorButton->setFixedWidth(32); m_pRemoveColorButton->setToolTip(tr("Remove Color")); m_pRemoveColorButton->setDisabled(true); @@ -41,7 +46,12 @@ ColorPaletteEditor::ColorPaletteEditor(QWidget* parent, bool showHotcueNumbers) this, &ColorPaletteEditor::slotRemoveColor); - m_pAddColorButton = new QPushButton(QIcon::fromTheme("list-add"), "", this); + QIcon addIcon = QIcon::fromTheme("list-add", QIcon()); + if (!addIcon.isNull()) { + m_pAddColorButton = new QPushButton(addIcon, "", this); + } else { + m_pAddColorButton = new QPushButton("+", this); + } m_pAddColorButton->setFixedWidth(32); m_pAddColorButton->setToolTip(tr("Add Color")); pColorButtonLayout->addWidget(m_pAddColorButton); From d2411ad88533bee19ef04f94d4c5649a4487d8a5 Mon Sep 17 00:00:00 2001 From: Be Date: Sun, 5 Apr 2020 15:08:23 -0500 Subject: [PATCH 3/3] ColorPaletteEditor: fix segfault --- src/preferences/colorpaletteeditor.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/preferences/colorpaletteeditor.cpp b/src/preferences/colorpaletteeditor.cpp index d6b1fc58c0b3..ca2004c97202 100644 --- a/src/preferences/colorpaletteeditor.cpp +++ b/src/preferences/colorpaletteeditor.cpp @@ -31,11 +31,9 @@ ColorPaletteEditor::ColorPaletteEditor(QWidget* parent, bool showHotcueNumbers) QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred)); pColorButtonLayout->addWidget(pExpander); - QIcon removeIcon = QIcon::fromTheme("list-remove", QIcon()); - if (!removeIcon.isNull()) { - m_pRemoveColorButton = new QPushButton(removeIcon, "", this); - } else { - m_pRemoveButton = new QPushButton("-", this); + m_pRemoveColorButton = new QPushButton(QIcon::fromTheme("list-remove"), "", this); + if (m_pRemoveColorButton->icon().isNull()) { + m_pRemoveColorButton->setText("-"); } m_pRemoveColorButton->setFixedWidth(32); m_pRemoveColorButton->setToolTip(tr("Remove Color")); @@ -46,11 +44,9 @@ ColorPaletteEditor::ColorPaletteEditor(QWidget* parent, bool showHotcueNumbers) this, &ColorPaletteEditor::slotRemoveColor); - QIcon addIcon = QIcon::fromTheme("list-add", QIcon()); - if (!addIcon.isNull()) { - m_pAddColorButton = new QPushButton(addIcon, "", this); - } else { - m_pAddColorButton = new QPushButton("+", this); + m_pAddColorButton = new QPushButton(QIcon::fromTheme("list-add"), "", this); + if (m_pAddColorButton->icon().isNull()) { + m_pAddColorButton->setText("+"); } m_pAddColorButton->setFixedWidth(32); m_pAddColorButton->setToolTip(tr("Add Color"));