Compare commits

..

No commits in common. "e7855603496688b36f15afb34b1d7507d637e64f" and "5e616be3a4ca9705309014d1dc9853adab5dab87" have entirely different histories.

7 changed files with 47 additions and 81 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 65 KiB

View File

@ -6,7 +6,6 @@
#include <QScreen>
#include <QMessageBox>
#include <QLineEdit>
#include <QGraphicsDropShadowEffect>
#include "installerprompt.h"
#include "./ui_installerprompt.h"
@ -16,7 +15,7 @@ InstallerPrompt::InstallerPrompt(QWidget *parent)
ui->setupUi(this);
// Set the background image and scale it
QPixmap bg(":/background");
QPixmap bg("/usr/share/lubuntu/installer-prompt/background.png");
if (bg.isNull()) {
QMessageBox::warning(this, tr("Error"), tr("Background image cannot be loaded."));
return;
@ -68,11 +67,11 @@ bool InstallerPrompt::checkInternetConnection() {
void InstallerPrompt::updateConnectionStatus(bool online) {
if (online) {
ui->connectionStatusLabel->setText(tr("Connected to the internet"));
ui->connectWifiButton->setVisible(false);
connectionStatusLabel->setText(tr("Connected to the internet"));
connectWifiButton->setVisible(false);
} else {
ui->connectionStatusLabel->setText(tr("Not connected to the internet"));
ui->connectWifiButton->setVisible(true);
connectionStatusLabel->setText(tr("Not connected to the internet"));
connectWifiButton->setVisible(true);
}
}

View File

@ -21,12 +21,13 @@
</property>
<property name="styleSheet">
<string notr="true">QWidget {
color: #000000;
color: #000000; /* Set text color to black */
}
QPushButton {
background-color: rgba(30, 144, 255, 0.8);
color: #ffffff;
border: 2px solid #ffffff;
border-radius: 15px;
padding: 10px 20px;
margin: 10px;
@ -52,14 +53,7 @@ QComboBox, QLineEdit {
QLabel {
qproperty-alignment: 'AlignCenter';
color: #ffffff;
}
QLabel#logoLabel {
image: url(:/logo);
background-color: transparent;
}
</string>
}</string>
</property>
<widget class="QWidget" name="centralwidget">
<property name="sizePolicy">
@ -113,7 +107,7 @@ QLabel#logoLabel {
</spacer>
</item>
<item>
<widget class="QLabel" name="logoLabel">
<widget class="QLabel" name="title">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -123,7 +117,7 @@ QLabel#logoLabel {
<property name="minimumSize">
<size>
<width>750</width>
<height>100</height>
<height>64</height>
</size>
</property>
<property name="baseSize">
@ -135,6 +129,7 @@ QLabel#logoLabel {
<property name="font">
<font>
<family>Ubuntu</family>
<pointsize>25</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
@ -144,10 +139,15 @@ QLabel#logoLabel {
<bool>false</bool>
</property>
<property name="styleSheet">
<string notr="true"/>
<string notr="true">QLabel {
color : white;
font: 25pt &quot;Ubuntu&quot;;
background-color: rgba(0, 104, 200, 200);
border-radius: 15px;
}</string>
</property>
<property name="text">
<string/>
<string>Lubuntu - Welcome to the Next Universe</string>
</property>
<property name="textFormat">
<enum>Qt::MarkdownText</enum>
@ -207,7 +207,7 @@ QLabel#logoLabel {
<widget class="QLabel" name="label">
<property name="font">
<font>
<pointsize>14</pointsize>
<pointsize>20</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -221,7 +221,7 @@ QLabel#logoLabel {
<widget class="QComboBox" name="languageComboBox">
<property name="minimumSize">
<size>
<width>352</width>
<width>400</width>
<height>50</height>
</size>
</property>
@ -280,13 +280,13 @@ QLabel#logoLabel {
<widget class="QLabel" name="label_2">
<property name="font">
<font>
<pointsize>14</pointsize>
<pointsize>20</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Select a Wi-Fi Network:</string>
<string>Select a WiFi Network:</string>
</property>
</widget>
</item>
@ -294,7 +294,7 @@ QLabel#logoLabel {
<widget class="QComboBox" name="networkComboBox">
<property name="minimumSize">
<size>
<width>352</width>
<width>400</width>
<height>50</height>
</size>
</property>
@ -311,17 +311,18 @@ QLabel#logoLabel {
<property name="minimumSize">
<size>
<width>100</width>
<height>65</height>
<height>50</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>65</height>
<height>50</height>
</size>
</property>
<property name="font">
<font>
<pointsize>14</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -365,6 +366,7 @@ QLabel#logoLabel {
<widget class="QLabel" name="label_3">
<property name="font">
<font>
<pointsize>14</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -447,22 +449,20 @@ QLabel#logoLabel {
<widget class="QPushButton" name="tryLubuntu">
<property name="minimumSize">
<size>
<width>300</width>
<height>125</height>
<width>250</width>
<height>75</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>125</height>
<height>75</height>
</size>
</property>
<property name="font">
<font>
<family>Ubuntu</family>
<pointsize>24</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="toolTip">
@ -480,17 +480,7 @@ QToolTip {
}</string>
</property>
<property name="text">
<string> Try Lubuntu</string>
</property>
<property name="icon">
<iconset resource="resource.qrc">
<normaloff>:/symbol</normaloff>:/symbol</iconset>
</property>
<property name="iconSize">
<size>
<width>64</width>
<height>64</height>
</size>
<string>Try Lubuntu</string>
</property>
</widget>
</item>
@ -524,22 +514,20 @@ QToolTip {
<widget class="QPushButton" name="installLubuntu">
<property name="minimumSize">
<size>
<width>300</width>
<height>125</height>
<width>250</width>
<height>75</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>125</height>
<height>75</height>
</size>
</property>
<property name="font">
<font>
<family>Ubuntu</family>
<pointsize>24</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="toolTip">
@ -554,17 +542,7 @@ QToolTip {
}</string>
</property>
<property name="text">
<string> Install Lubuntu</string>
</property>
<property name="icon">
<iconset resource="resource.qrc">
<normaloff>:/installer</normaloff>:/installer</iconset>
</property>
<property name="iconSize">
<size>
<width>64</width>
<height>64</height>
</size>
<string>Install Lubuntu</string>
</property>
</widget>
</item>
@ -680,9 +658,7 @@ QToolTip {
<widget class="QLabel" name="connectionStatusLabel">
<property name="font">
<font>
<pointsize>18</pointsize>
<weight>75</weight>
<bold>true</bold>
<pointsize>16</pointsize>
</font>
</property>
<property name="text">
@ -723,8 +699,6 @@ QToolTip {
</widget>
<widget class="QStatusBar" name="statusbar"/>
</widget>
<resources>
<include location="resource.qrc"/>
</resources>
<resources/>
<connections/>
</ui>

View File

@ -5,21 +5,22 @@
int main(int argc, char *argv[])
{
QApplication app(argc, argv);
QList<InstallerPrompt*> ws;
QList<InstallerPrompt*> windows;
// Iterate through all available screens
for (QScreen *screen : QApplication::screens()) {
InstallerPrompt *w = new InstallerPrompt();
w->setGeometry(screen->geometry());
w->show();
ws.append(w);
InstallerPrompt *window = new InstallerPrompt();
window->setGeometry(screen->geometry());
window->show();
windows.append(window);
}
for (InstallerPrompt *w : ws) {
for (InstallerPrompt *otherWindow : ws) {
if (w != otherWindow) {
// Connect signals and slots to synchronize state across windows
for (InstallerPrompt *window : windows) {
for (InstallerPrompt *otherWindow : windows) {
if (window != otherWindow) {
// Connect signals and slots for synchronization
// Example: connect(ws.last(), &InstallerPrompt::someSignal, otherWindow, &InstallerPrompt::someSlot);
// Example: connect(window, &InstallerPrompt::someSignal, otherWindow, &InstallerPrompt::someSlot);
}
}
}

View File

@ -1,8 +0,0 @@
<RCC>
<qresource prefix="/">
<file alias="logo">../img/lubuntu-logo.png</file>
<file alias="background">../img/background.png</file>
<file alias="installer">../img/installer.png</file>
<file alias="symbol">../img/symbol.png</file>
</qresource>
</RCC>