a408ba2 · unity8 · git.iko.soy

fix per review

commita408ba2c23ef1f5ce1228bdff15e0279251195ea authorOmer Akram <omer.akram@canonical.com> dateWed 27 Jul 2016, 17:45 (10 years ago) parent9663a4e

2 files changed+2−10

unifiedsplit

qml/Wizard/Pages/10-welcome.qml+1−5

@@ -125,16 +125,12 @@ LocalComponents.Page {

125125

126126 delegate: ListItem {

127127 id: itemDelegate

128− objectName: getObjectName()

128+ objectName: "languageDelegate_" + langLabel.text.toLowerCase().replace(/\s+/g, '_')

129129 highlightColor: backgroundColor

130130 divider.colorFrom: dividerColor

131131 divider.colorTo: backgroundColor

132132 readonly property bool isCurrent: index === ListView.view.currentIndex

133133

134− function getObjectName() {

135− return "languageDelegate_" + langLabel.text.toLowerCase().replace(/\s+/g, '_')

136− }

137−

138134 Label {

139135 id: langLabel

140136 text: modelData

qml/Wizard/Pages/30-wifi.qml+1−5

@@ -72,7 +72,7 @@ LocalComponents.Page {

7272 id: accessPointComponent

7373 ListItem {

7474 id: accessPoint

75− objectName: getObjectName()

75+ objectName: "accessPoint_" + apName.text.toLowerCase().replace(/\s+/g, '_')

7676 highlightColor: backgroundColor

7777 enabled: menuData && menuData.sensitive || false

7878 divider.colorFrom: dividerColor

@@ -93,10 +93,6 @@ LocalComponents.Page {

9393 readonly property int signalStrength: strengthAction.valid ? strengthAction.state : 0

9494 property int menuIndex: -1

9595

96− function getObjectName() {

97− "accessPoint_" + apName.text.toLowerCase().replace(/\s+/g, '_')

98− }

99−

10096 function loadAttributes() {

10197 if (!unityMenuModel || menuIndex == -1) return;

10298 unityMenuModel.loadExtendedAttributes(menuIndex, {'x-canonical-wifi-ap-is-adhoc': 'bool',