From ba068c0aabdfda732b7dc469837d802432efb6f8 Mon Sep 17 00:00:00 2001 From: hawkeyexp Date: Fri, 27 Jul 2018 13:40:14 +0200 Subject: [PATCH] Some cosmetics / Lock button during save --- assets/lock-hot.png | Bin 0 -> 3417 bytes assets/resources.qrc | 1 + src/autoapp/UI/MainWindow.cpp | 3 ++ src/autoapp/UI/mainwindow.ui | 53 ++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+) create mode 100644 assets/lock-hot.png diff --git a/assets/lock-hot.png b/assets/lock-hot.png new file mode 100644 index 0000000000000000000000000000000000000000..41e727383f01fb99181cea920bd2c0f9f5af6436 GIT binary patch literal 3417 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 literal 0 HcmV?d00001 diff --git a/assets/resources.qrc b/assets/resources.qrc index 3a16809..592a211 100644 --- a/assets/resources.qrc +++ b/assets/resources.qrc @@ -30,6 +30,7 @@ bg_rearcam.png rearcam-hot.png recordactive-hot.png + lock-hot.png Roboto-Regular.ttf diff --git a/src/autoapp/UI/MainWindow.cpp b/src/autoapp/UI/MainWindow.cpp index a2e8a1d..c5d6919 100644 --- a/src/autoapp/UI/MainWindow.cpp +++ b/src/autoapp/UI/MainWindow.cpp @@ -202,6 +202,7 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi ui_->pushButtonRearcamBack->hide(); ui_->systemConfigInProgress->hide(); ui_->systemDebugging->hide(); + ui_->pushButtonLock->hide(); QFileInfo DebugmodeFile("/tmp/usb_debug_mode"); if (DebugmodeFile.exists()) { @@ -491,6 +492,7 @@ void f1x::openauto::autoapp::ui::MainWindow::showTime() if (configInProgressFile.exists()) { ui_->systemConfigInProgress->setText("System config in progress - please wait ..."); ui_->pushButtonSettings->hide(); + ui_->pushButtonLock->show(); ui_->systemConfigInProgress->show(); } if (debugInProgressFile.exists()) { @@ -503,6 +505,7 @@ void f1x::openauto::autoapp::ui::MainWindow::showTime() if (ui_->systemConfigInProgress->isVisible() == true) { ui_->systemConfigInProgress->hide(); ui_->pushButtonSettings->show(); + ui_->pushButtonLock->hide(); if (this->systemDebugmode) { ui_->systemDebugging->show(); } diff --git a/src/autoapp/UI/mainwindow.ui b/src/autoapp/UI/mainwindow.ui index 057c1e3..48ee050 100644 --- a/src/autoapp/UI/mainwindow.ui +++ b/src/autoapp/UI/mainwindow.ui @@ -725,6 +725,59 @@ QPushButton:pressed { background: orange; border: none; } false + + + + 30 + 34 + 64 + 64 + + + + + :/lock-hot.png:/lock-hot.png + + + + 64 + 64 + + + + true + + + masterButtonBG + pushButtonSettings + pushButtonLock + pushButtonWirelessConnection + pushButtonKodi + pushButtonToggleCursor + pushButtonDay + pushButtonNight + pushButtonBrightness + pushButtonCameraShow + pushButtonCameraHide + pushButtonExit + systemDebugging + horizontalSliderBrightness + Digital_clock + phoneConnected + versionString + dateString + dashcamBG + pushButtonStop + pushButtonRecord + pushButtonRecordActive + pushButtonRearcam + pushButtonSave + exitBG + pushButtonShutdown + pushButtonReboot + pushButtonCancel + systemConfigInProgress + pushButtonRearcamBack