summaryrefslogtreecommitdiffstats
path: root/gui/client/connect.ui
diff options
context:
space:
mode:
authorBjörn Hagemeister2014-05-06 15:42:33 +0200
committerBjörn Hagemeister2014-05-06 15:42:33 +0200
commit8e774982be169f33fe4f4c687885d96f1c4e5ab4 (patch)
treef4d8042b531ef15024cd9e56a9569f3939950e96 /gui/client/connect.ui
parentNew Feature: Showing client toolbar while vnc server is running. (diff)
parentMerge branch 'master' of git.openslx.org:pvs2 (diff)
downloadpvs2-8e774982be169f33fe4f4c687885d96f1c4e5ab4.tar.gz
pvs2-8e774982be169f33fe4f4c687885d96f1c4e5ab4.tar.xz
pvs2-8e774982be169f33fe4f4c687885d96f1c4e5ab4.zip
Merge branch 'master' of git.openslx.org:pvs2
Conflicts: src/client/connectwindow/connectwindow.h
Diffstat (limited to 'gui/client/connect.ui')
-rw-r--r--gui/client/connect.ui8
1 files changed, 4 insertions, 4 deletions
diff --git a/gui/client/connect.ui b/gui/client/connect.ui
index d334924..a7cb621 100644
--- a/gui/client/connect.ui
+++ b/gui/client/connect.ui
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>Dialog</class>
- <widget class="QDialog" name="Dialog">
+ <class>ConnectWindow</class>
+ <widget class="QWidget" name="ConnectWindow">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>511</width>
- <height>121</height>
+ <width>512</width>
+ <height>128</height>
</rect>
</property>
<property name="windowTitle">