← Back to branch summary

~jonas-drange/ubuntu-system-settings/update-cannot-be-ota

« back to all changes in this revision

Viewing changes to plugins/wifi/NetworkDetailsBrief.qml

  • Committer: Bileto Bot
  • Author(s): Ken VanDine
  • Date: 2016-07-22 14:38:13 UTC
  • mfrom: (1556.3.32 slotsLayout)
  • Revision ID: ci-train-bot@canonical.com-20160722143813-ht9e4766lm0ie5fa
Ported to use Slots layout and updated visuals (LP: #1596529)

Approved by: Jonas G. Drange

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/wifi/NetworkDetailsBrief.qml
1
1
/*
2
2
 * This file is part of system-settings
3
3
 *
4
 
 * Copyright (C) 2014 Canonical Ltd.
 
4
 * Copyright (C) 2014-2016 Canonical Ltd.
5
5
 *
6
6
 * Contact: Jonas G. Drange <jonas.drange@canonical.com>
7
7
 *
21
21
import QtQuick 2.4
22
22
import QtQuick.Layouts 1.1
23
23
import SystemSettings 1.0
 
24
import SystemSettings.ListItems 1.0 as SettingsListItems
24
25
import Ubuntu.Components 1.3
25
 
import Ubuntu.Components.ListItems 1.3 as ListItem
26
26
import Ubuntu.SystemSettings.Wifi 1.0
27
27
 
28
28
ItemPage {
48
48
            anchors.left: parent.left
49
49
            anchors.right: parent.right
50
50
 
51
 
            ListItem.Divider {}
52
 
 
53
 
            Button {
54
 
                text : i18n.tr("Forget this network")
55
 
                anchors {
56
 
                    left: parent.left
57
 
                    right: parent.right
58
 
                    margins: units.gu(2)
59
 
                }
60
 
                onClicked: {
61
 
                    if (DbusHelper.forgetActiveDevice()) {
62
 
                        accessPoint.checked = false;
63
 
                        accessPoint.checkedChanged(false)
 
51
            SettingsListItems.SingleControl {
 
52
                Button {
 
53
                    text : i18n.tr("Forget this network")
 
54
                    anchors {
 
55
                        left: parent.left
 
56
                        right: parent.right
 
57
                        margins: units.gu(2)
 
58
                    }
 
59
                    onClicked: {
 
60
                        if (DbusHelper.forgetActiveDevice()) {
 
61
                            accessPoint.checked = false;
 
62
                            accessPoint.checkedChanged(false)
 
63
                        }
64
64
                    }
65
65
                }
66
66
            }
67
67
 
68
 
            ListItem.Standard {
 
68
            SettingsListItems.Standard {
69
69
                text: i18n.tr("IP address")
70
70
                id: addressItem
71
 
                control: TextField {
 
71
 
 
72
                TextField {
72
73
                    text: DbusHelper.wifiIp4Address
73
74
                    readOnly: true
74
75
                    horizontalAlignment: TextInput.AlignRight