From 3f241ee2835e0c7fe36a233898b36044952fa9ff Mon Sep 17 00:00:00 2001 From: hawkeyexp Date: Sat, 26 May 2018 16:31:31 +0200 Subject: [PATCH] [gui] Add clock --- .../f1x/openauto/autoapp/UI/MainWindow.hpp | 1 + src/autoapp/UI/MainWindow.cpp | 19 +++++++++++++++++++ src/autoapp/UI/mainwindow.ui | 10 ++++++++++ 3 files changed, 30 insertions(+) diff --git a/include/f1x/openauto/autoapp/UI/MainWindow.hpp b/include/f1x/openauto/autoapp/UI/MainWindow.hpp index f5afce2..f767bb6 100644 --- a/include/f1x/openauto/autoapp/UI/MainWindow.hpp +++ b/include/f1x/openauto/autoapp/UI/MainWindow.hpp @@ -61,6 +61,7 @@ private slots: void on_pushButtonBrightness_clicked(); void switchGuiToDay(); void switchGuiToNight(); + void showTime(); private: Ui::MainWindow* ui_; diff --git a/src/autoapp/UI/MainWindow.cpp b/src/autoapp/UI/MainWindow.cpp index be8ac18..6dff8fe 100644 --- a/src/autoapp/UI/MainWindow.cpp +++ b/src/autoapp/UI/MainWindow.cpp @@ -21,6 +21,8 @@ #include #include #include "ui_mainwindow.h" +#include +#include namespace f1x { @@ -43,6 +45,7 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi QSlider:horizontal { background: url(:/slider.png); border: 1px solid #ffffff; border-radius: 2px; min-height: 32px;} \ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} \ QSlider::handle:horizontal { background: white; height: 52px; width: 52px; margin: 0 0;} \ + QLabel { color: #ffffff; font-weight: bold;} \ "); QFileInfo wallpaperDayFile("wallpaper.png"); @@ -93,6 +96,11 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(:/connect.png) }") ); } } + + QTimer *timer=new QTimer(this); + connect(timer, SIGNAL(timeout()),this,SLOT(showTime())); + timer->start(); + QFileInfo cursorButtonFile("/etc/button_cursor_visible"); bool cursorButtonForce = cursorButtonFile.exists(); @@ -124,6 +132,10 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi } ui_->horizontalSliderBrightness->hide(); + + if (!configuration->showClock()) { + ui_->Digital_clock->hide(); + } } MainWindow::~MainWindow() @@ -183,3 +195,10 @@ void f1x::openauto::autoapp::ui::MainWindow::switchGuiToDay() ui_->pushButtonNight->show(); ui_->pushButtonDay->hide(); } + +void f1x::openauto::autoapp::ui::MainWindow::showTime() +{ + QTime time=QTime::currentTime(); + QString time_text=time.toString("hh : mm : ss"); + ui_->Digital_clock->setText(time_text); +} diff --git a/src/autoapp/UI/mainwindow.ui b/src/autoapp/UI/mainwindow.ui index d97f8a1..8daa900 100644 --- a/src/autoapp/UI/mainwindow.ui +++ b/src/autoapp/UI/mainwindow.ui @@ -14,6 +14,16 @@ MainWindow + + + + 670 + 14 + 120 + 20 + + +