Lubuntu
/
installer-prompt
10
0
Fork 2
Code Issues Pull Requests 2 Projects Releases Wiki Activity
Labels Milestones
New Pull Request

Fix Wi-Fi spelling and minor cleanup #6

Open
NaniNoni wants to merge 2 commits from NaniNoni/installer-prompt:fix_wifi_spelling into ubuntu/noble
Conversation 0 Commits 2 Files Changed 3
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File

20
src/installerprompt.cpp
Unescape View File

@ -64,7 +64,7 @@ InstallerPrompt::InstallerPrompt(QWidget *parent)
// Set up signal-slot connections for buttons // Set up signal-slot connections for buttons
connect(ui->tryLubuntu, &QAbstractButton::clicked, this, &InstallerPrompt::tryLubuntu); connect(ui->tryLubuntu, &QAbstractButton::clicked, this, &InstallerPrompt::tryLubuntu);
connect(ui->installLubuntu, &QAbstractButton::clicked, this, &InstallerPrompt::installLubuntu); 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); connect(ui->confirmButton, &QAbstractButton::clicked, this, &InstallerPrompt::onLanguageConfirm);
// Set up the language combo box with available languages // 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()) { foreach (const NetworkManager::Device::Ptr &device, NetworkManager::networkInterfaces()) {
if (device->type() == NetworkManager::Device::Wifi) { if (device->type() == NetworkManager::Device::Wifi) {
wifiDevice = device.objectCast<NetworkManager::WirelessDevice>(); wifiDevice = device.objectCast<NetworkManager::WirelessDevice>();
connect(wifiDevice.data(), &NetworkManager::Device::stateChanged, this, &InstallerPrompt::handleWiFiConnectionChange); connect(wifiDevice.data(), &NetworkManager::Device::stateChanged, this, &InstallerPrompt::handleWifiConnectionChange);
break; break;
} }
} }
@ -146,14 +146,14 @@ void InstallerPrompt::updateConnectionStatus() {
bool connectable = !online && wifiEnabled; bool connectable = !online && wifiEnabled;
if (connectable) refreshNetworkList(); if (connectable) refreshNetworkList();
ui->connectWiFiButton->setVisible(connectable); ui->connectWifiButton->setVisible(connectable);
ui->WiFiLabel->setVisible(connectable); ui->wifiLabel->setVisible(connectable);
ui->networkComboBox->setVisible(connectable); ui->networkComboBox->setVisible(connectable);
ui->WiFiInfoLabel->setVisible(connectable); ui->wifiInfoLabel->setVisible(connectable);
ui->WiFiSpacer->changeSize(connectable ? 40 : 0, connectable ? 20 : 0, QSizePolicy::Fixed, QSizePolicy::Fixed); 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); QMutexLocker locker(&wifiChangeMutex);
if (reason == NetworkManager::Device::NoSecretsReason && !wifiWrongHandling) { if (reason == NetworkManager::Device::NoSecretsReason && !wifiWrongHandling) {
@ -327,7 +327,7 @@ void InstallerPrompt::showWifiOptions() {
} }
if (!foundWifiDevice) { 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) { if (!wirelessDevice) {
// No wireless device found, handle appropriately // No wireless device found, handle appropriately
ui->networkComboBox->setVisible(false); ui->networkComboBox->setVisible(false);
ui->connectWiFiButton->setVisible(false); ui->connectWifiButton->setVisible(false);
return; return;
} }
@ -366,7 +366,7 @@ void InstallerPrompt::refreshNetworkList() {
// Adjust visibility // Adjust visibility
ui->networkComboBox->setVisible(!networks.isEmpty()); ui->networkComboBox->setVisible(!networks.isEmpty());
ui->connectWiFiButton->setVisible(!networks.isEmpty()); ui->connectWifiButton->setVisible(!networks.isEmpty());
} }
QString InstallerPrompt::getDisplayNameForLocale(const QLocale &locale) { QString InstallerPrompt::getDisplayNameForLocale(const QLocale &locale) {

3
src/installerprompt.h
Unescape View File

@ -29,7 +29,7 @@ private slots:
void onLanguageConfirm(); void onLanguageConfirm();
void onConnectWifiClicked(); void onConnectWifiClicked();
void updateConnectionStatus(); 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 tryLubuntu();
void installLubuntu(); void installLubuntu();
void languageProcessFinished(int exitCode, QProcess::ExitStatus exitStatus); void languageProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);
@ -51,7 +51,6 @@ private:
void handleWifiConnection(const QString &ssid, bool recoverFromWrongPassword = false); void handleWifiConnection(const QString &ssid, bool recoverFromWrongPassword = false);
QString promptForWifiPassword(const QString &ssid, bool isWrongPassword = false); QString promptForWifiPassword(const QString &ssid, bool isWrongPassword = false);
void connectToWifi(const QString &ssid, const QString &password, bool recoverFromWrongPassword = false);
void initLanguageComboBox(); void initLanguageComboBox();
QStringList getAvailableLanguages(); QStringList getAvailableLanguages();
void showWifiOptions(); void showWifiOptions();

10
src/installerprompt.ui
Unescape View File

@ -189,7 +189,7 @@ KBusyIndicatorWidget {
</spacer> </spacer>
</item> </item>
<item> <item>
<spacer name="WiFiSpacer"> <spacer name="wifiSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
@ -202,7 +202,7 @@ KBusyIndicatorWidget {
</spacer> </spacer>
</item> </item>
<item> <item>
<layout class="QGridLayout" name="WiFiLayout"> <layout class="QGridLayout" name="wifiLayout">
<item row="2" column="2"> <item row="2" column="2">
<widget class="QComboBox" name="languageComboBox"> <widget class="QComboBox" name="languageComboBox">
<property name="minimumSize"> <property name="minimumSize">
@ -308,7 +308,7 @@ KBusyIndicatorWidget {
</spacer> </spacer>
</item> </item>
<item row="6" column="1"> <item row="6" column="1">
<widget class="QLabel" name="WiFiLabel"> <widget class="QLabel" name="wifiLabel">
<property name="font"> <property name="font">
<font> <font>
<pointsize>18</pointsize> <pointsize>18</pointsize>
@ -369,7 +369,7 @@ KBusyIndicatorWidget {
</spacer> </spacer>
</item> </item>
<item row="7" column="2"> <item row="7" column="2">
<widget class="QLabel" name="WiFiInfoLabel"> <widget class="QLabel" name="wifiInfoLabel">
<property name="font"> <property name="font">
<font> <font>
<weight>75</weight> <weight>75</weight>
@ -395,7 +395,7 @@ KBusyIndicatorWidget {
</spacer> </spacer>
</item> </item>
<item row="6" column="4"> <item row="6" column="4">
<widget class="QPushButton" name="connectWiFiButton"> <widget class="QPushButton" name="connectWifiButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>175</width> <width>175</width>

Write Preview
Loading…
Cancel
Save