summaryrefslogtreecommitdiffstats
path: root/examples/multimediawidgets/camera/videosettings_mobile.ui
diff options
context:
space:
mode:
authorSamuel Mira <samuel.mira@qt.io>2021-09-24 15:11:27 +0300
committerSamuel Mira <samuel.mira@qt.io>2021-10-07 10:45:39 +0300
commit806325a271bf84a0ac359237d1b9a449c0987e8d (patch)
tree70757052e81ede6062e03364c218cbfa44796870 /examples/multimediawidgets/camera/videosettings_mobile.ui
parent8b039e83346fc86d99ed0c3efd17c2661d6cbb9d (diff)
Fix resolution list to a camera format list
Changed the resolution list (widthxheight) to camera a format list (PixelFormat widthxheight MinFps-MaxFps FPS) Changed the Frames per Second to be a spinbox and a slider so it would give feedback of the selected FPS while being easy to change on a mobile device. This way users can fine tune how many fps they want for the capture (previously was either min or max) Set the selected cameraFormat to the camera in the captureSession since it was needed for saving all the changes and it fixed QTBUG-96739 by coincidence Fixes: QTBUG-96719 Fixes: QTBUG-96739 Pick-to: 6.2 Change-Id: I9eaacfbf860d8a4d03c2044b41de5d84139b3b17 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'examples/multimediawidgets/camera/videosettings_mobile.ui')
-rw-r--r--examples/multimediawidgets/camera/videosettings_mobile.ui54
1 files changed, 36 insertions, 18 deletions
diff --git a/examples/multimediawidgets/camera/videosettings_mobile.ui b/examples/multimediawidgets/camera/videosettings_mobile.ui
index 99819df05..6584f07f9 100644
--- a/examples/multimediawidgets/camera/videosettings_mobile.ui
+++ b/examples/multimediawidgets/camera/videosettings_mobile.ui
@@ -106,37 +106,34 @@
<string>Video</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
- <item row="1" column="0" colspan="2">
- <widget class="QComboBox" name="videoResolutionBox"/>
- </item>
- <item row="4" column="0" colspan="2">
- <widget class="QLabel" name="label_6">
+ <item row="2" column="0">
+ <widget class="QLabel" name="label">
<property name="text">
- <string>Video Codec:</string>
+ <string>Frames per second:</string>
</property>
</widget>
</item>
- <item row="2" column="0" colspan="2">
- <widget class="QLabel" name="label_9">
+ <item row="6" column="0" colspan="2">
+ <widget class="QComboBox" name="videoCodecBox"/>
+ </item>
+ <item row="0" column="0" colspan="2">
+ <widget class="QLabel" name="label_8">
<property name="text">
- <string>Framerate:</string>
+ <string>Camera Format:</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
- <widget class="QComboBox" name="videoCodecBox"/>
- </item>
- <item row="3" column="0" colspan="2">
- <widget class="QComboBox" name="videoFramerateBox"/>
- </item>
- <item row="0" column="0" colspan="2">
- <widget class="QLabel" name="label_8">
+ <widget class="QLabel" name="label_6">
<property name="text">
- <string>Resolution:</string>
+ <string>Video Codec:</string>
</property>
</widget>
</item>
- <item row="6" column="0">
+ <item row="1" column="0" colspan="2">
+ <widget class="QComboBox" name="videoFormatBox"/>
+ </item>
+ <item row="7" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -146,6 +143,27 @@
</property>
</widget>
</item>
+ <item row="3" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QSpinBox" name="fpsSpinBox">
+ <property name="minimum">
+ <number>8</number>
+ </property>
+ <property name="maximum">
+ <number>30</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSlider" name="fpsSlider">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
</layout>
</widget>
</item>