From 95fb6af4c2965e135b09c1ddb7ada169a2df3b9c Mon Sep 17 00:00:00 2001 From: Nicolas Mailloux Date: Tue, 23 Aug 2022 11:43:25 -0400 Subject: [PATCH] Various fixes --- inkbox.pro | 6 +-- src/encfs/encryptionmanager.cpp | 4 +- src/encfs/encryptionmanager.h | 2 +- src/homeWidget/mainwindow.cpp | 24 +++++---- src/homeWidget/mainwindow.h | 4 +- src/reader/reader.cpp | 36 ++++++-------- src/resources/hide.png | Bin 1026 -> 13055 bytes src/resources/show.png | Bin 993 -> 13072 bytes src/settings/koboxsettings.cpp | 2 +- src/settings/koboxsettings.h | 4 +- src/settings/settings.cpp | 2 +- src/settings/settings.h | 4 +- .../{usbms_splash.cpp => usbmsSplash.cpp} | 23 ++++----- src/splash/{usbms_splash.h => usbmsSplash.h} | 12 ++--- .../{usbms_splash.ui => usbmsSplash.ui} | 4 +- src/widgets/dialogs/generaldialog.cpp | 2 +- src/widgets/dialogs/generaldialog.h | 4 +- src/widgets/dialogs/kobox/koboxappsdialog.cpp | 2 +- src/widgets/dialogs/kobox/koboxappsdialog.h | 4 +- src/widgets/dialogs/wifi/connectiondialog.cpp | 46 ++++++++++++++---- src/widgets/dialogs/wifi/connectiondialog.ui | 4 +- 21 files changed, 108 insertions(+), 81 deletions(-) rename src/splash/{usbms_splash.cpp => usbmsSplash.cpp} (94%) rename src/splash/{usbms_splash.h => usbmsSplash.h} (66%) rename src/splash/{usbms_splash.ui => usbmsSplash.ui} (97%) diff --git a/inkbox.pro b/inkbox.pro index a0c19d7..926528e 100644 --- a/inkbox.pro +++ b/inkbox.pro @@ -57,7 +57,7 @@ SOURCES += \ src/settings/settingschooser.cpp \ src/widgets/text/textwidget.cpp \ src/widgets/interfaceWidgets/toast.cpp \ - src/splash/usbms_splash.cpp \ + src/splash/usbmsSplash.cpp \ src/apps/userapps.cpp \ src/widgets/virtualKeyboard/virtualkeyboard.cpp \ src/widgets/virtualKeyboard/virtualkeypad.cpp \ @@ -100,7 +100,7 @@ HEADERS += \ src/settings/settingschooser.h \ src/widgets/text/textwidget.h \ src/widgets/interfaceWidgets/toast.h \ - src/splash/usbms_splash.h \ + src/splash/usbmsSplash.h \ src/apps/userapps.h \ src/widgets/virtualKeyboard/virtualkeyboard.h \ src/widgets/virtualKeyboard/virtualkeypad.h \ @@ -140,7 +140,7 @@ FORMS += \ src/settings/settingschooser.ui \ src/widgets/text/textwidget.ui \ src/widgets/interfaceWidgets/toast.ui \ - src/splash/usbms_splash.ui \ + src/splash/usbmsSplash.ui \ src/apps/userapps.ui \ src/widgets/virtualKeyboard/virtualkeyboard.ui \ src/widgets/virtualKeyboard/virtualkeypad.ui \ diff --git a/src/encfs/encryptionmanager.cpp b/src/encfs/encryptionmanager.cpp index 34a5e46..7493770 100644 --- a/src/encfs/encryptionmanager.cpp +++ b/src/encfs/encryptionmanager.cpp @@ -8,7 +8,7 @@ #include #include #include -#include "usbms_splash.h" +#include "usbmsSplash.h" #include "functions.h" encryptionManager::encryptionManager(QWidget *parent) : @@ -346,7 +346,7 @@ void encryptionManager::on_usbmsBtn_clicked() { log("Showing USBMS splash", className); global::usbms::launchUsbms = true; - usbmsWindow = new usbms_splash(); + usbmsWindow = new usbmsSplash(); usbmsWindow->setAttribute(Qt::WA_DeleteOnClose); usbmsWindow->setGeometry(QRect(QPoint(0,0), screen()->geometry ().size())); usbmsWindow->show(); diff --git a/src/encfs/encryptionmanager.h b/src/encfs/encryptionmanager.h index ac14c91..e90fdb3 100644 --- a/src/encfs/encryptionmanager.h +++ b/src/encfs/encryptionmanager.h @@ -48,7 +48,7 @@ private: toast * toastWindow; hourglassAnimationWidget * hourglassAnimationWidgetWindow; alert * alertWindow; - usbms_splash *usbmsWindow; + usbmsSplash *usbmsWindow; }; #endif // ENCRYPTIONMANAGER_H diff --git a/src/homeWidget/mainwindow.cpp b/src/homeWidget/mainwindow.cpp index 67a0df0..4b3406f 100644 --- a/src/homeWidget/mainwindow.cpp +++ b/src/homeWidget/mainwindow.cpp @@ -634,13 +634,13 @@ void MainWindow::setBatteryIcon() { stdIconHeight = sH / 16; QPixmap chargingPixmap(":/resources/battery_charging.png"); - QPixmap scaledChargingPixmap = chargingPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio); + QPixmap scaledChargingPixmap = chargingPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation); QPixmap fullPixmap(":/resources/battery_full.png"); - QPixmap scaledFullPixmap = fullPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio); + QPixmap scaledFullPixmap = fullPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation); QPixmap halfPixmap(":/resources/battery_half.png"); - QPixmap scaledHalfPixmap = halfPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio); + QPixmap scaledHalfPixmap = halfPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation); QPixmap emptyPixmap(":/resources/battery_empty.png"); - QPixmap scaledEmptyPixmap = emptyPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio); + QPixmap scaledEmptyPixmap = emptyPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation); // Checking battery level and status, then displaying the relevant icon on batteryIcon if(isUsbPluggedIn() == true) { @@ -664,13 +664,13 @@ void MainWindow::setBatteryIcon() { stdIconWidth = sW / 19; stdIconHeight = sH / 19; QPixmap chargingPixmap(":/resources/battery_charging.png"); - QPixmap scaledChargingPixmap = chargingPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio); + QPixmap scaledChargingPixmap = chargingPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation); QPixmap fullPixmap(":/resources/battery_full.png"); - QPixmap scaledFullPixmap = fullPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio); + QPixmap scaledFullPixmap = fullPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation); QPixmap halfPixmap(":/resources/battery_half.png"); - QPixmap scaledHalfPixmap = halfPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio); + QPixmap scaledHalfPixmap = halfPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation); QPixmap emptyPixmap(":/resources/battery_empty.png"); - QPixmap scaledEmptyPixmap = emptyPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio); + QPixmap scaledEmptyPixmap = emptyPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation); // Checking battery level and status, then displaying the relevant icon on batteryIcon if(isUsbPluggedIn() == true) { @@ -711,11 +711,12 @@ void MainWindow::setInitialBrightness() { // Coming from OOBE setup; not doing that fancy stuff again ;p QFile::remove("/tmp/oobe-inkbox_completed"); pre_set_brightness(brightness_value); + log("Ignoring cinematic brightness call because it has already been done", className); } else { // Fancy brightness fade-in - if(checkconfig("/tmp/inkbox-cinematic_brightness_auto") == true) { - QFile::remove("/tmp/inkbox-cinematic_brightness_auto"); + if(checkconfig("/tmp/inkbox-cinematicBrightness_auto") == true) { + QFile::remove("/tmp/inkbox-cinematicBrightness_auto"); cinematicBrightness(brightness_value, 2); } else { @@ -723,6 +724,9 @@ void MainWindow::setInitialBrightness() { string_writeconfig("/tmp/inkbox-cinematicBrightness_ran", "true"); cinematicBrightness(brightness_value, 0); } + else { + log("Ignoring cinematic brightness call because it has already been done", className); + } } } } diff --git a/src/homeWidget/mainwindow.h b/src/homeWidget/mainwindow.h index 539dfdd..b793017 100644 --- a/src/homeWidget/mainwindow.h +++ b/src/homeWidget/mainwindow.h @@ -8,7 +8,7 @@ #include "reader.h" #include "quit.h" #include "alert.h" -#include "usbms_splash.h" +#include "usbmsSplash.h" #include "brightnessdialog.h" #include "generaldialog.h" #include "koboxsettings.h" @@ -106,7 +106,7 @@ private: reader * readerWindow; quit * quitWindow; alert * alertWindow; - usbms_splash * usbmsWindow; + usbmsSplash * usbmsWindow; brightnessDialog * brightnessDialogWindow; generalDialog * generalDialogWindow; koboxSettings * koboxSettingsWindow; diff --git a/src/reader/reader.cpp b/src/reader/reader.cpp index 5893852..2c95bff 100644 --- a/src/reader/reader.cpp +++ b/src/reader/reader.cpp @@ -366,30 +366,24 @@ reader::reader(QWidget *parent) : float sH = QGuiApplication::screens()[0]->size().height(); // Defining what the icons' size will be if(checkconfig("/opt/inkbox_genuine") == true) { + float stdIconWidth; + float stdIconHeight; if(global::deviceID == "n705\n" or global::deviceID == "n905\n" or global::deviceID == "n613\n" or global::deviceID == "n236\n" or global::deviceID == "n437\n" or global::deviceID == "n306\n" or global::deviceID == "kt\n" or global::deviceID == "emu\n") { - float stdIconWidth = sW / 16; - float stdIconHeight = sW / 16; - QPixmap chargingPixmap(":/resources/battery_charging.png"); - scaledChargingPixmap = chargingPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio); - QPixmap fullPixmap(":/resources/battery_full.png"); - scaledFullPixmap = fullPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio); - QPixmap halfPixmap(":/resources/battery_half.png"); - scaledHalfPixmap = halfPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio); - QPixmap emptyPixmap(":/resources/battery_empty.png"); - scaledEmptyPixmap = emptyPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio); + stdIconWidth = sW / 16; + stdIconHeight = sW / 16; } else { - float stdIconWidth = sW / 19; - float stdIconHeight = sH / 19; - QPixmap chargingPixmap(":/resources/battery_charging.png"); - scaledChargingPixmap = chargingPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio); - QPixmap fullPixmap(":/resources/battery_full.png"); - scaledFullPixmap = fullPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio); - QPixmap halfPixmap(":/resources/battery_half.png"); - scaledHalfPixmap = halfPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio); - QPixmap emptyPixmap(":/resources/battery_empty.png"); - scaledEmptyPixmap = emptyPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio); + stdIconWidth = sW / 19; + stdIconHeight = sH / 19; } + QPixmap chargingPixmap(":/resources/battery_charging.png"); + scaledChargingPixmap = chargingPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation); + QPixmap fullPixmap(":/resources/battery_full.png"); + scaledFullPixmap = fullPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation); + QPixmap halfPixmap(":/resources/battery_half.png"); + scaledHalfPixmap = halfPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation); + QPixmap emptyPixmap(":/resources/battery_empty.png"); + scaledEmptyPixmap = emptyPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation); } else { float stdIconWidth = sW / 19; @@ -1282,7 +1276,7 @@ void reader::on_homeBtn_clicked() // Remount tmpfs string_writeconfig("/inkbox/remount", "true"); // Specify cinematic brightness mode - string_writeconfig("/tmp/inkbox-cinematic_brightness_auto", "true"); + string_writeconfig("/tmp/inkbox-cinematicBrightness_auto", "true"); // Relaunching process quit_restart(); diff --git a/src/resources/hide.png b/src/resources/hide.png index 5b643fd51b9569b5168578465098ab842f5613f8..3d2533ae71734c9850335fa58b43729c60012d6f 100644 GIT binary patch literal 13055 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 XfW~u&<2~uk2tZfM@J9J{)Z_mFxG4Ao literal 1026 zcmV+d1pWJoP)Px&yh%hsRA@u(n1QiPK@5iTDxd>YfC^9nDnJFO02QDDRDcRl0V+TTRKR>@b0#l# zlkB-?=AJuaXYRav-`$hVpZxigy=QXb>+Hn+m;V5coxxrPE{e#{V>?zo-vhw;4^R)9CM!qpw3@w4!u4F5IzGqea}R6_aJ&Tum%L#yCEWEj~AbBI%<7vpP?u3zlzBB zL+Lk?(FzEhye%U4JI+@90?Z2$dB0XTqCSv;AkswgLe<+~AF9WB&t`#Sjcf+Qr>0(j z!Xcuoa(r1tcv*V!-h*fVQxSPt4N3+8I~fQZW6kmz3PQg}B67(&4ES4>Y*YXcsn70! ztl5#qI`s~uK5!_an-_;L6C(gV^2i*~QMHIbWa?BYRBR9krPL6_XqY4NI#Q5&-;}b# z=2?o9NOL%!?>N9nhAHT{R+c-4}Kb0FC8gdkEU#d~Z6)SlGm& zh)#gudzD+{mB1{^1F*dR)trx1U={=i+h>R{N)s(I_ttD+zm6sU+{lnirB0S&Y!cOP z?(~Yp5>@4Qri7TsVN^}uFQDzi7U_@XToRnWh3#ceqa58QEKScvbZ{Vnf(c5cm0Mwe!U0n+KV&M>sXX|&ip(&583ES+h6b3cAv0g2F{a(W%ltA$pEn5&*uD(Ly*Ox;UM(c0H{IJ zK6B8OQvD#U^aW21jN{Oo$_3njs({eDM5t7i3|Irb%eQ_{HUPwn!x;$etWOY7He?ri zVau+pu)9EJ0bm42r~_UV#mTh(AP{Q+SXxnFM6#kfJs_GT`}|ZU4gp{t(jRjvKpn~b zFK_CsDw5I-J6TN(v$z$28Jdjtt^%wHvrQh_6T4K#9jgPKykN^Mx07*qoM6N<$g8e|wQ2+n{ diff --git a/src/resources/show.png b/src/resources/show.png index 0c0be28daacb9c7d185fe3ef7cbc47560b4a4605..0694e9ca122f444bc2543c6873731045945a3f84 100644 GIT binary patch literal 13072 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

