[gui] Update button images / rework layout

This commit is contained in:
Marc Hillesheim 2018-05-21 16:35:44 +02:00
parent 5d154138bb
commit 77f6f8c30d
14 changed files with 45 additions and 44 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

0
assets/ico_androidauto.png Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

0
assets/ico_info.png Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 438 B

After

Width:  |  Height:  |  Size: 438 B

0
assets/ico_setting.png Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

0
assets/ico_warning.png Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 751 B

After

Width:  |  Height:  |  Size: 751 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

View File

@ -37,8 +37,8 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi
{
this->setStyleSheet("QMainWindow {background-color: rgb(0,0,0);} \
QPushButton { background: url(:/circle.png); border: 0; } \
QPushButton:hover { background: url(:/circle-hot.png); } \
QPushButton:focus { background: url(:/circle-hot.png); } \
QPushButton:hover { background: url(:/circle.png); } \
QPushButton:focus { background: url(:/circle.png); } \
QPushButton:pressed { background: url(:/circle-pressed.png); } \
");
QFileInfo wallpaperFile("wallpaper.png");

View File

@ -17,8 +17,8 @@
<widget class="QPushButton" name="pushButtonSettings">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<x>30</x>
<y>34</y>
<width>64</width>
<height>64</height>
</rect>
@ -43,18 +43,18 @@
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton" name="pushButtonExit">
<widget class="QPushButton" name="pushButtonWirelessConnection">
<property name="geometry">
<rect>
<x>10</x>
<y>360</y>
<x>30</x>
<y>104</y>
<width>64</width>
<height>64</height>
</rect>
</property>
<property name="icon">
<iconset resource="../../../assets/resources.qrc">
<normaloff>:/power-hot.png</normaloff>:/power-hot.png</iconset>
<normaloff>:/wifi-hot.png</normaloff>:/wifi-hot.png</iconset>
</property>
<property name="iconSize">
<size>
@ -62,9 +62,6 @@
<height>64</height>
</size>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
<property name="flat">
<bool>true</bool>
</property>
@ -72,8 +69,8 @@
<widget class="QPushButton" name="pushButtonToggleCursor">
<property name="geometry">
<rect>
<x>10</x>
<y>150</y>
<x>30</x>
<y>174</y>
<width>64</width>
<height>64</height>
</rect>
@ -104,34 +101,11 @@
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton" name="pushButtonWirelessConnection">
<property name="geometry">
<rect>
<x>10</x>
<y>80</y>
<width>64</width>
<height>64</height>
</rect>
</property>
<property name="icon">
<iconset resource="../../../assets/resources.qrc">
<normaloff>:/wifi-hot.png</normaloff>:/wifi-hot.png</iconset>
</property>
<property name="iconSize">
<size>
<width>64</width>
<height>64</height>
</size>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton" name="pushButtonBrightness">
<property name="geometry">
<rect>
<x>10</x>
<y>220</y>
<x>30</x>
<y>244</y>
<width>64</width>
<height>64</height>
</rect>
@ -159,10 +133,10 @@
<widget class="QSlider" name="horizontalSliderBrightness">
<property name="geometry">
<rect>
<x>80</x>
<y>230</y>
<width>221</width>
<height>41</height>
<x>200</x>
<y>210</y>
<width>400</width>
<height>60</height>
</rect>
</property>
<property name="minimum">
@ -178,12 +152,39 @@
<enum>Qt::Horizontal</enum>
</property>
</widget>
<widget class="QPushButton" name="pushButtonExit">
<property name="geometry">
<rect>
<x>30</x>
<y>384</y>
<width>64</width>
<height>64</height>
</rect>
</property>
<property name="icon">
<iconset resource="../../../assets/resources.qrc">
<normaloff>:/power-hot.png</normaloff>:/power-hot.png</iconset>
</property>
<property name="iconSize">
<size>
<width>64</width>
<height>64</height>
</size>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</widget>
</widget>
<tabstops>
<tabstop>pushButtonToggleCursor</tabstop>
<tabstop>pushButtonWirelessConnection</tabstop>
<tabstop>pushButtonSettings</tabstop>
<tabstop>pushButtonWirelessConnection</tabstop>
<tabstop>pushButtonToggleCursor</tabstop>
<tabstop>pushButtonBrightness</tabstop>
<tabstop>pushButtonExit</tabstop>
</tabstops>
<resources>