From f2e27a8d64984510de806583dbad52aacaff1744 Mon Sep 17 00:00:00 2001 From: hawkeyexp Date: Fri, 21 Sep 2018 00:15:16 +0200 Subject: [PATCH] Add mediapaths to settings / gui reworks --- .../autoapp/Configuration/Configuration.hpp | 11 + .../autoapp/Configuration/IConfiguration.hpp | 6 + .../openauto/autoapp/UI/SettingsWindow.hpp | 4 + src/autoapp/Configuration/Configuration.cpp | 39 ++- src/autoapp/UI/MainWindow.cpp | 15 +- src/autoapp/UI/SettingsWindow.cpp | 47 +++- src/autoapp/UI/mainwindow.ui | 247 +++++++++++++----- src/autoapp/UI/settingswindow.ui | 224 +++++++++++++++- 8 files changed, 511 insertions(+), 82 deletions(-) diff --git a/include/f1x/openauto/autoapp/Configuration/Configuration.hpp b/include/f1x/openauto/autoapp/Configuration/Configuration.hpp index 8040991..778752a 100644 --- a/include/f1x/openauto/autoapp/Configuration/Configuration.hpp +++ b/include/f1x/openauto/autoapp/Configuration/Configuration.hpp @@ -57,6 +57,12 @@ public: void hideAlpha(bool value) override; bool hideAlpha() const override; + std::string getMp3MasterPath() const override; + void setMp3MasterPath(const std::string& value) override; + + std::string getMp3SubFolder() const override; + void setMp3SubFolder(const std::string& value) override; + aasdk::proto::enums::VideoFPS::Enum getVideoFPS() const override; void setVideoFPS(aasdk::proto::enums::VideoFPS::Enum value) override; aasdk::proto::enums::VideoResolution::Enum getVideoResolution() const override; @@ -98,6 +104,8 @@ private: size_t alphaTrans_; bool hideMenuToggle_; bool hideAlpha_; + std::string mp3MasterPath_; + std::string mp3SubFolder_; aasdk::proto::enums::VideoFPS::Enum videoFPS_; aasdk::proto::enums::VideoResolution::Enum videoResolution_; @@ -124,6 +132,9 @@ private: static const std::string cGeneralHandednessOfTrafficTypeKey; + static const std::string cGeneralMp3MasterPathKey; + static const std::string cGeneralMp3SubFolderKey; + static const std::string cVideoFPSKey; static const std::string cVideoResolutionKey; static const std::string cVideoScreenDPIKey; diff --git a/include/f1x/openauto/autoapp/Configuration/IConfiguration.hpp b/include/f1x/openauto/autoapp/Configuration/IConfiguration.hpp index 6b497c3..2c51846 100644 --- a/include/f1x/openauto/autoapp/Configuration/IConfiguration.hpp +++ b/include/f1x/openauto/autoapp/Configuration/IConfiguration.hpp @@ -65,6 +65,12 @@ public: virtual void hideAlpha(bool value) = 0; virtual bool hideAlpha() const = 0; + virtual std::string getMp3MasterPath() const = 0; + virtual void setMp3MasterPath(const std::string& value) = 0; + + virtual std::string getMp3SubFolder() const = 0; + virtual void setMp3SubFolder(const std::string& value) = 0; + virtual aasdk::proto::enums::VideoFPS::Enum getVideoFPS() const = 0; virtual void setVideoFPS(aasdk::proto::enums::VideoFPS::Enum value) = 0; virtual aasdk::proto::enums::VideoResolution::Enum getVideoResolution() const = 0; diff --git a/include/f1x/openauto/autoapp/UI/SettingsWindow.hpp b/include/f1x/openauto/autoapp/UI/SettingsWindow.hpp index c6054c7..2b89a93 100644 --- a/include/f1x/openauto/autoapp/UI/SettingsWindow.hpp +++ b/include/f1x/openauto/autoapp/UI/SettingsWindow.hpp @@ -21,6 +21,7 @@ #include #include #include +#include class QCheckBox; @@ -70,6 +71,9 @@ private slots: void show_tab7(); void show_tab8(); + void on_pushButton_clicked(); + void scanSubFolders(); + private: void showEvent(QShowEvent* event); void load(); diff --git a/src/autoapp/Configuration/Configuration.cpp b/src/autoapp/Configuration/Configuration.cpp index 3e60c3d..bc1275d 100644 --- a/src/autoapp/Configuration/Configuration.cpp +++ b/src/autoapp/Configuration/Configuration.cpp @@ -41,6 +41,9 @@ const std::string Configuration::cGeneralHideAlphaKey = "General.HideAlpha"; const std::string Configuration::cGeneralHandednessOfTrafficTypeKey = "General.HandednessOfTrafficType"; +const std::string Configuration::cGeneralMp3MasterPathKey = "General.Mp3MasterPath"; +const std::string Configuration::cGeneralMp3SubFolderKey = "General.Mp3SubFolder"; + const std::string Configuration::cVideoFPSKey = "Video.FPS"; const std::string Configuration::cVideoResolutionKey = "Video.Resolution"; const std::string Configuration::cVideoScreenDPIKey = "Video.ScreenDPI"; @@ -87,17 +90,18 @@ void Configuration::load() boost::property_tree::ini_parser::read_ini(cConfigFileName, iniConfig); handednessOfTrafficType_ = static_cast(iniConfig.get(cGeneralHandednessOfTrafficTypeKey, - static_cast(HandednessOfTrafficType::LEFT_HAND_DRIVE))); + static_cast(HandednessOfTrafficType::LEFT_HAND_DRIVE))); showClock_ = iniConfig.get(cGeneralShowClockKey, true); - showBigClock_ = iniConfig.get(cGeneralShowBigClockKey, false); oldGUI_ = iniConfig.get(cGeneralOldGUIKey, false); alphaTrans_ = iniConfig.get(cGeneralAlphaTransKey, 50); hideMenuToggle_ = iniConfig.get(cGeneralHideMenuToggleKey, false); hideAlpha_ = iniConfig.get(cGeneralHideAlphaKey, false); + mp3MasterPath_ = iniConfig.get(cGeneralMp3MasterPathKey, "/media/CSSTORAGE/Music"); + mp3SubFolder_ = iniConfig.get(cGeneralMp3SubFolderKey, "/"); videoFPS_ = static_cast(iniConfig.get(cVideoFPSKey, - aasdk::proto::enums::VideoFPS::_60)); + aasdk::proto::enums::VideoFPS::_30)); videoResolution_ = static_cast(iniConfig.get(cVideoResolutionKey, aasdk::proto::enums::VideoResolution::_480p)); @@ -113,10 +117,9 @@ void Configuration::load() static_cast(BluetoothAdapterType::NONE))); bluetoothRemoteAdapterAddress_ = iniConfig.get(cBluetoothRemoteAdapterAddressKey, ""); - musicAudioChannelEnabled_ = iniConfig.get(cAudioMusicAudioChannelEnabled, true); speechAudiochannelEnabled_ = iniConfig.get(cAudioSpeechAudioChannelEnabled, true); - audioOutputBackendType_ = static_cast(iniConfig.get(cAudioOutputBackendType, static_cast(AudioOutputBackendType::QT))); + audioOutputBackendType_ = static_cast(iniConfig.get(cAudioOutputBackendType, static_cast(AudioOutputBackendType::RTAUDIO))); } catch(const boost::property_tree::ini_parser_error& e) { @@ -136,7 +139,9 @@ void Configuration::reset() alphaTrans_ = 50; hideMenuToggle_ = false; hideAlpha_ = false; - videoFPS_ = aasdk::proto::enums::VideoFPS::_60; + mp3MasterPath_ = "/media/CSSTORAGE/Music"; + mp3SubFolder_ = "/"; + videoFPS_ = aasdk::proto::enums::VideoFPS::_30; videoResolution_ = aasdk::proto::enums::VideoResolution::_480p; screenDPI_ = 140; omxLayerIndex_ = 1; @@ -161,6 +166,8 @@ void Configuration::save() iniConfig.put(cGeneralAlphaTransKey, alphaTrans_); iniConfig.put(cGeneralHideMenuToggleKey, hideMenuToggle_); iniConfig.put(cGeneralHideAlphaKey, hideAlpha_); + iniConfig.put(cGeneralMp3MasterPathKey, mp3MasterPath_); + iniConfig.put(cGeneralMp3SubFolderKey, mp3SubFolder_); iniConfig.put(cVideoFPSKey, static_cast(videoFPS_)); iniConfig.put(cVideoResolutionKey, static_cast(videoResolution_)); @@ -270,6 +277,26 @@ bool Configuration::hideAlpha() const return hideAlpha_; } +std::string Configuration::getMp3MasterPath() const +{ + return mp3MasterPath_; +} + +void Configuration::setMp3MasterPath(const std::string& value) +{ + mp3MasterPath_ = value; +} + +std::string Configuration::getMp3SubFolder() const +{ + return mp3SubFolder_; +} + +void Configuration::setMp3SubFolder(const std::string& value) +{ + mp3SubFolder_ = value; +} + aasdk::proto::enums::VideoFPS::Enum Configuration::getVideoFPS() const { return videoFPS_; diff --git a/src/autoapp/UI/MainWindow.cpp b/src/autoapp/UI/MainWindow.cpp index 898e20f..e2a15ad 100644 --- a/src/autoapp/UI/MainWindow.cpp +++ b/src/autoapp/UI/MainWindow.cpp @@ -549,11 +549,20 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi connect(player, &QMediaPlayer::durationChanged, this, &MainWindow::on_durationChanged); connect(player, &QMediaPlayer::metaDataAvailableChanged, this, &MainWindow::metaDataChanged); - MainWindow::scanFolders(); - MainWindow::scanFiles(); - ui_->labelFolderpath->hide(); + //ui_->labelFolderpath->hide(); ui_->pushButtonPlayerPlay->hide(); ui_->PlayerPlayingWidget->hide(); + + //this->musicfolder = QString::fromStdString(configuration->getMp3MasterPath()); + //this->albumfolder = QString::fromStdString(configuration->getMp3SubFolder()); + //ui_->labelFolderpath->setText(this->musicfolder); + //ui_->labelAlbumpath->setText(this->albumfolder); + ui_->labelFolderpath->hide(); + ui_->labelAlbumpath->hide(); + + MainWindow::scanFolders(); + ui_->comboBoxAlbum->setCurrentText(QString::fromStdString(configuration->getMp3SubFolder())); + MainWindow::scanFiles(); } MainWindow::~MainWindow() diff --git a/src/autoapp/UI/SettingsWindow.cpp b/src/autoapp/UI/SettingsWindow.cpp index 0d1c5ee..ec164e8 100644 --- a/src/autoapp/UI/SettingsWindow.cpp +++ b/src/autoapp/UI/SettingsWindow.cpp @@ -1,4 +1,4 @@ -/* +/*subfolder * This file is part of openauto project. * Copyright (C) 2018 f1x.studio (Michal Szwaj) * @@ -95,6 +95,7 @@ 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::scanSubFolders(); } SettingsWindow::~SettingsWindow() @@ -112,6 +113,8 @@ void SettingsWindow::onSave() configuration_->setAlphaTrans(static_cast(ui_->horizontalSliderAlphaTrans->value())); configuration_->hideMenuToggle(ui_->checkBoxHideMenuToggle->isChecked()); configuration_->hideAlpha(ui_->checkBoxHideAlpha->isChecked()); + configuration_->setMp3MasterPath(ui_->pathMusicFolder->text().toStdString()); + configuration_->setMp3SubFolder(ui_->comboBoxSubFolder->currentText().toStdString()); configuration_->setVideoFPS(ui_->radioButton30FPS->isChecked() ? aasdk::proto::enums::VideoFPS::_30 : aasdk::proto::enums::VideoFPS::_60); @@ -288,6 +291,8 @@ void SettingsWindow::load() ui_->checkBoxOldGUI->setChecked(configuration_->oldGUI()); ui_->checkBoxHideMenuToggle->setChecked(configuration_->hideMenuToggle()); ui_->checkBoxHideAlpha->setChecked(configuration_->hideAlpha()); + ui_->pathMusicFolder->setText(QString::fromStdString(configuration_->getMp3MasterPath())); + ui_->comboBoxSubFolder->setCurrentText(QString::fromStdString(configuration_->getMp3SubFolder())); ui_->radioButton30FPS->setChecked(configuration_->getVideoFPS() == aasdk::proto::enums::VideoFPS::_30); ui_->radioButton60FPS->setChecked(configuration_->getVideoFPS() == aasdk::proto::enums::VideoFPS::_60); @@ -827,3 +832,43 @@ void SettingsWindow::show_tab8() } } } + +void f1x::openauto::autoapp::ui::SettingsWindow::on_pushButton_clicked() +{ + QString folder = QFileDialog::getExistingDirectory(this, tr("Select Music Path"), "/media/CSSTORAGE/Music", QFileDialog::ShowDirsOnly); + if (folder != "") { + ui_->pathMusicFolder->setText(folder); + int cleaner = ui_->comboBoxSubFolder->count(); + // clean and rebuild subfolder box + while (cleaner > -1) { + ui_->comboBoxSubFolder->removeItem(cleaner); + cleaner--; + } + ui_->comboBoxSubFolder->addItem("/"); + QDir directory(ui_->pathMusicFolder->text()); + 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::scanSubFolders() +{ + int cleaner = ui_->comboBoxSubFolder->count(); + // clean and rebuild subfolder box + while (cleaner > -1) { + ui_->comboBoxSubFolder->removeItem(cleaner); + cleaner--; + } + ui_->comboBoxSubFolder->addItem("/"); + QDir directory(ui_->pathMusicFolder->text()); + QStringList folders = directory.entryList(QStringList() << "*", QDir::AllDirs, QDir::Name); + foreach (QString foldername, folders) { + if (foldername != ".." && foldername != ".") { + ui_->comboBoxSubFolder->addItem(foldername); + } + } +} diff --git a/src/autoapp/UI/mainwindow.ui b/src/autoapp/UI/mainwindow.ui index 5a5015a..89af723 100644 --- a/src/autoapp/UI/mainwindow.ui +++ b/src/autoapp/UI/mainwindow.ui @@ -7,7 +7,7 @@ 0 0 936 - 1282 + 1286 @@ -332,7 +332,8 @@ color: rgb(0, 102, 255); background-color: rgb(32, 74, 135); -color: rgb(239, 239, 239); +color: rgb(239, 239, 239); +outline: none; BT-Pairing @@ -418,6 +419,9 @@ color: rgb(255, 255, 255); 0 + + outline: none; + 0 @@ -453,7 +457,8 @@ color: rgb(255, 255, 255); background: rgba(252, 233, 79, 0.5); border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); +border: 2px solid rgba(255,255,255,0.5); +outline: none; @@ -491,7 +496,8 @@ border: 2px solid rgba(255,255,255,0.5); background-color: rgba(114, 159, 207, 0.5); border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); +border: 2px solid rgba(255,255,255,0.5); +outline: none; @@ -507,6 +513,9 @@ border: 2px solid rgba(255,255,255,0.5); 64 + + false + @@ -520,7 +529,8 @@ border: 2px solid rgba(255,255,255,0.5); background-color: rgba(173, 127, 168, 0.5); border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); +border: 2px solid rgba(255,255,255,0.5); +outline: none; @@ -536,6 +546,9 @@ border: 2px solid rgba(255,255,255,0.5); 64 + + false + @@ -556,7 +569,8 @@ border: 2px solid rgba(255,255,255,0.5); background-color: rgba(100, 62, 4, 0.5); border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); +border: 2px solid rgba(255,255,255,0.5); +outline: none; @@ -586,7 +600,8 @@ border: 2px solid rgba(255,255,255,0.5); 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); +color: rgb(255, 255, 255); +outline: none; @@ -615,7 +630,8 @@ color: rgb(255, 255, 255); background-color: rgba(100, 62, 4, 0.5); border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); +border: 2px solid rgba(255,255,255,0.5); +outline: none; @@ -640,7 +656,8 @@ border: 2px solid rgba(255,255,255,0.5); 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); +color: rgb(255, 255, 255); +outline: none; @@ -662,7 +679,8 @@ color: rgb(255, 255, 255); background-color: rgba(164, 0, 0, 0.5); border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); +border: 2px solid rgba(255,255,255,0.5); +outline: none; @@ -691,7 +709,8 @@ border: 2px solid rgba(255,255,255,0.5); background-color: rgba(239, 41, 41, 0.5); border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); +border: 2px solid rgba(255,255,255,0.5); +outline: none; @@ -720,7 +739,8 @@ border: 2px solid rgba(255,255,255,0.5); background-color: rgba(252, 175, 62, 0.5); border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); +border: 2px solid rgba(255,255,255,0.5); +outline: none; @@ -749,7 +769,8 @@ border: 2px solid rgba(255,255,255,0.5); background-color: rgba(32, 74, 135, 0.5); border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); +border: 2px solid rgba(255,255,255,0.5); +outline: none; @@ -789,7 +810,8 @@ border: 2px solid rgba(255,255,255,0.5); 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); +color: rgb(255, 255, 255); +outline: none; @@ -814,7 +836,8 @@ color: rgb(255, 255, 255); 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); +color: rgb(255, 255, 255); +outline: none; @@ -839,7 +862,8 @@ color: rgb(255, 255, 255); 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); +color: rgb(255, 255, 255); +outline: none; @@ -861,7 +885,8 @@ color: rgb(255, 255, 255); background-color: rgba(237, 164, 255, 0.5); border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); +border: 2px solid rgba(255,255,255,0.5); +outline: none; @@ -892,6 +917,7 @@ border: 2px solid rgba(255,255,255,0.5); color: rgb(255, 255, 255); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); +outline: none; @@ -921,7 +947,8 @@ border: 2px solid rgba(255,255,255,0.5); background-color: rgba(138, 226, 52, 0.5); border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); +border: 2px solid rgba(255,255,255,0.5); +outline: none; @@ -970,7 +997,8 @@ border: 2px solid rgba(255,255,255,0.5); 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); +color: rgb(255, 255, 255); +outline: none; @@ -995,7 +1023,8 @@ color: rgb(255, 255, 255); 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); +color: rgb(255, 255, 255); +outline: none; @@ -1020,7 +1049,8 @@ color: rgb(255, 255, 255); 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); +color: rgb(255, 255, 255); +outline: none; @@ -1052,7 +1082,8 @@ color: rgb(255, 255, 255); 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); +color: rgb(255, 255, 255); +outline: none; @@ -1077,7 +1108,8 @@ color: rgb(255, 255, 255); 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); +color: rgb(255, 255, 255); +outline: none; @@ -1102,7 +1134,8 @@ color: rgb(255, 255, 255); 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); +color: rgb(255, 255, 255); +outline: none; @@ -1124,7 +1157,8 @@ color: rgb(255, 255, 255); background-color: rgba(85, 87, 83, 0.5); border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); +border: 2px solid rgba(255,255,255,0.5); +outline: none; @@ -1160,7 +1194,8 @@ border: 2px solid rgba(255,255,255,0.5); 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); +border: 2px solid rgba(255,255,255,0.5); +outline: none; @@ -1193,7 +1228,8 @@ border: 2px solid rgba(255,255,255,0.5); background-color: rgba(245, 121, 0, 0.5); border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); +border: 2px solid rgba(255,255,255,0.5); +outline: none; @@ -1222,7 +1258,8 @@ border: 2px solid rgba(255,255,255,0.5); background-color: rgba(64, 191, 191, 0.5); border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); +border: 2px solid rgba(255,255,255,0.5); +outline: none; @@ -1303,7 +1340,8 @@ border: 2px solid rgba(255,255,255,0.5); - background-color: rgba(136, 138, 133, 0.5); + background-color: rgba(136, 138, 133, 0.5); +outline: none; @@ -1330,7 +1368,8 @@ border: 2px solid rgba(255,255,255,0.5); - background-color: rgba(136, 138, 133, 0.5); + background-color: rgba(136, 138, 133, 0.5); +outline: none; @@ -1357,7 +1396,8 @@ border: 2px solid rgba(255,255,255,0.5); - background-color: rgba(136, 138, 133, 0.5); + background-color: rgba(136, 138, 133, 0.5); +outline: none; @@ -1384,7 +1424,8 @@ border: 2px solid rgba(255,255,255,0.5); - background-color: rgba(136, 138, 133, 0.5); + background-color: rgba(136, 138, 133, 0.5); +outline: none; @@ -1411,7 +1452,8 @@ border: 2px solid rgba(255,255,255,0.5); - background-color: rgba(136, 138, 133, 0.5); + background-color: rgba(136, 138, 133, 0.5); +outline: none; @@ -1438,7 +1480,8 @@ border: 2px solid rgba(255,255,255,0.5); - background-color: rgba(136, 138, 133, 0.5); + background-color: rgba(136, 138, 133, 0.5); +outline: none; @@ -1489,7 +1532,8 @@ border: 2px solid rgba(255,255,255,0.5); - background-color: rgba(136, 138, 133, 0.5); + background-color: rgba(136, 138, 133, 0.5); +outline: none; @@ -1516,7 +1560,8 @@ border: 2px solid rgba(255,255,255,0.5); - background-color: rgba(136, 138, 133, 0.5); + background-color: rgba(136, 138, 133, 0.5); +outline: none; @@ -1543,7 +1588,8 @@ border: 2px solid rgba(255,255,255,0.5); - background-color: rgba(136, 138, 133, 0.5); + background-color: rgba(136, 138, 133, 0.5); +outline: none; @@ -1628,7 +1674,8 @@ border: 2px solid rgba(255,255,255,0.5); - background-color: rgba(136, 138, 133, 0.5); + background-color: rgba(136, 138, 133, 0.5); +outline: none; @@ -1655,7 +1702,8 @@ border: 2px solid rgba(255,255,255,0.5); - background-color: rgba(136, 138, 133, 0.5); + background-color: rgba(136, 138, 133, 0.5); +outline: none; @@ -1682,7 +1730,8 @@ border: 2px solid rgba(255,255,255,0.5); - background-color: rgba(136, 138, 133, 0.5); + background-color: rgba(136, 138, 133, 0.5); +outline: none; @@ -1709,7 +1758,8 @@ border: 2px solid rgba(255,255,255,0.5); - background-color: rgba(136, 138, 133, 0.5); + background-color: rgba(136, 138, 133, 0.5); +outline: none; @@ -1736,7 +1786,8 @@ border: 2px solid rgba(255,255,255,0.5); - background-color: rgba(136, 138, 133, 0.5); + background-color: rgba(136, 138, 133, 0.5); +outline: none; @@ -1763,7 +1814,8 @@ border: 2px solid rgba(255,255,255,0.5); - background-color: rgba(136, 138, 133, 0.5); + background-color: rgba(136, 138, 133, 0.5); +outline: none; @@ -1796,7 +1848,8 @@ border: 2px solid rgba(255,255,255,0.5); - background-color: rgba(136, 138, 133, 0.5); + background-color: rgba(136, 138, 133, 0.5); +outline: none; @@ -1824,7 +1877,8 @@ border: 2px solid rgba(255,255,255,0.5); - background-color: rgba(136, 138, 133, 0.5); + background-color: rgba(136, 138, 133, 0.5); +outline: none; @@ -1899,7 +1953,8 @@ border: 2px solid rgba(255,255,255,0.5); background-color: rgb(186, 189, 182); border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); +border: 2px solid rgba(255,255,255,0.5); +outline: none; Record @@ -1928,7 +1983,8 @@ border: 2px solid rgba(255,255,255,0.5); background-color: rgb(186, 189, 182); border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); +border: 2px solid rgba(255,255,255,0.5); +outline: none; Record @@ -1957,7 +2013,8 @@ border: 2px solid rgba(255,255,255,0.5); background-color: rgb(186, 189, 182); border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); +border: 2px solid rgba(255,255,255,0.5); +outline: none; Stop @@ -1986,7 +2043,8 @@ border: 2px solid rgba(255,255,255,0.5); background-color: rgb(186, 189, 182); border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); +border: 2px solid rgba(255,255,255,0.5); +outline: none; Save @@ -2123,6 +2181,41 @@ background-color: rgba(0, 0, 0, 0); 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); @@ -2163,7 +2256,8 @@ border: 2px solid rgba(255,255,255,0.5); background-color: rgba(85, 87, 83, 0.9); color: rgb(255, 255, 255); -border: 2px solid rgba(255,255,255,0.5); +border: 2px solid rgba(255,255,255,0.5); +outline: none; true @@ -2196,6 +2290,7 @@ border: 2px solid rgba(255,255,255,0.5); background-color: rgba(85, 87, 83, 0.7); color: rgb(255, 255, 255); border: 2px solid rgba(255,255,255,0.5); +outline: none; @@ -2277,6 +2372,9 @@ border: 2px solid rgba(255,255,255,0.5); 16777215 + + outline: none; + @@ -2313,6 +2411,9 @@ border: 2px solid rgba(255,255,255,0.5); 16777215 + + outline: none; + @@ -2350,7 +2451,8 @@ border: 2px solid rgba(255,255,255,0.5); - background-color: rgba(0, 0, 0, 0); + background-color: rgba(0, 0, 0, 0); +outline: none; @@ -2394,6 +2496,9 @@ border: 2px solid rgba(255,255,255,0.5); 16777215 + + outline: none; + @@ -2430,6 +2535,9 @@ border: 2px solid rgba(255,255,255,0.5); 16777215 + + outline: none; + @@ -2699,7 +2807,8 @@ QSlider::handle:horizontal { background: rgb(255, 255, 255); height: 52px; width background-color: rgba(250, 80, 80, 0.7); border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); +border: 2px solid rgba(255,255,255,0.5); +outline: none; @@ -2740,7 +2849,8 @@ border: 2px solid rgba(255,255,255,0.5); background-color: rgba(138, 226, 52, 0.7); border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); +border: 2px solid rgba(255,255,255,0.5); +outline: none; @@ -2781,7 +2891,8 @@ border: 2px solid rgba(255,255,255,0.5); background-color: rgba(138, 226, 52, 0.7); border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); +border: 2px solid rgba(255,255,255,0.5); +outline: none; @@ -2822,7 +2933,9 @@ border: 2px solid rgba(255,255,255,0.5); background-color: rgba(233, 185, 110, 0.7); border-radius: 4px; -border: 2px solid rgba(255,255,255,0.5); +border: 2px solid rgba(255,255,255,0.5); +outline: none; + @@ -2838,6 +2951,9 @@ border: 2px solid rgba(255,255,255,0.5); 32 + + false + @@ -2870,7 +2986,8 @@ border: 2px solid rgba(255,255,255,0.5); 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); +color: rgb(255, 255, 255); +outline: none; @@ -2984,7 +3101,8 @@ color: rgb(0, 0, 0); color: rgb(255, 255, 255); -background-color: rgb(164, 0, 0); +background-color: rgb(164, 0, 0); +outline: none; Muted @@ -3013,7 +3131,8 @@ background-color: rgb(164, 0, 0); color: rgb(255, 255, 255); -background-color: #6d6d6d; +background-color: #6d6d6d; +outline: none; Mute @@ -3039,7 +3158,8 @@ background-color: #6d6d6d; QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} -QSlider::handle:horizontal { background: rgb(64, 191, 191); height: 52px; width: 52px; margin: 0 0;}; +QSlider::handle:horizontal { background: rgb(64, 191, 191); height: 52px; width: 52px; margin: 0 0;}; +outline: none; 100 @@ -3136,7 +3256,8 @@ background-color: #6d6d6d; QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} -QSlider::handle:horizontal { background: rgb(64, 191, 191); height: 52px; width: 52px; margin: 0 0;}; +QSlider::handle:horizontal { background: rgb(64, 191, 191); height: 52px; width: 52px; margin: 0 0;}; +outline: none; 100 @@ -3245,7 +3366,8 @@ background-color: #6d6d6d; QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} -QSlider::handle:horizontal { background: rgb(245, 121, 0); height: 52px; width: 52px; margin: 0 0;}; +QSlider::handle:horizontal { background: rgb(245, 121, 0); height: 52px; width: 52px; margin: 0 0;}; +outline: none; 30 @@ -3351,7 +3473,8 @@ background-color: #6d6d6d; QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} -QSlider::handle:horizontal { background: rgb(173, 127, 168); height: 52px; width: 52px; margin: 0 0;}; +QSlider::handle:horizontal { background: rgb(173, 127, 168); height: 52px; width: 52px; margin: 0 0;}; +outline: none; 1 diff --git a/src/autoapp/UI/settingswindow.ui b/src/autoapp/UI/settingswindow.ui index d08c71e..f2ca641 100644 --- a/src/autoapp/UI/settingswindow.ui +++ b/src/autoapp/UI/settingswindow.ui @@ -7,7 +7,7 @@ 0 0 800 - 2976 + 3106 @@ -58,7 +58,9 @@ background-color: rgb(114, 159, 207); } QPushButton:focus { background-color: rgb(114, 159, 207); -} +outline: none; +} + General @@ -82,6 +84,7 @@ background-color: rgb(114, 159, 207); } QPushButton:focus { background-color: rgb(114, 159, 207); +outline: none; } @@ -106,6 +109,7 @@ background-color: rgb(114, 159, 207); } QPushButton:focus { background-color: rgb(114, 159, 207); +outline: none; } @@ -130,6 +134,7 @@ background-color: rgb(114, 159, 207); } QPushButton:focus { background-color: rgb(114, 159, 207); +outline: none; } @@ -154,6 +159,7 @@ background-color: rgb(114, 159, 207); } QPushButton:focus { background-color: rgb(114, 159, 207); +outline: none; } @@ -178,6 +184,7 @@ background-color: rgb(114, 159, 207); } QPushButton:focus { background-color: rgb(114, 159, 207); +outline: none; } @@ -202,6 +209,7 @@ background-color: rgb(114, 159, 207); } QPushButton:focus { background-color: rgb(114, 159, 207); +outline: none; } @@ -226,6 +234,7 @@ background-color: rgb(114, 159, 207); } QPushButton:focus { background-color: rgb(114, 159, 207); +outline: none; } @@ -396,6 +405,193 @@ background-color: rgb(114, 159, 207); + + + + + 0 + 0 + + + + MP3 Player defaults + + + + 9 + + + 2 + + + 2 + + + 2 + + + + + + 0 + 0 + + + + + 140 + 24 + + + + + 140 + 24 + + + + background-color: rgb(85, 87, 83); +outline: none; + + + Master music path + + + + + + + + 0 + 0 + + + + + 0 + 24 + + + + + 16777215 + 24 + + + + background-color: rgb(85, 87, 83); + + + QFrame::NoFrame + + + /media/CSSTORAGE/Music + + + + + + + + 0 + 0 + + + + + 140 + 24 + + + + + 140 + 24 + + + + Subfolder (Album) + + + + + + + + 0 + 0 + + + + + 0 + 24 + + + + + 16777215 + 24 + + + + + + + + + + + 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) + + + + + @@ -1893,7 +2089,8 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} - background-color: rgb(164, 0, 0); + background-color: rgb(164, 0, 0); +outline: none; Remove all paired devices now! @@ -2163,7 +2360,8 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} - background-color: rgb(78, 154, 6); + background-color: rgb(78, 154, 6); +outline: none; Start @@ -2179,7 +2377,8 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} - background-color: rgb(164, 0, 0); + background-color: rgb(164, 0, 0); +outline: none; Stop @@ -4812,7 +5011,8 @@ subcontrol-position: center left; - background-color: rgb(78, 154, 6); + background-color: rgb(78, 154, 6); +outline: none; Set current time now! @@ -4854,7 +5054,8 @@ subcontrol-position: center left; background-color: rgb(114, 159, 207); -color: rgb(85, 87, 83); +color: rgb(85, 87, 83); +outline: none; NTP-Sync @@ -5296,7 +5497,8 @@ color: rgb(85, 87, 83); - background-color: rgb(7, 123, 123); + background-color: rgb(7, 123, 123); +outline: none; Save @@ -5324,7 +5526,8 @@ color: rgb(85, 87, 83); - background-color: rgb(206, 92, 0); + background-color: rgb(206, 92, 0); +outline: none; Reset to default @@ -5352,7 +5555,8 @@ color: rgb(85, 87, 83); - background-color: rgb(85, 87, 83); + background-color: rgb(85, 87, 83); +outline: none; Cancel