diff options
author | Gerald Combs <gerald@wireshark.org> | 2019-06-20 09:53:51 -0700 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2019-06-20 20:50:25 +0000 |
commit | 0d150d241f96970653db1212039aa18f6e3b1622 (patch) | |
tree | 72010da2a076bb6ba53fafc2c9b067600dc020cb /image | |
parent | 0c45cefab20006d4092a13286b31e39bdff31546 (diff) |
Qt: Convert the list management icons to templates.
Move the rest of the list management icons (remove, copy, clear, up, and
down) to the stock_icons directory. Convert them to templates by adding
".template" to their name.
Switch the UAT dialog to the "new" icons.
Convert the image README to .adoc.
To do:
- Make sure the icons are actually black.
- Convert the rest of the preference dialogs and other consumers.
Ping-Bug: 15511
Change-Id: Ie39afd52585ecbb644812be9f2762fede6e449ba
Reviewed-on: https://code.wireshark.org/review/33687
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'image')
-rw-r--r-- | image/README.adoc | 47 | ||||
-rw-r--r-- | image/README.image | 50 | ||||
-rw-r--r-- | image/stock_icons.qrc | 24 | ||||
-rw-r--r-- | image/stock_icons/8x8/list-clear.template.png (renamed from image/delete_list.png) | bin | 378 -> 378 bytes | |||
-rw-r--r-- | image/stock_icons/8x8/list-clear.template@2x.png (renamed from image/delete_list@2x.png) | bin | 660 -> 660 bytes | |||
-rw-r--r-- | image/stock_icons/8x8/list-copy.template.png (renamed from image/copy-8.png) | bin | 147 -> 147 bytes | |||
-rw-r--r-- | image/stock_icons/8x8/list-copy.template.xcf (renamed from image/copy-8.xcf) | bin | 667 -> 667 bytes | |||
-rw-r--r-- | image/stock_icons/8x8/list-move-down.template.png (renamed from image/arrow_down.png) | bin | 294 -> 294 bytes | |||
-rw-r--r-- | image/stock_icons/8x8/list-move-down.template@2x.png (renamed from image/arrow_down@2x.png) | bin | 445 -> 445 bytes | |||
-rw-r--r-- | image/stock_icons/8x8/list-move-up.template.png (renamed from image/arrow_up.png) | bin | 294 -> 294 bytes | |||
-rw-r--r-- | image/stock_icons/8x8/list-move-up.template@2x.png (renamed from image/arrow_up@2x.png) | bin | 412 -> 412 bytes | |||
-rw-r--r-- | image/stock_icons/8x8/list-remove.template.png (renamed from image/minus-8.png) | bin | 74 -> 74 bytes |
12 files changed, 63 insertions, 58 deletions
diff --git a/image/README.adoc b/image/README.adoc new file mode 100644 index 0000000000..a6070b3dd1 --- /dev/null +++ b/image/README.adoc @@ -0,0 +1,47 @@ += Introduction + +This directory contains a set of images and icons for the Wireshark +suite of applications. Of particular note for people creating packages +for distribution are the files wireshark.ico, wiresharkdoc.ico, +wsicon*.png, and WiresharkDoc-*.png + +File descriptions: + +wsicon.svg:: +Old vector source for the wireshark icon. + +wsiconcap.svg:: +Old vector source for the "capture" icon. + +wsicondoc.svg:: +Old vector source for the "document" icon. + +wsicon16.png ... wsicon1024.png:: +Wireshark application icons in various sizes + +wsiconcap16.png ... wsiconcap1024.png:: +“Capture in progress” application icon in various sizes + +wsiconinst16.png ... wsiconinst1024.png:: +Wireshark installer icons in various sizes + +WiresharkDoc-16.png ... WiresharkDoc-256.png +Capture document icon in various sizes + +wireshark.ico:: +Windows application icon file with 16 and 32 pixel 3D logo icons, high and low color. + +wiresharkdoc.ico:: +Windows document icon file with 16 and 32 pixel 3D logo icons, high and low color. + +*.rc.in:: +MSVC++ resource templates + +stock_icons:: +Various stock icons. Names _mostly_ conform to the freedesktop.org +https://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html[Icon Naming Specification]. +For example, the INS specifies “list-add” and “list-remove”. and we've added “list-copy”, “list-move-up“, “list-move-down”, and “list-clear”. + +The Wireshark application icon, document icon, and several toolbar icons were created by Elliott Aldrich. +The list-add and list-remove images were created by by Peter Hosey and released under CC-PD. +The list-clear images were created by Freepik, http://www.freepik.com from https://www.flaticon.com. diff --git a/image/README.image b/image/README.image deleted file mode 100644 index 36196e25de..0000000000 --- a/image/README.image +++ /dev/null @@ -1,50 +0,0 @@ -This directory contains a set of images and icons for the Wireshark -suite of applications. Of particular note for people creating packages -for distribution are the files wireshark.ico, wiresharkdoc.ico, -wsicon*.png, and WiresharkDoc-*.png - -File descriptions: - -File Description - -wsicon.svg Old vector source for the wireshark icon. - -wsiconcap.svg Old vector source for the "capture" icon. - -wsicondoc.svg Old vector source for the "document" icon. - -wsicon16.png Wireshark icons in various sizes -wsicon24.png -wsicon32.png -wsicon48.png -wsicon64.png -wsicon128.png -wsicon256.png -wsicon512.png -wsicon1024.png - -wireshark.ico Windows application icon file with 16 and 32 - pixel 3D logo icons, high and low color -wiresharkdoc.ico Windows document icon file with 16 and 32 - pixel 3D logo icons, high and low color - -wireshark.rc.in MSVC++ resource templates -editcap.rc.in -mergecap.rc.in -rawshark.rc.in -tshark.rc.in -tfshark.rc.in -text2pcap.rc.in - -image/capture_comment.svg Capture comment (annotation) icons -image/capture_comment_add.png created from elements in -image/capture_comment_disabled.png accessories-text-editor.svg and -image/capture_comment_update.png paper-sheets.svg - -list-add.png macOS style add / remove icons. Created by Peter Hosey. -minus-8.png Released under CC-PD. - -copy-8.png macOS style copy icon. - -delete_list.png by Freepik, http://www.freepik.com from https://www.flaticon.com -delete_list@2x.png diff --git a/image/stock_icons.qrc b/image/stock_icons.qrc index 0b38e0a591..c38bd14326 100644 --- a/image/stock_icons.qrc +++ b/image/stock_icons.qrc @@ -4,18 +4,26 @@ <file>wsicon-ask.png</file> </qresource> <qresource prefix="/stock"> - <file>minus-8.png</file> <file alias="plus-8.png">stock_icons/8x8/list-add.template.png</file> - <file>copy-8.png</file> - <file>delete_list.png</file> - <file>delete_list@2x.png</file> - <file>arrow_up.png</file> - <file>arrow_up@2x.png</file> - <file>arrow_down.png</file> - <file>arrow_down@2x.png</file> + <file alias="minus-8.png">stock_icons/8x8/list-remove.template.png</file> + <file alias="copy-8.png">stock_icons/8x8/list-copy.template.png</file> + <file alias="delete_list.png">stock_icons/8x8/list-clear.template.png</file> + <file alias="delete_list@2x.png">stock_icons/8x8/list-clear.template@2x.png</file> + <file alias="arrow_up.png">stock_icons/8x8/list-move-up.template.png</file> + <file alias="arrow_up@2x.png">stock_icons/8x8/list-move-up.template@2x.png</file> + <file alias="arrow_down.png">stock_icons/8x8/list-move-down.template.png</file> + <file alias="arrow_down@2x.png">stock_icons/8x8/list-move-down.template@2x.png</file> </qresource> <qresource prefix=""> <file>stock_icons/8x8/list-add.template.png</file> + <file>stock_icons/8x8/list-remove.template.png</file> + <file>stock_icons/8x8/list-copy.template.png</file> + <file>stock_icons/8x8/list-clear.template.png</file> + <file>stock_icons/8x8/list-clear.template@2x.png</file> + <file>stock_icons/8x8/list-move-up.template.png</file> + <file>stock_icons/8x8/list-move-up.template@2x.png</file> + <file>stock_icons/8x8/list-move-down.template.png</file> + <file>stock_icons/8x8/list-move-down.template@2x.png</file> <file>stock_icons/14x14/x-capture-comment-update.png</file> <file>stock_icons/14x14/x-capture-comment-update@2x.png</file> <file>stock_icons/14x14/x-capture-filter-bookmark.png</file> diff --git a/image/delete_list.png b/image/stock_icons/8x8/list-clear.template.png Binary files differindex 52f9f112eb..52f9f112eb 100644 --- a/image/delete_list.png +++ b/image/stock_icons/8x8/list-clear.template.png diff --git a/image/delete_list@2x.png b/image/stock_icons/8x8/list-clear.template@2x.png Binary files differindex c1b2ccdafc..c1b2ccdafc 100644 --- a/image/delete_list@2x.png +++ b/image/stock_icons/8x8/list-clear.template@2x.png diff --git a/image/copy-8.png b/image/stock_icons/8x8/list-copy.template.png Binary files differindex 117d80c039..117d80c039 100644 --- a/image/copy-8.png +++ b/image/stock_icons/8x8/list-copy.template.png diff --git a/image/copy-8.xcf b/image/stock_icons/8x8/list-copy.template.xcf Binary files differindex 3be9d711f5..3be9d711f5 100644 --- a/image/copy-8.xcf +++ b/image/stock_icons/8x8/list-copy.template.xcf diff --git a/image/arrow_down.png b/image/stock_icons/8x8/list-move-down.template.png Binary files differindex f71e54ff48..f71e54ff48 100644 --- a/image/arrow_down.png +++ b/image/stock_icons/8x8/list-move-down.template.png diff --git a/image/arrow_down@2x.png b/image/stock_icons/8x8/list-move-down.template@2x.png Binary files differindex 067b143a98..067b143a98 100644 --- a/image/arrow_down@2x.png +++ b/image/stock_icons/8x8/list-move-down.template@2x.png diff --git a/image/arrow_up.png b/image/stock_icons/8x8/list-move-up.template.png Binary files differindex d6ce9b7ce6..d6ce9b7ce6 100644 --- a/image/arrow_up.png +++ b/image/stock_icons/8x8/list-move-up.template.png diff --git a/image/arrow_up@2x.png b/image/stock_icons/8x8/list-move-up.template@2x.png Binary files differindex a4f9a8b339..a4f9a8b339 100644 --- a/image/arrow_up@2x.png +++ b/image/stock_icons/8x8/list-move-up.template@2x.png diff --git a/image/minus-8.png b/image/stock_icons/8x8/list-remove.template.png Binary files differindex eddbcc614d..eddbcc614d 100644 --- a/image/minus-8.png +++ b/image/stock_icons/8x8/list-remove.template.png |