tza/openauto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[gui] Rework wallpapers / finish auto day/night switch

Browse Source
This commit is contained in:
hawkeyexp 2018-06-13 21:09:55 +02:00
parent c8dd7f48ff
commit 77cdf52cd2
3 changed files with 111 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/f1x/openauto/autoapp/UI/MainWindow.hpp
View File

@ -69,6 +69,15 @@ private:
QString brightnessFilename = "/sys/class/backlight/rpi_backlight/brightness"; QString brightnessFilename = "/sys/class/backlight/rpi_backlight/brightness";
QFile *brightnessFile; QFile *brightnessFile;
char brightness_str[5]; char brightness_str[5];
bool nightModeEnabled = false;
bool DayNightModeState = false;
bool devModeEnabled = false;
bool wallpaperDayFileExists = false;
bool wallpaperNightFileExists = false;
bool wallpaperDevFileExists = false;
bool wallpaperDevNightFileExists = false;
}; };
} }

139
src/autoapp/UI/MainWindow.cpp
View File

@ -48,34 +48,43 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi
QLabel { color: #ffffff; font-weight: bold;} \ QLabel { color: #ffffff; font-weight: bold;} \
"); ");
// inits by files
QFileInfo wallpaperDayFile("wallpaper.png"); QFileInfo wallpaperDayFile("wallpaper.png");
bool wallpaperDayFileExists = wallpaperDayFile.exists(); this->wallpaperDayFileExists = wallpaperDayFile.exists();
QFileInfo wallpaperNightFile("wallpaper-night.png"); QFileInfo wallpaperNightFile("wallpaper-night.png");
bool wallpaperNightFileExists = wallpaperNightFile.exists(); this->wallpaperNightFileExists = wallpaperNightFile.exists();
QFileInfo wallpaperDevFile("wallpaper-devmode.png"); QFileInfo wallpaperDevFile("wallpaper-devmode.png");
bool wallpaperDevFileExists = wallpaperDevFile.exists(); this->wallpaperDevFileExists = wallpaperDevFile.exists();
QFileInfo wallpaperDevNightFile("wallpaper-devmode-night.png");
this->wallpaperDevNightFileExists = wallpaperDevNightFile.exists();
QFileInfo nightModeFile("/tmp/night_mode_enabled"); QFileInfo nightModeFile("/tmp/night_mode_enabled");
bool nightModeEnabled = nightModeFile.exists(); this->nightModeEnabled = nightModeFile.exists();
QFileInfo devModeFile("/tmp/dev_mode_enabled"); QFileInfo devModeFile("/tmp/dev_mode_enabled");
bool devModeEnabled = devModeFile.exists(); this->devModeEnabled = devModeFile.exists();
if (wallpaperDayFile.isSymLink()) { if (wallpaperDayFile.isSymLink()) {
QFileInfo linkTarget(wallpaperDayFile.symLinkTarget()); QFileInfo linkTarget(wallpaperDayFile.symLinkTarget());
wallpaperDayFileExists = linkTarget.exists(); this->wallpaperDayFileExists = linkTarget.exists();
} }
if (wallpaperNightFile.isSymLink()) { if (wallpaperNightFile.isSymLink()) {
QFileInfo linkTarget(wallpaperNightFile.symLinkTarget()); QFileInfo linkTarget(wallpaperNightFile.symLinkTarget());
wallpaperNightFileExists = linkTarget.exists(); this->wallpaperNightFileExists = linkTarget.exists();
} }
if (wallpaperDevFile.isSymLink()) { if (wallpaperDevFile.isSymLink()) {
QFileInfo linkTarget(wallpaperDevFile.symLinkTarget()); QFileInfo linkTarget(wallpaperDevFile.symLinkTarget());
wallpaperDevFileExists = linkTarget.exists(); this->wallpaperDevFileExists = linkTarget.exists();
}
if (wallpaperDevNightFile.isSymLink()) {
QFileInfo linkTarget(wallpaperDevNightFile.symLinkTarget());
this->wallpaperDevNightFileExists = linkTarget.exists();
} }
ui_->setupUi(this); ui_->setupUi(this);
@ -90,32 +99,6 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi
connect(ui_->pushButtonWirelessConnection, &QPushButton::clicked, this, &MainWindow::openConnectDialog); connect(ui_->pushButtonWirelessConnection, &QPushButton::clicked, this, &MainWindow::openConnectDialog);
connect(ui_->pushButtonBrightness, &QPushButton::clicked, this, &MainWindow::showBrightnessSlider); connect(ui_->pushButtonBrightness, &QPushButton::clicked, this, &MainWindow::showBrightnessSlider);
if (devModeEnabled) {
if (wallpaperDevFileExists) {
this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(wallpaper-devmode.png) }") );
} else {
this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(:/connect.png) }") );
}
} else {
if (!nightModeEnabled) {
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) }") );
}
}
}
QTimer *timer=new QTimer(this); QTimer *timer=new QTimer(this);
connect(timer, SIGNAL(timeout()),this,SLOT(showTime())); connect(timer, SIGNAL(timeout()),this,SLOT(showTime()));
timer->start(); timer->start();
@ -155,6 +138,37 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi
if (!configuration->showClock()) { if (!configuration->showClock()) {
ui_->Digital_clock->hide(); ui_->Digital_clock->hide();
} }
// init bg's on startup
if (!this->nightModeEnabled) {
if (this->devModeEnabled) {
if (this->wallpaperDevFileExists) {
this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(wallpaper-devmode.png) }") );
} else {
this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(:/connect.png) }") );
}
} else {
if (this->wallpaperDayFileExists) {
this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(wallpaper.png) }") );
} else {
this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(:/connect.png) }") );
}
}
} else {
if (this->devModeEnabled) {
if (this->wallpaperDevNightFileExists) {
this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(wallpaper-devmode-night.png) }") );
} else {
this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(:/connect.png) }") );
}
} else {
if (this->wallpaperNightFileExists) {
this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(wallpaper-night.png) }") );
} else {
this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(:/connect.png) }") );
}
}
}
} }
MainWindow::~MainWindow() MainWindow::~MainWindow()
@ -203,23 +217,47 @@ void f1x::openauto::autoapp::ui::MainWindow::on_horizontalSliderBrightness_value
void f1x::openauto::autoapp::ui::MainWindow::switchGuiToNight() void f1x::openauto::autoapp::ui::MainWindow::switchGuiToNight()
{ {
this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(wallpaper-night.png) }") ); if (this->devModeEnabled) {
if (this->wallpaperDevNightFileExists) {
this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(wallpaper-devmode-night.png) }") );
} else {
this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(:/connect.png) }") );
}
} else {
if (this->wallpaperNightFileExists) {
this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(wallpaper-night.png) }") );
} else {
this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(:/connect.png) }") );
}
}
ui_->pushButtonDay->show(); ui_->pushButtonDay->show();
ui_->pushButtonNight->hide(); ui_->pushButtonNight->hide();
if (this->brightnessSliderVisible) { if (this->brightnessSliderVisible) {
ui_->horizontalSliderBrightness->hide(); ui_->horizontalSliderBrightness->hide();
this->brightnessSliderVisible = false; this->brightnessSliderVisible = false;
} }
} }
void f1x::openauto::autoapp::ui::MainWindow::switchGuiToDay() void f1x::openauto::autoapp::ui::MainWindow::switchGuiToDay()
{ {
this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(wallpaper.png) }") ); if (this->devModeEnabled) {
if (this->wallpaperDevFileExists) {
this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(wallpaper-devmode.png) }") );
} else {
this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(:/connect.png) }") );
}
} else {
if (this->wallpaperDayFileExists) {
this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(wallpaper.png) }") );
} else {
this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(:/connect.png) }") );
}
}
ui_->pushButtonNight->show(); ui_->pushButtonNight->show();
ui_->pushButtonDay->hide(); ui_->pushButtonDay->hide();
if (this->brightnessSliderVisible) { if (this->brightnessSliderVisible) {
ui_->horizontalSliderBrightness->hide(); ui_->horizontalSliderBrightness->hide();
this->brightnessSliderVisible = false; this->brightnessSliderVisible = false;
} }
} }
@ -228,4 +266,29 @@ void f1x::openauto::autoapp::ui::MainWindow::showTime()
QTime time=QTime::currentTime(); QTime time=QTime::currentTime();
QString time_text=time.toString("hh : mm : ss"); QString time_text=time.toString("hh : mm : ss");
ui_->Digital_clock->setText(time_text); ui_->Digital_clock->setText(time_text);
/**if (configuration_->showClock()) {
if (ui_->Digital_clock->isVisible() == true) {
ui_->Digital_clock->hide();
}
} else {
if (ui_->Digital_clock->isVisible() == false) {
ui_->Digital_clock->show();
}
}**/
QFileInfo nightModeFile("/tmp/night_mode_enabled");
this->nightModeEnabled = nightModeFile.exists();
if (this->nightModeEnabled) {
if (!this->DayNightModeState) {
this->DayNightModeState = true;
f1x::openauto::autoapp::ui::MainWindow::switchGuiToNight();
}
} else {
if (this->DayNightModeState) {
this->DayNightModeState = false;
f1x::openauto::autoapp::ui::MainWindow::switchGuiToDay();
}
}
} }

1
src/autoapp/UI/SettingsWindow.cpp
View File

@ -100,6 +100,7 @@ void SettingsWindow::onSave()
configuration_->setAudioOutputBackendType(ui_->radioButtonRtAudio->isChecked() ? configuration::AudioOutputBackendType::RTAUDIO : configuration::AudioOutputBackendType::QT); configuration_->setAudioOutputBackendType(ui_->radioButtonRtAudio->isChecked() ? configuration::AudioOutputBackendType::RTAUDIO : configuration::AudioOutputBackendType::QT);
configuration_->save(); configuration_->save();
this->close(); this->close();
} }