Skip to content

ColorPaletteEditor: use theme's list-add and list-remove icons #2630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Holzhaus merged 3 commits into from
Apr 5, 2020
Merged

ColorPaletteEditor: use theme's list-add and list-remove icons #2630

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f39735
ColorPaletteEditor: use theme's list-add and list-remove icons
Be-ing Apr 5, 2020
ba13ac6
ColorPaletteEditor: check if theme has list-add/list-remove icons
Be-ing Apr 5, 2020
d2411ad
ColorPaletteEditor: fix segfault
Be-ing Apr 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/preferences/colorpaletteeditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ 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);
Comment thread
Be-ing marked this conversation as resolved.
if (m_pRemoveColorButton->icon().isNull()) {
m_pRemoveColorButton->setText("-");
}
m_pRemoveColorButton->setFixedWidth(32);
m_pRemoveColorButton->setToolTip(tr("Remove Color"));
m_pRemoveColorButton->setDisabled(true);
Expand All @@ -41,7 +44,10 @@ ColorPaletteEditor::ColorPaletteEditor(QWidget* parent, bool showHotcueNumbers)
this,
&ColorPaletteEditor::slotRemoveColor);

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"));
pColorButtonLayout->addWidget(m_pAddColorButton);
Expand Down