git.iko.soy/unity8
on xenial help sign in
renamd MenuItemAction[Value] to MenuAction[Binding]
dbc9718Nick Dedekind
modules/Unity/Indicators/Messaging/qml/ActionButton.qml+1−1
compare with xenial
unifiedsplit
@@ -29,7 +29,7 @@ Button {
29
29
30 property var actionParameter: null
30 property var actionParameter: null
31
31
32− Indicators.MenuItemAction {
32+ Indicators.MenuAction {
33 id: menuAction
33 id: menuAction
34 actionGroup: __button.actionGroup
34 actionGroup: __button.actionGroup
35 action: __button.action
35 action: __button.action
modules/Unity/Indicators/Messaging/qml/GroupedMessage.qml+1−1
@@ -29,7 +29,7 @@ Indicators.BasicMenuItem {
29 color: "#221e1b"
29 color: "#221e1b"
30 implicitHeight: units.gu(10)
30 implicitHeight: units.gu(10)
31
31
32− Indicators.MenuItemAction {
32+ Indicators.MenuAction {
33 id: menuAction
33 id: menuAction
34 actionGroup: __groupedMessage.actionGroup
34 actionGroup: __groupedMessage.actionGroup
35 action: menu ? menu.action : ""
35 action: menu ? menu.action : ""
modules/Unity/Indicators/Messaging/qml/HeroMessage.qml+1−1
@@ -35,7 +35,7 @@ Indicators.BasicMenuItem {
35 removable: state !== "expanded"
35 removable: state !== "expanded"
36 implicitHeight: collapsedHeight
36 implicitHeight: collapsedHeight
37
37
38− Indicators.MenuItemAction {
38+ Indicators.MenuAction {
39 id: menuAction
39 id: menuAction
40 actionGroup: __heroMessage.actionGroup
40 actionGroup: __heroMessage.actionGroup
41 action: menu ? menu.action : ""
41 action: menu ? menu.action : ""
modules/Unity/Indicators/Network/qml/AccessPoint.qml+1−1
@@ -59,7 +59,7 @@ Indicators.MenuItem {
59 anchors.centerIn: parent
59 anchors.centerIn: parent
60 }
60 }
61
61
62− Indicators.MenuItemActionValue {
62+ Indicators.MenuActionBinding {
63 actionGroup: _accessPoint.actionGroup
63 actionGroup: _accessPoint.actionGroup
64 action: menu ? menu.action : ""
64 action: menu ? menu.action : ""
65 target: checkBoxActive
65 target: checkBoxActive
modules/Unity/Indicators/Network/qml/WifiSection.qml+1−1
@@ -24,7 +24,7 @@ import Unity.Indicators 0.1 as Indicators
24Indicators.SectionMenuItem {
24Indicators.SectionMenuItem {
25 id: __wifiSectionMenu
25 id: __wifiSectionMenu
26
26
27− Indicators.MenuItemAction {
27+ Indicators.MenuAction {
28 id: busyAction
28 id: busyAction
29 actionGroup: __wifiSectionMenu.actionGroup
29 actionGroup: __wifiSectionMenu.actionGroup
30 action: menu ? menu.extra.canonical_busy_action : ""
30 action: menu ? menu.extra.canonical_busy_action : ""
modules/Unity/Indicators/qml/ButtonMenuItem.qml+1−1
@@ -39,7 +39,7 @@ BasicMenuItem {
39 }
39 }
40 }
40 }
41
41
42− MenuItemAction {
42+ MenuAction {
43 id: menuAction
43 id: menuAction
44 actionGroup: _buttonMenu.actionGroup
44 actionGroup: _buttonMenu.actionGroup
45 action: menu ? menu.action : ""
45 action: menu ? menu.action : ""
modules/Unity/Indicators/qml/MenuItemAction.qml → modules/Unity/Indicators/qml/MenuAction.qmlrenamed+7−9
@@ -20,27 +20,25 @@
20import QtQuick 2.0
20import QtQuick 2.0
21
21
22/*!
22/*!
23− \qmltype MenuItemActionValue
23+ \qmltype MenuAction
24 \inqmlmodule Indicators 0.1
24 \inqmlmodule Indicators 0.1
25− \brief Helper class to connect dbus action state with qml components property
25+ \brief Helper class to connect to a qmenumodel action
26
26
27− Exampiles:
27+ Example:
28 \qml
28 \qml
29 Button {
29 Button {
30 id: slide
30 id: slide
31 onClick: { action.activate() }
31 onClick: { action.activate() }
32 }
32 }
33− MenuItemAction {
33+ MenuAction {
34 id: action
34 id: action
35 actionGroup: menuItem.actionGroup
35 actionGroup: menuItem.actionGroup
36− action: "/ubuntu/sound/auto"
36+ action: "/ubuntu/sound/enabled"
37 }
37 }
38 \endqml
38 \endqml
39−
40− \b{This component is under heavy development.}
41*/
39*/
42
40
43−Item {
41+QtObject {
44 id: dbusAction
42 id: dbusAction
45
43
46 /*!
44 /*!
@@ -75,7 +73,7 @@ Item {
75 onActionGroupChanged: updateAction()
73 onActionGroupChanged: updateAction()
76 onActionChanged: updateAction()
74 onActionChanged: updateAction()
77
75
78− Item {
76+ QtObject {
79 id: priv
77 id: priv
80 property var actionObject: null
78 property var actionObject: null
81
79
modules/Unity/Indicators/qml/MenuItemActionValue.qml → modules/Unity/Indicators/qml/MenuActionBinding.qmlrenamed+6−8
@@ -20,27 +20,25 @@
20import QtQuick 2.0
20import QtQuick 2.0
21
21
22/*!
22/*!
23− \qmltype MenuItemActionValue
23+ \qmltype MenuActionBinding
24 \inqmlmodule Indicators 0.1
24 \inqmlmodule Indicators 0.1
25− \brief Helper class to connect dbus action state with qml components property
25+ \brief Helper class to connect a qmenumodel action state with a qml components property
26
26
27− Exampiles:
27+ Example:
28 \qml
28 \qml
29 Slider {
29 Slider {
30 id: slide
30 id: slide
31 }
31 }
32− MenuItemActionValue {
32+ MenuActionBinding {
33 actionGroup: menuItem.actionGroup
33 actionGroup: menuItem.actionGroup
34 action: "/ubuntu/sound/volume"
34 action: "/ubuntu/sound/volume"
35 target: slider
35 target: slider
36 property: "value"
36 property: "value"
37 }
37 }
38 \endqml
38 \endqml
39−
40− \b{This component is under heavy development.}
41*/
39*/
42
40
43−MenuItemAction {
41+MenuAction {
44 id: dbusActionState
42 id: dbusActionState
45
43
46 /*!
44 /*!
@@ -65,7 +63,7 @@ MenuItemAction {
65 onTargetChanged: connectViewChanges()
63 onTargetChanged: connectViewChanges()
66 onPropertyChanged: connectViewChanges()
64 onPropertyChanged: connectViewChanges()
67
65
68− Item {
66+ QtObject {
69 id: priv
67 id: priv
70 property alias actionObject : dbusActionState.__actionObject
68 property alias actionObject : dbusActionState.__actionObject
71
69
modules/Unity/Indicators/qml/ProgressMenuItem.qml+1−1
@@ -56,7 +56,7 @@ MenuItem {
56 }
56 }
57 }
57 }
58
58
59− MenuItemActionValue {
59+ MenuActionBinding {
60 actionGroup: _progressMenu.actionGroup
60 actionGroup: _progressMenu.actionGroup
61 action: menu ? menu.action : ""
61 action: menu ? menu.action : ""
62 target: progressBar
62 target: progressBar
modules/Unity/Indicators/qml/SliderMenuItem.qml+1−1
@@ -59,7 +59,7 @@ MenuItem {
59 }
59 }
60 }
60 }
61
61
62− MenuItemActionValue {
62+ MenuActionBinding {
63 id: menuAction
63 id: menuAction
64 actionGroup: _sliderMenu.actionGroup
64 actionGroup: _sliderMenu.actionGroup
65 action: menu ? menu.action : ""
65 action: menu ? menu.action : ""
modules/Unity/Indicators/qml/SwitchMenuItem.qml+1−1
@@ -33,7 +33,7 @@ MenuItem {
33 anchors.right: parent.right
33 anchors.right: parent.right
34 }
34 }
35
35
36− MenuItemActionValue {
36+ MenuActionBinding {
37 id: menuAction
37 id: menuAction
38 actionGroup: _switchMenu.actionGroup
38 actionGroup: _switchMenu.actionGroup
39 action: menu ? menu.action : ""
39 action: menu ? menu.action : ""
modules/Unity/Indicators/qml/TextMenuItem.qml+1−1
@@ -73,7 +73,7 @@ MenuItem {
73 }
73 }
74 }
74 }
75
75
76− MenuItemActionValue {
76+ MenuActionBinding {
77 actionGroup: _textMenu.actionGroup
77 actionGroup: _textMenu.actionGroup
78 action: menu ? menu.action : ""
78 action: menu ? menu.action : ""
79 target: _textField
79 target: _textField
modules/Unity/Indicators/qml/qmldir+2−2
@@ -9,8 +9,8 @@ IndicatorBase 0.1 IndicatorBase.qml
9IndicatorPage 0.1 IndicatorPage.qml
9IndicatorPage 0.1 IndicatorPage.qml
10IndicatorWidget 0.1 IndicatorWidget.qml
10IndicatorWidget 0.1 IndicatorWidget.qml
11MenuItem 0.1 MenuItem.qml
11MenuItem 0.1 MenuItem.qml
12−MenuItemAction 0.1 MenuItemAction.qml
12+MenuAction 0.1 MenuAction.qml
13−MenuItemActionValue 0.1 MenuItemActionValue.qml
13+MenuActionBinding 0.1 MenuActionBinding.qml
14MenuItemFactory 0.1 MenuItemFactory.qml
14MenuItemFactory 0.1 MenuItemFactory.qml
15ProgressMenuItem 0.1 ProgressMenuItem.qml
15ProgressMenuItem 0.1 ProgressMenuItem.qml
16SectionMenuItem 0.1 SectionMenuItem.qml
16SectionMenuItem 0.1 SectionMenuItem.qml