Merge branch 'develop' of https://git.tzatzikiweeb.moe/tza/openauto into develop
This commit is contained in:
commit
381dcfa102
@ -18,10 +18,6 @@
|
||||
|
||||
#include <QApplication>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <QDBusInterface>
|
||||
#include <QDBusConnection>
|
||||
#include <QDBusReply>
|
||||
#include <QDBusMessage>
|
||||
#include <QDebug>
|
||||
|
||||
#include "autoapp/UI/MainWindow.hpp"
|
||||
|
@ -439,7 +439,7 @@ color: rgb(238, 238, 236);</string>
|
||||
<item>
|
||||
<widget class="QPushButton" name="pushButtonExit">
|
||||
<property name="text">
|
||||
<string>Exit</string>
|
||||
<string>1. Exit</string>
|
||||
</property>
|
||||
<property name="autoDefault">
|
||||
<bool>false</bool>
|
||||
@ -449,7 +449,7 @@ color: rgb(238, 238, 236);</string>
|
||||
<item>
|
||||
<widget class="QPushButton" name="pushButtonSettings">
|
||||
<property name="text">
|
||||
<string>Settings</string>
|
||||
<string>2. Settings</string>
|
||||
</property>
|
||||
<property name="autoDefault">
|
||||
<bool>false</bool>
|
||||
@ -462,7 +462,7 @@ color: rgb(238, 238, 236);</string>
|
||||
<item>
|
||||
<widget class="QPushButton" name="pushButtonWirelessConnection">
|
||||
<property name="text">
|
||||
<string>Wireless connection</string>
|
||||
<string>3. Wireless connection</string>
|
||||
</property>
|
||||
<property name="autoDefault">
|
||||
<bool>false</bool>
|
||||
@ -475,7 +475,7 @@ color: rgb(238, 238, 236);</string>
|
||||
<item>
|
||||
<widget class="QPushButton" name="pushButtonToggleCursor">
|
||||
<property name="text">
|
||||
<string>Toggle cursor</string>
|
||||
<string>4. Toggle cursor</string>
|
||||
</property>
|
||||
<property name="autoDefault">
|
||||
<bool>false</bool>
|
||||
|
Loading…
x
Reference in New Issue
Block a user