Skip to content

Commit f4a49ca

Browse files
committed
ui: Update Qt6 forms with latest designer output
Simple load and save of the .ui files in the latest version of designer to clear out trivial changes. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
1 parent 40a91db commit f4a49ca

File tree

2 files changed

+28
-20
lines changed

2 files changed

+28
-20
lines changed

src/ptz-controls.ui

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,16 @@
22
<ui version="4.0">
33
<class>PTZControls</class>
44
<widget class="QWidget" name="PTZControls">
5+
<property name="geometry">
6+
<rect>
7+
<x>0</x>
8+
<y>0</y>
9+
<width>200</width>
10+
<height>300</height>
11+
</rect>
12+
</property>
513
<property name="contextMenuPolicy">
6-
<enum>Qt::CustomContextMenu</enum>
14+
<enum>Qt::ContextMenuPolicy::CustomContextMenu</enum>
715
</property>
816
<layout class="QVBoxLayout" name="dockWidgetContentsVerticalLayout">
917
<property name="spacing">
@@ -24,7 +32,7 @@
2432
<item>
2533
<widget class="QSplitter" name="splitter">
2634
<property name="orientation">
27-
<enum>Qt::Horizontal</enum>
35+
<enum>Qt::Orientation::Horizontal</enum>
2836
</property>
2937
<property name="childrenCollapsible">
3038
<bool>false</bool>
@@ -366,7 +374,7 @@
366374
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Zoom camera in&lt;br/&gt;&amp;lt;ctrl&amp;gt;+click: fast&lt;br/&gt;&amp;lt;shift&amp;gt;+click: slow&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
367375
</property>
368376
<property name="layoutDirection">
369-
<enum>Qt::LeftToRight</enum>
377+
<enum>Qt::LayoutDirection::LeftToRight</enum>
370378
</property>
371379
<property name="icon">
372380
<iconset resource="ptz-controls.qrc">
@@ -474,7 +482,7 @@
474482
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Focus far&lt;br/&gt;&amp;lt;ctrl&amp;gt;+click: fast&lt;br/&gt;&amp;lt;shift&amp;gt;+click: slow&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
475483
</property>
476484
<property name="layoutDirection">
477-
<enum>Qt::LeftToRight</enum>
485+
<enum>Qt::LayoutDirection::LeftToRight</enum>
478486
</property>
479487
<property name="icon">
480488
<iconset resource="ptz-controls.qrc">
@@ -525,10 +533,10 @@
525533
</size>
526534
</property>
527535
<property name="contextMenuPolicy">
528-
<enum>Qt::CustomContextMenu</enum>
536+
<enum>Qt::ContextMenuPolicy::CustomContextMenu</enum>
529537
</property>
530538
<property name="editTriggers">
531-
<set>QAbstractItemView::NoEditTriggers</set>
539+
<set>QAbstractItemView::EditTrigger::NoEditTriggers</set>
532540
</property>
533541
</widget>
534542
</item>
@@ -551,10 +559,10 @@
551559
<item>
552560
<widget class="CircularListView" name="presetListView">
553561
<property name="contextMenuPolicy">
554-
<enum>Qt::CustomContextMenu</enum>
562+
<enum>Qt::ContextMenuPolicy::CustomContextMenu</enum>
555563
</property>
556564
<property name="editTriggers">
557-
<set>QAbstractItemView::EditKeyPressed</set>
565+
<set>QAbstractItemView::EditTrigger::EditKeyPressed</set>
558566
</property>
559567
</widget>
560568
</item>

src/settings.ui

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<item row="1" column="1">
6464
<widget class="DoubleSlider" name="joystickSpeedSlider">
6565
<property name="orientation">
66-
<enum>Qt::Horizontal</enum>
66+
<enum>Qt::Orientation::Horizontal</enum>
6767
</property>
6868
</widget>
6969
</item>
@@ -80,7 +80,7 @@
8080
<string>Set this value higher if the camera position drifts when the joysticks are centered</string>
8181
</property>
8282
<property name="orientation">
83-
<enum>Qt::Horizontal</enum>
83+
<enum>Qt::Orientation::Horizontal</enum>
8484
</property>
8585
</widget>
8686
</item>
@@ -103,7 +103,7 @@
103103
&lt;/body&gt;&lt;/html&gt;</string>
104104
</property>
105105
<property name="alignment">
106-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
106+
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
107107
</property>
108108
<property name="wordWrap">
109109
<bool>true</bool>
@@ -133,7 +133,7 @@
133133
<item>
134134
<spacer name="verticalSpacer">
135135
<property name="orientation">
136-
<enum>Qt::Vertical</enum>
136+
<enum>Qt::Orientation::Vertical</enum>
137137
</property>
138138
<property name="sizeHint" stdset="0">
139139
<size>
@@ -165,12 +165,12 @@
165165
<item>
166166
<widget class="QSplitter" name="splitter">
167167
<property name="orientation">
168-
<enum>Qt::Horizontal</enum>
168+
<enum>Qt::Orientation::Horizontal</enum>
169169
</property>
170170
<widget class="QWidget" name="widget_1" native="true">
171171
<layout class="QVBoxLayout" name="verticalLayout_3">
172172
<property name="sizeConstraint">
173-
<enum>QLayout::SetMinimumSize</enum>
173+
<enum>QLayout::SizeConstraint::SetMinimumSize</enum>
174174
</property>
175175
<item>
176176
<widget class="QLabel" name="label_2">
@@ -182,10 +182,10 @@
182182
<item>
183183
<widget class="QListView" name="deviceList">
184184
<property name="contextMenuPolicy">
185-
<enum>Qt::CustomContextMenu</enum>
185+
<enum>Qt::ContextMenuPolicy::CustomContextMenu</enum>
186186
</property>
187187
<property name="editTriggers">
188-
<set>QAbstractItemView::NoEditTriggers</set>
188+
<set>QAbstractItemView::EditTrigger::NoEditTriggers</set>
189189
</property>
190190
</widget>
191191
</item>
@@ -244,7 +244,7 @@
244244
<item>
245245
<spacer name="horizontalSpacer_2">
246246
<property name="orientation">
247-
<enum>Qt::Horizontal</enum>
247+
<enum>Qt::Orientation::Horizontal</enum>
248248
</property>
249249
<property name="sizeHint" stdset="0">
250250
<size>
@@ -261,15 +261,15 @@
261261
<widget class="QWidget" name="widget" native="true">
262262
<layout class="QVBoxLayout" name="verticalLayout_4" stretch="0">
263263
<property name="sizeConstraint">
264-
<enum>QLayout::SetDefaultConstraint</enum>
264+
<enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
265265
</property>
266266
<item>
267267
<layout class="QHBoxLayout" name="propertiesLayout">
268268
<property name="spacing">
269269
<number>0</number>
270270
</property>
271271
<property name="sizeConstraint">
272-
<enum>QLayout::SetNoConstraint</enum>
272+
<enum>QLayout::SizeConstraint::SetNoConstraint</enum>
273273
</property>
274274
</layout>
275275
</item>
@@ -293,7 +293,7 @@
293293
</sizepolicy>
294294
</property>
295295
<property name="alignment">
296-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
296+
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
297297
</property>
298298
</widget>
299299
</item>

0 commit comments

Comments
 (0)