diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-08-08 00:26:57 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-08-08 00:26:57 +0000 |
| commit | 79454ef9fad4f80b059b77c1ad3cca82bf7f7a43 (patch) | |
| tree | add3245672d29123a94400221066a154ca5d7124 /ui/qt/main_welcome.ui | |
| parent | 786adc8522ab074a092ad4c61fbd19d8e728e101 (diff) | |
| download | wireshark-79454ef9fad4f80b059b77c1ad3cca82bf7f7a43.tar.gz | |
Add initial capture filter support.
Add CaptureFilterCombo and CaptureFilterEdit classes, similar to their
display filter counterparts. Add a CaptureFilterSyntaxWorker class which
runs a syntax check in a background thread similar to the threaded code
in capture_dlg.c. Add a bunch of related signal and slot plumbing. Other
minor fixups.
svn path=/trunk/; revision=51200
Diffstat (limited to 'ui/qt/main_welcome.ui')
| -rw-r--r-- | ui/qt/main_welcome.ui | 112 |
1 files changed, 85 insertions, 27 deletions
diff --git a/ui/qt/main_welcome.ui b/ui/qt/main_welcome.ui index 284d4bcb5c..c9044a8dc6 100644 --- a/ui/qt/main_welcome.ui +++ b/ui/qt/main_welcome.ui @@ -36,35 +36,88 @@ <property name="currentIndex"> <number>0</number> </property> - <widget class="InterfaceTree" name="interfaceTree"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="horizontalScrollBarPolicy"> - <enum>Qt::ScrollBarAlwaysOff</enum> - </property> - <property name="uniformRowHeights"> - <bool>true</bool> - </property> - <property name="columnCount"> - <number>2</number> - </property> - <attribute name="headerVisible"> - <bool>false</bool> - </attribute> - <column> - <property name="text"> - <string notr="true">1</string> + <widget class="QWidget" name="captureContainer"> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> </property> - </column> - <column> - <property name="text"> - <string notr="true">2</string> + <property name="rightMargin"> + <number>0</number> </property> - </column> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <widget class="QWidget" name="captureFilterLayout" native="true"> + <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Capture filter:</string> + </property> + </widget> + </item> + <item> + <widget class="CaptureFilterCombo" name="captureFilterComboBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="InterfaceTree" name="interfaceTree"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="horizontalScrollBarPolicy"> + <enum>Qt::ScrollBarAlwaysOff</enum> + </property> + <property name="uniformRowHeights"> + <bool>true</bool> + </property> + <property name="columnCount"> + <number>2</number> + </property> + <attribute name="headerVisible"> + <bool>false</bool> + </attribute> + <column> + <property name="text"> + <string notr="true">1</string> + </property> + </column> + <column> + <property name="text"> + <string notr="true">2</string> + </property> + </column> + </widget> + </item> + </layout> </widget> <widget class="QListWidget" name="recentList"> <property name="sizePolicy"> @@ -153,6 +206,11 @@ more about Wireshark</string> <extends>QTreeWidget</extends> <header>interface_tree.h</header> </customwidget> + <customwidget> + <class>CaptureFilterCombo</class> + <extends>QComboBox</extends> + <header>capture_filter_combo.h</header> + </customwidget> </customwidgets> <resources/> <connections/> |