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

Implemented general preferences page

Browse source
This commit is contained in:
Eism 2021-03-18 14:20:08 +02:00
parent eb84885530
commit 7151e5c6b4
12 changed files with 424 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/appshell/CMakeLists.txt
View file

@ -69,6 +69,8 @@ set(MODULE_SRC
${CMAKE_CURRENT_LIST_DIR}/view/toolsmenucontroller.h
${CMAKE_CURRENT_LIST_DIR}/view/helpmenucontroller.cpp
${CMAKE_CURRENT_LIST_DIR}/view/helpmenucontroller.h
${CMAKE_CURRENT_LIST_DIR}/view/generalpreferencesmodel.cpp
${CMAKE_CURRENT_LIST_DIR}/view/generalpreferencesmodel.h
${DOCKWINDOW_SRC}
)

2
src/appshell/appshellmodule.cpp
View file

@ -44,6 +44,7 @@
#include "view/toolsmenucontroller.h"
#include "view/helpmenucontroller.h"
#include "view/preferencesmodel.h"
#include "view/generalpreferencesmodel.h"
using namespace mu::appshell;
using namespace mu::framework;
@ -123,6 +124,7 @@ void AppShellModule::registerUiTypes()
qmlRegisterType<SettingListModel>("MuseScore.Preferences", 1, 0, "SettingListModel");
qmlRegisterType<PreferencesModel>("MuseScore.Preferences", 1, 0, "PreferencesModel");
qmlRegisterType<GeneralPreferencesModel>("MuseScore.Preferences", 1, 0, "GeneralPreferencesModel");
qmlRegisterType<AppMenuModel>("MuseScore.AppMenu", 1, 0, "AppMenuModel");
qmlRegisterType<NotationPageModel>("MuseScore.AppShell", 1, 0, "NotationPageModel");
qmlRegisterType<AboutModel>("MuseScore.AppShell", 1, 0, "AboutModel");

170
src/appshell/qml/Preferences/GeneralPreferencesPage.qml
View file

