Make BCNM check actually work; Update README deps; Fix NSWP

4 files changed, 23 insertions, 6 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc07267..0600bbf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,7 +69,10 @@ IF(INSTALL)
     pkg_check_modules(BLKID REQUIRED blkid)
     pkg_check_modules(LIBUDEV REQUIRED libudev)
     pkg_check_modules(PARTED REQUIRED libparted)
-    find_library(BCNM_LIBRARY REQUIRED wpactrl PATH_SUFFIXES bcnm)
+    find_library(BCNM NAMES wpactrl PATH_SUFFIXES bcnm)
+    if(BCNM STREQUAL "BCNM-NOTFOUND")
+        message(FATAL_ERROR "BCNM is required for the Installation Environment.")
+    endif()
     set(BUILD_SHARED_LIBS ON)
 
     add_subdirectory(executor)
diff --git a/README.rst b/README.rst
index 6cd0ab3..59a8cc0 100644
--- a/README.rst
+++ b/README.rst
@@ -88,7 +88,7 @@ Build Requirements
 
 To build the entirety of Project Horizon, you will need:
 
-* Qt 5 (Core; Widgets) (qt5-qtbase-dev)
+* Qt 5 (Core; Network; Widgets) (qt5-qtbase-dev)
 
 * GNU Parted development files (parted-dev)
 
@@ -96,11 +96,22 @@ To build the entirety of Project Horizon, you will need:
 
 * BCNM
 
+* cURL development files (curl-dev)
+
 * Either a C++17 environment, or Boost.Filesystem (boost-dev)
 
   Horizon makes full use of the C++17 <filesystem> library if it is
   available, but will fall back to requiring Boost if it isn't.
 
+To build the Horizon UI for Installation Environments, you will additionally
+need:
+
+* LibCap development files (libcap-dev)
+
+* libX11 development files (libx11-dev)
+
+* XKB File development files (libxkbfile-dev)
+
 To run the test suite, you will additionally need:
 
 * RSpec (ruby-rspec)
diff --git a/ui/qt5/netsimplewifipage.cc b/ui/qt5/netsimplewifipage.cc
index 2ac1681..3aef02f 100644
--- a/ui/qt5/netsimplewifipage.cc
+++ b/ui/qt5/netsimplewifipage.cc
@@ -12,15 +12,12 @@
 
 #include "netsimplewifipage.hh"
 
-#include <QLabel>
-#include <QPushButton>
+#include <bcnm/wpactrl.h>
 #include <QVBoxLayout>
 
 NetworkSimpleWirelessPage::NetworkSimpleWirelessPage(QWidget *parent)
     : HorizonWizardPage(parent) {
     QVBoxLayout *layout;
-    QLabel *statusLabel;
-    QPushButton *rescanButton;
 
     loadWatermark("network");
     setTitle(tr("Select Your Network"));
@@ -50,6 +47,7 @@ NetworkSimpleWirelessPage::NetworkSimpleWirelessPage(QWidget *parent)
 
 void NetworkSimpleWirelessPage::doScan() {
     ssidListView->clear();
+    rescanButton->setEnabled(false);
 }
 
 void NetworkSimpleWirelessPage::initializePage() {
diff --git a/ui/qt5/netsimplewifipage.hh b/ui/qt5/netsimplewifipage.hh
index 8545c94..f199903 100644
--- a/ui/qt5/netsimplewifipage.hh
+++ b/ui/qt5/netsimplewifipage.hh
@@ -16,8 +16,10 @@
 #include "horizonwizardpage.hh"
 
 #include <QComboBox>
+#include <QLabel>
 #include <QLineEdit>
 #include <QListWidget>
+#include <QPushButton>
 
 class NetworkSimpleWirelessPage : public HorizonWizardPage {
 public:
@@ -27,6 +29,9 @@ public:
     void doScan();
     int nextId() const;
 private:
+    QLabel *statusLabel;
+    QPushButton *rescanButton;
+
     QListWidget *ssidListView;
     QLineEdit *passphrase;
 };