git.iko.soy/unity8
on xenial help sign in
Removed _ prefixes.
9fa879eNick Dedekind
modules/Unity/Indicators/Messaging/qml/ActionButton.qml+3−3
compare with xenial
unifiedsplit
@@ -23,7 +23,7 @@ import Ubuntu.Components 0.1
23import Unity.Indicators 0.1 as Indicators
23import Unity.Indicators 0.1 as Indicators
24
24
25Button {
25Button {
26− id: __button
26+ id: button
27 property QtObject actionGroup: null
27 property QtObject actionGroup: null
28 property string action
28 property string action
29
29
@@ -31,8 +31,8 @@ Button {
31
31
32 Indicators.MenuAction {
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
36 }
36 }
37
37
38 onClicked: {
38 onClicked: {
modules/Unity/Indicators/Messaging/qml/ActionTextField.qml+9−9
@@ -22,20 +22,20 @@ import QtQuick 2.0
22import Ubuntu.Components 0.1
22import Ubuntu.Components 0.1
23
23
24Item {
24Item {
25− property alias actionGroup: __sendButton.actionGroup
25+ property alias actionGroup: sendButton.actionGroup
26− property alias action: __sendButton.action
26+ property alias action: sendButton.action
27
27
28− property alias text: __replyField.text
28+ property alias text: replyField.text
29− property alias buttonText: __sendButton.text
29+ property alias buttonText: sendButton.text
30
30
31 TextField {
31 TextField {
32− id: __replyField
32+ id: replyField
33
33
34 anchors {
34 anchors {
35 top: parent.top
35 top: parent.top
36 bottom: parent.bottom
36 bottom: parent.bottom
37 left: parent.left
37 left: parent.left
38− right: __sendButton.left
38+ right: sendButton.left
39 rightMargin: units.gu(1)
39 rightMargin: units.gu(1)
40 }
40 }
41 placeholderText: "Reply"
41 placeholderText: "Reply"
@@ -51,16 +51,16 @@ Item {
51 }
51 }
52
52
53 ActionButton {
53 ActionButton {
54− id: __sendButton
54+ id: sendButton
55
55
56− actionParameter: __replyField.text
56+ actionParameter: replyField.text
57 anchors {
57 anchors {
58 top: parent.top
58 top: parent.top
59 bottom: parent.bottom
59 bottom: parent.bottom
60 right: parent.right
60 right: parent.right
61 }
61 }
62 width: units.gu(9)
62 width: units.gu(9)
63− enabled: __replyField.text !== ""
63+ enabled: replyField.text !== ""
64 color: enabled ? "#c94212" : "#bababa"
64 color: enabled ? "#c94212" : "#bababa"
65 }
65 }
66}
66}
modules/Unity/Indicators/Messaging/qml/GroupedMessage.qml+2−2
@@ -23,7 +23,7 @@ import Ubuntu.Components 0.1
23import Unity.Indicators 0.1 as Indicators
23import Unity.Indicators 0.1 as Indicators
24
24
25Indicators.BasicMenuItem {
25Indicators.BasicMenuItem {
26− id: __groupedMessage
26+ id: groupedMessage
27 property alias count: label.text
27 property alias count: label.text
28
28
29 color: "#221e1b"
29 color: "#221e1b"
@@ -31,7 +31,7 @@ Indicators.BasicMenuItem {
31
31
32 Indicators.MenuAction {
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 : ""
36 }
36 }
37
37
modules/Unity/Indicators/Messaging/qml/HeroMessage.qml+5−5
@@ -23,7 +23,7 @@ import Ubuntu.Components 0.1
23import Unity.Indicators 0.1 as Indicators
23import Unity.Indicators 0.1 as Indicators
24
24
25Indicators.BasicMenuItem {
25Indicators.BasicMenuItem {
26− id: __heroMessage
26+ id: heroMessage
27
27
28 property variant actionsDescription: null
28 property variant actionsDescription: null
29 property alias heroMessageHeader: __heroMessageHeader
29 property alias heroMessageHeader: __heroMessageHeader
@@ -37,7 +37,7 @@ Indicators.BasicMenuItem {
37
37
38 Indicators.MenuAction {
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 : ""
42 }
42 }
43
43
@@ -52,7 +52,7 @@ Indicators.BasicMenuItem {
52 icon: menu && (menu.extra.canonical_app_icon.length > 0) ? "image://gicon/" + encodeURI(menu.extra.canonical_app_icon) : ""
52 icon: menu && (menu.extra.canonical_app_icon.length > 0) ? "image://gicon/" + encodeURI(menu.extra.canonical_app_icon) : ""
53 appIcon: icon
53 appIcon: icon
54
54
55− state: __heroMessage.state
55+ state: heroMessage.state
56
56
57 onAppIconClicked: {
57 onAppIconClicked: {
58 if (menuAction.valid) {
58 if (menuAction.valid) {
@@ -87,9 +87,9 @@ Indicators.BasicMenuItem {
87 when: menuActivated
87 when: menuActivated
88
88
89 PropertyChanges {
89 PropertyChanges {
90− target: __heroMessage
90+ target: heroMessage
91 color: "#333130"
91 color: "#333130"
92− implicitHeight: __heroMessage.expandedHeight
92+ implicitHeight: heroMessage.expandedHeight
93 }
93 }
94 PropertyChanges {
94 PropertyChanges {
95 target: __topHLine
95 target: __topHLine
modules/Unity/Indicators/Messaging/qml/HeroMessageHeader.qml+14−14
@@ -22,22 +22,22 @@ import QtQuick 2.0
22import Ubuntu.Components 0.1
22import Ubuntu.Components 0.1
23
23
24Item {
24Item {
25− id: __heroMessageHeader
25+ id: heroMessageHeader
26
26
27− property alias avatar: __avatarImage.source
27+ property alias avatar: avatarImage.source
28− property alias icon: __iconImage.source
28+ property alias icon: iconImage.source
29− property alias appIcon: __appIconImage.source
29+ property alias appIcon: appIconImage.source
30 property alias titleText: __titleText
30 property alias titleText: __titleText
31 property alias subtitleText: __subtitleText
31 property alias subtitleText: __subtitleText
32 property alias bodyText: __bodyText
32 property alias bodyText: __bodyText
33− property real bodyBottom: __bodyText.y + __bodyText.height
33+ property real bodyBottom: bodyText.y + bodyText.height
34
34
35 signal appIconClicked()
35 signal appIconClicked()
36
36
37 height: units.gu(9)
37 height: units.gu(9)
38
38
39 UbuntuShape {
39 UbuntuShape {
40− id: __avatarImageContainer
40+ id: avatarImageContainer
41 anchors {
41 anchors {
42 top: parent.top
42 top: parent.top
43 topMargin: units.gu(2)
43 topMargin: units.gu(2)
@@ -47,17 +47,17 @@ Item {
47 height: units.gu(6)
47 height: units.gu(6)
48 width: units.gu(6)
48 width: units.gu(6)
49 image: Image {
49 image: Image {
50− id: __avatarImage
50+ id: avatarImage
51 fillMode: Image.PreserveAspectFit
51 fillMode: Image.PreserveAspectFit
52 }
52 }
53 }
53 }
54
54
55 Image {
55 Image {
56− id: __iconImage
56+ id: iconImage
57 anchors {
57 anchors {
58 top: parent.top
58 top: parent.top
59 topMargin: units.gu(2)
59 topMargin: units.gu(2)
60− left: __avatarImageContainer.right
60+ left: avatarImageContainer.right
61 leftMargin: units.gu(1)
61 leftMargin: units.gu(1)
62 }
62 }
63 height: units.gu(1.5)
63 height: units.gu(1.5)
@@ -70,8 +70,8 @@ Item {
70 Label {
70 Label {
71 id: __titleText
71 id: __titleText
72 anchors {
72 anchors {
73− baseline: __iconImage.bottom
73+ baseline: iconImage.bottom
74− left: __iconImage.right
74+ left: iconImage.right
75 leftMargin: units.gu(1)
75 leftMargin: units.gu(1)
76 right: __appIcon.left
76 right: __appIcon.left
77 rightMargin: units.gu(2)
77 rightMargin: units.gu(2)
@@ -120,10 +120,10 @@ Item {
120 right: parent.right
120 right: parent.right
121 }
121 }
122 opacity: 0.0
122 opacity: 0.0
123− enabled: __heroMessageHeader.state === "expanded"
123+ enabled: heroMessageHeader.state === "expanded"
124
124
125 Image {
125 Image {
126− id: __appIconImage
126+ id: appIconImage
127 height: width
127 height: width
128 anchors {
128 anchors {
129 left: parent.left
129 left: parent.left
@@ -138,7 +138,7 @@ Item {
138
138
139 MouseArea {
139 MouseArea {
140 anchors.fill: parent
140 anchors.fill: parent
141− onClicked: __heroMessageHeader.appIconClicked()
141+ onClicked: heroMessageHeader.appIconClicked()
142 }
142 }
143 }
143 }
144
144
modules/Unity/Indicators/Messaging/qml/MessageMenuItem.qml+15−17
@@ -23,50 +23,48 @@ import Ubuntu.Components 0.1
23import Unity.Indicators 0.1 as Indicators
23import Unity.Indicators 0.1 as Indicators
24
24
25Indicators.BasicMenuItem {
25Indicators.BasicMenuItem {
26− id: __messageItem
27−
28 property variant actionsDescription: menu ? menu.extra.canonical_message_actions : undefined
26 property variant actionsDescription: menu ? menu.extra.canonical_message_actions : undefined
29
27
30 onActionGroupChanged: loadItem()
28 onActionGroupChanged: loadItem()
31 onActionsDescriptionChanged: loadItem()
29 onActionsDescriptionChanged: loadItem()
32− implicitHeight: __contents.status == Loader.Ready ? __contents.item.implicitHeight : 0
30+ implicitHeight: contents.status == Loader.Ready ? contents.item.implicitHeight : 0
33
31
34 Loader {
32 Loader {
35− id: __contents
33+ id: contents
36
34
37 anchors.fill: parent
35 anchors.fill: parent
38 // Binding all properties for the item, to make sure that any change in the
36 // Binding all properties for the item, to make sure that any change in the
39− // property will be propagated to the __contents.item at any time
37+ // property will be propagated to the contents.item at any time
40 Binding {
38 Binding {
41− target: __contents.item
39+ target: contents.item
42 property: "menuActivated"
40 property: "menuActivated"
43 value: menuActivated
41 value: menuActivated
44− when: (__contents.status == Loader.Ready)
42+ when: (contents.status == Loader.Ready)
45 }
43 }
46
44
47 Binding {
45 Binding {
48− target: __contents.item
46+ target: contents.item
49 property: "actionGroup"
47 property: "actionGroup"
50 value: actionGroup
48 value: actionGroup
51− when: (__contents.status == Loader.Ready)
49+ when: (contents.status == Loader.Ready)
52 }
50 }
53
51
54 Binding {
52 Binding {
55− target: __contents.item
53+ target: contents.item
56 property: "menu"
54 property: "menu"
57 value: menu
55 value: menu
58− when: (__contents.status == Loader.Ready)
56+ when: (contents.status == Loader.Ready)
59 }
57 }
60
58
61 Binding {
59 Binding {
62− target: __contents.item
60+ target: contents.item
63 property: "actionsDescription"
61 property: "actionsDescription"
64 value: actionsDescription
62 value: actionsDescription
65− when: (__contents.status == Loader.Ready)
63+ when: (contents.status == Loader.Ready)
66 }
64 }
67
65
68 Connections {
66 Connections {
69− target: __contents.item ? __contents.item : null
67+ target: contents.item ? contents.item : null
70 onActivateMenu: activateMenu()
68 onActivateMenu: activateMenu()
71 onDeactivateMenu: deactivateMenu()
69 onDeactivateMenu: deactivateMenu()
72 }
70 }
@@ -86,11 +84,11 @@ Indicators.BasicMenuItem {
86 }
84 }
87
85
88 if (parameterType === "") {
86 if (parameterType === "") {
89− __contents.source = "SimpleTextMessage.qml";
87+ contents.source = "SimpleTextMessage.qml";
90 } else if (parameterType === "s") {
88 } else if (parameterType === "s") {
91− __contents.source = "TextMessage.qml";
89+ contents.source = "TextMessage.qml";
92 } else if (parameterType === "_s") {
90 } else if (parameterType === "_s") {
93− __contents.source = "SnapDecision.qml";
91+ contents.source = "SnapDecision.qml";
94 } else {
92 } else {
95 console.debug("Unknown paramater type: " + parameterType);
93 console.debug("Unknown paramater type: " + parameterType);
96 }
94 }
modules/Unity/Indicators/Messaging/qml/QuickReply.qml+12−12
@@ -23,15 +23,15 @@ import Ubuntu.Components 0.1
23import Unity.Indicators 0.1 as Indicators
23import Unity.Indicators 0.1 as Indicators
24
24
25Item {
25Item {
26− property alias actionGroup: __actionTextField.actionGroup
26+ property alias actionGroup: actionTextField.actionGroup
27− property alias action: __actionTextField.action
27+ property alias action: actionTextField.action
28
28
29− property alias buttonText: __actionTextField.buttonText
29+ property alias buttonText: actionTextField.buttonText
30 property real expandedHeight: childrenRect.height
30 property real expandedHeight: childrenRect.height
31− property alias messages : __messagelistRepeater.model
31+ property alias messages : messagelistRepeater.model
32
32
33 Item {
33 Item {
34− id: __header
34+ id: header
35 anchors.top: parent.top
35 anchors.top: parent.top
36 anchors.left: parent.left
36 anchors.left: parent.left
37 anchors.right: parent.right
37 anchors.right: parent.right
@@ -70,21 +70,21 @@ Item {
70 }
70 }
71
71
72 Column {
72 Column {
73− id: __messagelist
73+ id: messagelist
74 anchors {
74 anchors {
75 left: parent.left
75 left: parent.left
76 right: parent.right
76 right: parent.right
77− top: __header.bottom
77+ top: header.bottom
78 }
78 }
79 height: childrenRect.height
79 height: childrenRect.height
80
80
81 Repeater {
81 Repeater {
82− id: __messagelistRepeater
82+ id: messagelistRepeater
83
83
84 height: childrenRect.height
84 height: childrenRect.height
85
85
86 Rectangle {
86 Rectangle {
87− width: __messagelist.width
87+ width: messagelist.width
88 height: units.gu(5)
88 height: units.gu(5)
89 color: "#333230"
89 color: "#333230"
90
90
@@ -117,7 +117,7 @@ Item {
117
117
118 anchors.fill: parent
118 anchors.fill: parent
119 onClicked: {
119 onClicked: {
120− __actionTextField.text = modelData;
120+ actionTextField.text = modelData;
121 }
121 }
122 }
122 }
123
123
@@ -140,13 +140,13 @@ Item {
140 }
140 }
141
141
142 Item {
142 Item {
143− anchors.top: __messagelist.bottom
143+ anchors.top: messagelist.bottom
144 anchors.left: parent.left
144 anchors.left: parent.left
145 anchors.right: parent.right
145 anchors.right: parent.right
146 height: units.gu(6)
146 height: units.gu(6)
147
147
148 ActionTextField {
148 ActionTextField {
149− id: __actionTextField
149+ id: actionTextField
150
150
151 anchors.fill: parent
151 anchors.fill: parent
152 anchors.margins: units.gu(1)
152 anchors.margins: units.gu(1)
modules/Unity/Indicators/Messaging/qml/SimpleTextMessage.qml+8−8
@@ -25,15 +25,15 @@ import "utils.js" as Utils
25HeroMessage {
25HeroMessage {
26 id: __heroMessage
26 id: __heroMessage
27
27
28− property alias footer: __footer.sourceComponent
28+ property alias footer: footerLoader.sourceComponent
29
29
30− expandedHeight: __fullMessage.y + __fullMessage.height + units.gu(2)
30+ expandedHeight: fullMessage.y + fullMessage.height + units.gu(2)
31 heroMessageHeader.titleText.text: menu ? menu.label : ""
31 heroMessageHeader.titleText.text: menu ? menu.label : ""
32 heroMessageHeader.subtitleText.text: menu ? Utils.formatDate(menu.extra.canonical_time) : ""
32 heroMessageHeader.subtitleText.text: menu ? Utils.formatDate(menu.extra.canonical_time) : ""
33 heroMessageHeader.bodyText.text: menu ? menu.extra.canonical_text : ""
33 heroMessageHeader.bodyText.text: menu ? menu.extra.canonical_text : ""
34
34
35 Item {
35 Item {
36− id: __fullMessage
36+ id: fullMessage
37
37
38 anchors {
38 anchors {
39 left: parent.left
39 left: parent.left
@@ -47,7 +47,7 @@ HeroMessage {
47 enabled: false
47 enabled: false
48
48
49 Label {
49 Label {
50− id: __bodyText
50+ id: bodyText
51 anchors {
51 anchors {
52 top: parent.top
52 top: parent.top
53 left: parent.left
53 left: parent.left
@@ -61,15 +61,15 @@ HeroMessage {
61 }
61 }
62
62
63 Loader {
63 Loader {
64− id: __footer
64+ id: footerLoader
65
65
66 anchors {
66 anchors {
67− top: __bodyText.bottom
67+ top: bodyText.bottom
68 topMargin: units.gu(2)
68 topMargin: units.gu(2)
69 left: parent.left
69 left: parent.left
70 right: parent.right
70 right: parent.right
71 }
71 }
72− height: __footer.item != undefined ? units.gu(4) : 0
72+ height: item != undefined ? units.gu(4) : 0
73 }
73 }
74
74
75 states: State {
75 states: State {
@@ -82,7 +82,7 @@ HeroMessage {
82 }
82 }
83
83
84 PropertyChanges {
84 PropertyChanges {
85− target: __fullMessage
85+ target: fullMessage
86 opacity: 1.0
86 opacity: 1.0
87 enabled: true
87 enabled: true
88 }
88 }
modules/Unity/Indicators/Messaging/qml/SnapDecision.qml+15−15
@@ -24,9 +24,9 @@ import Unity.Indicators 0.1 as Indicators
24import "utils.js" as Utils
24import "utils.js" as Utils
25
25
26HeroMessage {
26HeroMessage {
27− id: __snapDecision
27+ id: snapDecision
28
28
29− expandedHeight: __buttons.y + __buttons.height + __quickreply.height + units.gu(2)
29+ expandedHeight: buttons.y + buttons.height + quickreply.height + units.gu(2)
30 heroMessageHeader.titleText.text: menu ? menu.label : ""
30 heroMessageHeader.titleText.text: menu ? menu.label : ""
31 heroMessageHeader.subtitleText.text: menu ? menu.extra.canonical_text : ""
31 heroMessageHeader.subtitleText.text: menu ? menu.extra.canonical_text : ""
32 heroMessageHeader.subtitleText.color: "#e8e1d0"
32 heroMessageHeader.subtitleText.color: "#e8e1d0"
@@ -34,7 +34,7 @@ HeroMessage {
34 heroMessageHeader.bodyText.color: "#8f8f88"
34 heroMessageHeader.bodyText.color: "#8f8f88"
35
35
36 Item {
36 Item {
37− id: __buttons
37+ id: buttons
38
38
39 anchors.left: parent.left
39 anchors.left: parent.left
40 anchors.leftMargin: units.gu(2)
40 anchors.leftMargin: units.gu(2)
@@ -54,16 +54,16 @@ HeroMessage {
54 width: (parent.width - units.gu(1)) / 2
54 width: (parent.width - units.gu(1)) / 2
55
55
56 onClicked: {
56 onClicked: {
57− if (__quickreply.state === "") {
57+ if (quickreply.state === "") {
58− __quickreply.state = "expanded";
58+ quickreply.state = "expanded";
59 } else {
59 } else {
60− __quickreply.state = "";
60+ quickreply.state = "";
61 }
61 }
62 }
62 }
63 }
63 }
64
64
65 ActionButton {
65 ActionButton {
66− actionGroup: __snapDecision.actionGroup
66+ actionGroup: snapDecision.actionGroup
67 action: actionsDescription[0].name
67 action: actionsDescription[0].name
68
68
69 text: actionsDescription ? actionsDescription[0].label : "Call back"
69 text: actionsDescription ? actionsDescription[0].label : "Call back"
@@ -76,10 +76,10 @@ HeroMessage {
76
76
77 states: State {
77 states: State {
78 name: "expanded"
78 name: "expanded"
79− when: __snapDecision.state === "expanded"
79+ when: snapDecision.state === "expanded"
80
80
81 PropertyChanges {
81 PropertyChanges {
82− target: __buttons
82+ target: buttons
83 opacity: 1.0
83 opacity: 1.0
84 }
84 }
85 }
85 }
@@ -93,15 +93,15 @@ HeroMessage {
93 }
93 }
94
94
95 QuickReply {
95 QuickReply {
96− id: __quickreply
96+ id: quickreply
97
97
98− actionGroup: __snapDecision.actionGroup
98+ actionGroup: snapDecision.actionGroup
99 action: actionsDescription[1].name
99 action: actionsDescription[1].name
100
100
101 messages: actionsDescription ? actionsDescription[1]["parameter-hint"] : ""
101 messages: actionsDescription ? actionsDescription[1]["parameter-hint"] : ""
102 buttonText: actionsDescription ? actionsDescription[1].label : "send"
102 buttonText: actionsDescription ? actionsDescription[1].label : "send"
103 anchors {
103 anchors {
104− top: __buttons.bottom
104+ top: buttons.bottom
105 topMargin: units.gu(2)
105 topMargin: units.gu(2)
106 left: parent.left
106 left: parent.left
107 right: parent.right
107 right: parent.right
@@ -114,13 +114,13 @@ HeroMessage {
114 name: "expanded"
114 name: "expanded"
115
115
116 PropertyChanges {
116 PropertyChanges {
117− target: __quickreply
117+ target: quickreply
118 height: expandedHeight
118 height: expandedHeight
119 opacity: 1.0
119 opacity: 1.0
120 }
120 }
121
121
122 PropertyChanges {
122 PropertyChanges {
123− target: __quickreply
123+ target: quickreply
124 enabled: true
124 enabled: true
125 }
125 }
126 }
126 }
@@ -136,7 +136,7 @@ HeroMessage {
136
136
137 onStateChanged: {
137 onStateChanged: {
138 if (state === "") {
138 if (state === "") {
139− __quickreply.state = "";
139+ quickreply.state = "";
140 }
140 }
141 }
141 }
142}
142}
modules/Unity/Indicators/Messaging/qml/TextMessage.qml+2−2
@@ -23,11 +23,11 @@ import Ubuntu.Components 0.1
23import Unity.Indicators 0.1 as Indicators
23import Unity.Indicators 0.1 as Indicators
24
24
25SimpleTextMessage {
25SimpleTextMessage {
26− id: __simpleMessage
26+ id: simpleMessage
27
27
28 footer: ActionTextField {
28 footer: ActionTextField {
29 anchors.fill: parent
29 anchors.fill: parent
30− actionGroup: __simpleMessage.actionGroup
30+ actionGroup: simpleMessage.actionGroup
31 action: actionsDescription[0].name
31 action: actionsDescription[0].name
32
32
33 buttonText: actionsDescription ? actionsDescription[0].label : "Send"
33 buttonText: actionsDescription ? actionsDescription[0].label : "Send"
modules/Unity/Indicators/Network/qml/AccessPoint.qml+2−2
@@ -23,7 +23,7 @@ import Ubuntu.Components.ListItems 0.1 as ListItem
23import Unity.Indicators 0.1 as Indicators
23import Unity.Indicators 0.1 as Indicators
24
24
25Indicators.MenuItem {
25Indicators.MenuItem {
26− id: _accessPoint
26+ id: accessPoint
27 property variant actionWifiApStrength : menu && actionGroup ? actionGroup.action(menu.extra.canonical_wifi_ap_strength_action) : null
27 property variant actionWifiApStrength : menu && actionGroup ? actionGroup.action(menu.extra.canonical_wifi_ap_strength_action) : null
28 property variant wifiApStrength : actionWifiApStrength && actionWifiApStrength.valid ? actionWifiApStrength.state : "0"
28 property variant wifiApStrength : actionWifiApStrength && actionWifiApStrength.valid ? actionWifiApStrength.state : "0"
29
29
@@ -60,7 +60,7 @@ Indicators.MenuItem {
60 }
60 }
61
61
62 Indicators.MenuActionBinding {
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
66 property: "checked"
66 property: "checked"
modules/Unity/Indicators/Network/qml/WifiSection.qml+2−2
@@ -22,11 +22,11 @@ import Ubuntu.Components 0.1
22import Unity.Indicators 0.1 as Indicators
22import Unity.Indicators 0.1 as Indicators
23
23
24Indicators.SectionMenuItem {
24Indicators.SectionMenuItem {
25− id: __wifiSectionMenu
25+ id: wifiSectionMenu
26
26
27 Indicators.MenuAction {
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 : ""
31 }
31 }
32
32
modules/Unity/Indicators/qml/BasicMenuItem.qml+4−4
@@ -21,12 +21,12 @@ import QtQuick 2.0
21import Ubuntu.Components.ListItems 0.1 as ListItem
21import Ubuntu.Components.ListItems 0.1 as ListItem
22
22
23ListItem.Standard {
23ListItem.Standard {
24− id: _priv
24+ id: stdListItem
25
25
26 property bool menuActivated: false
26 property bool menuActivated: false
27 property QtObject menu
27 property QtObject menu
28 property QtObject actionGroup
28 property QtObject actionGroup
29− property alias color: __bg.color
29+ property alias color: background.color
30
30
31 signal activateMenu()
31 signal activateMenu()
32 signal deactivateMenu()
32 signal deactivateMenu()
@@ -35,11 +35,11 @@ ListItem.Standard {
35 __foregroundColor: "#e8e1d0"
35 __foregroundColor: "#e8e1d0"
36
36
37 backgroundIndicator: RemoveBackground {
37 backgroundIndicator: RemoveBackground {
38− state: _priv.swipingState
38+ state: stdListItem.swipingState
39 }
39 }
40
40
41 Rectangle {
41 Rectangle {
42− id: __bg
42+ id: background
43
43
44 anchors.fill: parent
44 anchors.fill: parent
45 color: "#221e1c"
45 color: "#221e1c"
modules/Unity/Indicators/qml/ButtonMenuItem.qml+2−2
@@ -21,7 +21,7 @@ import QtQuick 2.0
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22
22
23BasicMenuItem {
23BasicMenuItem {
24− id: _buttonMenu
24+ id: buttonMenu
25 color: "#221e1b"
25 color: "#221e1b"
26 implicitHeight: units.gu(7)
26 implicitHeight: units.gu(7)
27
27
@@ -41,7 +41,7 @@ BasicMenuItem {
41
41
42 MenuAction {
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 : ""
46 }
46 }
47}
47}
modules/Unity/Indicators/qml/MenuItem.qml−1
@@ -22,7 +22,6 @@ import Ubuntu.Components 0.1
22import Ubuntu.Components.ListItems 0.1 as ListItem
22import Ubuntu.Components.ListItems 0.1 as ListItem
23
23
24BasicMenuItem {
24BasicMenuItem {
25− id: __menu
26 objectName: menu ? menu.action : ""
25 objectName: menu ? menu.action : ""
27 progression: menu && (menu.linkSubMenu !== undefined)
26 progression: menu && (menu.linkSubMenu !== undefined)
28 text: menu && menu.label ? menu.label : ""
27 text: menu && menu.label ? menu.label : ""
modules/Unity/Indicators/qml/MenuItemFactory.qml+10−10
@@ -23,15 +23,15 @@ import Unity.Indicators.Messaging 0.1 as ICMessaging
23import Unity.Indicators.Network 0.1 as ICNetwork
23import Unity.Indicators.Network 0.1 as ICNetwork
24
24
25Item {
25Item {
26− id: __menuFactory
26+ id: menuFactory
27
27
28 property QtObject menu
28 property QtObject menu
29 property QtObject listView
29 property QtObject listView
30 property QtObject actionGroup
30 property QtObject actionGroup
31 property bool isCurrentItem
31 property bool isCurrentItem
32− readonly property bool empty: (__loader.item !== undefined && __loader.status == Loader.Ready) ? __loader.item.state === "EMPTY" : true
32+ readonly property bool empty: (loader.item !== undefined && loader.status == Loader.Ready) ? loader.item.state === "EMPTY" : true
33
33
34− implicitHeight: __loader.height
34+ implicitHeight: loader.height
35
35
36 signal activated()
36 signal activated()
37 signal deactivated()
37 signal deactivated()
@@ -70,7 +70,7 @@ Item {
70 Component { id: indicatorMenu; Indicators.MenuItem {} }
70 Component { id: indicatorMenu; Indicators.MenuItem {} }
71
71
72 Loader {
72 Loader {
73− id: __loader
73+ id: loader
74 asynchronous: true
74 asynchronous: true
75
75
76 anchors {
76 anchors {
@@ -79,11 +79,11 @@ Item {
79 }
79 }
80
80
81 sourceComponent: {
81 sourceComponent: {
82− if (!__menuFactory.menu || !__menuFactory.menu.extra) {
82+ if (!menuFactory.menu || !menuFactory.menu.extra) {
83 return undefined;
83 return undefined;
84 }
84 }
85
85
86− var widgetType = __menuFactory.menu.extra.canonical_type;
86+ var widgetType = menuFactory.menu.extra.canonical_type;
87 if (widgetType) {
87 if (widgetType) {
88 return _map[widgetType];
88 return _map[widgetType];
89 } else {
89 } else {
@@ -100,11 +100,11 @@ Item {
100
100
101 onLoaded: {
101 onLoaded: {
102 item.menuActivated = Qt.binding(function() { return isCurrentItem; });
102 item.menuActivated = Qt.binding(function() { return isCurrentItem; });
103− item.actionGroup = Qt.binding(function() { return __menuFactory.actionGroup; });
103+ item.actionGroup = Qt.binding(function() { return menuFactory.actionGroup; });
104− item.menu = Qt.binding(function() { return __menuFactory.menu; });
104+ item.menu = Qt.binding(function() { return menuFactory.menu; });
105
105
106− item.activateMenu.connect(function() { __menuFactory.activated(); });
106+ item.activateMenu.connect(function() { menuFactory.activated(); });
107− item.deactivateMenu.connect(function() { __menuFactory.deactivated(); });
107+ item.deactivateMenu.connect(function() { menuFactory.deactivated(); });
108 }
108 }
109 }
109 }
110}
110}
modules/Unity/Indicators/qml/ProgressMenuItem.qml+3−3
@@ -21,7 +21,7 @@ import QtQuick 2.0
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22
22
23MenuItem {
23MenuItem {
24− id: _progressMenu
24+ id: progressMenu
25 property alias value : progressBar.value
25 property alias value : progressBar.value
26
26
27 // TODO: Replace this with the official ProgressBar component as soon as
27 // TODO: Replace this with the official ProgressBar component as soon as
@@ -36,7 +36,7 @@ MenuItem {
36 }
36 }
37 height: units.gu(4)
37 height: units.gu(4)
38 anchors.verticalCenter: parent.verticalCenter
38 anchors.verticalCenter: parent.verticalCenter
39− color: "#00000000"
39+ color: "transparent"
40
40
41 property int minimumValue: 0
41 property int minimumValue: 0
42 property int maximumValue: 100
42 property int maximumValue: 100
@@ -57,7 +57,7 @@ MenuItem {
57 }
57 }
58
58
59 MenuActionBinding {
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
63 property: "value"
63 property: "value"
modules/Unity/Indicators/qml/RemoveBackground.qml+5−9
@@ -18,14 +18,10 @@ import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19
19
20Rectangle {
20Rectangle {
21− id: __backgroundItem
22−
23 anchors.fill: parent
21 anchors.fill: parent
24 color: "#333130"
22 color: "#333130"
25 Label {
23 Label {
26− id: __backgroundText
24+ id: backgroundText
27−
28− property int slidingMargin: units.gu(3)
29
25
30 anchors.fill: parent
26 anchors.fill: parent
31 verticalAlignment: Text.AlignVCenter
27 verticalAlignment: Text.AlignVCenter
@@ -39,8 +35,8 @@ Rectangle {
39 State {
35 State {
40 name: "SwipingRight"
36 name: "SwipingRight"
41 PropertyChanges {
37 PropertyChanges {
42− target: __backgroundText
38+ target: backgroundText
43− anchors.rightMargin: __backgroundText.slidingMargin
39+ anchors.rightMargin: units.gu(3)
44 anchors.leftMargin: 0
40 anchors.leftMargin: 0
45 horizontalAlignment: Text.AlignRight
41 horizontalAlignment: Text.AlignRight
46
42
@@ -49,9 +45,9 @@ Rectangle {
49 State {
45 State {
50 name: "SwipingLeft"
46 name: "SwipingLeft"
51 PropertyChanges {
47 PropertyChanges {
52− target: __backgroundText
48+ target: backgroundText
53 anchors.rightMargin: 0
49 anchors.rightMargin: 0
54− anchors.leftMargin: __backgroundText.slidingMargin
50+ anchors.leftMargin: units.gu(3)
55 horizontalAlignment: Text.AlignLeft
51 horizontalAlignment: Text.AlignLeft
56 }
52 }
57 }
53 }
modules/Unity/Indicators/qml/SectionMenuItem.qml−6
@@ -22,17 +22,11 @@ import Ubuntu.Components 0.1
22import Ubuntu.Components.ListItems 0.1 as ListItem
22import Ubuntu.Components.ListItems 0.1 as ListItem
23
23
24BasicMenuItem {
24BasicMenuItem {
25− id: __sectionMenu
26−
27 property string label: menu && menu.label ? menu.label : ""
25 property string label: menu && menu.label ? menu.label : ""
28 property bool busy: false
26 property bool busy: false
29 property int count: menu && menu.linkSection ? menu.linkSection.count : 0
27 property int count: menu && menu.linkSection ? menu.linkSection.count : 0
30
28
31 color: "#221e1b"
29 color: "#221e1b"
32− anchors {
33− left: parent ? parent.left : undefined
34− right: parent ? parent.right : undefined
35− }
36 implicitHeight: label !== "" ? __header.height : 0
30 implicitHeight: label !== "" ? __header.height : 0
37 state: count === 0 ? "EMPTY" : ""
31 state: count === 0 ? "EMPTY" : ""
38
32
modules/Unity/Indicators/qml/SwitchMenuItem.qml+2−2
@@ -21,7 +21,7 @@ import QtQuick 2.0
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22
22
23MenuItem {
23MenuItem {
24− id: _switchMenu
24+ id: switchMenu
25
25
26 property alias checked: switcher.checked
26 property alias checked: switcher.checked
27
27
@@ -35,7 +35,7 @@ MenuItem {
35
35
36 MenuActionBinding {
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 : ""
40 target: switcher
40 target: switcher
41 property: "checked"
41 property: "checked"
modules/Unity/Indicators/qml/TextMenuItem.qml+8−8
@@ -21,10 +21,10 @@ import QtQuick 2.0
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22
22
23MenuItem {
23MenuItem {
24− id: _textMenu
24+ id: textMenu
25
25
26− property alias text: _textField.text
26+ property alias text: textField.text
27− property alias password: _showPassword.visible
27+ property alias password: showPassword.visible
28
28
29 implicitHeight: password ? units.gu(10) : units.gu(7)
29 implicitHeight: password ? units.gu(10) : units.gu(7)
30
30
@@ -39,7 +39,7 @@ MenuItem {
39 }
39 }
40
40
41 TextField {
41 TextField {
42− id: _textField
42+ id: textField
43
43
44 anchors {
44 anchors {
45 left: parent.left
45 left: parent.left
@@ -47,11 +47,11 @@ MenuItem {
47 }
47 }
48
48
49 placeholderText: "Password"
49 placeholderText: "Password"
50− echoMode: _textMenu.password && !_checkBox.checked ? TextInput.Password : TextInput.Normal
50+ echoMode: textMenu.password && !_checkBox.checked ? TextInput.Password : TextInput.Normal
51 }
51 }
52
52
53 Row {
53 Row {
54− id: _showPassword
54+ id: showPassword
55
55
56 visible: false
56 visible: false
57 anchors {
57 anchors {
@@ -74,9 +74,9 @@ MenuItem {
74 }
74 }
75
75
76 MenuActionBinding {
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
80 property: "text"
80 property: "text"
81 }
81 }
82}
82}