git.iko.soy/unity8
on xenial help sign in
renamed a few things in menuAction
commit68669d9d71ec66781e444b37c12fecc92924ed15 authorNick Dedekind <nicholas.dedekind@gmail.com> dateWed 3 Jul 2013, 10:37 (13 years ago) parentdbc9718
2 files changed+33−39
compare with xenial
unifiedsplit
modules/Unity/Indicators/qml/MenuAction.qml+12−17 modules/Unity/Indicators/qml/MenuActionBinding.qml+21−22
modules/Unity/Indicators/qml/MenuAction.qml+12−17
@@ -38,8 +38,8 @@ import QtQuick 2.0
3838 \endqml
3939*/
4040
41−QtObject {
42− id: dbusAction
41+Item {
42+ id: menuAction
4343
4444 /*!
4545 \preliminary
@@ -57,35 +57,30 @@ QtObject {
5757 \preliminary
5858 This is a read-only property with the current validity of the action
5959 */
60− readonly property bool valid: __actionObject ? __actionObject.valid : false
60+ readonly property bool valid: actionObject ? actionObject.valid : false
6161
62− readonly property var state: __actionObject ? __actionObject.state : undefined
62+ readonly property var state: actionObject ? actionObject.state : undefined
6363
6464 // internal
65− property QtObject __actionObject: null
65+ property QtObject actionObject: null
6666
6767 function activate(param) {
6868 if (valid) {
69− __actionObject.activate(param);
69+ actionObject.activate(param);
7070 }
7171 }
7272
7373 onActionGroupChanged: updateAction()
7474 onActionChanged: updateAction()
7575
76− QtObject {
77− id: priv
78− property var actionObject: null
79−
80− Connections {
81− target: dbusAction.actionGroup != undefined ? dbusAction.actionGroup : null
82− onActionAppear: dbusAction.updateAction();
83− onActionVanish: dbusAction.updateAction();
84− onStatusChanged: dbusAction.updateAction();
85− }
76+ Connections {
77+ target: menuAction.actionGroup != undefined ? menuAction.actionGroup : null
78+ onActionAppear: menuAction.updateAction();
79+ onActionVanish: menuAction.updateAction();
80+ onStatusChanged: menuAction.updateAction();
8681 }
8782
8883 function updateAction() {
89− __actionObject = action !== "" && actionGroup ? actionGroup.action(action) : null
84+ actionObject = action !== "" && actionGroup ? actionGroup.action(action) : null
9085 }
9186}
modules/Unity/Indicators/qml/MenuActionBinding.qml+21−22
@@ -39,19 +39,19 @@ import QtQuick 2.0
3939*/
4040
4141MenuAction {
42− id: dbusActionState
42+ id: menuAction
4343
4444 /*!
4545 \preliminary
4646 The component which will have the property changed by action
4747 */
48− property alias target: propertyBinding.target
48+ property QtObject target: null
4949
5050 /*!
5151 \preliminary
5252 The property name of \l target component which will be linked with action state
5353 */
54− property string property: propertyBinding.property
54+ property string property
5555
5656 /*!
5757 \preliminary
@@ -63,37 +63,36 @@ MenuAction {
6363 onTargetChanged: connectViewChanges()
6464 onPropertyChanged: connectViewChanges()
6565
66− QtObject {
67− id: priv
68− property alias actionObject : dbusActionState.__actionObject
69−
66+ Item {
67+ id: d
7068 property var currentTarget: undefined
7169 property string currentSignal
70+ }
7271
73−
74− Binding {
75− id: propertyBinding
76− value: dbusActionState.state
77− when: priv.actionObject && dbusActionState.active
78− property: dbusActionState.property
79− }
72+ Binding {
73+ id: propertyBinding
74+ target: menuAction.target
75+ property: menuAction.property
76+ value: menuAction.state
77+ when: menuAction.actionObject && menuAction.active
8078 }
8179
80+ // TODO - re-evaluate in c++
8281 function connectViewChanges() {
83− if (priv.currentTarget != undefined && priv.currentSignal !== "") {
84− if (priv.currentTarget[priv.currentSignal] !== undefined) {
85− priv.currentTarget[priv.currentSignal].disconnect(onViewValueChanged);
82+ if (d.currentTarget != undefined && d.currentSignal !== "") {
83+ if (d.currentTarget[d.currentSignal] !== undefined) {
84+ d.currentTarget[d.currentSignal].disconnect(onViewValueChanged);
8685 }
8786 }
8887
89− priv.currentTarget = null;
90− priv.currentSignal = "";
88+ d.currentTarget = null;
89+ d.currentSignal = "";
9190 if (target) {
9291 var signal = "on%1Changed".arg(property.charAt(0).toUpperCase() + property.slice(1));
9392 if (target[signal] !== undefined) {
9493 target[signal].connect(onViewValueChanged);
95− priv.currentTarget = target;
96− priv.currentSignal = signal;
94+ d.currentTarget = target;
95+ d.currentSignal = signal;
9796 }
9897 }
9998 }
@@ -101,7 +100,7 @@ MenuAction {
101100 function onViewValueChanged() {
102101 if (valid) {
103102 var propertyValue = target[property];
104− priv.actionObject.updateState(propertyValue);
103+ actionObject.updateState(propertyValue);
105104 }
106105 }
107106}