From a532d00f485fca1068e08c6010ba5304427715ce Mon Sep 17 00:00:00 2001 From: Nicolas Mailloux Date: Tue, 13 Jul 2021 15:18:59 -0400 Subject: [PATCH] Wi-Fi button/icon in MainWindow Dialog's coming soon, hopefully ... --- eink.qrc | 3 + mainwindow.cpp | 84 ++++++++++++++++++ mainwindow.h | 6 ++ mainwindow.ui | 173 ++++++++++++++++++++----------------- resources/wifi-standby.png | Bin 3560 -> 3559 bytes 5 files changed, 188 insertions(+), 78 deletions(-) diff --git a/eink.qrc b/eink.qrc index 06dc549..25d1780 100644 --- a/eink.qrc +++ b/eink.qrc @@ -57,5 +57,8 @@ resources/fonts/IbarraRealNova-Medium.ttf resources/fonts/IbarraRealNova-BoldItalic.ttf resources/fonts/IbarraRealNova-Bold.ttf + resources/wifi-connected.png + resources/wifi-off.png + resources/wifi-standby.png diff --git a/mainwindow.cpp b/mainwindow.cpp index 6676aac..f1353c9 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -36,6 +36,7 @@ MainWindow::MainWindow(QWidget *parent) ui->pushButton->setProperty("type", "borderless"); ui->brightnessBtn->setProperty("type", "borderless"); ui->homeBtn->setProperty("type", "borderless"); + ui->wifiBtn->setProperty("type", "borderless"); ui->settingsBtn->setText(""); ui->appsBtn->setText(""); @@ -45,6 +46,7 @@ MainWindow::MainWindow(QWidget *parent) ui->brightnessBtn->setText(""); ui->homeBtn->setText(""); ui->quoteLabel->setText(""); + ui->wifiBtn->setText(""); ui->quotePictureLabel->setText(""); @@ -72,6 +74,8 @@ MainWindow::MainWindow(QWidget *parent) brightnessIconHeight = sH / 24; homeIconWidth = sW / 18; homeIconHeight = sW / 18; + wifiIconWidth = sW / 20; + wifiIconHeight = sH / 20; } else if(checkconfig_str_val == "n905\n") { stdIconWidth = sW / 14; @@ -80,6 +84,8 @@ MainWindow::MainWindow(QWidget *parent) brightnessIconHeight = sH / 26; homeIconWidth = sW / 20; homeIconHeight = sW / 20; + wifiIconWidth = sW / 22; + wifiIconHeight = sH / 22; } else if(checkconfig_str_val == "n613\n") { stdIconWidth = sW / 12.5; @@ -88,6 +94,8 @@ MainWindow::MainWindow(QWidget *parent) brightnessIconHeight = sH / 24.5; homeIconWidth = sW / 18.5; homeIconHeight = sW / 18.5; + wifiIconWidth = sW / 20.5; + wifiIconHeight = sH / 20.5; } else { stdIconWidth = sW / 14; @@ -96,6 +104,8 @@ MainWindow::MainWindow(QWidget *parent) brightnessIconHeight = sH / 26; homeIconWidth = sW / 20; homeIconHeight = sW / 20; + wifiIconWidth = sW / 22; + wifiIconHeight = sH / 22; } // Setting icons up @@ -116,6 +126,8 @@ MainWindow::MainWindow(QWidget *parent) ui->brightnessBtn->setIcon(QIcon(":/resources/frontlight.png")); ui->brightnessBtn->setIconSize(QSize(brightnessIconWidth, brightnessIconHeight)); + setWifiIcon(); + updateWifiIcon(0); setBatteryIcon(); int id = QFontDatabase::addApplicationFont(":/resources/fonts/CrimsonPro-Regular.ttf"); @@ -132,6 +144,7 @@ MainWindow::MainWindow(QWidget *parent) ui->book4Btn->setStyleSheet("font-size: 11pt; padding: 25px"); ui->brightnessBtn->setStyleSheet("font-size: 9pt; padding-bottom: 5px; padding-top: 5px; padding-left: 8px; padding-right: 8px;"); + ui->wifiBtn->setStyleSheet("font-size: 9pt; padding-bottom: 0px; padding-top: 0px; padding-left: 8px; padding-right: 8px"); // Checking if we have a Mini or Touch there string_checkconfig_ro("/opt/inkbox_device"); @@ -141,6 +154,9 @@ MainWindow::MainWindow(QWidget *parent) else if(checkconfig_str_val == "n613\n") { ui->batteryIcon->setStyleSheet("font-size: 5pt; padding-bottom: 0px; padding-top: 0px; padding-left: 0px; padding-right: 0px;"); } + else if(checkconfig_str_val == "n873\n") { + ui->batteryIcon->setStyleSheet("font-size: 5pt; padding-bottom: 0px; padding-top: 0px; padding-left: 0px; padding-right: 0px;"); + } else { ui->batteryIcon->setStyleSheet("font-size: 5pt; padding-bottom: 0px; padding-top: 0px; padding-left: 8px; padding-right: 8px;"); } @@ -823,3 +839,71 @@ void MainWindow::setupSearchDialog() { ; } } + +int MainWindow::testPing() { + QString pingProg = "ping"; + QStringList pingArgs; + pingArgs << "-c" << "1" << "1.1.1.1"; + QProcess *pingProcess = new QProcess(); + pingProcess->start(pingProg, pingArgs); + pingProcess->waitForFinished(); + return pingProcess->exitCode(); +} + +void MainWindow::updateWifiIcon(int mode) { + /* Usage: + * mode 0: auto + * mode 1: off + * mode 2: standby + * mode 3: connected + */ + if(mode == 0) { + QTimer *wifiIconTimer = new QTimer(this); + wifiIconTimer->setInterval(60000); + connect(wifiIconTimer, SIGNAL(timeout()), this, SLOT(setWifiIcon())); + wifiIconTimer->start(); + } + if(mode == 1) { + ui->wifiBtn->setIcon(QIcon(":/resources/wifi-off.png")); + ui->wifiBtn->setIconSize(QSize(wifiIconWidth, wifiIconHeight)); + } + if(mode == 2) { + ui->wifiBtn->setIcon(QIcon(":/resources/wifi-standby.png")); + ui->wifiBtn->setIconSize(QSize(wifiIconWidth, wifiIconHeight)); + } + if(mode == 3) { + ui->wifiBtn->setIcon(QIcon(":/resources/wifi-connected.png")); + ui->wifiBtn->setIconSize(QSize(wifiIconWidth, wifiIconHeight)); + } +} + +bool MainWindow::checkWifiState() { + /* Return value: + * true: interface UP + * false: interface DOWN + */ + string_checkconfig_ro("/sys/class/net/eth0/operstate"); + if(checkconfig_str_val == "up\n") { + return true; + } + else { + return false; + } +} + +void MainWindow::setWifiIcon() { + if(checkWifiState() == true) { + if(testPing() == 0) { + ui->wifiBtn->setIcon(QIcon(":/resources/wifi-connected.png")); + ui->wifiBtn->setIconSize(QSize(wifiIconWidth, wifiIconHeight)); + } + else { + ui->wifiBtn->setIcon(QIcon(":/resources/wifi-standby.png")); + ui->wifiBtn->setIconSize(QSize(wifiIconWidth, wifiIconHeight)); + } + } + else { + ui->wifiBtn->setIcon(QIcon(":/resources/wifi-off.png")); + ui->wifiBtn->setIconSize(QSize(wifiIconWidth, wifiIconHeight)); + } +} diff --git a/mainwindow.h b/mainwindow.h index 65c92e7..c267a44 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -36,6 +36,8 @@ public: float brightnessIconHeight; float homeIconWidth; float homeIconHeight; + float wifiIconWidth; + float wifiIconHeight; float sW; float sH; @@ -51,6 +53,9 @@ public: void resetWindow(bool resetStackedWidget); void resetIcons(); void setBatteryIcon(); + void updateWifiIcon(int mode); + int testPing(); + bool checkWifiState(); public slots: @@ -70,6 +75,7 @@ private slots: void on_homeBtn_clicked(); void refreshScreen(); void setupSearchDialog(); + void setWifiIcon(); private: Ui::MainWindow *ui; diff --git a/mainwindow.ui b/mainwindow.ui index ec87f6e..ef9de69 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -17,60 +17,20 @@ - - + + + + QFrame::Plain + - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Brightness + Qt::Vertical - - - - - 75 - true - - + + - batt - - - - - - - ― - - - - - - - - 11 - 75 - true - - - - time - - - Qt::AlignCenter + Home @@ -89,13 +49,6 @@ - - - - batteryIcon - - - @@ -103,6 +56,57 @@ + + + + ― + + + + + + + Wi-Fi + + + + + + + Brightness + + + + + + + QFrame::Plain + + + Qt::Vertical + + + + + + + batteryIcon + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -116,30 +120,43 @@ - - - - QFrame::Plain + + + + + 75 + true + - - Qt::Vertical - - - - - - - QFrame::Plain - - - Qt::Vertical - - - - - - Home + batt + + + + + + + + 11 + 75 + true + + + + time + + + Qt::AlignCenter + + + + + + + QFrame::Plain + + + Qt::Vertical diff --git a/resources/wifi-standby.png b/resources/wifi-standby.png index 2d6427b04db66826782da75cdd2769be69dd665d..5fa26f2985c2504edd114e132f33eef64d59f120 100644 GIT binary patch literal 3559 zcmdUxd010d7QoMYSp~A7fFNKJ&;b=SRE1cO1fmtn)U_&%3jvFkRtbu-2!RJdUv{pwEZPM05}2ui&p{QNX3E8MB;Va-9Z2>EkZ6|5g?ZfqjoB{L~IKOaNV!k zzsSF4h1K5WtB*U)=Jp8N_Z7bz%(vcgccxXb-%0D=>=wuWSuj7sf7J#DMsuoKnze>C zdFw{U4GdoctG2N*;P#UDFVCHEKC|yihwAItn{C=5C=L$)>fSu=$CtKmSry=(7h)|x z%NC`&;+gdg?{rO@!D$`5bi(IU1^wpB-k~z5PpZRYvT29I(<3G+`OB3Lm`_#hwzF=` z>|5BEA24}ZQs<@iKKrM?yMf=#F1X*|y(2rwZTGo5btT(Asa;*WW6cjULaxV`>}+W- zS@XO^wS4qSly69I*SlvzztLn)_vaTE<(Qq)>@V8rQs49F{zk(dzW9~_M`*i8K}Ki5NX z$jI6i@WB$+6BcI@E@_f?L;#p~1}ygdFz!LmW8X;oz=^Q(+oH|U_xmqQW^Rj{zVf5M zjn=(qSo!X23ha(bM;}E}FZh2LWb)Oe@ae_Y-m0~x)_8{uEsjIbKz^k^l%G!~hWrpfe$Ujl2tT7CfG`Ded?+9pCip*t8Xo)K0HTH`r1Oyy(3EKQiKFuu zVu}f&ZHhVWc{rI`?N|LMERsPmQjez;T>Z5R_ zz-ppWRN?C;KuwyO7n3(K9V~cUscx&W0K{(TbWLlwC#DcvFceSk$K#~X7D(=S8iQEc zdz%(>ROJfZyK)^g&OQE^J~ZJjp^6CU!b!O?6Z5*u{hUE$Jim<_f3KQi4!QT_jPA7+ z3#?%3iDNunxpBK2c)yn+&?NM<1VJ3Zl`41-Yl^|3cSw@4bvMp|;rh6C8)=$xtr^jM z<60}S#Zj6ex+2lrHkUze>g{>c=kLu2ugda{YsU<(&^_GJB;Zv$gJvvYD0$f6m<;7b zv8=1SM{O)VradH1x<#e$+2f2p^==cEChOglE%>$rC45ip=3#J50?S(!q7K$ml-HD& zMRroRYXTYl^^1CwXdy~?QS9ccysIb_u1%PiWSb);*v}pp_Q|8hLou}j*Bz3f;=PwzwTf1B-uqo>Wm-jkp#*B$eNU*b@4yY)Wo=vDPAXHksOVEI z$Rxdq!TQf;zaqtEXbt`%UVaiB&C9>m+Ld0m}v7aeo9R`cfP^8l4Ib= z&K-1fb%=@195~&y#sl0O-Rz>xp4jJEKp-Ql)nvVmF2w#=z4fmiCCNK^Nr77wsk!1XaQ>k9i`LeQV(;#$d|Zn{*|}A&jk1JBJ(XKWnw=jJilK)|MW;T zC$|j~$yB-8_K}8}$x$_73YmrCtoDVr;og{@SrbL@$Sb!CGPG@Wi94W9-3f}$WeEMGJ)4Kx=uCF0dxW|(4S z=)%yZ2Gj%muDo-lyTFT1Fw&l=gXd?l!JL)FEQ|241e@$Se9OHOCvcl|gWgd3oizjr z53=&Z%iKUCb~6(ZQ@x0t&@xhxGT zu@wf?V_bC8agv;}RaLKsAr=X%kG*3dlzf!RkgTEh%4OK;$$D32h;ir@Lo3lZ2 z;8>E)Idt#SnQob*hMes6)@0{xjf8 z{r(CJ7B_omWTkz5QyGZz~9WsdFwiy2~=r}gN~nEov4_jZ0cnOXPnx< zUgJ-wj>ezV?D2Y_rsYT}f61s2*T*EhvIO=9It1mQe+r7T00J##0Kzy+P}t#Y0Q6wU zQ&yt1ro!7taEa@;Bz>AjV;hHN+4F(CnlXBNY*Q$;DxEs%P}NE+0>Hz|6fzJ^T?oi@ zRtO(i97ZyHXztLeOr#H=uYVc)TFX-67!>bSexES8g|V*lERZ{^hPOUDOD$rJV06P? zxSSJSH@&1%=a|%6mr(5qde5XpXS7iX$K=z|Cat5Ah4w|Osqb?@dogC@gQmXzoXa9Q zq#Z0j-s2d*lnw0JO7n;7UmoNGfBhqy3+0`&MIbzXarURZ-zWHiY+J@J^v(1o;NOqZkuUnb+6gT0IpCi^E!@$tO%JL)*%y$ ziINS;rqgCHst=U^cQW>_EcK@UBt+v={6wgq12~D$^$)%Be>sly*}uHRx@kImvx@qR NfF;Wom-;DE{{lkv$f5uM literal 3560 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