diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-02-06 18:22:54 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-02-06 18:22:54 +0000 |
| commit | 1c0deb0fc818252904878fe5419c75df3873a901 (patch) | |
| tree | b44a3986fa473e3c6872c21c1036abe9d573b225 /ui/qt/preferences_dialog.ui | |
| parent | ae527cbf109a054ba10e3e313fb42e0b2ec0f342 (diff) | |
| download | wireshark-1c0deb0fc818252904878fe5419c75df3873a901.tar.gz | |
Add Filter Expressions^WButton^WShortcut^WBookmark preferences.
Add comments noting that
- We might want to do something different when the bookmark button is
pressed.
- The display filters (dfilters file) and gui.filter_expressions
preferences should be merged.
- Many buttons on Qt4 + OS X + unifiedTitleAndToolBarOnMac makes the
main window really wide.
Add a qstring_strdup convenience routine. Add "disabled" display filter
edit icons. Fix up whitespace and descriptions in a couple of places.
svn path=/trunk/; revision=47522
Diffstat (limited to 'ui/qt/preferences_dialog.ui')
| -rw-r--r-- | ui/qt/preferences_dialog.ui | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/ui/qt/preferences_dialog.ui b/ui/qt/preferences_dialog.ui index 1ea043de7b..32b359a95f 100644 --- a/ui/qt/preferences_dialog.ui +++ b/ui/qt/preferences_dialog.ui @@ -64,10 +64,7 @@ </item> <item> <property name="text"> - <string>Filter Expressions</string> - </property> - <property name="flags"> - <set>ItemIsDragEnabled|ItemIsUserCheckable</set> + <string>Filter Bookmarks</string> </property> </item> <item> @@ -112,7 +109,7 @@ <widget class="ColumnPreferencesFrame" name="columnFrame"/> <widget class="FontColorPreferencesFrame" name="fontandcolorFrame"/> <widget class="CapturePreferencesFrame" name="captureFrame"/> - <widget class="QFrame" name="filterFrame"/> + <widget class="FilterExpressionsPreferencesFrame" name="filterExpressonsFrame"/> <widget class="QFrame" name="nameresolutionFrame"/> <widget class="QFrame" name="protocolsFrame"/> <widget class="QFrame" name="statisticsFrame"/> @@ -220,6 +217,12 @@ <header>capture_preferences_frame.h</header> <container>1</container> </customwidget> + <customwidget> + <class>FilterExpressionsPreferencesFrame</class> + <extends>QFrame</extends> + <header>filter_expressions_preferences_frame.h</header> + <container>1</container> + </customwidget> </customwidgets> <resources/> <connections> |