Merge branch 'develop' of https://git.tzatzikiweeb.moe/tza/openauto into develop

This commit is contained in:
marios8543 2025-04-24 21:05:34 +03:00
commit 381dcfa102
2 changed files with 4 additions and 8 deletions

View File

@ -18,10 +18,6 @@
#include <QApplication> #include <QApplication>
#include <QtWebSockets/QWebSocket> #include <QtWebSockets/QWebSocket>
#include <QDBusInterface>
#include <QDBusConnection>
#include <QDBusReply>
#include <QDBusMessage>
#include <QDebug> #include <QDebug>
#include "autoapp/UI/MainWindow.hpp" #include "autoapp/UI/MainWindow.hpp"

View File

@ -439,7 +439,7 @@ color: rgb(238, 238, 236);</string>
<item> <item>
<widget class="QPushButton" name="pushButtonExit"> <widget class="QPushButton" name="pushButtonExit">
<property name="text"> <property name="text">
<string>Exit</string> <string>1. Exit</string>
</property> </property>
<property name="autoDefault"> <property name="autoDefault">
<bool>false</bool> <bool>false</bool>
@ -449,7 +449,7 @@ color: rgb(238, 238, 236);</string>
<item> <item>
<widget class="QPushButton" name="pushButtonSettings"> <widget class="QPushButton" name="pushButtonSettings">
<property name="text"> <property name="text">
<string>Settings</string> <string>2. Settings</string>
</property> </property>
<property name="autoDefault"> <property name="autoDefault">
<bool>false</bool> <bool>false</bool>
@ -462,7 +462,7 @@ color: rgb(238, 238, 236);</string>
<item> <item>
<widget class="QPushButton" name="pushButtonWirelessConnection"> <widget class="QPushButton" name="pushButtonWirelessConnection">
<property name="text"> <property name="text">
<string>Wireless connection</string> <string>3. Wireless connection</string>
</property> </property>
<property name="autoDefault"> <property name="autoDefault">
<bool>false</bool> <bool>false</bool>
@ -475,7 +475,7 @@ color: rgb(238, 238, 236);</string>
<item> <item>
<widget class="QPushButton" name="pushButtonToggleCursor"> <widget class="QPushButton" name="pushButtonToggleCursor">
<property name="text"> <property name="text">
<string>Toggle cursor</string> <string>4. Toggle cursor</string>
</property> </property>
<property name="autoDefault"> <property name="autoDefault">
<bool>false</bool> <bool>false</bool>