summaryrefslogtreecommitdiffhomepage
path: root/proto-vjoystick/vjoystick.ui
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2019-02-11 22:12:47 +0100
committerStanislaw Halik <sthalik@misaki.pl>2019-02-11 22:12:47 +0100
commitc0da74ccd25837186ebb48af5e21ec250d2a6bdf (patch)
tree1f4fc234e75784910c03e2f237a896046ee5eec4 /proto-vjoystick/vjoystick.ui
parent85fc6ac25d350950be56ba47b06c247216f2e22a (diff)
proto/vjoystick: fix threading issue
Acquiring given joystick id must be done on the same thread as the feeder apparently. Provide diagnostics on failure. Issue: #860
Diffstat (limited to 'proto-vjoystick/vjoystick.ui')
-rw-r--r--proto-vjoystick/vjoystick.ui21
1 files changed, 6 insertions, 15 deletions
diff --git a/proto-vjoystick/vjoystick.ui b/proto-vjoystick/vjoystick.ui
index 6e6a2b33..5bfdb02a 100644
--- a/proto-vjoystick/vjoystick.ui
+++ b/proto-vjoystick/vjoystick.ui
@@ -2,9 +2,6 @@
<ui version="4.0">
<class>vjoystick</class>
<widget class="QWidget" name="vjoystick">
- <property name="windowModality">
- <enum>Qt::NonModal</enum>
- </property>
<property name="geometry">
<rect>
<x>0</x>
@@ -14,23 +11,17 @@
</rect>
</property>
<property name="windowTitle">
- <string>VJoy</string>
+ <string>vjoystick</string>
</property>
<property name="windowIcon">
<iconset resource="vjoystick.qrc">
<normaloff>:/images/vjoystick.png</normaloff>:/images/vjoystick.png</iconset>
</property>
- <property name="layoutDirection">
- <enum>Qt::LeftToRight</enum>
- </property>
- <property name="autoFillBackground">
- <bool>false</bool>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Go to the &lt;a href=&quot;http://vjoystick.sourceforge.net/site/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;vjoystick&lt;/span&gt;&lt;/a&gt; project site or &lt;a href=&quot;https://sourceforge.net/projects/vjoystick/files/latest/download&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;download directly&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Go to the &lt;a href=&quot;http://vjoystick.sourceforge.net/site/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;vjoystick&lt;/span&gt;&lt;/a&gt; project site or &lt;a href=&quot;https://sourceforge.net/projects/vjoystick/files/latest/download&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;download directly&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -40,10 +31,10 @@
</property>
</widget>
</item>
- <item>
+ <item row="1" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
- <set>QDialogButtonBox::Ok</set>
+ <set>QDialogButtonBox::Close</set>
</property>
</widget>
</item>