From 5440d0e3b0bf33a9123b75de9520cf0ec6e44bdb Mon Sep 17 00:00:00 2001 From: hawkeyexp Date: Wed, 23 May 2018 18:11:31 +0200 Subject: [PATCH] [gui][script] Switchable day/night mode --- assets/day-hot.png | Bin 0 -> 3860 bytes assets/night-hot.png | Bin 0 -> 3491 bytes assets/resources.qrc | 2 + .../f1x/openauto/autoapp/UI/MainWindow.hpp | 4 + src/autoapp/UI/MainWindow.cpp | 60 ++++++++++++--- src/autoapp/UI/mainwindow.ui | 70 ++++++++++++++++++ src/autoapp/autoapp.cpp | 18 +++++ 7 files changed, 145 insertions(+), 9 deletions(-) create mode 100644 assets/day-hot.png create mode 100644 assets/night-hot.png diff --git a/assets/day-hot.png b/assets/day-hot.png new file mode 100644 index 0000000000000000000000000000000000000000..2e7a185c234422dd6248f2ea0bad1d9f4fd3d91f GIT binary patch literal 3860 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 RLhb+n002ovPDHLkV1jP>XW;+< literal 0 HcmV?d00001 diff --git a/assets/resources.qrc b/assets/resources.qrc index f952e89..6d5a501 100644 --- a/assets/resources.qrc +++ b/assets/resources.qrc @@ -15,5 +15,7 @@ wifi-hot.png brightness-hot.png camera-hot.png + day-hot.png + night-hot.png diff --git a/include/f1x/openauto/autoapp/UI/MainWindow.hpp b/include/f1x/openauto/autoapp/UI/MainWindow.hpp index d75556a..f5afce2 100644 --- a/include/f1x/openauto/autoapp/UI/MainWindow.hpp +++ b/include/f1x/openauto/autoapp/UI/MainWindow.hpp @@ -48,6 +48,8 @@ signals: void exit(); void openSettings(); void toggleCursor(); + void TriggerScriptDay(); + void TriggerScriptNight(); void toggleCamera(); void openConnectDialog(); void showBrightnessSlider(); @@ -57,6 +59,8 @@ private slots: private slots: void on_pushButtonBrightness_clicked(); + void switchGuiToDay(); + void switchGuiToNight(); private: Ui::MainWindow* ui_; diff --git a/src/autoapp/UI/MainWindow.cpp b/src/autoapp/UI/MainWindow.cpp index a873435..d62cf3e 100644 --- a/src/autoapp/UI/MainWindow.cpp +++ b/src/autoapp/UI/MainWindow.cpp @@ -41,16 +41,23 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi QPushButton:focus { background: url(:/circle.png); } \ QPushButton:pressed { background: url(:/circle-pressed.png); } \ "); - QFileInfo wallpaperFile("wallpaper.png"); - bool wallpaperFileExists = wallpaperFile.exists(); - if (wallpaperFile.isSymLink()) { - QFileInfo linkTarget(wallpaperFile.symLinkTarget()); - wallpaperFileExists = linkTarget.exists(); + QFileInfo wallpaperDayFile("wallpaper.png"); + bool wallpaperDayFileExists = wallpaperDayFile.exists(); + + QFileInfo wallpaperNightFile("wallpaper-night.png"); + bool wallpaperNightFileExists = wallpaperNightFile.exists(); + + QFileInfo nightSwitchFile("/tmp/night_mode_enabled"); + bool nightSwitchExists = nightSwitchFile.exists(); + + if (wallpaperDayFile.isSymLink()) { + QFileInfo linkTarget(wallpaperDayFile.symLinkTarget()); + wallpaperDayFileExists = linkTarget.exists(); } - if (wallpaperFileExists) { - this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(wallpaper.png) }") ); - } else { - this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(:/connect.png) }") ); + + if (wallpaperNightFile.isSymLink()) { + QFileInfo linkTarget(wallpaperNightFile.symLinkTarget()); + wallpaperNightFileExists = linkTarget.exists(); } ui_->setupUi(this); @@ -58,9 +65,30 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi connect(ui_->pushButtonExit, &QPushButton::clicked, this, &MainWindow::exit); connect(ui_->pushButtonToggleCamera, &QPushButton::clicked, this, &MainWindow::toggleCamera); connect(ui_->pushButtonToggleCursor, &QPushButton::clicked, this, &MainWindow::toggleCursor); + connect(ui_->pushButtonDay, &QPushButton::clicked, this, &MainWindow::TriggerScriptDay); + connect(ui_->pushButtonDay, &QPushButton::clicked, this, &MainWindow::switchGuiToDay); + connect(ui_->pushButtonNight, &QPushButton::clicked, this, &MainWindow::TriggerScriptNight); + connect(ui_->pushButtonNight, &QPushButton::clicked, this, &MainWindow::switchGuiToNight); connect(ui_->pushButtonWirelessConnection, &QPushButton::clicked, this, &MainWindow::openConnectDialog); connect(ui_->pushButtonBrightness, &QPushButton::clicked, this, &MainWindow::showBrightnessSlider); + if (!nightSwitchExists) { + ui_->pushButtonNight->show(); + ui_->pushButtonDay->hide(); + if (wallpaperDayFileExists) { + this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(wallpaper.png) }") ); + } else { + this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(:/connect.png) }") ); + } + } else { + ui_->pushButtonDay->show(); + ui_->pushButtonNight->hide(); + if (wallpaperNightFileExists) { + this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(wallpaper-night.png) }") ); + } else { + this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(:/connect.png) }") ); + } + } QFileInfo cursorButtonFile("/etc/button_cursor_visible"); bool cursorButtonForce = cursorButtonFile.exists(); @@ -137,3 +165,17 @@ void f1x::openauto::autoapp::ui::MainWindow::on_horizontalSliderBrightness_value this->brightnessFile->close(); } } + +void f1x::openauto::autoapp::ui::MainWindow::switchGuiToNight() +{ + this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(wallpaper-night.png) }") ); + ui_->pushButtonDay->show(); + ui_->pushButtonNight->hide(); +} + +void f1x::openauto::autoapp::ui::MainWindow::switchGuiToDay() +{ + this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(wallpaper.png) }") ); + ui_->pushButtonNight->show(); + ui_->pushButtonDay->hide(); +} diff --git a/src/autoapp/UI/mainwindow.ui b/src/autoapp/UI/mainwindow.ui index a8dfce1..b7a35ce 100644 --- a/src/autoapp/UI/mainwindow.ui +++ b/src/autoapp/UI/mainwindow.ui @@ -101,6 +101,76 @@ true + + + + 30 + 174 + 64 + 64 + + + + display: none; + + + + + + + :/day-hot.png:/day-hot.png + + + + 64 + 64 + + + + false + + + false + + + true + + + + + + 30 + 174 + 64 + 64 + + + + display: none; + + + + + + + :/night-hot.png:/night-hot.png + + + + 64 + 64 + + + + false + + + false + + + true + + diff --git a/src/autoapp/autoapp.cpp b/src/autoapp/autoapp.cpp index ddd74bf..aead3dd 100644 --- a/src/autoapp/autoapp.cpp +++ b/src/autoapp/autoapp.cpp @@ -119,6 +119,24 @@ int main(int argc, char* argv[]) #endif }); + QObject::connect(&mainWindow, &autoapp::ui::MainWindow::TriggerScriptNight, [&qApplication]() { +#ifdef RASPBERRYPI3 + system("/opt/crankshaft/service_daynight.sh night &"); + OPENAUTO_LOG(info) << "[CS] Run night script."; +#else + OPENAUTO_LOG(info) << "[CS] You are not running this on a Raspberry Pi, skipping Day/Night script."; +#endif + }); + + QObject::connect(&mainWindow, &autoapp::ui::MainWindow::TriggerScriptDay, [&qApplication]() { +#ifdef RASPBERRYPI3 + system("/opt/crankshaft/service_daynight.sh day &"); + OPENAUTO_LOG(info) << "[CS] Run day script."; +#else + OPENAUTO_LOG(info) << "[CS] You are not running this on a Raspberry Pi, skipping Day/Night script."; +#endif + }); + mainWindow.showFullScreen(); aasdk::usb::USBWrapper usbWrapper(usbContext);