LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Moved a lot of general components to UiComponents plugin

Browse source
This commit is contained in:
pereverzev_v 2020-06-13 11:08:39 +02:00 committed by pereverzev+v
parent aa9d4cdb9b
commit da7b38e6a0
145 changed files with 509 additions and 274 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
framework/ui/iconcodes.h
View file

@ -22,23 +22,27 @@
#include <QObject>
#ifdef DELETE
#undef DELETE
#endif
#ifdef FILE_OPEN
#undef FILE_OPEN
#endif
namespace mu {
namespace framework {
/**
* @brief The IconCode class simplifies access to the icons from the icon font
*
* @details Each enum value is a UTF-16-like address of the icon in the icon font.
* The current icon-font (MusescoreIcon.ttf) is located in the 'MuseScore/fonts/mscore' folder,
* The most actual version can be found by this persistent URL: @link https://www.dropbox.com/s/ip59ren10u69hr7/MusescoreIcon.ttf?dl=0
*/
class IconCode
{
Q_GADGET
Q_ENUMS(Code)
public:
enum class Code : char16_t {
SMALL_ARROW_UP = 0xEF10,
SMALL_ARROW_RIGHT = 0xEF11,
@ -58,17 +62,17 @@ public:
LOOP = 0xEF1F,
METRONOME = 0xEF20,
TUNING_FORK = 0xEF21,
FILE_NEW = 0xEF22,
FILE_OPEN = 0xEF23,
FILE_SHARE = 0xEF24,
FILE_CLOUD = 0xEF25,
NEW_FILE = 0xEF22,
OPEN_FILE = 0xEF23,
SHARE_FILE = 0xEF24,
CLOUD_FILE = 0xEF25,
REWIND = 0xEF26,
MIXER = 0xEF27,
CONFIGURE = 0xEF28,
SAVE = 0xEF29,
PLUS = 0xEF2A,
MINUS = 0xEF2B,
DELETE = 0xEF2C,
DELETE_TANK = 0xEF2C,
FEEDBACK = 0xEF2D,
LINK = 0xEF2E,
TICK = 0xEF2F,
@ -82,8 +86,8 @@ public:
ARROW_UP = 0xEF37,
POSITION_ARROWS = 0xEF38,
TEXT_ALIGN_BASELINE = 0xEF39,
TEXT_ALIGN_UNDER = 0xEF3A,
TEXT_ALIGN_ABOVE = 0xEF3B,
TEXT_ALIGN_ABOVE = 0xEF3A,
TEXT_ALIGN_UNDER = 0xEF3B,
TEXT_ALIGN_MIDDLE = 0xEF3C,
TEXT_ALIGN_LEFT = 0xEF3D,
TEXT_ALIGN_CENTER = 0xEF3E,
@ -150,12 +154,46 @@ public:
LINE_DASHED = 0xEF82,
LINE_DOTTED = 0xEF83,
LINE_NORMAL = 0xEF84,
LINE_WITH_HOOK = 0xEF85,
LINE_WITH_ANGLED_HOOK = 0xEF86,
LINE_WITH_END_HOOK = 0xEF85,
LINE_WITH_ANGLED_END_HOOK = 0xEF86,
LINE_PEDAL_STAR_ENDING = 0xEF87,
AUTO = 0xEF88,
NONE = 0xEF89
BEAM_FEATHERING_LEFT = 0xEF88,
BEAM_FEATHERING_RIGHT = 0xEF89,
RIGHT_GAP = 0xEF90,
LEFT_GAP = 0xEF91,
GAP_BELOW = 0xEF92,
GAP_ABOVE = 0xEF93,
LEFT_MARGIN = 0xEF94,
RIGHT_MARGIN = 0xEF95,
BOTTOM_MARGIN = 0xEF96,
TOP_MARGIN = 0xEF97,
LINE_WITH_T_LIKE_END_HOOK = 0xEF9C,
LINE_WITH_T_LINE_START_HOOK = 0xEF9D,
LINE_WITH_START_HOOK = 0xEF9E,
LINE_WITH_ANGLED_START_HOOK = 0xEF9F,
IMAGE_MOUNTAINS = 0xEFA1,
QUESTION_MARK = 0xF340,
NOTE_HEAD_QUARTER = 0xF341,
NOTE_HEAD_HALF = 0xF342,
NOTE_HEAD_WHOLE = 0xF343,
NOTE_HEAD_BREVIS = 0xF344,
BARLINE_WINGED = 0xF34C,
BARLINE_UNWINGED = 0xF34D,
ORIENTATION_PORTRAIT = 0xF350,
ORIENTATION_LANDSCAPE = 0xF351,
CHORD_SYMBOL = 0xF352,
GUITAR_BEND = 0xF353,
GUITAR_TREMOLO_BAR = 0xF355,
AUTO,
NONE,
CUSTOM
};
Q_ENUM(Code)
};
}
}

15
framework/ui/qmltheme.cpp
View file

@ -19,15 +19,26 @@
#include "qmltheme.h"
#include "preferencekeys.h"
#include <QSettings>
using namespace mu::framework;
QmlTheme::QmlTheme(const QPalette& pal, QObject* parent) :
QObject(parent), _palette(pal)
QObject(parent), m_palette(pal)
{
QSettings settings;
m_font.setFamily(settings.value(PREF_UI_THEME_FONTFAMILY).toString());
m_font.setPointSize(settings.value(PREF_UI_THEME_FONTSIZE).toInt());
}
QFont QmlTheme::font() const
{
return m_font;
}
void QmlTheme::update(const QPalette& pal)
{
_palette = pal;
m_palette = pal;
emit themeChanged();
}

10
framework/ui/qmltheme.h
View file

@ -23,6 +23,7 @@
#include <QObject>
#include <QPalette>
#include <QColor>
#include <QFont>
namespace mu {
namespace framework {
@ -32,7 +33,7 @@ class QmlTheme : public QObject
#define COLOR_PROPERTY(name, role) \
Q_PROPERTY(QColor name READ get##name NOTIFY themeChanged) \
QColor get##name() const { return _palette.color(role); \
QColor get##name() const { return m_palette.color(role); \
}
COLOR_PROPERTY(window, QPalette::Window)
@ -54,17 +55,22 @@ class QmlTheme : public QObject
#undef COLOR_PROPERTY
Q_PROPERTY(QFont font READ font CONSTANT)
public:
QmlTheme(const QPalette& pal, QObject* parent = nullptr);
void update(const QPalette& pal);
QFont font() const;
signals:
void themeChanged();
private:
QPalette _palette;
QPalette m_palette;
QFont m_font;
};
}
}

4
framework/uicomponents/CMakeLists.txt
View file

@ -28,6 +28,10 @@ set(MODULE_SRC
${CMAKE_CURRENT_LIST_DIR}/uicomponentsmodule.h
${CMAKE_CURRENT_LIST_DIR}/cpp/sampleobject.cpp
${CMAKE_CURRENT_LIST_DIR}/cpp/sampleobject.h
${CMAKE_CURRENT_LIST_DIR}/cpp/validators/doubleinputvalidator.cpp
${CMAKE_CURRENT_LIST_DIR}/cpp/validators/doubleinputvalidator.h
${CMAKE_CURRENT_LIST_DIR}/cpp/validators/intinputvalidator.cpp
${CMAKE_CURRENT_LIST_DIR}/cpp/validators/intinputvalidator.h
)
include(${PROJECT_SOURCE_DIR}/build/module.cmake)

0
inspectors/utils/doubleinputvalidator.cpp → framework/uicomponents/cpp/validators/doubleinputvalidator.cpp
View file

0
inspectors/utils/doubleinputvalidator.h → framework/uicomponents/cpp/validators/doubleinputvalidator.h
View file

0
inspectors/utils/intinputvalidator.cpp → framework/uicomponents/cpp/validators/intinputvalidator.cpp
View file

0
inspectors/utils/intinputvalidator.h → framework/uicomponents/cpp/validators/intinputvalidator.h
View file