@ -1,19 +1,183 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import MuseScore.Ui 1.0
import MuseScore.UiComponents 1.0
import MuseScore.Preferences 1.0
Item {
id: root
Component.onCompleted: {
preferencesModel.load()
}
GeneralPreferencesModel {
id: preferencesModel
}
Rectangle {
anchors.fill: parent
color: ui.theme.backgroundSecondaryColor
}
StyledTextLabel {
anchors.centerIn: parent
text: qsTrc("appshell", "General")
Column {
anchors.fill: parent
spacing: 24
Column {
anchors.left: parent.left
anchors.right: parent.right
spacing: 18
StyledTextLabel {
text: qsTrc("appshell", "Languages")
font: ui.theme.bodyBoldFont
}
Row {
spacing: 12
StyledComboBox {
width: 208
property var currValue
textRoleName: "name"
valueRoleName: "code"
model: preferencesModel.languages
currentIndex: indexOfValue(preferencesModel.currentLanguageCode)
onValueChanged: {
preferencesModel.currentLanguageCode = value
}
}
FlatButton {
text: qsTrc("appshell", "Update Translations")
}
}
}
SeparatorLine { }
Column {
anchors.left: parent.left
anchors.right: parent.right
spacing: 18
StyledTextLabel {
text: qsTrc("appshell", "Telemetry")
font: ui.theme.bodyBoldFont
}
CheckBox {
width: 216
text: qsTrc("appshell", "Send anonymous telemetry data to MuseScore")
checked: preferencesModel.isTelemetryAllowed
onClicked: {
preferencesModel.isTelemetryAllowed = !preferencesModel.isTelemetryAllowed
}
}
}
SeparatorLine { }
Column {
anchors.left: parent.left
anchors.right: parent.right
spacing: 18
StyledTextLabel {
text: qsTrc("appshell", "Auto Save")
font: ui.theme.bodyBoldFont
}
Row {
anchors.left: parent.left
anchors.right: parent.right
spacing: 0
CheckBox {
width: 216
text: qsTrc("appshell", "Auto save every:")
checked: preferencesModel.isAutoSave
onClicked: {
preferencesModel.isAutoSave = !preferencesModel.isAutoSave
}
}
IncrementalPropertyControl {
width: 96
iconMode: iconModeEnum.hidden
enabled: preferencesModel.isAutoSave
currentValue: preferencesModel.autoSavePeriod
minValue: 1
maxValue: 100
step: 1
measureUnitsSymbol: qsTrc("appshell", "min")
onValueEdited: {
// preferencesModel.autoSavePeriod = newValue
}
}
}
}
SeparatorLine { }
Column {
anchors.left: parent.left
anchors.right: parent.right
spacing: 18
StyledTextLabel {
text: qsTrc("appshell", "OSC Remote Control")
font: ui.theme.bodyBoldFont
}
Row {
anchors.left: parent.left
anchors.right: parent.right
spacing: 0
CheckBox {
width: 216
text: qsTrc("appshell", "Port number:")
checked: preferencesModel.isOSCRemoteControl
onClicked: {
preferencesModel.isOSCRemoteControl = !preferencesModel.isOSCRemoteControl
}
}
IncrementalPropertyControl {
width: 96
iconMode: iconModeEnum.hidden
enabled: preferencesModel.isOSCRemoteControl
currentValue: preferencesModel.oscPort
minValue: 1
maxValue: 65535
step: 1
onValueEdited: {
preferencesModel.oscPort = newValue
}
}
}
}
}
}

1
src/appshell/qml/Preferences/PreferencesDialog.qml
View file

@ -80,6 +80,7 @@ QmlDialog {
Loader {
Layout.fillHeight: true
Layout.fillWidth: true
Layout.margins: 30
sourceComponent: Boolean(root.privatesProperties.inited) ?
root.privatesProperties.pagesComponents[preferencesModel.currentPageId] : null

149
src/appshell/view/generalpreferencesmodel.cpp Normal file
View file

@ -0,0 +1,149 @@
//=============================================================================
// 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 2.
//
// 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, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//=============================================================================
#include "generalpreferencesmodel.h"
#include "log.h"
using namespace mu::appshell;
using namespace mu::languages;
GeneralPreferencesModel::GeneralPreferencesModel(QObject* parent)
: QObject(parent)
{
}
void GeneralPreferencesModel::load()
{
languagesService()->currentLanguage().ch.onReceive(this, [this](const Language&) {
emit currentLanguageCodeChanged(currentLanguageCode());
});
languagesService()->languages().ch.onReceive(this, [this](const LanguagesHash&) {
emit languagesChanged(languages());
});
telemetryConfiguration()->isTelemetryAllowed().ch.onReceive(this, [this](bool) {
emit isTelemetryAllowedChanged(isTelemetryAllowed());
});
}
void GeneralPreferencesModel::updateTranslations()
{
NOT_IMPLEMENTED;
}
QVariantList GeneralPreferencesModel::languages() const
{
ValCh<LanguagesHash> languages = languagesService()->languages();
QList<Language> languageList = languages.val.values();
QVariantList result;
for (const Language& language: languageList) {
if (language.status == LanguageStatus::Status::NoInstalled
|| language.status == LanguageStatus::Status::Undefined) {
continue;
}
QVariantMap languageObj;
languageObj["code"] = language.code;
languageObj["name"] = language.name;
result << languageObj;
}
std::sort(result.begin(), result.end(), [](const QVariant& l, const QVariant& r) {
return l.toMap().value("code").toString() < r.toMap().value("code").toString();
});
return result;
}
QString GeneralPreferencesModel::currentLanguageCode() const
{
return languagesService()->currentLanguage().val.code;
}
bool GeneralPreferencesModel::isTelemetryAllowed() const
{
return telemetryConfiguration()->isTelemetryAllowed().val;
}
bool GeneralPreferencesModel::isAutoSave() const
{
return false;
}
int GeneralPreferencesModel::autoSavePeriod() const
{
return 0;
}
bool GeneralPreferencesModel::isOSCRemoteControl() const
{
return false;
}
int GeneralPreferencesModel::oscPort() const
{
return 0;
}
void GeneralPreferencesModel::setCurrentLanguageCode(QString currentLanguageCode)
{
if (currentLanguageCode == this->currentLanguageCode()) {
return;
}
languagesService()->setCurrentLanguage(currentLanguageCode);
emit currentLanguageCodeChanged(currentLanguageCode);
}
void GeneralPreferencesModel::setIsTelemetryAllowed(bool isTelemetryAllowed)
{
if (isTelemetryAllowed == this->isTelemetryAllowed()) {
return;
}
telemetryConfiguration()->setIsTelemetryAllowed(isTelemetryAllowed);
emit isTelemetryAllowedChanged(isTelemetryAllowed);
}
void GeneralPreferencesModel::setIsAutoSave(bool isAutoSave)
{
NOT_IMPLEMENTED;
emit isAutoSaveChanged(isAutoSave);
}
void GeneralPreferencesModel::setAutoSavePeriod(int autoSavePeriod)
{
NOT_IMPLEMENTED;
emit autoSavePeriodChanged(autoSavePeriod);
}
void GeneralPreferencesModel::setIsOSCRemoteControl(bool isOSCRemoteControl)
{
NOT_IMPLEMENTED;
emit isOSCRemoteControlChanged(isOSCRemoteControl);
}
void GeneralPreferencesModel::setOscPort(int oscPort)
{
NOT_IMPLEMENTED;
emit oscPortChanged(oscPort);
}

81
src/appshell/view/generalpreferencesmodel.h Normal file
View file

@ -0,0 +1,81 @@
//=============================================================================
// 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 2.
//
// 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, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//=============================================================================
#ifndef MU_APPSHELL_GENERALPREFERENCESMODEL_H
#define MU_APPSHELL_GENERALPREFERENCESMODEL_H
#include <QObject>
#include "modularity/ioc.h"
#include "async/asyncable.h"
#include "languages/ilanguagesservice.h"
#include "telemetry/itelemetryconfiguration.h"
namespace mu::appshell {
class GeneralPreferencesModel : public QObject, public async::Asyncable
{
Q_OBJECT
INJECT(appshell, languages::ILanguagesService, languagesService)
INJECT(appshell, telemetry::ITelemetryConfiguration, telemetryConfiguration)
Q_PROPERTY(QVariantList languages READ languages NOTIFY languagesChanged)
Q_PROPERTY(QString currentLanguageCode READ currentLanguageCode WRITE setCurrentLanguageCode NOTIFY currentLanguageCodeChanged)
Q_PROPERTY(bool isTelemetryAllowed READ isTelemetryAllowed WRITE setIsTelemetryAllowed NOTIFY isTelemetryAllowedChanged)
Q_PROPERTY(bool isAutoSave READ isAutoSave WRITE setIsAutoSave NOTIFY isAutoSaveChanged)
Q_PROPERTY(int autoSavePeriod READ autoSavePeriod WRITE setAutoSavePeriod NOTIFY autoSavePeriodChanged)
Q_PROPERTY(bool isOSCRemoteControl READ isOSCRemoteControl WRITE setIsOSCRemoteControl NOTIFY isOSCRemoteControlChanged)
Q_PROPERTY(int oscPort READ oscPort WRITE setOscPort NOTIFY oscPortChanged)
public:
explicit GeneralPreferencesModel(QObject* parent = nullptr);
Q_INVOKABLE void load();
Q_INVOKABLE void updateTranslations();
QVariantList languages() const;
QString currentLanguageCode() const;
bool isTelemetryAllowed() const;
bool isAutoSave() const;
int autoSavePeriod() const;
bool isOSCRemoteControl() const;
int oscPort() const;
public slots:
void setCurrentLanguageCode(QString currentLanguageCode);
void setIsTelemetryAllowed(bool isTelemetryAllowed);
void setIsAutoSave(bool isAutoSave);
void setAutoSavePeriod(int sutoSavePeriod);
void setIsOSCRemoteControl(bool isOSCRemoteControl);
void setOscPort(int oscPort);
signals:
void languagesChanged(QVariantList languages);
void currentLanguageCodeChanged(QString currentLanguageCode);
void isTelemetryAllowedChanged(bool isTelemetryAllowed);
void isAutoSaveChanged(bool isAutoSave);
void isOSCRemoteControlChanged(bool isOSCRemoteControl);
void oscPortChanged(int oscPort);
void autoSavePeriodChanged(int autoSavePeriod);
};
}
#endif // MU_APPSHELL_GENERALPREFERENCESMODEL_H

12
src/framework/telemetry/internal/telemetryconfiguration.cpp
View file

@ -33,6 +33,10 @@ void TelemetryConfiguration::init()
settings()->setDefaultValue(REQUEST_TELEMETRY_PERMISSION, Val(true));
settings()->setDefaultValue(IS_TELEMETRY_ALLOWED, Val(false));
settings()->setDefaultValue(IS_DUMP_UPLOAD_ALLOWED, Val(true));
settings()->valueChanged(IS_TELEMETRY_ALLOWED).onReceive(this, [this](const Val& allowed){
m_isTelemetryAllowedChannel.send(allowed.toBool());
});
}
bool TelemetryConfiguration::needRequestTelemetryPermission() const
@ -40,10 +44,14 @@ bool TelemetryConfiguration::needRequestTelemetryPermission() const
return settings()->value(REQUEST_TELEMETRY_PERMISSION).toBool();
}
bool TelemetryConfiguration::isTelemetryAllowed() const
mu::ValCh<bool> TelemetryConfiguration::isTelemetryAllowed() const
{
mu::ValCh<bool> allowed;
allowed.ch = m_isTelemetryAllowedChannel;
static QString id(TELEMETRY_TRACK_ID);
return !id.isEmpty() && settings()->value(IS_TELEMETRY_ALLOWED).toBool();
allowed.val = !id.isEmpty() && settings()->value(IS_TELEMETRY_ALLOWED).toBool();
return allowed;
}
void TelemetryConfiguration::setIsTelemetryAllowed(bool val)

8
src/framework/telemetry/internal/telemetryconfiguration.h
View file

@ -20,9 +20,10 @@
#define MU_TELEMETRY_TELEMETRYCONFIGURATION_H
#include "../itelemetryconfiguration.h"
#include "async/asyncable.h"
namespace mu::telemetry {
class TelemetryConfiguration : public ITelemetryConfiguration
class TelemetryConfiguration : public ITelemetryConfiguration, public async::Asyncable
{
public:
TelemetryConfiguration() = default;
@ -31,11 +32,14 @@ public:
bool needRequestTelemetryPermission() const override;
bool isTelemetryAllowed() const override;
ValCh<bool> isTelemetryAllowed() const override;
void setIsTelemetryAllowed(bool val) override;
bool isDumpUploadAllowed() const override;
void setIsDumpUploadAllowed(bool val) override;
private:
async::Channel<bool> m_isTelemetryAllowedChannel;
};
}

2
src/framework/telemetry/internal/telemetryservice.cpp
View file

@ -64,5 +64,5 @@ void TelemetryService::endSession()
bool TelemetryService::isTelemetryAllowed() const
{
return configuration()->isTelemetryAllowed();
return configuration()->isTelemetryAllowed().val;
}

3
src/framework/telemetry/itelemetryconfiguration.h
View file

@ -20,6 +20,7 @@
#define MU_TELEMETRY_ITELEMETRYCONFIGURATION_H
#include "modularity/imoduleexport.h"
#include "retval.h"
namespace mu::telemetry {
class ITelemetryConfiguration : MODULE_EXPORT_INTERFACE
@ -31,7 +32,7 @@ public:
virtual bool needRequestTelemetryPermission() const = 0;
virtual bool isTelemetryAllowed() const = 0;
virtual ValCh<bool> isTelemetryAllowed() const = 0;
virtual void setIsTelemetryAllowed(bool val) = 0;
virtual bool isDumpUploadAllowed() const = 0;

2
src/framework/uicomponents/qml/MuseScore/UiComponents/CheckBox.qml
View file

@ -53,6 +53,8 @@ FocusableItem {
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
horizontalAlignment: Text.AlignLeft
wrapMode: Text.WordWrap
maximumLineCount: 2
visible: Boolean(text)
}

2
src/languages/view/languagelistmodel.cpp
View file

@ -204,7 +204,7 @@ void LanguageListModel::uninstall(QString code)
void LanguageListModel::openPreferences()
{
interactive()->open("musescore://devtools");
interactive()->open("musescore://preferences?currentPageId=general");
}
QVariantMap LanguageListModel::language(QString code)