diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-10-28 14:41:59 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-10-29 19:00:34 +0000 |
| commit | f449dcd8a590416aa33e5314f3db2bfc00134e9c (patch) | |
| tree | e573122e7046692099942111d50a751cc5078798 /ui/qt/main_window.ui | |
| parent | bd4f414593f2d463f4e36427da335923f141e264 (diff) | |
| download | wireshark-f449dcd8a590416aa33e5314f3db2bfc00134e9c.tar.gz | |
Qt: Add the ability to add filter expressions.
Add a "+" icon to the display filter toolbar which allows the addition
of a new filter expression button. (Hopefully this will be the last main
window UI change before 2.0.)
Change-Id: I52bf56bf699dddb7b387b9f4de1bf8b35eb3c4ce
Reviewed-on: https://code.wireshark.org/review/11375
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/main_window.ui')
| -rw-r--r-- | ui/qt/main_window.ui | 38 |
1 files changed, 35 insertions, 3 deletions
diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui index 761f160cb1..3ee4ffadbd 100644 --- a/ui/qt/main_window.ui +++ b/ui/qt/main_window.ui @@ -101,6 +101,9 @@ <widget class="PreferenceEditorFrame" name="preferenceEditorFrame"/> </item> <item> + <widget class="FilterExpressionFrame" name="filterExpressionFrame"/> + </item> + <item> <widget class="QStackedWidget" name="mainStack"> <property name="enabled"> <bool>true</bool> @@ -698,6 +701,12 @@ <property name="movable"> <bool>false</bool> </property> + <property name="iconSize"> + <size> + <width>14</width> + <height>14</height> + </size> + </property> <attribute name="toolBarArea"> <enum>TopToolBarArea</enum> </attribute> @@ -705,6 +714,8 @@ <bool>true</bool> </attribute> <addaction name="actionDisplayFilterExpression"/> + <addaction name="separator"/> + <addaction name="actionNewDisplayFilterExpression"/> </widget> <widget class="QToolBar" name="wirelessToolBar"> <property name="windowTitle"> @@ -1240,12 +1251,12 @@ <property name="text"> <string>As Filter</string> </property> - <property name="shortcut"> - <string>Ctrl+Shift+C</string> - </property> <property name="toolTip"> <string>Copy this item as a display filter</string> </property> + <property name="shortcut"> + <string>Ctrl+Shift+C</string> + </property> </action> <action name="actionAnalyzeAAFSelected"> <property name="text"> @@ -2806,6 +2817,21 @@ <string>Show IEEE 802.11 wireless LAN statistics.</string> </property> </action> + <action name="actionNewDisplayFilterExpression"> + <property name="icon"> + <iconset resource="../../image/toolbar.qrc"> + <normaloff>:/stock/plus-8.png</normaloff>:/stock/plus-8.png</iconset> + </property> + <property name="text"> + <string>Add a filter button</string> + </property> + <property name="iconText"> + <string>Expression…</string> + </property> + <property name="toolTip"> + <string>Add a display filter button.</string> + </property> + </action> </widget> <layoutdefault spacing="6" margin="11"/> <customwidgets> @@ -2849,6 +2875,12 @@ <header>address_editor_frame.h</header> <container>1</container> </customwidget> + <customwidget> + <class>FilterExpressionFrame</class> + <extends>QFrame</extends> + <header>filter_expression_frame.h</header> + <container>1</container> + </customwidget> </customwidgets> <resources> <include location="../../image/toolbar.qrc"/> |