diff options
| author | Jeff Morriss <jeff.morriss@netscout.com> | 2019-03-21 09:50:01 -0400 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2019-03-22 14:17:45 +0000 |
| commit | 13ca6fc38ec4e6dca4042c943ca6d1f7d87fa596 (patch) | |
| tree | 14c3137b331b31a8825f1a2631f8d2e3f7f63976 /ui/qt/capture_interfaces_dialog.ui | |
| parent | 429031b079353a2e909b115c4eadcf0844d76ab3 (diff) | |
Fix order of ring buffer and auto-stop items on the Capture Options page.
Apparently the order of the items defined here affects the order in which
order tab will cycle through them. See:
https://ask.wireshark.org/question/8010/wireshark-ring-buffer-settings-page-tab-sequence/
Sort the items by row and then by column; this gives a natural order when
tabbing through.
Change-Id: I1137ef59a3fbf506734d828d9bdfa87bddb96c3b
Reviewed-on: https://code.wireshark.org/review/32500
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
(cherry picked from commit 19bdf734f753713241adeccf7de0934a2d0c5032)
Reviewed-on: https://code.wireshark.org/review/32516
Diffstat (limited to 'ui/qt/capture_interfaces_dialog.ui')
| -rw-r--r-- | ui/qt/capture_interfaces_dialog.ui | 296 |
1 files changed, 148 insertions, 148 deletions
diff --git a/ui/qt/capture_interfaces_dialog.ui b/ui/qt/capture_interfaces_dialog.ui index 181f5df332..eb0b915f5a 100644 --- a/ui/qt/capture_interfaces_dialog.ui +++ b/ui/qt/capture_interfaces_dialog.ui @@ -189,13 +189,6 @@ <bool>false</bool> </property> <layout class="QGridLayout" name="gridLayout_3"> - <item row="0" column="2"> - <widget class="QPushButton" name="browseButton"> - <property name="text"> - <string>Browse…</string> - </property> - </widget> - </item> <item row="0" column="0"> <widget class="QLabel" name="label_2"> <property name="text"> @@ -206,6 +199,13 @@ <item row="0" column="1"> <widget class="QLineEdit" name="filenameLineEdit"/> </item> + <item row="0" column="2"> + <widget class="QPushButton" name="browseButton"> + <property name="text"> + <string>Browse…</string> + </property> + </widget> + </item> </layout> </widget> </item> @@ -275,25 +275,47 @@ </property> </spacer> </item> - <item row="2" column="0"> - <widget class="QCheckBox" name="MBCheckBox"> + <item row="1" column="0"> + <widget class="QCheckBox" name="PktCheckBox"> <property name="text"> <string/> </property> </widget> </item> - <item row="3" column="0"> - <widget class="QCheckBox" name="SecsCheckBox"> + <item row="1" column="1"> + <widget class="QSpinBox" name="PktSpinBox"> + <property name="toolTip"> + <string>Switch to the next file after the specified number of packets have been captured.</string> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::PlusMinus</enum> + </property> + <property name="maximum"> + <number>2147483647</number> + </property> + <property name="value"> + <number>100000</number> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QLabel" name="PktLabel"> + <property name="text"> + <string>packets</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QCheckBox" name="MBCheckBox"> <property name="text"> <string/> </property> </widget> </item> - <item row="3" column="1"> - <widget class="QSpinBox" name="SecsSpinBox"> + <item row="2" column="1"> + <widget class="QSpinBox" name="MBSpinBox"> <property name="toolTip"> - <string>If the selected file size is exceeded, capturing switches to the next file. -PLEASE NOTE: One option MUST be selected.</string> + <string><html><head/><body><p>If the selected file size is exceeded, capturing switches to the next file.</p><p>PLEASE NOTE: One option MUST be selected.</p></body></html></string> </property> <property name="wrapping"> <bool>true</bool> @@ -312,33 +334,41 @@ PLEASE NOTE: One option MUST be selected.</string> </property> </widget> </item> - <item row="3" column="2"> - <widget class="QComboBox" name="SecsComboBox"> + <item row="2" column="2"> + <widget class="QComboBox" name="MBComboBox"> <property name="toolTip"> <string>If the selected file size is exceeded, capturing switches to the next file. PLEASE NOTE: One option MUST be selected.</string> </property> <item> <property name="text"> - <string>seconds</string> + <string>kilobytes</string> </property> </item> <item> <property name="text"> - <string>minutes</string> + <string>megabytes</string> </property> </item> <item> <property name="text"> - <string>hours</string> + <string>gigabytes</string> </property> </item> </widget> </item> - <item row="2" column="1"> - <widget class="QSpinBox" name="MBSpinBox"> + <item row="3" column="0"> + <widget class="QCheckBox" name="SecsCheckBox"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QSpinBox" name="SecsSpinBox"> <property name="toolTip"> - <string><html><head/><body><p>If the selected file size is exceeded, capturing switches to the next file.</p><p>PLEASE NOTE: One option MUST be selected.</p></body></html></string> + <string>If the selected file size is exceeded, capturing switches to the next file. +PLEASE NOTE: One option MUST be selected.</string> </property> <property name="wrapping"> <bool>true</bool> @@ -357,59 +387,29 @@ PLEASE NOTE: One option MUST be selected.</string> </property> </widget> </item> - <item row="2" column="2"> - <widget class="QComboBox" name="MBComboBox"> + <item row="3" column="2"> + <widget class="QComboBox" name="SecsComboBox"> <property name="toolTip"> <string>If the selected file size is exceeded, capturing switches to the next file. PLEASE NOTE: One option MUST be selected.</string> </property> <item> <property name="text"> - <string>kilobytes</string> + <string>seconds</string> </property> </item> <item> <property name="text"> - <string>megabytes</string> + <string>minutes</string> </property> </item> <item> <property name="text"> - <string>gigabytes</string> + <string>hours</string> </property> </item> </widget> </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="PktCheckBox"> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QSpinBox" name="PktSpinBox"> - <property name="toolTip"> - <string>Switch to the next file after the specified number of packets have been captured.</string> - </property> - <property name="buttonSymbols"> - <enum>QAbstractSpinBox::PlusMinus</enum> - </property> - <property name="maximum"> - <number>2147483647</number> - </property> - <property name="value"> - <number>100000</number> - </property> - </widget> - </item> - <item row="1" column="2"> - <widget class="QLabel" name="PktLabel"> - <property name="text"> - <string>packets</string> - </property> - </widget> - </item> </layout> </widget> </item> @@ -611,6 +611,29 @@ PLEASE NOTE: One option MUST be selected.</string> <bool>true</bool> </property> <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="3" rowspan="4"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="0" column="0"> + <widget class="QCheckBox" name="stopPktCheckBox"> + <property name="toolTip"> + <string><html><head/><body><p>Stop capturing after the specified number of packets have been captured.</p></body></html></string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> <item row="0" column="1"> <widget class="QSpinBox" name="stopPktSpinBox"> <property name="sizePolicy"> @@ -633,10 +656,33 @@ PLEASE NOTE: One option MUST be selected.</string> </property> </widget> </item> - <item row="2" column="1"> - <widget class="QSpinBox" name="stopMBSpinBox"> + <item row="0" column="2"> + <widget class="QLabel" name="label_7"> + <property name="text"> + <string>packets</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="stopFilesCheckBox"> <property name="toolTip"> - <string>Stop capturing after the specified amount of data has been captured.</string> + <string><html><head/><body><p>Stop capturing after the specified number of files have been created.</p></body></html></string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QSpinBox" name="stopFilesSpinBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Stop capturing after the specified number of packets have been captured.</string> </property> <property name="buttonSymbols"> <enum>QAbstractSpinBox::PlusMinus</enum> @@ -649,62 +695,36 @@ PLEASE NOTE: One option MUST be selected.</string> </property> </widget> </item> - <item row="2" column="0"> - <widget class="QCheckBox" name="stopMBCheckBox"> - <property name="toolTip"> - <string><html><head/><body><p>Stop capturing after the specified amount of data has been captured.</p></body></html></string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="0" column="2"> - <widget class="QLabel" name="label_7"> + <item row="1" column="2"> + <widget class="QLabel" name="label_8"> <property name="text"> - <string>packets</string> + <string>files</string> </property> </widget> </item> - <item row="3" column="0"> - <widget class="QCheckBox" name="stopSecsCheckBox"> + <item row="2" column="0"> + <widget class="QCheckBox" name="stopMBCheckBox"> <property name="toolTip"> - <string>Stop capturing after the specified amount of time has passed.</string> + <string><html><head/><body><p>Stop capturing after the specified amount of data has been captured.</p></body></html></string> </property> <property name="text"> <string/> </property> </widget> </item> - <item row="3" column="2"> - <widget class="QComboBox" name="stopSecsComboBox"> + <item row="2" column="1"> + <widget class="QSpinBox" name="stopMBSpinBox"> <property name="toolTip"> - <string>Stop capturing after the specified amount of time has passed.</string> + <string>Stop capturing after the specified amount of data has been captured.</string> </property> - <item> - <property name="text"> - <string>seconds</string> - </property> - </item> - <item> - <property name="text"> - <string>minutes</string> - </property> - </item> - <item> - <property name="text"> - <string>hours</string> - </property> - </item> - </widget> - </item> - <item row="0" column="0"> - <widget class="QCheckBox" name="stopPktCheckBox"> - <property name="toolTip"> - <string><html><head/><body><p>Stop capturing after the specified number of packets have been captured.</p></body></html></string> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::PlusMinus</enum> </property> - <property name="text"> - <string/> + <property name="maximum"> + <number>2147483647</number> + </property> + <property name="value"> + <number>1</number> </property> </widget> </item> @@ -730,45 +750,20 @@ PLEASE NOTE: One option MUST be selected.</string> </item> </widget> </item> - <item row="3" column="1"> - <widget class="QSpinBox" name="stopSecsSpinBox"> + <item row="3" column="0"> + <widget class="QCheckBox" name="stopSecsCheckBox"> <property name="toolTip"> <string>Stop capturing after the specified amount of time has passed.</string> </property> - <property name="buttonSymbols"> - <enum>QAbstractSpinBox::PlusMinus</enum> - </property> - <property name="maximum"> - <number>2147483647</number> - </property> - <property name="value"> - <number>1</number> + <property name="text"> + <string/> </property> </widget> </item> - <item row="0" column="3" rowspan="4"> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="1"> - <widget class="QSpinBox" name="stopFilesSpinBox"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> + <item row="3" column="1"> + <widget class="QSpinBox" name="stopSecsSpinBox"> <property name="toolTip"> - <string>Stop capturing after the specified number of packets have been captured.</string> + <string>Stop capturing after the specified amount of time has passed.</string> </property> <property name="buttonSymbols"> <enum>QAbstractSpinBox::PlusMinus</enum> @@ -781,21 +776,26 @@ PLEASE NOTE: One option MUST be selected.</string> </property> </widget> </item> - <item row="1" column="2"> - <widget class="QLabel" name="label_8"> - <property name="text"> - <string>files</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="stopFilesCheckBox"> + <item row="3" column="2"> + <widget class="QComboBox" name="stopSecsComboBox"> <property name="toolTip"> - <string><html><head/><body><p>Stop capturing after the specified number of files have been created.</p></body></html></string> - </property> - <property name="text"> - <string/> + <string>Stop capturing after the specified amount of time has passed.</string> </property> + <item> + <property name="text"> + <string>seconds</string> + </property> + </item> + <item> + <property name="text"> + <string>minutes</string> + </property> + </item> + <item> + <property name="text"> + <string>hours</string> + </property> + </item> </widget> </item> </layout> |