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

objectID -> objectId

Browse source
This commit is contained in:
Roman Pudashkin 2021-10-06 11:48:20 +02:00
parent 9efb5e439c
commit bd13c0fde0
6 changed files with 36 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/framework/ui/iinteractiveuriregister.h
View file

@ -22,8 +22,6 @@
#ifndef MU_UI_IINTERACTIVEURIREGISTER_H #ifndef MU_UI_IINTERACTIVEURIREGISTER_H
#define MU_UI_IINTERACTIVEURIREGISTER_H #define MU_UI_IINTERACTIVEURIREGISTER_H
#include <QVariantMap>
#include "modularity/imoduleexport.h" #include "modularity/imoduleexport.h"
#include "global/uri.h" #include "global/uri.h"
#include "uitypes.h" #include "uitypes.h"

32
src/framework/ui/qml/MuseScore/Ui/InteractiveProvider.qml
View file

@ -63,7 +63,7 @@ Item {
var dialogObj = createDialog(dialogPath, page.params) var dialogObj = createDialog(dialogPath, page.params)
data.setValue("ret", dialogObj.ret) data.setValue("ret", dialogObj.ret)
data.setValue("objectID", dialogObj.object.objectID) data.setValue("objectId", dialogObj.object.objectId)
if (dialogObj.ret.errcode > 0) { if (dialogObj.ret.errcode > 0) {
return return
@ -81,7 +81,7 @@ Item {
var dialog = data.data() var dialog = data.data()
var dialogObj = createDialog("internal/StandardDialog.qml", dialog.params) var dialogObj = createDialog("internal/StandardDialog.qml", dialog.params)
data.setValue("ret", dialogObj.ret) data.setValue("ret", dialogObj.ret)
data.setValue("objectID", dialogObj.object.objectID) data.setValue("objectId", dialogObj.object.objectId)
if (dialogObj.ret.errcode > 0) { if (dialogObj.ret.errcode > 0) {
return return
@ -90,17 +90,17 @@ Item {
dialogObj.object.exec() dialogObj.object.exec()
} }
function onFireClose(objectID) { function onFireClose(objectId) {
var dialog = root.findDialog(objectID) var obj = root.findObject(objectId)
if (dialog) { if (obj) {
dialog.hide() obj.hide()
} }
} }
function onFireRaise(objectID) { function onFireRaise(objectId) {
var dialog = root.findDialog(objectID) var obj = root.findObject(objectId)
if (dialog) { if (obj) {
dialog.raise() obj.raise()
} }
} }
} }
@ -113,7 +113,7 @@ Item {
} }
var obj = comp.createObject(root.topParent, params) var obj = comp.createObject(root.topParent, params)
obj.objectID = root.provider.objectID(obj) obj.objectId = root.provider.objectId(obj)
var ret = (obj.ret && obj.ret.errcode) ? obj.ret : {errcode: 0} var ret = (obj.ret && obj.ret.errcode) ? obj.ret : {errcode: 0}
@ -122,18 +122,18 @@ Item {
} }
obj.closed.connect(function() { obj.closed.connect(function() {
root.provider.onPopupClose(obj.objectID, obj.ret ? obj.ret : {errcode: 0}) root.provider.onPopupClose(obj.objectId, obj.ret ? obj.ret : {errcode: 0})
obj.destroy() obj.destroy()
}) })
root.provider.onOpen(ContainerType.QmlDialog, obj.objectID) root.provider.onOpen(ContainerType.QmlDialog, obj.objectId)
return { "ret": ret, "object" : obj } return { "ret": ret, "object" : obj }
} }
function findDialog(objectID) { function findObject(objectId) {
for(var i = 0; i < root.topParent.children.length; ++i) { for (var i = 0; i < root.topParent.children.length; ++i) {
if (root.topParent.children[i].objectID === objectID) { if (root.topParent.children[i].objectId === objectId) {
return root.topParent.children[i] return root.topParent.children[i]
} }
} }

16
src/framework/ui/view/interactiveprovider.cpp
View file

@ -262,7 +262,7 @@ std::vector<Uri> InteractiveProvider::stack() const
return uris; return uris;
} }
QString InteractiveProvider::objectID(const QVariant& val) const QString InteractiveProvider::objectId(const QVariant& val) const
{ {
static int count(0); static int count(0);
@ -388,16 +388,16 @@ RetVal<InteractiveProvider::OpenData> InteractiveProvider::openQml(const UriQuer
RetVal<OpenData> result; RetVal<OpenData> result;
result.ret = toRet(data->value("ret")); result.ret = toRet(data->value("ret"));
result.val.sync = data->value("sync").toBool(); result.val.sync = data->value("sync").toBool();
result.val.objectId = data->value("objectID").toString(); result.val.objectId = data->value("objectId").toString();
delete data; delete data;
return result; return result;
} }
RetVal<Val> InteractiveProvider::openStandardDialog(const QString& type, const QString& title, const framework::IInteractive::Text& text, RetVal<Val> InteractiveProvider::openStandardDialog(const QString& type, const QString& title, const IInteractive::Text& text,
const framework::IInteractive::ButtonDatas& buttons, int defBtn, const IInteractive::ButtonDatas& buttons, int defBtn,
const framework::IInteractive::Options& options) const IInteractive::Options& options)
{ {
QmlLaunchData* data = new QmlLaunchData(); QmlLaunchData* data = new QmlLaunchData();
fillStandardDialogData(data, type, title, text, buttons, defBtn, options); fillStandardDialogData(data, type, title, text, buttons, defBtn, options);
@ -405,7 +405,7 @@ RetVal<Val> InteractiveProvider::openStandardDialog(const QString& type, const Q
emit fireOpenStandardDialog(data); emit fireOpenStandardDialog(data);
Ret ret = toRet(data->value("ret")); Ret ret = toRet(data->value("ret"));
QString objectID = data->value("objectID").toString(); QString objectId = data->value("objectId").toString();
delete data; delete data;
@ -415,8 +415,8 @@ RetVal<Val> InteractiveProvider::openStandardDialog(const QString& type, const Q
return result; return result;
} }
if (!objectID.isEmpty()) { if (!objectId.isEmpty()) {
RetVal<Val> rv = m_retvals.take(objectID); RetVal<Val> rv = m_retvals.take(objectId);
if (rv.ret.valid()) { if (rv.ret.valid()) {
result = rv; result = rv;
} }

2
src/framework/ui/view/interactiveprovider.h
View file

@ -83,7 +83,7 @@ public:
ValCh<Uri> currentUri() const override; ValCh<Uri> currentUri() const override;
std::vector<Uri> stack() const override; std::vector<Uri> stack() const override;
Q_INVOKABLE QString objectID(const QVariant& val) const; Q_INVOKABLE QString objectId(const QVariant& val) const;
Q_INVOKABLE void onOpen(const QVariant& type, const QVariant& objectId); Q_INVOKABLE void onOpen(const QVariant& type, const QVariant& objectId);
Q_INVOKABLE void onPopupClose(const QString& objectId, const QVariant& rv); Q_INVOKABLE void onPopupClose(const QString& objectId, const QVariant& rv);

12
src/framework/uicomponents/view/popupview.cpp
View file

@ -365,19 +365,19 @@ bool PopupView::isMouseWithinBoundaries(const QPoint& mousePos) const
return contains; return contains;
} }
void PopupView::setObjectID(QString objectID) void PopupView::setObjectId(QString objectId)
{ {
if (m_objectID == objectID) { if (m_objectId == objectId) {
return; return;
} }
m_objectID = objectID; m_objectId = objectId;
emit objectIDChanged(m_objectID); emit objectIdChanged(m_objectId);
} }
QString PopupView::objectID() const QString PopupView::objectId() const
{ {
return m_objectID; return m_objectId;
} }
QString PopupView::title() const QString PopupView::title() const

10
src/framework/uicomponents/view/popupview.h
View file

@ -69,7 +69,7 @@ class PopupView : public QObject, public QQmlParserStatus
//! NOTE Used for dialogs, but be here so that dialogs and just popups have one api //! NOTE Used for dialogs, but be here so that dialogs and just popups have one api
Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged) Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
Q_PROPERTY(QString objectID READ objectID WRITE setObjectID NOTIFY objectIDChanged) Q_PROPERTY(QString objectId READ objectId WRITE setObjectId NOTIFY objectIdChanged)
Q_PROPERTY(bool modal READ modal WRITE setModal NOTIFY modalChanged) Q_PROPERTY(bool modal READ modal WRITE setModal NOTIFY modalChanged)
Q_PROPERTY(bool resizable READ resizable WRITE setResizable NOTIFY resizableChanged) Q_PROPERTY(bool resizable READ resizable WRITE setResizable NOTIFY resizableChanged)
Q_PROPERTY(QVariantMap ret READ ret WRITE setRet NOTIFY retChanged) Q_PROPERTY(QVariantMap ret READ ret WRITE setRet NOTIFY retChanged)
@ -109,7 +109,7 @@ public:
bool isOpened() const; bool isOpened() const;
QString objectID() const; QString objectId() const;
QString title() const; QString title() const;
bool modal() const; bool modal() const;
bool resizable() const; bool resizable() const;
@ -129,7 +129,7 @@ public slots:
void setLocalY(qreal y); void setLocalY(qreal y);
void setClosePolicy(ClosePolicy closePolicy); void setClosePolicy(ClosePolicy closePolicy);
void setNavigationParentControl(QObject* parentNavigationControl); void setNavigationParentControl(QObject* parentNavigationControl);
void setObjectID(QString objectID); void setObjectId(QString objectId);
void setTitle(QString title); void setTitle(QString title);
void setModal(bool modal); void setModal(bool modal);
void setResizable(bool resizable); void setResizable(bool resizable);
@ -149,7 +149,7 @@ signals:
void yChanged(qreal y); void yChanged(qreal y);
void closePolicyChanged(ClosePolicy closePolicy); void closePolicyChanged(ClosePolicy closePolicy);
void navigationParentControlChanged(QObject* navigationParentControl); void navigationParentControlChanged(QObject* navigationParentControl);
void objectIDChanged(QString objectID); void objectIdChanged(QString objectId);
void titleChanged(QString title); void titleChanged(QString title);
void modalChanged(bool modal); void modalChanged(bool modal);
void resizableChanged(bool resizable); void resizableChanged(bool resizable);
@ -205,7 +205,7 @@ protected:
QPointF m_globalPos; QPointF m_globalPos;
ClosePolicy m_closePolicy = ClosePolicy::CloseOnPressOutsideParent; ClosePolicy m_closePolicy = ClosePolicy::CloseOnPressOutsideParent;
QObject* m_navigationParentControl = nullptr; QObject* m_navigationParentControl = nullptr;
QString m_objectID; QString m_objectId;
QString m_title; QString m_title;
bool m_modal = true; bool m_modal = true;
bool m_resizable = false; bool m_resizable = false;