1
=== modified file 'po/it.po'
2
--- po/it.po	2014-09-03 07:03:52 +0000
3
+++ po/it.po	2014-09-03 09:51:49 +0000
4
@@ -1748,8 +1748,8 @@
5
1748
msgstr "Sistema"
1748
msgstr "Sistema"
6
1749
1749
7
1750
#: ../wizard/qml/Pages//20-wifi.qml:27
1750
#: ../wizard/qml/Pages//20-wifi.qml:27
10
1751
msgid "Connect to Wi-Fi"
1751
msgid "Connect to Wi‑Fi"
11
1752
msgstr "Connetti alla rete Wi-Fi"
1752
msgstr "Connetti alla rete Wi‑Fi"
12
1753
1753
13
1754
#: ../wizard/qml/Pages//20-wifi.qml:66
1754
#: ../wizard/qml/Pages//20-wifi.qml:66
14
1755
msgid "Available networks"
1755
msgid "Available networks"
15
1756
1756
16
=== modified file 'wizard/qml/Components/Page.qml'
17
--- wizard/qml/Components/Page.qml	2014-08-26 21:19:55 +0000
18
+++ wizard/qml/Components/Page.qml	2014-09-03 09:51:49 +0000
19
@@ -25,7 +25,7 @@
20
25
    readonly property real topMargin: units.gu(8)
25
    readonly property real topMargin: units.gu(8)
21
26
    readonly property real leftMargin: units.gu(2)
26
    readonly property real leftMargin: units.gu(2)
22
27
    readonly property real rightMargin: units.gu(2)
27
    readonly property real rightMargin: units.gu(2)
24
28
    readonly property real bottomMargin: backButton.height + buttonMargin * 3
28
    readonly property real bottomMargin: backButton.height + buttonMargin * 2
25
29
29
26
30
    property bool hasBackButton: true
30
    property bool hasBackButton: true
27
31
    property bool customBack: false
31
    property bool customBack: false
28
32
32
29
=== modified file 'wizard/qml/Pages/20-wifi.qml'
30
--- wizard/qml/Pages/20-wifi.qml	2014-08-26 21:19:55 +0000
31
+++ wizard/qml/Pages/20-wifi.qml	2014-09-03 09:51:49 +0000
32
@@ -17,14 +17,14 @@
33
17
import QtQuick 2.0
17
import QtQuick 2.0
34
18
import QMenuModel 0.1 as QMenuModel
18
import QMenuModel 0.1 as QMenuModel
35
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 0.1
37
20
import Ubuntu.SystemSettings.Wifi 1.0
20
import Ubuntu.Components.ListItems 0.1 as ListItem
38
21
import Ubuntu.SystemSettings.Wizard.Utils 0.1
21
import Ubuntu.SystemSettings.Wizard.Utils 0.1
39
22
import Ubuntu.Settings.Menus 0.1 as Menus
22
import Ubuntu.Settings.Menus 0.1 as Menus
40
23
import "../Components" as LocalComponents
23
import "../Components" as LocalComponents
41
24
24
42
25
LocalComponents.Page {
25
LocalComponents.Page {
43
26
    id: wifiPage
26
    id: wifiPage
45
27
    title: i18n.tr("Connect to Wi-Fi")
27
    title: i18n.tr("Connect to Wi‑Fi")
46
28
    forwardButtonSourceComponent: forwardButton
28
    forwardButtonSourceComponent: forwardButton
47
29
29
48
30
    readonly property bool connected: mainMenu.connectedAPs === 1
30
    readonly property bool connected: mainMenu.connectedAPs === 1
49
@@ -36,15 +36,95 @@
50
36
        return defaultValue;
36
        return defaultValue;
51
37
    }
37
    }
