git.iko.soy/unity8
on xenial help sign in
simplify
82af3b4Lukáš Tinkl
qml/Wizard/Pages/30-wifi.qml+2−5
compare with xenial
unifiedsplit
@@ -97,14 +97,12 @@ LocalComponents.Page {
97 'x-canonical-wifi-ap-strength-action': 'string'});
97 'x-canonical-wifi-ap-strength-action': 'string'});
98 }
98 }
99
99
100− signal activate()
101−
102 text: menuData && menuData.label || ""
100 text: menuData && menuData.label || ""
103 enabled: menuData && menuData.sensitive && !enterprise || false
101 enabled: menuData && menuData.sensitive && !enterprise || false
104 __foregroundColor: textColor
102 __foregroundColor: textColor
105 showDivider: true
103 showDivider: true
106 iconName: {
104 iconName: {
107− var imageName = "nm-signal-100";
105+ var imageName = "nm-no-connection";
108
106
109 if (adHoc) {
107 if (adHoc) {
110 imageName = "nm-adhoc";
108 imageName = "nm-adhoc";
@@ -126,7 +124,7 @@ LocalComponents.Page {
126 return imageName;
124 return imageName;
127 }
125 }
128 iconFrame: false
126 iconFrame: false
129− onClicked: accessPoint.activate();
127+ onClicked: unityMenuModel.activate(menuIndex);
130
128
131 Component.onCompleted: {
129 Component.onCompleted: {
132 loadAttributes();
130 loadAttributes();
@@ -137,7 +135,6 @@ LocalComponents.Page {
137 onMenuIndexChanged: {
135 onMenuIndexChanged: {
138 loadAttributes();
136 loadAttributes();
139 }
137 }
140− onActivate: unityMenuModel.activate(menuIndex);
141 }
138 }
142 }
139 }
143
140