git.iko.soy/unity8
on xenial help sign in
fix per review
a408ba2Omer Akram
qml/Wizard/Pages/10-welcome.qml+1−5
compare with xenial
unifiedsplit
@@ -125,16 +125,12 @@ LocalComponents.Page {
125
125
126 delegate: ListItem {
126 delegate: ListItem {
127 id: itemDelegate
127 id: itemDelegate
128− objectName: getObjectName()
128+ objectName: "languageDelegate_" + langLabel.text.toLowerCase().replace(/\s+/g, '_')
129 highlightColor: backgroundColor
129 highlightColor: backgroundColor
130 divider.colorFrom: dividerColor
130 divider.colorFrom: dividerColor
131 divider.colorTo: backgroundColor
131 divider.colorTo: backgroundColor
132 readonly property bool isCurrent: index === ListView.view.currentIndex
132 readonly property bool isCurrent: index === ListView.view.currentIndex
133
133
134− function getObjectName() {
135− return "languageDelegate_" + langLabel.text.toLowerCase().replace(/\s+/g, '_')
136− }
137−
138 Label {
134 Label {
139 id: langLabel
135 id: langLabel
140 text: modelData
136 text: modelData
qml/Wizard/Pages/30-wifi.qml+1−5
@@ -72,7 +72,7 @@ LocalComponents.Page {
72 id: accessPointComponent
72 id: accessPointComponent
73 ListItem {
73 ListItem {
74 id: accessPoint
74 id: accessPoint
75− objectName: getObjectName()
75+ objectName: "accessPoint_" + apName.text.toLowerCase().replace(/\s+/g, '_')
76 highlightColor: backgroundColor
76 highlightColor: backgroundColor
77 enabled: menuData && menuData.sensitive || false
77 enabled: menuData && menuData.sensitive || false
78 divider.colorFrom: dividerColor
78 divider.colorFrom: dividerColor
@@ -93,10 +93,6 @@ LocalComponents.Page {
93 readonly property int signalStrength: strengthAction.valid ? strengthAction.state : 0
93 readonly property int signalStrength: strengthAction.valid ? strengthAction.state : 0
94 property int menuIndex: -1
94 property int menuIndex: -1
95
95
96− function getObjectName() {
97− "accessPoint_" + apName.text.toLowerCase().replace(/\s+/g, '_')
98− }
99−
100 function loadAttributes() {
96 function loadAttributes() {
101 if (!unityMenuModel || menuIndex == -1) return;
97 if (!unityMenuModel || menuIndex == -1) return;
102 unityMenuModel.loadExtendedAttributes(menuIndex, {'x-canonical-wifi-ap-is-adhoc': 'bool',
98 unityMenuModel.loadExtendedAttributes(menuIndex, {'x-canonical-wifi-ap-is-adhoc': 'bool',