From cc2e3d67ba2af20d4006e413dbeaa86e69d49275 Mon Sep 17 00:00:00 2001 From: hawkeyexp Date: Sat, 24 Nov 2018 15:23:09 +0100 Subject: [PATCH] More dynamic gui / player autoplay / add lightsensor to hw setup --- .../f1x/openauto/autoapp/UI/MainWindow.hpp | 7 +- .../openauto/autoapp/UI/SettingsWindow.hpp | 1 - src/autoapp/UI/MainWindow.cpp | 134 ++- src/autoapp/UI/SettingsWindow.cpp | 31 +- src/autoapp/UI/mainwindow.ui | 831 +++++++++--------- src/autoapp/UI/settingswindow.ui | 591 ++++++------- 6 files changed, 784 insertions(+), 811 deletions(-) diff --git a/include/f1x/openauto/autoapp/UI/MainWindow.hpp b/include/f1x/openauto/autoapp/UI/MainWindow.hpp index 82e97a4..18f05c4 100644 --- a/include/f1x/openauto/autoapp/UI/MainWindow.hpp +++ b/include/f1x/openauto/autoapp/UI/MainWindow.hpp @@ -146,6 +146,8 @@ private slots: private: Ui::MainWindow* ui_; + configuration::IConfiguration::Pointer configuration_; + QString brightnessFilename = "/sys/class/backlight/rpi_backlight/brightness"; QString brightnessFilenameAlt = "/tmp/custombrightness"; QFile *brightnessFile; @@ -226,12 +228,11 @@ private: bool c7ButtonForce = false; bool hotspotActive = false; - int currentPlaylistIndex = 0; - bool background_set = false; - bool mediacontentchanged = true; + + bool lightsensor = false; }; } diff --git a/include/f1x/openauto/autoapp/UI/SettingsWindow.hpp b/include/f1x/openauto/autoapp/UI/SettingsWindow.hpp index ef3b094..696f202 100644 --- a/include/f1x/openauto/autoapp/UI/SettingsWindow.hpp +++ b/include/f1x/openauto/autoapp/UI/SettingsWindow.hpp @@ -61,7 +61,6 @@ private slots: void onStartHotspot(); void onStopHotspot(); void syncNTPTime(); - void on_pushButtonRescan_clicked(); void on_pushButtonAudioTest_clicked(); void updateNetworkInfo(); diff --git a/src/autoapp/UI/MainWindow.cpp b/src/autoapp/UI/MainWindow.cpp index 3c9d021..3f80855 100644 --- a/src/autoapp/UI/MainWindow.cpp +++ b/src/autoapp/UI/MainWindow.cpp @@ -53,6 +53,8 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi QFont _font(family, 11); qApp->setFont(_font); + this->configuration_ = configuration; + // trigger files QFileInfo nightModeFile("/tmp/night_mode_enabled"); this->nightModeEnabled = nightModeFile.exists(); @@ -72,6 +74,9 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi QFileInfo DebugmodeFile("/tmp/usb_debug_mode"); this->systemDebugmode = DebugmodeFile.exists(); + QFileInfo lightsensorFile("/etc/cs_lightsensor"); + this->lightsensor = lightsensorFile.exists(); + QFileInfo c1ButtonFile(this->custom_button_file_c1); this->c1ButtonForce = c1ButtonFile.exists(); @@ -192,7 +197,6 @@ 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_->pushButtonDummyCamWifi->hide(); } else { ui_->pushButtonCameraShow->hide(); ui_->pushButtonCameraShow2->hide(); @@ -226,10 +230,8 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi ui_->VolumeSliderControlPlayer->hide(); // as default hide power buttons - ui_->pushButtonShutdown->hide(); - ui_->pushButtonReboot->hide(); - ui_->pushButtonCancel->hide(); ui_->exitWidget->hide(); + ui_->horizontalWidgetPower->hide(); // as default hide phone connected label ui_->phoneConnected->hide(); @@ -241,8 +243,6 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi if (!this->wifiButtonForce) { ui_->pushButtonWifi->hide(); ui_->pushButtonWifi2->hide(); - } else { - ui_->pushButtonDummyCamWifi->hide(); } // set custom buttons if file enabled by trigger file @@ -348,23 +348,6 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi connect(ui_->pushButton_c6, &QPushButton::clicked, this, &MainWindow::customButtonPressed6); } - if (!this->c7ButtonForce) { - ui_->pushButton_c7->hide(); - } else { - // read button config 7 - QFile paramFile(this->custom_button_file_c7); - paramFile.open(QIODevice::ReadOnly); - QTextStream data(¶mFile); - QStringList params = data.readAll().split("#"); - paramFile.close(); - ui_->pushButton_c7->setText(params[0].simplified()); - this->custom_button_command_c7 = params[1].simplified(); - if (params[2] != "") { - this->custom_button_color_c7 = params[2].simplified(); - } - connect(ui_->pushButton_c7, &QPushButton::clicked, this, &MainWindow::customButtonPressed7); - } - // as default hide camera controls ui_->cameraWidget->hide(); ui_->pushButtonRecordActive->hide(); @@ -504,6 +487,7 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi ui_->Digital_clock->hide(); } } else { + ui_->oldmenuDummy->show(); ui_->Digital_clock->show(); ui_->bigClock->hide(); } @@ -524,6 +508,16 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi ui_->horizontalSliderAlpha->setValue(int(configuration->getAlphaTrans())); MainWindow::on_horizontalSliderAlpha_valueChanged(int(configuration->getAlphaTrans())); + // Hide auto day/night if needed + if (this->lightsensor) { + ui_->pushButtonDay->hide(); + ui_->pushButtonNight->hide(); + ui_->pushButtonDay2->hide(); + ui_->pushButtonNight2->hide(); + ui_->pushButtonBrightness->hide(); + ui_->pushButtonBrightness2->hide(); + } + player = new QMediaPlayer(this); playlist = new QMediaPlaylist(this); connect(player, &QMediaPlayer::positionChanged, this, &MainWindow::on_positionChanged); @@ -549,7 +543,16 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi MainWindow::scanFolders(); ui_->comboBoxAlbum->setCurrentText(QString::fromStdString(configuration->getMp3SubFolder())); MainWindow::scanFiles(); + player->setPlaylist(this->playlist); ui_->mp3List->setCurrentRow(configuration->getMp3Track()); + this->currentPlaylistIndex = configuration->getMp3Track(); + + if (configuration->mp3AutoPlay()) { + MainWindow::playerShow(); + MainWindow::playerHide(); + MainWindow::on_pushButtonPlayerPlayList_clicked(); + MainWindow::playerShow(); + } watcher = new QFileSystemWatcher(this); watcher->addPath("/media/USBDRIVES"); @@ -757,7 +760,6 @@ 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_->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);"); @@ -766,7 +768,6 @@ void f1x::openauto::autoapp::ui::MainWindow::on_horizontalSliderAlpha_valueChang ui_->pushButton_c4->setStyleSheet( "background-color: rgba(" + this->custom_button_color_c4 + ", " + alp + " ); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); color: rgb(255,255,255);"); ui_->pushButton_c5->setStyleSheet( "background-color: rgba(" + this->custom_button_color_c5 + ", " + alp + " ); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); color: rgb(255,255,255);"); ui_->pushButton_c6->setStyleSheet( "background-color: rgba(" + this->custom_button_color_c6 + ", " + alp + " ); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); color: rgb(255,255,255);"); - ui_->pushButton_c7->setStyleSheet( "background-color: rgba(" + this->custom_button_color_c7 + ", " + alp + " ); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); color: rgb(255,255,255);"); ui_->pushButtonDummy1->setStyleSheet( "background-color: rgba(186, 189, 182, " + alp + " ); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5);"); ui_->pushButtonDummy2->setStyleSheet( "background-color: rgba(186, 189, 182, " + alp + " ); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5);"); ui_->pushButtonDummy3->setStyleSheet( "background-color: rgba(186, 189, 182, " + alp + " ); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5);"); @@ -876,20 +877,16 @@ void f1x::openauto::autoapp::ui::MainWindow::playerHide() void f1x::openauto::autoapp::ui::MainWindow::toggleExit() { if (!this->exitMenuVisible) { - ui_->pushButtonExit->hide(); - ui_->pushButtonShutdown->show(); - ui_->pushButtonReboot->show(); - ui_->pushButtonCancel->show(); ui_->exitWidget->show(); ui_->buttonWidget->hide(); + ui_->horizontalWidgetButtons->hide(); + ui_->horizontalWidgetPower->show(); this->exitMenuVisible = true; } else { - ui_->pushButtonShutdown->hide(); - ui_->pushButtonReboot->hide(); - ui_->pushButtonCancel->hide(); - ui_->pushButtonExit->show(); ui_->buttonWidget->show(); ui_->exitWidget->hide(); + ui_->horizontalWidgetButtons->show(); + ui_->horizontalWidgetPower->hide(); this->exitMenuVisible = false; } } @@ -1146,10 +1143,10 @@ void f1x::openauto::autoapp::ui::MainWindow::metaDataChanged() ui_->labelTrack->setText(QString::number(playlist->currentIndex()+1)); ui_->labelTrackCount->setText(QString::number(playlist->mediaCount())); - // Here a write to config is needed to keep playlist index - // - //configuration->setMp3Track(ui_->mp3List->currentRow()); - // + // Write current playing album and track to config + this->configuration_->setMp3Track(playlist->currentIndex()); + this->configuration_->setMp3SubFolder(ui_->comboBoxAlbum->currentText().toStdString()); + this->configuration_->save(); } void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonPlayerPlayList_clicked() @@ -1205,13 +1202,10 @@ void f1x::openauto::autoapp::ui::MainWindow::scanFolders() } this->currentPlaylistIndex = 0; ui_->SysinfoTopLeft->hide(); - //timerscan->stop(); } } catch(...) { ui_->SysinfoTopLeft->hide(); - //timerscan->stop(); - qDebug() << "Fail in Folderscan"; } } @@ -1515,15 +1509,11 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged() if ((ui_->pushButtonWifi->isVisible() == true) || (ui_->pushButtonWifi2->isVisible() == true)){ ui_->pushButtonWifi->hide(); ui_->pushButtonWifi2->hide(); - if (!this->cameraButtonForce) { - ui_->pushButtonDummyCamWifi->show(); - } } } else { if ((ui_->pushButtonWifi->isVisible() == false) || (ui_->pushButtonWifi2->isVisible() == false)) { ui_->pushButtonWifi->show(); ui_->pushButtonWifi2->show(); - ui_->pushButtonDummyCamWifi->hide(); } } @@ -1557,4 +1547,60 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged() ui_->pushButtonDummyClassic1->show(); ui_->pushButtonDummyClassic2->show(); } + + // Hide auto day/night if needed + if (this->lightsensor) { + ui_->pushButtonDay->hide(); + ui_->pushButtonNight->hide(); + ui_->pushButtonDay2->hide(); + ui_->pushButtonNight2->hide(); + ui_->pushButtonBrightness->hide(); + ui_->pushButtonBrightness2->hide(); + } + + // use big clock in classic gui? + if (this->configuration_->showBigClock()) { + this->UseBigClock = true; + } else { + this->UseBigClock = false; + } + + // clock viibility by settings + if (!this->configuration_->showClock()) { + ui_->Digital_clock->hide(); + ui_->bigClock->hide(); + this->NoClock = true; + } else { + this->NoClock = false; + if (this->UseBigClock) { + ui_->oldmenuDummy->hide(); + ui_->bigClock->show(); + if (oldGUIStyle) { + ui_->Digital_clock->hide(); + } + } else { + ui_->oldmenuDummy->show(); + ui_->Digital_clock->show(); + ui_->bigClock->hide(); + } + } + + // hide gui toggle if enabled in settings + if (this->configuration_->hideMenuToggle()) { + ui_->pushButtonToggleGUI->hide(); + ui_->pushButtonToggleGUI2->hide(); + } else { + ui_->pushButtonToggleGUI->show(); + ui_->pushButtonToggleGUI2->show(); + } + + // hide alpha controls if enabled in settings + if (!this->configuration_->hideAlpha()) { + ui_->pushButtonAlpha->show(); + } else { + ui_->pushButtonAlpha->hide(); + } + if (QString::number(this->configuration_->getAlphaTrans()) != QString::number(ui_->horizontalSliderAlpha->value())) { + ui_->horizontalSliderAlpha->setValue(static_cast(this->configuration_->getAlphaTrans())); + } } diff --git a/src/autoapp/UI/SettingsWindow.cpp b/src/autoapp/UI/SettingsWindow.cpp index 695c72a..8071ca7 100644 --- a/src/autoapp/UI/SettingsWindow.cpp +++ b/src/autoapp/UI/SettingsWindow.cpp @@ -94,8 +94,6 @@ SettingsWindow::SettingsWindow(configuration::IConfiguration::Pointer configurat QString time_text_minute=time.toString("mm"); ui_->spinBoxHour->setValue((time_text_hour).toInt()); ui_->spinBoxMinute->setValue((time_text_minute).toInt()); - - SettingsWindow::on_pushButtonRescan_clicked(); ui_->label_modeswitchprogress->hide(); QFileInfo hotspotFile("/tmp/hotspot_active"); @@ -127,7 +125,6 @@ void SettingsWindow::onSave() configuration_->setAlphaTrans(static_cast(ui_->horizontalSliderAlphaTrans->value())); configuration_->hideMenuToggle(ui_->checkBoxHideMenuToggle->isChecked()); configuration_->hideAlpha(ui_->checkBoxHideAlpha->isChecked()); - configuration_->setMp3SubFolder(ui_->comboBoxSubFolder->currentText().toStdString()); configuration_->mp3AutoPlay(ui_->checkBoxAutoPlay->isChecked()); configuration_->setVideoFPS(ui_->radioButton30FPS->isChecked() ? aasdk::proto::enums::VideoFPS::_30 : aasdk::proto::enums::VideoFPS::_60); @@ -273,6 +270,8 @@ void SettingsWindow::onSave() params.append("#"); params.append( std::string(ui_->comboBoxSDOC->currentText().split(" ")[0].toStdString()) ); params.append("#"); + params.append( std::string(ui_->comboBoxLS->currentText().split(" ")[0].toStdString()) ); + params.append("#"); system((std::string("/usr/local/bin/autoapp_helper setparams#") + std::string(params) + std::string(" &") ).c_str()); @@ -307,8 +306,6 @@ void SettingsWindow::load() ui_->checkBoxOldGUI->setChecked(configuration_->oldGUI()); ui_->checkBoxHideMenuToggle->setChecked(configuration_->hideMenuToggle()); ui_->checkBoxHideAlpha->setChecked(configuration_->hideAlpha()); - ui_->comboBoxSubFolder->setCurrentText(QString::fromStdString(configuration_->getMp3SubFolder())); - ui_->mp3track->setText(QString::number(configuration_->getMp3Track())); ui_->checkBoxAutoPlay->setChecked(configuration_->mp3AutoPlay()); ui_->radioButton30FPS->setChecked(configuration_->getVideoFPS() == aasdk::proto::enums::VideoFPS::_30); @@ -722,6 +719,12 @@ void SettingsWindow::loadSystemValues() } else { ui_->comboBoxSDOC->setCurrentIndex(0); } + // set lightsensor + if (getparams[40] == "enabled") { + ui_->comboBoxLS->setCurrentIndex(1); + } else { + ui_->comboBoxLS->setCurrentIndex(0); + } } } @@ -875,24 +878,6 @@ void SettingsWindow::show_tab8() } } -void f1x::openauto::autoapp::ui::SettingsWindow::on_pushButtonRescan_clicked() -{ - int cleaner = ui_->comboBoxSubFolder->count(); - // clean and rebuild subfolder box - while (cleaner > -1) { - ui_->comboBoxSubFolder->removeItem(cleaner); - cleaner--; - } - ui_->comboBoxSubFolder->addItem("/"); - QDir directory("/media/MYMEDIA"); - QStringList folders = directory.entryList(QStringList() << "*", QDir::AllDirs, QDir::Name); - foreach (QString foldername, folders) { - if (foldername != ".." && foldername != ".") { - ui_->comboBoxSubFolder->addItem(foldername); - } - } -} - void f1x::openauto::autoapp::ui::SettingsWindow::on_pushButtonAudioTest_clicked() { ui_->labelTestInProgress->show(); diff --git a/src/autoapp/UI/mainwindow.ui b/src/autoapp/UI/mainwindow.ui index ca2744b..22b7076 100644 --- a/src/autoapp/UI/mainwindow.ui +++ b/src/autoapp/UI/mainwindow.ui @@ -7,7 +7,7 @@ 0 0 862 - 1297 + 1301 @@ -554,11 +554,8 @@ color: rgb(255, 255, 255); 0 - - - - 6 - + + @@ -670,15 +667,8 @@ outline: none; - - - - - - 6 - - + 0 @@ -686,7 +676,7 @@ outline: none; - background-color: rgba(100, 62, 4, 0.5); + background-color: rgba(245, 121, 0, 0.5); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); outline: none; @@ -696,7 +686,7 @@ outline: none; - :/camera-hot.png + :/brightness-hot.png @@ -708,7 +698,7 @@ outline: none; - + 0 @@ -716,10 +706,9 @@ outline: none; - background-color: rgba(252, 175, 62, 0.5); + background-color: rgba(64, 191, 191, 0.5); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); -color: rgb(255, 255, 255); outline: none; @@ -727,7 +716,7 @@ outline: none; - :/wifi-hot.png + :/volume-hot.png @@ -738,280 +727,6 @@ outline: none; - - - - - 0 - 0 - - - - background-color: rgba(100, 62, 4, 0.5); -border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); -outline: none; - - - - - - - - - - - 0 - 0 - - - - background-color: rgba(100, 62, 4, 0.5); -border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); -outline: none; - - - Setup - - - - - - - - 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 - - - - 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 - - - - 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 - - - - - 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; - - - - - - - - - - @@ -1109,7 +824,7 @@ outline: none; - + @@ -1198,10 +913,84 @@ 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; + + + + + + @@ -1282,137 +1071,321 @@ outline: none; - - + + - + 0 0 - - background-color: rgba(85, 87, 83, 0.5); + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + background-color: rgba(100, 62, 4, 0.5); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); outline: none; - - - - - - - :/bug-hot.png - - - - - 64 - 64 - - - - - - - - - 0 - 0 - - - - - 75 - true - - - - background-color: rgba(78, 154, 6, 0.5); + + + + + + + :/camera-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); +color: rgb(255, 255, 255); +outline: none; + + + + + + + :/wifi-hot.png + + + + + 64 + 64 + + + + + + + + + 0 + 0 + + + + background-color: rgba(100, 62, 4, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + Setup + + + + + + + + 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 + + + + + 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 - - + + + + + + + :/mp3-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 - - background-color: rgba(245, 121, 0, 0.5); + + + 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; - - - - - - - :/brightness-hot.png - - - - - 64 - 64 - - - - - - - - - 0 - 0 - - - - background-color: rgba(64, 191, 191, 0.5); + + + + + + + :/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; - - - - - - - :/volume-hot.png - - - - - 64 - 64 - - + + + + + + + :/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 + + + + + @@ -1525,6 +1498,34 @@ outline: none; + + + + + 0 + 0 + + + + background-color: rgba(136, 138, 133, 0.5); +outline: none; + + + + + + + :/eye-hot.png + + + + + 50 + 50 + + + + @@ -1859,34 +1860,6 @@ outline: none; - - - - - 0 - 0 - - - - background-color: rgba(136, 138, 133, 0.5); -outline: none; - - - - - - - :/eye-hot.png - - - - - 50 - 50 - - - - diff --git a/src/autoapp/UI/settingswindow.ui b/src/autoapp/UI/settingswindow.ui index 00b263e..1a0b289 100644 --- a/src/autoapp/UI/settingswindow.ui +++ b/src/autoapp/UI/settingswindow.ui @@ -7,7 +7,7 @@ 0 0 963 - 3152 + 3006 @@ -253,6 +253,9 @@ outline: none; + + 6 + 2 @@ -406,165 +409,32 @@ outline: none; - + - + 0 0 - MP3 Player defaults + Media player defaults - - - 9 - - - 2 - + 2 2 - - - - - 140 - 32 - - - - - 140 - 32 - - - - background-color: rgb(85, 87, 83); -outline: none; - - - Rescan Folders - - - - - - - - 0 - 0 - - - - - 0 - 32 - - - - - 16777215 - 32 - - - - QScrollBar { - width: 40px; - background-color: rgba(85, 87, 83, 0.7); -} - - - - - - - 9 - - - 2 - - - 9 - - - 2 - - - - - - 0 - 0 - - - - - 30 - 30 - - - - <html><head/><body><p><img src=":/ico_warning.png"/></p></body></html> - - - - - - - - 0 - 0 - - - - - true - - - - If you select a subfolder the player will start with listing the files inside this folder (on system start). - - - true - - - - - - - - - Last Played Index - - - - - - - - 0 - 0 - - - - - - - - + auto play - - + + 0 @@ -5660,6 +5530,205 @@ QComboBox::item:selected { + + + + + + + 0 + 0 + + + + + 200 + 32 + + + + + 200 + 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 + + + + + abx80x + + + + + ds1307 + + + + + ds1339 + + + + + ds3231 + + + + + mcp7940x + + + + + mcp7941x + + + + + pcf2127 + + + + + pcf8523 + + + + + pcf8563 + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 100 + 30 + + + + Timezone + + + + + + + + 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; +} + + + + + + + + @@ -5679,172 +5748,7 @@ QComboBox::item:selected { - - - - - 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 - - - - - abx80x - - - - - ds1307 - - - - - ds1339 - - - - - ds3231 - - - - - mcp7940x - - - - - mcp7941x - - - - - pcf2127 - - - - - pcf8523 - - - - - pcf8563 - - - - - - - - 0 - 0 - - - - - 100 - 30 - - - - Timezone - - - - - - - - 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; -} - - - - @@ -5863,7 +5767,7 @@ QComboBox::item:selected { - + @@ -5921,7 +5825,7 @@ QComboBox::item:selected { - + @@ -5940,7 +5844,7 @@ QComboBox::item:selected { - + @@ -6003,7 +5907,7 @@ QComboBox::item:selected { - + @@ -6022,7 +5926,7 @@ QComboBox::item:selected { - + @@ -6080,6 +5984,71 @@ QComboBox::item:selected { + + + + 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 + + + + + enabled (tsl2561) + + + +