Skip to content

Commit 9c2350a

Browse files
ddennedyddennedy
committed
Add Help > What's This? to menu and toolbar
1 parent dc0520c commit 9c2350a

File tree

227 files changed

+702
-584
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

227 files changed

+702
-584
lines changed

‎icons/dark/32x32/help-contextual.png‎

564 Bytes
Loading

‎icons/light/32x32/help-contextual.png‎

325 Bytes
Loading

‎icons/oxygen-dark/32x32/actions/help-contextual.png‎

2.45 KB
Loading

‎icons/oxygen/32x32/actions/help-contextual.png‎

2.45 KB
Loading

‎icons/resources.qrc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<file>dark/32x32/bookmarks.png</file>
99
<file>dark/32x32/chronometer.png</file>
1010
<file>dark/32x32/color-picker.png</file>
11+
<file>dark/32x32/help-contextual.png</file>
1112
<file>dark/32x32/cpu.png</file>
1213
<file>dark/32x32/dialog-information.png</file>
1314
<file>dark/32x32/dialog-ok.png</file>
@@ -152,6 +153,7 @@
152153
<file>light/32x32/bookmarks.png</file>
153154
<file>light/32x32/chronometer.png</file>
154155
<file>light/32x32/color-picker.png</file>
156+
<file>light/32x32/help-contextual.png</file>
155157
<file>light/32x32/cpu.png</file>
156158
<file>light/32x32/dialog-information.png</file>
157159
<file>light/32x32/dialog-ok.png</file>
@@ -290,6 +292,7 @@
290292
<file>oxygen/32x32/actions/4-direction.png</file>
291293
<file>oxygen/32x32/actions/chronometer.png</file>
292294
<file>oxygen/32x32/actions/color-picker.png</file>
295+
<file>oxygen/32x32/actions/help-contextual.png</file>
293296
<file>oxygen/32x32/actions/dialog-ok.png</file>
294297
<file>oxygen/32x32/actions/document-edit.png</file>
295298
<file>oxygen/32x32/actions/document-export.png</file>
@@ -437,6 +440,7 @@
437440
<file>oxygen-dark/32x32/actions/audio-meter.png</file>
438441
<file>oxygen-dark/32x32/actions/chronometer.png</file>
439442
<file>oxygen-dark/32x32/actions/color-picker.png</file>
443+
<file>oxygen-dark/32x32/actions/help-contextual.png</file>
440444
<file>oxygen-dark/32x32/actions/dialog-ok.png</file>
441445
<file>oxygen-dark/32x32/actions/document-edit.png</file>
442446
<file>oxygen-dark/32x32/actions/document-export.png</file>

