diff options
| -rw-r--r-- | examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/NetworkListView.qml | 2 | ||||
| -rw-r--r-- | src/networksettings/qnetworksettingsservicemodel.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/NetworkListView.qml b/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/NetworkListView.qml index 424ab74..128cff2 100644 --- a/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/NetworkListView.qml +++ b/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/NetworkListView.qml @@ -61,7 +61,7 @@ ListView { font.pixelSize: Globals.subTitleFontSize font.family: Globals.appFont color: connected ? Globals.buttonGreenColor : "white" - text: (entry.type === NetworkSettingsType.Wired) ? entry["name"] + " (" + entry["id"] + ")" : name + text: (type === NetworkSettingsType.Wired) ? name + " (" + entry["id"] + ")" : name } Row { id: ipRow diff --git a/src/networksettings/qnetworksettingsservicemodel.cpp b/src/networksettings/qnetworksettingsservicemodel.cpp index 6ddeb09..0927bcc 100644 --- a/src/networksettings/qnetworksettingsservicemodel.cpp +++ b/src/networksettings/qnetworksettingsservicemodel.cpp @@ -66,6 +66,7 @@ QNetworkSettingsServiceModel::QNetworkSettingsServiceModel(QObject *parent) : QAbstractListModel(parent) { m_roleNames.insert(Qt::UserRole, "entry"); + m_roleNames.insert(Type, "type"); m_roleNames.insert(Name, "name"); m_roleNames.insert(SignalStrength, "signalStrength"); m_roleNames.insert(Connected, "connected"); @@ -108,6 +109,9 @@ QVariant QNetworkSettingsServiceModel::data(const QModelIndex & index, int role) if (role == Qt::UserRole) { return QVariant::fromValue(static_cast<QObject*>(item)); } + else if (role == Type) { + return item->type(); + } else if (role == Name) { return item->name(); } |