Yh+XWl-eC*2`QJUrYlY7hh;>YG=csrF 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 literal 993 zcmV<710MW|P)Px&n@L1LRA@u(nSqfFK@f)fA|L}qfCvx)B0vO)01+SpWN;!t1c(3`5CQd7_5Z40 zznSUTw|8}}YNtxw+MDj_zyE)Fdgo5;l8=*19=~k>E}FrOfsKKc8Q3J`3A}1%cg*aT zncekwJoBFM+swZC^Jjnl;_p{+u$F;GX7)G)y)+oWyf?ECOAR&uSO71~>{-b0vFpnY zhTfRjtEG;X0ze+`%?i5_T;llUnL`E& zc4}cy!UJdWS~9{PK*})#fb4zp49X#azjXbUi%d))G5Cu>*!1_R#8d#Fo8VPVh=mP@ z{;Q0uDq%w~NNhA%gMC0@&|nQfsDd5Xj{u_%sRa&06Tg2Bs5bY{yPZ~P-J1ILSUm!4CwBO8Fa-a{t-_2nN3V7 zWgjs1ipyD)(FmH&`LNgoODo-?GRoRf*E3S0bW-M276C!O(>loLlXOnZRJ!t9>d_ao zT6TnuRsx$=D-rvosxi!+aPwRmHFE@@!-IfWaMaAf9CXKir==z`&)iX0OEX7rCBWbP z%sDtDt9Cj{L-HDRk;sX_TAz#BfCM+{t>|j$L^Xydd{qH*M~G7bJ4iZtF zwq%>E$IsTX6RrRdFpi^~ct-}2%hA^%Nn3n{;V)hmbY&B5X8>qEnU9})0s`IiK_gkT z_5#7um9ii5EeDCo7YNPjyaa$wUV!9V1Ra9$T7?Y8YZVHDu2+y(tJCGOfWRxc?Z7Mr zAVcUTb5+HeY3!JT)?sqC8C(rO4#*b&dR3setAttribute(Qt::WA_DeleteOnClose); usbmsWindow->setGeometry(QRect(QPoint(0,0), screen()->geometry ().size())); usbmsWindow->show(); diff --git a/src/settings/koboxsettings.h b/src/settings/koboxsettings.h index 43b254a..fbced89 100644 --- a/src/settings/koboxsettings.h +++ b/src/settings/koboxsettings.h @@ -4,7 +4,7 @@ #include #include "generaldialog.h" -#include "usbms_splash.h" +#include "usbmsSplash.h" namespace Ui { class koboxSettings; @@ -33,7 +33,7 @@ private slots: private: Ui::koboxSettings *ui; generalDialog *generalDialogWindow; - usbms_splash *usbmsWindow; + usbmsSplash *usbmsWindow; }; #endif // KOBOXSETTINGS_H diff --git a/src/settings/settings.cpp b/src/settings/settings.cpp index d48f141..3133a81 100644 --- a/src/settings/settings.cpp +++ b/src/settings/settings.cpp @@ -901,7 +901,7 @@ void settings::usbms_launch() log("Showing USBMS splash", className); global::usbms::launchUsbms = true; - usbmsWindow = new usbms_splash(); + usbmsWindow = new usbmsSplash(); usbmsWindow->setAttribute(Qt::WA_DeleteOnClose); usbmsWindow->setGeometry(QRect(QPoint(0,0), screen()->geometry ().size())); usbmsWindow->show(); diff --git a/src/settings/settings.h b/src/settings/settings.h index 4ad0205..0089283 100644 --- a/src/settings/settings.h +++ b/src/settings/settings.h @@ -3,7 +3,7 @@ #include -#include +#include #include "generaldialog.h" #include "otamanager.h" #include "toast.h" @@ -79,7 +79,7 @@ signals: private: Ui::settings *ui; - usbms_splash *usbmsWindow; + usbmsSplash *usbmsWindow; generalDialog *generalDialogWindow; otaManager *otaManagerWindow; toast *toastWindow; diff --git a/src/splash/usbms_splash.cpp b/src/splash/usbmsSplash.cpp similarity index 94% rename from src/splash/usbms_splash.cpp rename to src/splash/usbmsSplash.cpp index 774b9bd..b99fa90 100644 --- a/src/splash/usbms_splash.cpp +++ b/src/splash/usbmsSplash.cpp @@ -1,5 +1,5 @@ -#include "usbms_splash.h" -#include "ui_usbms_splash.h" +#include "usbmsSplash.h" +#include "ui_usbmsSplash.h" #include #include @@ -7,12 +7,12 @@ #include "functions.h" -usbms_splash::usbms_splash(QWidget *parent) : +usbmsSplash::usbmsSplash(QWidget *parent) : QWidget(parent), - ui(new Ui::usbms_splash) + ui(new Ui::usbmsSplash) { ui->setupUi(this); - usbms_splash::setFont(QFont("u001")); + usbmsSplash::setFont(QFont("u001")); ui->label->setFont(QFont("Inter")); // Getting the screen's size @@ -60,11 +60,11 @@ usbms_splash::usbms_splash(QWidget *parent) : if(global::usbms::launchUsbms == true) { global::usbms::launchUsbms = false; - usbms_launch(); + usbmsLaunch(); } } -void usbms_splash::usbms_launch() +void usbmsSplash::usbmsLaunch() { log("Entering USBMS session", className); string_writeconfig("/tmp/in_usbms", "true"); @@ -169,16 +169,17 @@ void usbms_splash::usbms_launch() usbms_t->start(); } -usbms_splash::~usbms_splash() +usbmsSplash::~usbmsSplash() { delete ui; } -void usbms_splash::brightnessDown() { +void usbmsSplash::brightnessDown() { cinematicBrightness(0, 1); + writeFile("/tmp/inkbox-cinematicBrightness_ran", "false"); } -void usbms_splash::quit_restart() { +void usbmsSplash::quit_restart() { // If existing, cleaning bookconfig_mount mountpoint string_writeconfig("/opt/ibxd", "bookconfig_unmount\n"); @@ -188,7 +189,7 @@ void usbms_splash::quit_restart() { qApp->quit(); } -void usbms_splash::restartServices() { +void usbmsSplash::restartServices() { // Restarting USBNet // NOTE: USBNet is only started if required conditions are met (see https://github.com/Kobo-InkBox/rootfs/blob/master/etc/init.d/usbnet) string_writeconfig("/opt/ibxd", "usbnet_start\n"); diff --git a/src/splash/usbms_splash.h b/src/splash/usbmsSplash.h similarity index 66% rename from src/splash/usbms_splash.h rename to src/splash/usbmsSplash.h index 3d8d8af..cce0038 100644 --- a/src/splash/usbms_splash.h +++ b/src/splash/usbmsSplash.h @@ -4,22 +4,22 @@ #include namespace Ui { -class usbms_splash; +class usbmsSplash; } -class usbms_splash : public QWidget +class usbmsSplash : public QWidget { Q_OBJECT public: QString className = this->metaObject()->className(); - explicit usbms_splash(QWidget *parent = nullptr); - ~usbms_splash(); + explicit usbmsSplash(QWidget *parent = nullptr); + ~usbmsSplash(); float sW; float sH; QString massStorageModule; - void usbms_launch(); + void usbmsLaunch(); private slots: void brightnessDown(); @@ -27,7 +27,7 @@ private slots: void restartServices(); private: - Ui::usbms_splash *ui; + Ui::usbmsSplash *ui; }; #endif // USBMS_SPLASH_H diff --git a/src/splash/usbms_splash.ui b/src/splash/usbmsSplash.ui similarity index 97% rename from src/splash/usbms_splash.ui rename to src/splash/usbmsSplash.ui index 5b4fde8..57b7cda 100644 --- a/src/splash/usbms_splash.ui +++ b/src/splash/usbmsSplash.ui @@ -1,7 +1,7 @@ - usbms_splash - + usbmsSplash + 0 diff --git a/src/widgets/dialogs/generaldialog.cpp b/src/widgets/dialogs/generaldialog.cpp index a3c78eb..c3d0db0 100644 --- a/src/widgets/dialogs/generaldialog.cpp +++ b/src/widgets/dialogs/generaldialog.cpp @@ -337,7 +337,7 @@ void generalDialog::on_okBtn_clicked() global::usbms::usbmsDialog = false; global::usbms::launchUsbms = true; - usbmsWindow = new usbms_splash(); + usbmsWindow = new usbmsSplash(); usbmsWindow->setAttribute(Qt::WA_DeleteOnClose); usbmsWindow->setGeometry(QRect(QPoint(0,0), screen()->geometry ().size())); usbmsWindow->show(); diff --git a/src/widgets/dialogs/generaldialog.h b/src/widgets/dialogs/generaldialog.h index a1e742c..9f91738 100644 --- a/src/widgets/dialogs/generaldialog.h +++ b/src/widgets/dialogs/generaldialog.h @@ -3,7 +3,7 @@ #include -#include "usbms_splash.h" +#include "usbmsSplash.h" #include "textwidget.h" #include "virtualkeyboard.h" #include "virtualkeypad.h" @@ -73,7 +73,7 @@ private slots: private: Ui::generalDialog *ui; - usbms_splash *usbmsWindow; + usbmsSplash *usbmsWindow; textwidget *textwidgetWindow; virtualkeyboard *keyboardWidget; virtualkeypad *keypadWidget; diff --git a/src/widgets/dialogs/kobox/koboxappsdialog.cpp b/src/widgets/dialogs/kobox/koboxappsdialog.cpp index 2a8dd8f..2ad0c50 100644 --- a/src/widgets/dialogs/kobox/koboxappsdialog.cpp +++ b/src/widgets/dialogs/kobox/koboxappsdialog.cpp @@ -166,7 +166,7 @@ void koboxAppsDialog::on_launchBtn_clicked() // Re-use USBMS splash window for KoBox splash, since it's pretty much the same layout log("Showing KoBox splash", className); - usbmsSplashWindow = new usbms_splash(); + usbmsSplashWindow = new usbmsSplash(); usbmsSplashWindow->setAttribute(Qt::WA_DeleteOnClose); usbmsSplashWindow->setGeometry(QRect(QPoint(0,0), screen()->geometry().size())); usbmsSplashWindow->show(); diff --git a/src/widgets/dialogs/kobox/koboxappsdialog.h b/src/widgets/dialogs/kobox/koboxappsdialog.h index f3861f3..fa95967 100644 --- a/src/widgets/dialogs/kobox/koboxappsdialog.h +++ b/src/widgets/dialogs/kobox/koboxappsdialog.h @@ -4,7 +4,7 @@ #include #include -#include "usbms_splash.h" +#include "usbmsSplash.h" namespace Ui { class koboxAppsDialog; @@ -36,7 +36,7 @@ signals: private: Ui::koboxAppsDialog *ui; - usbms_splash *usbmsSplashWindow; + usbmsSplash *usbmsSplashWindow; }; #endif // KOBOXAPPSDIALOG_H diff --git a/src/widgets/dialogs/wifi/connectiondialog.cpp b/src/widgets/dialogs/wifi/connectiondialog.cpp index cc097ab..eaf01d0 100644 --- a/src/widgets/dialogs/wifi/connectiondialog.cpp +++ b/src/widgets/dialogs/wifi/connectiondialog.cpp @@ -12,6 +12,9 @@ connectiondialog::connectiondialog(QWidget *parent) : { ui->setupUi(this); this->setFont(QFont("u001")); + ui->passphraseTextEdit->setFont(QFont("Noto Mono")); + ui->label->setFont(QFont("Inter")); + ui->label_2->setFont(QFont("Inter")); // Stylesheet, style & misc. QFile stylesheetFile("/mnt/onboard/.adds/inkbox/eink.qss"); @@ -19,15 +22,29 @@ connectiondialog::connectiondialog(QWidget *parent) : this->setStyleSheet(stylesheetFile.readAll()); stylesheetFile.close(); - ui->cancelBtn->setStyleSheet("font-size: 9pt"); - ui->connectBtn->setStyleSheet("font-size: 9pt"); - ui->showPassphraseBtn->setStyleSheet("font-size: 9pt"); + ui->cancelBtn->setProperty("type", "borderless"); + ui->connectBtn->setProperty("type", "borderless"); + ui->showPassphraseBtn->setProperty("type", "borderless"); + + ui->label->setStyleSheet("font-weight: bold"); + ui->label_2->setStyleSheet("font-weight: bold"); + + ui->cancelBtn->setIcon(QIcon(":/resources/close.png")); + ui->connectBtn->setIcon(QIcon(":/resources/arrow-right.png")); // Size QRect screenGeometry = QGuiApplication::screens()[0]->geometry(); - this->setFixedWidth(screenGeometry.width()); + this->setFixedWidth(screenGeometry.width() / 1.5); + int halfOfHalfHeight = ((screenGeometry.height() / 2) / 2) / 2; + int finalHeight = screenGeometry.height() - halfOfHalfHeight * 6.3; + this->setFixedHeight(finalHeight); + + // Centering dialog + int x = (screenGeometry.width() - this->width()) / 2; + int y = (screenGeometry.height() - this->height()) / 2; + this->move(x, y); } connectiondialog::~connectiondialog() @@ -63,12 +80,17 @@ void connectiondialog::applyVariables() { } QString passphrase = searchDatabase(connectedNetworkData.name); if(passphrase.isEmpty() == false) { - log("Found passphrase: " + passphrase, className); + log("Found passphrase: '" + passphrase + "'", className); ui->showPassphraseBtn->setIcon(QIcon(":/resources/show.png")); showedPassphrase = false; savedPassphrase = passphrase; - ui->passphraseTextEdit->setText("********"); + int passphraseLength = passphrase.length(); + QString hiddenPassphrase; + for(int i = 0; i < passphraseLength; i++) { + hiddenPassphrase.append("•"); + } + ui->passphraseTextEdit->setText(hiddenPassphrase); } else { log("No passphrase found", className); @@ -224,12 +246,12 @@ void connectiondialog::on_passphraseTextEdit_cursorPositionChanged(int oldpos, i global::keyboard::keyboardText = ""; } else { - log("Passphrase is not saved; ignoring text edit call", className); + log("Passphrase is not saved; ignoring text edit widget call", className); } } } else { - log("Ignoring click on text edit", className); + log("Ignoring click on text edit widget", className); cursorPositionIgnore = true; } } @@ -248,7 +270,13 @@ void connectiondialog::on_showPassphraseBtn_clicked() else { showedPassphrase = false; ui->showPassphraseBtn->setIcon(QIcon(":/resources/show.png")); - ui->passphraseTextEdit->setText("********"); + + int passphraseLength = searchDatabase(connectedNetworkData.name).length(); + QString hiddenPassphrase; + for(int i = 0; i < passphraseLength; i++) { + hiddenPassphrase.append("•"); + } + ui->passphraseTextEdit->setText(hiddenPassphrase); } } diff --git a/src/widgets/dialogs/wifi/connectiondialog.ui b/src/widgets/dialogs/wifi/connectiondialog.ui index b8ea219..7c97ade 100644 --- a/src/widgets/dialogs/wifi/connectiondialog.ui +++ b/src/widgets/dialogs/wifi/connectiondialog.ui @@ -22,7 +22,7 @@ - Cancel + @@ -62,7 +62,7 @@ - Connect +