From 0e9389bb47e54ff0f4bbc288cb1adfde4a9ed045 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Wed, 2 Sep 2015 14:51:33 -0700 Subject: Display filter edit updates. Have the bookmark button operate on saved display filters, similar to the "Filter:" button in the GTK+ UI. Expose the saved display filter list via a popup menu. Update the display filter icons. Make the "Apply" button wider. Remove the old icon assets. Add a StockIconToolButton class along with note explaining why it's necessary. Rename the "Filter Bookmarks" preference to "Filter Shortcuts". Suggestion for a better name are welcome. Change-Id: I0082d3f01b017253fa75e51cbff9beb17c41a209 Reviewed-on: https://code.wireshark.org/review/10390 Reviewed-by: Gerald Combs Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot --- image/dfilter_apply_disabled.png | Bin 181 -> 0 bytes image/dfilter_apply_hover.png | Bin 182 -> 0 bytes image/dfilter_apply_normal.png | Bin 182 -> 0 bytes image/dfilter_apply_pressed.png | Bin 182 -> 0 bytes image/dfilter_bookmark_disabled.png | Bin 420 -> 0 bytes image/dfilter_bookmark_hover.png | Bin 384 -> 0 bytes image/dfilter_bookmark_normal.png | Bin 384 -> 0 bytes image/dfilter_bookmark_pressed.png | Bin 384 -> 0 bytes image/dfilter_dropdown.png | Bin 123 -> 0 bytes image/dfilter_erase_active.png | Bin 174 -> 0 bytes image/dfilter_erase_normal.png | Bin 184 -> 0 bytes image/dfilter_erase_selected.png | Bin 174 -> 0 bytes image/dfilter_refresh_active.png | Bin 267 -> 0 bytes image/dfilter_refresh_normal.png | Bin 262 -> 0 bytes image/display_filter.qrc | 18 --- image/toolbar.qrc | 26 ++++ image/toolbar/14x14/x-filter-bookmark.active.png | Bin 0 -> 254 bytes image/toolbar/14x14/x-filter-bookmark.active.svg | 109 +++++++++++++++++ .../toolbar/14x14/x-filter-bookmark.active@2x.png | Bin 0 -> 403 bytes image/toolbar/14x14/x-filter-bookmark.png | Bin 0 -> 238 bytes image/toolbar/14x14/x-filter-bookmark.selected.png | Bin 0 -> 258 bytes image/toolbar/14x14/x-filter-bookmark.selected.svg | 109 +++++++++++++++++ .../14x14/x-filter-bookmark.selected@2x.png | Bin 0 -> 400 bytes image/toolbar/14x14/x-filter-bookmark.svg | 109 +++++++++++++++++ image/toolbar/14x14/x-filter-bookmark@2x.png | Bin 0 -> 392 bytes image/toolbar/14x14/x-filter-clear.active.png | Bin 0 -> 285 bytes image/toolbar/14x14/x-filter-clear.active.svg | 126 +++++++++++++++++++ image/toolbar/14x14/x-filter-clear.active@2x.png | Bin 0 -> 504 bytes image/toolbar/14x14/x-filter-clear.png | Bin 0 -> 277 bytes image/toolbar/14x14/x-filter-clear.selected.png | Bin 0 -> 287 bytes image/toolbar/14x14/x-filter-clear.selected.svg | 126 +++++++++++++++++++ image/toolbar/14x14/x-filter-clear.selected@2x.png | Bin 0 -> 508 bytes image/toolbar/14x14/x-filter-clear.svg | 125 +++++++++++++++++++ image/toolbar/14x14/x-filter-clear@2x.png | Bin 0 -> 480 bytes image/toolbar/14x14/x-filter-dropdown.png | Bin 0 -> 120 bytes image/toolbar/14x14/x-filter-dropdown.svg | 107 +++++++++++++++++ image/toolbar/14x14/x-filter-dropdown@2x.png | Bin 0 -> 146 bytes .../14x14/x-filter-matching-bookmark.active.png | Bin 0 -> 241 bytes .../14x14/x-filter-matching-bookmark.active.svg | 109 +++++++++++++++++ .../14x14/x-filter-matching-bookmark.active@2x.png | Bin 0 -> 406 bytes image/toolbar/14x14/x-filter-matching-bookmark.png | Bin 0 -> 237 bytes .../14x14/x-filter-matching-bookmark.selected.png | Bin 0 -> 236 bytes .../14x14/x-filter-matching-bookmark.selected.svg | 109 +++++++++++++++++ .../x-filter-matching-bookmark.selected@2x.png | Bin 0 -> 417 bytes image/toolbar/14x14/x-filter-matching-bookmark.svg | 109 +++++++++++++++++ .../14x14/x-filter-matching-bookmark@2x.png | Bin 0 -> 385 bytes image/toolbar/24x14/x-filter-apply.active.png | Bin 0 -> 388 bytes image/toolbar/24x14/x-filter-apply.active.svg | 128 ++++++++++++++++++++ image/toolbar/24x14/x-filter-apply.active@2x.png | Bin 0 -> 632 bytes image/toolbar/24x14/x-filter-apply.png | Bin 0 -> 365 bytes image/toolbar/24x14/x-filter-apply.selected.png | Bin 0 -> 395 bytes image/toolbar/24x14/x-filter-apply.selected.svg | 128 ++++++++++++++++++++ image/toolbar/24x14/x-filter-apply.selected@2x.png | Bin 0 -> 647 bytes image/toolbar/24x14/x-filter-apply.svg | 128 ++++++++++++++++++++ image/toolbar/24x14/x-filter-apply@2x.png | Bin 0 -> 583 bytes image/toolbar/svg-to-png.sh | 34 ++++-- image/toolbar/svg/x-filter-apply.svg | 133 +++++++++++++++++++++ image/toolbar/svg/x-filter-bookmark.svg | 77 ++++++++++++ image/toolbar/svg/x-filter-clear.svg | 77 ++++++++++++ 59 files changed, 1860 insertions(+), 27 deletions(-) delete mode 100644 image/dfilter_apply_disabled.png delete mode 100644 image/dfilter_apply_hover.png delete mode 100644 image/dfilter_apply_normal.png delete mode 100644 image/dfilter_apply_pressed.png delete mode 100644 image/dfilter_bookmark_disabled.png delete mode 100644 image/dfilter_bookmark_hover.png delete mode 100644 image/dfilter_bookmark_normal.png delete mode 100644 image/dfilter_bookmark_pressed.png delete mode 100644 image/dfilter_dropdown.png delete mode 100644 image/dfilter_erase_active.png delete mode 100644 image/dfilter_erase_normal.png delete mode 100644 image/dfilter_erase_selected.png delete mode 100644 image/dfilter_refresh_active.png delete mode 100644 image/dfilter_refresh_normal.png delete mode 100644 image/display_filter.qrc create mode 100644 image/toolbar/14x14/x-filter-bookmark.active.png create mode 100644 image/toolbar/14x14/x-filter-bookmark.active.svg create mode 100644 image/toolbar/14x14/x-filter-bookmark.active@2x.png create mode 100644 image/toolbar/14x14/x-filter-bookmark.png create mode 100644 image/toolbar/14x14/x-filter-bookmark.selected.png create mode 100644 image/toolbar/14x14/x-filter-bookmark.selected.svg create mode 100644 image/toolbar/14x14/x-filter-bookmark.selected@2x.png create mode 100644 image/toolbar/14x14/x-filter-bookmark.svg create mode 100644 image/toolbar/14x14/x-filter-bookmark@2x.png create mode 100644 image/toolbar/14x14/x-filter-clear.active.png create mode 100644 image/toolbar/14x14/x-filter-clear.active.svg create mode 100644 image/toolbar/14x14/x-filter-clear.active@2x.png create mode 100644 image/toolbar/14x14/x-filter-clear.png create mode 100644 image/toolbar/14x14/x-filter-clear.selected.png create mode 100644 image/toolbar/14x14/x-filter-clear.selected.svg create mode 100644 image/toolbar/14x14/x-filter-clear.selected@2x.png create mode 100644 image/toolbar/14x14/x-filter-clear.svg create mode 100644 image/toolbar/14x14/x-filter-clear@2x.png create mode 100644 image/toolbar/14x14/x-filter-dropdown.png create mode 100644 image/toolbar/14x14/x-filter-dropdown.svg create mode 100644 image/toolbar/14x14/x-filter-dropdown@2x.png create mode 100644 image/toolbar/14x14/x-filter-matching-bookmark.active.png create mode 100644 image/toolbar/14x14/x-filter-matching-bookmark.active.svg create mode 100644 image/toolbar/14x14/x-filter-matching-bookmark.active@2x.png create mode 100644 image/toolbar/14x14/x-filter-matching-bookmark.png create mode 100644 image/toolbar/14x14/x-filter-matching-bookmark.selected.png create mode 100644 image/toolbar/14x14/x-filter-matching-bookmark.selected.svg create mode 100644 image/toolbar/14x14/x-filter-matching-bookmark.selected@2x.png create mode 100644 image/toolbar/14x14/x-filter-matching-bookmark.svg create mode 100644 image/toolbar/14x14/x-filter-matching-bookmark@2x.png create mode 100644 image/toolbar/24x14/x-filter-apply.active.png create mode 100644 image/toolbar/24x14/x-filter-apply.active.svg create mode 100644 image/toolbar/24x14/x-filter-apply.active@2x.png create mode 100644 image/toolbar/24x14/x-filter-apply.png create mode 100644 image/toolbar/24x14/x-filter-apply.selected.png create mode 100644 image/toolbar/24x14/x-filter-apply.selected.svg create mode 100644 image/toolbar/24x14/x-filter-apply.selected@2x.png create mode 100644 image/toolbar/24x14/x-filter-apply.svg create mode 100644 image/toolbar/24x14/x-filter-apply@2x.png create mode 100644 image/toolbar/svg/x-filter-apply.svg create mode 100644 image/toolbar/svg/x-filter-bookmark.svg create mode 100644 image/toolbar/svg/x-filter-clear.svg (limited to 'image') diff --git a/image/dfilter_apply_disabled.png b/image/dfilter_apply_disabled.png deleted file mode 100644 index d6d6b55cff..0000000000 Binary files a/image/dfilter_apply_disabled.png and /dev/null differ diff --git a/image/dfilter_apply_hover.png b/image/dfilter_apply_hover.png deleted file mode 100644 index f1fea1a0f0..0000000000 Binary files a/image/dfilter_apply_hover.png and /dev/null differ diff --git a/image/dfilter_apply_normal.png b/image/dfilter_apply_normal.png deleted file mode 100644 index c6d405b98e..0000000000 Binary files a/image/dfilter_apply_normal.png and /dev/null differ diff --git a/image/dfilter_apply_pressed.png b/image/dfilter_apply_pressed.png deleted file mode 100644 index a1e83b8711..0000000000 Binary files a/image/dfilter_apply_pressed.png and /dev/null differ diff --git a/image/dfilter_bookmark_disabled.png b/image/dfilter_bookmark_disabled.png deleted file mode 100644 index d9ff66921d..0000000000 Binary files a/image/dfilter_bookmark_disabled.png and /dev/null differ diff --git a/image/dfilter_bookmark_hover.png b/image/dfilter_bookmark_hover.png deleted file mode 100644 index 83dab989ab..0000000000 Binary files a/image/dfilter_bookmark_hover.png and /dev/null differ diff --git a/image/dfilter_bookmark_normal.png b/image/dfilter_bookmark_normal.png deleted file mode 100644 index a9381bc48a..0000000000 Binary files a/image/dfilter_bookmark_normal.png and /dev/null differ diff --git a/image/dfilter_bookmark_pressed.png b/image/dfilter_bookmark_pressed.png deleted file mode 100644 index d46624b011..0000000000 Binary files a/image/dfilter_bookmark_pressed.png and /dev/null differ diff --git a/image/dfilter_dropdown.png b/image/dfilter_dropdown.png deleted file mode 100644 index d392524448..0000000000 Binary files a/image/dfilter_dropdown.png and /dev/null differ diff --git a/image/dfilter_erase_active.png b/image/dfilter_erase_active.png deleted file mode 100644 index e5b9a4b577..0000000000 Binary files a/image/dfilter_erase_active.png and /dev/null differ diff --git a/image/dfilter_erase_normal.png b/image/dfilter_erase_normal.png deleted file mode 100644 index 4b0e187758..0000000000 Binary files a/image/dfilter_erase_normal.png and /dev/null differ diff --git a/image/dfilter_erase_selected.png b/image/dfilter_erase_selected.png deleted file mode 100644 index 6824b69297..0000000000 Binary files a/image/dfilter_erase_selected.png and /dev/null differ diff --git a/image/dfilter_refresh_active.png b/image/dfilter_refresh_active.png deleted file mode 100644 index 21cd0f5690..0000000000 Binary files a/image/dfilter_refresh_active.png and /dev/null differ diff --git a/image/dfilter_refresh_normal.png b/image/dfilter_refresh_normal.png deleted file mode 100644 index 21a6275fe3..0000000000 Binary files a/image/dfilter_refresh_normal.png and /dev/null differ diff --git a/image/display_filter.qrc b/image/display_filter.qrc deleted file mode 100644 index ffd78c802f..0000000000 --- a/image/display_filter.qrc +++ /dev/null @@ -1,18 +0,0 @@ - - - dfilter_dropdown.png - dfilter_erase_active.png - dfilter_erase_normal.png - dfilter_erase_selected.png - dfilter_refresh_active.png - dfilter_refresh_normal.png - dfilter_bookmark_normal.png - dfilter_bookmark_hover.png - dfilter_bookmark_pressed.png - dfilter_apply_hover.png - dfilter_apply_normal.png - dfilter_apply_pressed.png - dfilter_apply_disabled.png - dfilter_bookmark_disabled.png - - diff --git a/image/toolbar.qrc b/image/toolbar.qrc index dc72c68dc4..f4b9ec7208 100644 --- a/image/toolbar.qrc +++ b/image/toolbar.qrc @@ -11,6 +11,26 @@ toolbar/12x12/media-playback-start.png toolbar/12x12/media-playback-start@2x.png + toolbar/14x14/x-filter-clear.png + toolbar/14x14/x-filter-clear@2x.png + toolbar/14x14/x-filter-clear.active.png + toolbar/14x14/x-filter-clear.active@2x.png + toolbar/14x14/x-filter-clear.selected.png + toolbar/14x14/x-filter-clear.selected@2x.png + toolbar/14x14/x-filter-bookmark.png + toolbar/14x14/x-filter-bookmark@2x.png + toolbar/14x14/x-filter-bookmark.active.png + toolbar/14x14/x-filter-bookmark.active@2x.png + toolbar/14x14/x-filter-bookmark.selected.png + toolbar/14x14/x-filter-bookmark.selected@2x.png + toolbar/14x14/x-filter-dropdown.png + toolbar/14x14/x-filter-dropdown@2x.png + toolbar/14x14/x-filter-matching-bookmark.png + toolbar/14x14/x-filter-matching-bookmark@2x.png + toolbar/14x14/x-filter-matching-bookmark.active.png + toolbar/14x14/x-filter-matching-bookmark.active@2x.png + toolbar/14x14/x-filter-matching-bookmark.selected.png + toolbar/14x14/x-filter-matching-bookmark.selected@2x.png toolbar/16x16/edit-find.png toolbar/16x16/edit-find@2x.png toolbar/16x16/go-first.png @@ -51,6 +71,12 @@ toolbar/16x16/zoom-original@2x.png toolbar/16x16/zoom-out.png toolbar/16x16/zoom-out@2x.png + toolbar/24x14/x-filter-apply.png + toolbar/24x14/x-filter-apply@2x.png + toolbar/24x14/x-filter-apply.active.png + toolbar/24x14/x-filter-apply.active@2x.png + toolbar/24x14/x-filter-apply.selected.png + toolbar/24x14/x-filter-apply.selected@2x.png toolbar/24x24/edit-find.png toolbar/24x24/edit-find@2x.png toolbar/24x24/go-first.png diff --git a/image/toolbar/14x14/x-filter-bookmark.active.png b/image/toolbar/14x14/x-filter-bookmark.active.png new file mode 100644 index 0000000000..a9bf35a7dd Binary files /dev/null and b/image/toolbar/14x14/x-filter-bookmark.active.png differ diff --git a/image/toolbar/14x14/x-filter-bookmark.active.svg b/image/toolbar/14x14/x-filter-bookmark.active.svg new file mode 100644 index 0000000000..59336bb970 --- /dev/null +++ b/image/toolbar/14x14/x-filter-bookmark.active.svg @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/image/toolbar/14x14/x-filter-bookmark.active@2x.png b/image/toolbar/14x14/x-filter-bookmark.active@2x.png new file mode 100644 index 0000000000..1988700e55 Binary files /dev/null and b/image/toolbar/14x14/x-filter-bookmark.active@2x.png differ diff --git a/image/toolbar/14x14/x-filter-bookmark.png b/image/toolbar/14x14/x-filter-bookmark.png new file mode 100644 index 0000000000..fbeeb3466d Binary files /dev/null and b/image/toolbar/14x14/x-filter-bookmark.png differ diff --git a/image/toolbar/14x14/x-filter-bookmark.selected.png b/image/toolbar/14x14/x-filter-bookmark.selected.png new file mode 100644 index 0000000000..0bb4dcd817 Binary files /dev/null and b/image/toolbar/14x14/x-filter-bookmark.selected.png differ diff --git a/image/toolbar/14x14/x-filter-bookmark.selected.svg b/image/toolbar/14x14/x-filter-bookmark.selected.svg new file mode 100644 index 0000000000..3690c887a3 --- /dev/null +++ b/image/toolbar/14x14/x-filter-bookmark.selected.svg @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/image/toolbar/14x14/x-filter-bookmark.selected@2x.png b/image/toolbar/14x14/x-filter-bookmark.selected@2x.png new file mode 100644 index 0000000000..ae64fd7a86 Binary files /dev/null and b/image/toolbar/14x14/x-filter-bookmark.selected@2x.png differ diff --git a/image/toolbar/14x14/x-filter-bookmark.svg b/image/toolbar/14x14/x-filter-bookmark.svg new file mode 100644 index 0000000000..1945279613 --- /dev/null +++ b/image/toolbar/14x14/x-filter-bookmark.svg @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/image/toolbar/14x14/x-filter-bookmark@2x.png b/image/toolbar/14x14/x-filter-bookmark@2x.png new file mode 100644 index 0000000000..1ca597cdfc Binary files /dev/null and b/image/toolbar/14x14/x-filter-bookmark@2x.png differ diff --git a/image/toolbar/14x14/x-filter-clear.active.png b/image/toolbar/14x14/x-filter-clear.active.png new file mode 100644 index 0000000000..2c0ed113db Binary files /dev/null and b/image/toolbar/14x14/x-filter-clear.active.png differ diff --git a/image/toolbar/14x14/x-filter-clear.active.svg b/image/toolbar/14x14/x-filter-clear.active.svg new file mode 100644 index 0000000000..3450bcf533 --- /dev/null +++ b/image/toolbar/14x14/x-filter-clear.active.svg @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/image/toolbar/14x14/x-filter-clear.active@2x.png b/image/toolbar/14x14/x-filter-clear.active@2x.png new file mode 100644 index 0000000000..8b36013925 Binary files /dev/null and b/image/toolbar/14x14/x-filter-clear.active@2x.png differ diff --git a/image/toolbar/14x14/x-filter-clear.png b/image/toolbar/14x14/x-filter-clear.png new file mode 100644 index 0000000000..85ea100b0b Binary files /dev/null and b/image/toolbar/14x14/x-filter-clear.png differ diff --git a/image/toolbar/14x14/x-filter-clear.selected.png b/image/toolbar/14x14/x-filter-clear.selected.png new file mode 100644 index 0000000000..d94d4f99db Binary files /dev/null and b/image/toolbar/14x14/x-filter-clear.selected.png differ diff --git a/image/toolbar/14x14/x-filter-clear.selected.svg b/image/toolbar/14x14/x-filter-clear.selected.svg new file mode 100644 index 0000000000..ea77368620 --- /dev/null +++ b/image/toolbar/14x14/x-filter-clear.selected.svg @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/image/toolbar/14x14/x-filter-clear.selected@2x.png b/image/toolbar/14x14/x-filter-clear.selected@2x.png new file mode 100644 index 0000000000..2e56edb081 Binary files /dev/null and b/image/toolbar/14x14/x-filter-clear.selected@2x.png differ diff --git a/image/toolbar/14x14/x-filter-clear.svg b/image/toolbar/14x14/x-filter-clear.svg new file mode 100644 index 0000000000..01e74d9c56 --- /dev/null +++ b/image/toolbar/14x14/x-filter-clear.svg @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/image/toolbar/14x14/x-filter-clear@2x.png b/image/toolbar/14x14/x-filter-clear@2x.png new file mode 100644 index 0000000000..492948c900 Binary files /dev/null and b/image/toolbar/14x14/x-filter-clear@2x.png differ diff --git a/image/toolbar/14x14/x-filter-dropdown.png b/image/toolbar/14x14/x-filter-dropdown.png new file mode 100644 index 0000000000..a994dccf52 Binary files /dev/null and b/image/toolbar/14x14/x-filter-dropdown.png differ diff --git a/image/toolbar/14x14/x-filter-dropdown.svg b/image/toolbar/14x14/x-filter-dropdown.svg new file mode 100644 index 0000000000..6346f18c3f --- /dev/null +++ b/image/toolbar/14x14/x-filter-dropdown.svg @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/image/toolbar/14x14/x-filter-dropdown@2x.png b/image/toolbar/14x14/x-filter-dropdown@2x.png new file mode 100644 index 0000000000..162e4c817e Binary files /dev/null and b/image/toolbar/14x14/x-filter-dropdown@2x.png differ diff --git a/image/toolbar/14x14/x-filter-matching-bookmark.active.png b/image/toolbar/14x14/x-filter-matching-bookmark.active.png new file mode 100644 index 0000000000..f4b3ef9560 Binary files /dev/null and b/image/toolbar/14x14/x-filter-matching-bookmark.active.png differ diff --git a/image/toolbar/14x14/x-filter-matching-bookmark.active.svg b/image/toolbar/14x14/x-filter-matching-bookmark.active.svg new file mode 100644 index 0000000000..1bcef4e69c --- /dev/null +++ b/image/toolbar/14x14/x-filter-matching-bookmark.active.svg @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/image/toolbar/14x14/x-filter-matching-bookmark.active@2x.png b/image/toolbar/14x14/x-filter-matching-bookmark.active@2x.png new file mode 100644 index 0000000000..cf58e3866a Binary files /dev/null and b/image/toolbar/14x14/x-filter-matching-bookmark.active@2x.png differ diff --git a/image/toolbar/14x14/x-filter-matching-bookmark.png b/image/toolbar/14x14/x-filter-matching-bookmark.png new file mode 100644 index 0000000000..1b055d7d49 Binary files /dev/null and b/image/toolbar/14x14/x-filter-matching-bookmark.png differ diff --git a/image/toolbar/14x14/x-filter-matching-bookmark.selected.png b/image/toolbar/14x14/x-filter-matching-bookmark.selected.png new file mode 100644 index 0000000000..90a2cfabeb Binary files /dev/null and b/image/toolbar/14x14/x-filter-matching-bookmark.selected.png differ diff --git a/image/toolbar/14x14/x-filter-matching-bookmark.selected.svg b/image/toolbar/14x14/x-filter-matching-bookmark.selected.svg new file mode 100644 index 0000000000..59a43a01df --- /dev/null +++ b/image/toolbar/14x14/x-filter-matching-bookmark.selected.svg @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/image/toolbar/14x14/x-filter-matching-bookmark.selected@2x.png b/image/toolbar/14x14/x-filter-matching-bookmark.selected@2x.png new file mode 100644 index 0000000000..209b1fa037 Binary files /dev/null and b/image/toolbar/14x14/x-filter-matching-bookmark.selected@2x.png differ diff --git a/image/toolbar/14x14/x-filter-matching-bookmark.svg b/image/toolbar/14x14/x-filter-matching-bookmark.svg new file mode 100644 index 0000000000..774970abeb --- /dev/null +++ b/image/toolbar/14x14/x-filter-matching-bookmark.svg @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/image/toolbar/14x14/x-filter-matching-bookmark@2x.png b/image/toolbar/14x14/x-filter-matching-bookmark@2x.png new file mode 100644 index 0000000000..2e5b6ead57 Binary files /dev/null and b/image/toolbar/14x14/x-filter-matching-bookmark@2x.png differ diff --git a/image/toolbar/24x14/x-filter-apply.active.png b/image/toolbar/24x14/x-filter-apply.active.png new file mode 100644 index 0000000000..4deb9125fc Binary files /dev/null and b/image/toolbar/24x14/x-filter-apply.active.png differ diff --git a/image/toolbar/24x14/x-filter-apply.active.svg b/image/toolbar/24x14/x-filter-apply.active.svg new file mode 100644 index 0000000000..ad0b22fa68 --- /dev/null +++ b/image/toolbar/24x14/x-filter-apply.active.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/image/toolbar/24x14/x-filter-apply.active@2x.png b/image/toolbar/24x14/x-filter-apply.active@2x.png new file mode 100644 index 0000000000..778e9d4d32 Binary files /dev/null and b/image/toolbar/24x14/x-filter-apply.active@2x.png differ diff --git a/image/toolbar/24x14/x-filter-apply.png b/image/toolbar/24x14/x-filter-apply.png new file mode 100644 index 0000000000..04b64eb352 Binary files /dev/null and b/image/toolbar/24x14/x-filter-apply.png differ diff --git a/image/toolbar/24x14/x-filter-apply.selected.png b/image/toolbar/24x14/x-filter-apply.selected.png new file mode 100644 index 0000000000..49885c132b Binary files /dev/null and b/image/toolbar/24x14/x-filter-apply.selected.png differ diff --git a/image/toolbar/24x14/x-filter-apply.selected.svg b/image/toolbar/24x14/x-filter-apply.selected.svg new file mode 100644 index 0000000000..d1489ddaf3 --- /dev/null +++ b/image/toolbar/24x14/x-filter-apply.selected.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/image/toolbar/24x14/x-filter-apply.selected@2x.png b/image/toolbar/24x14/x-filter-apply.selected@2x.png new file mode 100644 index 0000000000..225e529e7f Binary files /dev/null and b/image/toolbar/24x14/x-filter-apply.selected@2x.png differ diff --git a/image/toolbar/24x14/x-filter-apply.svg b/image/toolbar/24x14/x-filter-apply.svg new file mode 100644 index 0000000000..d795e46c03 --- /dev/null +++ b/image/toolbar/24x14/x-filter-apply.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/image/toolbar/24x14/x-filter-apply@2x.png b/image/toolbar/24x14/x-filter-apply@2x.png new file mode 100644 index 0000000000..6ad482cc44 Binary files /dev/null and b/image/toolbar/24x14/x-filter-apply@2x.png differ diff --git a/image/toolbar/svg-to-png.sh b/image/toolbar/svg-to-png.sh index 6796aad8d7..cf78ac9587 100755 --- a/image/toolbar/svg-to-png.sh +++ b/image/toolbar/svg-to-png.sh @@ -62,6 +62,19 @@ ICONS=" x-capture-start x-capture-stop x-colorize-packets + x-filter-apply + x-filter-apply.active + x-filter-apply.selected + x-filter-bookmark + x-filter-bookmark.active + x-filter-bookmark.selected + x-filter-clear + x-filter-clear.active + x-filter-clear.selected + x-filter-dropdown + x-filter-matching-bookmark + x-filter-matching-bookmark.active + x-filter-matching-bookmark.selected x-resize-columns x-stay-last zoom-in @@ -71,15 +84,18 @@ ICONS=" QRC_FILES="" -# XXX Add support for 16 pixel icons. -for SIZE in 12 16 24 ; do - SIZE_DIR=${SIZE}x${SIZE} +for SIZE in 12x12 14x14 16x16 24x14 24x14 ; do + WIDTH=${SIZE/x*/} + HEIGHT=${SIZE/*x/} + SIZE_DIR=${SIZE} - TWO_X_SIZE=`expr $SIZE \* 2` - ONE_X_ARGS="--export-width=${SIZE} --export-height=${SIZE}" - TWO_X_ARGS="--export-width=${TWO_X_SIZE} --export-height=${TWO_X_SIZE}" + TWO_X_WIDTH=`expr $WIDTH \* 2` + TWO_X_HEIGHT=`expr $HEIGHT \* 2` + ONE_X_ARGS="--export-width=${WIDTH} --export-height=${HEIGHT}" + TWO_X_ARGS="--export-width=${TWO_X_WIDTH} --export-height=${TWO_X_HEIGHT}" - cd $SIZE_DIR + echo "Converting $SIZE_DIR" + cd $SIZE_DIR || exit 1 for ICON in $ICONS ; do set_source_svgs $ICON @@ -94,12 +110,12 @@ for SIZE in 12 16 24 ; do if [ $ONE_X_SVG -nt $ONE_X_PNG ] ; then inkscape $COMMON_ARGS $ONE_X_ARGS \ - --file=$ONE_X_SVG --export-png=$ONE_X_PNG || exit 1 + --file="$PWD/$ONE_X_SVG" --export-png="$PWD/$ONE_X_PNG" || exit 1 fi if [ $TWO_X_SVG -nt $TWO_X_PNG ] ; then inkscape $COMMON_ARGS $TWO_X_ARGS \ - --file=$TWO_X_SVG --export-png=$TWO_X_PNG || exit 1 + --file="$PWD/$TWO_X_SVG" --export-png="$PWD/$TWO_X_PNG" || exit 1 fi QRC_FILES="${QRC_FILES} ${SIZE_DIR}/${ONE_X_PNG} ${SIZE_DIR}/${TWO_X_PNG}" diff --git a/image/toolbar/svg/x-filter-apply.svg b/image/toolbar/svg/x-filter-apply.svg new file mode 100644 index 0000000000..defbcf4153 --- /dev/null +++ b/image/toolbar/svg/x-filter-apply.svg @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/image/toolbar/svg/x-filter-bookmark.svg b/image/toolbar/svg/x-filter-bookmark.svg new file mode 100644 index 0000000000..9f4fb36d32 --- /dev/null +++ b/image/toolbar/svg/x-filter-bookmark.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/image/toolbar/svg/x-filter-clear.svg b/image/toolbar/svg/x-filter-clear.svg new file mode 100644 index 0000000000..9f4fb36d32 --- /dev/null +++ b/image/toolbar/svg/x-filter-clear.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + -- cgit v1.2.1