diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-06 11:41:16 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-06 11:41:16 +0200 |
| commit | 3a54a111567370ecf903704d702d12736b693a8e (patch) | |
| tree | 1981d1bb3a97165d954ed8856061bb44d88fdd7c /ftnoir_tracker_ht/ht-trackercontrols.ui | |
| parent | f58efb5c2c51e5866d4640036865792b822641f6 (diff) | |
| parent | fcb8ca75c0c274be2321f0ba91e9f129ae63e354 (diff) | |
Merge branch 'unstable' into trackhat-ui
Diffstat (limited to 'ftnoir_tracker_ht/ht-trackercontrols.ui')
| -rw-r--r-- | ftnoir_tracker_ht/ht-trackercontrols.ui | 60 |
1 files changed, 37 insertions, 23 deletions
diff --git a/ftnoir_tracker_ht/ht-trackercontrols.ui b/ftnoir_tracker_ht/ht-trackercontrols.ui index 0b94ffc5..dd5e57f3 100644 --- a/ftnoir_tracker_ht/ht-trackercontrols.ui +++ b/ftnoir_tracker_ht/ht-trackercontrols.ui @@ -10,7 +10,7 @@ <x>0</x> <y>0</y> <width>354</width> - <height>158</height> + <height>179</height> </rect> </property> <property name="sizePolicy"> @@ -29,6 +29,13 @@ <string>HT tracker settings</string> </property> <layout class="QGridLayout" name="gridLayout"> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Frames per second</string> + </property> + </widget> + </item> <item row="0" column="1"> <widget class="QDoubleSpinBox" name="cameraFOV"> <property name="locale"> @@ -52,13 +59,6 @@ </property> </widget> </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>Frames per second</string> - </property> - </widget> - </item> <item row="1" column="1"> <widget class="QComboBox" name="cameraFPS"> <item> @@ -88,23 +88,9 @@ </item> </widget> </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>Camera name</string> - </property> - </widget> - </item> <item row="2" column="1"> <widget class="QComboBox" name="cameraName"/> </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_4"> - <property name="text"> - <string>Resolution</string> - </property> - </widget> - </item> <item row="3" column="1"> <widget class="QComboBox" name="resolution"> <item> @@ -129,13 +115,41 @@ </item> </widget> </item> - <item row="4" column="1"> + <item row="3" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Resolution</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Camera name</string> + </property> + </widget> + </item> + <item row="5" column="1"> <widget class="QDialogButtonBox" name="buttonBox"> <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> </item> + <item row="4" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>Camera settings</string> + </property> + </widget> + </item> + <item row="4" column="1"> + <widget class="QPushButton" name="camera_settings"> + <property name="text"> + <string>Open</string> + </property> + </widget> + </item> </layout> </widget> <resources/> |