renamd MenuItemAction[Value] to MenuAction[Binding]
commitdbc9718f1554d9eea353fe542afe86ee55e3554c
authorNick Dedekind <nicholas.dedekind@gmail.com>
dateWed 3 Jul 2013, 09:04 (13 years ago)
parent23ed9de
modules/Unity/Indicators/Messaging/qml/ActionButton.qml+1−1
@@ -29,7 +29,7 @@ Button {
2929
3030 property var actionParameter: null
3131
32− Indicators.MenuItemAction {
32+ Indicators.MenuAction {
3333 id: menuAction
3434 actionGroup: __button.actionGroup
3535 action: __button.action
modules/Unity/Indicators/Messaging/qml/GroupedMessage.qml+1−1
@@ -29,7 +29,7 @@ Indicators.BasicMenuItem {
2929 color: "#221e1b"
3030 implicitHeight: units.gu(10)
3131
32− Indicators.MenuItemAction {
32+ Indicators.MenuAction {
3333 id: menuAction
3434 actionGroup: __groupedMessage.actionGroup
3535 action: menu ? menu.action : ""
modules/Unity/Indicators/Messaging/qml/HeroMessage.qml+1−1
@@ -35,7 +35,7 @@ Indicators.BasicMenuItem {
3535 removable: state !== "expanded"
3636 implicitHeight: collapsedHeight
3737
38− Indicators.MenuItemAction {
38+ Indicators.MenuAction {
3939 id: menuAction
4040 actionGroup: __heroMessage.actionGroup
4141 action: menu ? menu.action : ""
modules/Unity/Indicators/Network/qml/AccessPoint.qml+1−1
@@ -59,7 +59,7 @@ Indicators.MenuItem {
5959 anchors.centerIn: parent
6060 }
6161
62− Indicators.MenuItemActionValue {
62+ Indicators.MenuActionBinding {
6363 actionGroup: _accessPoint.actionGroup
6464 action: menu ? menu.action : ""
6565 target: checkBoxActive
modules/Unity/Indicators/Network/qml/WifiSection.qml+1−1
@@ -24,7 +24,7 @@ import Unity.Indicators 0.1 as Indicators
2424Indicators.SectionMenuItem {
2525 id: __wifiSectionMenu
2626
27− Indicators.MenuItemAction {
27+ Indicators.MenuAction {
2828 id: busyAction
2929 actionGroup: __wifiSectionMenu.actionGroup
3030 action: menu ? menu.extra.canonical_busy_action : ""
modules/Unity/Indicators/qml/ButtonMenuItem.qml+1−1
@@ -39,7 +39,7 @@ BasicMenuItem {
3939 }
4040 }
4141
42− MenuItemAction {
42+ MenuAction {
4343 id: menuAction
4444 actionGroup: _buttonMenu.actionGroup
4545 action: menu ? menu.action : ""
modules/Unity/Indicators/qml/MenuItemAction.qml → modules/Unity/Indicators/qml/MenuAction.qmlrenamed+7−9
@@ -20,27 +20,25 @@
2020import QtQuick 2.0
2121
2222/*!
23− \qmltype MenuItemActionValue
23+ \qmltype MenuAction
2424 \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
2626
27− Exampiles:
27+ Example:
2828 \qml
2929 Button {
3030 id: slide
3131 onClick: { action.activate() }
3232 }
33− MenuItemAction {
33+ MenuAction {
3434 id: action
3535 actionGroup: menuItem.actionGroup
36− action: "/ubuntu/sound/auto"
36+ action: "/ubuntu/sound/enabled"
3737 }
3838 \endqml
39−
40− \b{This component is under heavy development.}
4139*/
4240
43−Item {
41+QtObject {
4442 id: dbusAction
4543
4644 /*!
@@ -75,7 +73,7 @@ Item {
7573 onActionGroupChanged: updateAction()
7674 onActionChanged: updateAction()
7775
78− Item {
76+ QtObject {
7977 id: priv
8078 property var actionObject: null
8179
modules/Unity/Indicators/qml/MenuItemActionValue.qml → modules/Unity/Indicators/qml/MenuActionBinding.qmlrenamed+6−8
@@ -20,27 +20,25 @@
2020import QtQuick 2.0
2121
2222/*!
23− \qmltype MenuItemActionValue
23+ \qmltype MenuActionBinding
2424 \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
2626
27− Exampiles:
27+ Example:
2828 \qml
2929 Slider {
3030 id: slide
3131 }
32− MenuItemActionValue {
32+ MenuActionBinding {
3333 actionGroup: menuItem.actionGroup
3434 action: "/ubuntu/sound/volume"
3535 target: slider
3636 property: "value"
3737 }
3838 \endqml
39−
40− \b{This component is under heavy development.}
4139*/
4240
43−MenuItemAction {
41+MenuAction {
4442 id: dbusActionState
4543
4644 /*!
@@ -65,7 +63,7 @@ MenuItemAction {
6563 onTargetChanged: connectViewChanges()
6664 onPropertyChanged: connectViewChanges()
6765
68− Item {
66+ QtObject {
6967 id: priv
7068 property alias actionObject : dbusActionState.__actionObject
7169
modules/Unity/Indicators/qml/ProgressMenuItem.qml+1−1
@@ -56,7 +56,7 @@ MenuItem {
5656 }
5757 }
5858
59− MenuItemActionValue {
59+ MenuActionBinding {
6060 actionGroup: _progressMenu.actionGroup
6161 action: menu ? menu.action : ""
6262 target: progressBar
modules/Unity/Indicators/qml/SliderMenuItem.qml+1−1
@@ -59,7 +59,7 @@ MenuItem {
5959 }
6060 }
6161
62− MenuItemActionValue {
62+ MenuActionBinding {
6363 id: menuAction
6464 actionGroup: _sliderMenu.actionGroup
6565 action: menu ? menu.action : ""
modules/Unity/Indicators/qml/SwitchMenuItem.qml+1−1
@@ -33,7 +33,7 @@ MenuItem {
3333 anchors.right: parent.right
3434 }
3535
36− MenuItemActionValue {
36+ MenuActionBinding {
3737 id: menuAction
3838 actionGroup: _switchMenu.actionGroup
3939 action: menu ? menu.action : ""
modules/Unity/Indicators/qml/TextMenuItem.qml+1−1
@@ -73,7 +73,7 @@ MenuItem {
7373 }
7474 }
7575
76− MenuItemActionValue {
76+ MenuActionBinding {
7777 actionGroup: _textMenu.actionGroup
7878 action: menu ? menu.action : ""
7979 target: _textField
modules/Unity/Indicators/qml/qmldir+2−2
@@ -9,8 +9,8 @@ IndicatorBase 0.1 IndicatorBase.qml
99IndicatorPage 0.1 IndicatorPage.qml
1010IndicatorWidget 0.1 IndicatorWidget.qml
1111MenuItem 0.1 MenuItem.qml
12−MenuItemAction 0.1 MenuItemAction.qml
13−MenuItemActionValue 0.1 MenuItemActionValue.qml
12+MenuAction 0.1 MenuAction.qml
13+MenuActionBinding 0.1 MenuActionBinding.qml
1414MenuItemFactory 0.1 MenuItemFactory.qml
1515ProgressMenuItem 0.1 ProgressMenuItem.qml
1616SectionMenuItem 0.1 SectionMenuItem.qml