8
inspectors/view/qml/common/CheckBox.qml → framework/uicomponents/qml/MuseScore/UiComponents/CheckBox.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.0
import MuseScore.Inspectors 3.3
import MuseScore.Ui 1.0
FocusableItem {
id: root
@ -31,12 +31,12 @@ FocusableItem {
border.width: 1
radius: 2
color: Qt.rgba(globalStyle.button.r, globalStyle.button.g, globalStyle.button.b, 0.75)
color: Qt.rgba(ui.theme.button.r, ui.theme.button.g, ui.theme.button.b, 0.75)
border.color: "#A2A2A2"
StyledIconLabel {
anchors.fill: parent
iconCode: root.isIndeterminate ? IconNameTypes.MINUS : IconNameTypes.TICK_RIGHT_ANGLE
iconCode: root.isIndeterminate ? IconCode.MINUS : IconCode.TICK_RIGHT_ANGLE
visible: root.checked || root.isIndeterminate
}
@ -73,7 +73,7 @@ FocusableItem {
PropertyChanges {
target: box
radius: 1
color: Qt.rgba(globalStyle.button.r, globalStyle.button.g, globalStyle.button.b, 1.0)
color: Qt.rgba(ui.theme.button.r, ui.theme.button.g, ui.theme.button.b, 1.0)
border.color: Qt.rgba(0, 0, 0, 0.15)
}
},

15
inspectors/view/qml/common/ColorPicker.qml → framework/uicomponents/qml/MuseScore/UiComponents/ColorPicker.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.9
import QtQuick.Dialogs 1.2
import MuseScore.Ui 1.0
Rectangle {
id: root
@ -25,15 +25,10 @@ Rectangle {
border.width: 1
}
StyledIcon {
anchors.centerIn: parent
StyledIconLabel {
anchors.fill: parent
icon: "qrc:/resources/icons/question_mark.svg"
pixelSize: 12
sourceSize.height: 12
sourceSize.width: 12
iconCode: IconCode.QUESTION_MARK
visible: isIndeterminate
}
@ -73,7 +68,7 @@ Rectangle {
name: "HOVERED"
when: cliickableArea.containsMouse && !cliickableArea.pressed && !colorDialog.visible
PropertyChanges { target: backgroundRect; border.color: globalStyle.highlight }
PropertyChanges { target: backgroundRect; border.color: ui.theme.highlight }
},
State {

5
inspectors/view/qml/common/ExpandableBlank.qml → framework/uicomponents/qml/MuseScore/UiComponents/ExpandableBlank.qml
View file

@ -1,7 +1,6 @@
import QtQuick 2.9
import QtGraphicalEffects 1.0
import "../common"
import MuseScore.UiComponents 1.0
FocusableItem {
id: root
@ -29,7 +28,7 @@ FocusableItem {
height: contentColumn.height
width: root.width
color: globalStyle.window
color: ui.theme.window
}
Column {

5
inspectors/view/qml/common/ExpandableBlankSection.qml → framework/uicomponents/qml/MuseScore/UiComponents/ExpandableBlankSection.qml
View file

@ -1,6 +1,7 @@
import QtQuick 2.9
import QtGraphicalEffects 1.0
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
FocusableItem {
id: root
@ -39,7 +40,7 @@ FocusableItem {
anchors.fill: parent
rotation: root.isExpanded ? 0 : -90
iconCode: IconNameTypes.SMALL_ARROW_DOWN
iconCode: IconCode.SMALL_ARROW_DOWN
Behavior on rotation {
NumberAnimation {

7
inspectors/view/qml/common/FlatButton.qml → framework/uicomponents/qml/MuseScore/UiComponents/FlatButton.qml
View file

@ -1,4 +1,5 @@
import QtQuick 2.8
import MuseScore.UiComponents 1.0
FocusableItem {
id: root
@ -19,7 +20,7 @@ FocusableItem {
anchors.fill: parent
color: globalStyle.button
color: ui.theme.button
border.width: 0
radius: 3
}
@ -70,7 +71,7 @@ FocusableItem {
PropertyChanges {
target: backgroundRect
color: Qt.darker(globalStyle.button, 1.1)
color: Qt.darker(ui.theme.button, 1.1)
border.color: "#25000000"
border.width: 1
}
@ -82,7 +83,7 @@ FocusableItem {
PropertyChanges {
target: backgroundRect
color: globalStyle.button
color: ui.theme.button
border.color: "#25000000"
border.width: 1
}

8
inspectors/view/qml/common/FlatRadioButton.qml → framework/uicomponents/qml/MuseScore/UiComponents/FlatRadioButton.qml
View file

@ -19,7 +19,7 @@ RadioDelegate {
anchors.fill: parent
color: globalStyle.button
color: ui.theme.button
radius: 2
}
@ -56,7 +56,7 @@ RadioDelegate {
PropertyChanges {
target: selectionOverlay
color: Qt.darker(globalStyle.button, 1.1)
color: Qt.darker(ui.theme.button, 1.1)
border.width: 0
}
},
@ -67,7 +67,7 @@ RadioDelegate {
PropertyChanges {
target: selectionOverlay
color: Qt.rgba(globalStyle.highlight.r, globalStyle.highlight.g, globalStyle.highlight.b, 0.5)
color: Qt.rgba(ui.theme.highlight.r, ui.theme.highlight.g, ui.theme.highlight.b, 0.5)
border.width: 0
}
},
@ -90,7 +90,7 @@ RadioDelegate {
PropertyChanges {
target: selectionOverlay
color: Qt.rgba(globalStyle.highlight.r, globalStyle.highlight.g, globalStyle.highlight.b, 0.75)
color: Qt.rgba(ui.theme.highlight.r, ui.theme.highlight.g, ui.theme.highlight.b, 0.75)
border.width: 0
}
}

9
inspectors/view/qml/common/FlatToogleButton.qml → framework/uicomponents/qml/MuseScore/UiComponents/FlatToogleButton.qml
View file

@ -1,4 +1,5 @@
import QtQuick 2.8
import MuseScore.UiComponents 1.0
FocusableItem {
id: root
@ -20,7 +21,7 @@ FocusableItem {
anchors.fill: parent
color: globalStyle.button
color: ui.theme.button
radius: 2
}
@ -60,7 +61,7 @@ FocusableItem {
PropertyChanges {
target: selectionOverlay
color: Qt.darker(globalStyle.button, 1.1)
color: Qt.darker(ui.theme.button, 1.1)
border.width: 0
}
},
@ -71,7 +72,7 @@ FocusableItem {
PropertyChanges {
target: selectionOverlay
color: Qt.rgba(globalStyle.highlight.r, globalStyle.highlight.g, globalStyle.highlight.b, 0.5)
color: Qt.rgba(ui.theme.highlight.r, ui.theme.highlight.g, ui.theme.highlight.b, 0.5)
border.width: 0
}
},
@ -94,7 +95,7 @@ FocusableItem {
PropertyChanges {
target: selectionOverlay
color: Qt.rgba(globalStyle.highlight.r, globalStyle.highlight.g, globalStyle.highlight.b, 0.75)
color: Qt.rgba(ui.theme.highlight.r, ui.theme.highlight.g, ui.theme.highlight.b, 0.75)
border.width: 0
}
}

0
inspectors/view/qml/common/FocusableItem.qml → framework/uicomponents/qml/MuseScore/UiComponents/FocusableItem.qml
View file

2
inspectors/view/qml/common/StyledIcon.qml → framework/uicomponents/qml/MuseScore/UiComponents/Icon.qml
View file

@ -29,6 +29,6 @@ Item {
anchors.fill: image
source: image
color: globalStyle.buttonText
color: ui.theme.buttonText
}
}

7
inspectors/view/qml/common/IncrementalPropertyControl.qml → framework/uicomponents/qml/MuseScore/UiComponents/IncrementalPropertyControl.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.9
import MuseScore.Inspectors 3.3 // should be removed when component will be moved to the gui module, currently needed only for DoubleInputValidator
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
Item {
id: root
@ -41,7 +42,7 @@ Item {
height: root.iconBackgroundSize
width: root.iconBackgroundSize
color: globalStyle.button
color: ui.theme.button
opacity: root.enabled ? 1.0 : 0.3
@ -72,7 +73,7 @@ Item {
anchors.verticalCenter: textInputField.verticalCenter
anchors.right: textInputField.right
icon: IconNameTypes.SMALL_ARROW_DOWN
icon: IconCode.SMALL_ARROW_DOWN
onIncreaseButtonClicked: {
var value = root.isIndeterminate ? 0.0 : currentValue

0
inspectors/view/qml/common/RadioButtonGroup.qml → framework/uicomponents/qml/MuseScore/UiComponents/RadioButtonGroup.qml
View file

0
inspectors/view/qml/common/SeparatorLine.qml → framework/uicomponents/qml/MuseScore/UiComponents/SeparatorLine.qml
View file

10
inspectors/view/qml/common/StyledComboBox.qml → framework/uicomponents/qml/MuseScore/UiComponents/StyledComboBox.qml
View file

@ -1,7 +1,7 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import QtGraphicalEffects 1.0
import MuseScore.Inspectors 3.3
import MuseScore.Ui 1.0
ComboBox {
id: root
@ -68,7 +68,7 @@ ComboBox {
anchors.fill: parent
radius: 4
color: highlighted ? globalStyle.highlight : globalStyle.button
color: highlighted ? ui.theme.highlight : ui.theme.button
Rectangle {
id: roundedCornersOverlay
@ -125,7 +125,7 @@ ComboBox {
background: Rectangle {
anchors.fill: parent
color: globalStyle.button
color: ui.theme.button
radius: 4
}
@ -139,11 +139,11 @@ ComboBox {
radius: 4
color: root.pressed || root.isExpanded ? globalStyle.highlight : globalStyle.button
color: root.pressed || root.isExpanded ? ui.theme.highlight : ui.theme.button
StyledIconLabel {
anchors.fill: parent
iconCode: IconNameTypes.SMALL_ARROW_DOWN
iconCode: IconCode.SMALL_ARROW_DOWN
}
Rectangle {

10
inspectors/view/qml/common/StyledIconLabel.qml → framework/uicomponents/qml/MuseScore/UiComponents/StyledIconLabel.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.9
import MuseScore.Inspectors 3.3
import MuseScore.Ui 1.0
Text {
id: root
@ -17,7 +17,7 @@ Text {
family: "MusescoreIcon"
pixelSize: 16
}
color: globalStyle ? globalStyle.buttonText : "#CECECE"
color: ui.theme ? ui.theme.buttonText : "#CECECE"
text: iconCharCode(iconCode)
@ -25,9 +25,9 @@ Text {
var result = 0
switch (code) {
case IconNameTypes.AUTO: result = "AUTO"; break
case IconNameTypes.NONE: result = "NONE"; break
case IconNameTypes.CUSTOM: result = "Custom"; break
case IconCode.AUTO: result = "AUTO"; break
case IconCode.NONE: result = "NONE"; break
case IconCode.CUSTOM: result = "Custom"; break
default: result = String.fromCharCode(code); break
}

4
inspectors/view/qml/common/StyledPopup.qml → framework/uicomponents/qml/MuseScore/UiComponents/StyledPopup.qml
View file

@ -24,8 +24,8 @@ import QtGraphicalEffects 1.0
Popup {
id: root
property color borderColor: globalStyle.windowText
property color fillColor: globalStyle.window
property color borderColor: ui.theme.windowText
property color fillColor: ui.theme.window
property bool isOpened: false
property var arrowX: width / 2

6
inspectors/view/qml/common/StyledTextLabel.qml → framework/uicomponents/qml/MuseScore/UiComponents/StyledTextLabel.qml
View file

@ -3,7 +3,7 @@ import QtQuick 2.0
Text {
id: root
color: globalStyle ? globalStyle.buttonText : "#000000"
color: ui.theme ? ui.theme.buttonText : "#000000"
opacity: root.enabled ? 1.0 : 0.3
elide: Text.ElideRight
@ -11,7 +11,7 @@ Text {
horizontalAlignment: Text.AlignHCenter
font {
family: globalStyle ? globalStyle.font.family : "FreeSerif"
pixelSize: globalStyle ? globalStyle.font.pixelSize : 12
family: ui.theme ? ui.theme.font.family : "FreeSerif"
pixelSize: ui.theme ? ui.theme.font.pixelSize : 12
}
}

6
inspectors/view/qml/common/TabPanel.qml → framework/uicomponents/qml/MuseScore/UiComponents/TabPanel.qml
View file

@ -15,7 +15,7 @@ TabView {
height: 3
width: parent.width / count
color: globalStyle.voice1Color
color: "#0062C2"
radius: 2
@ -52,7 +52,7 @@ TabView {
text: styleData.title
horizontalAlignment: Text.AlignHCenter
color: styleData.selected ? globalStyle.buttonText : "#AEAEAE"
color: styleData.selected ? ui.theme.buttonText : "#AEAEAE"
font.bold: true
}
}
@ -62,7 +62,7 @@ TabView {
anchors.fill: parent
color: globalStyle.window
color: ui.theme.window
}
}
}

8
inspectors/view/qml/common/TextInputField.qml → framework/uicomponents/qml/MuseScore/UiComponents/TextInputField.qml
View file

@ -31,14 +31,14 @@ Rectangle {
color: "#000000"
font {
family: globalStyle.font.family
pointSize: globalStyle.font.pointSize
family: ui.theme.font.family
pointSize: ui.theme.font.pointSize
}
focus: false
activeFocusOnPress: false
selectByMouse: true
selectionColor: Qt.rgba(globalStyle.highlight.r, globalStyle.highlight.g, globalStyle.highlight.b, 0.75)
selectionColor: Qt.rgba(ui.theme.highlight.r, ui.theme.highlight.g, ui.theme.highlight.b, 0.75)
selectedTextColor: "#000000"
visible: !root.isIndeterminate || activeFocus
@ -94,7 +94,7 @@ Rectangle {
name: "TEXT_SELECTED"
when: valueInput.focus && valueInput.selectedText !== ""
PropertyChanges { target: root; border.color: globalStyle.highlight
PropertyChanges { target: root; border.color: ui.theme.highlight
border.width: 1}
}
]

0
inspectors/view/qml/common/ValueAdjustControl.qml → framework/uicomponents/qml/MuseScore/UiComponents/ValueAdjustControl.qml
View file

19
framework/uicomponents/qml/MuseScore/UiComponents/qmldir
View file

@ -1,3 +1,22 @@
module MuseScore.UiComponents
SampleButton 1.0 SampleButton.qml
FontIcon 1.0 FontIcon.qml
CheckBox 1.0 CheckBox.qml
FocusableItem 1.0 FocusableItem.qml
StyledIconLabel 1.0 StyledIconLabel.qml
StyledTextLabel 1.0 StyledTextLabel.qml
ColorPicker 1.0 ColorPicker.qml
ExpandableBlank 1.0 ExpandableBlank.qml
ExpandableBlankSection 1.0 ExpandableBlankSection.qml
FlatButton 1.0 FlatButton.qml
FlatRadioButton 1.0 FlatRadioButton.qml
FlatToogleButton 1.0 FlatToogleButton.qml
IncrementalPropertyControl 1.0 IncrementalPropertyControl.qml
RadioButtonGroup 1.0 RadioButtonGroup.qml
SeparatorLine 1.0 SeparatorLine.qml
StyledComboBox 1.0 StyledComboBox.qml
Icon 1.0 Icon.qml
StyledPopup 1.0 StyledPopup.qml
TabPanel 1.0 TabPanel.qml
TextInputField 1.0 TextInputField.qml
ValueAdjustControl 1.0 ValueAdjustControl.qml

19
framework/uicomponents/uicomponents.qrc
View file

@ -3,5 +3,24 @@
<file>qml/MuseScore/UiComponents/qmldir</file>
<file>qml/MuseScore/UiComponents/SampleRectangle.qml</file>
<file>qml/MuseScore/UiComponents/FontIcon.qml</file>
<file>qml/MuseScore/UiComponents/CheckBox.qml</file>
<file>qml/MuseScore/UiComponents/StyledIconLabel.qml</file>
<file>qml/MuseScore/UiComponents/FocusableItem.qml</file>
<file>qml/MuseScore/UiComponents/StyledTextLabel.qml</file>
<file>qml/MuseScore/UiComponents/IncrementalPropertyControl.qml</file>
<file>qml/MuseScore/UiComponents/FlatToogleButton.qml</file>
<file>qml/MuseScore/UiComponents/FlatButton.qml</file>
<file>qml/MuseScore/UiComponents/ExpandableBlankSection.qml</file>
<file>qml/MuseScore/UiComponents/ExpandableBlank.qml</file>
<file>qml/MuseScore/UiComponents/StyledComboBox.qml</file>
<file>qml/MuseScore/UiComponents/TabPanel.qml</file>
<file>qml/MuseScore/UiComponents/RadioButtonGroup.qml</file>
<file>qml/MuseScore/UiComponents/TextInputField.qml</file>
<file>qml/MuseScore/UiComponents/ValueAdjustControl.qml</file>
<file>qml/MuseScore/UiComponents/StyledPopup.qml</file>
<file>qml/MuseScore/UiComponents/Icon.qml</file>
<file>qml/MuseScore/UiComponents/SeparatorLine.qml</file>
<file>qml/MuseScore/UiComponents/FlatRadioButton.qml</file>
<file>qml/MuseScore/UiComponents/ColorPicker.qml</file>
</qresource>
</RCC>

4
framework/uicomponents/uicomponentsmodule.cpp
View file

@ -2,6 +2,8 @@
#include <QtQml>
#include "cpp/sampleobject.h"
#include "cpp/validators/doubleinputvalidator.h"
#include "cpp/validators/intinputvalidator.h"
using namespace mu::framework;
@ -23,4 +25,6 @@ void UiComponentsModule::registerResources()
void UiComponentsModule::registerUiTypes()
{
qmlRegisterType<SampleObject>("MuseScore.UiComponents", 1, 0, "SampleObject");
qmlRegisterType<DoubleInputValidator>("MuseScore.UiComponents", 1, 0, "DoubleInputValidator");
qmlRegisterType<IntInputValidator>("MuseScore.UiComponents", 1, 0, "IntInputValidator");
}

19
inspectors/inspectors_resources.qrc
View file

@ -4,20 +4,8 @@
<file>resources/icons/raster-horizontal.svg</file>
<file>view/qml/general/GeneralInspectorView.qml</file>
<file>view/qml/InspectorForm.qml</file>
<file>view/qml/common/CheckBox.qml</file>
<file>view/qml/common/IncrementalPropertyControl.qml</file>
<file>view/qml/common/ValueAdjustControl.qml</file>
<file>view/qml/common/ExpandableBlank.qml</file>
<file>view/qml/common/InspectorMenu.qml</file>
<file>view/qml/common/FocusableItem.qml</file>
<file>view/qml/common/ExpandableBlankSection.qml</file>
<file>view/qml/common/TabPanel.qml</file>
<file>view/qml/notation/NotationInspectorView.qml</file>
<file>view/qml/common/StyledPopup.qml</file>
<file>view/qml/common/FlatRadioButton.qml</file>
<file>view/qml/common/StyledIcon.qml</file>
<file>view/qml/common/RadioButtonGroup.qml</file>
<file>view/qml/common/FlatButton.qml</file>
<file>view/qml/notation/notes/StemSettings.qml</file>
<file>view/qml/notation/notes/NoteSettingsTabPanel.qml</file>
<file>view/qml/notation/notes/HeadSettings.qml</file>
@ -59,13 +47,11 @@
<file>resources/icons/beams/beam_none.svg</file>
<file>resources/icons/beams/beam_auto.svg</file>
<file>resources/icons/beams/beam_pos_lock.svg</file>
<file>view/qml/common/FlatToogleButton.qml</file>
<file>view/qml/general/playback/PlaybackPopup.qml</file>
<file>view/qml/general/playback/PlaybackTabPanel.qml</file>
<file>view/qml/general/playback/GeneralSettingsTab.qml</file>
<file>view/qml/general/playback/internal/NoteExpandableBlank.qml</file>
<file>view/qml/general/playback/internal/FermataExpandableBlank.qml</file>
<file>view/qml/common/StyledComboBox.qml</file>
<file>view/qml/general/playback/internal/PausesExpandableBlank.qml</file>
<file>view/qml/general/playback/internal/GlissandoExpandableBlank.qml</file>
<file>view/qml/general/playback/internal/DynamicsExpandableBlank.qml</file>
@ -75,26 +61,21 @@
<file>resources/icons/beams/beam_feathered_right.svg</file>
<file>resources/icons/beams/beam_feathered_none.svg</file>
<file>resources/icons/beams/beam_feathered_left.svg</file>
<file>view/qml/common/StyledTextLabel.qml</file>
<file>view/qml/general/appearance/AppearancePopup.qml</file>
<file>view/qml/common/SeparatorLine.qml</file>
<file>view/qml/general/appearance/internal/HorizontalSpacingSection.qml</file>
<file>view/qml/general/appearance/internal/OffsetSection.qml</file>
<file>view/qml/general/appearance/internal/ArrangeSection.qml</file>
<file>view/qml/general/appearance/internal/ColorSection.qml</file>
<file>view/qml/general/appearance/internal/VerticalSpacingSection.qml</file>
<file>view/qml/common/ColorPicker.qml</file>
<file>resources/icons/question_mark.svg</file>
<file>view/qml/notation/fermatas/FermataPopup.qml</file>
<file>view/qml/notation/tempos/TempoPopup.qml</file>
<file>view/qml/notation/glissandos/GlissandoPopup.qml</file>
<file>view/qml/notation/notes/NotePopup.qml</file>
<file>view/qml/notation/fretdiagrams/FretDiagramPopup.qml</file>
<file>view/qml/common/StyledIconLabel.qml</file>
<file>resources/icons/orientation_auto.svg</file>
<file>view/qml/notation/barlines/BarlinePopup.qml</file>
<file>view/qml/notation/sectionbreaks/SectionBreakPopup.qml</file>
<file>view/qml/common/TextInputField.qml</file>
<file>view/qml/notation/markers/MarkerPopup.qml</file>
<file>view/qml/notation/jumps/JumpPopup.qml</file>
<file>view/qml/notation/keysignatures/KeySignaturePopup.qml</file>

7
inspectors/inspectorssetup.cpp
View file

@ -33,8 +33,6 @@ void InspectorsSetup::registerResources()
Q_INIT_RESOURCE(inspectors_resources);
}
#include "utils/doubleinputvalidator.h"
#include "utils/intinputvalidator.h"
#include "models/abstractinspectormodel.h"
#include "view/widgets/fretcanvas.h"
@ -48,7 +46,6 @@ void InspectorsSetup::registerResources()
#include "types/dynamictypes.h"
#include "types/glissandotypes.h"
#include "types/fermatatypes.h"
#include "types/iconnames.h"
#include "types/barlinetypes.h"
#include "types/markertypes.h"
#include "types/keysignaturetypes.h"
@ -66,8 +63,6 @@ void InspectorsSetup::registerResources()
void InspectorsSetup::registerUiTypes()
{
qmlRegisterType<DoubleInputValidator>("MuseScore.Inspectors", 3, 3, "DoubleInputValidator");
qmlRegisterType<IntInputValidator>("MuseScore.Inspectors", 3, 3, "IntInputValidator");
qmlRegisterUncreatableType<AbstractInspectorModel>("MuseScore.Inspectors", 3, 3, "Inspector",
"Not creatable as it is an enum type");
qmlRegisterUncreatableType<DirectionTypes>("MuseScore.Inspectors", 3, 3, "DirectionTypes",
@ -85,8 +80,6 @@ void InspectorsSetup::registerUiTypes()
"Not creatable as it is an enum type");
qmlRegisterUncreatableType<FermataTypes>("MuseScore.Inspectors", 3, 3, "FermataTypes",
"Not creatable as it is an enum type");
qmlRegisterUncreatableType<IconNameTypes>("MuseScore.Inspectors", 3, 3, "IconNameTypes",
"Not creatable as it is an enum type");
qmlRegisterUncreatableType<BarlineTypes>("MuseScore.Inspectors", 3, 3, "BarlineTypes",
"Not creatable as it is an enum type");
qmlRegisterUncreatableType<MarkerTypes>("MuseScore.Inspectors", 3, 3, "MarkerTypes",

10
inspectors/view/qml/InspectorForm.qml
View file

@ -1,6 +1,8 @@
import QtQuick 2.9
import QtQml.Models 2.3
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "common"
import "general"
@ -18,7 +20,7 @@ FocusableItem {
anchors.fill: parent
color: globalStyle.window
color: ui.theme.window
}
Flickable {
@ -150,7 +152,7 @@ FocusableItem {
height: tabTitleColumn.height + 12
width: parent.width
color: globalStyle.window
color: ui.theme.window
}
Column {
@ -167,7 +169,7 @@ FocusableItem {
text: qsTr("Inspector")
font.bold: true
font.pixelSize: globalStyle.font.pixelSize * 1.2
font.pixelSize: ui.theme.font.pixelSize * 1.2
}
Rectangle {
@ -176,7 +178,7 @@ FocusableItem {
height: 3
width: inspectorTitle.width
color: globalStyle.voice1Color
color: "#0062C2"
radius: 2
}

8
inspectors/view/qml/common/InspectorMenu.qml
View file

@ -2,6 +2,8 @@ import QtQuick 2.9
import QtQuick.Controls 2.2
import QtGraphicalEffects 1.0
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
Rectangle {
id: root
@ -22,7 +24,7 @@ Rectangle {
StyledIconLabel {
anchors.fill: parent
iconCode: IconNameTypes.MENU_THREE_DOTS
iconCode: IconCode.MENU_THREE_DOTS
}
MouseArea {
@ -79,7 +81,7 @@ Rectangle {
when: root.hovered && !root.opened
PropertyChanges {
target: root
color: globalStyle.button
color: ui.theme.button
}
},
State {
@ -87,7 +89,7 @@ Rectangle {
when: root.opened
PropertyChanges {
target: root
color: globalStyle.voice1Color
color: ui.theme.highlight
}
}
]

2
inspectors/view/qml/common/InspectorSectionView.qml
View file

@ -1,5 +1,7 @@
import QtQuick 2.0
import MuseScore.UiComponents 1.0
FocusableItem {
id: root

1
inspectors/view/qml/common/PopupViewButton.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.9
import QtQuick.Layouts 1.3
import MuseScore.UiComponents 1.0
FlatButton {
id: root

6
inspectors/view/qml/general/GeneralInspectorView.qml
View file

@ -1,6 +1,8 @@
import QtQuick 2.9
import QtQuick.Layouts 1.0
import QtQuick.Controls 2.0
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import MuseScore.Inspectors 3.3
import "../common"
import "playback"
@ -91,7 +93,7 @@ InspectorSectionView {
width: (parent.width - popupButtonsRow.spacing)/ 2
icon: IconNameTypes.AUDIO
icon: IconCode.AUDIO
iconPixelSize: 16
text: qsTr("Playback")
@ -121,7 +123,7 @@ InspectorSectionView {
width: (parent.width - popupButtonsRow.spacing)/ 2
icon: IconNameTypes.POSITION_ARROWS
icon: IconCode.POSITION_ARROWS
iconPixelSize: 16
text: qsTr("Appearance")

1
inspectors/view/qml/general/appearance/AppearancePopup.qml
View file

@ -1,6 +1,7 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Dialogs 1.2
import MuseScore.UiComponents 1.0
import "../../common"
import "internal"

1
inspectors/view/qml/general/appearance/internal/ArrangeSection.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import MuseScore.UiComponents 1.0
import "../../../common"
Column {

3
inspectors/view/qml/general/appearance/internal/ColorSection.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.9
import QtQuick.Dialogs 1.2
import MuseScore.UiComponents 1.0
import "../../../common"
Column {
@ -21,7 +22,7 @@ Column {
enabled: root.color ? root.color.isEnabled : false
isIndeterminate: root.color && enabled ? root.color.isUndefined : false
color: root.color && !root.color.isUndefined ? root.color.value : globalStyle.window
color: root.color && !root.color.isUndefined ? root.color.value : ui.theme.window
onNewColorSelected: {
if (root.color) {

6
inspectors/view/qml/general/appearance/internal/HorizontalSpacingSection.qml
View file

@ -1,5 +1,7 @@
import QtQuick 2.9
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../../common"
Item {
@ -23,7 +25,7 @@ Item {
}
IncrementalPropertyControl {
icon: IconNameTypes.HORIZONTAL
icon: IconCode.HORIZONTAL
enabled: leadingSpace ? leadingSpace.isEnabled : false
isIndeterminate: leadingSpace && enabled ? leadingSpace.isUndefined : false
@ -45,7 +47,7 @@ Item {
}
IncrementalPropertyControl {
icon: IconNameTypes.HORIZONTAL
icon: IconCode.HORIZONTAL
enabled: barWidth ? barWidth.isEnabled : false
isIndeterminate: barWidth && enabled ? barWidth.isUndefined : false

6
inspectors/view/qml/general/appearance/internal/OffsetSection.qml
View file

@ -1,4 +1,6 @@
import QtQuick 2.9
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import MuseScore.Inspectors 3.3
import "../../../common"
@ -38,7 +40,7 @@ Column {
anchors.right: parent.horizontalCenter
anchors.rightMargin: 4
icon: IconNameTypes.HORIZONTAL
icon: IconCode.HORIZONTAL
enabled: horizontalOffset ? horizontalOffset.isEnabled : false
isIndeterminate: horizontalOffset && enabled ? horizontalOffset.isUndefined : false
@ -52,7 +54,7 @@ Column {
anchors.leftMargin: 4
anchors.right: parent.right
icon: IconNameTypes.VERTICAL
icon: IconCode.VERTICAL
enabled: verticalOffset ? verticalOffset.isEnabled : false
isIndeterminate: verticalOffset && enabled ? verticalOffset.isUndefined : false

4
inspectors/view/qml/general/appearance/internal/VerticalSpacingSection.qml
View file

@ -1,5 +1,7 @@
import QtQuick 2.9
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../../common"
Column {
@ -18,7 +20,7 @@ Column {
}
IncrementalPropertyControl {
icon: IconNameTypes.VERTICAL
icon: IconCode.VERTICAL
isIndeterminate: minimumDistance ? minimumDistance.isUndefined : false
currentValue: minimumDistance ? minimumDistance.value : 0

1
inspectors/view/qml/general/playback/DynamicsSettingsTab.qml
View file

@ -1,4 +1,5 @@
import QtQuick 2.0
import MuseScore.UiComponents 1.0
import "../../common"
import "internal"

1
inspectors/view/qml/general/playback/GeneralSettingsTab.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.0
import QtQuick.Controls 2.0
import MuseScore.UiComponents 1.0
import "../../common"
import "internal"

1
inspectors/view/qml/general/playback/PlaybackPopup.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import MuseScore.UiComponents 1.0
import "../../common"
StyledPopup {

1
inspectors/view/qml/general/playback/PlaybackTabPanel.qml
View file

@ -1,6 +1,7 @@
import QtQuick 2.9
import QtQuick.Controls 1.5
import QtQuick.Layouts 1.3
import MuseScore.UiComponents 1.0
import "../../common"
TabPanel {

1
inspectors/view/qml/general/playback/internal/ArpeggioExpandableBlank.qml
View file

@ -1,4 +1,5 @@
import QtQuick 2.9
import MuseScore.UiComponents 1.0
import "../../../common"
ExpandableBlank {

7
inspectors/view/qml/general/playback/internal/DynamicsExpandableBlank.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.9
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import QtQuick.Controls 2.0
import "../../../common"
@ -96,11 +97,11 @@ ExpandableBlank {
Text {
text: qsTr("Velocity change")
color: globalStyle.buttonText
color: ui.theme.buttonText
font {
family: globalStyle.font.family
pixelSize: globalStyle.font.pixelSize
family: ui.theme.font.family
pixelSize: ui.theme.font.pixelSize
}
}

1
inspectors/view/qml/general/playback/internal/FermataExpandableBlank.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.9
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import "../../../common"
ExpandableBlank {

1
inspectors/view/qml/general/playback/internal/GlissandoExpandableBlank.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.9
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import "../../../common"
ExpandableBlank {

1
inspectors/view/qml/general/playback/internal/HairpinsExpandableBlank.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.9
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import "../../../common"
ExpandableBlank {

1
inspectors/view/qml/general/playback/internal/NoteExpandableBlank.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.9
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import "../../../common"
ExpandableBlank {

1
inspectors/view/qml/general/playback/internal/PausesExpandableBlank.qml
View file

@ -1,4 +1,5 @@
import QtQuick 2.9
import MuseScore.UiComponents 1.0
import "../../../common"
ExpandableBlank {

1
inspectors/view/qml/notation/NotationInspectorView.qml
View file

@ -1,6 +1,7 @@
import QtQuick 2.9
import QtQuick.Layouts 1.3
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import "../common"
import "notes"

1
inspectors/view/qml/notation/accidentals/AccidentalPopup.qml
View file

@ -1,6 +1,7 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import "../../common"
StyledPopup {

4
inspectors/view/qml/notation/accidentals/AccidentalSettings.qml
View file

@ -1,6 +1,8 @@
import QtQuick 2.9
import QtQuick.Layouts 1.3
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../common"
PopupViewButton {
@ -8,7 +10,7 @@ PopupViewButton {
property alias model: accidentalPopup.model
icon: IconNameTypes.ACCIDENTAL_SHARP
icon: IconCode.ACCIDENTAL_SHARP
text: qsTr("Accidentals")
visible: root.model ? !root.model.isEmpty : false

18
inspectors/view/qml/notation/ambituses/AmbitusPopup.qml
View file

@ -1,6 +1,8 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../common"
import "../notes/internal"
@ -208,9 +210,9 @@ StyledPopup {
width: parent.width
model: [
{ iconRole: IconNameTypes.AMBITUS, typeRole: DirectionTypes.HORIZONTAL_AUTO },
{ iconRole: IconNameTypes.AMBITUS_LEANING_LEFT, typeRole: DirectionTypes.HORIZONTAL_LEFT },
{ iconRole: IconNameTypes.AMBITUS_LEANING_RIGHT, typeRole: DirectionTypes.HORIZONTAL_RIGHT }
{ iconRole: IconCode.AMBITUS, typeRole: DirectionTypes.HORIZONTAL_AUTO },
{ iconRole: IconCode.AMBITUS_LEANING_LEFT, typeRole: DirectionTypes.HORIZONTAL_LEFT },
{ iconRole: IconCode.AMBITUS_LEANING_RIGHT, typeRole: DirectionTypes.HORIZONTAL_RIGHT }
]
delegate: FlatRadioButton {
@ -250,11 +252,11 @@ StyledPopup {
width: parent.width
model: [
{ iconRole: IconNameTypes.AUTO, typeRole: NoteHead.TYPE_AUTO },
{ iconRole: IconNameTypes.NOTE_HEAD_QUARTER, typeRole: NoteHead.TYPE_QUARTER },
{ iconRole: IconNameTypes.NOTE_HEAD_HALF, typeRole: NoteHead.TYPE_HALF },
{ iconRole: IconNameTypes.NOTE_HEAD_WHOLE, typeRole: NoteHead.TYPE_WHOLE },
{ iconRole: IconNameTypes.NOTE_HEAD_BREVIS, typeRole: NoteHead.TYPE_BREVIS }
{ iconRole: IconCode.AUTO, typeRole: NoteHead.TYPE_AUTO },
{ iconRole: IconCode.NOTE_HEAD_QUARTER, typeRole: NoteHead.TYPE_QUARTER },
{ iconRole: IconCode.NOTE_HEAD_HALF, typeRole: NoteHead.TYPE_HALF },
{ iconRole: IconCode.NOTE_HEAD_WHOLE, typeRole: NoteHead.TYPE_WHOLE },
{ iconRole: IconCode.NOTE_HEAD_BREVIS, typeRole: NoteHead.TYPE_BREVIS }
]
delegate: FlatRadioButton {

4
inspectors/view/qml/notation/ambituses/AmbitusSettings.qml
View file

@ -1,6 +1,8 @@
import QtQuick 2.9
import QtQuick.Layouts 1.3
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../common"
PopupViewButton {
@ -8,7 +10,7 @@ PopupViewButton {
property alias model: ambitusPopup.model
icon: IconNameTypes.AMBITUS
icon: IconCode.AMBITUS
text: qsTr("Ambituses")
visible: root.model ? !root.model.isEmpty : false

8
inspectors/view/qml/notation/articulations/ArticulationPopup.qml
View file

@ -1,6 +1,8 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../common"
StyledPopup {
@ -29,9 +31,9 @@ StyledPopup {
width: parent.width
model: [
{ iconRole: IconNameTypes.AUTO, typeRole: ArticulationTypes.AUTO },
{ iconRole: IconNameTypes.ARROW_DOWN, typeRole: ArticulationTypes.DOWN },
{ iconRole: IconNameTypes.ARROW_UP, typeRole: ArticulationTypes.UP }
{ iconRole: IconCode.AUTO, typeRole: ArticulationTypes.AUTO },
{ iconRole: IconCode.ARROW_DOWN, typeRole: ArticulationTypes.DOWN },
{ iconRole: IconCode.ARROW_UP, typeRole: ArticulationTypes.UP }
]
delegate: FlatRadioButton {

4
inspectors/view/qml/notation/articulations/ArticulationSettings.qml
View file

@ -1,6 +1,8 @@
import QtQuick 2.9
import QtQuick.Layouts 1.3
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../common"
PopupViewButton {
@ -8,7 +10,7 @@ PopupViewButton {
property alias model: articulationPopup.model
icon: IconNameTypes.ARTICULATION
icon: IconCode.ARTICULATION
text: qsTr("Articulations")
visible: root.model ? !root.model.isEmpty : false

6
inspectors/view/qml/notation/barlines/BarlinePopup.qml
View file

@ -2,6 +2,8 @@ import QtQuick 2.9
import QtQuick.Controls 2.2
import MuseScore.Inspectors 3.3
import QtQuick.Layouts 1.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../common"
StyledPopup {
@ -70,8 +72,8 @@ StyledPopup {
width: parent.width
model: [
{ iconRole: IconNameTypes.BARLINE_UNWINGED, valueRole: false },
{ iconRole: IconNameTypes.BARLINE_WINGED, valueRole: true }
{ iconRole: IconCode.BARLINE_UNWINGED, valueRole: false },
{ iconRole: IconCode.BARLINE_WINGED, valueRole: true }
]
delegate: FlatRadioButton {

4
inspectors/view/qml/notation/barlines/BarlineSettings.qml
View file

@ -1,6 +1,8 @@
import QtQuick 2.9
import QtQuick.Layouts 1.3
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../common"
PopupViewButton {
@ -9,7 +11,7 @@ PopupViewButton {
property alias barlineSettingsModel: barlinePopup.barlineSettingsModel
property alias staffSettingsModel: barlinePopup.staffSettingsModel
icon: IconNameTypes.SECTION_BREAK
icon: IconCode.SECTION_BREAK
text: qsTr("Barlines")
visible: root.barlineSettingsModel ? !root.barlineSettingsModel.isEmpty : false

1
inspectors/view/qml/notation/bends/BendPopup.qml
View file

@ -1,6 +1,7 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import "../../common"
StyledPopup {

4
inspectors/view/qml/notation/bends/BendSettings.qml
View file

@ -1,6 +1,8 @@
import QtQuick 2.9
import QtQuick.Layouts 1.3
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../common"
PopupViewButton {
@ -8,7 +10,7 @@ PopupViewButton {
property alias model: bendPopup.model
icon: IconNameTypes.GUITAR_BEND
icon: IconCode.GUITAR_BEND
text: qsTr("Guitar bends")
visible: root.model ? !root.model.isEmpty : false

1
inspectors/view/qml/notation/brackets/BracePopup.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.9
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import "../../common"
import "internal"

4
inspectors/view/qml/notation/brackets/BraceSettings.qml
View file

@ -1,5 +1,7 @@
import QtQuick 2.9
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../common"
@ -8,7 +10,7 @@ PopupViewButton {
property alias model: bracketPopup.model
icon: IconNameTypes.BRACE
icon: IconCode.BRACE
text: qsTr("Braces")
visible: root.model ? !root.model.isEmpty : false

1
inspectors/view/qml/notation/brackets/BracketPopup.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.9
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import "../../common"
import "internal"

4
inspectors/view/qml/notation/brackets/BracketSettings.qml
View file

@ -1,5 +1,7 @@
import QtQuick 2.9
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../common"
@ -8,7 +10,7 @@ PopupViewButton {
property alias model: bracketPopup.model
icon: IconNameTypes.BRACKET
icon: IconCode.BRACKET
text: qsTr("Brackets")
visible: root.model ? !root.model.isEmpty : false

1
inspectors/view/qml/notation/brackets/internal/BracketPopupSection.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.9
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import "../../../common"

1
inspectors/view/qml/notation/chordsymbols/ChordSymbolPopup.qml
View file

@ -1,6 +1,7 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import "../../common"
StyledPopup {

4
inspectors/view/qml/notation/chordsymbols/ChordSymbolSettings.qml
View file

@ -1,6 +1,8 @@
import QtQuick 2.9
import QtQuick.Layouts 1.3
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../common"
PopupViewButton {
@ -8,7 +10,7 @@ PopupViewButton {
property alias model: chordSymbolPopup.model
icon: IconNameTypes.CHORD_SYMBOL
icon: IconCode.CHORD_SYMBOL
text: qsTr("Chord symbols")
visible: root.model ? !root.model.isEmpty : false

1
inspectors/view/qml/notation/clefs/ClefPopup.qml
View file

@ -1,6 +1,7 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import "../../common"
StyledPopup {

4
inspectors/view/qml/notation/clefs/ClefSettings.qml
View file

@ -1,6 +1,8 @@
import QtQuick 2.9
import QtQuick.Layouts 1.3
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../common"
PopupViewButton {
@ -8,7 +10,7 @@ PopupViewButton {
property alias model: clefPopup.model
icon: IconNameTypes.CLEF_BASS
icon: IconCode.CLEF_BASS
text: qsTr("Clefs")
visible: root.model ? !root.model.isEmpty : false

1
inspectors/view/qml/notation/crescendos/CrescendoPopup.qml
View file

@ -1,6 +1,7 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Controls 1.5
import MuseScore.UiComponents 1.0
import "../../common"
import "internal"

4
inspectors/view/qml/notation/crescendos/CrescendoSettings.qml
View file

@ -1,6 +1,8 @@
import QtQuick 2.9
import QtQuick.Layouts 1.3
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../common"
PopupViewButton {
@ -8,7 +10,7 @@ PopupViewButton {
property alias model: crescendoPopup.model
icon: IconNameTypes.CRESCENDO_LINE
icon: IconCode.CRESCENDO_LINE
text: qsTr("Crescendos & Diminuendos")
visible: root.model ? !root.model.isEmpty : false

18
inspectors/view/qml/notation/crescendos/internal/CrescendoStyleSettingsTab.qml
View file

@ -1,6 +1,8 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../../common"
FocusableItem {
@ -44,10 +46,10 @@ FocusableItem {
width: parent.width
model: [
{ iconRole: IconNameTypes.LINE_NORMAL, typeRole: CrescendoTypes.HOOK_TYPE_NONE },
{ iconRole: IconNameTypes.LINE_WITH_END_HOOK, typeRole: CrescendoTypes.HOOK_TYPE_90 },
{ iconRole: IconNameTypes.LINE_WITH_ANGLED_END_HOOK, typeRole: CrescendoTypes.HOOK_TYPE_45 },
{ iconRole: IconNameTypes.LINE_WITH_T_LIKE_END_HOOK, typeRole: CrescendoTypes.HOOK_TYPE_T_LIKE },
{ iconRole: IconCode.LINE_NORMAL, typeRole: CrescendoTypes.HOOK_TYPE_NONE },
{ iconRole: IconCode.LINE_WITH_END_HOOK, typeRole: CrescendoTypes.HOOK_TYPE_90 },
{ iconRole: IconCode.LINE_WITH_ANGLED_END_HOOK, typeRole: CrescendoTypes.HOOK_TYPE_45 },
{ iconRole: IconCode.LINE_WITH_T_LIKE_END_HOOK, typeRole: CrescendoTypes.HOOK_TYPE_T_LIKE },
]
delegate: FlatRadioButton {
@ -88,10 +90,10 @@ FocusableItem {
width: parent.width
model: [
{ iconRole: IconNameTypes.LINE_NORMAL, typeRole: CrescendoTypes.LINE_STYLE_SOLID },
{ iconRole: IconNameTypes.LINE_DASHED, typeRole: CrescendoTypes.LINE_STYLE_DASHED },
{ iconRole: IconNameTypes.LINE_DOTTED, typeRole: CrescendoTypes.LINE_STYLE_DOTTED },
{ iconRole: IconNameTypes.CUSTOM, typeRole: CrescendoTypes.LINE_STYLE_CUSTOM }
{ iconRole: IconCode.LINE_NORMAL, typeRole: CrescendoTypes.LINE_STYLE_SOLID },
{ iconRole: IconCode.LINE_DASHED, typeRole: CrescendoTypes.LINE_STYLE_DASHED },
{ iconRole: IconCode.LINE_DOTTED, typeRole: CrescendoTypes.LINE_STYLE_DOTTED },
{ iconRole: IconCode.CUSTOM, typeRole: CrescendoTypes.LINE_STYLE_CUSTOM }
]
delegate: FlatRadioButton {

1
inspectors/view/qml/notation/crescendos/internal/CrescendoTabPanel.qml
View file

@ -1,6 +1,7 @@
import QtQuick 2.9
import QtQuick.Controls 1.5
import QtQuick.Layouts 1.3
import MuseScore.UiComponents 1.0
import "../../../common"
TabPanel {

10
inspectors/view/qml/notation/crescendos/internal/CrescendoTextSettingsTab.qml
View file

@ -1,6 +1,8 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../../common"
FocusableItem {
@ -62,7 +64,7 @@ FocusableItem {
anchors.right: parent.horizontalCenter
anchors.rightMargin: 2
icon: IconNameTypes.HORIZONTAL
icon: IconCode.HORIZONTAL
isIndeterminate: root.model ? root.model.beginningTextHorizontalOffset.isUndefined : false
currentValue: root.model ? root.model.beginningTextHorizontalOffset.value : 0
@ -74,7 +76,7 @@ FocusableItem {
anchors.leftMargin: 2
anchors.right: parent.right
icon: IconNameTypes.VERTICAL
icon: IconCode.VERTICAL
isIndeterminate: root.model ? root.model.beginningTextVerticalOffset.isUndefined : false
currentValue: root.model ? root.model.beginningTextVerticalOffset.value : 0
@ -129,7 +131,7 @@ FocusableItem {
anchors.right: parent.horizontalCenter
anchors.rightMargin: 2
icon: IconNameTypes.HORIZONTAL
icon: IconCode.HORIZONTAL
isIndeterminate: root.model ? root.model.continiousTextHorizontalOffset.isUndefined : false
currentValue: root.model ? root.model.continiousTextHorizontalOffset.value : 0
@ -141,7 +143,7 @@ FocusableItem {
anchors.leftMargin: 2
anchors.right: parent.right
icon: IconNameTypes.VERTICAL
icon: IconCode.VERTICAL
isIndeterminate: root.model ? root.model.continiousTextVerticalOffset.isUndefined : false
currentValue: root.model ? root.model.continiousTextVerticalOffset.value : 0

1
inspectors/view/qml/notation/fermatas/FermataPopup.qml
View file

@ -1,6 +1,7 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import "../../common"
StyledPopup {

4
inspectors/view/qml/notation/fermatas/FermataSettings.qml
View file

@ -1,6 +1,8 @@
import QtQuick 2.9
import QtQuick.Layouts 1.3
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../common"
PopupViewButton {
@ -8,7 +10,7 @@ PopupViewButton {
property alias model: fermataPopup.model
icon: IconNameTypes.FERMATA
icon: IconCode.FERMATA
text: qsTr("Fermatas")
visible: root.model ? !root.model.isEmpty : false

1
inspectors/view/qml/notation/frames/HorizontalFramePopup.qml
View file

@ -1,6 +1,7 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Dialogs 1.2
import MuseScore.UiComponents 1.0
import "../../common"
import "internal"

4
inspectors/view/qml/notation/frames/HorizontalFrameSettings.qml
View file

@ -1,5 +1,7 @@
import QtQuick 2.9
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../common"
PopupViewButton {
@ -7,7 +9,7 @@ PopupViewButton {
property alias model: horizontalFramePopup.model
icon: IconNameTypes.HORIZONTAL_FRAME
icon: IconCode.HORIZONTAL_FRAME
text: qsTr("Horizontal frames")
visible: root.model ? !root.model.isEmpty : false

1
inspectors/view/qml/notation/frames/TextFramePopup.qml
View file

@ -1,6 +1,7 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Dialogs 1.2
import MuseScore.UiComponents 1.0
import "../../common"
import "internal"

4
inspectors/view/qml/notation/frames/TextFrameSettings.qml
View file

@ -1,5 +1,7 @@
import QtQuick 2.9
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../common"
PopupViewButton {
@ -7,7 +9,7 @@ PopupViewButton {
property alias model: textFramePopup.model
icon: IconNameTypes.TEXT_FRAME
icon: IconCode.TEXT_FRAME
text: qsTr("Text frames")
visible: root.model ? !root.model.isEmpty : false

1
inspectors/view/qml/notation/frames/VerticalFramePopup.qml
View file

@ -1,6 +1,7 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Dialogs 1.2
import MuseScore.UiComponents 1.0
import "../../common"
import "internal"

4
inspectors/view/qml/notation/frames/VerticalFrameSettings.qml
View file

@ -1,5 +1,7 @@
import QtQuick 2.9
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../common"
PopupViewButton {
@ -7,7 +9,7 @@ PopupViewButton {
property alias model: verticalFramePopup.model
icon: IconNameTypes.VERTICAL_FRAME
icon: IconCode.VERTICAL_FRAME
text: qsTr("Vertical frames")
visible: root.model ? !root.model.isEmpty : false

5
inspectors/view/qml/notation/frames/internal/HeightSection.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.9
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../../common"
Column {
@ -18,7 +19,7 @@ Column {
}
IncrementalPropertyControl {
icon: IconNameTypes.VERTICAL
icon: IconCode.VERTICAL
isIndeterminate: heightProperty ? heightProperty.isUndefined : false
currentValue: heightProperty ? heightProperty.value : 0

6
inspectors/view/qml/notation/frames/internal/HorizontalGapsSection.qml
View file

@ -1,5 +1,7 @@
import QtQuick 2.9
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../../common"
Item {
@ -23,7 +25,7 @@ Item {
}
IncrementalPropertyControl {
icon: IconNameTypes.LEFT_GAP
icon: IconCode.LEFT_GAP
enabled: leftGap ? leftGap.isEnabled : false
isIndeterminate: leftGap && enabled ? leftGap.isUndefined : false
@ -45,7 +47,7 @@ Item {
}
IncrementalPropertyControl {
icon: IconNameTypes.RIGHT_GAP
icon: IconCode.RIGHT_GAP
enabled: rightGap ? rightGap.isEnabled : false
isIndeterminate: rightGap && enabled ? rightGap.isUndefined : false

7
inspectors/view/qml/notation/frames/internal/HorizontalMarginsSection.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.9
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../../common"
Item {
@ -23,7 +24,7 @@ Item {
}
IncrementalPropertyControl {
icon: IconNameTypes.LEFT_MARGIN
icon: IconCode.LEFT_MARGIN
measureUnitsSymbol: qsTr("mm")
@ -47,7 +48,7 @@ Item {
}
IncrementalPropertyControl {
icon: IconNameTypes.RIGHT_MARGIN
icon: IconCode.RIGHT_MARGIN
measureUnitsSymbol: qsTr("mm")

7
inspectors/view/qml/notation/frames/internal/VerticalGapsSection.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.9
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../../common"
Item {
@ -23,7 +24,7 @@ Item {
}
IncrementalPropertyControl {
icon: IconNameTypes.GAP_ABOVE
icon: IconCode.GAP_ABOVE
enabled: gapAbove ? gapAbove.isEnabled : false
isIndeterminate: gapAbove && enabled ? gapAbove.isUndefined : false
@ -45,7 +46,7 @@ Item {
}
IncrementalPropertyControl {
icon: IconNameTypes.GAP_BELOW
icon: IconCode.GAP_BELOW
enabled: gapBelow ? gapBelow.isEnabled : false
isIndeterminate: gapBelow && enabled ? gapBelow.isUndefined : false

7
inspectors/view/qml/notation/frames/internal/VerticalMarginsSection.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.9
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../../common"
Item {
@ -23,7 +24,7 @@ Item {
}
IncrementalPropertyControl {
icon: IconNameTypes.TOP_MARGIN
icon: IconCode.TOP_MARGIN
measureUnitsSymbol: qsTr("mm")
@ -47,7 +48,7 @@ Item {
}
IncrementalPropertyControl {
icon: IconNameTypes.BOTTOM_MARGIN
icon: IconCode.BOTTOM_MARGIN
measureUnitsSymbol: qsTr("mm")

5
inspectors/view/qml/notation/frames/internal/WidthSection.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.9
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../../common"
Column {
@ -18,7 +19,7 @@ Column {
}
IncrementalPropertyControl {
icon: IconNameTypes.HORIZONTAL
icon: IconCode.HORIZONTAL
isIndeterminate: widthProperty ? widthProperty.isUndefined : false
currentValue: widthProperty ? widthProperty.value : 0

1
inspectors/view/qml/notation/fretdiagrams/FretDiagramPopup.qml
View file

@ -1,6 +1,7 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import "../../common/"
import "internal"

4
inspectors/view/qml/notation/fretdiagrams/FretDiagramSettings.qml
View file

@ -1,6 +1,8 @@
import QtQuick 2.9
import QtQuick.Layouts 1.3
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../common"
PopupViewButton {
@ -8,7 +10,7 @@ PopupViewButton {
property alias model: fretDiagramPopup.model
icon: IconNameTypes.FRETBOARD_DIAGRAM
icon: IconCode.FRETBOARD_DIAGRAM
text: qsTr("Fretboard diagrams")
visible: root.model ? !root.model.isEmpty : false

1
inspectors/view/qml/notation/fretdiagrams/internal/FretAdvancedSettingsTab.qml
View file

@ -1,6 +1,7 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import "../../../common"
FocusableItem {

1
inspectors/view/qml/notation/fretdiagrams/internal/FretDiagramTabPanel.qml
View file

@ -1,6 +1,7 @@
import QtQuick 2.9
import QtQuick.Controls 1.5
import QtQuick.Layouts 1.3
import MuseScore.UiComponents 1.0
import "../../../common"
TabPanel {

10
inspectors/view/qml/notation/fretdiagrams/internal/FretGeneralSettingsTab.qml
View file

@ -1,6 +1,8 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../../common"
FocusableItem {
@ -72,10 +74,10 @@ FocusableItem {
enabled: root.model ? !root.model.isBarreModeOn : false
model: [
{ iconRole: IconNameTypes.FRETBOARD_MARKER_CIRCLE_FILLED, typeRole: FretDiagramTypes.DOT_NORMAL },
{ iconRole: IconNameTypes.CLOSE_X_ROUNDED, typeRole: FretDiagramTypes.DOT_CROSS },
{ iconRole: IconNameTypes.STOP, typeRole: FretDiagramTypes.DOT_SQUARE },
{ iconRole: IconNameTypes.FRETBOARD_MARKER_TRIANGLE, typeRole: FretDiagramTypes.DOT_TRIANGLE }
{ iconRole: IconCode.FRETBOARD_MARKER_CIRCLE_FILLED, typeRole: FretDiagramTypes.DOT_NORMAL },
{ iconRole: IconCode.CLOSE_X_ROUNDED, typeRole: FretDiagramTypes.DOT_CROSS },
{ iconRole: IconCode.STOP, typeRole: FretDiagramTypes.DOT_SQUARE },
{ iconRole: IconCode.FRETBOARD_MARKER_TRIANGLE, typeRole: FretDiagramTypes.DOT_TRIANGLE }
]
delegate: FlatRadioButton {

1
inspectors/view/qml/notation/glissandos/GlissandoPopup.qml
View file

@ -1,6 +1,7 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import "../../common"
StyledPopup {

4
inspectors/view/qml/notation/glissandos/GlissandoSettings.qml
View file

@ -1,6 +1,8 @@
import QtQuick 2.9
import QtQuick.Layouts 1.3
import MuseScore.Inspectors 3.3
import MuseScore.UiComponents 1.0
import MuseScore.Ui 1.0
import "../../common"
PopupViewButton {
@ -8,7 +10,7 @@ PopupViewButton {
property alias model: glissandoPopup.model
icon: IconNameTypes.GLISSANDO
icon: IconCode.GLISSANDO
text: qsTr("Glissandos")
visible: root.model ? !root.model.isEmpty : false

Some files were not shown because too many files have changed in this diff Show more