diff --git a/src/autoapp/UI/MainWindow.cpp b/src/autoapp/UI/MainWindow.cpp index 49a4810..334f724 100644 --- a/src/autoapp/UI/MainWindow.cpp +++ b/src/autoapp/UI/MainWindow.cpp @@ -1379,7 +1379,7 @@ void f1x::openauto::autoapp::ui::MainWindow::scanFiles() QList content; QDir directory(this->musicfolder + "/" + this->albumfolder); - QStringList mp3s = directory.entryList(QStringList() << "*.mp3",QDir::Files, QDir::Name); + QStringList mp3s = directory.entryList(QStringList() << "*.mp3" << "*.flac" << "*.aac" << "*.ogg",QDir::Files, QDir::Name); foreach (QString filename, mp3s) { // add to mediacontent content.push_back(QMediaContent(QUrl::fromLocalFile(this->musicfolder + "/" + this->albumfolder + "/" + filename))); diff --git a/src/autoapp/UI/mainwindow.ui b/src/autoapp/UI/mainwindow.ui index 23e954e..6dd1062 100644 --- a/src/autoapp/UI/mainwindow.ui +++ b/src/autoapp/UI/mainwindow.ui @@ -6,8 +6,8 @@ 0 0 - 956 - 1295 + 907 + 1291 @@ -30,6 +30,9 @@ MainWindow + + color: rgb(255, 255, 255); + true @@ -1950,8 +1953,16 @@ border: 2px solid rgba(255,255,255,0.5); 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; @@ -1980,8 +1991,16 @@ outline: none; 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; @@ -2010,8 +2029,16 @@ outline: none; 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; @@ -2040,8 +2067,16 @@ outline: none; 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; @@ -2135,7 +2170,9 @@ background-color: rgba(0, 0, 0, 0); - background-color: rgba(0, 0, 0, 0.5); + background-color: rgba(0, 0, 0, 0.5); +color: rgb(255, 255, 255); +heigth: 45px; @@ -2234,18 +2271,24 @@ border: 2px solid rgba(255,255,255,0.5); 0 - 30 + 45 16777215 - 30 + 45 + + + + + 0 + 45 - 12 + 14 75 true @@ -2254,21 +2297,73 @@ border: 2px solid rgba(255,255,255,0.5); Qt::DefaultContextMenu - background-color: rgba(117, 80, 123, 0.9); -color: rgb(255, 255, 255); -border: 2px solid rgba(255,255,255,0.5); -outline: none; + 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 + + + Neues Element + + + + + Neues Element + + + + + Neues Element + + + + + Neues Element + + + + + Neues Element + + + + + Neues Element + + + + + Neues Element + + - 12 + 14 75 true @@ -2276,12 +2371,21 @@ outline: none; Qt::LeftToRight + + false + - background-color: rgba(85, 87, 83, 0.7); + 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 @@ -2293,7 +2397,7 @@ outline: none; Qt::ScrollBarAsNeeded - QAbstractScrollArea::AdjustIgnored + QAbstractScrollArea::AdjustToContents 16 @@ -2311,7 +2415,7 @@ outline: none; false - QListView::Adjust + QListView::Fixed QListView::SinglePass @@ -2319,15 +2423,12 @@ outline: none; 0 - 30 + 40 QListView::ListMode - - false - diff --git a/src/autoapp/UI/settingswindow.ui b/src/autoapp/UI/settingswindow.ui index 8af4140..7f59bc4 100644 --- a/src/autoapp/UI/settingswindow.ui +++ b/src/autoapp/UI/settingswindow.ui @@ -534,6 +534,12 @@ outline: none; 24 + + QScrollBar { + width: 40px; + background-color: rgba(85, 87, 83, 0.7); +} + @@ -1510,6 +1516,12 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 0 + + QScrollBar { + width: 40px; + background-color: rgba(85, 87, 83, 0.7); +} + @@ -1527,6 +1539,12 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 0 + + QScrollBar { + width: 40px; + background-color: rgba(85, 87, 83, 0.7); +} + @@ -3508,6 +3526,12 @@ subcontrol-position: center left; 30 + + QScrollBar { + width: 40px; + background-color: rgba(85, 87, 83, 0.7); +} + - - - @@ -3691,6 +3715,12 @@ subcontrol-position: center left; 30 + + QScrollBar { + width: 40px; + background-color: rgba(85, 87, 83, 0.7); +} + - - - @@ -3865,6 +3895,12 @@ subcontrol-position: center left; 30 + + QScrollBar { + width: 40px; + background-color: rgba(85, 87, 83, 0.7); +} + - - - @@ -4083,6 +4119,12 @@ subcontrol-position: center left; 30 + + QScrollBar { + width: 40px; + background-color: rgba(85, 87, 83, 0.7); +} + - - - @@ -4257,6 +4299,12 @@ subcontrol-position: center left; 30 + + QScrollBar { + width: 40px; + background-color: rgba(85, 87, 83, 0.7); +} + - - - @@ -4493,6 +4541,9 @@ subcontrol-position: center left; 30 + + + - - - @@ -5115,6 +5166,12 @@ outline: none; 30 + + QScrollBar { + width: 40px; + background-color: rgba(85, 87, 83, 0.7); +} + Custom @@ -5220,6 +5277,12 @@ outline: none; 30 + + QScrollBar { + width: 40px; + background-color: rgba(85, 87, 83, 0.7); +} + none @@ -5305,6 +5368,12 @@ outline: none; 30 + + QScrollBar { + width: 40px; + background-color: rgba(85, 87, 83, 0.7); +} + @@ -5340,6 +5409,12 @@ outline: none; 30 + + QScrollBar { + width: 40px; + background-color: rgba(85, 87, 83, 0.7); +} + none @@ -5385,6 +5460,12 @@ outline: none; 30 + + QScrollBar { + width: 40px; + background-color: rgba(85, 87, 83, 0.7); +} + none