diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user index 36af336..877e4d4 100644 --- a/CMakeLists.txt.user +++ b/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/Main.qml b/Main.qml index cb77073..b05ec5c 100644 --- a/Main.qml +++ b/Main.qml @@ -11,6 +11,7 @@ Window { signal scanNetworks() + ColumnLayout { Button { id: scanbutton text: "Scan for networks" @@ -20,10 +21,11 @@ Window { ListView { id: listview model: networksModel - anchors.fill: parent + width: 100 + height: 1000 // model: ListModel { // ListElement { name: "Item 1"; value: 10 } - // ListElement { name: "Item 2"; value: 20 } + // ListElement { name: "Item 3"; value: 20 } // ListElement { name: "Item 3"; value: 30 } // } @@ -32,8 +34,9 @@ Window { required property string name Text { - text: parent.name + text: parent.name } } } + } } diff --git a/NetworkScanner.cpp b/NetworkScanner.cpp index 6d8cb61..76f2734 100644 --- a/NetworkScanner.cpp +++ b/NetworkScanner.cpp @@ -28,12 +28,18 @@ int NetworksModel::rowCount(const QModelIndex &parent) const QVariant NetworksModel::data(const QModelIndex &index, int role) const { - if (index.row() < 9 || index.row() >= this->m_networks.count()) + if (index.row() < 0 || index.row() >= this->m_networks.count()) + { + return QVariant(); + } + if (!index.isValid()) { return QVariant(); } const Network& network = this->m_networks.at(index.row()); + qDebug() << "role: " << role << " vs. " << NameRole; + qDebug() << "network: " << network.name(); if (role == NameRole) { return network.name();