diff --git a/assets/album-hot.png b/assets/album-hot.png new file mode 100644 index 0000000..3836c39 Binary files /dev/null and b/assets/album-hot.png differ diff --git a/assets/christmas.png b/assets/christmas.png deleted file mode 100644 index 68f089b..0000000 Binary files a/assets/christmas.png and /dev/null differ diff --git a/assets/firework.png b/assets/firework.png deleted file mode 100644 index 0a7dace..0000000 Binary files a/assets/firework.png and /dev/null differ diff --git a/assets/resources.qrc b/assets/resources.qrc index d1e5cd9..a52ab34 100644 --- a/assets/resources.qrc +++ b/assets/resources.qrc @@ -37,8 +37,7 @@ player-hot.png coverlogo.png black.png - christmas.png - firework.png + album-hot.png Roboto-Regular.ttf diff --git a/include/f1x/openauto/autoapp/Configuration/Configuration.hpp b/include/f1x/openauto/autoapp/Configuration/Configuration.hpp index 300ab2c..63924b4 100644 --- a/include/f1x/openauto/autoapp/Configuration/Configuration.hpp +++ b/include/f1x/openauto/autoapp/Configuration/Configuration.hpp @@ -81,6 +81,8 @@ public: void mp3AutoPlay(bool value) override; bool showAutoPlay() const override; void showAutoPlay(bool value) override; + bool instantPlay() const override; + void instantPlay(bool value) override; QString getCSValue(QString searchString) const override; QString readFileContent(QString fileName) const override; @@ -139,6 +141,7 @@ private: int32_t mp3Track_; bool mp3AutoPlay_; bool showAutoPlay_; + bool instantPlay_; aasdk::proto::enums::VideoFPS::Enum videoFPS_; aasdk::proto::enums::VideoResolution::Enum videoResolution_; @@ -176,6 +179,7 @@ private: static const std::string cGeneralMp3TrackKey; static const std::string cGeneralMp3AutoPlayKey; static const std::string cGeneralShowAutoPlayKey; + static const std::string cGeneralInstantPlayKey; static const std::string cVideoFPSKey; static const std::string cVideoResolutionKey; diff --git a/include/f1x/openauto/autoapp/Configuration/IConfiguration.hpp b/include/f1x/openauto/autoapp/Configuration/IConfiguration.hpp index 42d6ffe..db22bc8 100644 --- a/include/f1x/openauto/autoapp/Configuration/IConfiguration.hpp +++ b/include/f1x/openauto/autoapp/Configuration/IConfiguration.hpp @@ -85,6 +85,8 @@ public: virtual void mp3AutoPlay(bool value) = 0; virtual bool showAutoPlay() const = 0; virtual void showAutoPlay(bool value) = 0; + virtual bool instantPlay() const = 0; + virtual void instantPlay(bool value) = 0; virtual QString getCSValue(QString searchString) const = 0; virtual QString readFileContent(QString fileName) const = 0; diff --git a/include/f1x/openauto/autoapp/UI/MainWindow.hpp b/include/f1x/openauto/autoapp/UI/MainWindow.hpp index 23e0a5e..03d5361 100644 --- a/include/f1x/openauto/autoapp/UI/MainWindow.hpp +++ b/include/f1x/openauto/autoapp/UI/MainWindow.hpp @@ -163,6 +163,11 @@ private slots: void hostModeStateChanged(QBluetoothLocalDevice::HostMode); + //void on_AlbumCoverListView_clicked(const QModelIndex &index); + void on_AlbumCoverListView_clicked(const QModelIndex &index); + + void on_pushButtonAlbum_clicked(); + private: Ui::MainWindow* ui_; configuration::IConfiguration::Pointer configuration_; diff --git a/src/autoapp/Configuration/Configuration.cpp b/src/autoapp/Configuration/Configuration.cpp index 52b86e4..b290973 100644 --- a/src/autoapp/Configuration/Configuration.cpp +++ b/src/autoapp/Configuration/Configuration.cpp @@ -51,6 +51,7 @@ const std::string Configuration::cGeneralMp3SubFolderKey = "General.Mp3SubFolder const std::string Configuration::cGeneralMp3TrackKey = "General.Mp3Track"; const std::string Configuration::cGeneralMp3AutoPlayKey = "General.Mp3AutoPlay"; const std::string Configuration::cGeneralShowAutoPlayKey = "General.ShowAutoPlay"; +const std::string Configuration::cGeneralInstantPlayKey = "General.InstantPlay"; const std::string Configuration::cVideoFPSKey = "Video.FPS"; const std::string Configuration::cVideoResolutionKey = "Video.Resolution"; @@ -116,6 +117,7 @@ void Configuration::load() mp3Track_ = iniConfig.get(cGeneralMp3TrackKey, 0); mp3AutoPlay_ = iniConfig.get(cGeneralMp3AutoPlayKey, false); showAutoPlay_ = iniConfig.get(cGeneralShowAutoPlayKey, false); + instantPlay_ = iniConfig.get(cGeneralInstantPlayKey, false); videoFPS_ = static_cast(iniConfig.get(cVideoFPSKey, aasdk::proto::enums::VideoFPS::_30)); @@ -167,6 +169,7 @@ void Configuration::reset() mp3Track_ = 0; mp3AutoPlay_ = false; showAutoPlay_ = false; + instantPlay_ = false; videoFPS_ = aasdk::proto::enums::VideoFPS::_30; videoResolution_ = aasdk::proto::enums::VideoResolution::_480p; screenDPI_ = 140; @@ -203,6 +206,7 @@ void Configuration::save() iniConfig.put(cGeneralMp3TrackKey, mp3Track_); iniConfig.put(cGeneralMp3AutoPlayKey, mp3AutoPlay_); iniConfig.put(cGeneralShowAutoPlayKey, showAutoPlay_); + iniConfig.put(cGeneralInstantPlayKey, instantPlay_); iniConfig.put(cVideoFPSKey, static_cast(videoFPS_)); iniConfig.put(cVideoResolutionKey, static_cast(videoResolution_)); @@ -413,6 +417,16 @@ bool Configuration::showAutoPlay() const return showAutoPlay_; } +void Configuration::instantPlay(bool value) +{ + instantPlay_ = value; +} + +bool Configuration::instantPlay() const +{ + return instantPlay_; +} + 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 7a6656e..61d9092 100644 --- a/src/autoapp/UI/MainWindow.cpp +++ b/src/autoapp/UI/MainWindow.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -526,6 +527,8 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi ui_->labelFolderpath->hide(); ui_->labelAlbumpath->hide(); + ui_->comboBoxAlbum->hide(); + ui_->pushButtonAlbum->hide(); MainWindow::scanFolders(); ui_->comboBoxAlbum->setCurrentText(QString::fromStdString(configuration->getMp3SubFolder())); @@ -910,8 +913,20 @@ void f1x::openauto::autoapp::ui::MainWindow::playerShow() ui_->VolumeSliderControl->hide(); ui_->BrightnessSliderControl->hide(); ui_->networkInfo->hide(); + ui_->Info->hide(); + ui_->horizontalSliderProgressPlayer->hide(); + ui_->VolumeSliderControlPlayer->hide(); if (player->state() == QMediaPlayer::PlayingState) { on_pushButtonBackToPlayer_clicked(); + ui_->Info->show(); + ui_->horizontalSliderProgressPlayer->show(); + ui_->VolumeSliderControlPlayer->show(); + ui_->pushButtonPlayerPlayList->hide(); + } + if (ui_->mp3List->isVisible() == true) { + ui_->pushButtonPlayerPlayList->show(); + } else { + ui_->pushButtonPlayerPlayList->hide(); } } @@ -994,11 +1009,11 @@ void f1x::openauto::autoapp::ui::MainWindow::toggleGUI() void f1x::openauto::autoapp::ui::MainWindow::updateBG() { if (this->date_text == "12/24") { - this->setStyleSheet("QMainWindow { background: url(:/christmas.png); background-repeat: no-repeat; background-position: center; }"); + this->setStyleSheet("QMainWindow { background: url(:/wallpaper-christmas.png); background-repeat: no-repeat; background-position: center; }"); this->holidaybg = true; } else if (this->date_text == "12/31") { - this->setStyleSheet("QMainWindow { background: url(:/firework.png); background-repeat: no-repeat; background-position: center; }"); + this->setStyleSheet("QMainWindow { background: url(:/wallpaper-firework.png); background-repeat: no-repeat; background-position: center; }"); this->holidaybg = true; } if (!this->nightModeEnabled) { @@ -1006,20 +1021,20 @@ void f1x::openauto::autoapp::ui::MainWindow::updateBG() 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; }"); + this->setStyleSheet("QMainWindow { background: url(:/black.png); background-repeat: repeat; background-position: center; }"); } } else { if (this->oldGUIStyle) { if (this->wallpaperClassicDayFileExists) { 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; }"); + this->setStyleSheet("QMainWindow { background: url(:/black.png); background-repeat: repeat; background-position: center; }"); } } else { if (this->wallpaperDayFileExists) { 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; }"); + this->setStyleSheet("QMainWindow { background: url(:/black.png); background-repeat: repeat; background-position: center; }"); } } } @@ -1028,20 +1043,20 @@ void f1x::openauto::autoapp::ui::MainWindow::updateBG() 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; }"); + this->setStyleSheet("QMainWindow { background: url(:/black.png); background-repeat: repeat; background-position: center; }"); } } else { if (this->oldGUIStyle) { if (this->wallpaperClassicNightFileExists) { 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; }"); + this->setStyleSheet("QMainWindow { background: url(:/black.png); background-repeat: repeat; background-position: center; }"); } } else { if (this->wallpaperNightFileExists) { - this->setStyleSheet("QMainWindow { background: url(wallpaper-night.png); background-repeat: no-repeat; background-position: center; }"); + this->setStyleSheet("QMainWindow { background: url(wallpaper-night.png) stretch stretch; background-repeat: no-repeat; background-position: center; }"); } else { - this->setStyleSheet("QMainWindow { background: url(:/black.png); background-repeat: no-repeat; background-position: center; }"); + this->setStyleSheet("QMainWindow { background: url(:/black.png); background-repeat: repeat; background-position: center; }"); } } } @@ -1137,6 +1152,11 @@ void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonList_clicked() ui_->PlayerPlayingWidget->hide(); ui_->pushButtonList->hide(); ui_->pushButtonPlayerPlayList->show(); + ui_->Info->hide(); + ui_->horizontalSliderProgressPlayer->hide(); + + ui_->mp3List->show(); + ui_->AlbumCoverListView->hide(); if (playlist->currentIndex() == -1) { ui_->pushButtonPlayerStop->hide(); @@ -1163,6 +1183,13 @@ void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonPlayerStop_clicked() ui_->playerPositionTime->setText("00:00 / 00:00"); ui_->labelCurrentPlaying->setText(""); ui_->labelTrack->setText(""); + ui_->Info->hide(); + ui_->horizontalSliderProgressPlayer->hide(); + + ui_->mp3List->show(); + ui_->AlbumCoverListView->hide(); + ui_->pushButtonAlbum->show(); + ui_->VolumeSliderControlPlayer->hide(); } void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonPlayerPause_clicked() @@ -1298,14 +1325,23 @@ void f1x::openauto::autoapp::ui::MainWindow::metaDataChanged() if (playlist->currentIndex() == -1) { // check for folder icon - QString cover = this->musicfolder + "/" + this->albumfolder + "/folder.png"; + QString coverpng = this->musicfolder + "/" + this->albumfolder + "/folder.png"; QString coverjpg = this->musicfolder + "/" + this->albumfolder + "/folder.jpg"; - if (check_file_exist(cover.toStdString().c_str())) { - QPixmap img = cover; + QString coverpngcs = "/media/USBDRIVES/CSSTORAGE/COVERCACHE/" + this->albumfolder + ".png"; + QString coverjpgcs = "/media/USBDRIVES/CSSTORAGE/COVERCACHE/" + this->albumfolder + ".jpg"; + + if (check_file_exist(coverpng.toStdString().c_str())) { + QPixmap img = coverpng; ui_->pushButtonBack->setIcon(img.scaled(270,270,Qt::KeepAspectRatio)); } else if (check_file_exist(coverjpg.toStdString().c_str())) { QPixmap img = coverjpg; ui_->pushButtonBack->setIcon(img.scaled(270,270,Qt::KeepAspectRatio)); + } else if (check_file_exist(coverpngcs.toStdString().c_str())) { + QPixmap img = coverpngcs; + ui_->pushButtonBack->setIcon(img.scaled(270,270,Qt::KeepAspectRatio)); + } else if (check_file_exist(coverjpgcs.toStdString().c_str())) { + QPixmap img = coverjpgcs; + ui_->pushButtonBack->setIcon(img.scaled(270,270,Qt::KeepAspectRatio)); } else { ui_->pushButtonBack->setIcon(QPixmap("://coverlogo.png")); } @@ -1337,6 +1373,20 @@ void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonPlayerPlayList_clicked ui_->pushButtonPlayerPause->show(); int currentalbum = ui_->comboBoxAlbum->currentIndex(); ui_->labelCurrentAlbumIndex->setText(QString::number(currentalbum+1)); + ui_->Info->show(); + ui_->horizontalSliderProgressPlayer->show(); + ui_->pushButtonAlbum->hide(); + ui_->mp3List->hide(); + ui_->AlbumCoverListView->show(); +} + +void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonAlbum_clicked() +{ + ui_->pushButtonList->hide(); + ui_->pushButtonAlbum->hide(); + ui_->mp3List->hide(); + ui_->AlbumCoverListView->show(); + ui_->pushButtonPlayerPlayList->hide(); } void f1x::openauto::autoapp::ui::MainWindow::on_comboBoxAlbum_currentIndexChanged(const QString &arg1) @@ -1349,6 +1399,12 @@ void f1x::openauto::autoapp::ui::MainWindow::on_comboBoxAlbum_currentIndexChange ui_->pushButtonBackToPlayer->hide(); ui_->labelCurrentPlaying->setText(""); ui_->playerPositionTime->setText(""); + + if (this->playlist->mediaCount() < 2) { + ui_->pushButtonPlayerPlayList->hide(); + } else { + ui_->pushButtonPlayerPlayList->show(); + } } void f1x::openauto::autoapp::ui::MainWindow::setTrigger() @@ -1387,12 +1443,40 @@ void f1x::openauto::autoapp::ui::MainWindow::scanFolders() } QDir directory(this->musicfolder); QStringList folders = directory.entryList(QStringList() << "*", QDir::AllDirs, QDir::Name); + QStandardItemModel *model = new QStandardItemModel(this); foreach (QString foldername, folders) { - if (foldername != "..") { + if (foldername != ".." and foldername != ".") { ui_->comboBoxAlbum->addItem(foldername); - ui_->labelAlbumCount->setText(QString::number(ui_->comboBoxAlbum->count())); + ui_->labelAlbumCount->setText(QString::number(ui_->comboBoxAlbum->count())); + + QString coverpng = this->musicfolder + "/" + foldername + "/folder.png"; + QString coverjpg = this->musicfolder + "/" + foldername + "/folder.jpg"; + QString coverpngcs = "/media/USBDRIVES/CSSTORAGE/COVERCACHE/" + foldername + ".png"; + QString coverjpgcs = "/media/USBDRIVES/CSSTORAGE/COVERCACHE/" + foldername + ".jpg"; + + if (check_file_exist(coverpng.toStdString().c_str())) { + QPixmap img = coverpng; + QStandardItem *item = new QStandardItem(QIcon(img.scaled(270,270,Qt::KeepAspectRatio)),foldername); + model->setItem(ui_->comboBoxAlbum->count(),0,item); + } else if (check_file_exist(coverjpg.toStdString().c_str())) { + QPixmap img = coverjpg; + QStandardItem *item = new QStandardItem(QIcon(img.scaled(270,270,Qt::KeepAspectRatio)),foldername); + model->setItem(ui_->comboBoxAlbum->count(),0,item); + } else if (check_file_exist(coverpngcs.toStdString().c_str())) { + QPixmap img = coverpngcs; + QStandardItem *item = new QStandardItem(QIcon(img.scaled(270,270,Qt::KeepAspectRatio)),foldername); + model->setItem(ui_->comboBoxAlbum->count(),0,item); + } else if (check_file_exist(coverjpgcs.toStdString().c_str())) { + QPixmap img = coverjpgcs; + QStandardItem *item = new QStandardItem(QIcon(img.scaled(270,270,Qt::KeepAspectRatio)),foldername); + model->setItem(ui_->comboBoxAlbum->count(),0,item); + } else { + QStandardItem *item = new QStandardItem(QIcon(":/coverlogo.png"),foldername); + model->setItem(ui_->comboBoxAlbum->count(),0,item); + } } } + ui_->AlbumCoverListView->setModel(model); this->currentPlaylistIndex = 0; ui_->SysinfoTopLeft->hide(); } @@ -1400,6 +1484,7 @@ void f1x::openauto::autoapp::ui::MainWindow::scanFolders() catch(...) { ui_->SysinfoTopLeft->hide(); } + ui_->mp3List->hide(); } void f1x::openauto::autoapp::ui::MainWindow::scanFiles() @@ -1454,6 +1539,10 @@ void f1x::openauto::autoapp::ui::MainWindow::on_mp3List_currentRowChanged(int cu { ui_->labelFolderpath->setText(QString::number(currentRow)); this->currentPlaylistIndex = currentRow; + + if (configuration_->instantPlay()) { + MainWindow::on_pushButtonPlayerPlayList_clicked(); + } } void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonPlayerNextBig_clicked() @@ -1498,6 +1587,7 @@ void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonPlayerPrevAlbum_clicke ui_->pushButtonList->show(); ui_->pushButtonPlayerPause->show(); ui_->pushButtonPlayerStop->show(); + ui_->pushButtonPlayerPlayList->hide(); } } @@ -1521,6 +1611,7 @@ void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonPlayerNextAlbum_clicke ui_->pushButtonList->show(); ui_->pushButtonPlayerPause->show(); ui_->pushButtonPlayerStop->show(); + ui_->pushButtonPlayerPlayList->hide(); } } @@ -1533,6 +1624,8 @@ void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonBackToPlayer_clicked() ui_->pushButtonList->show(); ui_->pushButtonPlayerPause->show(); ui_->pushButtonPlayerStop->show(); + ui_->Info->show(); + ui_->horizontalSliderProgressPlayer->show(); } void f1x::openauto::autoapp::ui::MainWindow::on_StateChanged(QMediaPlayer::State state) @@ -1596,6 +1689,23 @@ void f1x::openauto::autoapp::ui::MainWindow::KeyPress(QString key) } } +void f1x::openauto::autoapp::ui::MainWindow::on_AlbumCoverListView_clicked(const QModelIndex &index) +{ + QString foldertext = index.data(Qt::DisplayRole).toString(); + ui_->labelAlbumpath->setText(foldertext); + ui_->comboBoxAlbum->setCurrentIndex(ui_->comboBoxAlbum->findText(foldertext)); + + ui_->mp3List->show(); + ui_->AlbumCoverListView->hide(); + ui_->pushButtonList->hide(); + ui_->pushButtonAlbum->show(); + ui_->pushButtonPlayerPlayList->show(); + + if (ui_->mp3selectWidget->isVisible() == false) { + MainWindow::on_pushButtonPlayerPlayList_clicked(); + } +} + void f1x::openauto::autoapp::ui::MainWindow::tmpChanged() { try { @@ -2039,3 +2149,4 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged() } updateNetworkInfo(); } + diff --git a/src/autoapp/UI/SettingsWindow.cpp b/src/autoapp/UI/SettingsWindow.cpp index 5894ba0..340e0b1 100644 --- a/src/autoapp/UI/SettingsWindow.cpp +++ b/src/autoapp/UI/SettingsWindow.cpp @@ -208,6 +208,7 @@ void SettingsWindow::onSave() configuration_->showNetworkinfo(ui_->checkBoxNetworkinfo->isChecked()); configuration_->mp3AutoPlay(ui_->checkBoxAutoPlay->isChecked()); configuration_->showAutoPlay(ui_->checkBoxShowPlayer->isChecked()); + configuration_->instantPlay(ui_->checkBoxInstantPlay->isChecked()); configuration_->hideWarning(ui_->checkBoxDontShowAgain->isChecked()); configuration_->setVideoFPS(ui_->radioButton30FPS->isChecked() ? aasdk::proto::enums::VideoFPS::_30 : aasdk::proto::enums::VideoFPS::_60); @@ -498,6 +499,7 @@ void SettingsWindow::load() ui_->checkBoxNetworkinfo->setChecked(configuration_->showNetworkinfo()); ui_->checkBoxAutoPlay->setChecked(configuration_->mp3AutoPlay()); ui_->checkBoxShowPlayer->setChecked(configuration_->showAutoPlay()); + ui_->checkBoxInstantPlay->setChecked(configuration_->instantPlay()); ui_->checkBoxDontShowAgain->setChecked(configuration_->hideWarning()); ui_->radioButton30FPS->setChecked(configuration_->getVideoFPS() == aasdk::proto::enums::VideoFPS::_30); @@ -887,6 +889,7 @@ void SettingsWindow::loadSystemValues() ui_->comboBoxTZ->setCurrentText(configuration_->readFileContent("/etc/timezone")); } else { ui_->comboBoxHardwareRTC->setCurrentText("none"); + ui_->comboBoxTZ->setCurrentText(configuration_->readFileContent("/etc/timezone")); } // set dac diff --git a/src/autoapp/UI/mainwindow.ui b/src/autoapp/UI/mainwindow.ui index 8610a1c..f77623b 100644 --- a/src/autoapp/UI/mainwindow.ui +++ b/src/autoapp/UI/mainwindow.ui @@ -970,6 +970,13 @@ outline: none; 24 + + + 9 + 75 + true + + border: no-border; @@ -1008,6 +1015,7 @@ outline: none; + 9 75 true @@ -1032,6 +1040,7 @@ border: no-border; + 9 75 true @@ -1110,6 +1119,7 @@ border: no-border; + 9 75 true @@ -1146,6 +1156,7 @@ border: no-border; + 9 75 true @@ -1224,6 +1235,7 @@ border: no-border; + 9 75 true @@ -1260,6 +1272,7 @@ border: no-border; + 9 75 true @@ -1332,6 +1345,7 @@ border: no-border; + 9 75 true @@ -1362,6 +1376,7 @@ border: no-border; + 9 75 true @@ -4093,6 +4108,74 @@ border: 2px solid rgba(255,255,255,0.5); + + + + + 8 + 75 + true + + + + QScrollBar { + width: 60px; + background-color: rgba(85, 87, 83, 0.7); +} + + + Qt::ScrollBarAlwaysOn + + + QAbstractScrollArea::AdjustToContents + + + false + + + 0 + + + QAbstractItemView::NoEditTriggers + + + false + + + QAbstractItemView::NoDragDrop + + + Qt::IgnoreAction + + + + 160 + 160 + + + + QListView::Static + + + QListView::Adjust + + + QListView::Batched + + + 0 + + + QListView::IconMode + + + true + + + Qt::AlignCenter + + + @@ -4110,15 +4193,23 @@ border: 2px solid rgba(255,255,255,0.5); QScrollBar { - width: 40px; + width: 60px; 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; +} + +QListView::item { +height: 50px; +} + +QListView::item::selected { +background-color: rgb(32, 74, 135); +height: 50px; } @@ -4133,8 +4224,23 @@ outline: none; QAbstractScrollArea::AdjustToContents + + false + - 16 + 0 + + + QAbstractItemView::NoEditTriggers + + + false + + + QAbstractItemView::NoDragDrop + + + Qt::IgnoreAction false @@ -4142,6 +4248,15 @@ outline: none; QAbstractItemView::SingleSelection + + + 0 + 0 + + + + Qt::ElideMiddle + QListView::Static @@ -4154,15 +4269,49 @@ outline: none; QListView::SinglePass + + 0 + 0 - 40 + 60 QListView::ListMode + + Qt::AlignCenter + + + -1 + + + + Neues Element + + + + + Neues Element + + + + + Neues Element + + + + + Neues Element + + + + + Neues Element + + @@ -5134,6 +5283,49 @@ outline: none; + + + + + 0 + 0 + + + + + 0 + 40 + + + + + 16777215 + 40 + + + + 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; + + + + + + + :/album-hot.png + + + + + 32 + 32 + + + + diff --git a/src/autoapp/UI/settingswindow.ui b/src/autoapp/UI/settingswindow.ui index 96a8e57..6d0a2f8 100644 --- a/src/autoapp/UI/settingswindow.ui +++ b/src/autoapp/UI/settingswindow.ui @@ -6,8 +6,8 @@ 0 0 - 968 - 3602 + 800 + 3594 @@ -573,165 +573,195 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} - + - + 0 0 - - Brightness Day - - - - 6 - - - 0 - - - 4 - - - - - - 0 - 0 - - - - - 40 - 20 - - - - - 16777215 - 20 - - - - 0 - - - - - - - - 0 - 0 - - - - - 0 - 20 - - - - QSlider::handle:horizontal { background: white; height: 32px; width: 52px; margin: 0 0;} -QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} - - - 1 - - - 100 - - - 50 - - - Qt::Horizontal - - - - - - - - - - - 0 - 0 - - - - Brightness Night - - + - 9 + 0 0 - 9 + 0 - 4 + 0 - - - - - 0 - 0 - - - - - 40 - 20 - - - - - 16777215 - 20 - - - - 0 - - - - - + + 0 0 - - - 0 - 20 - + + Brightness Day - - QSlider::handle:horizontal { background: white; height: 32px; width: 52px; margin: 0 0;} + + + 6 + + + 6 + + + 0 + + + 6 + + + 4 + + + + + + 0 + 0 + + + + + 40 + 20 + + + + + 16777215 + 20 + + + + 0 + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + QSlider::handle:horizontal { background: white; height: 32px; width: 52px; margin: 0 0;} QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} + + + 1 + + + 100 + + + 50 + + + Qt::Horizontal + + + + + + + + + + + 0 + 0 + - - 1 - - - 100 - - - 50 - - - Qt::Horizontal + + Brightness Night + + + 6 + + + 0 + + + 6 + + + 4 + + + + + + 0 + 0 + + + + + 40 + 20 + + + + + 16777215 + 20 + + + + 0 + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + QSlider::handle:horizontal { background: white; height: 32px; width: 52px; margin: 0 0;} +QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} + + + 1 + + + 100 + + + 50 + + + Qt::Horizontal + + + + @@ -748,12 +778,15 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} Media player defaults - + + + 2 + 2 - 2 + 0 @@ -786,12 +819,12 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} - 100 + 120 0 - auto play + Auto play @@ -808,28 +841,67 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} + + + + + 0 + 0 + + + + + 120 + 0 + + + + Instant play + + + + + + + + 0 + 0 + + + + Instant play track on select / Instant play full album on select + + + + + + + + 0 + 0 + + + + + 120 + 0 + + + + Show player + + + + + + + Start openauto with player window + + + - - - - - 0 - 0 - - - - - 240 - 0 - - - - Show player window on auto play - - -