From c9d148c077213c256e275574420fc67d61f6835a Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Fri, 29 Jan 2016 16:45:04 -0800 Subject: Update filter bookmark icons. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Separate the capture and display filter bookmark icons. Make the capture icon green to match(-ish) the active capture icon. Tested on nice+new and janky+old displays. Change-Id: I6ed532c8a49da50fe2a7de3d8fbd0b1af7623b4a Reviewed-on: https://code.wireshark.org/review/13612 Reviewed-by: Gerald Combs Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke --- image/toolbar.qrc | 18 ++- .../14x14/x-capture-filter-bookmark.active.png | Bin 0 -> 252 bytes .../14x14/x-capture-filter-bookmark.active.svg | 153 +++++++++++++++++++++ .../14x14/x-capture-filter-bookmark.active@2x.png | Bin 0 -> 413 bytes image/toolbar/14x14/x-capture-filter-bookmark.png | Bin 0 -> 269 bytes .../14x14/x-capture-filter-bookmark.selected.png | Bin 0 -> 248 bytes .../14x14/x-capture-filter-bookmark.selected.svg | 153 +++++++++++++++++++++ .../x-capture-filter-bookmark.selected@2x.png | Bin 0 -> 425 bytes image/toolbar/14x14/x-capture-filter-bookmark.svg | 153 +++++++++++++++++++++ .../toolbar/14x14/x-capture-filter-bookmark@2x.png | Bin 0 -> 405 bytes .../14x14/x-display-filter-bookmark.active.png | Bin 0 -> 254 bytes .../14x14/x-display-filter-bookmark.active.svg | 109 +++++++++++++++ .../14x14/x-display-filter-bookmark.active@2x.png | Bin 0 -> 403 bytes image/toolbar/14x14/x-display-filter-bookmark.png | Bin 0 -> 238 bytes .../14x14/x-display-filter-bookmark.selected.png | Bin 0 -> 258 bytes .../14x14/x-display-filter-bookmark.selected.svg | 109 +++++++++++++++ .../x-display-filter-bookmark.selected@2x.png | Bin 0 -> 400 bytes image/toolbar/14x14/x-display-filter-bookmark.svg | 153 +++++++++++++++++++++ .../toolbar/14x14/x-display-filter-bookmark@2x.png | Bin 0 -> 392 bytes image/toolbar/14x14/x-filter-bookmark.active.png | Bin 254 -> 0 bytes image/toolbar/14x14/x-filter-bookmark.active.svg | 109 --------------- .../toolbar/14x14/x-filter-bookmark.active@2x.png | Bin 403 -> 0 bytes image/toolbar/14x14/x-filter-bookmark.png | Bin 238 -> 0 bytes image/toolbar/14x14/x-filter-bookmark.selected.png | Bin 258 -> 0 bytes image/toolbar/14x14/x-filter-bookmark.selected.svg | 109 --------------- .../14x14/x-filter-bookmark.selected@2x.png | Bin 400 -> 0 bytes image/toolbar/14x14/x-filter-bookmark.svg | 109 --------------- image/toolbar/14x14/x-filter-bookmark@2x.png | Bin 392 -> 0 bytes image/toolbar/svg-to-png.sh | 9 +- 29 files changed, 848 insertions(+), 336 deletions(-) create mode 100644 image/toolbar/14x14/x-capture-filter-bookmark.active.png create mode 100644 image/toolbar/14x14/x-capture-filter-bookmark.active.svg create mode 100644 image/toolbar/14x14/x-capture-filter-bookmark.active@2x.png create mode 100644 image/toolbar/14x14/x-capture-filter-bookmark.png create mode 100644 image/toolbar/14x14/x-capture-filter-bookmark.selected.png create mode 100644 image/toolbar/14x14/x-capture-filter-bookmark.selected.svg create mode 100644 image/toolbar/14x14/x-capture-filter-bookmark.selected@2x.png create mode 100644 image/toolbar/14x14/x-capture-filter-bookmark.svg create mode 100644 image/toolbar/14x14/x-capture-filter-bookmark@2x.png create mode 100644 image/toolbar/14x14/x-display-filter-bookmark.active.png create mode 100644 image/toolbar/14x14/x-display-filter-bookmark.active.svg create mode 100644 image/toolbar/14x14/x-display-filter-bookmark.active@2x.png create mode 100644 image/toolbar/14x14/x-display-filter-bookmark.png create mode 100644 image/toolbar/14x14/x-display-filter-bookmark.selected.png create mode 100644 image/toolbar/14x14/x-display-filter-bookmark.selected.svg create mode 100644 image/toolbar/14x14/x-display-filter-bookmark.selected@2x.png create mode 100644 image/toolbar/14x14/x-display-filter-bookmark.svg create mode 100644 image/toolbar/14x14/x-display-filter-bookmark@2x.png delete mode 100644 image/toolbar/14x14/x-filter-bookmark.active.png delete mode 100644 image/toolbar/14x14/x-filter-bookmark.active.svg delete mode 100644 image/toolbar/14x14/x-filter-bookmark.active@2x.png delete mode 100644 image/toolbar/14x14/x-filter-bookmark.png delete mode 100644 image/toolbar/14x14/x-filter-bookmark.selected.png delete mode 100644 image/toolbar/14x14/x-filter-bookmark.selected.svg delete mode 100644 image/toolbar/14x14/x-filter-bookmark.selected@2x.png delete mode 100644 image/toolbar/14x14/x-filter-bookmark.svg delete mode 100644 image/toolbar/14x14/x-filter-bookmark@2x.png (limited to 'image') diff --git a/image/toolbar.qrc b/image/toolbar.qrc index f6839621d1..6974d641bc 100644 --- a/image/toolbar.qrc +++ b/image/toolbar.qrc @@ -11,6 +11,18 @@ toolbar/14x14/x-capture-comment-update.png toolbar/14x14/x-capture-comment-update@2x.png + toolbar/14x14/x-capture-filter-bookmark.png + toolbar/14x14/x-capture-filter-bookmark@2x.png + toolbar/14x14/x-capture-filter-bookmark.active.png + toolbar/14x14/x-capture-filter-bookmark.active@2x.png + toolbar/14x14/x-capture-filter-bookmark.selected.png + toolbar/14x14/x-capture-filter-bookmark.selected@2x.png + toolbar/14x14/x-display-filter-bookmark.png + toolbar/14x14/x-display-filter-bookmark@2x.png + toolbar/14x14/x-display-filter-bookmark.active.png + toolbar/14x14/x-display-filter-bookmark.active@2x.png + toolbar/14x14/x-display-filter-bookmark.selected.png + toolbar/14x14/x-display-filter-bookmark.selected@2x.png toolbar/14x14/x-expert-chat.png toolbar/14x14/x-expert-chat@2x.png toolbar/14x14/x-expert-error.png @@ -27,12 +39,6 @@ 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 diff --git a/image/toolbar/14x14/x-capture-filter-bookmark.active.png b/image/toolbar/14x14/x-capture-filter-bookmark.active.png new file mode 100644 index 0000000000..5df57a378a Binary files /dev/null and b/image/toolbar/14x14/x-capture-filter-bookmark.active.png differ diff --git a/image/toolbar/14x14/x-capture-filter-bookmark.active.svg b/image/toolbar/14x14/x-capture-filter-bookmark.active.svg new file mode 100644 index 0000000000..f1085c1d18 --- /dev/null +++ b/image/toolbar/14x14/x-capture-filter-bookmark.active.svg @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + Plain: 8ae234 + Active: 73d216 + Selected: 4e9a06 + http://emilis.info/other/extended_tango/ + + diff --git a/image/toolbar/14x14/x-capture-filter-bookmark.active@2x.png b/image/toolbar/14x14/x-capture-filter-bookmark.active@2x.png new file mode 100644 index 0000000000..0beeb62945 Binary files /dev/null and b/image/toolbar/14x14/x-capture-filter-bookmark.active@2x.png differ diff --git a/image/toolbar/14x14/x-capture-filter-bookmark.png b/image/toolbar/14x14/x-capture-filter-bookmark.png new file mode 100644 index 0000000000..63e3cebb49 Binary files /dev/null and b/image/toolbar/14x14/x-capture-filter-bookmark.png differ diff --git a/image/toolbar/14x14/x-capture-filter-bookmark.selected.png b/image/toolbar/14x14/x-capture-filter-bookmark.selected.png new file mode 100644 index 0000000000..ca7d0f0b64 Binary files /dev/null and b/image/toolbar/14x14/x-capture-filter-bookmark.selected.png differ diff --git a/image/toolbar/14x14/x-capture-filter-bookmark.selected.svg b/image/toolbar/14x14/x-capture-filter-bookmark.selected.svg new file mode 100644 index 0000000000..572ea701a1 --- /dev/null +++ b/image/toolbar/14x14/x-capture-filter-bookmark.selected.svg @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + Plain: 8ae234 + Active: 73d216 + Selected: 4e9a06 + http://emilis.info/other/extended_tango/ + + diff --git a/image/toolbar/14x14/x-capture-filter-bookmark.selected@2x.png b/image/toolbar/14x14/x-capture-filter-bookmark.selected@2x.png new file mode 100644 index 0000000000..7a6d87bbf9 Binary files /dev/null and b/image/toolbar/14x14/x-capture-filter-bookmark.selected@2x.png differ diff --git a/image/toolbar/14x14/x-capture-filter-bookmark.svg b/image/toolbar/14x14/x-capture-filter-bookmark.svg new file mode 100644 index 0000000000..5a9d9fe732 --- /dev/null +++ b/image/toolbar/14x14/x-capture-filter-bookmark.svg @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + Plain: 8ae234 + Active: 73d216 + Selected: 4e9a06 + http://emilis.info/other/extended_tango/ + + diff --git a/image/toolbar/14x14/x-capture-filter-bookmark@2x.png b/image/toolbar/14x14/x-capture-filter-bookmark@2x.png new file mode 100644 index 0000000000..ac3b69e55c Binary files /dev/null and b/image/toolbar/14x14/x-capture-filter-bookmark@2x.png differ diff --git a/image/toolbar/14x14/x-display-filter-bookmark.active.png b/image/toolbar/14x14/x-display-filter-bookmark.active.png new file mode 100644 index 0000000000..a9bf35a7dd Binary files /dev/null and b/image/toolbar/14x14/x-display-filter-bookmark.active.png differ diff --git a/image/toolbar/14x14/x-display-filter-bookmark.active.svg b/image/toolbar/14x14/x-display-filter-bookmark.active.svg new file mode 100644 index 0000000000..59336bb970 --- /dev/null +++ b/image/toolbar/14x14/x-display-filter-bookmark.active.svg @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/image/toolbar/14x14/x-display-filter-bookmark.active@2x.png b/image/toolbar/14x14/x-display-filter-bookmark.active@2x.png new file mode 100644 index 0000000000..1988700e55 Binary files /dev/null and b/image/toolbar/14x14/x-display-filter-bookmark.active@2x.png differ diff --git a/image/toolbar/14x14/x-display-filter-bookmark.png b/image/toolbar/14x14/x-display-filter-bookmark.png new file mode 100644 index 0000000000..fbeeb3466d Binary files /dev/null and b/image/toolbar/14x14/x-display-filter-bookmark.png differ diff --git a/image/toolbar/14x14/x-display-filter-bookmark.selected.png b/image/toolbar/14x14/x-display-filter-bookmark.selected.png new file mode 100644 index 0000000000..0bb4dcd817 Binary files /dev/null and b/image/toolbar/14x14/x-display-filter-bookmark.selected.png differ diff --git a/image/toolbar/14x14/x-display-filter-bookmark.selected.svg b/image/toolbar/14x14/x-display-filter-bookmark.selected.svg new file mode 100644 index 0000000000..3690c887a3 --- /dev/null +++ b/image/toolbar/14x14/x-display-filter-bookmark.selected.svg @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/image/toolbar/14x14/x-display-filter-bookmark.selected@2x.png b/image/toolbar/14x14/x-display-filter-bookmark.selected@2x.png new file mode 100644 index 0000000000..ae64fd7a86 Binary files /dev/null and b/image/toolbar/14x14/x-display-filter-bookmark.selected@2x.png differ diff --git a/image/toolbar/14x14/x-display-filter-bookmark.svg b/image/toolbar/14x14/x-display-filter-bookmark.svg new file mode 100644 index 0000000000..0e8dc9eff9 --- /dev/null +++ b/image/toolbar/14x14/x-display-filter-bookmark.svg @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + Plain: 729fcf + Active: 3465a4 + Selected: 204a87 + http://emilis.info/other/extended_tango/ + + diff --git a/image/toolbar/14x14/x-display-filter-bookmark@2x.png b/image/toolbar/14x14/x-display-filter-bookmark@2x.png new file mode 100644 index 0000000000..1ca597cdfc Binary files /dev/null and b/image/toolbar/14x14/x-display-filter-bookmark@2x.png differ diff --git a/image/toolbar/14x14/x-filter-bookmark.active.png b/image/toolbar/14x14/x-filter-bookmark.active.png deleted file mode 100644 index a9bf35a7dd..0000000000 Binary files a/image/toolbar/14x14/x-filter-bookmark.active.png and /dev/null differ diff --git a/image/toolbar/14x14/x-filter-bookmark.active.svg b/image/toolbar/14x14/x-filter-bookmark.active.svg deleted file mode 100644 index 59336bb970..0000000000 --- a/image/toolbar/14x14/x-filter-bookmark.active.svg +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100644 index 1988700e55..0000000000 Binary files a/image/toolbar/14x14/x-filter-bookmark.active@2x.png and /dev/null differ diff --git a/image/toolbar/14x14/x-filter-bookmark.png b/image/toolbar/14x14/x-filter-bookmark.png deleted file mode 100644 index fbeeb3466d..0000000000 Binary files a/image/toolbar/14x14/x-filter-bookmark.png and /dev/null differ diff --git a/image/toolbar/14x14/x-filter-bookmark.selected.png b/image/toolbar/14x14/x-filter-bookmark.selected.png deleted file mode 100644 index 0bb4dcd817..0000000000 Binary files a/image/toolbar/14x14/x-filter-bookmark.selected.png and /dev/null differ diff --git a/image/toolbar/14x14/x-filter-bookmark.selected.svg b/image/toolbar/14x14/x-filter-bookmark.selected.svg deleted file mode 100644 index 3690c887a3..0000000000 --- a/image/toolbar/14x14/x-filter-bookmark.selected.svg +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100644 index ae64fd7a86..0000000000 Binary files a/image/toolbar/14x14/x-filter-bookmark.selected@2x.png and /dev/null differ diff --git a/image/toolbar/14x14/x-filter-bookmark.svg b/image/toolbar/14x14/x-filter-bookmark.svg deleted file mode 100644 index 1945279613..0000000000 --- a/image/toolbar/14x14/x-filter-bookmark.svg +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff --git a/image/toolbar/14x14/x-filter-bookmark@2x.png b/image/toolbar/14x14/x-filter-bookmark@2x.png deleted file mode 100644 index 1ca597cdfc..0000000000 Binary files a/image/toolbar/14x14/x-filter-bookmark@2x.png and /dev/null differ diff --git a/image/toolbar/svg-to-png.sh b/image/toolbar/svg-to-png.sh index a4fbc27152..bcdfa0cf58 100755 --- a/image/toolbar/svg-to-png.sh +++ b/image/toolbar/svg-to-png.sh @@ -55,18 +55,21 @@ ICONS=" x-capture-file-close x-capture-file-save x-capture-file-reload + x-capture-filter-bookmark + x-capture-filter-bookmark.active + x-capture-filter-bookmark.selected x-capture-options x-capture-restart x-capture-start.on x-capture-start x-capture-stop x-colorize-packets + x-display-filter-bookmark + x-display-filter-bookmark.active + x-display-filter-bookmark.selected 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 -- cgit v1.2.1