‎src/dialogs/customprofiledialog.ui‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@
77
<x>0</x>
88
<y>0</y>
99
<width>496</width>
10-
<height>322</height>
10+
<height>376</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Add Custom Video Mode</string>
1515
</property>
16+
<property name="whatsThis">
17+
<string notr="true">https://forum.shotcut.org/t/settings-video-mode/12790#p-40331-custom-3</string>
18+
</property>
1619
<property name="modal">
1720
<bool>true</bool>
1821
</property>
@@ -29,7 +32,7 @@
2932
<string>Colorspace</string>
3033
</property>
3134
<property name="alignment">
32-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
35+
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
3336
</property>
3437
<property name="buddy">
3538
<cstring>colorspaceCombo</cstring>
@@ -63,7 +66,7 @@
6366
<item>
6467
<spacer name="horizontalSpacer">
6568
<property name="orientation">
66-
<enum>Qt::Horizontal</enum>
69+
<enum>Qt::Orientation::Horizontal</enum>
6770
</property>
6871
<property name="sizeHint" stdset="0">
6972
<size>
@@ -81,7 +84,7 @@
8184
<string>Resolution</string>
8285
</property>
8386
<property name="alignment">
84-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
87+
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
8588
</property>
8689
<property name="buddy">
8790
<cstring>widthSpinner</cstring>
@@ -164,7 +167,7 @@
164167
<item>
165168
<spacer name="horizontalSpacer_8">
166169
<property name="orientation">
167-
<enum>Qt::Horizontal</enum>
170+
<enum>Qt::Orientation::Horizontal</enum>
168171
</property>
169172
<property name="sizeHint" stdset="0">
170173
<size>
@@ -182,7 +185,7 @@
182185
<string>Name</string>
183186
</property>
184187
<property name="alignment">
185-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
188+
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
186189
</property>
187190
<property name="buddy">
188191
<cstring>nameEdit</cstring>
@@ -211,7 +214,7 @@
211214
<item>
212215
<spacer name="horizontalSpacer_9">
213216
<property name="orientation">
214-
<enum>Qt::Horizontal</enum>
217+
<enum>Qt::Orientation::Horizontal</enum>
215218
</property>
216219
<property name="sizeHint" stdset="0">
217220
<size>
@@ -229,7 +232,7 @@
229232
<string>Aspect ratio</string>
230233
</property>
231234
<property name="alignment">
232-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
235+
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
233236
</property>
234237
<property name="buddy">
235238
<cstring>aspectNumSpinner</cstring>
@@ -330,7 +333,7 @@
330333
<item>
331334
<spacer name="horizontalSpacer_7">
332335
<property name="orientation">
333-
<enum>Qt::Horizontal</enum>
336+
<enum>Qt::Orientation::Horizontal</enum>
334337
</property>
335338
<property name="sizeHint" stdset="0">
336339
<size>
@@ -348,7 +351,7 @@
348351
<string>Frames/sec</string>
349352
</property>
350353
<property name="alignment">
351-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
354+
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
352355
</property>
353356
<property name="buddy">
354357
<cstring>fpsSpinner</cstring>
@@ -431,7 +434,7 @@
431434
<item>
432435
<spacer name="horizontalSpacer_16">
433436
<property name="orientation">
434-
<enum>Qt::Horizontal</enum>
437+
<enum>Qt::Orientation::Horizontal</enum>
435438
</property>
436439
<property name="sizeHint" stdset="0">
437440
<size>
@@ -449,7 +452,7 @@
449452
<string>Scan mode</string>
450453
</property>
451454
<property name="alignment">
452-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
455+
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
453456
</property>
454457
<property name="buddy">
455458
<cstring>scanModeCombo</cstring>
@@ -459,7 +462,7 @@
459462
<item row="10" column="0">
460463
<spacer name="verticalSpacer_2">
461464
<property name="orientation">
462-
<enum>Qt::Vertical</enum>
465+
<enum>Qt::Orientation::Vertical</enum>
463466
</property>
464467
<property name="sizeHint" stdset="0">
465468
<size>
@@ -487,7 +490,7 @@
487490
<bool>true</bool>
488491
</property>
489492
<property name="textInteractionFlags">
490-
<set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
493+
<set>Qt::TextInteractionFlag::TextSelectableByKeyboard|Qt::TextInteractionFlag::TextSelectableByMouse</set>
491494
</property>
492495
</widget>
493496
</item>
@@ -497,10 +500,10 @@
497500
<item>
498501
<widget class="QDialogButtonBox" name="buttonBox">
499502
<property name="orientation">
500-
<enum>Qt::Horizontal</enum>
503+
<enum>Qt::Orientation::Horizontal</enum>
501504
</property>
502505
<property name="standardButtons">
503-
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
506+
<set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
504507
</property>
505508
</widget>
506509
</item>

