diff --git a/src/autoapp/UI/MainWindow.cpp b/src/autoapp/UI/MainWindow.cpp
index 0940dd6..b143740 100644
--- a/src/autoapp/UI/MainWindow.cpp
+++ b/src/autoapp/UI/MainWindow.cpp
@@ -124,6 +124,8 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi
connect(ui_->pushButtonAndroidAuto2, &QPushButton::clicked, this, &MainWindow::TriggerAppStart);
connect(ui_->pushButtonAndroidAuto2, &QPushButton::clicked, this, &MainWindow::setRetryUSBConnect);
+
+
ui_->radioView->hide();
ui_->clockOnlyWidget->hide();
@@ -440,20 +442,17 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi
// clock viibility by settings
if (!configuration->showClock()) {
ui_->Digital_clock->hide();
- ui_->bigClock->hide();
this->NoClock = true;
} else {
this->NoClock = false;
if (this->UseBigClock) {
//ui_->oldmenuDummy->hide();
- ui_->bigClock->show();
if (oldGUIStyle) {
ui_->Digital_clock->hide();
}
} else {
//ui_->oldmenuDummy->show();
ui_->Digital_clock->show();
- ui_->bigClock->hide();
}
}
@@ -902,10 +901,8 @@ void f1x::openauto::autoapp::ui::MainWindow::toggleGUI()
if (!this->NoClock) {
if (UseBigClock) {
ui_->Digital_clock->hide();
- ui_->bigClock->show();
} else {
ui_->Digital_clock->show();
- ui_->bigClock->hide();
}
}
} else {
@@ -995,8 +992,6 @@ void f1x::openauto::autoapp::ui::MainWindow::showTime()
this->date_text=date.toString("MM/dd");
ui_->Digital_clock->setText(time_text);
- ui_->bigClock->setText(time_text);
- ui_->bigClock2->setText(time_text);
if (!this->holidaybg) {
if (this->date_text == "12/24") {
@@ -1023,7 +1018,7 @@ void f1x::openauto::autoapp::ui::MainWindow::showTime()
ui_->btDevice->show();
}
if (std::ifstream("/tmp/btnowplaying")) {
- ui_->btNowPlaying->show();
+ ui_->stackedWidget->setCurrentIndex(0);
using namespace std;
ifstream inFile;
string line;
@@ -1038,7 +1033,7 @@ void f1x::openauto::autoapp::ui::MainWindow::showTime()
}
}
else {
- ui_->btNowPlaying->hide();
+ ui_->stackedWidget->setCurrentIndex(1);
ui_->btSongName->setText("");
ui_->btArtistName->setText("");
ui_->btAlbumName->setText("");
@@ -1952,20 +1947,17 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged()
if (!this->configuration_->showClock()) {
ui_->Digital_clock->hide();
//ui_->oldmenuDummy->show();
- ui_->bigClock->hide();
this->NoClock = true;
} else {
this->NoClock = false;
if (this->UseBigClock && ui_->oldmenuWidget->isVisible() == true) {
//ui_->oldmenuDummy->hide();
- ui_->bigClock->show();
if (oldGUIStyle) {
ui_->Digital_clock->hide();
}
} else {
//ui_->oldmenuDummy->show();
ui_->Digital_clock->show();
- ui_->bigClock->hide();
}
}
diff --git a/src/autoapp/UI/mainwindow.ui b/src/autoapp/UI/mainwindow.ui
index ab40e22..d4500a9 100644
--- a/src/autoapp/UI/mainwindow.ui
+++ b/src/autoapp/UI/mainwindow.ui
@@ -2892,506 +2892,533 @@ outline: none;
- -
-
-
- true
-
-
-
- 0
- 0
-
-
+
-
+
- 800
- 400
+ 500
+ 500
- 800
- 400
+ 500
+ 500
-
-
- 0
- 0
-
+
+ 1
-
-
- 22
-
-
-
-
-
-
-
-
- 200
- 200
-
-
-
-
- 200
- 200
-
-
-
-
-
-
- :/bluetooth.svg
-
-
- true
-
-
-
- -
-
-
-
- 500
- 250
-
-
-
-
- 500
- 250
-
-
-
-
- 7
-
-
- 1
-
-
- 1
-
-
- 1
-
-
- 1
-
-
-
-
-
-
- 0
- 0
-
+
+
+
+
+ 10
+ 10
+ 500
+ 80
+
+
+
+
+ 500
+ 0
+
+
+
+
-
+
+
+
+ 24
+
+
+
+ ABCD,EFGH
+
+
+
+
+
+
+
+ true
+
+
+
+ 0
+ 0
+ 500
+ 500
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 500
+ 500
+
+
+
+
+ 500
+ 500
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 22
+
+
+
+ -
+
+
+
+ 200
+ 200
+
+
+
+
+ 200
+ 200
+
+
+
+
+
+
+ :/bluetooth.svg
+
+
+ true
+
+
+
+ -
+
+
+
+ 500
+ 250
+
+
+
+
+ 500
+ 250
+
+
+
+
+ 7
-
-
- 400
- 0
-
+
+ 1
-
-
- 10
-
+
+ 1
-
-
- 1
-
-
- 1
-
-
-
-
-
-
- 50
- 50
-
-
-
-
- 50
- 50
-
-
-
-
- 5
-
-
-
-
-
-
- :/song.svg
-
-
- true
-
-
- false
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 200
- 0
-
-
-
-
- 20
-
-
-
- SONG NAME
-
-
-
-
-
-
- -
-
-
-
- 0
- 0
-
+
+ 1
-
-
- 100
- 0
-
+
+ 1
-
-
- 1
-
-
- 1
-
-
-
-
-
-
- 50
- 50
-
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 400
+ 0
+
+
+
+
+ 10
+
+
+
+
+ 1
-
-
+
+ 1
-
- :/artist.svg
+
-
+
+
+
+ 50
+ 50
+
+
+
+
+ 50
+ 50
+
+
+
+
+ 5
+
+
+
+
+
+
+ :/song.svg
+
+
+ true
+
+
+ false
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 200
+ 0
+
+
+
+
+ 20
+
+
+
+ SONG NAME
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 100
+ 0
+
+
+
+
+ 1
-
- true
+
+ 1
-
-
- -
-
-
-
- 0
- 0
-
+
-
+
+
+
+ 50
+ 50
+
+
+
+
+
+
+ :/artist.svg
+
+
+ true
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 200
+ 0
+
+
+
+
+ 13
+
+
+
+ ARTIST NAME
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 200
+ 0
+
+
+
+
+ 1
-
-
- 200
- 0
-
+
+ 1
-
-
- 13
-
-
-
- ARTIST NAME
-
-
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 200
- 0
-
-
-
-
- 1
-
-
- 1
-
-
-
-
-
-
- 50
- 50
-
-
-
-
-
-
- :/album.svg
-
-
- true
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 100
- 0
-
-
-
-
- 13
-
-
-
- ALBUM NAME
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 600
- 210
-
-
-
-
- 0
- 200
-
-
-
- Qt::LeftToRight
-
-
-
-
-
-
-
- 150
- 150
-
-
-
-
- 150
- 150
-
-
-
-
-
-
- :/radio.svg
-
-
- true
-
-
-
- -
-
-
-
- 0
- 100
-
-
-
-
- 16777215
- 150
-
-
-
-
-
-
-
-
- 100
- 100
-
-
-
-
-
-
-
-
- 0
- 50
-
-
-
-
- 500
- 100
-
-
-
-
- 32
-
-
-
- ABCD,EFGH
-
-
-
- -
-
-
-
- 16777215
- 50
-
-
-
-
- 16
-
-
-
- 0
-
-
-
-
-
-
- -
-
-
-
- 0
- 50
-
-
-
-
- 16777215
- 50
-
-
-
-
- 13
-
-
-
- Tuner List
-
-
-
-
-
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 200
- 100
-
-
-
-
- 100
- 50
-
-
-
-
- 32
- 50
- false
-
-
-
- color: rgb(255, 255, 255);
-
-
- 12:00
-
-
- Qt::AlignCenter
-
+
-
+
+
+
+ 50
+ 50
+
+
+
+
+
+
+ :/album.svg
+
+
+ true
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 100
+ 0
+
+
+
+
+ 13
+
+
+
+ ALBUM NAME
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 600
+ 450
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 600
+ 450
+
+
+
+
+ 0
+ 450
+
+
+
+ Qt::LeftToRight
+
+
+ -
+
+
+
+ 150
+ 150
+
+
+
+
+ 150
+ 150
+
+
+
+
+
+
+ :/radio.svg
+
+
+ true
+
+
+
+ -
+
+
+
+ 0
+ 100
+
+
+
+
+ 16777215
+ 150
+
+
+
+
-
+
+
+
+ 100
+ 100
+
+
+
+
-
+
+
+
+ 0
+ 50
+
+
+
+
+ 500
+ 100
+
+
+
+
+ 32
+
+
+
+ ABCD,EFGH
+
+
+
+ -
+
+
+
+ 16777215
+ 50
+
+
+
+
+ 16
+
+
+
+ 0
+
+
+
+
+
+
+ -
+
+
+
+ 50
+ 50
+
+
+
+
+ 16777215
+ 50
+
+
+
+
+ 13
+
+
+
+ Tuner List
+
+
+
+
+
+
+
+
+
-