diff --git a/assets/home-hot.png b/assets/home-hot.png
new file mode 100644
index 0000000..4b0ec03
Binary files /dev/null and b/assets/home-hot.png differ
diff --git a/assets/list-hot.png b/assets/list-hot.png
new file mode 100644
index 0000000..6a23c9d
Binary files /dev/null and b/assets/list-hot.png differ
diff --git a/assets/player-hot.png b/assets/player-hot.png
new file mode 100644
index 0000000..6689cc0
Binary files /dev/null and b/assets/player-hot.png differ
diff --git a/assets/resources.qrc b/assets/resources.qrc
index 267a55f..e21d154 100644
--- a/assets/resources.qrc
+++ b/assets/resources.qrc
@@ -33,6 +33,9 @@
pause-hot.png
prevbig-hot.png
nextbig-hot.png
+ list-hot.png
+ home-hot.png
+ player-hot.png
coverlogo.png
black.png
Roboto-Regular.ttf
diff --git a/include/f1x/openauto/autoapp/UI/MainWindow.hpp b/include/f1x/openauto/autoapp/UI/MainWindow.hpp
index f383114..8595138 100644
--- a/include/f1x/openauto/autoapp/UI/MainWindow.hpp
+++ b/include/f1x/openauto/autoapp/UI/MainWindow.hpp
@@ -113,7 +113,7 @@ private slots:
void on_horizontalSliderProgressPlayer_sliderMoved(int position);
void on_horizontalSliderVolumePlayer_sliderMoved(int position);
- void on_pushButtonPlayerPlay_clicked();
+ void on_pushButtonList_clicked();
void on_pushButtonPlayerStop_clicked();
void on_pushButtonPlayerPause_clicked();
void on_positionChanged(qint64 position);
@@ -125,12 +125,12 @@ private slots:
void on_pushButtonPlayerPrevBig_clicked();
void on_pushButtonPlayerPrevAlbum_clicked();
void on_pushButtonPlayerNextAlbum_clicked();
+ void on_pushButtonBackToPlayer_clicked();
void on_comboBoxAlbum_currentIndexChanged(const QString &arg1);
void on_mp3List_currentRowChanged(int currentRow);
void scanFolders();
void scanFiles();
-
private:
Ui::MainWindow* ui_;
QString brightnessFilename = "/sys/class/backlight/rpi_backlight/brightness";
diff --git a/src/autoapp/UI/MainWindow.cpp b/src/autoapp/UI/MainWindow.cpp
index 31390a4..b3a385d 100644
--- a/src/autoapp/UI/MainWindow.cpp
+++ b/src/autoapp/UI/MainWindow.cpp
@@ -549,10 +549,11 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi
connect(player, &QMediaPlayer::durationChanged, this, &MainWindow::on_durationChanged);
connect(player, &QMediaPlayer::metaDataAvailableChanged, this, &MainWindow::metaDataChanged);
- //ui_->labelFolderpath->hide();
- ui_->pushButtonPlayerPlay->hide();
+ ui_->pushButtonList->hide();
+ ui_->pushButtonBackToPlayer->hide();
ui_->PlayerPlayingWidget->hide();
-
+ ui_->pushButtonPlayerStop->hide();
+ ui_->pushButtonPlayerPause->hide();
//this->musicfolder = QString::fromStdString(configuration->getMp3MasterPath());
//this->albumfolder = QString::fromStdString(configuration->getMp3SubFolder());
//ui_->labelFolderpath->setText(this->musicfolder);
@@ -1204,15 +1205,13 @@ void f1x::openauto::autoapp::ui::MainWindow::on_horizontalSliderVolumePlayer_sli
ui_->volumeValueLabelPlayer->setText(QString::number(position) + "%");
}
-void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonPlayerPlay_clicked()
+void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonList_clicked()
{
- QString path = this->musicfolder + "/" + this->albumfolder + "/" + this->selectedMp3file;
- player->setMedia(QMediaContent(QUrl::fromLocalFile(path)));
- player->play();
- //qDebug() << player->errorString();
- ui_->pushButtonPlayerPause->setStyleSheet( "background-color: rgb(233, 185, 110); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); color: rgb(0,0,0);");
- ui_->mp3selectWidget->hide();
- ui_->PlayerPlayingWidget->show();
+ ui_->mp3selectWidget->show();
+ ui_->PlayerPlayingWidget->hide();
+ ui_->pushButtonList->hide();
+ ui_->pushButtonPlayerPlayList->show();
+ ui_->pushButtonBackToPlayer->show();
}
void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonPlayerStop_clicked()
@@ -1222,6 +1221,11 @@ void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonPlayerStop_clicked()
ui_->pushButtonPlayerPause->setStyleSheet( "background-color: rgb(233, 185, 110); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); color: rgb(0,0,0);");
ui_->mp3selectWidget->show();
ui_->PlayerPlayingWidget->hide();
+ ui_->pushButtonBackToPlayer->hide();
+ ui_->pushButtonPlayerPlayList->show();
+ ui_->pushButtonPlayerStop->hide();
+ ui_->pushButtonList->hide();
+ ui_->pushButtonPlayerPause->hide();
ui_->playerPositionTime->setText("00:00 / 00:00");
ui_->labelCurrentPlaying->setText("");
ui_->labelTrack->setText("");
@@ -1233,14 +1237,10 @@ void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonPlayerPause_clicked()
if(player->state() == QMediaPlayer::PlayingState){
player->pause();
ui_->pushButtonPlayerPause->setStyleSheet( "background-color: rgb(218, 143, 143); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); color: rgb(0,0,0);");
- ui_->mp3selectWidget->show();
- ui_->PlayerPlayingWidget->hide();
}else{
ui_->pushButtonPlayerPause->setStyleSheet( "background-color: rgb(233, 185, 110); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); color: rgb(0,0,0);");
player->play();
player->setPosition(player->position());
- ui_->mp3selectWidget->hide();
- ui_->PlayerPlayingWidget->show();
}
}
@@ -1333,7 +1333,12 @@ void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonPlayerPlayList_clicked
player->play();
ui_->mp3selectWidget->hide();
ui_->PlayerPlayingWidget->show();
+ ui_->pushButtonPlayerPlayList->hide();
+ ui_->pushButtonList->show();
+ ui_->pushButtonBackToPlayer->hide();
+ ui_->pushButtonPlayerStop->show();
ui_->pushButtonPlayerPause->setStyleSheet( "background-color: rgb(233, 185, 110); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); color: rgb(0,0,0);");
+ ui_->pushButtonPlayerPause->show();
int currentalbum = ui_->comboBoxAlbum->currentIndex();
ui_->labelCurrentAlbumIndex->setText(QString::number(currentalbum+1));
}
@@ -1433,3 +1438,12 @@ void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonPlayerNextAlbum_clicke
player->play();
}
}
+
+void f1x::openauto::autoapp::ui::MainWindow::on_pushButtonBackToPlayer_clicked()
+{
+ ui_->PlayerPlayingWidget->show();
+ ui_->mp3selectWidget->hide();
+ ui_->pushButtonBackToPlayer->hide();
+ ui_->pushButtonPlayerPlayList->hide();
+ ui_->pushButtonList->show();
+}
diff --git a/src/autoapp/UI/SettingsWindow.cpp b/src/autoapp/UI/SettingsWindow.cpp
index ec164e8..24994ff 100644
--- a/src/autoapp/UI/SettingsWindow.cpp
+++ b/src/autoapp/UI/SettingsWindow.cpp
@@ -616,7 +616,10 @@ void SettingsWindow::loadSystemValues()
dac = "Hifiberry - DAC Plus";
}
if (getparams[23] == "hifiberry-digi") {
- dac = "Hifiberry - DAC Digi";
+ dac = "Hifiberry - Digi";
+ }
+ if (getparams[23] == "hifiberry-digi-pro") {
+ dac = "Hifiberry - Digi Pro";
}
if (getparams[23] == "hifiberry-amp") {
dac = "Hifiberry - DAC Amp";
diff --git a/src/autoapp/UI/mainwindow.ui b/src/autoapp/UI/mainwindow.ui
index 4fa9261..e42460a 100644
--- a/src/autoapp/UI/mainwindow.ui
+++ b/src/autoapp/UI/mainwindow.ui
@@ -7,7 +7,7 @@
0
0
956
- 1296
+ 1295
@@ -3173,6 +3173,90 @@ QSlider::handle:horizontal { background: rgb(255, 255, 255); height: 52px; width
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
+
+
+
+
-
@@ -3190,7 +3274,7 @@ QSlider::handle:horizontal { background: rgb(255, 255, 255); height: 52px; width
16777215
- 30
+ 40
@@ -3215,48 +3299,6 @@ outline: none;
- -
-
-
-
- 0
- 0
-
-
-
-
- 0
- 40
-
-
-
-
- 16777215
- 30
-
-
-
- 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
-
-
-
-
-
@@ -3274,7 +3316,7 @@ outline: none;
16777215
- 30
+ 40
@@ -3316,7 +3358,7 @@ outline: none;
16777215
- 30
+ 40
@@ -3362,7 +3404,7 @@ outline: none;
16777215
- 30
+ 40
@@ -3383,7 +3425,7 @@ outline: none;
- :/back-hot.png
+ :/home-hot.png
diff --git a/src/autoapp/UI/settingswindow.ui b/src/autoapp/UI/settingswindow.ui
index f2ca641..8af4140 100644
--- a/src/autoapp/UI/settingswindow.ui
+++ b/src/autoapp/UI/settingswindow.ui
@@ -5172,12 +5172,17 @@ outline: none;
-
- Hifiberry - DAC Digi
+ Hifiberry - DAC Amp
-
- Hifiberry - DAC Amp
+ Hifiberry - Digi
+
+
+ -
+
+ Hifiberry - Digi Pro