Fix icons in all QWidget dialogs on macOS
This commit is contained in:
parent
3137dba093
commit
2ca247c2ae
25 changed files with 179 additions and 115 deletions
|
@ -78,8 +78,6 @@ set(MODULE_SRC
|
|||
${CMAKE_CURRENT_LIST_DIR}/progress.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/smuflranges.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/smuflranges.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/widgetstatestore.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/widgetstatestore.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/xmlreader.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/xmlreader.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/xmlwriter.cpp
|
||||
|
|
|
@ -124,6 +124,9 @@ set(MODULE_SRC
|
|||
${CMAKE_CURRENT_LIST_DIR}/view/focuslistener.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/view/widgetnavigationfix.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/view/widgetnavigationfix.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/view/widgetstatestore.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/view/widgetstatestore.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/view/widgetutils.h
|
||||
|
||||
${CMAKE_CURRENT_LIST_DIR}/dev/interactivetestsmodel.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/dev/interactivetestsmodel.h
|
||||
|
|
|
@ -19,17 +19,18 @@
|
|||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#ifndef WIDGETSTATESTORE_H
|
||||
#define WIDGETSTATESTORE_H
|
||||
#ifndef MU_UI_WIDGETSTATESTORE_H
|
||||
#define MU_UI_WIDGETSTATESTORE_H
|
||||
|
||||
class QWidget;
|
||||
|
||||
namespace mu::ui {
|
||||
class WidgetStateStore
|
||||
{
|
||||
public:
|
||||
|
||||
static void saveGeometry(const QWidget* qw);
|
||||
static void restoreGeometry(QWidget* qw);
|
||||
};
|
||||
}
|
||||
|
||||
#endif // WIDGETSTATESTORE_H
|
||||
#endif // MU_UI_WIDGETSTATESTORE_H
|
54
src/framework/ui/view/widgetutils.h
Normal file
54
src/framework/ui/view/widgetutils.h
Normal file
|
@ -0,0 +1,54 @@
|
|||
/*
|
||||
* SPDX-License-Identifier: GPL-3.0-only
|
||||
* MuseScore-CLA-applies
|
||||
*
|
||||
* MuseScore
|
||||
* Music Composition & Notation
|
||||
*
|
||||
* Copyright (C) 2021 MuseScore BVBA and others
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 3 as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#ifndef MU_UI_WIDGETUTILS_H
|
||||
#define MU_UI_WIDGETUTILS_H
|
||||
|
||||
#include <type_traits>
|
||||
|
||||
#include "iconcodes.h"
|
||||
|
||||
#include "modularity/ioc.h"
|
||||
#include "ui/iuiconfiguration.h"
|
||||
|
||||
class QWidget;
|
||||
|
||||
namespace mu::ui {
|
||||
class WidgetUtils
|
||||
{
|
||||
INJECT_STATIC(ui, IUiConfiguration, uiConfiguration)
|
||||
|
||||
public:
|
||||
template<class W>
|
||||
static inline std::enable_if_t<std::is_base_of<QWidget, W>::value, void>
|
||||
setWidgetIcon(W* widget, IconCode::Code iconCode)
|
||||
{
|
||||
QChar icon = iconCodeToChar(iconCode);
|
||||
QString styleSheet = QString("font-family: %1; font-size: %2")
|
||||
.arg(QString::fromStdString(uiConfiguration()->iconsFontFamily()))
|
||||
.arg(uiConfiguration()->iconsFontSize(IconSizeType::Regular));
|
||||
widget->setStyleSheet(styleSheet);
|
||||
widget->setText(icon);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
#endif // MU_UI_WIDGETUTILS_H
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
#include <QButtonGroup>
|
||||
|
||||
#include "ui/view/iconcodes.h"
|
||||
#include "ui/view/widgetutils.h"
|
||||
|
||||
using namespace mu::notation;
|
||||
using namespace mu::ui;
|
||||
|
@ -45,13 +45,13 @@ AlignSelect::AlignSelect(QWidget* parent)
|
|||
g2->addButton(alignBaseline);
|
||||
g2->addButton(alignBottom);
|
||||
|
||||
alignLeft->setText(iconCodeToChar(IconCode::Code::TEXT_ALIGN_LEFT));
|
||||
alignRight->setText(iconCodeToChar(IconCode::Code::TEXT_ALIGN_RIGHT));
|
||||
alignHCenter->setText(iconCodeToChar(IconCode::Code::TEXT_ALIGN_CENTER));
|
||||
alignVCenter->setText(iconCodeToChar(IconCode::Code::TEXT_ALIGN_MIDDLE));
|
||||
alignTop->setText(iconCodeToChar(IconCode::Code::TEXT_ALIGN_ABOVE));
|
||||
alignBaseline->setText(iconCodeToChar(IconCode::Code::TEXT_ALIGN_BASELINE));
|
||||
alignBottom->setText(iconCodeToChar(IconCode::Code::TEXT_ALIGN_UNDER));
|
||||
WidgetUtils::setWidgetIcon(alignLeft, IconCode::Code::TEXT_ALIGN_LEFT);
|
||||
WidgetUtils::setWidgetIcon(alignRight, IconCode::Code::TEXT_ALIGN_RIGHT);
|
||||
WidgetUtils::setWidgetIcon(alignHCenter, IconCode::Code::TEXT_ALIGN_CENTER);
|
||||
WidgetUtils::setWidgetIcon(alignVCenter, IconCode::Code::TEXT_ALIGN_MIDDLE);
|
||||
WidgetUtils::setWidgetIcon(alignTop, IconCode::Code::TEXT_ALIGN_ABOVE);
|
||||
WidgetUtils::setWidgetIcon(alignBaseline, IconCode::Code::TEXT_ALIGN_BASELINE);
|
||||
WidgetUtils::setWidgetIcon(alignBottom, IconCode::Code::TEXT_ALIGN_UNDER);
|
||||
|
||||
connect(g1, QOverload<QAbstractButton*, bool>::of(&QButtonGroup::buttonToggled),
|
||||
this, &AlignSelect::_alignChanged);
|
||||
|
|
|
@ -20,9 +20,11 @@
|
|||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include "editpitch.h"
|
||||
#include "widgetstatestore.h"
|
||||
|
||||
#include "ui/view/widgetstatestore.h"
|
||||
|
||||
using namespace mu::notation;
|
||||
using namespace mu::ui;
|
||||
|
||||
//---------------------------------------------------------
|
||||
// EditPitch
|
||||
|
|
|
@ -39,8 +39,8 @@
|
|||
|
||||
#include "translation.h"
|
||||
|
||||
#include "ui/view/iconcodes.h"
|
||||
#include "widgetstatestore.h"
|
||||
#include "ui/view/widgetstatestore.h"
|
||||
#include "ui/view/widgetutils.h"
|
||||
|
||||
#include "log.h"
|
||||
|
||||
|
@ -88,12 +88,12 @@ EditStaff::EditStaff(QWidget* parent)
|
|||
connect(lineDistance, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
|
||||
this, &EditStaff::lineDistanceChanged);
|
||||
|
||||
nextButton->setText(GO_DOWN_ICON);
|
||||
previousButton->setText(GO_UP_ICON);
|
||||
minPitchASelect->setText(EDIT_ICON);
|
||||
maxPitchASelect->setText(EDIT_ICON);
|
||||
minPitchPSelect->setText(EDIT_ICON);
|
||||
maxPitchPSelect->setText(EDIT_ICON);
|
||||
WidgetUtils::setWidgetIcon(nextButton, IconCode::Code::ARROW_DOWN);
|
||||
WidgetUtils::setWidgetIcon(previousButton, IconCode::Code::ARROW_UP);
|
||||
WidgetUtils::setWidgetIcon(minPitchASelect, IconCode::Code::EDIT);
|
||||
WidgetUtils::setWidgetIcon(maxPitchASelect, IconCode::Code::EDIT);
|
||||
WidgetUtils::setWidgetIcon(minPitchPSelect, IconCode::Code::EDIT);
|
||||
WidgetUtils::setWidgetIcon(maxPitchPSelect, IconCode::Code::EDIT);
|
||||
|
||||
WidgetStateStore::restoreGeometry(this);
|
||||
}
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#include "engraving/compat/scoreaccess.h"
|
||||
#include "engraving/compat/mscxcompat.h"
|
||||
|
||||
#include "widgetstatestore.h"
|
||||
#include "ui/view/widgetstatestore.h"
|
||||
|
||||
#include "notationerrors.h"
|
||||
|
||||
|
@ -38,6 +38,7 @@
|
|||
|
||||
using namespace mu::notation;
|
||||
using namespace mu::engraving;
|
||||
using namespace mu::ui;
|
||||
|
||||
const char* g_groupNames[Ms::STAFF_GROUP_MAX] = {
|
||||
QT_TRANSLATE_NOOP("staff group header name", "STANDARD STAFF"),
|
||||
|
|
|
@ -22,9 +22,11 @@
|
|||
|
||||
#include "editstringdata.h"
|
||||
#include "editpitch.h"
|
||||
#include "widgetstatestore.h"
|
||||
|
||||
#include "ui/view/widgetstatestore.h"
|
||||
|
||||
using namespace mu::notation;
|
||||
using namespace mu::ui;
|
||||
|
||||
//---------------------------------------------------------
|
||||
// EditStringData
|
||||
|
|
|
@ -30,16 +30,20 @@
|
|||
#include "alignSelect.h"
|
||||
#include "colorlabel.h"
|
||||
#include "fontStyleSelect.h"
|
||||
#include "framework/global/widgetstatestore.h"
|
||||
#include "libmscore/figuredbass.h"
|
||||
#include "libmscore/scorefont.h"
|
||||
#include "libmscore/symnames.h"
|
||||
#include "libmscore/realizedharmony.h"
|
||||
#include "offsetSelect.h"
|
||||
|
||||
#include "engraving/libmscore/figuredbass.h"
|
||||
#include "engraving/libmscore/scorefont.h"
|
||||
#include "engraving/libmscore/symnames.h"
|
||||
#include "engraving/libmscore/realizedharmony.h"
|
||||
|
||||
#include "settings.h"
|
||||
#include "translation.h"
|
||||
#include "ui/view/iconcodes.h"
|
||||
|
||||
#include "ui/view/widgetstatestore.h"
|
||||
#include "ui/view/widgetutils.h"
|
||||
|
||||
#include "log.h"
|
||||
#include "translation.h"
|
||||
|
||||
using namespace mu::notation;
|
||||
using namespace mu::ui;
|
||||
|
@ -63,17 +67,6 @@ static void fillDirectionComboBox(QComboBox* comboBox)
|
|||
comboBox->addItem(Ms::toUserString(Ms::Direction::DOWN), QVariant::fromValue<Ms::Direction>(Ms::Direction::DOWN));
|
||||
}
|
||||
|
||||
template<class T>
|
||||
void EditStyle::setWidgetIcon(T* widget, IconCode::Code code)
|
||||
{
|
||||
QChar icon = iconCodeToChar(code);
|
||||
QString styleSheet = QString("font-family: %1; font-size: %2")
|
||||
.arg(QString::fromStdString(uiConfiguration()->iconsFontFamily()))
|
||||
.arg(uiConfiguration()->iconsFontSize(IconSizeType::Regular));
|
||||
widget->setStyleSheet(styleSheet);
|
||||
widget->setText(icon);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// EditStyle
|
||||
//---------------------------------------------------------
|
||||
|
@ -87,7 +80,7 @@ EditStyle::EditStyle(QWidget* parent)
|
|||
setModal(true);
|
||||
|
||||
buttonApplyToAllParts = buttonBox->addButton(tr("Apply to all Parts"), QDialogButtonBox::ApplyRole);
|
||||
setWidgetIcon(buttonTogglePagelist, IconCode::Code::ARROW_RIGHT);
|
||||
WidgetUtils::setWidgetIcon(buttonTogglePagelist, IconCode::Code::ARROW_RIGHT);
|
||||
|
||||
// ====================================================
|
||||
// Button Groups
|
||||
|
@ -612,7 +605,7 @@ EditStyle::EditStyle(QWidget* parent)
|
|||
connect(chordsXmlFile, &QCheckBox::toggled, this, &EditStyle::setChordStyle);
|
||||
connect(chordDescriptionFile, &QLineEdit::editingFinished, [=]() { setChordStyle(true); });
|
||||
|
||||
setWidgetIcon(chordDescriptionFileButton, IconCode::Code::OPEN_FILE);
|
||||
WidgetUtils::setWidgetIcon(chordDescriptionFileButton, IconCode::Code::OPEN_FILE);
|
||||
|
||||
connect(swingOff, &QRadioButton::toggled, this, &EditStyle::setSwingParams);
|
||||
connect(swingEighth, &QRadioButton::toggled, this, &EditStyle::setSwingParams);
|
||||
|
@ -644,7 +637,7 @@ EditStyle::EditStyle(QWidget* parent)
|
|||
}
|
||||
|
||||
if (sw.reset) {
|
||||
setWidgetIcon(sw.reset, IconCode::Code::UNDO);
|
||||
WidgetUtils::setWidgetIcon(sw.reset, IconCode::Code::UNDO);
|
||||
connect(sw.reset, &QToolButton::clicked, resetSignalMapper, mapFunction);
|
||||
resetSignalMapper->setMapping(sw.reset, static_cast<int>(sw.idx));
|
||||
}
|
||||
|
@ -695,13 +688,13 @@ EditStyle::EditStyle(QWidget* parent)
|
|||
textStyleFrameType->addItem(tr("Rectangle"), int(Ms::FrameType::SQUARE));
|
||||
textStyleFrameType->addItem(tr("Circle"), int(Ms::FrameType::CIRCLE));
|
||||
|
||||
setWidgetIcon(resetTextStyleName, IconCode::Code::UNDO);
|
||||
WidgetUtils::setWidgetIcon(resetTextStyleName, IconCode::Code::UNDO);
|
||||
connect(resetTextStyleName, &QToolButton::clicked, this, &EditStyle::resetUserStyleName);
|
||||
connect(styleName, &QLineEdit::textEdited, this, &EditStyle::editUserStyleName);
|
||||
connect(styleName, &QLineEdit::editingFinished, this, &EditStyle::endEditUserStyleName);
|
||||
|
||||
// font face
|
||||
setWidgetIcon(resetTextStyleFontFace, IconCode::Code::UNDO);
|
||||
WidgetUtils::setWidgetIcon(resetTextStyleFontFace, IconCode::Code::UNDO);
|
||||
connect(resetTextStyleFontFace, &QToolButton::clicked, [=]() {
|
||||
resetTextStyle(Ms::Pid::FONT_FACE);
|
||||
});
|
||||
|
@ -710,7 +703,7 @@ EditStyle::EditStyle(QWidget* parent)
|
|||
});
|
||||
|
||||
// font size
|
||||
setWidgetIcon(resetTextStyleFontSize, IconCode::Code::UNDO);
|
||||
WidgetUtils::setWidgetIcon(resetTextStyleFontSize, IconCode::Code::UNDO);
|
||||
connect(resetTextStyleFontSize, &QToolButton::clicked, [=]() {
|
||||
resetTextStyle(Ms::Pid::FONT_SIZE);
|
||||
});
|
||||
|
@ -719,7 +712,7 @@ EditStyle::EditStyle(QWidget* parent)
|
|||
});
|
||||
|
||||
// line spacing
|
||||
setWidgetIcon(resetTextStyleLineSpacing, IconCode::Code::UNDO);
|
||||
WidgetUtils::setWidgetIcon(resetTextStyleLineSpacing, IconCode::Code::UNDO);
|
||||
connect(resetTextStyleLineSpacing, &QToolButton::clicked, [=]() {
|
||||
resetTextStyle(Ms::Pid::TEXT_LINE_SPACING);
|
||||
});
|
||||
|
@ -728,7 +721,7 @@ EditStyle::EditStyle(QWidget* parent)
|
|||
});
|
||||
|
||||
// font style
|
||||
setWidgetIcon(resetTextStyleFontStyle, IconCode::Code::UNDO);
|
||||
WidgetUtils::setWidgetIcon(resetTextStyleFontStyle, IconCode::Code::UNDO);
|
||||
connect(resetTextStyleFontStyle, &QToolButton::clicked, [=]() {
|
||||
resetTextStyle(Ms::Pid::FONT_STYLE);
|
||||
});
|
||||
|
@ -737,7 +730,7 @@ EditStyle::EditStyle(QWidget* parent)
|
|||
});
|
||||
|
||||
// align
|
||||
setWidgetIcon(resetTextStyleAlign, IconCode::Code::UNDO);
|
||||
WidgetUtils::setWidgetIcon(resetTextStyleAlign, IconCode::Code::UNDO);
|
||||
connect(resetTextStyleAlign, &QToolButton::clicked, [=]() {
|
||||
resetTextStyle(Ms::Pid::ALIGN);
|
||||
});
|
||||
|
@ -746,7 +739,7 @@ EditStyle::EditStyle(QWidget* parent)
|
|||
});
|
||||
|
||||
// offset
|
||||
setWidgetIcon(resetTextStyleOffset, IconCode::Code::UNDO);
|
||||
WidgetUtils::setWidgetIcon(resetTextStyleOffset, IconCode::Code::UNDO);
|
||||
connect(resetTextStyleOffset, &QToolButton::clicked, [=]() {
|
||||
resetTextStyle(Ms::Pid::OFFSET);
|
||||
});
|
||||
|
@ -755,7 +748,7 @@ EditStyle::EditStyle(QWidget* parent)
|
|||
});
|
||||
|
||||
// spatium dependent
|
||||
setWidgetIcon(resetTextStyleSpatiumDependent, IconCode::Code::UNDO);
|
||||
WidgetUtils::setWidgetIcon(resetTextStyleSpatiumDependent, IconCode::Code::UNDO);
|
||||
connect(resetTextStyleSpatiumDependent, &QToolButton::clicked, [=]() {
|
||||
resetTextStyle(Ms::Pid::SIZE_SPATIUM_DEPENDENT);
|
||||
});
|
||||
|
@ -763,7 +756,7 @@ EditStyle::EditStyle(QWidget* parent)
|
|||
textStyleValueChanged(Ms::Pid::SIZE_SPATIUM_DEPENDENT, textStyleSpatiumDependent->isChecked());
|
||||
});
|
||||
|
||||
setWidgetIcon(resetTextStyleFrameType, IconCode::Code::UNDO);
|
||||
WidgetUtils::setWidgetIcon(resetTextStyleFrameType, IconCode::Code::UNDO);
|
||||
connect(resetTextStyleFrameType, &QToolButton::clicked, [=]() {
|
||||
resetTextStyle(Ms::Pid::FRAME_TYPE);
|
||||
});
|
||||
|
@ -771,7 +764,7 @@ EditStyle::EditStyle(QWidget* parent)
|
|||
textStyleValueChanged(Ms::Pid::FRAME_TYPE, textStyleFrameType->currentIndex());
|
||||
});
|
||||
|
||||
setWidgetIcon(resetTextStyleFramePadding, IconCode::Code::UNDO);
|
||||
WidgetUtils::setWidgetIcon(resetTextStyleFramePadding, IconCode::Code::UNDO);
|
||||
connect(resetTextStyleFramePadding, &QToolButton::clicked, [=]() {
|
||||
resetTextStyle(Ms::Pid::FRAME_PADDING);
|
||||
});
|
||||
|
@ -779,7 +772,7 @@ EditStyle::EditStyle(QWidget* parent)
|
|||
textStyleValueChanged(Ms::Pid::FRAME_PADDING, textStyleFramePadding->value());
|
||||
});
|
||||
|
||||
setWidgetIcon(resetTextStyleFrameBorder, IconCode::Code::UNDO);
|
||||
WidgetUtils::setWidgetIcon(resetTextStyleFrameBorder, IconCode::Code::UNDO);
|
||||
connect(resetTextStyleFrameBorder, &QToolButton::clicked, [=]() {
|
||||
resetTextStyle(Ms::Pid::FRAME_WIDTH);
|
||||
});
|
||||
|
@ -787,7 +780,7 @@ EditStyle::EditStyle(QWidget* parent)
|
|||
textStyleValueChanged(Ms::Pid::FRAME_WIDTH, textStyleFrameBorder->value());
|
||||
});
|
||||
|
||||
setWidgetIcon(resetTextStyleFrameBorderRadius, IconCode::Code::UNDO);
|
||||
WidgetUtils::setWidgetIcon(resetTextStyleFrameBorderRadius, IconCode::Code::UNDO);
|
||||
connect(resetTextStyleFrameBorderRadius, &QToolButton::clicked, [=]() {
|
||||
resetTextStyle(Ms::Pid::FRAME_ROUND);
|
||||
});
|
||||
|
@ -795,7 +788,7 @@ EditStyle::EditStyle(QWidget* parent)
|
|||
textStyleValueChanged(Ms::Pid::FRAME_ROUND, textStyleFrameBorderRadius->value());
|
||||
});
|
||||
|
||||
setWidgetIcon(resetTextStyleFrameForeground, IconCode::Code::UNDO);
|
||||
WidgetUtils::setWidgetIcon(resetTextStyleFrameForeground, IconCode::Code::UNDO);
|
||||
connect(resetTextStyleFrameForeground, &QToolButton::clicked, [=]() {
|
||||
resetTextStyle(Ms::Pid::FRAME_FG_COLOR);
|
||||
});
|
||||
|
@ -803,7 +796,7 @@ EditStyle::EditStyle(QWidget* parent)
|
|||
textStyleValueChanged(Ms::Pid::FRAME_FG_COLOR, textStyleFrameForeground->color());
|
||||
});
|
||||
|
||||
setWidgetIcon(resetTextStyleFrameBackground, IconCode::Code::UNDO);
|
||||
WidgetUtils::setWidgetIcon(resetTextStyleFrameBackground, IconCode::Code::UNDO);
|
||||
connect(resetTextStyleFrameBackground, &QToolButton::clicked, [=]() {
|
||||
resetTextStyle(Ms::Pid::FRAME_BG_COLOR);
|
||||
});
|
||||
|
@ -811,7 +804,7 @@ EditStyle::EditStyle(QWidget* parent)
|
|||
textStyleValueChanged(Ms::Pid::FRAME_BG_COLOR, textStyleFrameBackground->color());
|
||||
});
|
||||
|
||||
setWidgetIcon(resetTextStyleColor, IconCode::Code::UNDO);
|
||||
WidgetUtils::setWidgetIcon(resetTextStyleColor, IconCode::Code::UNDO);
|
||||
connect(resetTextStyleColor, &QToolButton::clicked, [=]() {
|
||||
resetTextStyle(Ms::Pid::COLOR);
|
||||
});
|
||||
|
@ -1339,7 +1332,7 @@ void EditStyle::on_buttonTogglePagelist_clicked()
|
|||
bool isVis = !pageList->isVisible(); // toggle it
|
||||
|
||||
pageList->setVisible(isVis);
|
||||
setWidgetIcon(buttonTogglePagelist, isVis ? IconCode::Code::ARROW_RIGHT : IconCode::Code::ARROW_LEFT);
|
||||
WidgetUtils::setWidgetIcon(buttonTogglePagelist, isVis ? IconCode::Code::ARROW_RIGHT : IconCode::Code::ARROW_LEFT);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
|
|
|
@ -23,13 +23,12 @@
|
|||
#define MU_NOTATION_EDITSTYLE_H
|
||||
|
||||
#include "ui_editstyle.h"
|
||||
|
||||
#include "modularity/ioc.h"
|
||||
#include "context/iglobalcontext.h"
|
||||
#include "inotationconfiguration.h"
|
||||
#include "iinteractive.h"
|
||||
#include "ui/iuiconfiguration.h"
|
||||
#include "ui/iuiengine.h"
|
||||
#include "ui/view/iconcodes.h"
|
||||
|
||||
namespace mu::notation {
|
||||
class EditStyle : public QDialog, private Ui::EditStyleBase
|
||||
|
@ -39,7 +38,6 @@ class EditStyle : public QDialog, private Ui::EditStyleBase
|
|||
INJECT(notation, mu::context::IGlobalContext, globalContext)
|
||||
INJECT(notation, mu::notation::INotationConfiguration, configuration)
|
||||
INJECT(notation, mu::framework::IInteractive, interactive)
|
||||
INJECT(notaiton, mu::ui::IUiConfiguration, uiConfiguration)
|
||||
INJECT(notation, mu::ui::IUiEngine, uiEngine)
|
||||
|
||||
public:
|
||||
|
@ -63,9 +61,6 @@ private:
|
|||
void setHeaderFooterToolTip();
|
||||
void adjustPagesStackSize(int currentPageIndex);
|
||||
|
||||
template<class T>
|
||||
void setWidgetIcon(T* widget, ui::IconCode::Code code);
|
||||
|
||||
/// EditStylePage
|
||||
/// This is a type for a pointer to any QWidget that is a member of EditStyle.
|
||||
/// It's used to create static references to the pointers to pages.
|
||||
|
|
|
@ -12719,7 +12719,7 @@ By default, they will be placed such as that their right end are at the same lev
|
|||
<widget class="QPushButton" name="buttonTogglePagelist">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<width>30</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
#include "fontStyleSelect.h"
|
||||
|
||||
#include "ui/view/iconcodes.h"
|
||||
#include "ui/view/widgetutils.h"
|
||||
|
||||
using namespace mu::notation;
|
||||
using namespace mu::ui;
|
||||
|
@ -32,10 +32,10 @@ FontStyleSelect::FontStyleSelect(QWidget* parent)
|
|||
{
|
||||
setupUi(this);
|
||||
|
||||
bold->setText(iconCodeToChar(IconCode::Code::TEXT_BOLD));
|
||||
italic->setText(iconCodeToChar(IconCode::Code::TEXT_ITALIC));
|
||||
underline->setText(iconCodeToChar(IconCode::Code::TEXT_UNDERLINE));
|
||||
strike->setText(iconCodeToChar(IconCode::Code::TEXT_STRIKE));
|
||||
WidgetUtils::setWidgetIcon(bold, IconCode::Code::TEXT_BOLD);
|
||||
WidgetUtils::setWidgetIcon(italic, IconCode::Code::TEXT_ITALIC);
|
||||
WidgetUtils::setWidgetIcon(underline, IconCode::Code::TEXT_UNDERLINE);
|
||||
WidgetUtils::setWidgetIcon(strike, IconCode::Code::TEXT_STRIKE);
|
||||
|
||||
connect(bold, &QPushButton::toggled, this, &FontStyleSelect::_fontStyleChanged);
|
||||
connect(italic, &QPushButton::toggled, this, &FontStyleSelect::_fontStyleChanged);
|
||||
|
|
|
@ -21,23 +21,25 @@
|
|||
*/
|
||||
|
||||
#include "measureproperties.h"
|
||||
#include "libmscore/measure.h"
|
||||
#include "libmscore/sig.h"
|
||||
#include "libmscore/masterscore.h"
|
||||
#include "libmscore/measurerepeat.h"
|
||||
#include "libmscore/undo.h"
|
||||
#include "libmscore/range.h"
|
||||
|
||||
#include "engraving/libmscore/masterscore.h"
|
||||
#include "engraving/libmscore/measure.h"
|
||||
#include "engraving/libmscore/measurerepeat.h"
|
||||
#include "engraving/libmscore/range.h"
|
||||
#include "engraving/libmscore/sig.h"
|
||||
#include "engraving/libmscore/undo.h"
|
||||
|
||||
#include "notation/inotationelements.h"
|
||||
#include "global/widgetstatestore.h"
|
||||
#include "ui/view/iconcodes.h"
|
||||
#include "ui/view/widgetnavigationfix.h"
|
||||
|
||||
static const int ITEM_ACCESSIBLE_TITLE_ROLE = Qt::UserRole + 1;
|
||||
#include "ui/view/widgetnavigationfix.h"
|
||||
#include "ui/view/widgetstatestore.h"
|
||||
#include "ui/view/widgetutils.h"
|
||||
|
||||
using namespace mu::notation;
|
||||
using namespace mu::ui;
|
||||
|
||||
static const int ITEM_ACCESSIBLE_TITLE_ROLE = Qt::UserRole + 1;
|
||||
|
||||
MeasurePropertiesDialog::MeasurePropertiesDialog(QWidget* parent)
|
||||
: QDialog(parent)
|
||||
{
|
||||
|
@ -62,6 +64,9 @@ MeasurePropertiesDialog::MeasurePropertiesDialog(QWidget* parent)
|
|||
horizontalLayout_2->insertWidget(0, nextButton);
|
||||
}
|
||||
|
||||
WidgetUtils::setWidgetIcon(previousButton, IconCode::Code::ARROW_LEFT);
|
||||
WidgetUtils::setWidgetIcon(nextButton, IconCode::Code::ARROW_RIGHT);
|
||||
|
||||
WidgetStateStore::restoreGeometry(this);
|
||||
|
||||
//! NOTE: It is necessary for the correct start of navigation in the dialog
|
||||
|
|
|
@ -23,15 +23,16 @@
|
|||
|
||||
#include <QPageSize>
|
||||
|
||||
#include "engraving/libmscore/page.h"
|
||||
#include "engraving/libmscore/masterscore.h"
|
||||
#include "engraving/libmscore/mscore.h"
|
||||
#include "engraving/libmscore/excerpt.h"
|
||||
#include "engraving/style/pagestyle.h"
|
||||
|
||||
#include "widgetstatestore.h"
|
||||
#include "libmscore/page.h"
|
||||
#include "libmscore/masterscore.h"
|
||||
#include "libmscore/mscore.h"
|
||||
#include "libmscore/excerpt.h"
|
||||
#include "ui/view/widgetstatestore.h"
|
||||
|
||||
using namespace mu::notation;
|
||||
using namespace mu::ui;
|
||||
using namespace Ms;
|
||||
|
||||
PageSettings::PageSettings(QWidget* parent)
|
||||
|
|
|
@ -24,8 +24,9 @@
|
|||
|
||||
#include <QScrollBar>
|
||||
|
||||
#include "framework/global/widgetstatestore.h"
|
||||
#include "ui/view/iconcodes.h"
|
||||
#include "ui/view/widgetstatestore.h"
|
||||
#include "ui/view/widgetutils.h"
|
||||
|
||||
#include "translation.h"
|
||||
|
||||
using namespace mu::notation;
|
||||
|
@ -83,7 +84,7 @@ ScorePropertiesDialog::ScorePropertiesDialog(QWidget* parent)
|
|||
revealButton->setEnabled(false);
|
||||
}
|
||||
|
||||
revealButton->setText(iconCodeToChar(IconCode::Code::OPEN_FILE));
|
||||
WidgetUtils::setWidgetIcon(revealButton, IconCode::Code::OPEN_FILE);
|
||||
connect(revealButton, &QPushButton::clicked, this, &ScorePropertiesDialog::openFileLocation);
|
||||
|
||||
WidgetStateStore::restoreGeometry(this);
|
||||
|
@ -121,7 +122,7 @@ ScorePropertiesDialog::TagItem ScorePropertiesDialog::addTag(const QString& key,
|
|||
tagLineEdit->setPlaceholderText(qtrc("notation", "Name"));
|
||||
|
||||
deleteButton = new QToolButton();
|
||||
deleteButton->setText(iconCodeToChar(IconCode::Code::DELETE_TANK));
|
||||
WidgetUtils::setWidgetIcon(deleteButton, IconCode::Code::DELETE_TANK);
|
||||
deleteButton->setAccessibleName(qtrc("notation", "Remove"));
|
||||
|
||||
tagWidget = tagLineEdit;
|
||||
|
|
|
@ -26,13 +26,14 @@
|
|||
Implementation of class Selection plus other selection related functions.
|
||||
*/
|
||||
|
||||
#include "libmscore/system.h"
|
||||
#include "engraving/libmscore/system.h"
|
||||
|
||||
#include "notationtypes.h"
|
||||
|
||||
#include "widgetstatestore.h"
|
||||
#include "ui/view/widgetstatestore.h"
|
||||
|
||||
using namespace mu::notation;
|
||||
using namespace mu::ui;
|
||||
|
||||
//---------------------------------------------------------
|
||||
// SelectDialog
|
||||
|
|
|
@ -25,18 +25,20 @@
|
|||
Implementation of class Selection plus other selection related functions.
|
||||
*/
|
||||
|
||||
#include "libmscore/select.h"
|
||||
#include "selectnotedialog.h"
|
||||
#include "libmscore/engravingitem.h"
|
||||
#include "libmscore/system.h"
|
||||
#include "libmscore/masterscore.h"
|
||||
#include "libmscore/chord.h"
|
||||
#include "libmscore/segment.h"
|
||||
#include "libmscore/note.h"
|
||||
|
||||
#include "widgetstatestore.h"
|
||||
#include "engraving/libmscore/chord.h"
|
||||
#include "engraving/libmscore/engravingitem.h"
|
||||
#include "engraving/libmscore/masterscore.h"
|
||||
#include "engraving/libmscore/note.h"
|
||||
#include "engraving/libmscore/segment.h"
|
||||
#include "engraving/libmscore/select.h"
|
||||
#include "engraving/libmscore/system.h"
|
||||
|
||||
#include "ui/view/widgetstatestore.h"
|
||||
|
||||
using namespace mu::notation;
|
||||
using namespace mu::ui;
|
||||
|
||||
//---------------------------------------------------------
|
||||
// SelectDialog
|
||||
|
|
|
@ -21,17 +21,18 @@
|
|||
*/
|
||||
#include "stafftextpropertiesdialog.h"
|
||||
|
||||
#include <QSignalMapper>
|
||||
|
||||
#include "engraving/libmscore/score.h"
|
||||
#include "engraving/libmscore/stafftext.h"
|
||||
#include "engraving/libmscore/system.h"
|
||||
#include "engraving/libmscore/staff.h"
|
||||
#include "engraving/libmscore/segment.h"
|
||||
|
||||
#include "framework/global/widgetstatestore.h"
|
||||
|
||||
#include <QSignalMapper>
|
||||
#include "ui/view/widgetstatestore.h"
|
||||
|
||||
using namespace mu::notation;
|
||||
using namespace mu::ui;
|
||||
|
||||
static const QString STAFF_TEXT_PROPERTIES_DIALOG_NAME("StaffTextPropertiesDialog");
|
||||
|
||||
|
|
|
@ -22,9 +22,10 @@
|
|||
|
||||
#include "transposedialog.h"
|
||||
|
||||
#include "framework/global/widgetstatestore.h"
|
||||
#include "ui/view/widgetstatestore.h"
|
||||
|
||||
using namespace mu::notation;
|
||||
using namespace mu::ui;
|
||||
|
||||
//---------------------------------------------------------
|
||||
// TransposeDialog
|
||||
|
|
|
@ -21,11 +21,12 @@
|
|||
*/
|
||||
#include "tupletdialog.h"
|
||||
|
||||
#include "libmscore/tuplet.h"
|
||||
#include "engraving/libmscore/tuplet.h"
|
||||
|
||||
#include "widgetstatestore.h"
|
||||
#include "ui/view/widgetstatestore.h"
|
||||
|
||||
using namespace mu::notation;
|
||||
using namespace mu::ui;
|
||||
|
||||
//---------------------------------------------------------
|
||||
// TupletDialog
|
||||
|
|
|
@ -30,11 +30,12 @@
|
|||
#include "internal/palettecreator.h"
|
||||
|
||||
#include "smuflranges.h"
|
||||
#include "widgetstatestore.h"
|
||||
#include "ui/view/widgetstatestore.h"
|
||||
|
||||
#include "translation.h"
|
||||
|
||||
using namespace mu::palette;
|
||||
using namespace mu::ui;
|
||||
using namespace Ms;
|
||||
|
||||
//---------------------------------------------------------
|
||||
|
|
|
@ -21,6 +21,9 @@
|
|||
*/
|
||||
#include "specialcharactersdialog.h"
|
||||
|
||||
#include <QListWidget>
|
||||
#include <QSplitter>
|
||||
|
||||
#include "palettewidget.h"
|
||||
|
||||
#include "translation.h"
|
||||
|
@ -33,15 +36,13 @@
|
|||
#include "engraving/libmscore/score.h"
|
||||
#include "engraving/style/style.h"
|
||||
|
||||
#include "framework/global/widgetstatestore.h"
|
||||
|
||||
#include <QListWidget>
|
||||
#include <QSplitter>
|
||||
#include "ui/view/widgetstatestore.h"
|
||||
|
||||
static const QString SPECIAL_CHARACTERS_DIALOG_NAME("SpecialCharactersDialog");
|
||||
|
||||
using namespace mu::notation;
|
||||
using namespace mu::palette;
|
||||
using namespace mu::ui;
|
||||
|
||||
namespace Ms {
|
||||
static constexpr SymId commonScoreSymbols[] = {
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
#include "commonscene/exampleview.h"
|
||||
#include "ui/view/musicalsymbolcodes.h"
|
||||
#include "global/widgetstatestore.h"
|
||||
#include "ui/view/widgetstatestore.h"
|
||||
|
||||
static QString TIME_SIGNATURE_PROPERTIES_DIALOG_NAME("TimeSignaturePropertiesDialog");
|
||||
|
||||
|
|
Loading…
Reference in a new issue