From 17d9c993789c1e2f3acad945168d780d325bf0a2 Mon Sep 17 00:00:00 2001 From: anatoly-os Date: Fri, 21 Jun 2019 14:40:50 +0200 Subject: [PATCH] fix black up/down arrow icons in dark theme --- fluid/fluidgui.cpp | 3 +++ mscore/editstaff.cpp | 3 +++ mscore/excerptsdialog.cpp | 3 +++ mscore/importmidi/importmidi_panel.cpp | 4 +++- mscore/instrwidget.cpp | 3 +++ mscore/toolbarEditor.cpp | 4 ++++ zerberus/zerberusgui.cpp | 5 +++++ 7 files changed, 24 insertions(+), 1 deletion(-) diff --git a/fluid/fluidgui.cpp b/fluid/fluidgui.cpp index 2b18000850aa..9baabb922715 100644 --- a/fluid/fluidgui.cpp +++ b/fluid/fluidgui.cpp @@ -124,6 +124,9 @@ FluidGui::FluidGui(Synthesizer* s) connect(_progressTimer, SIGNAL(timeout()), this, SLOT(updateProgress())); connect(soundFonts, SIGNAL(itemSelectionChanged()), this, SLOT(updateUpDownButtons())); + soundFontUp->setIcon(*icons[int(Icons::arrowUp_ICON)]); + soundFontDown->setIcon(*icons[int(Icons::arrowDown_ICON)]); + //update sfs QStringList sfonts = fluid()->soundFonts(); soundFonts->clear(); diff --git a/mscore/editstaff.cpp b/mscore/editstaff.cpp index 4835c60d0334..5a9c71499cb8 100644 --- a/mscore/editstaff.cpp +++ b/mscore/editstaff.cpp @@ -73,6 +73,9 @@ EditStaff::EditStaff(Staff* s, const Fraction& /*tick*/, QWidget* parent) connect(nextButton, SIGNAL(clicked()), SLOT(gotoNextStaff())); connect(previousButton, SIGNAL(clicked()), SLOT(gotoPreviousStaff())); + nextButton->setIcon(*icons[int(Icons::arrowUp_ICON)]); + previousButton->setIcon(*icons[int(Icons::arrowDown_ICON)]); + addAction(getAction("help")); // why is this needed? } diff --git a/mscore/excerptsdialog.cpp b/mscore/excerptsdialog.cpp index 8b858eeb6ab1..e16b8ef4a8a9 100644 --- a/mscore/excerptsdialog.cpp +++ b/mscore/excerptsdialog.cpp @@ -134,6 +134,9 @@ ExcerptsDialog::ExcerptsDialog(MasterScore* s, QWidget* parent) SLOT(addButtonClicked())); connect(title, SIGNAL(textChanged(const QString&)), SLOT(titleChanged(const QString&))); + moveUpButton->setIcon(*icons[int(Icons::arrowUp_ICON)]); + moveDownButton->setIcon(*icons[int(Icons::arrowDown_ICON)]); + for (int i = 1; i <= VOICES; i++) { //partList->model()->setHeaderData(i, Qt::Horizontal, MScore::selectColor[i-1], Qt::BackgroundRole); partList->header()->resizeSection(i, 30); diff --git a/mscore/importmidi/importmidi_panel.cpp b/mscore/importmidi/importmidi_panel.cpp index b503db01a077..bb226067ebfe 100644 --- a/mscore/importmidi/importmidi_panel.cpp +++ b/mscore/importmidi/importmidi_panel.cpp @@ -8,7 +8,7 @@ #include "mscore/preferences.h" #include "musescore.h" #include "libmscore/score.h" - +#include "icons.h" namespace Ms { @@ -128,6 +128,8 @@ void ImportMidiPanel::setupUi() connect(_ui->pushButtonDown, SIGNAL(clicked()), SLOT(moveTrackDown())); connect(_ui->toolButtonHideMidiPanel, SIGNAL(clicked()), SLOT(hidePanel())); + _ui->pushButtonDown->setIcon(*icons[int(Icons::arrowDown_ICON)]); + _updateUiTimer->start(100); updateUi(); _ui->tracksView->setVHeaderDefaultSectionSize(24); diff --git a/mscore/instrwidget.cpp b/mscore/instrwidget.cpp index d058e9d2c2eb..ac73c501fa3a 100644 --- a/mscore/instrwidget.cpp +++ b/mscore/instrwidget.cpp @@ -385,6 +385,9 @@ InstrumentsWidget::InstrumentsWidget(QWidget* parent) downButton->setEnabled(false); addStaffButton->setEnabled(false); addLinkedStaffButton->setEnabled(false); + + upButton->setIcon(*icons[int(Icons::arrowUp_ICON)]); + downButton->setIcon(*icons[int(Icons::arrowDown_ICON)]); instrumentSearch->setFilterableView(instrumentList); } diff --git a/mscore/toolbarEditor.cpp b/mscore/toolbarEditor.cpp index 7d0db1bf46db..aca5364cbd7d 100644 --- a/mscore/toolbarEditor.cpp +++ b/mscore/toolbarEditor.cpp @@ -13,6 +13,7 @@ #include "toolbarEditor.h" #include "musescore.h" #include "workspace.h" +#include "icons.h" namespace Ms { @@ -60,6 +61,9 @@ ToolbarEditor::ToolbarEditor(QWidget* parent) connect(up, SIGNAL(clicked()), SLOT(upAction())); connect(down, SIGNAL(clicked()), SLOT(downAction())); connect(buttonBox, SIGNAL(accepted()), SLOT(accepted())); + + up->setIcon(*icons[int(Icons::arrowUp_ICON)]); + down->setIcon(*icons[int(Icons::arrowDown_ICON)]); MuseScore::restoreGeometry(this); } diff --git a/zerberus/zerberusgui.cpp b/zerberus/zerberusgui.cpp index 92022ced6550..7340efcdee79 100644 --- a/zerberus/zerberusgui.cpp +++ b/zerberus/zerberusgui.cpp @@ -14,6 +14,7 @@ #include "mscore/preferences.h" #include "mscore/extension.h" +#include "mscore/icons.h" //--------------------------------------------------------- // SfzListDialog @@ -106,6 +107,10 @@ ZerberusGui::ZerberusGui(Ms::Synthesizer* s) _progressTimer = new QTimer(this); connect(_progressTimer, SIGNAL(timeout()), this, SLOT(updateProgress())); connect(files, SIGNAL(itemSelectionChanged()), this, SLOT(updateButtons())); + + soundFontUp->setIcon(*Ms::icons[int(Ms::Icons::arrowUp_ICON)]); + soundFontDown->setIcon(*Ms::icons[int(Ms::Icons::arrowDown_ICON)]); + updateButtons(); }