UI overhaul, switch to native packaging, fix network-related bugs

master
Aaron Rainbolt 2 months ago
parent 056867affb
commit e5c2f1e484

@ -32,6 +32,12 @@ set(PROJECT_SOURCES
src/languagechangedialog.h
src/languagechangedialog.cpp
src/languagechangedialog.ui
src/warningdialog.h
src/warningdialog.cpp
src/warningdialog.ui
src/connectionprogressdialog.h
src/connectionprogressdialog.cpp
src/connectionprogressdialog.ui
)
set(TRANSLATION_RESOURCES "src/translations.qrc")

41
debian/changelog vendored

@ -0,0 +1,41 @@
lubuntu-installer-prompt (24.04.1) noble; urgency=medium
* Switch to native packaging.
* Fix several networking-related bugs.
* Significant design improvements.
-- Aaron Rainbolt <arraybolt3@ubuntu.com> Tue, 27 Feb 2024 14:45:23 -0600
lubuntu-installer-prompt (1.1.2-0ubuntu1) noble; urgency=medium
* New upstream release (LP: #2047379).
-- Simon Quigley <tsimonq2@ubuntu.com> Mon, 01 Jan 2024 13:56:49 -0600
lubuntu-installer-prompt (1.1.1-0ubuntu2) noble; urgency=medium
* Ensure C is not the default locale, to the user.
-- Simon Quigley <tsimonq2@ubuntu.com> Sat, 23 Dec 2023 18:03:34 -0600
lubuntu-installer-prompt (1.1.1-0ubuntu1) noble; urgency=medium
* New upstream release (LP: #2046099).
-- Simon Quigley <tsimonq2@ubuntu.com> Sat, 23 Dec 2023 17:06:34 -0600
lubuntu-installer-prompt (1.0.1-0ubuntu1) noble; urgency=medium
* New upstream release.
* Update Standards-version to 4.6.2, no changes needed.
* Update Vcs-*.
* Update build dependencies.
* Update Lintian overrides.
-- Simon Quigley <tsimonq2@ubuntu.com> Sat, 09 Dec 2023 15:07:07 -0600
lubuntu-installer-prompt (0.2.0-0ubuntu1) kinetic; urgency=medium
* Initial release.
-- Aaron Rainbolt <arraybolt3@gmail.com> Thu, 30 Jun 2022 18:04:08 -0500

28
debian/control vendored

@ -0,0 +1,28 @@
Source: lubuntu-installer-prompt
Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
Uploaders: Simon Quigley <tsimonq2@ubuntu.com>,
Aaron Rainbolt <arraybolt3@gmail.com>
Section: misc
Priority: optional
Build-Depends: cmake,
debhelper-compat (= 13),
extra-cmake-modules,
libkf5networkmanagerqt-dev,
libkf5widgetsaddons-dev,
qtbase5-dev,
qttools5-dev
Standards-Version: 4.6.2
Vcs-Browser: https://git.lubuntu.me/Lubuntu/installer-prompt-packaging
Vcs-Git: https://git.lubuntu.me/Lubuntu/installer-prompt-packaging.git
Homepage: https://lubuntu.me
Rules-Requires-Root: no
Package: lubuntu-installer-prompt
Architecture: any
Depends: calamares-settings-lubuntu, ${misc:Depends}, ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
Description: Live ISO prompt for trying or installing Lubuntu
This application displays a screen allowing the user to either try or
install Lubuntu after booting the Lubuntu ISO file. It auto-launches
when the ISO is first booted, and will either launch Calamares or LXQt,
depending on the user's choice.

412
debian/copyright vendored

@ -0,0 +1,412 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: installer-prompt
Source: https://github.com/lubuntu-team/installer-prompt
Files: *
Copyright: 2022 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
License: GPL-3.0
Files: img/background.png
Copyright: 2022 Aaron Rainbolt <arraybolt3@gmail.com>
License: CC-BY-4.0
License: GPL-3.0
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License version 3 as
published by the Free Software Foundation.
.
On Debian systems, the full text of the GNU General Public License version
3 can be found in the file `/usr/share/common-licenses/GPL-3'.
License: CC-BY-4.0
Creative Commons Corporation ("Creative Commons") is not a law firm and
does not provide legal services or legal advice. Distribution of
Creative Commons public licenses does not create a lawyer-client or
other relationship. Creative Commons makes its licenses and related
information available on an "as-is" basis. Creative Commons gives no
warranties regarding its licenses, any material licensed under their
terms and conditions, or any related information. Creative Commons
disclaims all liability for damages resulting from their use to the
fullest extent possible.
.
Using Creative Commons Public Licenses
.
Creative Commons public licenses provide a standard set of terms and
conditions that creators and other rights holders may use to share
original works of authorship and other material subject to copyright
and certain other rights specified in the public license below. The
following considerations are for informational purposes only, are not
exhaustive, and do not form part of our licenses.
.
Considerations for licensors: Our public licenses are
intended for use by those authorized to give the public
permission to use material in ways otherwise restricted by
copyright and certain other rights. Our licenses are
irrevocable. Licensors should read and understand the terms
and conditions of the license they choose before applying it.
Licensors should also secure all rights necessary before
applying our licenses so that the public can reuse the
material as expected. Licensors should clearly mark any
material not subject to the license. This includes other CC-
licensed material, or material used under an exception or
limitation to copyright. More considerations for licensors:
wiki.creativecommons.org/Considerations_for_licensors
.
Considerations for the public: By using one of our public
licenses, a licensor grants the public permission to use the
licensed material under specified terms and conditions. If
the licensor's permission is not necessary for any reason--for
example, because of any applicable exception or limitation to
copyright--then that use is not regulated by the license. Our
licenses grant only permissions under copyright and certain
other rights that a licensor has authority to grant. Use of
the licensed material may still be restricted for other
reasons, including because others have copyright or other
rights in the material. A licensor may make special requests,
such as asking that all changes be marked or described.
Although not required by our licenses, you are encouraged to
respect those requests where reasonable. More considerations
for the public:
wiki.creativecommons.org/Considerations_for_licensees
.
=======================================================================
.
Creative Commons Attribution 4.0 International Public License
.
By exercising the Licensed Rights (defined below), You accept and agree
to be bound by the terms and conditions of this Creative Commons
Attribution 4.0 International Public License ("Public License"). To the
extent this Public License may be interpreted as a contract, You are
granted the Licensed Rights in consideration of Your acceptance of
these terms and conditions, and the Licensor grants You such rights in
consideration of benefits the Licensor receives from making the
Licensed Material available under these terms and conditions.
.
.
Section 1 -- Definitions.
.
a. Adapted Material means material subject to Copyright and Similar
Rights that is derived from or based upon the Licensed Material
and in which the Licensed Material is translated, altered,
arranged, transformed, or otherwise modified in a manner requiring
permission under the Copyright and Similar Rights held by the
Licensor. For purposes of this Public License, where the Licensed
Material is a musical work, performance, or sound recording,
Adapted Material is always produced where the Licensed Material is
synched in timed relation with a moving image.
.
b. Adapter's License means the license You apply to Your Copyright
and Similar Rights in Your contributions to Adapted Material in
accordance with the terms and conditions of this Public License.
.
c. Copyright and Similar Rights means copyright and/or similar rights
closely related to copyright including, without limitation,
performance, broadcast, sound recording, and Sui Generis Database
Rights, without regard to how the rights are labeled or
categorized. For purposes of this Public License, the rights
specified in Section 2(b)(1)-(2) are not Copyright and Similar
Rights.
.
d. Effective Technological Measures means those measures that, in the
absence of proper authority, may not be circumvented under laws
fulfilling obligations under Article 11 of the WIPO Copyright
Treaty adopted on December 20, 1996, and/or similar international
agreements.
.
e. Exceptions and Limitations means fair use, fair dealing, and/or
any other exception or limitation to Copyright and Similar Rights
that applies to Your use of the Licensed Material.
.
f. Licensed Material means the artistic or literary work, database,
or other material to which the Licensor applied this Public
License.
.
g. Licensed Rights means the rights granted to You subject to the
terms and conditions of this Public License, which are limited to
all Copyright and Similar Rights that apply to Your use of the
Licensed Material and that the Licensor has authority to license.
.
h. Licensor means the individual(s) or entity(ies) granting rights
under this Public License.
.
i. Share means to provide material to the public by any means or
process that requires permission under the Licensed Rights, such
as reproduction, public display, public performance, distribution,
dissemination, communication, or importation, and to make material
available to the public including in ways that members of the
public may access the material from a place and at a time
individually chosen by them.
.
j. Sui Generis Database Rights means rights other than copyright
resulting from Directive 96/9/EC of the European Parliament and of
the Council of 11 March 1996 on the legal protection of databases,
as amended and/or succeeded, as well as other essentially
equivalent rights anywhere in the world.
.
k. You means the individual or entity exercising the Licensed Rights
under this Public License. Your has a corresponding meaning.
.
.
Section 2 -- Scope.
.
a. License grant.
.
1. Subject to the terms and conditions of this Public License,
the Licensor hereby grants You a worldwide, royalty-free,
non-sublicensable, non-exclusive, irrevocable license to
exercise the Licensed Rights in the Licensed Material to:
.
a. reproduce and Share the Licensed Material, in whole or
in part; and
.
b. produce, reproduce, and Share Adapted Material.
.
2. Exceptions and Limitations. For the avoidance of doubt, where
Exceptions and Limitations apply to Your use, this Public
License does not apply, and You do not need to comply with
its terms and conditions.
.
3. Term. The term of this Public License is specified in Section
6(a).
.
4. Media and formats; technical modifications allowed. The
Licensor authorizes You to exercise the Licensed Rights in
all media and formats whether now known or hereafter created,
and to make technical modifications necessary to do so. The
Licensor waives and/or agrees not to assert any right or
authority to forbid You from making technical modifications
necessary to exercise the Licensed Rights, including
technical modifications necessary to circumvent Effective
Technological Measures. For purposes of this Public License,
simply making modifications authorized by this Section 2(a)
(4) never produces Adapted Material.
.
5. Downstream recipients.
.
a. Offer from the Licensor -- Licensed Material. Every
recipient of the Licensed Material automatically
receives an offer from the Licensor to exercise the
Licensed Rights under the terms and conditions of this
Public License.
.
b. No downstream restrictions. You may not offer or impose
any additional or different terms or conditions on, or
apply any Effective Technological Measures to, the
Licensed Material if doing so restricts exercise of the
Licensed Rights by any recipient of the Licensed
Material.
.
6. No endorsement. Nothing in this Public License constitutes or
may be construed as permission to assert or imply that You
are, or that Your use of the Licensed Material is, connected
with, or sponsored, endorsed, or granted official status by,
the Licensor or others designated to receive attribution as
provided in Section 3(a)(1)(A)(i).
.
b. Other rights.
.
1. Moral rights, such as the right of integrity, are not
licensed under this Public License, nor are publicity,
privacy, and/or other similar personality rights; however, to
the extent possible, the Licensor waives and/or agrees not to
assert any such rights held by the Licensor to the limited
extent necessary to allow You to exercise the Licensed
Rights, but not otherwise.
.
2. Patent and trademark rights are not licensed under this
Public License.
.
3. To the extent possible, the Licensor waives any right to
collect royalties from You for the exercise of the Licensed
Rights, whether directly or through a collecting society
under any voluntary or waivable statutory or compulsory
licensing scheme. In all other cases the Licensor expressly
reserves any right to collect such royalties.
.
.
Section 3 -- License Conditions.
.
Your exercise of the Licensed Rights is expressly made subject to the
following conditions.
.
a. Attribution.
.
1. If You Share the Licensed Material (including in modified
form), You must:
.
a. retain the following if it is supplied by the Licensor
with the Licensed Material:
.
i. identification of the creator(s) of the Licensed
Material and any others designated to receive
attribution, in any reasonable manner requested by
the Licensor (including by pseudonym if
designated);
.
ii. a copyright notice;
.
iii. a notice that refers to this Public License;
.
iv. a notice that refers to the disclaimer of
warranties;
.
v. a URI or hyperlink to the Licensed Material to the
extent reasonably practicable;
.
b. indicate if You modified the Licensed Material and
retain an indication of any previous modifications; and
.
c. indicate the Licensed Material is licensed under this
Public License, and include the text of, or the URI or
hyperlink to, this Public License.
.
2. You may satisfy the conditions in Section 3(a)(1) in any
reasonable manner based on the medium, means, and context in
which You Share the Licensed Material. For example, it may be
reasonable to satisfy the conditions by providing a URI or
hyperlink to a resource that includes the required
information.
.
3. If requested by the Licensor, You must remove any of the
information required by Section 3(a)(1)(A) to the extent
reasonably practicable.
.
4. If You Share Adapted Material You produce, the Adapter's
License You apply must not prevent recipients of the Adapted
Material from complying with this Public License.
.
.
Section 4 -- Sui Generis Database Rights.
.
Where the Licensed Rights include Sui Generis Database Rights that
apply to Your use of the Licensed Material:
.
a. for the avoidance of doubt, Section 2(a)(1) grants You the right
to extract, reuse, reproduce, and Share all or a substantial
portion of the contents of the database;
.
b. if You include all or a substantial portion of the database
contents in a database in which You have Sui Generis Database
Rights, then the database in which You have Sui Generis Database
Rights (but not its individual contents) is Adapted Material; and
.
c. You must comply with the conditions in Section 3(a) if You Share
all or a substantial portion of the contents of the database.
.
For the avoidance of doubt, this Section 4 supplements and does not
replace Your obligations under this Public License where the Licensed
Rights include other Copyright and Similar Rights.
.
.
Section 5 -- Disclaimer of Warranties and Limitation of Liability.
.
a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
.
b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
.
c. The disclaimer of warranties and limitation of liability provided
above shall be interpreted in a manner that, to the extent
possible, most closely approximates an absolute disclaimer and
waiver of all liability.
.
.
Section 6 -- Term and Termination.
.
a. This Public License applies for the term of the Copyright and
Similar Rights licensed here. However, if You fail to comply with
this Public License, then Your rights under this Public License
terminate automatically.
.
b. Where Your right to use the Licensed Material has terminated under
Section 6(a), it reinstates:
.
1. automatically as of the date the violation is cured, provided
it is cured within 30 days of Your discovery of the
violation; or
.
2. upon express reinstatement by the Licensor.
.
For the avoidance of doubt, this Section 6(b) does not affect any
right the Licensor may have to seek remedies for Your violations
of this Public License.
.
c. For the avoidance of doubt, the Licensor may also offer the
Licensed Material under separate terms or conditions or stop
distributing the Licensed Material at any time; however, doing so
will not terminate this Public License.
.
d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
License.
.
.
Section 7 -- Other Terms and Conditions.
.
a. The Licensor shall not be bound by any additional or different
terms or conditions communicated by You unless expressly agreed.
.
b. Any arrangements, understandings, or agreements regarding the
Licensed Material not stated herein are separate from and
independent of the terms and conditions of this Public License.
.
.
Section 8 -- Interpretation.
.
a. For the avoidance of doubt, this Public License does not, and
shall not be interpreted to, reduce, limit, restrict, or impose
conditions on any use of the Licensed Material that could lawfully
be made without permission under this Public License.
.
b. To the extent possible, if any provision of this Public License is
deemed unenforceable, it shall be automatically reformed to the
minimum extent necessary to make it enforceable. If the provision
cannot be reformed, it shall be severed from this Public License
without affecting the enforceability of the remaining terms and
conditions.
.
c. No term or condition of this Public License will be waived and no
failure to comply consented to unless expressly agreed to by the
Licensor.
.
d. Nothing in this Public License constitutes or may be interpreted
as a limitation upon, or waiver of, any privileges and immunities
that apply to the Licensor or You, including from the legal
processes of any jurisdiction or authority.
.
.
=======================================================================
.
Creative Commons is not a party to its public
licenses. Notwithstanding, Creative Commons may elect to apply one of
its public licenses to material it publishes and in those instances
will be considered the “Licensor.” The text of the Creative Commons
public licenses is dedicated to the public domain under the CC0 Public
Domain Dedication. Except for the limited purpose of indicating that
material is shared under a Creative Commons public license or as
otherwise permitted by the Creative Commons policies published at
creativecommons.org/policies, Creative Commons does not authorize the
use of the trademark "Creative Commons" or any other trademark or logo
of Creative Commons without its prior written consent including,
without limitation, in connection with any unauthorized modifications
to any of its public licenses or any other arrangements,
understandings, or agreements concerning use of licensed material. For
the avoidance of doubt, this paragraph does not form part of the
public licenses.
.
Creative Commons may be contacted at creativecommons.org.

1
debian/docs vendored

@ -0,0 +1 @@
README.md

@ -0,0 +1,3 @@
lubuntu-installer-prompt: no-manual-page [usr/bin/lubuntu-installer-prompt]
lubuntu-installer-prompt: desktop-entry-lacks-icon-entry [usr/share/xsessions/lubuntu-live-environment.desktop]
lubuntu-installer-prompt: desktop-entry-lacks-keywords-entry [usr/share/xsessions/lubuntu-live-environment.desktop]

9
debian/rules vendored

@ -0,0 +1,9 @@
#!/usr/bin/make -f
export LC_ALL=C.UTF-8
%:
dh ${@} --buildsystem cmake
override_dh_missing:
dh_missing --fail-missing

@ -0,0 +1 @@
3.0 (native)

@ -0,0 +1,2 @@
# We intentionally switched from quilt packaging to native.
lubuntu-installer-prompt source: odd-historical-debian-changelog-version *

@ -0,0 +1 @@
tar-ignore=.gitignore

@ -0,0 +1,11 @@
<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" version="1">
<rect fill="#ffd453" width="40" height="40" x="-44" y="-44" rx="20" ry="20" transform="matrix(0,-1,-1,0,0,0)"/>
<g opacity=".2" transform="matrix(2,0,0,2,-1068,722.01)">
<path class="error" d="m545-355h2v9.0039h-2zm0 11.004h2v1.9961h-2z"/>
</g>
<g fill="#3f3f3f" transform="matrix(2,0,0,2,-1068,721.01)">
<path class="error" d="m545-355h2v9.0039h-2zm0 11.004h2v1.9961h-2z"/>
</g>
<path fill="#fff" opacity=".2" d="m24 4c-11.08 0-20 8.92-20 20 0 0.168 0.008 0.333 0.0117 0.5 0.2647-10.846 9.0763-19.5 19.988-19.5s19.724 8.6539 19.988 19.5c0.004-0.16686 0.0117-0.33213 0.0117-0.5 0-11.08-8.92-20-20-20z"/>
<path opacity=".2" d="m4.0117 24.5c-0.0041 0.167-0.0117 0.332-0.0117 0.5 0 11.08 8.92 20 20 20s20-8.92 20-20c0-0.168-0.008-0.333-0.012-0.5-0.264 10.846-9.076 19.5-19.988 19.5s-19.724-8.654-19.988-19.5z"/>
</svg>

After

Width:  |  Height:  |  Size: 903 B

@ -0,0 +1,19 @@
#include "connectionprogressdialog.h"
#include "ui_connectionprogressdialog.h"
ConnectionProgressDialog::ConnectionProgressDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::ConnectionProgressDialog)
{
ui->setupUi(this);
}
ConnectionProgressDialog::~ConnectionProgressDialog()
{
delete ui;
}
void ConnectionProgressDialog::setNetworkName(QString name)
{
ui->label->setText(tr("Connecting to %1...").arg(name));
}

@ -0,0 +1,23 @@
#ifndef CONNECTIONPROGRESSDIALOG_H
#define CONNECTIONPROGRESSDIALOG_H
#include <QDialog>
namespace Ui {
class ConnectionProgressDialog;
}
class ConnectionProgressDialog : public QDialog
{
Q_OBJECT
public:
explicit ConnectionProgressDialog(QWidget *parent = nullptr);
~ConnectionProgressDialog();
void setNetworkName(QString name);
private:
Ui::ConnectionProgressDialog *ui;
};
#endif // CONNECTIONPROGRESSDIALOG_H

@ -0,0 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ConnectionProgressDialog</class>
<widget class="QDialog" name="ConnectionProgressDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>263</width>
<height>72</height>
</rect>
</property>
<property name="windowTitle">
<string>Lubuntu</string>
</property>
<property name="windowIcon">
<iconset theme="system-software-install"/>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Connecting...</string>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QProgressBar" name="progressBar">
<property name="maximum">
<number>0</number>
</property>
<property name="value">
<number>-1</number>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>

@ -28,12 +28,13 @@
#include <QScreen>
#include <QTimer>
#include <QFile>
#include <QMessageBox>
#include <QUuid>
#include <QDBusPendingReply>
#include "installerprompt.h"
#include "wifipassworddialog.h"
#include "languagechangedialog.h"
#include "warningdialog.h"
#include "connectionprogressdialog.h"
#include "./ui_installerprompt.h"
InstallerPrompt::InstallerPrompt(QWidget *parent)
@ -41,6 +42,8 @@ InstallerPrompt::InstallerPrompt(QWidget *parent)
, ui(new Ui::InstallerPrompt) {
ui->setupUi(this);
cpd = new ConnectionProgressDialog();
updateConnectionInfo();
initLanguageComboBox();
@ -50,6 +53,15 @@ InstallerPrompt::InstallerPrompt(QWidget *parent)
connect(ui->languageComboBox, SIGNAL(activated(int)), this, SLOT(onLanguageSelected(int)));
connect(ui->networkComboBox, SIGNAL(activated(int)), this, SLOT(onNetworkSelected(int)));
auto nm = NetworkManager::notifier();
connect(nm, &NetworkManager::Notifier::deviceAdded, this, &InstallerPrompt::updateConnectionInfo);
connect(nm, &NetworkManager::Notifier::deviceRemoved, this, &InstallerPrompt::updateConnectionInfo);
connect(nm, &NetworkManager::Notifier::activeConnectionsChanged, this, &InstallerPrompt::updateConnectionInfo);
connect(nm, &NetworkManager::Notifier::wirelessEnabledChanged, this, &InstallerPrompt::updateConnectionInfo);
connect(nm, &NetworkManager::Notifier::activeConnectionAdded, this, &InstallerPrompt::updateConnectionInfo);
connect(nm, &NetworkManager::Notifier::connectivityChanged, this, &InstallerPrompt::updateConnectionInfo);
connect(nm, &NetworkManager::Notifier::primaryConnectionChanged, this, &InstallerPrompt::updateConnectionInfo);
QTimer *repeater = new QTimer();
connect(repeater, SIGNAL(timeout()), this, SLOT(updateConnectionInfo()));
repeater->start(15000);
@ -65,7 +77,7 @@ void InstallerPrompt::activateBackground()
// Set the background image and scale it
QImage image(":/background");
if (image.isNull()) {
QMessageBox::warning(this, tr("Error"), tr("Background image cannot be loaded."));
WarningDialog::showWarning(tr("Background image cannot be loaded."));
return;
}
@ -170,9 +182,11 @@ void InstallerPrompt::onNetworkSelected(int index)
NetworkManager::Connection::List availableConnections = wiredDevice.availableConnections();
if (availableConnections.count() > 0) {
QString ethernetName = ui->networkComboBox->itemText(index).split(":")[0];
NetworkManager::activateConnection(availableConnections[0]->path(), wiredDevice.uni(), QString());
cpd->setNetworkName(ethernetName);
} else {
QMessageBox::warning(this, tr("Error"), tr("Selected Ethernet device has no network!"));
WarningDialog::showWarning(tr("Selected Ethernet device has no network!"));
}
} else { // this is a Wifi connection
wifiSsid = networkId.right(networkId.length() - 4);
@ -189,6 +203,7 @@ void InstallerPrompt::onNetworkSelected(int index)
}
if (targetConnection) {
NetworkManager::activateConnection(targetConnection->path(), wifiDevice->uni(), QString());
cpd->setNetworkName(wifiSsid);
} else {
WifiPasswordDialog wpd(wifiSsid);
wpd.exec();
@ -223,12 +238,13 @@ void InstallerPrompt::onNetworkSelected(int index)
QDBusPendingReply<QDBusObjectPath> reply = NetworkManager::addConnection(wifiSettings);
reply.waitForFinished();
if (reply.isError()) {
QMessageBox::warning(this, tr("Error"), tr("Failed to add WiFi connection."));
WarningDialog::showWarning(tr("Failed to add WiFi connection."));
return;
}
QDBusObjectPath path = reply.value();
NetworkManager::activateConnection(path.path(), wifiDevice->uni(), QString());
cpd->setNetworkName(wifiSsid);
}
}
}
@ -261,11 +277,14 @@ void InstallerPrompt::updateConnectionInfo()
}
if (hitWifiDevice) {
NetworkManager::ActiveConnection::Ptr activeConnection = wifiDevice->activeConnection();
NetworkManager::Connection::Ptr underlyingActiveConnection = activeConnection->connection();
NetworkManager::Connection::Ptr underlyingActiveConnection;
if (activeConnection != nullptr) {
underlyingActiveConnection = activeConnection->connection();
}
for (const auto &network : wifiDevice->networks()) {
QString ssid = network->ssid();
bool isNetworkConnected = false;
if (activeConnection->state() == NetworkManager::ActiveConnection::Activated) {
if (activeConnection != nullptr && activeConnection->state() == NetworkManager::ActiveConnection::Activated) {
NetworkManager::WirelessSetting::Ptr underlyingWirelessSetting = underlyingActiveConnection->settings()->setting(NetworkManager::Setting::Wireless).staticCast<NetworkManager::WirelessSetting>();
if (network->ssid() == QString(underlyingWirelessSetting->ssid())) {
isNetworkConnected = true;
@ -283,6 +302,12 @@ void InstallerPrompt::updateConnectionInfo()
if (hitConnectedNetwork) {
ui->networkComboBox->setCurrentIndex(connectedDevice);
}
if (NetworkManager::status() == NetworkManager::Connecting) {
cpd->exec();
} else {
cpd->done(0);
}
}
void InstallerPrompt::handleWiFiConnectionChange(NetworkManager::Device::State newstate, NetworkManager::Device::State oldstate, NetworkManager::Device::StateChangeReason reason)
@ -297,7 +322,7 @@ void InstallerPrompt::handleWiFiConnectionChange(NetworkManager::Device::State n
qDebug() << "Wiping connection with wrong password: " << wifiSsid;
QDBusPendingReply removeReply = connection->remove();
removeReply.waitForFinished();
QMessageBox::warning(this, tr("Error"), tr("WiFi password was incorrect."));
WarningDialog::showWarning(tr("WiFi password was incorrect."));
}
}
}
@ -342,7 +367,7 @@ QStringList InstallerPrompt::getAvailableLanguages() {
if (lineParts.count() == 1) {
lineParts = line.split(' ');
if (lineParts.count() == 1) {
QMessageBox::warning(this, tr("Error"), tr("Something has gone very wrong trying to parse the list of supported languages!"));
WarningDialog::showWarning(tr("Something has gone very wrong trying to parse the list of supported languages!"));
}
}
supported_languages.append(lineParts[0]);

@ -15,6 +15,8 @@
#include <NetworkManagerQt/WiredDevice>
#include <NetworkManagerQt/WirelessNetwork>
class ConnectionProgressDialog;
namespace Ui { class InstallerPrompt; }
class InstallerPrompt : public QMainWindow {
@ -36,6 +38,7 @@ private slots:
private:
Ui::InstallerPrompt *ui;
ConnectionProgressDialog *cpd;
NetworkManager::WirelessDevice::Ptr wifiDevice;
bool hitWifiDevice = false;
QString wifiSsid;

@ -25,7 +25,7 @@
}
QPushButton {
background-color: rgba(200, 200, 200, 0.8);
background-color: rgb(200, 200, 200);
color: #ffffff;
border-radius: 10px;
padding: 10px 20px;
@ -33,21 +33,26 @@ QPushButton {
}
QPushButton:hover {
background-color: rgba(30, 144, 255, 1);
background-color: rgb(30, 144, 255);
}
QPushButton:disabled {
background-color: rgba(169, 169, 169, 0.8);
background-color: rgb(169, 169, 169);
color: #ffffff;
}
QComboBox, QLineEdit {
background-color: #3b5da2;
color: #ffffff;
border: 1px solid #ffffff;
border-radius: 10px;
padding: 5px;
margin: 5px;
/* background-color: #315764; */
/* background-color: #729fa5; */
background-color: #044b8a;
color: #ddd;
border: 1px solid #ddd;
border-radius: 15px;
padding: 6px 12px;
}
QComboBox:hover {
background-color: #6172d1; color: #fff; border-color: #fff;
}
QComboBox::drop-down {
@ -62,6 +67,7 @@ QComboBox::down-arrow {
QLabel {
color: #ffffff;
margin-right: 12px;
}
QLabel#logoLabel {
@ -69,12 +75,20 @@ QLabel#logoLabel {
background-color: transparent;
}
QLabel#incorrectPassword {
color: red;
QPushButton {
background-color: #044b8a; color: #eee; border: 1px solid #ddd; border-radius: 15px;
}
QPushButton:hover {
background-color: #6172d1; color: #fff; border-color: #fff;
}
QPushButton:disabled {
background-color: #808080; color: white; border-radius: 15px;
}
KBusyIndicatorWidget {
color: blue;
QToolTip {
background-color: rgba(230, 230, 230, 0.85); padding: 12px; border-radius: 15px; border: 1px solid #e4e4e4; font: 12px 'Ubuntu Light'; color: #696b6f; line-height: 18px;
}</string>
</property>
<widget class="QWidget" name="centralwidget">
@ -199,15 +213,15 @@ KBusyIndicatorWidget {
</font>
</property>
<property name="text">
<string>Select Your Language:</string>
<string>Select Your Language</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="networkComboBox">
<item row="0" column="1">
<widget class="QComboBox" name="languageComboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -232,10 +246,13 @@ KBusyIndicatorWidget {
<pointsize>16</pointsize>
</font>
</property>
<property name="cursor">
<cursorShape>PointingHandCursor</cursorShape>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="languageComboBox">
<item row="2" column="1">
<widget class="QComboBox" name="networkComboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -260,9 +277,12 @@ KBusyIndicatorWidget {
<pointsize>16</pointsize>
</font>
</property>
<property name="cursor">
<cursorShape>PointingHandCursor</cursorShape>
</property>
</widget>
</item>
<item row="1" column="0">
<item row="2" column="0">
<widget class="QLabel" name="WiFiLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@ -278,13 +298,29 @@ KBusyIndicatorWidget {
</font>
</property>
<property name="text">
<string>Internet Connection:</string>
<string>Internet Connection</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="1">
<spacer name="verticalSpacer_6">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>36</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
@ -367,24 +403,15 @@ KBusyIndicatorWidget {
<bold>false</bold>
</font>
</property>
<property name="cursor">
<cursorShape>PointingHandCursor</cursorShape>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Try Lubuntu without installing it on your system. Allows you to use programs, browse the Web, and even temporarily install apps without modifying your system. Changes made within the live environment will be lost when the computer shuts down.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;p&gt;&lt;span style=&quot;font-size:18px; color: #333; margin-bottom: 0;&quot;&gt;Run live environment&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-size:16px;&quot;&gt;Run Lubuntu from the installation media without changing a system disk. Changes made to this environment will not be saved when the computer is shut down.&lt;/span&gt;&lt;/p&gt;</string>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="styleSheet">
<string notr="true">QPushButton {
background-color: #3b5da2; color: white; border-radius: 10px;
}
QPushButton:disabled {
background-color: #808080; color: white; border-radius: 10px;
}
QToolTip {
background-color: rgb(150, 150, 150); color: white; border: 1px solid black;
font: 9pt &quot;Ubuntu&quot;;
}</string>
</property>
<property name="text">
<string> Try Lubuntu</string>
</property>
@ -434,20 +461,14 @@ QToolTip {
<bold>false</bold>
</font>
</property>
<property name="cursor">
<cursorShape>PointingHandCursor</cursorShape>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Install Lubuntu onto your system. You can install Lubuntu by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;p&gt;&lt;span style=&quot;font-size:18px; color: #333; margin-bottom: 0;&quot;&gt;Install to this system&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot;font-size:16px;&quot;&gt;Install Lubuntu to a system disk by itself, or alongside an existing operating system.&lt;/span&gt;&lt;/p&gt;</string>
</property>
<property name="styleSheet">
<string notr="true">QPushButton {
background-color: #3b5da2; color: white; border-radius: 10px;
}
QPushButton:disabled {
background-color: #808080; color: white; border-radius: 10px;
}
QToolTip {
background-color: rgb(150, 150, 150); color: white; border: 1px solid black;
font: 9pt &quot;Ubuntu&quot;;
}</string>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="text">
<string> Install Lubuntu</string>

@ -14,8 +14,7 @@
<string>Lubuntu</string>
</property>
<property name="windowIcon">
<iconset theme="system-software-install">
<normaloff>.</normaloff>.</iconset>
<iconset theme="system-software-install"/>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>

@ -5,5 +5,6 @@
<file alias="symbol">../img/symbol.png</file>
<file alias="logo">../img/lubuntu-logo.png</file>
<file alias="arrow-down">../img/arrow-down.svg</file>
<file alias="warning-icon">../img/dialog-warning.svg</file>
</qresource>
</RCC>

@ -0,0 +1,27 @@
#include "warningdialog.h"
#include "ui_warningdialog.h"
WarningDialog::WarningDialog(QString warningText, QWidget *parent) :
QDialog(parent),
ui(new Ui::WarningDialog)
{
ui->setupUi(this);
ui->warningLabel->setText(warningText);
connect (ui->okButton, &QPushButton::clicked, this, &WarningDialog::onOkClicked);
}
WarningDialog::~WarningDialog()
{
delete ui;
}
void WarningDialog::showWarning(QString warningText)
{
WarningDialog warn(warningText);
warn.exec();
}
void WarningDialog::onOkClicked()
{
this->done(0);
}

@ -0,0 +1,26 @@
#ifndef WARNINGDIALOG_H
#define WARNINGDIALOG_H
#include <QDialog>
namespace Ui {
class WarningDialog;
}
class WarningDialog : public QDialog
{
Q_OBJECT
public:
explicit WarningDialog(QString warningText, QWidget *parent = nullptr);
~WarningDialog();
static void showWarning(QString warningText);
private slots:
void onOkClicked();
private:
Ui::WarningDialog *ui;
};
#endif // WARNINGDIALOG_H

@ -0,0 +1,93 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>WarningDialog</class>
<widget class="QDialog" name="WarningDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>141</width>
<height>107</height>
</rect>
</property>
<property name="windowTitle">
<string>Lubuntu</string>
</property>
<property name="windowIcon">
<iconset theme="system-software-install"/>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="resource.qrc">:/warning-icon</pixmap>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="warningLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;placeholder&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="okButton">
<property name="text">
<string>OK</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources>
<include location="resource.qrc"/>
</resources>
<connections/>
</ui>

@ -7,6 +7,7 @@ WifiPasswordDialog::WifiPasswordDialog(QString ssid, QWidget *parent) :
{
ui->setupUi(this);
ui->wifiLabel->setText(tr("Enter password for %1:").arg(ssid));
connect(ui->connectButton, &QPushButton::clicked, this, &WifiPasswordDialog::onConnectClicked);
}
WifiPasswordDialog::~WifiPasswordDialog()

@ -7,60 +7,17 @@
<x>0</x>
<y>0</y>
<width>312</width>
<height>151</height>
<height>103</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
<string>Lubuntu</string>
</property>
<property name="windowIcon">
<iconset theme="system-software-install"/>
</property>
<property name="styleSheet">
<string notr="true">QWidget {
color: #000000;
}
QPushButton {
background-color: rgba(200, 200, 200, 0.8);
color: #ffffff;
border-radius: 10px;
padding: 10px 20px;
margin: 10px;
}
QPushButton:hover {
background-color: rgba(30, 144, 255, 1);
}
QPushButton:disabled {
background-color: rgba(169, 169, 169, 0.8);
color: #ffffff;
}
QComboBox, QLineEdit {
background-color: rgba(255, 255, 255, 0.65);
color: #000000;
border: 1px solid #ffffff;
border-radius: 10px;
padding: 5px;
margin: 5px;
}
QLabel {
qproperty-alignment: 'AlignCenter';
color: #ffffff;
}
QLabel#logoLabel {
image: url(:/logo);
background-color: transparent;
}
QLabel#incorrectPassword {
color: red;
}
KBusyIndicatorWidget {
color: blue;
}</string>
<string notr="true"/>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
@ -72,7 +29,7 @@ KBusyIndicatorWidget {
<string>wifilabel</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>

Loading…
Cancel
Save