diff --git a/fluid/fluid_gui.ui b/fluid/fluid_gui.ui index 2cd53b8e9212..fe525c7a9e30 100644 --- a/fluid/fluid_gui.ui +++ b/fluid/fluid_gui.ui @@ -50,7 +50,11 @@ - ↑ + + + + + :/data/icons/arrow_up.svg:/data/icons/arrow_up.svg @@ -69,7 +73,11 @@ Move Soundfont down - ↓ + + + + + :/data/icons/arrow_down.svg:/data/icons/arrow_down.svg @@ -116,6 +124,8 @@ - + + + diff --git a/fluid/fluidgui.cpp b/fluid/fluidgui.cpp index 288152116100..382c17e5dffb 100644 --- a/fluid/fluidgui.cpp +++ b/fluid/fluidgui.cpp @@ -85,8 +85,6 @@ FluidGui::FluidGui(Synthesizer* s) connect(soundFontDelete, SIGNAL(clicked()), SLOT(soundFontDeleteClicked())); connect(soundFonts, SIGNAL(itemSelectionChanged ()), SLOT(updateUpDownButtons())); updateUpDownButtons(); - soundFontUp->setIcon(*icons[int(Icons::arrowUp_ICON)]); - soundFontDown->setIcon(*icons[int(Icons::arrowDown_ICON)]); } //--------------------------------------------------------- diff --git a/mscore/aboutbox.ui b/mscore/aboutbox.ui index 63d36cb4cec0..939acba0a5fb 100644 --- a/mscore/aboutbox.ui +++ b/mscore/aboutbox.ui @@ -132,6 +132,10 @@ + + + :/data/icons/edit-copy.svg:/data/icons/edit-copy.svg + diff --git a/mscore/albummanager.cpp b/mscore/albummanager.cpp index 5bf6f11291de..9f5a55ae4115 100644 --- a/mscore/albummanager.cpp +++ b/mscore/albummanager.cpp @@ -38,8 +38,6 @@ AlbumManager::AlbumManager(QWidget* parent) { setupUi(this); setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); - up->setIcon(*icons[int(Icons::arrowUp_ICON)]); - down->setIcon(*icons[int(Icons::arrowDown_ICON)]); album = 0; connect(add, SIGNAL(clicked()), SLOT(addClicked())); diff --git a/mscore/albummanager.ui b/mscore/albummanager.ui index 7e578010f81d..15f41a0207be 100644 --- a/mscore/albummanager.ui +++ b/mscore/albummanager.ui @@ -85,7 +85,11 @@ Move current score up in list - ↑ + + + + + :/data/icons/arrow_up.svg:/data/icons/arrow_up.svg @@ -114,7 +118,11 @@ Move current score down in list - ↓ + + + + + :/data/icons/arrow_down.svg:/data/icons/arrow_down.svg @@ -248,7 +256,9 @@ checkBoxAddPageBreak createScore - + + + buttonBox diff --git a/mscore/debugger/measure.ui b/mscore/debugger/measure.ui index c3a7f3e6bb2b..386206ef8b47 100644 --- a/mscore/debugger/measure.ui +++ b/mscore/debugger/measure.ui @@ -31,14 +31,22 @@ - previous + + + + + :/data/icons/go-previous.svg:/data/icons/go-previous.svg - next + + + + + :/data/icons/go-next.svg:/data/icons/go-next.svg @@ -510,6 +518,8 @@ - + + + diff --git a/mscore/editstaff.cpp b/mscore/editstaff.cpp index 1f75e4cdf99e..c79efdffb8ed 100644 --- a/mscore/editstaff.cpp +++ b/mscore/editstaff.cpp @@ -55,12 +55,6 @@ EditStaff::EditStaff(Staff* s, int /*tick*/, QWidget* parent) setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); setModal(true); - const QIcon &editIcon = *icons[int(Icons::edit_ICON)]; - minPitchASelect->setIcon(editIcon); - maxPitchASelect->setIcon(editIcon); - minPitchPSelect->setIcon(editIcon); - maxPitchPSelect->setIcon(editIcon); - Part* part = orgStaff->part(); instrument = *part->instrument(/*tick*/); Score* score = part->score(); diff --git a/mscore/editstaff.ui b/mscore/editstaff.ui index e1a6ed1a31e3..2c8812809810 100644 --- a/mscore/editstaff.ui +++ b/mscore/editstaff.ui @@ -188,7 +188,11 @@ - ... + + + + + :/data/icons/edit.svg:/data/icons/edit.svg @@ -209,7 +213,11 @@ - ... + + + + + :/data/icons/edit.svg:/data/icons/edit.svg @@ -249,7 +257,11 @@ - ... + + + + + :/data/icons/edit.svg:/data/icons/edit.svg @@ -270,7 +282,11 @@ - ... + + + + + :/data/icons/edit.svg:/data/icons/edit.svg @@ -920,7 +936,9 @@ numOfStrings editStringData - + + + buttonBox diff --git a/mscore/editstyle.cpp b/mscore/editstyle.cpp index aa410c03b0e2..796204c1b0ff 100644 --- a/mscore/editstyle.cpp +++ b/mscore/editstyle.cpp @@ -245,9 +245,6 @@ EditStyle::EditStyle(Score* s, QWidget* parent) }; - const QIcon &editIcon = *icons[int(Icons::edit_ICON)]; - chordDescriptionFileButton->setIcon(editIcon); - pageList->setCurrentRow(0); articulationTable->setSelectionBehavior(QAbstractItemView::SelectRows); @@ -389,8 +386,6 @@ EditStyle::EditStyle(Score* s, QWidget* parent) Direction::fillComboBox(cb); } if (sw.reset) { - sw.reset->setIcon(*icons[int(Icons::reset_ICON)]); - sw.reset->setToolTip(tr("reset to default")); connect(sw.reset, SIGNAL(clicked()), mapper, SLOT(map())); mapper->setMapping(sw.reset, int(sw.idx)); } diff --git a/mscore/editstyle.ui b/mscore/editstyle.ui index 9560afb61bce..d8c32c1c1db2 100644 --- a/mscore/editstyle.ui +++ b/mscore/editstyle.ui @@ -2348,8 +2348,11 @@ + + Reset to default + - ... + @@ -2359,8 +2362,11 @@ + + Reset to default + - ... + @@ -2370,8 +2376,11 @@ + + Reset to default + - ... + @@ -2381,8 +2390,11 @@ + + Reset to default + - ... + @@ -2392,8 +2404,11 @@ + + Reset to default + - ... + @@ -2403,8 +2418,11 @@ + + Reset to default + - ... + @@ -2414,8 +2432,11 @@ + + Reset to default + - ... + @@ -2425,8 +2446,11 @@ + + Reset to default + - ... + @@ -2436,8 +2460,11 @@ + + Reset to default + - ... + @@ -2447,8 +2474,11 @@ + + Reset to default + - ... + @@ -2458,8 +2488,11 @@ + + Reset to default + - ... + @@ -2469,8 +2502,11 @@ + + Reset to default + - ... + @@ -2480,8 +2516,11 @@ + + Reset to default + - ... + @@ -2541,8 +2580,11 @@ + + Reset to default + - ... + @@ -2552,8 +2594,11 @@ + + Reset to default + - ... + @@ -2563,8 +2608,11 @@ + + Reset to default + - ... + @@ -2584,8 +2632,11 @@ + + Reset to default + - ... + @@ -2625,8 +2676,11 @@ + + Reset to default + - ... + @@ -2655,8 +2709,11 @@ + + Reset to default + - ... + @@ -2727,8 +2784,11 @@ + + Reset to default + - ... + @@ -2779,8 +2839,11 @@ + + Reset to default + - ... + @@ -4177,13 +4240,17 @@ - Reset value + Reset to default Reset 'Default vertical position' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -4196,13 +4263,17 @@ - Reset value + Reset to default Reset 'Line thickness' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -4215,13 +4286,17 @@ - Reset value + Reset to default Reset 'Height' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -4234,13 +4309,17 @@ - Reset value + Reset to default Reset 'Continue height' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -4390,13 +4469,17 @@ - Reset value + Reset to default Reset 'Default vertical position' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -4409,13 +4492,17 @@ - Reset value + Reset to default Reset 'Hook height' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -4428,13 +4515,17 @@ - Reset value + Reset to default Reset 'Line thickness' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -4447,13 +4538,17 @@ - Reset value + Reset to default Reset 'Line style' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -4484,13 +4579,17 @@ - Reset value + Reset to default Reset 'Default vertical position' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -4612,13 +4711,17 @@ - Reset value + Reset to default Reset 'Hook height' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -4631,13 +4734,17 @@ - Reset value + Reset to default Reset 'Line thickness' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -4650,13 +4757,17 @@ - Reset value + Reset to default Reset 'Line style' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -4689,10 +4800,14 @@ - Reset value + Reset to default - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -4819,8 +4934,15 @@ + + Reset to default + - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -4977,7 +5099,11 @@ - ... + + + + + :/data/icons/document-open.svg:/data/icons/document-open.svg @@ -5021,7 +5147,7 @@ - A, B♭, B, C, C♯, ... + A, B♭, B, C, C♯, ... Standard @@ -5031,7 +5157,7 @@ - A, B♭, H, C, C♯, ... + A, B♭, H, C, C♯, ... German @@ -5041,7 +5167,7 @@ - A, B, H, C, Cis + A, B, H, C, Cis Full German @@ -5051,7 +5177,7 @@ - Do, Do♯, Re♭, Re, ... + Do, Do♯, Re♭, Re, ... Solfeggio @@ -5061,7 +5187,7 @@ - Do, Do♯, Ré♭, Ré, ... + Do, Do♯, Ré♭, Ré, ... French diff --git a/mscore/excerptsdialog.cpp b/mscore/excerptsdialog.cpp index 7efe2c143a3f..39cd8cc99da3 100644 --- a/mscore/excerptsdialog.cpp +++ b/mscore/excerptsdialog.cpp @@ -76,9 +76,6 @@ ExcerptsDialog::ExcerptsDialog(MasterScore* s, QWidget* parent) partList->addItem(item); } - moveUpButton->setIcon(*icons[int(Icons::arrowUp_ICON)]); - moveDownButton->setIcon(*icons[int(Icons::arrowDown_ICON)]); - connect(newButton, SIGNAL(clicked()), SLOT(newClicked())); connect(newAllButton, SIGNAL(clicked()), SLOT(newAllClicked())); connect(deleteButton, SIGNAL(clicked()), SLOT(deleteClicked())); diff --git a/mscore/excerptsdialog.ui b/mscore/excerptsdialog.ui index 3510808029a3..38d1e5c718bb 100644 --- a/mscore/excerptsdialog.ui +++ b/mscore/excerptsdialog.ui @@ -52,7 +52,11 @@ Move part up - ↑ + + + + + :/data/icons/arrow_up.svg:/data/icons/arrow_up.svg @@ -71,7 +75,11 @@ Move part down - ↓ + + + + + :/data/icons/arrow_down.svg:/data/icons/arrow_down.svg @@ -168,7 +176,9 @@ newAllButton newButton - + + + buttonBox diff --git a/mscore/harmonyedit.cpp b/mscore/harmonyedit.cpp index d032633e2dfe..0ccc27ba9ca4 100644 --- a/mscore/harmonyedit.cpp +++ b/mscore/harmonyedit.cpp @@ -46,7 +46,6 @@ ChordStyleEditor::ChordStyleEditor(QWidget* parent) setWindowTitle(tr("MuseScore: Chord Symbols Style Editor")); setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); - fileButton->setIcon(*icons[int(Icons::fileOpen_ICON)]); chordList = 0; score = 0; diff --git a/mscore/harmonyedit.ui b/mscore/harmonyedit.ui index 86fc3e9b76fa..40a4b7d89cd8 100644 --- a/mscore/harmonyedit.ui +++ b/mscore/harmonyedit.ui @@ -100,7 +100,11 @@ - Load... + + + + + :/data/icons/document-open.svg:/data/icons/document-open.svg @@ -136,7 +140,9 @@ 1 - + + + buttonBox diff --git a/mscore/icons.h b/mscore/icons.h index e1e7bf5b3757..e5cadf5a26bd 100644 --- a/mscore/icons.h +++ b/mscore/icons.h @@ -53,7 +53,7 @@ enum class Icons : signed char { Invalid_ICON = -1, timesig_allabreve_ICON, timesig_common_ICON, timesig_prolatio01_ICON, timesig_prolatio02_ICON, timesig_prolatio03_ICON, timesig_prolatio04_ICON, timesig_prolatio05_ICON, timesig_prolatio07_ICON, timesig_prolatio08_ICON, timesig_prolatio10_ICON, timesig_prolatio11_ICON, edit_ICON, reset_ICON, close_ICON, - arrowUp_ICON, arrowDown_ICON, + //arrowUp_ICON, arrowDown_ICON, voice1_ICON, voice2_ICON, voice3_ICON, voice4_ICON, ICONS }; diff --git a/mscore/importmidi/importmidi_panel.cpp b/mscore/importmidi/importmidi_panel.cpp index 4cc90356b0ed..faea8382e8c8 100644 --- a/mscore/importmidi/importmidi_panel.cpp +++ b/mscore/importmidi/importmidi_panel.cpp @@ -121,9 +121,6 @@ bool ImportMidiPanel::isMidiFile(const QString &fileName) void ImportMidiPanel::setupUi() { - _ui->pushButtonUp->setIcon(*icons[int(Icons::arrowUp_ICON)]); - _ui->pushButtonDown->setIcon(*icons[int(Icons::arrowDown_ICON)]); - connect(_updateUiTimer, SIGNAL(timeout()), this, SLOT(updateUi())); connect(_ui->pushButtonApply, SIGNAL(clicked()), SLOT(applyMidiImport())); connect(_ui->pushButtonCancel, SIGNAL(clicked()), SLOT(cancelChanges())); diff --git a/mscore/importmidi/importmidi_panel.ui b/mscore/importmidi/importmidi_panel.ui index 44c6a79f3fea..3784f1cd7b58 100644 --- a/mscore/importmidi/importmidi_panel.ui +++ b/mscore/importmidi/importmidi_panel.ui @@ -79,7 +79,7 @@ Close MIDI import panel - ... + @@ -121,7 +121,7 @@ Move track up - + @@ -144,7 +144,7 @@ Move track down - + diff --git a/mscore/inspector/inspectorBase.cpp b/mscore/inspector/inspectorBase.cpp index 73904b64d3eb..32aa1b53eef8 100644 --- a/mscore/inspector/inspectorBase.cpp +++ b/mscore/inspector/inspectorBase.cpp @@ -237,9 +237,6 @@ void InspectorBase::setElement() val = QVariant(f.denominator()); } - if (ii.r) - ii.r->setIcon(*icons[int(Icons::reset_ICON)]); - ii.w->blockSignals(true); setValue(ii, val); ii.w->blockSignals(false); diff --git a/mscore/inspector/inspector_accidental.ui b/mscore/inspector/inspector_accidental.ui index 90bac83ebea4..170ff1bc7fc0 100644 --- a/mscore/inspector/inspector_accidental.ui +++ b/mscore/inspector/inspector_accidental.ui @@ -87,7 +87,11 @@ Reset 'Small' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -135,7 +139,11 @@ Reset 'Has bracket' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -168,6 +176,8 @@ hasBracket resetHasBracket - + + + diff --git a/mscore/inspector/inspector_ambitus.ui b/mscore/inspector/inspector_ambitus.ui index 4aa98767e2ce..b9d87843c885 100644 --- a/mscore/inspector/inspector_ambitus.ui +++ b/mscore/inspector/inspector_ambitus.ui @@ -211,7 +211,12 @@ Reset 'Line thickness' value - ... + + + + + :/data/icons/edit-reset.svg + @@ -485,7 +490,11 @@ Reset 'Has line' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -797,7 +806,11 @@ Reset 'Head group' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -829,7 +842,11 @@ Reset 'Direction' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -897,7 +914,11 @@ Reset 'Head type' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -965,6 +986,8 @@ bottomTpc bottomOctave - + + + diff --git a/mscore/inspector/inspector_arpeggio.ui b/mscore/inspector/inspector_arpeggio.ui index 0a4e392f58b5..51588740c790 100644 --- a/mscore/inspector/inspector_arpeggio.ui +++ b/mscore/inspector/inspector_arpeggio.ui @@ -103,7 +103,11 @@ Reset 'Play' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -111,6 +115,8 @@ - + + + diff --git a/mscore/inspector/inspector_articulation.ui b/mscore/inspector/inspector_articulation.ui index a607cc2a360f..37af19ff42f7 100644 --- a/mscore/inspector/inspector_articulation.ui +++ b/mscore/inspector/inspector_articulation.ui @@ -176,7 +176,11 @@ Reset 'Direction' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -218,7 +222,11 @@ Reset 'Anchor' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -231,7 +239,11 @@ Reset 'Time stretch' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -280,7 +292,11 @@ Reset 'Ornament style' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -303,7 +319,11 @@ Reset 'Play' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -323,6 +343,8 @@ playArticulation resetPlayArticulation - + + + diff --git a/mscore/inspector/inspector_barline.ui b/mscore/inspector/inspector_barline.ui index 81a9c6c5a49d..3bad9adbf22b 100644 --- a/mscore/inspector/inspector_barline.ui +++ b/mscore/inspector/inspector_barline.ui @@ -110,7 +110,11 @@ Reset 'Type' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -179,7 +183,11 @@ Reset 'Span' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -205,7 +213,11 @@ Reset 'Span from' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -218,7 +230,11 @@ Reset 'Span to' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -289,6 +305,8 @@ spanTo resetSpanTo - + + + diff --git a/mscore/inspector/inspector_beam.ui b/mscore/inspector/inspector_beam.ui index a111eb7c1dc1..cb4c768a979e 100644 --- a/mscore/inspector/inspector_beam.ui +++ b/mscore/inspector/inspector_beam.ui @@ -198,7 +198,11 @@ Reset 'Direction' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -264,7 +268,11 @@ Reset 'Grow right' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -283,7 +291,11 @@ Reset 'Grow left' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -321,7 +333,11 @@ Reset 'User position' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -353,7 +369,11 @@ Reset 'Local relayout' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -398,7 +418,11 @@ Reset 'Horizontal' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -422,6 +446,8 @@ y1 y2 - + + + diff --git a/mscore/inspector/inspector_bend.ui b/mscore/inspector/inspector_bend.ui index 26fe8d2e72c1..ed713dbbedaa 100644 --- a/mscore/inspector/inspector_bend.ui +++ b/mscore/inspector/inspector_bend.ui @@ -115,7 +115,11 @@ Reset 'Play' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -146,6 +150,8 @@ - + + + diff --git a/mscore/inspector/inspector_caesura.ui b/mscore/inspector/inspector_caesura.ui index 7dd3b88cda21..fd34b441215c 100644 --- a/mscore/inspector/inspector_caesura.ui +++ b/mscore/inspector/inspector_caesura.ui @@ -122,7 +122,11 @@ Reset 'Pause' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -134,6 +138,8 @@ pause resetPause - + + + diff --git a/mscore/inspector/inspector_chord.ui b/mscore/inspector/inspector_chord.ui index 9ca52a58b197..5452c6debbb8 100644 --- a/mscore/inspector/inspector_chord.ui +++ b/mscore/inspector/inspector_chord.ui @@ -84,7 +84,11 @@ Reset 'Vertical offset' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -138,7 +142,11 @@ Reset 'Horizontal offset' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -189,7 +197,11 @@ Reset 'Stem direction' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -240,7 +252,11 @@ Reset 'Small' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -253,7 +269,11 @@ Reset 'Stemless' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -311,6 +331,8 @@ stemDirection resetStemDirection - + + + diff --git a/mscore/inspector/inspector_clef.ui b/mscore/inspector/inspector_clef.ui index 09d17459a62e..e9a2b51d6645 100644 --- a/mscore/inspector/inspector_clef.ui +++ b/mscore/inspector/inspector_clef.ui @@ -106,7 +106,11 @@ Reset 'Show courtesy' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -114,6 +118,8 @@ - + + + diff --git a/mscore/inspector/inspector_dynamic.ui b/mscore/inspector/inspector_dynamic.ui index 7302ab78bb58..c02ee901b367 100644 --- a/mscore/inspector/inspector_dynamic.ui +++ b/mscore/inspector/inspector_dynamic.ui @@ -91,7 +91,11 @@ Reset 'Velocity' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -143,7 +147,11 @@ Reset 'Dynamic range' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -156,7 +164,11 @@ Reset 'Placement' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -191,6 +203,8 @@ velocity resetVelocity - + + + diff --git a/mscore/inspector/inspector_element.ui b/mscore/inspector/inspector_element.ui index 1a716f6cf620..db6eb64f9416 100644 --- a/mscore/inspector/inspector_element.ui +++ b/mscore/inspector/inspector_element.ui @@ -159,7 +159,11 @@ Reset 'Horizontal offset' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -203,7 +207,11 @@ Reset 'Vertical offset' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -241,14 +249,22 @@ Reset 'Color' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg - ... + + + + + :/data/icons/raster-horizontal.svg:/data/icons/raster-horizontal.svg true @@ -261,7 +277,11 @@ - ... + + + + + :/data/icons/raster-vertical.svg:/data/icons/raster-vertical.svg true @@ -330,7 +350,11 @@ Reset 'Visible' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -356,7 +380,11 @@ Reset 'Automatic placement' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -383,6 +411,8 @@ vRaster resetY - + + + diff --git a/mscore/inspector/inspector_fret.ui b/mscore/inspector/inspector_fret.ui index 86e8862ebf6a..60076abaff1f 100644 --- a/mscore/inspector/inspector_fret.ui +++ b/mscore/inspector/inspector_fret.ui @@ -103,7 +103,11 @@ Reset 'Size in staff space units' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -134,6 +138,8 @@ - + + + diff --git a/mscore/inspector/inspector_glissando.ui b/mscore/inspector/inspector_glissando.ui index 0a4e7b831cf3..b0e71bfa5fac 100644 --- a/mscore/inspector/inspector_glissando.ui +++ b/mscore/inspector/inspector_glissando.ui @@ -107,7 +107,11 @@ Reset 'Text' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -120,7 +124,11 @@ Reset 'Type' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -140,7 +148,11 @@ Reset 'Style' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -204,7 +216,11 @@ Reset 'Show text' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -240,7 +256,11 @@ Reset 'Play' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -256,6 +276,8 @@ showText resetShowText - + + + diff --git a/mscore/inspector/inspector_hairpin.ui b/mscore/inspector/inspector_hairpin.ui index d472caeaf29d..96b73e45415a 100644 --- a/mscore/inspector/inspector_hairpin.ui +++ b/mscore/inspector/inspector_hairpin.ui @@ -87,7 +87,11 @@ Reset 'Type' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -124,7 +128,11 @@ Reset 'Height' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -168,7 +176,11 @@ Reset 'Velocity change' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -201,7 +213,11 @@ Reset 'Continue height' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -214,7 +230,11 @@ Reset 'Dynamic range' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -247,7 +267,11 @@ Reset 'Circled tip' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -291,8 +315,15 @@ Reset value + + Reset 'Text line' vslue + - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -316,6 +347,8 @@ hairpinContHeight resetHairpinContHeight - + + + diff --git a/mscore/inspector/inspector_hbox.ui b/mscore/inspector/inspector_hbox.ui index 32df68853682..7531a23b7f80 100644 --- a/mscore/inspector/inspector_hbox.ui +++ b/mscore/inspector/inspector_hbox.ui @@ -72,9 +72,6 @@ 3 - - 0 - 6 @@ -180,7 +177,11 @@ Reset 'Left gap' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -193,7 +194,11 @@ Reset 'Right gap' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -208,6 +213,8 @@ resetRightGap width - + + + diff --git a/mscore/inspector/inspector_image.ui b/mscore/inspector/inspector_image.ui index 9c8e9cec7bfb..66c8854f68c8 100644 --- a/mscore/inspector/inspector_image.ui +++ b/mscore/inspector/inspector_image.ui @@ -104,7 +104,11 @@ Reset 'Scale to frame size' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -240,7 +244,11 @@ Reset 'Lock aspect ratio' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -253,7 +261,11 @@ Reset 'Size in staff space units' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -305,6 +317,8 @@ sizeIsSpatium resetSizeIsSpatium - + + + diff --git a/mscore/inspector/inspector_jump.ui b/mscore/inspector/inspector_jump.ui index 4be9b074dc03..9364a9304570 100644 --- a/mscore/inspector/inspector_jump.ui +++ b/mscore/inspector/inspector_jump.ui @@ -132,7 +132,11 @@ Reset 'Jump to' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -145,7 +149,11 @@ Reset 'Play until' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -158,7 +166,11 @@ Reset 'Continue at' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -174,6 +186,8 @@ continueAt resetContinueAt - + + + diff --git a/mscore/inspector/inspector_keysig.ui b/mscore/inspector/inspector_keysig.ui index a39b6319f6bb..48c66a53068c 100644 --- a/mscore/inspector/inspector_keysig.ui +++ b/mscore/inspector/inspector_keysig.ui @@ -97,7 +97,11 @@ Reset 'Show courtesy' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -109,6 +113,8 @@ showCourtesy resetShowCourtesy - + + + diff --git a/mscore/inspector/inspector_line.ui b/mscore/inspector/inspector_line.ui index 22f95fcebd8c..20bfb314fc18 100644 --- a/mscore/inspector/inspector_line.ui +++ b/mscore/inspector/inspector_line.ui @@ -84,7 +84,11 @@ Reset 'Line color' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -124,7 +128,11 @@ Reset 'Allow diagonal' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -203,7 +211,11 @@ Reset 'Line thickness' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -216,7 +228,11 @@ Reset 'Line style' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -235,7 +251,11 @@ Reset 'Line visible' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -270,6 +290,8 @@ lineStyle resetLineStyle - + + + diff --git a/mscore/inspector/inspector_marker.ui b/mscore/inspector/inspector_marker.ui index b24040cf1fef..2502cd4bfae5 100644 --- a/mscore/inspector/inspector_marker.ui +++ b/mscore/inspector/inspector_marker.ui @@ -84,7 +84,11 @@ Reset 'Marker type' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -111,7 +115,11 @@ Reset 'Label' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -179,6 +187,8 @@ jumpLabel resetJumpLabel - + + + diff --git a/mscore/inspector/inspector_note.ui b/mscore/inspector/inspector_note.ui index 8a86372d3082..e4cb6a3b4572 100644 --- a/mscore/inspector/inspector_note.ui +++ b/mscore/inspector/inspector_note.ui @@ -93,7 +93,11 @@ Reset 'Tuning' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -138,7 +142,11 @@ Reset 'Velocity' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -401,7 +409,11 @@ Reset 'Velocity type' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -436,7 +448,11 @@ Reset 'Dot position' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -462,7 +478,11 @@ Reset 'Play' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -481,7 +501,11 @@ Reset 'Small' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -545,7 +569,11 @@ Reset 'Mirror head' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -580,7 +608,11 @@ Reset 'Head group' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -599,7 +631,11 @@ Reset 'Head type' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -612,7 +648,11 @@ Reset 'Fix to line' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -625,7 +665,11 @@ Reset 'Line' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -653,6 +697,8 @@ velocity resetVelocity - + + + diff --git a/mscore/inspector/inspector_ottava.ui b/mscore/inspector/inspector_ottava.ui index bb666bb17bfa..c440dfc31083 100644 --- a/mscore/inspector/inspector_ottava.ui +++ b/mscore/inspector/inspector_ottava.ui @@ -91,7 +91,11 @@ Reset 'Type' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -165,7 +169,11 @@ Reset 'Placement' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -191,7 +199,11 @@ Reset 'Numbers only' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -207,6 +219,8 @@ numbersOnly resetNumbersOnly - + + + diff --git a/mscore/inspector/inspector_rest.ui b/mscore/inspector/inspector_rest.ui index 4b45384a63ad..e44bf4eed1b9 100644 --- a/mscore/inspector/inspector_rest.ui +++ b/mscore/inspector/inspector_rest.ui @@ -84,7 +84,11 @@ Reset 'Small' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -109,6 +113,8 @@ small resetSmall - + + + diff --git a/mscore/inspector/inspector_segment.ui b/mscore/inspector/inspector_segment.ui index 8399019f246e..2bb024cdac47 100644 --- a/mscore/inspector/inspector_segment.ui +++ b/mscore/inspector/inspector_segment.ui @@ -122,7 +122,11 @@ Reset 'Leading space' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg diff --git a/mscore/inspector/inspector_slur.ui b/mscore/inspector/inspector_slur.ui index 30776df1e74a..f2ac68a65e11 100644 --- a/mscore/inspector/inspector_slur.ui +++ b/mscore/inspector/inspector_slur.ui @@ -90,7 +90,11 @@ Reset 'Line type' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -150,7 +154,11 @@ Reset 'Direction' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -205,6 +213,8 @@ slurDirection resetSlurDirection - + + + diff --git a/mscore/inspector/inspector_spacer.ui b/mscore/inspector/inspector_spacer.ui index e845a34310b7..a1f92d037f26 100644 --- a/mscore/inspector/inspector_spacer.ui +++ b/mscore/inspector/inspector_spacer.ui @@ -119,7 +119,11 @@ Reset 'Height' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -127,6 +131,8 @@ - + + + diff --git a/mscore/inspector/inspector_tbox.ui b/mscore/inspector/inspector_tbox.ui index a42df93efb35..f0591b01ea72 100644 --- a/mscore/inspector/inspector_tbox.ui +++ b/mscore/inspector/inspector_tbox.ui @@ -104,7 +104,11 @@ Reset 'Top gap' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -117,7 +121,11 @@ Reset 'Bottom gap' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -159,7 +167,11 @@ Reset 'Right margin' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -201,7 +213,11 @@ Reset 'Bottom margin' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -243,7 +259,11 @@ Reset 'Top margin' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -256,7 +276,11 @@ Reset 'Left margin' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -367,6 +391,8 @@ bottomMargin resetBottomMargin - + + + diff --git a/mscore/inspector/inspector_tempotext.ui b/mscore/inspector/inspector_tempotext.ui index bc395957f705..43461fda4f15 100644 --- a/mscore/inspector/inspector_tempotext.ui +++ b/mscore/inspector/inspector_tempotext.ui @@ -87,7 +87,11 @@ Reset 'Follow text' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -107,7 +111,11 @@ Reset 'Tempo' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -156,6 +164,8 @@ tempo resetTempo - + + + diff --git a/mscore/inspector/inspector_text.ui b/mscore/inspector/inspector_text.ui index 0d751718982a..a3525e7b588a 100644 --- a/mscore/inspector/inspector_text.ui +++ b/mscore/inspector/inspector_text.ui @@ -104,7 +104,11 @@ Reset 'Style' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -119,6 +123,8 @@ - + + + diff --git a/mscore/inspector/inspector_timesig.ui b/mscore/inspector/inspector_timesig.ui index 93bb173df186..21382c68af8c 100644 --- a/mscore/inspector/inspector_timesig.ui +++ b/mscore/inspector/inspector_timesig.ui @@ -63,9 +63,6 @@ - - 0 - 0 @@ -78,6 +75,9 @@ 0 + + 0 + @@ -93,7 +93,11 @@ Reset 'Show courtesy' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -124,6 +128,8 @@ showCourtesy resetShowCourtesy - + + + diff --git a/mscore/inspector/inspector_tremolo.ui b/mscore/inspector/inspector_tremolo.ui index 3ee2eb9ac74c..fee2859576fc 100644 --- a/mscore/inspector/inspector_tremolo.ui +++ b/mscore/inspector/inspector_tremolo.ui @@ -103,7 +103,11 @@ Reset 'Size in staff space units' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -134,6 +138,8 @@ - + + + diff --git a/mscore/inspector/inspector_trill.ui b/mscore/inspector/inspector_trill.ui index bbce0acedcb0..b29ec32a36c6 100644 --- a/mscore/inspector/inspector_trill.ui +++ b/mscore/inspector/inspector_trill.ui @@ -127,7 +127,11 @@ Reset 'Type' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -144,7 +148,34 @@ - + + + + Play + + + false + + + + + + + Reset value + + + Reset 'Ornament style' value + + + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg + + + + @@ -167,30 +198,7 @@ - - - - Reset value - - - Reset 'Ornament style' value - - - ... - - - - - - - Play - - - false - - - - + Reset value @@ -199,7 +207,11 @@ Reset 'Play' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -207,6 +219,8 @@ - + + + diff --git a/mscore/inspector/inspector_tuplet.ui b/mscore/inspector/inspector_tuplet.ui index 1f02895c1b97..121aa87b7937 100644 --- a/mscore/inspector/inspector_tuplet.ui +++ b/mscore/inspector/inspector_tuplet.ui @@ -87,7 +87,11 @@ Reset 'Number type' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -100,7 +104,11 @@ Reset 'Bracket type' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -200,7 +208,11 @@ Reset 'Direction' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -216,6 +228,8 @@ bracketType resetBracketType - + + + diff --git a/mscore/inspector/inspector_vbox.ui b/mscore/inspector/inspector_vbox.ui index d4fcc95d7922..584ce827770a 100644 --- a/mscore/inspector/inspector_vbox.ui +++ b/mscore/inspector/inspector_vbox.ui @@ -63,9 +63,6 @@ - - 0 - 0 @@ -78,6 +75,9 @@ 0 + + 0 + @@ -97,7 +97,11 @@ Reset 'Top gap' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -110,7 +114,11 @@ Reset 'Bottom gap' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -328,7 +336,11 @@ Reset 'Left margin' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -341,7 +353,11 @@ Reset 'Right margin' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -354,7 +370,11 @@ Reset 'Top margin' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -367,7 +387,11 @@ Reset 'Bottom margin' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -397,6 +421,8 @@ bottomMargin resetBottomMargin - + + + diff --git a/mscore/inspector/inspector_volta.ui b/mscore/inspector/inspector_volta.ui index 116b6cc71327..b0461b314ae8 100644 --- a/mscore/inspector/inspector_volta.ui +++ b/mscore/inspector/inspector_volta.ui @@ -63,9 +63,6 @@ - - 0 - 0 @@ -78,6 +75,9 @@ 0 + + 0 + @@ -111,7 +111,11 @@ Reset 'Type' value - ... + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg @@ -119,6 +123,8 @@ - + + + diff --git a/mscore/instrwidget.cpp b/mscore/instrwidget.cpp index 5451ff4b5d4a..6880c7f6e0e9 100644 --- a/mscore/instrwidget.cpp +++ b/mscore/instrwidget.cpp @@ -355,8 +355,6 @@ InstrumentsWidget::InstrumentsWidget(QWidget* parent) : QWidget(parent) { setupUi(this); - upButton->setIcon(*icons[int(Icons::arrowUp_ICON)]); - downButton->setIcon(*icons[int(Icons::arrowDown_ICON)]); splitter->setStretchFactor(0, 10); splitter->setStretchFactor(1, 0); splitter->setStretchFactor(2, 15); diff --git a/mscore/instrwidget.ui b/mscore/instrwidget.ui index df759ba628e9..c8ca60d2cac9 100644 --- a/mscore/instrwidget.ui +++ b/mscore/instrwidget.ui @@ -219,7 +219,11 @@ Up - ↑ + + + + + :/data/icons/arrow_up.svg:/data/icons/arrow_up.svg @@ -238,7 +242,11 @@ Down - ↓ + + + + + :/data/icons/arrow_down.svg:/data/icons/arrow_down.svg @@ -370,6 +378,8 @@ linkedButton partiturList - + + + diff --git a/mscore/measureproperties.ui b/mscore/measureproperties.ui index 2b0abb0f892f..0489af84fdcb 100644 --- a/mscore/measureproperties.ui +++ b/mscore/measureproperties.ui @@ -457,7 +457,11 @@ Go to previous measure - ← + + + + + :/data/icons/go-previous.svg:/data/icons/go-previous.svg @@ -467,7 +471,11 @@ Go to next measure - → + + + + + :/data/icons/go-next.svg:/data/icons/go-next.svg @@ -502,7 +510,9 @@ previousButton nextButton - + + + buttonBox diff --git a/mscore/mediadialog.cpp b/mscore/mediadialog.cpp index 3475bbe723bc..be1ad935f1d5 100644 --- a/mscore/mediadialog.cpp +++ b/mscore/mediadialog.cpp @@ -39,8 +39,6 @@ MediaDialog::MediaDialog(QWidget* /*parent*/) setupUi(this); setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowTitle(tr("MuseScore: Additional Media")); - scanFileButton->setIcon(*icons[int(Icons::fileOpen_ICON)]); - audioFileButton->setIcon(*icons[int(Icons::fileOpen_ICON)]); connect(addScan, SIGNAL(clicked()), SLOT(addScanPressed())); connect(removeScan, SIGNAL(clicked()), SLOT(removeScanPressed())); diff --git a/mscore/mediadialog.ui b/mscore/mediadialog.ui index 8f4cc7698c7b..e220f75d95f1 100644 --- a/mscore/mediadialog.ui +++ b/mscore/mediadialog.ui @@ -39,7 +39,11 @@ - ... + + + + + :/data/icons/document-open.svg:/data/icons/document-open.svg @@ -115,7 +119,11 @@ - ... + + + + + :/data/icons/document-open.svg:/data/icons/document-open.svg diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp index e185239e54ec..70189ed10b3f 100644 --- a/mscore/musescore.cpp +++ b/mscore/musescore.cpp @@ -3253,8 +3253,6 @@ AboutBoxDialog::AboutBoxDialog() revisionLabel->setText(tr("Revision: %1").arg(revision)); setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); - copyRevisionButton->setIcon(*icons[int(Icons::copy_ICON)]); - copyrightLabel->setText(QString("%1") .arg(tr( "Visit %1www.musescore.org%2 for new versions and more information.\n" "Support MuseScore with your %3donation%4.\n\n" diff --git a/mscore/preferences.cpp b/mscore/preferences.cpp index f67d2bc7be94..7ad2efc4b6f4 100644 --- a/mscore/preferences.cpp +++ b/mscore/preferences.cpp @@ -547,21 +547,6 @@ PreferenceDialog::PreferenceDialog(QWidget* parent) setupUi(this); setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); setModal(true); - startWithButton->setIcon(*icons[int(Icons::fileOpen_ICON)]); - instrumentList1Button->setIcon(*icons[int(Icons::fileOpen_ICON)]); - instrumentList2Button->setIcon(*icons[int(Icons::fileOpen_ICON)]); - defaultStyleButton->setIcon(*icons[int(Icons::fileOpen_ICON)]); - partStyleButton->setIcon(*icons[int(Icons::fileOpen_ICON)]); - myScoresButton->setIcon(*icons[int(Icons::fileOpen_ICON)]); - myStylesButton->setIcon(*icons[int(Icons::fileOpen_ICON)]); - myTemplatesButton->setIcon(*icons[int(Icons::fileOpen_ICON)]); - myPluginsButton->setIcon(*icons[int(Icons::fileOpen_ICON)]); - mySoundfontsButton->setIcon(*icons[int(Icons::edit_ICON)]); - myImagesButton->setIcon(*icons[int(Icons::fileOpen_ICON)]); - - bgWallpaperSelect->setIcon(*icons[int(Icons::fileOpen_ICON)]); - fgWallpaperSelect->setIcon(*icons[int(Icons::fileOpen_ICON)]); - styleFileButton->setIcon(*icons[int(Icons::fileOpen_ICON)]); shortcutsChanged = false; #ifndef USE_JACK diff --git a/mscore/prefsdialog.ui b/mscore/prefsdialog.ui index 394b280093ce..274796255edc 100644 --- a/mscore/prefsdialog.ui +++ b/mscore/prefsdialog.ui @@ -165,7 +165,11 @@ Opens a file dialog for selecting the starting score - + + + + + :/data/icons/document-open.svg:/data/icons/document-open.svg @@ -534,7 +538,11 @@ Opens a folder dialog for selecting the score folder - + + + + + :/data/icons/document-open.svg:/data/icons/document-open.svg @@ -550,7 +558,11 @@ Opens a folder dialog for selecting the style folder - + + + + + :/data/icons/document-open.svg:/data/icons/document-open.svg @@ -609,7 +621,11 @@ Opens a folder dialog for selecting the plugin folder - + + + + + :/data/icons/document-open.svg:/data/icons/document-open.svg @@ -648,7 +664,11 @@ Opens a folder dialog for selecting the template folder - + + + + + :/data/icons/document-open.svg:/data/icons/document-open.svg @@ -666,6 +686,10 @@ + + + :/data/icons/document-open.svg:/data/icons/document-open.svg + @@ -680,7 +704,11 @@ Opens a dialog for configuring the SoundFont folders - + + + + + :/data/icons/edit.svg:/data/icons/edit.svg @@ -886,7 +914,11 @@ Opens a file dialog for selecting the wallpaper file - + + + + + :/data/icons/document-open.svg:/data/icons/document-open.svg @@ -1003,7 +1035,11 @@ Opens a file dialog for selecting the wallpaper file - + + + + + :/data/icons/document-open.svg:/data/icons/document-open.svg @@ -1321,7 +1357,12 @@ Rewind is active - ... + + + + + :/data/darkgreendot.svg + :/data/greendot.svg:/data/darkgreendot.svg @@ -1337,7 +1378,12 @@ Rewind record - ... + + + + + :/data/recordOff.svg + :/data/recordOn.svg:/data/recordOff.svg @@ -1360,7 +1406,12 @@ Is active - ... + + + + + :/data/darkgreendot.svg + :/data/greendot.svg:/data/darkgreendot.svg @@ -1376,7 +1427,12 @@ Toggle play record - ... + + + + + :/data/recordOff.svg + :/data/recordOn.svg:/data/recordOff.svg @@ -1422,7 +1478,12 @@ Whole note is active - ... + + + + + :/data/darkgreendot.svg + :/data/greendot.svg:/data/darkgreendot.svg @@ -1435,7 +1496,12 @@ Half note is active - ... + + + + + :/data/darkgreendot.svg + :/data/greendot.svg:/data/darkgreendot.svg @@ -1448,7 +1514,12 @@ Whole note record - ... + + + + + :/data/recordOff.svg + :/data/recordOn.svg:/data/recordOff.svg @@ -1461,7 +1532,12 @@ Half note record - ... + + + + + :/data/recordOff.svg + :/data/recordOn.svg:/data/recordOff.svg @@ -1504,7 +1580,12 @@ Rest is active - ... + + + + + :/data/darkgreendot.svg + :/data/greendot.svg:/data/darkgreendot.svg @@ -1517,7 +1598,12 @@ Quarter note is active - ... + + + + + :/data/darkgreendot.svg + :/data/greendot.svg:/data/darkgreendot.svg @@ -1530,7 +1616,12 @@ Quarter note record - ... + + + + + :/data/recordOff.svg + :/data/recordOn.svg:/data/recordOff.svg @@ -1543,7 +1634,12 @@ Eighth note is active - ... + + + + + :/data/darkgreendot.svg + :/data/greendot.svg:/data/darkgreendot.svg @@ -1556,7 +1652,12 @@ Eighth note record - ... + + + + + :/data/recordOff.svg + :/data/recordOn.svg:/data/recordOff.svg @@ -1596,7 +1697,12 @@ Augmentation dot is active - ... + + + + + :/data/darkgreendot.svg + :/data/greendot.svg:/data/darkgreendot.svg @@ -1609,7 +1715,12 @@ Augmentation dot record - ... + + + + + :/data/recordOff.svg + :/data/recordOn.svg:/data/recordOff.svg @@ -1622,7 +1733,12 @@ Double augmentation dot is active - ... + + + + + :/data/darkgreendot.svg + :/data/greendot.svg:/data/darkgreendot.svg @@ -1635,7 +1751,12 @@ Double augmentation dot record - ... + + + + + :/data/recordOff.svg + :/data/recordOn.svg:/data/recordOff.svg @@ -1648,7 +1769,12 @@ Tie is active - ... + + + + + :/data/darkgreendot.svg + :/data/greendot.svg:/data/darkgreendot.svg @@ -1661,7 +1787,12 @@ Tie record - ... + + + + + :/data/recordOff.svg + :/data/recordOn.svg:/data/recordOff.svg @@ -1674,7 +1805,12 @@ Rest record - ... + + + + + :/data/recordOff.svg + :/data/recordOn.svg:/data/recordOff.svg @@ -1749,7 +1885,12 @@ Play is active - ... + + + + + :/data/darkgreendot.svg + :/data/greendot.svg:/data/darkgreendot.svg @@ -1765,7 +1906,12 @@ Stop is active - ... + + + + + :/data/darkgreendot.svg + :/data/greendot.svg:/data/darkgreendot.svg @@ -1781,7 +1927,12 @@ Play record - ... + + + + + :/data/recordOff.svg + :/data/recordOn.svg:/data/recordOff.svg @@ -1797,7 +1948,12 @@ Stop record - ... + + + + + :/data/recordOff.svg + :/data/recordOn.svg:/data/recordOff.svg @@ -1823,7 +1979,12 @@ Note input is active - ... + + + + + :/data/darkgreendot.svg + :/data/greendot.svg:/data/darkgreendot.svg @@ -1839,7 +2000,12 @@ Note input record - ... + + + + + :/data/recordOff.svg + :/data/recordOn.svg:/data/recordOff.svg @@ -1862,7 +2028,12 @@ 16th note is active - ... + + + + + :/data/darkgreendot.svg + :/data/greendot.svg:/data/darkgreendot.svg @@ -1875,7 +2046,12 @@ 16th note record - ... + + + + + :/data/recordOff.svg + :/data/recordOn.svg:/data/recordOff.svg @@ -1888,7 +2064,12 @@ 32nd note is active - ... + + + + + :/data/darkgreendot.svg + :/data/greendot.svg:/data/darkgreendot.svg @@ -1901,7 +2082,12 @@ 32nd note record - ... + + + + + :/data/recordOff.svg + :/data/recordOn.svg:/data/recordOff.svg @@ -1934,7 +2120,12 @@ 64th note is active - ... + + + + + :/data/darkgreendot.svg + :/data/greendot.svg:/data/darkgreendot.svg @@ -1947,7 +2138,12 @@ 64th note record - ... + + + + + :/data/recordOff.svg + :/data/recordOn.svg:/data/recordOff.svg @@ -1960,7 +2156,12 @@ Undo is active - ... + + + + + :/data/darkgreendot.svg + :/data/greendot.svg:/data/darkgreendot.svg @@ -1973,7 +2174,12 @@ Undo record - ... + + + + + :/data/recordOff.svg + :/data/recordOn.svg:/data/recordOff.svg @@ -2144,6 +2350,10 @@ + + + :/data/icons/document-open.svg:/data/icons/document-open.svg + @@ -2198,7 +2408,11 @@ Opens a file dialog for selecting a style file - + + + + + :/data/icons/document-open.svg:/data/icons/document-open.svg @@ -2234,7 +2448,11 @@ Opens a file dialog for selecting a style file for part - + + + + + :/data/icons/document-open.svg:/data/icons/document-open.svg @@ -2260,7 +2478,11 @@ Opens a file dialog for selecting a instrument list file - + + + + + :/data/icons/document-open.svg:/data/icons/document-open.svg @@ -2866,7 +3088,11 @@ Opens a file dialog for selecting a style file - Browse... + + + + + :/data/icons/document-open.svg:/data/icons/document-open.svg @@ -3728,6 +3954,8 @@ drawAntialiased proximity - + + + diff --git a/mscore/textprop.cpp b/mscore/textprop.cpp index 7fe756dc95ef..dd947ff2bb21 100644 --- a/mscore/textprop.cpp +++ b/mscore/textprop.cpp @@ -33,17 +33,6 @@ TextProp::TextProp(QWidget* parent) : QWidget(parent) { setupUi(this); - //set the icon here or the style can't color them - alignLeft->setIcon(*icons[int(Icons::textLeft_ICON)]); - alignHCenter->setIcon(*icons[int(Icons::textCenter_ICON)]); - alignRight->setIcon(*icons[int(Icons::textRight_ICON)]); - alignTop->setIcon(*icons[int(Icons::textTop_ICON)]); - alignVCenter->setIcon(*icons[int(Icons::textVCenter_ICON)]); - alignBaseline->setIcon(*icons[int(Icons::textBaseline_ICON)]); - alignBottom->setIcon(*icons[int(Icons::textBottom_ICON)]); - fontBold->setIcon(*icons[int(Icons::textBold_ICON)]); - fontItalic->setIcon(*icons[int(Icons::textItalic_ICON)]); - fontUnderline->setIcon(*icons[int(Icons::textUnderline_ICON)]); QButtonGroup* g1 = new QButtonGroup(this); g1->addButton(alignLeft); diff --git a/mscore/textproperties.ui b/mscore/textproperties.ui index 39fa5d3cbeba..7ec48d263242 100644 --- a/mscore/textproperties.ui +++ b/mscore/textproperties.ui @@ -582,7 +582,7 @@ Align left edge of text to reference point - ... + @@ -605,7 +605,7 @@ Center text on reference point - ... + @@ -628,7 +628,7 @@ Align top edge of text to reference point - ... + @@ -651,7 +651,7 @@ Align right edge of text to reference point - ... + @@ -684,7 +684,7 @@ Align baseline of text to reference point - ... + @@ -707,7 +707,7 @@ Center text vertical to reference point - ... + @@ -730,7 +730,7 @@ Align bottom edge of text to reference point - ... +