52
38
38
54
39
    SortFilterProxyModel {
39
    QMenuModel.UnityMenuModel {
55
40
        id: menuModel
40
        id: menuModel
63
41
        filterRole: 5 // UnityMenuModel.TypeRole should really be exported from unitymenumodel
41
        busName: "com.canonical.indicator.network"
64
42
        filterRegExp: RegExp("unity.widgets.systemsettings.tablet.accesspoint")
42
        actions: { "indicator": "/com/canonical/indicator/network" }
65
43
        model: QMenuModel.UnityMenuModel {
43
        menuObjectPath: "/com/canonical/indicator/network/phone_wifi_settings"
66
44
            id: unitymenumodel
44
    }
67
45
            busName: "com.canonical.indicator.network"
45
68
46
            actions: { "indicator": "/com/canonical/indicator/network" }
46
    Component {
69
47
            menuObjectPath: "/com/canonical/indicator/network/phone_wifi_settings"
47
        id: accessPointComponent
70
48
        ListItem.Standard {
71
49
            id: accessPoint
72
50
            objectName: "accessPoint"
73
51
74
52
            property QtObject menuData: null
75
53
            property var unityMenuModel: menuModel
76
54
            property var extendedData: menuData && menuData.ext || undefined
77
55
            property var strengthAction: QMenuModel.UnityMenuAction {
78
56
                model: unityMenuModel
79
57
                index: menuIndex
80
58
                name: getExtendedProperty(extendedData, "xCanonicalWifiApStrengthAction", "")
81
59
            }
82
60
            property bool checked: menuData && menuData.isToggled || false
83
61
            property bool secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
84
62
            property bool adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
85
63
            property int signalStrength: strengthAction.valid ? strengthAction.state : 0
86
64
            property int menuIndex: -1
87
65
88
66
            function loadAttributes() {
89
67
                if (!unityMenuModel || menuIndex == -1) return;
90
68
                unityMenuModel.loadExtendedAttributes(menuIndex, {'x-canonical-wifi-ap-is-adhoc': 'bool',
91
69
                                                                  'x-canonical-wifi-ap-is-secure': 'bool',
92
70
                                                                  'x-canonical-wifi-ap-strength-action': 'string'});
93
71
            }
94
72
95
73
            signal activate()
96
74
97
75
            text: menuData && menuData.label || ""
98
76
            enabled: menuData && menuData.sensitive || false
99
77
            iconName: {
100
78
                var imageName = "nm-signal-100";
101
79
102
80
                if (adHoc) {
103
81
                    imageName = "nm-adhoc";
104
82
                } else if (signalStrength == 0) {
105
83
                    imageName = "nm-signal-00";
106
84
                } else if (signalStrength <= 25) {
107
85
                    imageName = "nm-signal-25";
108
86
                } else if (signalStrength <= 50) {
109
87
                    imageName = "nm-signal-50";
110
88
                } else if (signalStrength <= 75) {
111
89
                    imageName = "nm-signal-75";
112
90
                }
113
91
114
92
                if (secure) {
115
93
                    imageName += "-secure";
116
94
                }
117
95
                return imageName;
118
96
            }
119
97
            iconFrame: false
120
98
            control: CheckBox {
121
99
                id: checkBoxActive
122
100
123
101
                onClicked: {
124
102
                    accessPoint.activate();
125
103
                }
126
104
            }
127
105
            style: Rectangle {
128
106
                color: "#4c000000"
129
107
            }
130
108
131
109
            Component.onCompleted: {
132
110
                loadAttributes();
133
111
            }
134
112
            onUnityMenuModelChanged: {
135
113
                loadAttributes();
136
114
            }
137
115
            onMenuIndexChanged: {
138
116
                loadAttributes();
139
117
            }
140
118
            onCheckedChanged: {
141
119
                // Can't rely on binding. Checked is assigned on click.
142
120
                checkBoxActive.checked = checked;
143
121
                if (checked) {
144
122
                    mainMenu.connectedAPs++
145
123
                } else {
146
124
                    mainMenu.connectedAPs--
147
125
                }
148
126
            }
149
127
            onActivate: unityMenuModel.activate(menuIndex);
150
48
        }
128
        }
151
49
    }
129
    }
152
50
130
153
@@ -66,76 +146,45 @@
154
66
            text: i18n.tr("Available networks")
146
            text: i18n.tr("Available networks")
155
67
        }
147
        }
