diff --git a/src/autoapp/Service/VideoService.cpp b/src/autoapp/Service/VideoService.cpp index 1bb0aa1..6c680f6 100644 --- a/src/autoapp/Service/VideoService.cpp +++ b/src/autoapp/Service/VideoService.cpp @@ -159,6 +159,12 @@ void VideoService::onVideoFocusRequest(const aasdk::proto::messages::VideoFocusR this->sendVideoFocusIndication(); channel_->receive(this->shared_from_this()); + + // stop video service on go back to openauto + if (request.focus_mode() == 2) { + OPENAUTO_LOG(info) << "[VideoService] Stop video service..."; + VideoService::stop(); + } } void VideoService::sendVideoFocusIndication() diff --git a/src/autoapp/UI/MainWindow.cpp b/src/autoapp/UI/MainWindow.cpp index 3f80855..31bb4d4 100644 --- a/src/autoapp/UI/MainWindow.cpp +++ b/src/autoapp/UI/MainWindow.cpp @@ -175,6 +175,9 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi // by default hide bluetooth button on init ui_->pushButtonBluetooth->hide(); + // by default hide bluetooth button on init + ui_->pushButtonAndroidAuto->hide(); + // by default hide media player ui_->mediaWidget->hide(); ui_->pushButtonUSB->hide(); @@ -1568,11 +1571,12 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged() // clock viibility by settings if (!this->configuration_->showClock()) { ui_->Digital_clock->hide(); + ui_->oldmenuDummy->show(); ui_->bigClock->hide(); this->NoClock = true; } else { this->NoClock = false; - if (this->UseBigClock) { + if (this->UseBigClock && ui_->oldmenuWidget->isVisible() == true) { ui_->oldmenuDummy->hide(); ui_->bigClock->show(); if (oldGUIStyle) { @@ -1603,4 +1607,23 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged() if (QString::number(this->configuration_->getAlphaTrans()) != QString::number(ui_->horizontalSliderAlpha->value())) { ui_->horizontalSliderAlpha->setValue(static_cast(this->configuration_->getAlphaTrans())); } + + // read value from tsl2561 + QFileInfo lightsensorFile("/tmp/tsl2561"); + if (lightsensorFile.exists()) { + QFile paramFile("/tmp/tsl2561"); + paramFile.open(QIODevice::ReadOnly); + QTextStream data(¶mFile); + QStringList value = data.readAll().split("\n"); + paramFile.close(); + if (ui_->label_left->isVisible() == false) { + ui_->label_left->show(); + } + ui_->label_left->setText("Lux: " + value[0]); + } else { + if (ui_->label_left->isVisible() == true) { + ui_->label_left->hide(); + ui_->label_left->setText(""); + } + } } diff --git a/src/autoapp/UI/SettingsWindow.cpp b/src/autoapp/UI/SettingsWindow.cpp index 8071ca7..c4ba5ef 100644 --- a/src/autoapp/UI/SettingsWindow.cpp +++ b/src/autoapp/UI/SettingsWindow.cpp @@ -272,6 +272,8 @@ void SettingsWindow::onSave() params.append("#"); params.append( std::string(ui_->comboBoxLS->currentText().split(" ")[0].toStdString()) ); params.append("#"); + params.append( std::string(ui_->comboBoxDayNight->currentText().toStdString()) ); + params.append("#"); system((std::string("/usr/local/bin/autoapp_helper setparams#") + std::string(params) + std::string(" &") ).c_str()); @@ -725,6 +727,7 @@ void SettingsWindow::loadSystemValues() } else { ui_->comboBoxLS->setCurrentIndex(0); } + ui_->comboBoxDayNight->setCurrentText(getparams[41]); } } diff --git a/src/autoapp/UI/mainwindow.old b/src/autoapp/UI/mainwindow.old new file mode 100644 index 0000000..84ca6eb --- /dev/null +++ b/src/autoapp/UI/mainwindow.old @@ -0,0 +1,4253 @@ + + + MainWindow + + + + 0 + 0 + 862 + 1297 + + + + + 0 + 0 + + + + + 800 + 480 + + + + + 12 + + + + MainWindow + + + color: rgb(0, 0, 0); + + + + true + + + + 0 + 0 + + + + false + + + + 4 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 0 + 0 + + + + background-color: rgba(0, 0, 0, 0.5); + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + 0 + + + + + + 75 + true + PreferDefault + + + + background-color: rgb(164, 0, 0); +color: rgb(255, 255, 255); + + + Dev Mode Enabled + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 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 + + + + + + + + 75 + true + + + + background-color: rgb(164, 0, 0); +color: rgb(255, 255, 255); + + + 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 + 22 + + + + + 16777215 + 22 + + + + + 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 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 75 + true + + + + background-color: rgba(255, 255, 255, 0); +color: rgb(255, 255, 255); + + + USB Connected + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + + 10 + 10 + + + + + + + + + 0 + 0 + + + + + 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 + 22 + + + + + 80 + 22 + + + + + 0 + 0 + + + + background-color: rgb(32, 74, 135); +color: rgb(239, 239, 239); +outline: none; + + + BT-Pairing + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 10 + 20 + + + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 100 + 22 + + + + + 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 + + + + + + + + + + true + + + + 0 + 0 + + + + outline: none; + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + 6 + + + + + + 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 + + + + + 12 + 75 + true + + + + background-color: rgba(114, 159, 207, 0.5); +color: rgb(255, 255, 255); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + Auto + Day/Night +activated + + + + 64 + 64 + + + + + + + + + 0 + 0 + + + + background-color: rgba(173, 127, 168, 0.5); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + + + + :/skin-hot.png + + + + + 64 + 64 + + + + false + + + + + + + + + 6 + + + + + + 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(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; + + + + + + + + + + + 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; + + + + + + + + + + + + + + + 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(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 + + + + + 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 + + + + 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 + + + + + + + + + + + + + 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(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 + + + + + 4 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + + + 0 + 0 + + + + + 10 + + + 10 + + + 0 + + + 10 + + + + + + 0 + 0 + + + + background-color: rgba(136, 138, 133, 0.5); +outline: none; + + + + + + + :/settings-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + background-color: rgba(136, 138, 133, 0.5); +outline: none; + + + + + + + :/lock-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + background-color: rgba(136, 138, 133, 0.5); +outline: none; + + + + + + + :/day-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + background-color: rgba(136, 138, 133, 0.5); +outline: none; + + + + + + + :/night-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + background-color: rgba(136, 138, 133, 0.5); +outline: none; + + + + + + + :/brightness-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + background-color: rgba(136, 138, 133, 0.5); +outline: none; + + + + + + + :/power-hot.png + + + + + 50 + 50 + + + + + + + + + + + + 0 + 0 + + + + + 10 + + + 10 + + + 0 + + + 10 + + + + + + 0 + 0 + + + + background-color: rgba(136, 138, 133, 0.5); +outline: none; + + + + + + + :/power-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + background-color: rgba(136, 138, 133, 0.5); +outline: none; + + + + + + + :/reboot-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + background-color: rgba(136, 138, 133, 0.5); +outline: none; + + + + + + + :/back-hot.png + + + + + 50 + 50 + + + + + + + + + + + + 0 + 0 + + + + + 80 + + + + color: rgb(255, 255, 255); + + + 12:00:00 + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + + 10 + + + 10 + + + 10 + + + + + + 0 + 0 + + + + background-color: rgba(136, 138, 133, 0.5); +outline: none; + + + + + + + :/camera-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + background-color: rgba(136, 138, 133, 0.5); +outline: none; + + + + + + + :/volume-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + background-color: rgba(136, 138, 133, 0.5); +outline: none; + + + + + + + :/eye-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + background-color: rgba(136, 138, 133, 0.5); +outline: none; + + + + + + + :/wifi-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + background-color: rgba(136, 138, 133, 0.5); +outline: none; + + + + + + + :/bug-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + background-color: rgba(136, 138, 133, 0.5); +outline: none; + + + + + + + :/mp3-hot.png + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + + 62 + 0 + + + + background-color: rgba(136, 138, 133, 0.5); +outline: none; + + + + + + + 50 + 50 + + + + + + + + + 0 + 0 + + + + + 62 + 0 + + + + background-color: rgba(136, 138, 133, 0.5); +outline: none; + + + + + + + 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); + + + + + + + + + + + + + 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; + + + Save + + + + :/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 + + + 4 + + + 0 + + + 4 + + + + + + 0 + 0 + + + + + 150 + 20 + + + + + 150 + 20 + + + + color: rgb(255, 255, 255); +background-color: rgba(0, 0, 0, 0); + + + + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + + 16777215 + 20 + + + + + 14 + 75 + true + true + + + + background-color: rgba(0, 0, 0, 0); +color: rgb(255, 255, 255); + + + + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 150 + 16 + + + + + 150 + 16 + + + + + 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 + + + + + 12 + 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; + + + USB + + + + + + + + 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 + + + + + + + + + + + + + + false + + + + 0 + 0 + + + + + 0 + 30 + + + + + 75 + true + + + + background-color: rgb(92, 231, 57); +color: rgb(0, 0, 0); + + + System messages + + + false + + + Qt::AlignCenter + + + 0 + + + + + + + + 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 + + + + + + + + + + + 0 + 0 + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 30 + + + + QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} +QSlider::handle:horizontal { background: rgb(173, 127, 168); height: 52px; width: 52px; margin: 0 0;}; +outline: none; + + + 1 + + + 100 + + + 1 + + + 50 + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 40 + 30 + + + + + 40 + 16777215 + + + + + 75 + true + + + + color: rgb(255, 255, 255); +background-color: #6d6d6d; + + + 0.5 + + + Qt::AlignCenter + + + + + + + + + + + + + diff --git a/src/autoapp/UI/mainwindow.ui b/src/autoapp/UI/mainwindow.ui index 22b7076..c1769b2 100644 --- a/src/autoapp/UI/mainwindow.ui +++ b/src/autoapp/UI/mainwindow.ui @@ -121,6 +121,41 @@ color: rgb(255, 255, 255); + + + + + 0 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + + 75 + true + + + + background-color: rgba(0, 0, 0, 0); +color: rgb(211, 215, 207); + + + + + + @@ -150,6 +185,44 @@ color: rgb(255, 255, 255); + + + + + 0 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + + 75 + true + + + + background-color: rgba(0, 0, 0, 0); +color: rgb(211, 215, 207); + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + @@ -442,61 +515,45 @@ outline: none; - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 20 - - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - - 100 - 22 - - - - - 75 - true - - - - background-color: rgba(255, 255, 255, 0); + + + + + 0 + 0 + + + + + 100 + 22 + + + + + 100 + 22 + + + + + 75 + true + + + + background-color: rgba(255, 255, 255, 0); color: rgb(255, 255, 255); - - - 12:00:00 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - + + + 12:00:00 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + @@ -556,6 +613,34 @@ color: rgb(255, 255, 255); + + + + + 0 + 0 + + + + + 75 + true + + + + background-color: rgba(14, 8, 137, 0.5); +color: rgb(255, 255, 255); +border-radius: 4px; +border: 2px solid rgba(255,255,255,0.5); +outline: none; + + + + Android +Auto + + + diff --git a/src/autoapp/UI/settingswindow.ui b/src/autoapp/UI/settingswindow.ui index 20ff110..448ffe2 100644 --- a/src/autoapp/UI/settingswindow.ui +++ b/src/autoapp/UI/settingswindow.ui @@ -408,47 +408,6 @@ outline: none; - - - - - 0 - 0 - - - - Media player defaults - - - - 2 - - - 2 - - - - - auto play - - - - - - - - 0 - 0 - - - - Auto playback last played song on startup if available - - - - - - @@ -521,6 +480,47 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} + + + + + 0 + 0 + + + + Media player defaults + + + + 2 + + + 2 + + + + + auto play + + + + + + + + 0 + 0 + + + + Auto playback last played song on startup if available + + + + + + @@ -4922,6 +4922,255 @@ subcontrol-position: center left; + + + + + + + 0 + 0 + + + + + 100 + 32 + + + + + 100 + 32 + + + + DayNight-Pin + + + + + + + + 0 + 0 + + + + + 100 + 32 + + + + + 16777215 + 32 + + + + QScrollBar { + width: 40px; + background-color: rgba(85, 87, 83, 0.7); +} + + + + - - - + + + + + 1 + + + + + 2 + + + + + 3 + + + + + 4 + + + + + 5 + + + + + 6 + + + + + 7 + + + + + 8 + + + + + 9 + + + + + 10 + + + + + 11 + + + + + 12 + + + + + 13 + + + + + 14 + + + + + 15 + + + + + 16 + + + + + 17 + + + + + 18 + + + + + 19 + + + + + 20 + + + + + 21 + + + + + 22 + + + + + 23 + + + + + 24 + + + + + 25 + + + + + 26 + + + + + + + + + + + + + 0 + 0 + + + + + 100 + 32 + + + + + 100 + 32 + + + + Unused + + + + + + + + 0 + 0 + + + + + 100 + 32 + + + + + 100 + 32 + + + + QScrollBar { + width: 40px; + background-color: rgba(85, 87, 83, 0.7); +} + + + + + diff --git a/src/autoapp/autoapp.cpp b/src/autoapp/autoapp.cpp index f159855..f12ccf5 100644 --- a/src/autoapp/autoapp.cpp +++ b/src/autoapp/autoapp.cpp @@ -229,6 +229,14 @@ int main(int argc, char* argv[]) app->start(std::move(socket)); }); + //QObject::connect(&mainWindow, &autoapp::ui::MainWindow::TriggerAAStart, [&qApplication]() { + // OPENAUTO_LOG(info) << "[CS] Manual start android auto entity."; + //}); + + //QObject::connect(&mainWindow, &autoapp::ui::MainWindow::TriggerAAStop, [&qApplication]() { + // OPENAUTO_LOG(info) << "[CS] Manual stop android auto entity."; + //}); + app->waitForUSBDevice(); auto result = qApplication.exec();