‎src/dialogs/transcodedialog.ui‎

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,30 @@
33
<class>TranscodeDialog</class>
44
<widget class="QDialog" name="TranscodeDialog">
55
<property name="windowModality">
6-
<enum>Qt::WindowModal</enum>
6+
<enum>Qt::WindowModality::WindowModal</enum>
77
</property>
88
<property name="geometry">
99
<rect>
1010
<x>0</x>
1111
<y>0</y>
12-
<width>418</width>
13-
<height>427</height>
12+
<width>492</width>
13+
<height>575</height>
1414
</rect>
1515
</property>
16+
<property name="whatsThis">
17+
<string notr="true">https://forum.shotcut.org/t/convert-to-edit-friendly-dialog/47720</string>
18+
</property>
1619
<layout class="QVBoxLayout" name="verticalLayout">
1720
<property name="sizeConstraint">
18-
<enum>QLayout::SetFixedSize</enum>
21+
<enum>QLayout::SizeConstraint::SetFixedSize</enum>
1922
</property>
2023
<item>
2124
<widget class="QLabel" name="messageLabel">
2225
<property name="text">
2326
<string notr="true">messageLabel</string>
2427
</property>
2528
<property name="alignment">
26-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
29+
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
2730
</property>
2831
<property name="wordWrap">
2932
<bool>true</bool>
@@ -38,7 +41,7 @@
3841
<string>good</string>
3942
</property>
4043
<property name="alignment">
41-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
44+
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
4245
</property>
4346
</widget>
4447
</item>
@@ -48,7 +51,7 @@
4851
<string>better</string>
4952
</property>
5053
<property name="alignment">
51-
<set>Qt::AlignCenter</set>
54+
<set>Qt::AlignmentFlag::AlignCenter</set>
5255
</property>
5356
</widget>
5457
</item>
@@ -58,7 +61,7 @@
5861
<string>best</string>
5962
</property>
6063
<property name="alignment">
61-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
64+
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
6265
</property>
6366
</widget>
6467
</item>
@@ -79,10 +82,10 @@
7982
<number>0</number>
8083
</property>
8184
<property name="orientation">
82-
<enum>Qt::Horizontal</enum>
85+
<enum>Qt::Orientation::Horizontal</enum>
8386
</property>
8487
<property name="tickPosition">
85-
<enum>QSlider::TicksBothSides</enum>
88+
<enum>QSlider::TickPosition::TicksBothSides</enum>
8689
</property>
8790
</widget>
8891
</item>
@@ -94,27 +97,27 @@
9497
<string>medium</string>
9598
</property>
9699
<property name="alignment">
97-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
100+
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
98101
</property>
99102
</widget>
100103
</item>
101104
<item>
102105
<widget class="QLabel" name="label_5">
103-
<property name="text">
104-
<string>BIG</string>
105-
</property>
106+
<property name="text">
107+
<string>BIG</string>
108+
</property>
106109
<property name="alignment">
107-
<set>Qt::AlignCenter</set>
110+
<set>Qt::AlignmentFlag::AlignCenter</set>
108111
</property>
109112
</widget>
110113
</item>
111114
<item>
112115
<widget class="QLabel" name="label_6">
113-
<property name="text">
114-
<string>&lt;span style=&quot; font-weight:700; color:#ff0000;&quot;&gt;HUGE&lt;/span&gt;</string>
115-
</property>
116+
<property name="text">
117+
<string>&lt;span style=&quot; font-weight:700; color:#ff0000;&quot;&gt;HUGE&lt;/span&gt;</string>
118+
</property>
116119
<property name="alignment">
117-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
120+
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
118121
</property>
119122
</widget>
120123
</item>
@@ -126,7 +129,7 @@
126129
<string notr="true">formatLabel</string>
127130
</property>
128131
<property name="alignment">
129-
<set>Qt::AlignCenter</set>
132+
<set>Qt::AlignmentFlag::AlignCenter</set>
130133
</property>
131134
</widget>
132135
</item>
@@ -196,7 +199,7 @@ Motion Compensation: Interpolate new frames using motion compensation. This meth
196199
<item row="0" column="0" colspan="2">
197200
<widget class="Line" name="line">
198201
<property name="orientation">
199-
<enum>Qt::Horizontal</enum>
202+
<enum>Qt::Orientation::Horizontal</enum>
200203
</property>
201204
</widget>
202205
</item>
@@ -219,7 +222,7 @@ Motion Compensation: Interpolate new frames using motion compensation. This meth
219222
<string>Sample rate</string>
220223
</property>
221224
<property name="alignment">
222-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
225+
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
223226
</property>
224227
</widget>
225228
</item>
@@ -229,7 +232,7 @@ Motion Compensation: Interpolate new frames using motion compensation. This meth
229232
<string>Frames/sec</string>
230233
</property>
231234
<property name="alignment">
232-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
235+
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
233236
</property>
234237
</widget>
235238
</item>
@@ -249,7 +252,7 @@ Motion Compensation: Interpolate new frames using motion compensation. This meth
249252
<string>Frame rate conversion</string>
250253
</property>
251254
<property name="alignment">
252-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
255+
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
253256
</property>
254257
</widget>
255258
</item>
@@ -286,10 +289,10 @@ Motion Compensation: Interpolate new frames using motion compensation. This meth
286289
<item>
287290
<widget class="QDialogButtonBox" name="buttonBox">
288291
<property name="orientation">
289-
<enum>Qt::Horizontal</enum>
292+
<enum>Qt::Orientation::Horizontal</enum>
290293
</property>
291294
<property name="standardButtons">
292-
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
295+
<set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
293296
</property>
294297
</widget>
295298
</item>

0 commit comments

Comments
 (0)