diff options
| author | Manuel Schneider | 2014-05-06 15:25:13 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2014-05-06 15:25:13 +0200 |
| commit | 9d92e6f2202339de585b6bd5c3858e03b89651f0 (patch) | |
| tree | acb8e72d3b9f60fcad0ac4fa3af00db20a90133e /gui/client | |
| parent | Changes the approach of Qt Gui initialization to the member pointer approach.... (diff) | |
| parent | Merge branch 'master' of git.openslx.org:pvs2 (diff) | |
| download | pvs2-9d92e6f2202339de585b6bd5c3858e03b89651f0.tar.gz pvs2-9d92e6f2202339de585b6bd5c3858e03b89651f0.tar.xz pvs2-9d92e6f2202339de585b6bd5c3858e03b89651f0.zip | |
Merge branch 'master' of git.openslx.org:pvs2
Conflicts:
gui/client/toolbar.ui
src/client/connectwindow/connectwindow.cpp
Diffstat (limited to 'gui/client')
| -rw-r--r-- | gui/client/connect.ui | 33 | ||||
| -rw-r--r-- | gui/client/toolbar.ui | 2 |
2 files changed, 31 insertions, 4 deletions
diff --git a/gui/client/connect.ui b/gui/client/connect.ui index 1cb873c..a7cb621 100644 --- a/gui/client/connect.ui +++ b/gui/client/connect.ui @@ -66,8 +66,8 @@ <widget class="QLabel" name="lblError"> <property name="geometry"> <rect> - <x>10</x> - <y>70</y> + <x>20</x> + <y>80</y> <width>381</width> <height>21</height> </rect> @@ -108,7 +108,34 @@ <bool>false</bool> </property> </widget> + <widget class="QLabel" name="lblCheckmark"> + <property name="geometry"> + <rect> + <x>120</x> + <y>0</y> + <width>221</width> + <height>121</height> + </rect> + </property> + <property name="autoFillBackground"> + <bool>false</bool> + </property> + <property name="styleSheet"> + <string notr="true"/> + </property> + <property name="text"> + <string/> + </property> + <property name="pixmap"> + <pixmap resource="../../pvsclient.qrc">:/dark-green-check-mark.svg</pixmap> + </property> + <property name="scaledContents"> + <bool>true</bool> + </property> + </widget> </widget> - <resources/> + <resources> + <include location="../../pvsclient.qrc"/> + </resources> <connections/> </ui> diff --git a/gui/client/toolbar.ui b/gui/client/toolbar.ui index 199eef2..3e39e16 100644 --- a/gui/client/toolbar.ui +++ b/gui/client/toolbar.ui @@ -100,7 +100,7 @@ QCheckBox::indicator:checked:pressed { <string>Menu</string> </property> <property name="text"> - <string notr="true">Menu</string> + <string>Menu</string> </property> </widget> </item> |