156
68
148
163
69
        ListView {
149
        Flickable {
164
70
            id: mainMenu
150
            anchors.left: parent.left
165
71
151
            anchors.right: parent.right
160
72
            property int connectedAPs: 0
161
73
162
74
            model: menuModel
166
75
            height: column.height - label.height - column.spacing
152
            height: column.height - label.height - column.spacing
169
76
            anchors.left: parent.left
153
            contentHeight: contentItem.childrenRect.height
168
77
            anchors.right: parent.right
170
78
            clip: true
154
            clip: true
213
79
155
            flickDeceleration: 1500 * units.gridUnit / 8
214
80
            // Ensure all delegates are cached in order to improve smoothness of scrolling
156
            maximumFlickVelocity: 2500 * units.gridUnit / 8
215
81
            cacheBuffer: 10000
157
            boundsBehavior: (contentHeight > height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
216
82
158
217
83
            // Only allow flicking if the content doesn't fit on the page
159
            Column {
218
84
            boundsBehavior: (contentHeight > mainMenu.height) ?
160
                anchors.left: parent.left
219
85
                                Flickable.DragAndOvershootBounds :
161
                anchors.right: parent.right
220
86
                                Flickable.StopAtBounds
162
221
87
163
                Repeater {
222
88
            currentIndex: -1
164
                    id: mainMenu
223
89
            delegate: Menus.AccessPointMenu {
165
224
90
                id: menuDelegate
166
                    // FIXME Check connection better https://bugs.launchpad.net/indicator-network/+bug/1349371
225
91
167
                    property int connectedAPs: 0
226
92
                property int menuIndex: menuModel.mapRowToSource(index)
168
227
93
                property var extendedData: model.ext
169
                    model: menuModel
228
94
                property var serverToggle: model.isToggled
170
229
95
                property var strengthAction: QMenuModel.UnityMenuAction {
171
                    delegate: Loader {
230
96
                    model: unitymenumodel
172
                        id: loader
231
97
                    index: menuIndex
173
232
98
                    name: getExtendedProperty(extendedData, "xCanonicalWifiApStrengthAction", "")
174
                        readonly property bool isAccessPoint: model.type === "unity.widgets.systemsettings.tablet.accesspoint"
233
99
                }
175
234
100
176
                        anchors.left: parent.left
235
101
                anchors {
177
                        anchors.right: parent.right
236
102
                    left: parent.left
178
                        height: isAccessPoint ? units.gu(6) : 0
237
103
                    right: parent.right
179
                        asynchronous: true
238
104
                }
180
                        sourceComponent: isAccessPoint ? accessPointComponent : null
239
105
                text: model.label
181
240
106
                enabled: model.sensitive
182
                        onLoaded: {
241
107
                secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
183
                            item.menuData = Qt.binding(function() { return model; });
242
108
                adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
184
                            item.menuIndex = Qt.binding(function() { return index; });
243
109
                signalStrength: strengthAction.valid ? strengthAction.state : 0
185
                        }
202
110
203
111
                style: Rectangle {
204
112
                    color: "black"
205
113
                    opacity: 0.3
206
114
                }
207
115
208
116
                onCheckedChanged: {
209
117
                    if (checked) {
210
118
                        mainMenu.connectedAPs++
211
119
                    } else {
212
120
                        mainMenu.connectedAPs--
244
121
                    }
186
                    }
245
122
                }
187
                }
246
123
                onMenuIndexChanged: {
247
124
                    loadAttributes();
248
125
                }
249
126
                onServerToggleChanged: {
250
127
                    checked = serverToggle;
251
128
                }
252
129
                onTriggered: {
253
130
                    unitymenumodel.activate(menuIndex);
254
131
                }
255
132
256
133
                function loadAttributes() {
257
134
                    if (!unitymenumodel || menuIndex == -1) return;
258
135
                    unitymenumodel.loadExtendedAttributes(menuIndex, {'x-canonical-wifi-ap-is-adhoc': 'bool',
259
136
                                                                      'x-canonical-wifi-ap-is-secure': 'bool',
260
137
                                                                      'x-canonical-wifi-ap-strength-action': 'string'});
261
138
                }
262
139
            }
188
            }
263
140
        }
189
        }
264
141
    }
190
    }
265
142
191
266
=== modified file 'wizard/qml/main.qml'
267
--- wizard/qml/main.qml	2014-08-26 21:19:55 +0000
268
+++ wizard/qml/main.qml	2014-09-03 09:51:49 +0000
269
@@ -108,6 +108,17 @@
270
108
        }
108
        }
271
109
    }
109
    }
272
110
110
273
111
    Rectangle {
274
112
        id: modalNotificationBackground
275
113
        visible: notifications.useModal && (notifications.state == "narrow")
276
114
        anchors.fill: parent
277
115
        color: "#80000000"
278
116
279
117
        MouseArea {
280
118
            anchors.fill: parent
281
119
        }
282
120
    }
283
121
284
111
    InputMethod {
122
    InputMethod {
285
112
        anchors.fill: parent
123
        anchors.fill: parent
286
113
    }
124
    }
Reviewer	Review Type	Date Requested	Status
Michael Terry (community)		2014-09-02	Approve on 2014-09-03
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-09-03
Review via email: mp+233071@code.launchpad.net