From 873b1e2dde146ed1adf81decbda101ccb6ad35d6 Mon Sep 17 00:00:00 2001 From: hawkeyexp Date: Wed, 5 Sep 2018 03:03:16 +0200 Subject: [PATCH] add lost wifi button --- src/autoapp/UI/MainWindow.cpp | 27 ++++++++++++---- src/autoapp/UI/mainwindow.ui | 61 +++++++++++++++++++++++++++++++++-- 2 files changed, 79 insertions(+), 9 deletions(-) diff --git a/src/autoapp/UI/MainWindow.cpp b/src/autoapp/UI/MainWindow.cpp index b0062ad..353c33d 100644 --- a/src/autoapp/UI/MainWindow.cpp +++ b/src/autoapp/UI/MainWindow.cpp @@ -164,6 +164,8 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi connect(ui_->pushButtonUnMute, &QPushButton::clicked, this, &MainWindow::setUnMute); connect(ui_->pushButtonToggleGUI, &QPushButton::clicked, this, &MainWindow::toggleGUI); connect(ui_->pushButtonToggleGUI2, &QPushButton::clicked, this, &MainWindow::toggleGUI); + connect(ui_->pushButtonWifi, &QPushButton::clicked, this, &MainWindow::openConnectDialog); + connect(ui_->pushButtonWifi2, &QPushButton::clicked, this, &MainWindow::openConnectDialog); QTimer *timer=new QTimer(this); connect(timer, SIGNAL(timeout()),this,SLOT(showTime())); @@ -210,19 +212,23 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi connect(ui_->pushButtonStop, &QPushButton::clicked, this, &MainWindow::cameraStop); connect(ui_->pushButtonRecord, &QPushButton::clicked, this, &MainWindow::cameraRecord); connect(ui_->pushButtonSave, &QPushButton::clicked, this, &MainWindow::cameraSave); - ui_->pushButtonDummyCam->hide(); - ui_->pushButtonDummyCam2->hide(); + ui_->pushButtonDummyCamWifi->hide(); + ui_->pushButtonDummyCamWifi2->hide(); } else { ui_->pushButtonCameraShow->hide(); ui_->pushButtonCameraShow2->hide(); - ui_->pushButtonDummyCam->show(); - ui_->pushButtonDummyCam2->show(); + if (this->wifiButtonForce) { + ui_->pushButtonDummyCamWifi2->hide(); + } } // show debug button if enabled if (!this->systemDebugmode) { ui_->pushButtonDebug->hide(); ui_->pushButtonDebug2->hide(); + if (this->cameraButtonForce && this->wifiButtonForce) { + ui_->pushButtonDummyDebug->hide(); + } } else { ui_->pushButtonDummyDebug->hide(); } @@ -252,8 +258,6 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi ui_->alphaValueLabel->hide(); ui_->pushButtonAlpha->show(); - - // as default hide power buttons ui_->pushButtonShutdown->hide(); ui_->pushButtonReboot->hide(); @@ -266,6 +270,14 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi // as default hide muted button ui_->pushButtonUnMute->hide(); + // hide wifi if not forced + if (!this->wifiButtonForce) { + ui_->pushButtonWifi->hide(); + ui_->pushButtonWifi2->hide(); + } else { + ui_->pushButtonDummyCamWifi->hide(); + } + // set custom buttons if file enabled by trigger file if (!this->c1ButtonForce) { ui_->pushButton_c1->hide(); @@ -766,7 +778,8 @@ void f1x::openauto::autoapp::ui::MainWindow::on_horizontalSliderAlpha_valueChang ui_->pushButtonDay->setStyleSheet( "background: rgba(252, 233, 79, " + alp + " ); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5);"); ui_->pushButtonNight->setStyleSheet( "background-color: rgba(114, 159, 207, " + alp + " ); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5);"); ui_->pushButtonCameraShow->setStyleSheet( "background-color: rgba(100, 62, 4, " + alp + " ); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5);"); - ui_->pushButtonDummyCam->setStyleSheet( "background-color: rgba(117, 80, 123, " + alp + " ); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5);"); + ui_->pushButtonDummyCamWifi->setStyleSheet( "background-color: rgba(117, 80, 123, " + alp + " ); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5);"); + ui_->pushButtonWifi->setStyleSheet( "background-color: rgba(252, 175, 62, " + alp + " ); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5);"); ui_->pushButtonToggleGUI->setStyleSheet( "background-color: rgba(237, 164, 255, " + alp + " ); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5);"); ui_->pushButton_c1->setStyleSheet( "background-color: rgba(" + this->custom_button_color_c1 + ", " + alp + " ); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); color: rgb(255,255,255);"); ui_->pushButton_c2->setStyleSheet( "background-color: rgba(" + this->custom_button_color_c2 + ", " + alp + " ); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); color: rgb(255,255,255);"); diff --git a/src/autoapp/UI/mainwindow.ui b/src/autoapp/UI/mainwindow.ui index 27ba80f..b0f46d0 100644 --- a/src/autoapp/UI/mainwindow.ui +++ b/src/autoapp/UI/mainwindow.ui @@ -458,7 +458,37 @@ border: 2px solid rgba(255,255,255,0.5); - + + + + 0 + 0 + + + + background-color: rgba(252, 175, 62, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +color: rgb(255, 255, 255); + + + + + + + :/wifi-hot.png + + + + + 64 + 64 + + + + + + 0 @@ -1561,6 +1591,33 @@ border: 2px solid rgba(255,255,255,0.5); + + + + + 0 + 0 + + + + background-color: rgba(136, 138, 133, 0.5); + + + + + + + :/wifi-hot.png + + + + + 50 + 50 + + + + @@ -1589,7 +1646,7 @@ border: 2px solid rgba(255,255,255,0.5); - + 0