From 6874b729c3dfcd738e8111c3ed53afc272cf9987 Mon Sep 17 00:00:00 2001 From: Nicolas Mailloux Date: Sun, 3 Apr 2022 23:26:15 -0400 Subject: [PATCH] Design improvements --- apps.cpp | 2 +- bookinfodialog.cpp | 2 +- brightnessdialog.cpp | 2 +- calendarapp.cpp | 5 ++++- encryptionmanager.cpp | 2 +- generaldialog.cpp | 2 +- koboxappsdialog.cpp | 2 +- koboxsettings.cpp | 2 +- main.cpp | 2 +- mainwindow.cpp | 2 +- quit.cpp | 2 +- reader.cpp | 6 +++--- savedwords.cpp | 12 +++++++++++- settings.cpp | 4 +++- settingschooser.cpp | 2 +- textwidget.cpp | 2 +- usbms_splash.cpp | 2 +- wifidialog.cpp | 2 +- 18 files changed, 35 insertions(+), 20 deletions(-) diff --git a/apps.cpp b/apps.cpp index dbdfedb..5ea135f 100644 --- a/apps.cpp +++ b/apps.cpp @@ -61,7 +61,7 @@ apps::apps(QWidget *parent) : ui->lightmapsLaunchBtn->deleteLater(); } - QFile stylesheetFile("eink.qss"); + QFile stylesheetFile("/mnt/onboard/.adds/inkbox/eink.qss"); stylesheetFile.open(QFile::ReadOnly); this->setStyleSheet(stylesheetFile.readAll()); stylesheetFile.close(); diff --git a/bookinfodialog.cpp b/bookinfodialog.cpp index f04a04e..7f01c63 100644 --- a/bookinfodialog.cpp +++ b/bookinfodialog.cpp @@ -11,7 +11,7 @@ bookInfoDialog::bookInfoDialog(QWidget *parent) : ui->setupUi(this); // Stylesheet - QFile stylesheetFile("eink.qss"); + QFile stylesheetFile("/mnt/onboard/.adds/inkbox/eink.qss"); stylesheetFile.open(QFile::ReadOnly); this->setStyleSheet(stylesheetFile.readAll()); stylesheetFile.close(); diff --git a/brightnessdialog.cpp b/brightnessdialog.cpp index 6fce464..e37de03 100644 --- a/brightnessdialog.cpp +++ b/brightnessdialog.cpp @@ -15,7 +15,7 @@ brightnessDialog::brightnessDialog(QWidget *parent) : brightnessDialog::setFont(QFont("u001")); // Stylesheet, style & misc. - QFile stylesheetFile("eink.qss"); + QFile stylesheetFile("/mnt/onboard/.adds/inkbox/eink.qss"); stylesheetFile.open(QFile::ReadOnly); this->setStyleSheet(stylesheetFile.readAll()); stylesheetFile.close(); diff --git a/calendarapp.cpp b/calendarapp.cpp index 734c90b..fec6610 100644 --- a/calendarapp.cpp +++ b/calendarapp.cpp @@ -8,9 +8,12 @@ calendarApp::calendarApp(QWidget *parent) : ui(new Ui::calendarApp) { ui->setupUi(this); + calendarApp::setFont(QFont("u001")); + ui->backBtn->setFont(QFont("Inter")); + ui->backBtn->setStyleSheet("font-weight: bold"); // Stylesheet - QFile stylesheetFile("eink.qss"); + QFile stylesheetFile("/mnt/onboard/.adds/inkbox/eink.qss"); stylesheetFile.open(QFile::ReadOnly); this->setStyleSheet(stylesheetFile.readAll()); stylesheetFile.close(); diff --git a/encryptionmanager.cpp b/encryptionmanager.cpp index 695f1d9..16939a8 100644 --- a/encryptionmanager.cpp +++ b/encryptionmanager.cpp @@ -26,7 +26,7 @@ encryptionManager::encryptionManager(QWidget *parent) : ui->warningDescriptionLabel->setFont(QFont("u001")); // Stylesheet - QFile stylesheetFile("eink.qss"); + QFile stylesheetFile("/mnt/onboard/.adds/inkbox/eink.qss"); stylesheetFile.open(QFile::ReadOnly); this->setStyleSheet(stylesheetFile.readAll()); stylesheetFile.close(); diff --git a/generaldialog.cpp b/generaldialog.cpp index c018465..959edff 100644 --- a/generaldialog.cpp +++ b/generaldialog.cpp @@ -33,7 +33,7 @@ generalDialog::generalDialog(QWidget *parent) : stylesheetFile.close(); } else { - QFile stylesheetFile("eink.qss"); + QFile stylesheetFile("/mnt/onboard/.adds/inkbox/eink.qss"); stylesheetFile.open(QFile::ReadOnly); this->setStyleSheet(stylesheetFile.readAll()); stylesheetFile.close(); diff --git a/koboxappsdialog.cpp b/koboxappsdialog.cpp index d4259f2..154ff85 100644 --- a/koboxappsdialog.cpp +++ b/koboxappsdialog.cpp @@ -21,7 +21,7 @@ koboxAppsDialog::koboxAppsDialog(QWidget *parent) : this->setModal(true); // Stylesheet, style & misc. - QFile stylesheetFile("eink.qss"); + QFile stylesheetFile("/mnt/onboard/.adds/inkbox/eink.qss"); stylesheetFile.open(QFile::ReadOnly); this->setStyleSheet(stylesheetFile.readAll()); stylesheetFile.close(); diff --git a/koboxsettings.cpp b/koboxsettings.cpp index 2006593..02ec460 100644 --- a/koboxsettings.cpp +++ b/koboxsettings.cpp @@ -22,7 +22,7 @@ koboxSettings::koboxSettings(QWidget *parent) : ui->okBtn->setStyleSheet("font-weight: bold"); // Stylesheet - QFile stylesheetFile("eink.qss"); + QFile stylesheetFile("/mnt/onboard/.adds/inkbox/eink.qss"); stylesheetFile.open(QFile::ReadOnly); this->setStyleSheet(stylesheetFile.readAll()); stylesheetFile.close(); diff --git a/main.cpp b/main.cpp index 2b4b29c..bbc352c 100644 --- a/main.cpp +++ b/main.cpp @@ -178,7 +178,7 @@ int main(int argc, char *argv[]) MainWindow w; QApplication::setStyle("windows"); - QFile stylesheetFile("eink.qss"); + QFile stylesheetFile("/mnt/onboard/.adds/inkbox/eink.qss"); stylesheetFile.open(QFile::ReadOnly); w.setStyleSheet(stylesheetFile.readAll()); stylesheetFile.close(); diff --git a/mainwindow.cpp b/mainwindow.cpp index 79a12df..75f80e2 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -191,7 +191,7 @@ MainWindow::MainWindow(QWidget *parent) } // Stylesheet - QFile stylesheetFile("eink.qss"); + QFile stylesheetFile("/mnt/onboard/.adds/inkbox/eink.qss"); stylesheetFile.open(QFile::ReadOnly); this->setStyleSheet(stylesheetFile.readAll()); stylesheetFile.close(); diff --git a/quit.cpp b/quit.cpp index e41c02d..d9c1790 100644 --- a/quit.cpp +++ b/quit.cpp @@ -22,7 +22,7 @@ quit::quit(QWidget *parent) : ui->backBtn->setProperty("type", "borderless"); // Stylesheet - QFile stylesheetFile("eink.qss"); + QFile stylesheetFile("/mnt/onboard/.adds/inkbox/eink.qss"); stylesheetFile.open(QFile::ReadOnly); this->setStyleSheet(stylesheetFile.readAll()); stylesheetFile.close(); diff --git a/reader.cpp b/reader.cpp index 5d8919e..9f58cb0 100644 --- a/reader.cpp +++ b/reader.cpp @@ -41,7 +41,7 @@ reader::reader(QWidget *parent) : ui->brightnessStatus->setFont(QFont("u001")); ui->fontLabel->setFont(QFont("u001")); ui->sizeLabel->setFont(QFont("u001")); - ui->sizeValueLabel->setFont(QFont("u001")); + ui->sizeValueLabel->setFont(QFont("Inter")); ui->alignmentLabel->setFont(QFont("u001")); ui->fontChooser->setFont(QFont("u001")); ui->definitionStatusLabel->setFont(QFont("u001")); @@ -124,7 +124,7 @@ reader::reader(QWidget *parent) : QFont crimson(family); // Stylesheet + misc. - QFile stylesheetFile("eink.qss"); + QFile stylesheetFile("/mnt/onboard/.adds/inkbox/eink.qss"); stylesheetFile.open(QFile::ReadOnly); this->setStyleSheet(stylesheetFile.readAll()); stylesheetFile.close(); @@ -294,7 +294,7 @@ reader::reader(QWidget *parent) : ui->previousBtn->setStyleSheet("padding: 13.5px"); ui->optionsBtn->setStyleSheet("padding: 13.5px"); } - ui->sizeValueLabel->setStyleSheet("font-size: 9pt"); + ui->sizeValueLabel->setStyleSheet("font-size: 9pt; font-weight: bold"); ui->homeBtn->setStyleSheet("font-size: 9pt; padding: 5px"); ui->aboutBtn->setStyleSheet("font-size: 9pt; padding: 5px"); ui->fontChooser->setStyleSheet("font-size: 9pt"); diff --git a/savedwords.cpp b/savedwords.cpp index 08b4b3a..6b35641 100644 --- a/savedwords.cpp +++ b/savedwords.cpp @@ -10,13 +10,23 @@ savedwords::savedwords(QWidget *parent) : { ui->setupUi(this); savedwords::setFont(QFont("u001")); - QFile stylesheetFile("eink.qss"); + ui->savedWordsLabel->setFont(QFont("Inter")); + ui->backBtn->setFont(QFont("Inter")); + ui->clearBtn->setFont(QFont("Inter")); + + QFile stylesheetFile("/mnt/onboard/.adds/inkbox/eink.qss"); stylesheetFile.open(QFile::ReadOnly); this->setStyleSheet(stylesheetFile.readAll()); stylesheetFile.close(); + ui->backBtn->setProperty("type", "borderless"); ui->clearBtn->setProperty("type", "borderless"); + ui->savedWordsLabel->setStyleSheet("font-weight: bold"); + ui->wordsList->setStyleSheet("font-size: 10pt"); + ui->backBtn->setStyleSheet("font-weight: bold"); + ui->clearBtn->setStyleSheet("font-weight: bold"); + checkwords(); QStringListModel * model = new QStringListModel(this); diff --git a/settings.cpp b/settings.cpp index b58db15..b895600 100644 --- a/settings.cpp +++ b/settings.cpp @@ -27,6 +27,7 @@ settings::settings(QWidget *parent) : ui->comboBox->setFont(QFont("u001")); ui->tzComboBox->setFont(QFont("u001")); ui->sleepTimeoutComboBox->setFont(QFont("u001")); + ui->uiScaleNumberLabel->setFont(QFont("Inter")); ui->aboutBtn->setFont(QFont("u001")); ui->okBtn->setFont(QFont("Inter")); @@ -58,6 +59,7 @@ settings::settings(QWidget *parent) : ui->sleepTimeoutComboBox->setStyleSheet("font-size: 9pt"); ui->setPasscodeBtn->setStyleSheet("font-size: 9pt"); ui->repackBtn->setStyleSheet("font-size: 9pt"); + ui->uiScaleNumberLabel->setStyleSheet("font-size: 9pt; font-weight: bold"); ui->previousBtn->setText(""); ui->previousBtn->setIcon(QIcon(":/resources/chevron-left.png")); @@ -381,7 +383,7 @@ settings::settings(QWidget *parent) : ui->checkOtaUpdateGridLayout->deleteLater(); } - QFile stylesheetFile("eink.qss"); + QFile stylesheetFile("/mnt/onboard/.adds/inkbox/eink.qss"); stylesheetFile.open(QFile::ReadOnly); this->setStyleSheet(stylesheetFile.readAll()); stylesheetFile.close(); diff --git a/settingschooser.cpp b/settingschooser.cpp index 250629f..b3d15f2 100644 --- a/settingschooser.cpp +++ b/settingschooser.cpp @@ -12,7 +12,7 @@ settingsChooser::settingsChooser(QWidget *parent) : ui->setupUi(this); // Stylesheet - QFile stylesheetFile("eink.qss"); + QFile stylesheetFile("/mnt/onboard/.adds/inkbox/eink.qss"); stylesheetFile.open(QFile::ReadOnly); this->setStyleSheet(stylesheetFile.readAll()); stylesheetFile.close(); diff --git a/textwidget.cpp b/textwidget.cpp index f65969f..8fb1d0a 100644 --- a/textwidget.cpp +++ b/textwidget.cpp @@ -13,7 +13,7 @@ textwidget::textwidget(QWidget *parent) : ui->textBrowser->setFont(QFont("u001")); // Stylesheet - QFile stylesheetFile("eink.qss"); + QFile stylesheetFile("/mnt/onboard/.adds/inkbox/eink.qss"); stylesheetFile.open(QFile::ReadOnly); this->setStyleSheet(stylesheetFile.readAll()); stylesheetFile.close(); diff --git a/usbms_splash.cpp b/usbms_splash.cpp index eb6b544..c7967fb 100644 --- a/usbms_splash.cpp +++ b/usbms_splash.cpp @@ -24,7 +24,7 @@ usbms_splash::usbms_splash(QWidget *parent) : float stdIconHeight = sH / 1.30; // Stylesheet - QFile stylesheetFile("eink.qss"); + QFile stylesheetFile("/mnt/onboard/.adds/inkbox/eink.qss"); stylesheetFile.open(QFile::ReadOnly); this->setStyleSheet(stylesheetFile.readAll()); stylesheetFile.close(); diff --git a/wifidialog.cpp b/wifidialog.cpp index d413394..f1a176d 100644 --- a/wifidialog.cpp +++ b/wifidialog.cpp @@ -17,7 +17,7 @@ wifiDialog::wifiDialog(QWidget *parent) : wifiListTimer = new QTimer(this); // Stylesheet, style & misc. - QFile stylesheetFile("eink.qss"); + QFile stylesheetFile("/mnt/onboard/.adds/inkbox/eink.qss"); stylesheetFile.open(QFile::ReadOnly); this->setStyleSheet(stylesheetFile.readAll()); stylesheetFile.close();