final fixes

This commit is contained in:
marios8543 2025-05-17 17:31:25 +03:00
parent 94f5f5a382
commit cab79ecd5f
3 changed files with 29 additions and 66 deletions

View File

@ -69,9 +69,9 @@ namespace autoapp
{ {
this->setControlsEnabledStatus(true); 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.setWindowFlags(Qt::WindowStaysOnTopHint);
errorMessage.exec(); errorMessage.exec();*/
} }
void ConnectDialog::onRecentAddressClicked(const QModelIndex &index) void ConnectDialog::onRecentAddressClicked(const QModelIndex &index)

View File

@ -31,10 +31,10 @@ namespace autoapp
: QMainWindow(parent), ui_(new Ui::MainWindow) : QMainWindow(parent), ui_(new Ui::MainWindow)
{ {
ui_->setupUi(this); ui_->setupUi(this);
connect(ui_->pushButtonSettings, &QPushButton::clicked, this, &MainWindow::openSettings); //connect(ui_->pushButtonSettings, &QPushButton::clicked, this, &MainWindow::openSettings);
connect(ui_->pushButtonExit, &QPushButton::clicked, this, &MainWindow::exit); //connect(ui_->pushButtonExit, &QPushButton::clicked, this, &MainWindow::exit);
connect(ui_->pushButtonToggleCursor, &QPushButton::clicked, this, &MainWindow::toggleCursor); //connect(ui_->pushButtonToggleCursor, &QPushButton::clicked, this, &MainWindow::toggleCursor);
connect(ui_->pushButtonWirelessConnection, &QPushButton::clicked, this, &MainWindow::openConnectDialog); //connect(ui_->pushButtonWirelessConnection, &QPushButton::clicked, this, &MainWindow::openConnectDialog);
} }
MainWindow::~MainWindow() MainWindow::~MainWindow()
@ -69,4 +69,7 @@ void autoapp::ui::MainWindow::handleIncomingMessage(const QJsonObject &rootObj)
QJsonObject aaObj = rootObj["connect_wireless_aa"].toObject(); QJsonObject aaObj = rootObj["connect_wireless_aa"].toObject();
//connectWirelessAndroidAuto(aaObj["address"].toString()); //connectWirelessAndroidAuto(aaObj["address"].toString());
} }
else if (rootObj.contains("settings")) {
MainWindow::openSettings();
}
} }

View File

@ -101,7 +101,7 @@ color: rgb(238, 238, 236);</string>
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="../assets/resources.qrc">:/bluetooth.png</pixmap> <pixmap>:/bluetooth.png</pixmap>
</property> </property>
<property name="scaledContents"> <property name="scaledContents">
<bool>true</bool> <bool>true</bool>
@ -134,7 +134,7 @@ color: rgb(238, 238, 236);</string>
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="../assets/resources.qrc">:/song.png</pixmap> <pixmap>:/song.png</pixmap>
</property> </property>
<property name="scaledContents"> <property name="scaledContents">
<bool>true</bool> <bool>true</bool>
@ -175,7 +175,7 @@ color: rgb(238, 238, 236);</string>
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="../assets/resources.qrc">:/artist.png</pixmap> <pixmap>:/artist.png</pixmap>
</property> </property>
<property name="scaledContents"> <property name="scaledContents">
<bool>true</bool> <bool>true</bool>
@ -210,7 +210,7 @@ color: rgb(238, 238, 236);</string>
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="../assets/resources.qrc">:/album.png</pixmap> <pixmap>:/album.png</pixmap>
</property> </property>
<property name="scaledContents"> <property name="scaledContents">
<bool>true</bool> <bool>true</bool>
@ -317,7 +317,7 @@ color: rgb(238, 238, 236);</string>
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="../assets/resources.qrc">:/radio.png</pixmap> <pixmap>:/radio.png</pixmap>
</property> </property>
<property name="scaledContents"> <property name="scaledContents">
<bool>true</bool> <bool>true</bool>
@ -330,6 +330,18 @@ color: rgb(238, 238, 236);</string>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<item> <item>
<widget class="QLabel" name="radioScreen"> <widget class="QLabel" name="radioScreen">
<property name="minimumSize">
<size>
<width>276</width>
<height>140</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>276</width>
<height>140</height>
</size>
</property>
<property name="font"> <property name="font">
<font> <font>
<pointsize>40</pointsize> <pointsize>40</pointsize>
@ -396,6 +408,9 @@ color: rgb(238, 238, 236);</string>
</item> </item>
<item alignment="Qt::AlignHCenter|Qt::AlignBottom"> <item alignment="Qt::AlignHCenter|Qt::AlignBottom">
<widget class="QWidget" name="horizontalWidget" native="true"> <widget class="QWidget" name="horizontalWidget" native="true">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -436,67 +451,12 @@ color: rgb(238, 238, 236);</string>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item>
<widget class="QPushButton" name="pushButtonExit">
<property name="text">
<string>1. Exit</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonSettings">
<property name="text">
<string>2. Settings</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
<property name="default">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonWirelessConnection">
<property name="text">
<string>3. Wireless connection</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
<property name="default">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonToggleCursor">
<property name="text">
<string>4. Toggle cursor</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
<property name="default">
<bool>false</bool>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</widget> </widget>
<tabstops>
<tabstop>pushButtonToggleCursor</tabstop>
<tabstop>pushButtonWirelessConnection</tabstop>
<tabstop>pushButtonSettings</tabstop>
<tabstop>pushButtonExit</tabstop>
</tabstops>
<resources> <resources>
<include location="../assets/resources.qrc"/> <include location="../assets/resources.qrc"/>
</resources> </resources>