diff --git a/src/installerprompt.cpp b/src/installerprompt.cpp index 87a20c3..91902e1 100644 --- a/src/installerprompt.cpp +++ b/src/installerprompt.cpp @@ -64,7 +64,7 @@ InstallerPrompt::InstallerPrompt(QWidget *parent) // Set up signal-slot connections for buttons connect(ui->tryLubuntu, &QAbstractButton::clicked, this, &InstallerPrompt::tryLubuntu); connect(ui->installLubuntu, &QAbstractButton::clicked, this, &InstallerPrompt::installLubuntu); - connect(ui->connectWiFiButton, &QAbstractButton::clicked, this, &InstallerPrompt::onConnectWifiClicked); + connect(ui->connectWifiButton, &QAbstractButton::clicked, this, &InstallerPrompt::onConnectWifiClicked); connect(ui->confirmButton, &QAbstractButton::clicked, this, &InstallerPrompt::onLanguageConfirm); // Set up the language combo box with available languages @@ -80,7 +80,7 @@ InstallerPrompt::InstallerPrompt(QWidget *parent) foreach (const NetworkManager::Device::Ptr &device, NetworkManager::networkInterfaces()) { if (device->type() == NetworkManager::Device::Wifi) { wifiDevice = device.objectCast(); - connect(wifiDevice.data(), &NetworkManager::Device::stateChanged, this, &InstallerPrompt::handleWiFiConnectionChange); + connect(wifiDevice.data(), &NetworkManager::Device::stateChanged, this, &InstallerPrompt::handleWifiConnectionChange); break; } } @@ -146,14 +146,14 @@ void InstallerPrompt::updateConnectionStatus() { bool connectable = !online && wifiEnabled; if (connectable) refreshNetworkList(); - ui->connectWiFiButton->setVisible(connectable); - ui->WiFiLabel->setVisible(connectable); + ui->connectWifiButton->setVisible(connectable); + ui->wifiLabel->setVisible(connectable); ui->networkComboBox->setVisible(connectable); - ui->WiFiInfoLabel->setVisible(connectable); - ui->WiFiSpacer->changeSize(connectable ? 40 : 0, connectable ? 20 : 0, QSizePolicy::Fixed, QSizePolicy::Fixed); + ui->wifiInfoLabel->setVisible(connectable); + ui->wifiSpacer->changeSize(connectable ? 40 : 0, connectable ? 20 : 0, QSizePolicy::Fixed, QSizePolicy::Fixed); } -void InstallerPrompt::handleWiFiConnectionChange(NetworkManager::Device::State newstate, NetworkManager::Device::State oldstate, NetworkManager::Device::StateChangeReason reason) +void InstallerPrompt::handleWifiConnectionChange(NetworkManager::Device::State newstate, NetworkManager::Device::State oldstate, NetworkManager::Device::StateChangeReason reason) { QMutexLocker locker(&wifiChangeMutex); if (reason == NetworkManager::Device::NoSecretsReason && !wifiWrongHandling) { @@ -327,7 +327,7 @@ void InstallerPrompt::showWifiOptions() { } if (!foundWifiDevice) { - QMessageBox::information(this, tr("WiFi Not Available"), tr("No WiFi devices were found on this system.")); + QMessageBox::information(this, tr("Wi-Fi Not Available"), tr("No Wi-Fi devices were found on this system.")); } } @@ -346,7 +346,7 @@ void InstallerPrompt::refreshNetworkList() { if (!wirelessDevice) { // No wireless device found, handle appropriately ui->networkComboBox->setVisible(false); - ui->connectWiFiButton->setVisible(false); + ui->connectWifiButton->setVisible(false); return; } @@ -366,7 +366,7 @@ void InstallerPrompt::refreshNetworkList() { // Adjust visibility ui->networkComboBox->setVisible(!networks.isEmpty()); - ui->connectWiFiButton->setVisible(!networks.isEmpty()); + ui->connectWifiButton->setVisible(!networks.isEmpty()); } QString InstallerPrompt::getDisplayNameForLocale(const QLocale &locale) { diff --git a/src/installerprompt.h b/src/installerprompt.h index e9de244..d1cacd1 100644 --- a/src/installerprompt.h +++ b/src/installerprompt.h @@ -29,7 +29,7 @@ private slots: void onLanguageConfirm(); void onConnectWifiClicked(); void updateConnectionStatus(); - void handleWiFiConnectionChange(NetworkManager::Device::State newstate, NetworkManager::Device::State oldstate, NetworkManager::Device::StateChangeReason reason); + void handleWifiConnectionChange(NetworkManager::Device::State newstate, NetworkManager::Device::State oldstate, NetworkManager::Device::StateChangeReason reason); void tryLubuntu(); void installLubuntu(); void languageProcessFinished(int exitCode, QProcess::ExitStatus exitStatus); @@ -51,7 +51,6 @@ private: void handleWifiConnection(const QString &ssid, bool recoverFromWrongPassword = false); QString promptForWifiPassword(const QString &ssid, bool isWrongPassword = false); - void connectToWifi(const QString &ssid, const QString &password, bool recoverFromWrongPassword = false); void initLanguageComboBox(); QStringList getAvailableLanguages(); void showWifiOptions(); diff --git a/src/installerprompt.ui b/src/installerprompt.ui index d2f85b4..75e9079 100644 --- a/src/installerprompt.ui +++ b/src/installerprompt.ui @@ -189,7 +189,7 @@ KBusyIndicatorWidget { - + Qt::Vertical @@ -202,7 +202,7 @@ KBusyIndicatorWidget { - + @@ -308,7 +308,7 @@ KBusyIndicatorWidget { - + 18 @@ -369,7 +369,7 @@ KBusyIndicatorWidget { - + 75 @@ -395,7 +395,7 @@ KBusyIndicatorWidget { - + 175