aboutsummaryrefslogtreecommitdiffstats
path: root/image
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-02-06 18:22:54 +0000
committerGerald Combs <gerald@wireshark.org>2013-02-06 18:22:54 +0000
commit1c0deb0fc818252904878fe5419c75df3873a901 (patch)
treeb44a3986fa473e3c6872c21c1036abe9d573b225 /image
parentae527cbf109a054ba10e3e313fb42e0b2ec0f342 (diff)
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 'image')
-rw-r--r--image/dfilter_apply_disabled.pngbin0 -> 333 bytes
-rw-r--r--image/dfilter_bookmark_disabled.pngbin0 -> 634 bytes
-rw-r--r--image/display_filter.qrc2
3 files changed, 2 insertions, 0 deletions
diff --git a/image/dfilter_apply_disabled.png b/image/dfilter_apply_disabled.png
new file mode 100644
index 0000000000..0edb989ea8
--- /dev/null
+++ b/image/dfilter_apply_disabled.png
Binary files differ
diff --git a/image/dfilter_bookmark_disabled.png b/image/dfilter_bookmark_disabled.png
new file mode 100644
index 0000000000..10122534fa
--- /dev/null
+++ b/image/dfilter_bookmark_disabled.png
Binary files differ
diff --git a/image/display_filter.qrc b/image/display_filter.qrc
index 42dea62f52..ffd78c802f 100644
--- a/image/display_filter.qrc
+++ b/image/display_filter.qrc
@@ -12,5 +12,7 @@
<file>dfilter_apply_hover.png</file>
<file>dfilter_apply_normal.png</file>
<file>dfilter_apply_pressed.png</file>
+ <file>dfilter_apply_disabled.png</file>
+ <file>dfilter_bookmark_disabled.png</file>
</qresource>
</RCC>