From 03c1518baf526d38f75655d11c791df993e28516 Mon Sep 17 00:00:00 2001 From: hawkeyexp Date: Sat, 26 Jan 2019 20:03:07 +0100 Subject: [PATCH] update to latest --- .../openauto/autoapp/UI/SettingsWindow.hpp | 1 - .../f1x/openauto/autoapp/UI/UpdateDialog.hpp | 1 + src/autoapp/App.cpp | 25 +- src/autoapp/Service/AndroidAutoEntity.cpp | 1 - src/autoapp/UI/MainWindow.cpp | 66 +- src/autoapp/UI/SettingsWindow.cpp | 125 +- src/autoapp/UI/UpdateDialog.cpp | 24 + src/autoapp/UI/mainwindow.ui | 4 +- src/autoapp/UI/mainwindow.ui.autosave | 5670 +++++++++++++++++ src/autoapp/UI/settingswindow.ui | 1877 +++++- src/autoapp/UI/updatedialog.ui | 492 +- src/autoapp/autoapp.cpp | 13 +- 12 files changed, 7676 insertions(+), 623 deletions(-) create mode 100644 src/autoapp/UI/mainwindow.ui.autosave diff --git a/include/f1x/openauto/autoapp/UI/SettingsWindow.hpp b/include/f1x/openauto/autoapp/UI/SettingsWindow.hpp index 2c431d3..fdc6dad 100644 --- a/include/f1x/openauto/autoapp/UI/SettingsWindow.hpp +++ b/include/f1x/openauto/autoapp/UI/SettingsWindow.hpp @@ -57,7 +57,6 @@ private slots: void onUpdateAlphaTrans(int value); void onUpdateBrightnessDay(int value); void onUpdateBrightnessNight(int value); - void onShowBindings(); void onUpdateSystemVolume(int value); void onUpdateSystemCapture(int value); void setTime(); diff --git a/include/f1x/openauto/autoapp/UI/UpdateDialog.hpp b/include/f1x/openauto/autoapp/UI/UpdateDialog.hpp index 69dd6bf..8b723ec 100644 --- a/include/f1x/openauto/autoapp/UI/UpdateDialog.hpp +++ b/include/f1x/openauto/autoapp/UI/UpdateDialog.hpp @@ -38,6 +38,7 @@ private slots: void on_pushButtonUpdateOpenauto_clicked(); void on_pushButtonUpdateSystem_clicked(); void on_pushButtonUpdateCheck_clicked(); + void on_pushButtonUpdateCancel_clicked(); private: Ui::UpdateDialog *ui_; diff --git a/src/autoapp/App.cpp b/src/autoapp/App.cpp index ca40401..02495c5 100644 --- a/src/autoapp/App.cpp +++ b/src/autoapp/App.cpp @@ -46,8 +46,23 @@ App::App(boost::asio::io_service& ioService, aasdk::usb::USBWrapper& usbWrapper, void App::waitForUSBDevice() { strand_.dispatch([this, self = this->shared_from_this()]() { - this->waitForDevice(); - this->enumerateDevices(); + try + { + this->waitForDevice(); + } + catch(...) + { + OPENAUTO_LOG(error) << "[App] waitForUSBDevice() -exception caused by this->waitForDevice();"; + } + try + { + this->enumerateDevices(); + } + catch(...) + { + OPENAUTO_LOG(error) << "[App] waitForUSBDevice() exception caused by this->enumerateDevices()"; + } + }); } @@ -224,7 +239,11 @@ void App::onUSBHubError(const aasdk::error::Error& error) if(error != aasdk::error::ErrorCode::OPERATION_ABORTED && error != aasdk::error::ErrorCode::OPERATION_IN_PROGRESS) { - this->waitForDevice(); + try { + this->waitForDevice(); + } catch (...) { + OPENAUTO_LOG(error) << "[App] onUSBHubError: exception caused by this->waitForDevice();"; + } } } diff --git a/src/autoapp/Service/AndroidAutoEntity.cpp b/src/autoapp/Service/AndroidAutoEntity.cpp index 4312e8d..5b93722 100644 --- a/src/autoapp/Service/AndroidAutoEntity.cpp +++ b/src/autoapp/Service/AndroidAutoEntity.cpp @@ -94,7 +94,6 @@ void AndroidAutoEntity::pause() try { std::for_each(serviceList_.begin(), serviceList_.end(), std::bind(&IService::pause, std::placeholders::_1)); - messenger_->stop(); } catch (...) { OPENAUTO_LOG(info) << "[AndroidAutoEntity] exception in pause."; } diff --git a/src/autoapp/UI/MainWindow.cpp b/src/autoapp/UI/MainWindow.cpp index 7b093ec..57b30aa 100644 --- a/src/autoapp/UI/MainWindow.cpp +++ b/src/autoapp/UI/MainWindow.cpp @@ -876,6 +876,19 @@ void f1x::openauto::autoapp::ui::MainWindow::cameraControlShow() ui_->oldmenuWidget->hide(); } ui_->cameraWidget->show(); + + // check if dashcam is recording + if (std::ifstream("/tmp/dashcam_is_recording")) { + if (ui_->pushButtonRecordActive->isVisible() == false) { + ui_->pushButtonRecordActive->show(); + ui_->pushButtonRecord->hide(); + } + } else { + if (ui_->pushButtonRecordActive->isVisible() == true) { + ui_->pushButtonRecordActive->hide(); + ui_->pushButtonRecord->show(); + } + } } } @@ -988,34 +1001,44 @@ void f1x::openauto::autoapp::ui::MainWindow::updateBG() this->setStyleSheet("QMainWindow { background: url(:/firework.png); background-repeat: no-repeat; background-position: center; }"); this->holidaybg = true; } - else if (ui_->mediaWidget->isVisible() == false) { - if (!this->nightModeEnabled) { + if (!this->nightModeEnabled) { + if (ui_->mediaWidget->isVisible() == true) { + if (this->wallpaperEQFileExists) { + this->setStyleSheet("QMainWindow { background: url(wallpaper-eq.png); background-repeat: no-repeat; background-position: center; }"); + } else { + this->setStyleSheet("QMainWindow { background: url(:/black.png); background-repeat: no-repeat; background-position: center; }"); + } + } else { if (this->oldGUIStyle) { if (this->wallpaperClassicDayFileExists) { - //this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(wallpaper-classic.png); background-repeat: no-repeat; background-position: center; }") ); this->setStyleSheet("QMainWindow { background: url(wallpaper-classic.png); background-repeat: no-repeat; background-position: center; }"); } else { this->setStyleSheet("QMainWindow { background: url(:/black.png); background-repeat: no-repeat; background-position: center; }"); } } else { if (this->wallpaperDayFileExists) { - //this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(wallpaper.png); background-repeat: no-repeat; background-position: center; }") ); this->setStyleSheet("QMainWindow { background: url(wallpaper.png); background-repeat: no-repeat; background-position: center; }"); } else { this->setStyleSheet("QMainWindow { background: url(:/black.png); background-repeat: no-repeat; background-position: center; }"); } } + } + } else { + if (ui_->mediaWidget->isVisible() == true) { + if (this->wallpaperEQFileExists) { + this->setStyleSheet("QMainWindow { background: url(wallpaper-eq.png); background-repeat: no-repeat; background-position: center; }"); + } else { + this->setStyleSheet("QMainWindow { background: url(:/black.png); background-repeat: no-repeat; background-position: center; }"); + } } else { if (this->oldGUIStyle) { if (this->wallpaperClassicNightFileExists) { - //this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(wallpaper-classic-night.png); background-repeat: no-repeat; background-position: center; }") ); this->setStyleSheet( "QMainWindow { background: url(wallpaper-classic-night.png); background-repeat: no-repeat; background-position: center; }"); } else { this->setStyleSheet("QMainWindow { background: url(:/black.png); background-repeat: no-repeat; background-position: center; }"); } } else { if (this->wallpaperNightFileExists) { - //this->setStyleSheet( this->styleSheet().append("QMainWindow { background: url(wallpaper-night.png); background-repeat: no-repeat; background-position: center; }") ); this->setStyleSheet("QMainWindow { background: url(wallpaper-night.png); background-repeat: no-repeat; background-position: center; }"); } else { this->setStyleSheet("QMainWindow { background: url(:/black.png); background-repeat: no-repeat; background-position: center; }"); @@ -1228,6 +1251,19 @@ void f1x::openauto::autoapp::ui::MainWindow::metaDataChanged() if (playlist->currentIndex() != -1 && fullpathplaying != "") { QString currentsong = ui_->mp3List->item(playlist->currentIndex())->text(); ui_->labelCurrentPlaying->setText(currentsong); + if (currentsong.length() > 48) { + int id = QFontDatabase::addApplicationFont(":/Roboto-Regular.ttf"); + QString family = QFontDatabase::applicationFontFamilies(id).at(0); + QFont _font(family, 12, QFont::Bold); + _font.setItalic(true); + ui_->labelCurrentPlaying->setFont(_font); + } else { + int id = QFontDatabase::addApplicationFont(":/Roboto-Regular.ttf"); + QString family = QFontDatabase::applicationFontFamilies(id).at(0); + QFont _font(family, 16, QFont::Bold); + _font.setItalic(true); + ui_->labelCurrentPlaying->setFont(_font); + } } } catch (...) { // use metadata from player @@ -1358,10 +1394,9 @@ void f1x::openauto::autoapp::ui::MainWindow::scanFiles() QString url=configuration_->readFileContent(this->musicfolder + "/" + this->albumfolder + "/" + filename); content.push_back(QMediaContent(QUrl(url))); ui_->mp3List->addItem(filename.replace(".strm","")); - //ui_->mp3List->addItem(url); } else { - content.push_back(QMediaContent(QUrl::fromLocalFile(this->musicfolder + "/" + this->albumfolder + "/" + filename))); // add items to gui + content.push_back(QMediaContent(QUrl::fromLocalFile(this->musicfolder + "/" + this->albumfolder + "/" + filename))); // read metadata using taglib try { TagLib::FileRef file((this->musicfolder + "/" + this->albumfolder + "/" + filename).toUtf8(),true); @@ -1589,6 +1624,7 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged() ui_->clockOnlyWidget->hide(); toggleGUI(); toggleGUI(); + updateBG(); } } @@ -1751,20 +1787,6 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged() } } } - - // check if rearcam is eanbled - this->rearCamEnabled = check_file_exist("/tmp/rearcam_enabled"); - if (this->rearCamEnabled) { - if (!this->rearCamVisible) { - this->rearCamVisible = true; - f1x::openauto::autoapp::ui::MainWindow::MainWindow::showRearCam(); - } - } else { - if (this->rearCamVisible) { - this->rearCamVisible = false; - f1x::openauto::autoapp::ui::MainWindow::MainWindow::hideRearCam(); - } - } } // check if shutdown is external triggered and init clean app exit diff --git a/src/autoapp/UI/SettingsWindow.cpp b/src/autoapp/UI/SettingsWindow.cpp index 03290b7..5894ba0 100644 --- a/src/autoapp/UI/SettingsWindow.cpp +++ b/src/autoapp/UI/SettingsWindow.cpp @@ -69,7 +69,6 @@ SettingsWindow::SettingsWindow(configuration::IConfiguration::Pointer configurat connect(ui_->pushButtonClearSelection, &QPushButton::clicked, std::bind(&SettingsWindow::setButtonCheckBoxes, this, false)); connect(ui_->pushButtonSelectAll, &QPushButton::clicked, std::bind(&SettingsWindow::setButtonCheckBoxes, this, true)); connect(ui_->pushButtonResetToDefaults, &QPushButton::clicked, this, &SettingsWindow::onResetToDefaults); - connect(ui_->pushButtonShowBindings, &QPushButton::clicked, this, &SettingsWindow::onShowBindings); connect(ui_->horizontalSliderSystemVolume, &QSlider::valueChanged, this, &SettingsWindow::onUpdateSystemVolume); connect(ui_->horizontalSliderSystemCapture, &QSlider::valueChanged, this, &SettingsWindow::onUpdateSystemCapture); connect(ui_->radioButtonHotspot, &QPushButton::clicked, this, &SettingsWindow::onStartHotspot); @@ -84,6 +83,8 @@ SettingsWindow::SettingsWindow(configuration::IConfiguration::Pointer configurat connect(ui_->pushButtonNetworkAuto, &QPushButton::clicked, [&]() { system("/usr/local/bin/crankshaft network auto &");}); connect(ui_->pushButtonNetwork0, &QPushButton::clicked, this, &SettingsWindow::on_pushButtonNetwork0_clicked); connect(ui_->pushButtonNetwork1, &QPushButton::clicked, this, &SettingsWindow::on_pushButtonNetwork1_clicked); + connect(ui_->pushButtonSambaStart, &QPushButton::clicked, [&]() { system("/usr/local/bin/crankshaft samba start &");}); + connect(ui_->pushButtonSambaStop, &QPushButton::clicked, [&]() { system("/usr/local/bin/crankshaft samba stop &");}); // menu ui_->tab1->show(); @@ -100,7 +101,6 @@ SettingsWindow::SettingsWindow(configuration::IConfiguration::Pointer configurat ui_->labelBluetoothAdapterAddress->hide(); ui_->lineEditExternalBluetoothAdapterAddress->hide(); ui_->labelTestInProgress->hide(); - ui_->pushButtonShowBindings->hide(); connect(ui_->pushButtonTab1, &QPushButton::clicked, this, &SettingsWindow::show_tab1); connect(ui_->pushButtonTab2, &QPushButton::clicked, this, &SettingsWindow::show_tab2); @@ -109,6 +109,7 @@ SettingsWindow::SettingsWindow(configuration::IConfiguration::Pointer configurat connect(ui_->pushButtonTab5, &QPushButton::clicked, this, &SettingsWindow::show_tab5); connect(ui_->pushButtonTab5, &QPushButton::clicked, this, &SettingsWindow::updateNetworkInfo); connect(ui_->pushButtonTab6, &QPushButton::clicked, this, &SettingsWindow::show_tab6); + connect(ui_->pushButtonTab6, &QPushButton::clicked, this, &SettingsWindow::updateSystemInfo); connect(ui_->pushButtonTab7, &QPushButton::clicked, this, &SettingsWindow::show_tab7); connect(ui_->pushButtonTab8, &QPushButton::clicked, this, &SettingsWindow::show_tab8); connect(ui_->pushButtonTab9, &QPushButton::clicked, this, &SettingsWindow::show_tab9); @@ -162,6 +163,16 @@ SettingsWindow::SettingsWindow(configuration::IConfiguration::Pointer configurat ui_->label_notavailable->show(); } + if (std::ifstream("/tmp/samba_running")) { + ui_->labelSambaStatus->setText("running"); + ui_->pushButtonSambaStart->hide(); + ui_->pushButtonSambaStop->show(); + } else { + ui_->labelSambaStatus->setText("stopped"); + ui_->pushButtonSambaStop->hide(); + ui_->pushButtonSambaStart->show(); + } + QTimer *refresh=new QTimer(this); connect(refresh, SIGNAL(timeout()),this,SLOT(updateInfo())); refresh->start(5000); @@ -342,7 +353,7 @@ void SettingsWindow::onSave() params.append("0"); } params.append("#"); - params.append( std::string(ui_->comboBoxSDOC->currentText().split(" ")[0].toStdString()) ); + params.append( std::string(ui_->comboBoxUSBCam->currentText().toStdString()) ); params.append("#"); params.append( std::string(ui_->comboBoxLS->currentText().split(" ")[0].toStdString()) ); params.append("#"); @@ -419,6 +430,36 @@ void SettingsWindow::onSave() params.append("#"); params.append( std::string(ui_->comboBoxResolution->currentText().toStdString()) ); params.append("#"); + params.append( std::string((ui_->comboBoxFPS->currentText()).replace(" (not @1080)","").toStdString()) ); + params.append("#"); + params.append( std::string(ui_->comboBoxAWB->currentText().toStdString()) ); + params.append("#"); + params.append( std::string(ui_->comboBoxEXP->currentText().toStdString()) ); + params.append("#"); + params.append( std::string(ui_->comboBoxLoopTime->currentText().toStdString()) ); + params.append("#"); + params.append( std::string(ui_->comboBoxLoopCount->currentText().toStdString()) ); + params.append("#"); + if (ui_->checkBoxAutoRecording ->isChecked()) { + params.append("1"); + } else { + params.append("0"); + } + params.append("#"); + if (ui_->checkBoxFlipXUSB ->isChecked()) { + params.append("1"); + } else { + params.append("0"); + } + params.append("#"); + if (ui_->checkBoxFlipYUSB ->isChecked()) { + params.append("1"); + } else { + params.append("0"); + } + params.append("#"); + params.append( std::string(ui_->comboBoxUSBRotation->currentText().replace("180","1").toStdString()) ); + params.append("#"); system((std::string("/usr/local/bin/autoapp_helper setparams#") + std::string(params) + std::string(" &") ).c_str()); this->close(); @@ -948,6 +989,38 @@ void SettingsWindow::loadSystemValues() } ui_->comboBoxRotation->setCurrentText(configuration_->getCSValue("RPICAM_ROTATION")); ui_->comboBoxResolution->setCurrentText(configuration_->getCSValue("RPICAM_RESOLUTION")); + ui_->comboBoxFPS->setCurrentText(configuration_->getCSValue("RPICAM_FPS")); + ui_->comboBoxAWB->setCurrentText(configuration_->getCSValue("RPICAM_AWB")); + ui_->comboBoxEXP->setCurrentText(configuration_->getCSValue("RPICAM_EXP")); + ui_->comboBoxLoopTime->setCurrentText(configuration_->getCSValue("RPICAM_LOOPTIME")); + ui_->comboBoxLoopCount->setCurrentText(configuration_->getCSValue("RPICAM_LOOPCOUNT")); + + if (configuration_->getCSValue("RPICAM_AUTORECORDING") == "1") { + ui_->checkBoxAutoRecording->setChecked(true); + } else { + ui_->checkBoxAutoRecording->setChecked(false); + } + + if (configuration_->getCSValue("USBCAM_USE") == "1") { + ui_->comboBoxUSBCam->setCurrentText("enabled"); + } else { + ui_->comboBoxUSBCam->setCurrentText("none"); + } + if (configuration_->getCSValue("USBCAM_ROTATION") == "1") { + ui_->comboBoxUSBRotation->setCurrentText("180"); + } else { + ui_->comboBoxUSBRotation->setCurrentText("0"); + } + if (configuration_->getCSValue("USBCAM_HFLIP") == "1") { + ui_->checkBoxFlipXUSB->setChecked(true); + } else { + ui_->checkBoxFlipXUSB->setChecked(false); + } + if (configuration_->getCSValue("USBCAM_VFLIP") == "1") { + ui_->checkBoxFlipYUSB->setChecked(true); + } else { + ui_->checkBoxFlipYUSB->setChecked(false); + } // set bluetooth if (configuration_->getCSValue("ENABLE_BLUETOOTH") == "1") { @@ -980,13 +1053,6 @@ void SettingsWindow::loadSystemValues() ui_->comboBoxBluetooth->setCurrentText("none"); } - // set sdoc - QString sdoc = configuration_->getParamFromFile("/boot/config.txt","dtoverlay=sdtweak"); - if (sdoc.contains("sdtweak")) { - ui_->comboBoxSDOC->setCurrentIndex(1); - } else { - ui_->comboBoxSDOC->setCurrentIndex(0); - } // set lightsensor if (std::ifstream("/etc/cs_lightsensor")) { ui_->comboBoxLS->setCurrentIndex(1); @@ -1027,31 +1093,6 @@ void SettingsWindow::loadSystemValues() updateNetworkInfo(); } -void SettingsWindow::onShowBindings() -{ - const QString message = QString("Enter -> [Enter] \n") - + QString("Left -> [Left] \n") - + QString("Right -> [Right] \n") - + QString("Up -> [Up] \n") - + QString("Down -> [Down] \n") - + QString("Back -> [Esc] \n") - + QString("Home -> [H] \n") - + QString("Phone -> [P] \n") - + QString("Call end -> [O] \n") - + QString("Play -> [X] \n") - + QString("Pause -> [C] \n") - + QString("Previous track -> [V]/[Media Previous] \n") - + QString("Next track -> [N]/[Media Next] \n") - + QString("Toggle play -> [B]/[Media Play] \n") - + QString("Voice command -> [M] \n") - + QString("Wheel left -> [1] \n") - + QString("Wheel right -> [2]"); - - QMessageBox confirmationMessage(QMessageBox::Information, "Information", message, QMessageBox::Ok); - confirmationMessage.setWindowFlags(Qt::WindowStaysOnTopHint); - confirmationMessage.exec(); -} - void SettingsWindow::onStartHotspot() { ui_->label_modeswitchprogress->setText("Wait ..."); @@ -1265,6 +1306,20 @@ void f1x::openauto::autoapp::ui::SettingsWindow::on_pushButtonAudioTest_clicked( void f1x::openauto::autoapp::ui::SettingsWindow::updateNetworkInfo() { + if (std::ifstream("/tmp/samba_running")) { + ui_->labelSambaStatus->setText("running"); + if (ui_->pushButtonSambaStart->isVisible() == true) { + ui_->pushButtonSambaStart->hide(); + ui_->pushButtonSambaStop->show(); + } + } else { + ui_->labelSambaStatus->setText("stopped"); + if (ui_->pushButtonSambaStop->isVisible() == true) { + ui_->pushButtonSambaStop->hide(); + ui_->pushButtonSambaStart->show(); + } + } + if (!std::ifstream("/tmp/mode_change_progress")) { QNetworkInterface eth0if = QNetworkInterface::interfaceFromName("eth0"); if (eth0if.flags().testFlag(QNetworkInterface::IsUp)) { diff --git a/src/autoapp/UI/UpdateDialog.cpp b/src/autoapp/UI/UpdateDialog.cpp index a1684ab..e9dbbd7 100644 --- a/src/autoapp/UI/UpdateDialog.cpp +++ b/src/autoapp/UI/UpdateDialog.cpp @@ -2,6 +2,7 @@ #include "ui_updatedialog.h" #include #include +#include #include #include @@ -24,6 +25,7 @@ UpdateDialog::UpdateDialog(QWidget *parent) connect(ui_->pushButtonUpdateOpenauto, &QPushButton::clicked, this, &UpdateDialog::on_pushButtonUpdateOpenauto_clicked); connect(ui_->pushButtonUpdateSystem, &QPushButton::clicked, this, &UpdateDialog::on_pushButtonUpdateSystem_clicked); connect(ui_->pushButtonUpdateCheck, &QPushButton::clicked, this, &UpdateDialog::on_pushButtonUpdateCheck_clicked); + connect(ui_->pushButtonUpdateCancel, &QPushButton::clicked, this, &UpdateDialog::on_pushButtonUpdateCancel_clicked); connect(ui_->pushButtonClose, &QPushButton::clicked, this, &UpdateDialog::close); ui_->progressBarCsmt->hide(); @@ -32,6 +34,7 @@ UpdateDialog::UpdateDialog(QWidget *parent) ui_->progressBarSystem->hide(); ui_->labelSystemReadyInstall->hide(); ui_->labelUpdateChecking->hide(); + ui_->pushButtonUpdateCancel->hide(); updateCheck(); watcher_tmp = new QFileSystemWatcher(this); @@ -41,6 +44,16 @@ UpdateDialog::UpdateDialog(QWidget *parent) watcher_download = new QFileSystemWatcher(this); watcher_download->addPath("/media/USBDRIVES/CSSTORAGE"); connect(watcher_download, &QFileSystemWatcher::directoryChanged, this, &UpdateDialog::downloadCheck); + + QStorageInfo storage("/media/USBDRIVES/CSSTORAGE"); + storage.refresh(); + if (storage.isValid() && storage.isReady()) { + ui_->system->show(); + ui_->labelNoStorage->hide(); + } else { + ui_->labelNoStorage->show(); + ui_->system->hide(); + } } UpdateDialog::~UpdateDialog() @@ -92,6 +105,12 @@ void f1x::openauto::autoapp::ui::UpdateDialog::on_pushButtonUpdateCheck_clicked( ui_->pushButtonUpdateCheck->show(); } +void f1x::openauto::autoapp::ui::UpdateDialog::on_pushButtonUpdateCancel_clicked() +{ + ui_->pushButtonUpdateCancel->hide(); + system("crankshaft update cancel &"); +} + void f1x::openauto::autoapp::ui::UpdateDialog::downloadCheck() { QDir directory("/media/USBDRIVES/CSSTORAGE"); @@ -146,6 +165,7 @@ void f1x::openauto::autoapp::ui::UpdateDialog::updateCheck() ui_->pushButtonUpdateSystem->hide(); ui_->progressBarSystem->hide(); ui_->labelSystemReadyInstall->show(); + ui_->pushButtonUpdateCancel->hide(); } else { ui_->labelSystemReadyInstall->hide(); if (std::ifstream("/tmp/system_update_available")) { @@ -158,6 +178,7 @@ void f1x::openauto::autoapp::ui::UpdateDialog::updateCheck() ui_->pushButtonUpdateSystem->hide(); ui_->pushButtonUpdateCheck->hide(); ui_->progressBarSystem->show(); + ui_->pushButtonUpdateCancel->show(); QFileInfo downloadfile = "/media/USBDRIVES/CSSTORAGE/" + ui_->labelDownload->text(); if (downloadfile.exists()) { @@ -168,6 +189,8 @@ void f1x::openauto::autoapp::ui::UpdateDialog::updateCheck() } else { if (ui_->pushButtonUpdateCheck->isVisible() == false) { ui_->pushButtonUpdateCheck->show(); + ui_->labelDownload->setText(""); + ui_->pushButtonUpdateCancel->hide(); } } @@ -183,3 +206,4 @@ void f1x::openauto::autoapp::ui::UpdateDialog::updateCheck() } } } + diff --git a/src/autoapp/UI/mainwindow.ui b/src/autoapp/UI/mainwindow.ui index 1db56f0..8610a1c 100644 --- a/src/autoapp/UI/mainwindow.ui +++ b/src/autoapp/UI/mainwindow.ui @@ -3844,7 +3844,7 @@ border: 2px solid rgba(255,255,255,0.5); outline: none; - Save + Save Event @@ -4858,7 +4858,7 @@ background-color: rgba(0, 0, 0, 0); - 12 + 14 75 true true diff --git a/src/autoapp/UI/mainwindow.ui.autosave b/src/autoapp/UI/mainwindow.ui.autosave new file mode 100644 index 0000000..8610a1c --- /dev/null +++ b/src/autoapp/UI/mainwindow.ui.autosave @@ -0,0 +1,5670 @@ + + + MainWindow + + + + 0 + 0 + 1010 + 1646 + + + + + 0 + 0 + + + + + 800 + 480 + + + + + 12 + + + + MainWindow + + + color: rgb(0, 0, 0); + + + + true + + + + 0 + 0 + + + + false + + + + 4 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + + + + 0 + 0 + + + + + 80 + + + + color: rgb(255, 255, 255); + + + 12:00:00 + + + Qt::AlignCenter + + + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + background-color: rgba(0, 0, 0, 0.5); + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 40 + 24 + + + + + 40 + 24 + + + + background-color: rgb(78, 154, 6); +color: rgb(239, 239, 239); +outline: none; +border-radius: 4px; + + + Lock + + + Qt::AlignCenter + + + + + + + + 150 + 24 + + + + + 150 + 24 + + + + + 75 + true + PreferDefault + + + + background-color: rgb(164, 0, 0); +color: rgb(255, 255, 255); +border-radius: 4px; + + + Dev Mode Enabled + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 150 + 24 + + + + + 150 + 24 + + + + + 50 + false + + + + background-color: rgb(115, 210, 22); +color: rgb(0, 0, 0); +outline: none; +border-radius: 4px; + + + + Update available! + + + + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + background-color: rgba(0, 0, 0, 0); +color: rgb(211, 215, 207); + + + + + + 4 + + + + + + + + 0 + 0 + + + + + 0 + 24 + + + + + 16777215 + 24 + + + + + DejaVu Sans + 14 + 75 + true + true + false + + + + background-color: rgba(255, 255, 255, 0); + + + <html><head/><body><p><span style=" font-style:normal; color:#ffffff;">crank</span><span style=" font-style:normal; color:#5ce739;">shaft </span><span style=" font-style:normal; color:#40bfbf;">NG </span><span style=" font-style:normal; color:#888a85;">- OpenCarOS</span></p></body></html> + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 8 + 75 + true + + + + background-color: rgba(0, 0, 0, 0); +color: rgb(211, 215, 207); + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 4 + + + + + + + + 0 + 0 + + + + + 150 + 24 + + + + + 150 + 24 + + + + background-color: rgba(0, 0, 0, 0); +color: rgb(211, 215, 207); + + + + + + + + + + + 0 + 0 + + + + + 40 + 24 + + + + + 40 + 24 + + + + background-color: rgba(0, 0, 0, 0); + + + + + + + + + + + 0 + 0 + + + + + 150 + 24 + + + + + 150 + 24 + + + + + 75 + true + + + + background-color: rgb(164, 0, 0); +color: rgb(255, 255, 255); +border-radius: 4px; + + + Dev Mode Enabled + + + Qt::AlignCenter + + + + + + + + + + 0 + 0 + + + + + 0 + 24 + + + + + 16777215 + 24 + + + + background-color: rgba(0, 0, 0, 0); + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 0 + 24 + + + + + 16777215 + 24 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 0 + 24 + + + + + 16777215 + 24 + + + + + 10 + 75 + true + + + + background-color: rgba(0, 0, 0, 0); +color: rgb(78, 244, 37); + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 0 + 24 + + + + + 16777215 + 24 + + + + + 75 + true + + + + background-color: rgba(0, 0, 0, 0); +color: rgb(78, 244, 37); + + + + + + + + + + + + + + 0 + 0 + + + + + 0 + 24 + + + + + 16777215 + 24 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 10 + 10 + + + + + + + + + 0 + 0 + + + + + 0 + 24 + + + + + 16777215 + 24 + + + + + 75 + true + + + + background-color: rgba(255, 255, 255, 0); +color: rgb(0, 102, 255); + + + BT-Device + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 10 + 20 + + + + + + + + + 0 + 0 + + + + + 80 + 24 + + + + + 80 + 24 + + + + + 50 + false + + + + background-color: rgb(164, 0, 0); +color: rgb(239, 239, 239); +outline: none; +border-radius: 4px; + + + + Recording + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 10 + 20 + + + + + + + + + 0 + 0 + + + + + 80 + 24 + + + + + 80 + 24 + + + + background-color: rgb(32, 74, 135); +color: rgb(255, 255, 255); +outline: none; +border-radius: 4px; + + + + <html><head/><body><p><span style=" color:#29ffff;">Pairable</span></p></body></html> + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 80 + 24 + + + + + 80 + 24 + + + + + 0 + 0 + + + + background-color: rgb(32, 74, 135); +color: rgb(239, 239, 239); +outline: none; +border-radius: 4px; + + + + BT-Pairing + + + + + + + + 0 + 0 + + + + + 100 + 24 + + + + + 100 + 24 + + + + + 75 + true + + + + background-color: rgba(255, 255, 255, 0); +color: rgb(255, 255, 255); + + + 12:00:00 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + + + 0 + 0 + + + + + 0 + 1 + + + + background-color: rgba(255,255,255,0.3); + + + Qt::Horizontal + + + + + + + + + + + 0 + 0 + + + + + 0 + 24 + + + + + 16777215 + 24 + + + + background-color: rgba(0, 0, 0, 0); +border-radius: 0px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 10 + 20 + + + + + + + + + 0 + 0 + + + + + 0 + 24 + + + + + 16777215 + 24 + + + + border: no-border; + + + + 0 + + + 0 + + + 20 + + + 0 + + + + + + 0 + 0 + + + + + 0 + 24 + + + + + 16777215 + 24 + + + + + 75 + true + + + + background-color: rgba(0, 0, 0, 0); +color: rgb(255, 255, 255); +border: no-border; + + + SSID: + + + + + + + + 0 + 0 + + + + + 75 + true + + + + background-color: rgba(0, 0, 0, 0); +color: rgb(255, 255, 255); +border: no-border; + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + + + 0 + 0 + + + + + 0 + 24 + + + + + 16777215 + 24 + + + + border: no-border; + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 0 + 24 + + + + + 16777215 + 24 + + + + + 75 + true + + + + background-color: rgba(0, 0, 0, 0); +color: rgb(255, 255, 255); +border: no-border; + + + IP: + + + + + + + + 0 + 0 + + + + + 130 + 24 + + + + + 130 + 24 + + + + + 75 + true + + + + background-color: rgba(0, 0, 0, 0); +color: rgb(255, 255, 255); +border: no-border; + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + + + 0 + 0 + + + + + 0 + 24 + + + + + 16777215 + 24 + + + + border: no-border; + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 0 + 24 + + + + + 16777215 + 24 + + + + + 75 + true + + + + background-color: rgba(0, 0, 0, 0); +color: rgb(255, 255, 255); +border: no-border; + + + Mask: + + + + + + + + 0 + 0 + + + + + 130 + 24 + + + + + 130 + 24 + + + + + 75 + true + + + + background-color: rgba(0, 0, 0, 0); +color: rgb(255, 255, 255); +border: no-border; + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + + + 0 + 0 + + + + + 0 + 24 + + + + + 16777215 + 24 + + + + border: no-border; + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 16777215 + 24 + + + + + 75 + true + + + + background-color: rgba(0, 0, 0, 0); +color: rgb(255, 255, 255); +border: no-border; + + + GW: + + + + + + + + 0 + 0 + + + + + 120 + 16777215 + + + + + 75 + true + + + + background-color: rgba(0, 0, 0, 0); +color: rgb(255, 255, 255); +border: no-border; + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + + Qt::Horizontal + + + + 10 + 20 + + + + + + + + + + + true + + + + 0 + 0 + + + + outline: none; + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + background-color: rgba(48, 140, 198, 0.5); +color: rgb(255, 255, 255); +border-top-left-radius: 4px; +border-top-right-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; +border-bottom: 0px; + + + + + + + + + + + 0 + 0 + + + + + 75 + true + + + + background-color: rgba(48, 140, 198, 0.5); +color: rgb(255, 255, 255); +border: 2px solid rgba(255,255,255,0.5); +outline: none; +border-top: 0px; +border-bottom: 0px; + + + + + + + + :/aausb-hot.png + + + + + 50 + 50 + + + + false + + + + + + + + 0 + 0 + + + + + 75 + true + + + + background-color: rgba(48, 140, 198, 0.5); +color: rgb(255, 255, 255); +border-bottom-left-radius: 4px; +border-bottom-right-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; +border-top: 0px; + + + + + + Qt::AlignHCenter|Qt::AlignTop + + + + + + + + + + + 0 + 0 + + + + + 75 + true + + + + background-color: rgba(48, 140, 198, 0.5); +color: rgb(255, 255, 255); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + No +USB Device + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 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); +outline: none; + + + + + + + :/aawifi-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + + 75 + true + + + + 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); +outline: none; + + + No +WiFi Clients + + + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + background: rgba(252, 233, 79, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/day-hot.png + + + + + 64 + 64 + + + + false + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + background-color: rgba(114, 159, 207, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/night-hot.png + + + + + 64 + 64 + + + + false + + + + + + + + 0 + 0 + + + + background-color: rgba(100, 62, 4, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/camera-hot.png + + + + + 64 + 64 + + + + + + + + + 0 + 0 + + + + background-color: rgba(64, 191, 191, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/volume-hot.png + + + + + 64 + 64 + + + + + + + + + 0 + 0 + + + + background-color: rgba(85, 87, 83, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/bug-hot.png + + + + + 64 + 64 + + + + + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 75 + true + + + + background-color: rgba(186, 189, 182, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +color: rgb(255, 255, 255); +outline: none; + + + + + + + + + + + 0 + 0 + + + + + 75 + true + + + + background-color: rgba(186, 189, 182, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +color: rgb(255, 255, 255); +outline: none; + + + + + + + + + + + 0 + 0 + + + + + 75 + true + + + + background-color: rgba(186, 189, 182, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +color: rgb(255, 255, 255); +outline: none; + + + + + + false + + + + + + + + 0 + 0 + + + + + 75 + true + + + + background-color: rgba(186, 189, 182, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +color: rgb(255, 255, 255); +outline: none; + + + + + + + + + + + 0 + 0 + + + + + 75 + true + + + + background-color: rgba(186, 189, 182, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +color: rgb(255, 255, 255); +outline: none; + + + + + + + + + + + 0 + 0 + + + + + 75 + true + + + + background-color: rgba(186, 189, 182, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +color: rgb(255, 255, 255); +outline: none; + + + + + + + + + + + 0 + 0 + + + + + 75 + true + + + + background-color: rgba(186, 189, 182, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +color: rgb(255, 255, 255); +outline: none; + + + + + + + + + + + 0 + 0 + + + + + 75 + true + + + + background-color: rgba(186, 189, 182, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +color: rgb(255, 255, 255); +outline: none; + + + + + + + + + + + 0 + 0 + + + + + 75 + true + + + + background-color: rgba(186, 189, 182, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +color: rgb(255, 255, 255); +outline: none; + + + + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + background-color: rgba(15, 54, 5, 0.5); +color: rgb(255, 255, 255); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + + :/lock-hot.png + + + + + 64 + 64 + + + + + + + + + 0 + 0 + + + + background-color: rgba(138, 226, 52, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/settings-hot.png + + + + + 64 + 64 + + + + true + + + + + + + + 0 + 0 + + + + + 75 + true + + + + background-color: rgba(78, 154, 6, 0.5); +color: rgb(255, 255, 255); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/mp3-hot.png + + + + + 64 + 64 + + + + + + + + + 0 + 0 + + + + background-color: rgba(245, 121, 0, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/brightness-hot.png + + + + + 64 + 64 + + + + + + + + + 0 + 0 + + + + background-color: rgba(237, 164, 255, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/eye-hot.png + + + + + 64 + 64 + + + + + + + + + 0 + 0 + + + + background-color: rgba(164, 0, 0, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/power-hot.png + + + + + 64 + 64 + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + background-color: rgba(239, 41, 41, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/power-hot.png + + + + + 64 + 64 + + + + + + + + + 0 + 0 + + + + background-color: rgba(252, 175, 62, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/reboot-hot.png + + + + + 64 + 64 + + + + + + + + + 0 + 0 + + + + background-color: rgba(32, 74, 135, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/back-hot.png + + + + + 64 + 64 + + + + + + + + + + + + + + + + + 0 + 0 + + + + + 4 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + + + 0 + 0 + + + + + 10 + + + 10 + + + 0 + + + 10 + + + + + + 0 + 0 + + + + + 66 + 0 + + + + + 66 + 16777215 + + + + background-color: rgba(136, 138, 133, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/settings-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + + 66 + 0 + + + + + 66 + 16777215 + + + + background-color: rgba(136, 138, 133, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/lock-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + + 66 + 0 + + + + + 66 + 16777215 + + + + background-color: rgba(136, 138, 133, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/mp3-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + + 66 + 0 + + + + + 66 + 16777215 + + + + background-color: rgba(136, 138, 133, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/brightness-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + + 66 + 0 + + + + + 66 + 16777215 + + + + background-color: rgba(136, 138, 133, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/eye-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + + 66 + 0 + + + + + 66 + 16777215 + + + + background-color: rgba(136, 138, 133, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/power-hot.png + + + + + 50 + 50 + + + + + + + + + + + + 0 + 0 + + + + + 10 + + + 10 + + + 0 + + + 10 + + + + + + 0 + 0 + + + + + 66 + 0 + + + + + 66 + 16777215 + + + + background-color: rgba(136, 138, 133, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/power-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + + 66 + 0 + + + + + 66 + 16777215 + + + + background-color: rgba(136, 138, 133, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/reboot-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + + 66 + 0 + + + + + 66 + 16777215 + + + + background-color: rgba(136, 138, 133, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/back-hot.png + + + + + 50 + 50 + + + + + + + + + + + + 0 + 0 + + + + + 80 + 50 + false + + + + color: rgb(255, 255, 255); + + + 12:00:00 + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + + 10 + + + 10 + + + 10 + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 66 + 0 + + + + + 66 + 16777215 + + + + background-color: rgba(136, 138, 133, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/aausb-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + + 66 + 0 + + + + + 66 + 16777215 + + + + + 75 + true + + + + background-color: rgba(136, 138, 133, 0.5); +color: rgb(255, 255, 255); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + No +USB +Device + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 66 + 0 + + + + + 66 + 16777215 + + + + background-color: rgba(136, 138, 133, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/aawifi-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + + 66 + 0 + + + + + 66 + 16777215 + + + + + 75 + true + + + + background-color: rgba(136, 138, 133, 0.5); +color: rgb(255, 255, 255); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + No +WiFi +Device + + + + + + + + + + + 0 + 0 + + + + + 66 + 0 + + + + + 66 + 16777215 + + + + background-color: rgba(136, 138, 133, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/day-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + + 66 + 0 + + + + + 66 + 16777215 + + + + background-color: rgba(136, 138, 133, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/night-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + + 66 + 0 + + + + + 66 + 16777215 + + + + background-color: rgba(136, 138, 133, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/camera-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + + 66 + 0 + + + + + 66 + 16777215 + + + + background-color: rgba(136, 138, 133, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/volume-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + + 66 + 0 + + + + + 66 + 16777215 + + + + background-color: rgba(136, 138, 133, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/bug-hot.png + + + + + 50 + 50 + + + + + + + + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + background-color: rgba(0, 0, 0, 1); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + background-color: rgba(0, 0, 0, 0); +border: 0px; + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 66 + 66 + + + + + 66 + 16777215 + + + + + 75 + true + + + + background-color: rgba(136, 138, 133, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +border-left: 0px; +border-top: 0px; +color: rgb(255, 255, 255); +outline: none; + + + Up + + + + + + + + 0 + 0 + + + + + 66 + 66 + + + + + 66 + 16777215 + + + + + 75 + true + + + + background-color: rgba(136, 138, 133, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +border-left: 0px; +border-bottom: 0px; +color: rgb(255, 255, 255); +outline: none; + + + Down + + + + + + + + + + + 0 + 0 + + + + background-color: rgba(0, 0, 0, 0); +border: 0px; +outline: none; + + + + + + + + + + + 0 + 0 + + + + background-color: rgba(0, 0, 0, 0); +border: 0px; + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 66 + 66 + + + + + 66 + 16777215 + + + + + 16 + 75 + true + + + + background-color: rgba(136, 138, 133, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +border-right: 0px; +border-top: 0px; +color: rgb(255, 255, 255); +outline: none; + + + + + + + + + + + + 0 + 0 + + + + + 66 + 66 + + + + + 66 + 16777215 + + + + + 16 + 75 + true + + + + background-color: rgba(136, 138, 133, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +border-right: 0px; +border-bottom: 0px; +color: rgb(255, 255, 255); +outline: none; + + + - + + + + + + + + + + + + + + + + 0 + 0 + + + + + 12 + 75 + true + + + + background-color: rgb(186, 189, 182); +color: rgb(0, 0, 0); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + Record + + + + :/record-hot.png + + + + + 32 + 32 + + + + + + + + + 0 + 0 + + + + + 12 + 75 + true + + + + background-color: rgb(186, 189, 182); +color: rgb(0, 0, 0); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + Record + + + + :/recordactive-hot.png + + + + + 32 + 32 + + + + + + + + + 0 + 0 + + + + + 12 + 75 + true + + + + background-color: rgb(186, 189, 182); +color: rgb(0, 0, 0); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + Stop + + + + :/stop-hot.png + + + + + 32 + 32 + + + + + + + + + 0 + 0 + + + + + 12 + 75 + true + + + + background-color: rgb(186, 189, 182); +color: rgb(0, 0, 0); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + Recordings + + + + :/list-hot.png + + + + + 32 + 32 + + + + + + + + + 0 + 0 + + + + + 12 + 75 + true + + + + background-color: rgb(186, 189, 182); +color: rgb(0, 0, 0); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + Save Event + + + + :/save-hot.png + + + + + 32 + 32 + + + + + + + + + + + + + + 0 + 0 + + + + Qt::LeftToRight + + + background-color: rgba(0, 0, 0, 0); + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + border: 0px; +background-color: rgba(0, 0, 0, 0); + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + background-color: rgba(0, 0, 0, 0.5); +color: rgb(255, 255, 255); +height: 45px; + + + + 4 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + 2 + + + + + + 0 + 0 + + + + + 0 + 45 + + + + + 16777215 + 45 + + + + + 0 + 45 + + + + + 14 + 75 + true + + + + Qt::DefaultContextMenu + + + QComboBox { + background-color: rgba(117, 80, 123, 0.9); + color: rgb(255, 255, 255); + border: 2px solid rgba(255,255,255,0.5); + outline: none; + height: 40px; +} + +QComboBox::drop-down { + width: 40px; + color: rgb(255, 255, 255); +} + +QScrollBar { + width: 40px; + background-color: rgba(117, 80, 123, 0.9); +} + + + + QComboBox::AdjustToContents + + + true + + + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + + 16777215 + 20 + + + + + 8 + + + + background-color: rgba(85, 87, 83, 0.7); +color: rgb(255, 255, 255); +border: 2px solid rgba(255,255,255,0.5); + + + + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + + 16777215 + 20 + + + + + 8 + + + + background-color: rgba(85, 87, 83, 0.7); +color: rgb(255, 255, 255); +border: 2px solid rgba(255,255,255,0.5); + + + + + + + + + + + 14 + 75 + true + + + + Qt::LeftToRight + + + false + + + QScrollBar { + width: 40px; + background-color: rgba(85, 87, 83, 0.7); +} + +QWidget { +background-color: rgba(85, 87, 83, 0.7); +color: rgb(255, 255, 255); +border: 2px solid rgba(255,255,255,0.5); +outline: none; +} + + + QFrame::NoFrame + + + Qt::ScrollBarAsNeeded + + + Qt::ScrollBarAsNeeded + + + QAbstractScrollArea::AdjustToContents + + + 16 + + + false + + + QAbstractItemView::SingleSelection + + + QListView::Static + + + false + + + QListView::Fixed + + + QListView::SinglePass + + + + 0 + 40 + + + + QListView::ListMode + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 12 + 75 + true + + + + color: rgb(255, 255, 255); + + + Title + + + + + + + + 0 + 0 + + + + + 12 + 75 + true + + + + color: rgb(255, 255, 255); +background-color: rgba(0, 0, 0, 0); + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 20 + 0 + + + + + 20 + 16777215 + + + + + 12 + 75 + true + + + + color: rgb(255, 255, 255); + + + / + + + Qt::AlignCenter + + + + + + + + 12 + 75 + true + + + + color: rgb(255, 255, 255); + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Qt::Horizontal + + + + 5 + 20 + + + + + + + + + 0 + 0 + + + + + 90 + 0 + + + + + 90 + 16777215 + + + + outline: none; + + + + + + + :/prevbig-hot.png + + + + + 128 + 140 + + + + + + + + Qt::Horizontal + + + + 5 + 20 + + + + + + + + + 0 + 0 + + + + + 90 + 0 + + + + + 90 + 16777215 + + + + outline: none; + + + + + + + :/prevbig-hot.png + + + + + 128 + 160 + + + + + + + + Qt::Horizontal + + + + 5 + 20 + + + + + + + + + + + + + 0 + 0 + + + + + 280 + 0 + + + + + 280 + 16777215 + + + + background-color: rgba(0, 0, 0, 0); +outline: none; + + + + + + + :/coverlogo.png + + + + + 270 + 270 + + + + false + + + false + + + + + + + + + + + Qt::Horizontal + + + + 1 + 1 + + + + + + + + + 0 + 0 + + + + + 12 + 75 + true + + + + color: rgb(255, 255, 255); + + + Album + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 12 + 75 + true + + + + color: rgb(255, 255, 255); + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 20 + 0 + + + + + 20 + 16777215 + + + + + 12 + 75 + true + + + + color: rgb(255, 255, 255); + + + / + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 12 + 75 + true + + + + color: rgb(255, 255, 255); + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Qt::Horizontal + + + + 1 + 1 + + + + + + + + + + + + Qt::Horizontal + + + + 5 + 20 + + + + + + + + + 0 + 0 + + + + + 90 + 0 + + + + + 90 + 16777215 + + + + outline: none; + + + + + + + :/nextbig-hot.png + + + + + 128 + 160 + + + + + + + + Qt::Horizontal + + + + 5 + 20 + + + + + + + + + 0 + 0 + + + + + 90 + 0 + + + + + 90 + 16777215 + + + + outline: none; + + + + + + + :/nextbig-hot.png + + + + + 128 + 140 + + + + + + + + Qt::Horizontal + + + + 5 + 20 + + + + + + + + + + + + + + + + + + + 0 + 0 + + + + + 14 + + + + background-color: rgba(0, 0, 0, 0.5); + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 150 + 34 + + + + + 150 + 34 + + + + color: rgb(255, 255, 255); +background-color: rgba(0, 0, 0, 0); + + + + + + + + + + + 0 + 0 + + + + + 0 + 34 + + + + + 16777215 + 34 + + + + + 14 + 75 + true + true + + + + background-color: rgba(0, 0, 0, 0); +color: rgb(255, 255, 255); + + + + + + Qt::AutoText + + + true + + + Qt::AlignCenter + + + true + + + + + + + + 0 + 0 + + + + + 150 + 34 + + + + + 150 + 34 + + + + + 14 + 75 + true + + + + color: rgb(255, 255, 255); +background-color: rgba(0, 0, 0, 0); + + + 00:00 / 00:00 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + 0 + 20 + + + + + 16777215 + 20 + + + + Qt::LeftToRight + + + false + + + QSlider::groove:horizontal { background-color: rgba(0, 0, 0, 0.8); height: 32px;} +QSlider::handle:horizontal { background: rgb(255, 255, 255); height: 52px; width: 52px; margin: 0 0;}; + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 0 + 4 + + + + + 16777215 + 4 + + + + background-color: rgba(0, 0, 0, 0.5); + + + + + + + + + + + 0 + 0 + + + + background-color: rgba(0, 0, 0, 0.5); + + + + 0 + + + 4 + + + 0 + + + 10 + + + + + + 0 + 0 + + + + + 0 + 40 + + + + + 16777215 + 40 + + + + background-color: rgba(114, 159, 207, 0.7); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/player-hot.png + + + + + 32 + 32 + + + + + + + + + 0 + 0 + + + + + 0 + 40 + + + + + 16777215 + 40 + + + + background-color: rgba(114, 159, 207, 0.7); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/list-hot.png + + + + + 32 + 32 + + + + + + + + + 0 + 0 + + + + + 0 + 40 + + + + + 16777215 + 40 + + + + background-color: rgba(250, 80, 80, 0.7); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/stop-hot.png + + + + + 32 + 32 + + + + + + + + + 0 + 0 + + + + + 0 + 40 + + + + + 16777215 + 40 + + + + background-color: rgba(138, 226, 52, 0.7); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/play-hot.png + + + + + 32 + 32 + + + + + + + + + 0 + 0 + + + + + 0 + 40 + + + + + 16777215 + 40 + + + + background-color: rgba(233, 185, 110, 0.7); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + + :/pause-hot.png + + + + + 32 + 32 + + + + false + + + + + + + + 0 + 0 + + + + + 0 + 40 + + + + + 16777215 + 40 + + + + + 75 + true + + + + background-color: rgba(186, 189, 182, 0.7); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +color: rgb(255, 255, 255); +outline: none; + + + + + + + :/home-hot.png + + + + + 32 + 32 + + + + + + + + + + + + + + + 0 + 0 + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 80 + 30 + + + + + 80 + 30 + + + + color: rgb(255, 255, 255); +background-color: rgb(164, 0, 0); +outline: none; + + + Muted + + + + + + + + 0 + 0 + + + + + 80 + 30 + + + + + 80 + 30 + + + + color: rgb(255, 255, 255); +background-color: #6d6d6d; +outline: none; + + + Mute + + + false + + + + + + + + 0 + 0 + + + + + 0 + 30 + + + + QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} +QSlider::handle:horizontal { background: rgb(64, 191, 191); height: 52px; width: 52px; margin: 0 0;}; +outline: none; + + + 100 + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 40 + 30 + + + + + 40 + 16777215 + + + + + 75 + true + + + + color: rgb(255, 255, 255); +background-color: #6d6d6d; + + + - + + + Qt::AlignCenter + + + + + + + + + + + 0 + 0 + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 30 + + + + Qt::LeftToRight + + + QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} +QSlider::handle:horizontal { background: rgb(64, 191, 191); height: 52px; width: 52px; margin: 0 0;}; +outline: none; + + + 100 + + + 100 + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 40 + 30 + + + + + 40 + 16777215 + + + + + 75 + true + + + + color: rgb(255, 255, 255); +background-color: #6d6d6d; + + + 100% + + + Qt::AlignCenter + + + + + + + + + + + 0 + 0 + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 0 + 30 + + + + + + + + + + QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} +QSlider::handle:horizontal { background: rgb(245, 121, 0); height: 52px; width: 52px; margin: 0 0;}; +outline: none; + + + 30 + + + 255 + + + 25 + + + 30 + + + 30 + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 40 + 30 + + + + + 40 + 16777215 + + + + + 75 + true + + + + color: rgb(255, 255, 255); +background-color: #6d6d6d; + + + - + + + Qt::AlignCenter + + + + + + + + + + + + + diff --git a/src/autoapp/UI/settingswindow.ui b/src/autoapp/UI/settingswindow.ui index a47496c..96a8e57 100644 --- a/src/autoapp/UI/settingswindow.ui +++ b/src/autoapp/UI/settingswindow.ui @@ -6,8 +6,8 @@ 0 0 - 800 - 3601 + 968 + 3602 @@ -1918,6 +1918,12 @@ QComboBox::item:selected { + + + 0 + 0 + + 0 @@ -1937,7 +1943,7 @@ QComboBox::item:selected { - background-color: rgb(78, 154, 6); + background-color: rgb(136, 138, 133); color: rgb(255, 255, 255); @@ -1971,8 +1977,12 @@ color: rgb(255, 255, 255); true + + background-color: rgb(164, 0, 0); +color: rgb(255, 255, 255); + - Test in progresss... + Test in progress ... Qt::AlignCenter @@ -2408,25 +2418,6 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} - - - - - 0 - 0 - - - - - 120 - 20 - - - - Show bindings - - - @@ -3880,51 +3871,6 @@ outline: none; 0 - - - - 2 - - - 2 - - - - - - 130 - 0 - - - - - 130 - 16777215 - - - - IP-Address (eth0) - - - - - - - - 200 - 0 - - - - - 200 - 16777215 - - - - - - @@ -4046,6 +3992,177 @@ outline: none; + + + + 2 + + + 2 + + + + + + 130 + 0 + + + + + 130 + 16777215 + + + + IP-Address (eth0) + + + + + + + + 200 + 0 + + + + + + + + Samba Server + + + + + + + + 0 + 0 + + + + + 0 + 24 + + + + + 16777215 + 24 + + + + + 2 + + + 0 + + + 2 + + + 0 + + + + + + 0 + 0 + + + + + 0 + 24 + + + + + 16777215 + 24 + + + + background-color: rgb(164, 0, 0); +outline: none; + + + Stop Samba + + + + + + + + 0 + 0 + + + + + 0 + 24 + + + + + 16777215 + 24 + + + + background-color: rgb(78, 154, 6); +outline: none; + + + Start Samba + + + + + + + + + + + 0 + 0 + + + + + 0 + 24 + + + + + 16777215 + 24 + + + + + 75 + true + + + + stopped + + + + + @@ -8435,10 +8552,10 @@ outline: none; - 2 + 0 - 2 + 0 @@ -8452,10 +8569,16 @@ outline: none; - 100 + 80 30 + + + 80 + 16777215 + + DAC @@ -8582,7 +8705,250 @@ QComboBox::item:selected { - + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 80 + 30 + + + + + 80 + 16777215 + + + + Bluetooth + + + + + + + + 0 + 0 + + + + + 0 + 32 + + + + + 16777215 + 32 + + + + + 12 + 75 + true + + + + QScrollBar { + width: 40px; + background-color: rgba(85, 87, 83, 0.7); +} +QComboBox::item { + padding-top: 6px; + padding-bottom: 6px; + height: 32px; + min-height: 32px; +} +QComboBox::item:selected { + background-color: rgb(78, 154, 6); + padding-top: 6px; + padding-bottom: 6px; + height: 32px; + min-height: 32px; +} + + + + none + + + + + builtin + + + + + external + + + + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 0 + 32 + + + + + 16777215 + 32 + + + + + 12 + 75 + true + + + + QScrollBar { + width: 40px; + background-color: rgba(85, 87, 83, 0.7); +} +QComboBox::item { + padding-top: 6px; + padding-bottom: 6px; + height: 32px; + min-height: 32px; +} +QComboBox::item:selected { + background-color: rgb(78, 154, 6); + padding-top: 6px; + padding-bottom: 6px; + height: 32px; + min-height: 32px; +} + + + + none + + + + + enabled (tsl2561) + + + + + + + + + 0 + 0 + + + + + 80 + 30 + + + + + 80 + 30 + + + + Lightsensor + + + + + + + + + + @@ -8592,17 +8958,23 @@ QComboBox::item:selected { - 100 + 80 30 + + + 80 + 16777215 + + RTC - - + + 0 @@ -8632,13 +9004,13 @@ QComboBox::item:selected { - 200 + 110 32 - 200 + 110 32 @@ -8757,13 +9129,22 @@ QComboBox::item:selected { - 100 + 74 + 30 + + + + + 74 30 Timezone + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + @@ -8820,7 +9201,7 @@ QComboBox::item:selected { - + @@ -8830,16 +9211,22 @@ QComboBox::item:selected { - 100 + 80 30 + + + 80 + 16777215 + + RPI-Cam - + @@ -8848,6 +9235,9 @@ QComboBox::item:selected { + + 6 + 0 @@ -8863,20 +9253,20 @@ QComboBox::item:selected { - + 0 0 - 0 + 110 32 - 16777215 + 110 32 @@ -8919,29 +9309,110 @@ QComboBox::item:selected { - + + + + 0 + 0 + + - 80 + 68 + 30 + + + + + 68 30 - FlipX + FPS + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - + + + + 0 + 0 + + - 80 - 30 + 130 + 32 - - FlipY + + + 130 + 32 + + + QScrollBar { + width: 40px; + background-color: rgba(85, 87, 83, 0.7); +} +QComboBox::item { + padding-top: 6px; + padding-bottom: 6px; + height: 32px; + min-height: 32px; +} +QComboBox::item:selected { + background-color: rgb(78, 154, 6); + padding-top: 6px; + padding-bottom: 6px; + height: 32px; + min-height: 32px; +} + + + 6 + + + + 5 + + + + + 10 + + + + + 15 + + + + + 20 + + + + + 24 + + + + + 30 + + + + + 60 (not @1080) + + @@ -8954,32 +9425,38 @@ QComboBox::item:selected { - 70 + 46 30 - 70 + 46 30 - Rotation ° + ROT + + + 0 + 0 + + - 0 + 120 32 - 16777215 + 120 32 @@ -9034,29 +9511,336 @@ QComboBox::item:selected { - 80 + 46 30 - 80 + 46 30 - Resolution + RES + + + 0 + 0 + + + + + 0 + 32 + + + + + 16777215 + 32 + + + + QScrollBar { + width: 40px; + background-color: rgba(85, 87, 83, 0.7); +} +QComboBox::item { + padding-top: 6px; + padding-bottom: 6px; + height: 32px; + min-height: 32px; +} +QComboBox::item:selected { + background-color: rgb(78, 154, 6); + padding-top: 6px; + padding-bottom: 6px; + height: 32px; + min-height: 32px; +} + + + 1 + + + + 480 + + + + + 720 + + + + + 1080 + + + + + + + + + + + + 0 + 0 + + + + + 1 + + + 0 + + + 0 + + + 0 + + + 0 0 + + + 108 + 30 + + + + + 108 + 30 + + + + border: 1px solid; +border-color: rgb(85, 87, 83); + + + Flip X-Axis + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 76 + 20 + + + + + + + + + 0 + 0 + + + + + 128 + 30 + + + + + 128 + 30 + + + + border: 1px solid; +border-color: rgb(85, 87, 83); + + + Flip Y-Axis + + + + + + + + 0 + 0 + + + + + 48 + 30 + + + + + 48 + 30 + + + + AWB + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 120 + 32 + + + + + 120 + 32 + + + + + 50 + false + + + + QScrollBar { + width: 40px; + background-color: rgba(85, 87, 83, 0.7); +} +QComboBox::item { + padding-top: 6px; + padding-bottom: 6px; + height: 32px; + min-height: 32px; +} +QComboBox::item:selected { + background-color: rgb(78, 154, 6); + padding-top: 6px; + padding-bottom: 6px; + height: 32px; + min-height: 32px; +} + + + + auto + + + + + sunlight + + + + + cloudy + + + + + shade + + + + + tungsten + + + + + fluorescent + + + + + incandescent + + + + + flash + + + + + horizon + + + + + off + + + + + + + + + 0 + 0 + + + + + 44 + 30 + + + + + 44 + 30 + + + + EXP + + + + + + + + 0 + 0 + + 0 @@ -9090,12 +9874,67 @@ QComboBox::item:selected { - 720 + auto - 1080 + night + + + + + nightpreview + + + + + backlight + + + + + spotlight + + + + + sports + + + + + snow + + + + + beach + + + + + verylong + + + + + fixedfps + + + + + antishake + + + + + fireworks + + + + + off @@ -9103,201 +9942,129 @@ QComboBox::item:selected { - - - - - 0 - 0 - - - - - 100 - 30 - - - - Bluetooth - - - - - - - - 0 - 0 - - - - - 100 - 30 - - - - SDCard OC - - - - - - - Lightsensor - - - - - - - - 0 - 0 - - - - - 0 - 32 - - - - - 16777215 - 32 - - - - - 12 - 75 - true - - - - QScrollBar { - width: 40px; - background-color: rgba(85, 87, 83, 0.7); -} -QComboBox::item { - padding-top: 6px; - padding-bottom: 6px; - height: 32px; - min-height: 32px; -} -QComboBox::item:selected { - background-color: rgb(78, 154, 6); - padding-top: 6px; - padding-bottom: 6px; - height: 32px; - min-height: 32px; -} - - - - none - - - - - builtin - - - - - external - - - - - - - - - 0 - 0 - - - - - 0 - 32 - - - - - 16777215 - 32 - - - - - 12 - 75 - true - - - - QScrollBar { - width: 40px; - background-color: rgba(85, 87, 83, 0.7); -} -QComboBox::item { - padding-top: 6px; - padding-bottom: 6px; - height: 32px; - min-height: 32px; -} -QComboBox::item:selected { - background-color: rgb(78, 154, 6); - padding-top: 6px; - padding-bottom: 6px; - height: 32px; - min-height: 32px; -} - - - - disabled - - - - - enabled (This can cause demaged sdcard - use at your own risk!) - - - - - + 0 0 - - - 0 - 32 - + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + + 0 + 0 + - - - 16777215 - 32 - - - - - 12 - 75 - true - - - - QScrollBar { + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 110 + 30 + + + + + 110 + 30 + + + + + 75 + true + + + + Dashcam + + + + + + + + 0 + 0 + + + + + 68 + 30 + + + + + 68 + 30 + + + + LTIME + + + + + + + + 0 + 0 + + + + + 130 + 32 + + + + + 130 + 32 + + + + QScrollBar { width: 40px; background-color: rgba(85, 87, 83, 0.7); } @@ -9314,28 +10081,153 @@ QComboBox::item:selected { height: 32px; min-height: 32px; } - - - - none - - - - - enabled (tsl2561) - - + + + + 300 + + + + + 600 + + + + + 900 + + + + + 1800 + + + + + 3600 + + + + + + + + + 0 + 0 + + + + + 46 + 30 + + + + + 46 + 30 + + + + CNT + + + + + + + + 0 + 0 + + + + + 120 + 32 + + + + + 120 + 32 + + + + QScrollBar { + width: 40px; + background-color: rgba(85, 87, 83, 0.7); +} +QComboBox::item { + padding-top: 6px; + padding-bottom: 6px; + height: 32px; + min-height: 32px; +} +QComboBox::item:selected { + background-color: rgb(78, 154, 6); + padding-top: 6px; + padding-bottom: 6px; + height: 32px; + min-height: 32px; +} + + + 2 + + + + 1 + + + + + 2 + + + + + 3 + + + + + 4 + + + + + 5 + + + + + + + + Auto record + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - - - - - - 0 - - - + + 0 @@ -9344,78 +10236,359 @@ QComboBox::item:selected { - 30 + 80 30 - 30 + 80 30 - <html><head/><body><p><img src=":/ico_warning.png"/></p></body></html> + USB-Cam - - + + 0 0 - - - 0 - 30 - - - - - 16777215 - 30 - - - - - 10 - true - - - - This must be selected if any hw config should be done on save! - + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 110 + 32 + + + + + 110 + 32 + + + + + none + + + + + enabled + + + + + + + + + 0 + 0 + + + + + 68 + 30 + + + + + 68 + 30 + + + + + + + + + + + + 0 + 0 + + + + + 128 + 30 + + + + + 128 + 30 + + + + border: 1px solid; +border-color: rgb(85, 87, 83); + + + Flip X-Axis + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 54 + 20 + + + + + + + + + 118 + 30 + + + + + 118 + 30 + + + + border: 1px solid; +border-color: rgb(85, 87, 83); + + + Flip Y-Axis + + + + + + + + 0 + 0 + + + + + 46 + 30 + + + + + 46 + 30 + + + + ROT + + + + + + + + 0 + 0 + + + + + 0 + 32 + + + + + 16777215 + 32 + + + + QScrollBar { + width: 40px; + background-color: rgba(85, 87, 83, 0.7); +} +QComboBox::item { + padding-top: 6px; + padding-bottom: 6px; + height: 32px; + min-height: 32px; +} +QComboBox::item:selected { + background-color: rgb(78, 154, 6); + padding-top: 6px; + padding-bottom: 6px; + height: 32px; + min-height: 32px; +} + + + + 0 + + + + + 180 + + + + + - + 0 0 - - - 240 - 0 - - - - - 12 - 75 - true - - - - Exec hardware setup on save? - + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 240 + 0 + + + + + 12 + 75 + true + + + + Exec hardware setup on save? + + + + + + + 0 + + + + + + 0 + 0 + + + + + 30 + 30 + + + + + 30 + 30 + + + + <html><head/><body><p><img src=":/ico_warning.png"/></p></body></html> + + + + + + + + 0 + 0 + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + + 10 + true + + + + This must be selected if any hw config should be done on save! + + + + + + diff --git a/src/autoapp/UI/updatedialog.ui b/src/autoapp/UI/updatedialog.ui index dc4af9a..9770ada 100644 --- a/src/autoapp/UI/updatedialog.ui +++ b/src/autoapp/UI/updatedialog.ui @@ -66,7 +66,7 @@ color: rgb(255, 255, 255); 2 - + Qt::Vertical @@ -511,200 +511,7 @@ color: rgb(255, 255, 255); - - - - - 0 - 0 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 140 - 30 - - - - - 140 - 30 - - - - - 75 - true - - - - background-color: rgb(78, 154, 6); -border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); - - - OK - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 140 - 30 - - - - - 140 - 30 - - - - - 75 - true - - - - background-color: rgb(206, 92, 0); -border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); - - - Reboot To Install - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 140 - 30 - - - - - 140 - 30 - - - - - 75 - true - - - - background-color: rgb(164, 0, 0); -border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); -color: rgb(255, 255, 255); - - - Update System - - - - - - - true - - - - 0 - 0 - - - - - 140 - 30 - - - - - 140 - 30 - - - - background-color: rgba(186, 189, 182, 0.5); -border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); -color: rgb(255, 255, 255); - - - 420 - - - 0 - - - Qt::AlignCenter - - - - - - - - - - Update System (Download Flash zip) -This can take some minutes! - - - false - - - - + @@ -726,6 +533,264 @@ This can take some minutes! + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 140 + 30 + + + + + 140 + 30 + + + + + 8 + 50 + false + + + + background-color: rgb(85, 87, 83); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); + + + No CSSTORAGE to +cache System Updates! + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 140 + 30 + + + + + 140 + 30 + + + + + 75 + true + + + + background-color: rgb(78, 154, 6); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); + + + OK + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 140 + 30 + + + + + 140 + 30 + + + + + 75 + true + + + + background-color: rgb(206, 92, 0); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); + + + Reboot To Install + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 140 + 30 + + + + + 140 + 30 + + + + + 75 + true + + + + background-color: rgb(164, 0, 0); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +color: rgb(255, 255, 255); + + + Update System + + + + + + + true + + + + 0 + 0 + + + + + 140 + 30 + + + + + 140 + 30 + + + + background-color: rgba(186, 189, 182, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +color: rgb(255, 255, 255); + + + 420 + + + 0 + + + Qt::AlignCenter + + + + + + + + + + + + + Update System (Download Flash zip) +This can take some minutes! + + + false + + + @@ -830,6 +895,43 @@ color: rgb(255, 255, 255); + + + + + 0 + 0 + + + + + 140 + 30 + + + + + 140 + 30 + + + + + 75 + true + + + + background-color: rgba(186, 189, 182, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +color: rgb(255, 255, 255); + + + Cancel Download + + + diff --git a/src/autoapp/autoapp.cpp b/src/autoapp/autoapp.cpp index acf58cf..7071e7b 100644 --- a/src/autoapp/autoapp.cpp +++ b/src/autoapp/autoapp.cpp @@ -166,17 +166,6 @@ int main(int argc, char* argv[]) OPENAUTO_LOG(info) << "[Camera] Zoom minus."; }); - QObject::connect(&mainWindow, &autoapp::ui::MainWindow::hideRearCam, [&qApplication]() { - system("/opt/crankshaft/cameracontrol.py DashcamMode &"); - system("sudo rm /tmp/rearcam_enabled &"); - OPENAUTO_LOG(info) << "[Camera] Dashcam mode."; - }); - - QObject::connect(&mainWindow, &autoapp::ui::MainWindow::showRearCam, [&qApplication]() { - system("/opt/crankshaft/cameracontrol.py Rearcam &"); - OPENAUTO_LOG(info) << "[Camera] Rearcam mode."; - }); - QObject::connect(&mainWindow, &autoapp::ui::MainWindow::cameraRecord, [&qApplication]() { system("/opt/crankshaft/cameracontrol.py Record &"); OPENAUTO_LOG(info) << "[Camera] Record."; @@ -248,7 +237,7 @@ int main(int argc, char* argv[]) } else { OPENAUTO_LOG(info) << "[Autoapp] TriggerAppStop: Manual stop wifi android auto."; try { - app->stop(); + app->onAndroidAutoQuit(); //app->pause(); } catch (...) { OPENAUTO_LOG(error) << "[Autoapp] TriggerAppStop: stop();";