diff --git a/autoapp/UI/ConnectDialog.cpp b/autoapp/UI/ConnectDialog.cpp index 210097e..6f2382d 100644 --- a/autoapp/UI/ConnectDialog.cpp +++ b/autoapp/UI/ConnectDialog.cpp @@ -69,9 +69,9 @@ namespace autoapp { this->setControlsEnabledStatus(true); - QMessageBox errorMessage(QMessageBox::Critical, "Connect error", message, QMessageBox::Ok); + /*QMessageBox errorMessage(QMessageBox::Critical, "Connect error", message, QMessageBox::Ok); errorMessage.setWindowFlags(Qt::WindowStaysOnTopHint); - errorMessage.exec(); + errorMessage.exec();*/ } void ConnectDialog::onRecentAddressClicked(const QModelIndex &index) diff --git a/autoapp/UI/MainWindow.cpp b/autoapp/UI/MainWindow.cpp index 45b05de..8e10501 100644 --- a/autoapp/UI/MainWindow.cpp +++ b/autoapp/UI/MainWindow.cpp @@ -31,10 +31,10 @@ namespace autoapp : QMainWindow(parent), ui_(new Ui::MainWindow) { ui_->setupUi(this); - connect(ui_->pushButtonSettings, &QPushButton::clicked, this, &MainWindow::openSettings); - connect(ui_->pushButtonExit, &QPushButton::clicked, this, &MainWindow::exit); - connect(ui_->pushButtonToggleCursor, &QPushButton::clicked, this, &MainWindow::toggleCursor); - connect(ui_->pushButtonWirelessConnection, &QPushButton::clicked, this, &MainWindow::openConnectDialog); + //connect(ui_->pushButtonSettings, &QPushButton::clicked, this, &MainWindow::openSettings); + //connect(ui_->pushButtonExit, &QPushButton::clicked, this, &MainWindow::exit); + //connect(ui_->pushButtonToggleCursor, &QPushButton::clicked, this, &MainWindow::toggleCursor); + //connect(ui_->pushButtonWirelessConnection, &QPushButton::clicked, this, &MainWindow::openConnectDialog); } MainWindow::~MainWindow() @@ -69,4 +69,7 @@ void autoapp::ui::MainWindow::handleIncomingMessage(const QJsonObject &rootObj) QJsonObject aaObj = rootObj["connect_wireless_aa"].toObject(); //connectWirelessAndroidAuto(aaObj["address"].toString()); } + else if (rootObj.contains("settings")) { + MainWindow::openSettings(); + } } \ No newline at end of file diff --git a/autoapp/UI/mainwindow.ui b/autoapp/UI/mainwindow.ui index 068b2f0..b66927e 100644 --- a/autoapp/UI/mainwindow.ui +++ b/autoapp/UI/mainwindow.ui @@ -101,7 +101,7 @@ color: rgb(238, 238, 236); - :/bluetooth.png + :/bluetooth.png true @@ -134,7 +134,7 @@ color: rgb(238, 238, 236); - :/song.png + :/song.png true @@ -175,7 +175,7 @@ color: rgb(238, 238, 236); - :/artist.png + :/artist.png true @@ -210,7 +210,7 @@ color: rgb(238, 238, 236); - :/album.png + :/album.png true @@ -317,7 +317,7 @@ color: rgb(238, 238, 236); - :/radio.png + :/radio.png true @@ -330,6 +330,18 @@ color: rgb(238, 238, 236); + + + 276 + 140 + + + + + 276 + 140 + + 40 @@ -396,6 +408,9 @@ color: rgb(238, 238, 236); + + true + 0 @@ -436,67 +451,12 @@ color: rgb(238, 238, 236); 0 - - - - 1. Exit - - - false - - - - - - - 2. Settings - - - false - - - false - - - - - - - 3. Wireless connection - - - false - - - false - - - - - - - 4. Toggle cursor - - - false - - - false - - - - - pushButtonToggleCursor - pushButtonWirelessConnection - pushButtonSettings - pushButtonExit -