git.iko.soy/unity8
on xenial help sign in
Renamed indicator menus to menu items.
e507710Nick Dedekind
Panel/Indicators/client/IndicatorsList.qml+1−1
compare with xenial
unifiedsplit
@@ -38,7 +38,7 @@ Page {
38 anchors.fill: parent
38 anchors.fill: parent
39 model: indicatorsModel
39 model: indicatorsModel
40
40
41− delegate: Indicators.Menu {
41+ delegate: Indicators.MenuItem {
42 anchors.left: parent.left
42 anchors.left: parent.left
43 anchors.right: parent.right
43 anchors.right: parent.right
44 progression: isValid
44 progression: isValid
modules/Unity/Indicators/qml/BasicMenu.qml → modules/Unity/Indicators/qml/BasicMenuItem.qmlrenamed

The content is the same.

modules/Unity/Indicators/qml/ButtonMenu.qml → modules/Unity/Indicators/qml/ButtonMenuItem.qmlrenamed+1−1
@@ -20,7 +20,7 @@
20import QtQuick 2.0
20import QtQuick 2.0
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22
22
23−BasicMenu {
23+BasicMenuItem {
24 property variant action: menu && menu.action!="" && actionGroup ? actionGroup.action(menu.action) : null
24 property variant action: menu && menu.action!="" && actionGroup ? actionGroup.action(menu.action) : null
25
25
26 color: "#221e1b"
26 color: "#221e1b"
modules/Unity/Indicators/qml/DivMenu.qml → modules/Unity/Indicators/qml/DivMenuItem.qmlrenamed

The content is the same.

modules/Unity/Indicators/qml/IndicatorPage.qml+2−2
@@ -106,7 +106,7 @@ IndicatorBase {
106
106
107 anchors.fill: parent
107 anchors.fill: parent
108
108
109− DivMenu {
109+ DivMenuItem {
110 id: div
110 id: div
111
111
112 anchors.left: parent.left
112 anchors.left: parent.left
@@ -125,7 +125,7 @@ IndicatorBase {
125 }
125 }
126 }
126 }
127
127
128− MenuFactory {
128+ MenuItemFactory {
129 id: factory
129 id: factory
130
130
131 actionGroup: main.actionGroup
131 actionGroup: main.actionGroup
modules/Unity/Indicators/qml/Menu.qml → modules/Unity/Indicators/qml/MenuItem.qmlrenamed+1−1
@@ -21,7 +21,7 @@ import QtQuick 2.0
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22import Ubuntu.Components.ListItems 0.1 as ListItem
22import Ubuntu.Components.ListItems 0.1 as ListItem
23
23
24−BasicMenu {
24+BasicMenuItem {
25 id: __menu
25 id: __menu
26 objectName: menu ? menu.action : ""
26 objectName: menu ? menu.action : ""
27 progression: menu && (menu.linkSubMenu !== undefined)
27 progression: menu && (menu.linkSubMenu !== undefined)
modules/Unity/Indicators/qml/MenuFactory.qml → modules/Unity/Indicators/qml/MenuItemFactory.qmlrenamed+8−9
@@ -56,18 +56,18 @@ Item {
56 "unity.widgets.systemsettings.tablet.accesspoint" : accessPoint,
56 "unity.widgets.systemsettings.tablet.accesspoint" : accessPoint,
57 }
57 }
58
58
59− Component { id: sliderMenu; Indicators.SliderMenu {} }
59+ Component { id: sliderMenu; Indicators.SliderMenuItem {} }
60− Component { id: switchMenu; Indicators.SwitchMenu {} }
60+ Component { id: switchMenu; Indicators.SwitchMenuItem {} }
61− Component { id: buttonMenu; Indicators.ButtonMenu {} }
61+ Component { id: buttonMenu; Indicators.ButtonMenuItem {} }
62− Component { id: divMenu; Indicators.DivMenu {} }
62+ Component { id: divMenu; Indicators.DivMenuItem {} }
63− Component { id: sectionMenu; Indicators.SectionMenu {} }
63+ Component { id: sectionMenu; Indicators.SectionMenuItem {} }
64− Component { id: progressMenu; Indicators.ProgressMenu {} }
64+ Component { id: progressMenu; Indicators.ProgressMenuItem {} }
65− Component { id: messageItem; ICMessaging.MessageItem {} }
65+ Component { id: messageItem; ICMessaging.MessageMenuItem {} }
66 Component { id: snapDecision; ICMessaging.SnapDecision {} }
66 Component { id: snapDecision; ICMessaging.SnapDecision {} }
67 Component { id: groupedMessage; ICMessaging.GroupedMessage {} }
67 Component { id: groupedMessage; ICMessaging.GroupedMessage {} }
68 Component { id: wifiSection; ICNetwork.WifiSection {} }
68 Component { id: wifiSection; ICNetwork.WifiSection {} }
69 Component { id: accessPoint; ICNetwork.AccessPoint {} }
69 Component { id: accessPoint; ICNetwork.AccessPoint {} }
70− Component { id: indicatorMenu; Indicators.Menu {} }
70+ Component { id: indicatorMenu; Indicators.MenuItem {} }
71
71
72 Loader {
72 Loader {
73 id: __loader
73 id: __loader
@@ -93,7 +93,6 @@ Item {
93 return indicatorMenu;
93 return indicatorMenu;
94 }
94 }
95 }
95 }
96− return undefined;
97 }
96 }
98
97
99 onLoaded: {
98 onLoaded: {
modules/Unity/Indicators/qml/ProgressMenu.qml → modules/Unity/Indicators/qml/ProgressMenuItem.qmlrenamed+1−1
@@ -20,7 +20,7 @@
20import QtQuick 2.0
20import QtQuick 2.0
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22
22
23−Menu {
23+MenuItem {
24
24
25 property alias value : progressBar.value
25 property alias value : progressBar.value
26
26
modules/Unity/Indicators/qml/SectionMenu.qml → modules/Unity/Indicators/qml/SectionMenuItem.qmlrenamed+1−1
@@ -21,7 +21,7 @@ import QtQuick 2.0
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22import Ubuntu.Components.ListItems 0.1 as ListItem
22import Ubuntu.Components.ListItems 0.1 as ListItem
23
23
24−BasicMenu {
24+BasicMenuItem {
25 id: __sectionMenu
25 id: __sectionMenu
26
26
27 property string label: menu && menu.label ? menu.label : ""
27 property string label: menu && menu.label ? menu.label : ""
modules/Unity/Indicators/qml/SliderMenu.qml → modules/Unity/Indicators/qml/SliderMenuItem.qmlrenamed+1−1
@@ -20,7 +20,7 @@
20import QtQuick 2.0
20import QtQuick 2.0
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22
22
23−Menu {
23+MenuItem {
24 id: _sliderMenu
24 id: _sliderMenu
25
25
26 property alias minimumValue: slider.minimumValue
26 property alias minimumValue: slider.minimumValue
modules/Unity/Indicators/qml/SwitchMenu.qml → modules/Unity/Indicators/qml/SwitchMenuItem.qmlrenamed+1−1
@@ -20,7 +20,7 @@
20import QtQuick 2.0
20import QtQuick 2.0
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22
22
23−Menu {
23+MenuItem {
24 id: _switchMenu
24 id: _switchMenu
25
25
26 property alias checked: switcher.checked
26 property alias checked: switcher.checked
modules/Unity/Indicators/qml/TextMenu.qml → modules/Unity/Indicators/qml/TextMenuItem.qmlrenamed+1−1
@@ -20,7 +20,7 @@
20import QtQuick 2.0
20import QtQuick 2.0
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22
22
23−Menu {
23+MenuItem {
24 id: _textMenu
24 id: _textMenu
25
25
26 property alias text: _textField.text
26 property alias text: _textField.text
modules/Unity/Indicators/qml/messaging/GroupedMessage.qml+1−1
@@ -22,7 +22,7 @@ import QtQuick 2.0
22import Ubuntu.Components 0.1
22import Ubuntu.Components 0.1
23import Unity.Indicators 0.1 as Indicators
23import Unity.Indicators 0.1 as Indicators
24
24
25−Indicators.BasicMenu {
25+Indicators.BasicMenuItem {
26 property variant action: menu && menu.action!="" && actionGroup ? actionGroup.action(menu.action) : null
26 property variant action: menu && menu.action!="" && actionGroup ? actionGroup.action(menu.action) : null
27 property alias count: label.text
27 property alias count: label.text
28
28
modules/Unity/Indicators/qml/messaging/HeroMessage.qml+1−1
@@ -22,7 +22,7 @@ import QtQuick 2.0
22import Ubuntu.Components 0.1
22import Ubuntu.Components 0.1
23import Unity.Indicators 0.1 as Indicators
23import Unity.Indicators 0.1 as Indicators
24
24
25−Indicators.BasicMenu {
25+Indicators.BasicMenuItem {
26 id: __heroMessage
26 id: __heroMessage
27
27
28 property variant actionsDescription: null
28 property variant actionsDescription: null
modules/Unity/Indicators/qml/messaging/MessageItem.qml → modules/Unity/Indicators/qml/messaging/MessageMenuItem.qmlrenamed+1−1
@@ -22,7 +22,7 @@ import QtQuick 2.0
22import Ubuntu.Components 0.1
22import Ubuntu.Components 0.1
23import Unity.Indicators 0.1 as Indicators
23import Unity.Indicators 0.1 as Indicators
24
24
25−Indicators.BasicMenu {
25+Indicators.BasicMenuItem {
26 id: __messageItem
26 id: __messageItem
27
27
28 property variant actionsDescription: menu ? menu.extra.canonical_message_actions : undefined
28 property variant actionsDescription: menu ? menu.extra.canonical_message_actions : undefined
modules/Unity/Indicators/qml/messaging/qmldir+1−1
@@ -5,7 +5,7 @@ ActionTextField 0.1 ActionTextField.qml
5GroupedMessage 0.1 GroupedMessage.qml
5GroupedMessage 0.1 GroupedMessage.qml
6HeroMessage 0.1 HeroMessage.qml
6HeroMessage 0.1 HeroMessage.qml
7HeroMessageHeader 0.1 HeroMessageHeader.qml
7HeroMessageHeader 0.1 HeroMessageHeader.qml
8−MessageItem 0.1 MessageItem.qml
8+MessageMenuItem 0.1 MessageMenuItem.qml
9QuickReply 0.1 QuickReply.qml
9QuickReply 0.1 QuickReply.qml
10SimpleTextMessage 0.1 SimpleTextMessage.qml
10SimpleTextMessage 0.1 SimpleTextMessage.qml
11SnapDecision 0.1 SnapDecision.qml
11SnapDecision 0.1 SnapDecision.qml
modules/Unity/Indicators/qml/network/AccessPoint.qml+1−1
@@ -22,7 +22,7 @@ import Ubuntu.Components 0.1
22import Ubuntu.Components.ListItems 0.1 as ListItem
22import Ubuntu.Components.ListItems 0.1 as ListItem
23import Unity.Indicators 0.1 as Indicators
23import Unity.Indicators 0.1 as Indicators
24
24
25−Indicators.Menu {
25+Indicators.MenuItem {
26 property variant actionWifiApStrength : menu && actionGroup ? actionGroup.action(menu.extra.canonical_wifi_ap_strength_action) : null
26 property variant actionWifiApStrength : menu && actionGroup ? actionGroup.action(menu.extra.canonical_wifi_ap_strength_action) : null
27 property variant wifiApStrength : actionWifiApStrength && actionWifiApStrength.valid ? actionWifiApStrength.state : "0"
27 property variant wifiApStrength : actionWifiApStrength && actionWifiApStrength.valid ? actionWifiApStrength.state : "0"
28
28
modules/Unity/Indicators/qml/network/PasswordPage.qml+3−3
@@ -37,17 +37,17 @@ Page {
37 right: parent.right
37 right: parent.right
38 }
38 }
39
39
40− Indicators.SectionMenu {
40+ Indicators.SectionMenuItem {
41 label: "Authentication"
41 label: "Authentication"
42 }
42 }
43
43
44− Indicators.TextMenu {
44+ Indicators.TextMenuItem {
45 id: _password
45 id: _password
46
46
47 password: true
47 password: true
48 }
48 }
49
49
50− Indicators.Menu {
50+ Indicators.MenuItem {
51 Row {
51 Row {
52 anchors {
52 anchors {
53 right: parent.right
53 right: parent.right
modules/Unity/Indicators/qml/network/WifiSection.qml+1−1
@@ -21,7 +21,7 @@ import QtQuick 2.0
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22import Unity.Indicators 0.1 as Indicators
22import Unity.Indicators 0.1 as Indicators
23
23
24−Indicators.SectionMenu {
24+Indicators.SectionMenuItem {
25 property variant busyAction : actionGroup ? actionGroup.action(menu.extra.canonical_busy_action) : undefined
25 property variant busyAction : actionGroup ? actionGroup.action(menu.extra.canonical_busy_action) : undefined
26 busy: busyAction && busyAction.valid ? busyAction.state : false
26 busy: busyAction && busyAction.valid ? busyAction.state : false
27}
27}
modules/Unity/Indicators/qml/qmldir+13−14
@@ -1,21 +1,20 @@
1module Unity.Indicators
1module Unity.Indicators
2plugin IndicatorsQml
2plugin IndicatorsQml
3
3
4−IndicatorBase 0.1 IndicatorBase.qml
4+BasicMenuItem 0.1 BasicMenuItem.qml
5−IndicatorWidget 0.1 IndicatorWidget.qml
5+ButtonMenuItem 0.1 ButtonMenuItem.qml
6−IndicatorPage 0.1 IndicatorPage.qml
7−BasicMenu 0.1 BasicMenu.qml
8−ButtonMenu 0.1 ButtonMenu.qml
9DBusActionState 0.1 DBusActionState.qml
6DBusActionState 0.1 DBusActionState.qml
10−DivMenu 0.1 DivMenu.qml
7+DivMenuItem 0.1 DivMenuItem.qml
11−MenuFactory 0.1 MenuFactory.qml
12HLine 0.1 HLine.qml
8HLine 0.1 HLine.qml
13−Menu 0.1 Menu.qml
9+IndicatorBase 0.1 IndicatorBase.qml
14−RemovableMenu 0.1 RemovableMenu.qml
10+IndicatorPage 0.1 IndicatorPage.qml
15−SectionMenu 0.1 SectionMenu.qml
11+IndicatorWidget 0.1 IndicatorWidget.qml
16−SliderMenu 0.1 SliderMenu.qml
12+MenuItem 0.1 MenuItem.qml
17−SwitchMenu 0.1 SwitchMenu.qml
13+MenuItemFactory 0.1 MenuItemFactory.qml
18−TextMenu 0.1 TextMenu.qml
14+ProgressMenuItem 0.1 ProgressMenuItem.qml
19−ProgressMenu 0.1 ProgressMenu.qml
15+SectionMenuItem 0.1 SectionMenuItem.qml
16+SliderMenuItem 0.1 SliderMenuItem.qml
17+SwitchMenuItem 0.1 SwitchMenuItem.qml
18+TextMenuItem 0.1 TextMenuItem.qml
20
19
21internal RemoveBackground RemoveBackground.qml
20internal RemoveBackground RemoveBackground.qml
unity8.qmlproject+1
@@ -18,6 +18,7 @@ Project {
18 /* List of plugin directories passed to QML runtime */
18 /* List of plugin directories passed to QML runtime */
19 importPaths: [
19 importPaths: [
20 "builddir/plugins",
20 "builddir/plugins",
21+ "builddir/modules",
21 "builddir/tests/plugins",
22 "builddir/tests/plugins",
22 "builddir/tests/utils/modules"
23 "builddir/tests/utils/modules"
23 ]
24 ]