summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2014-10-28 12:00:44 -0700
committerGerald Combs <gerald@wireshark.org>2014-10-28 19:09:52 +0000
commit0b03183f0ae5746b232eea4172dcae717e16c6a8 (patch)
tree62c2de06071d8d0bb857a9be712b269ec3f8edd1 /Makefile.am
parente86553e13cea47896ca23811531c447368112256 (diff)
downloadwireshark-0b03183f0ae5746b232eea4172dcae717e16c6a8.tar.gz
Qt: Add a set of 2x 16-pixel toolbar icons.
Optimize the toolbar PNGs. To do: The rest of the PNGs. Change-Id: Ieed8b0d099655994d43cdc9cf6c9a094d84c1802 Reviewed-on: https://code.wireshark.org/review/4978 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am76
1 files changed, 49 insertions, 27 deletions
diff --git a/Makefile.am b/Makefile.am
index f60202aa27..1576c6b5d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -901,51 +901,74 @@ EXTRA_DIST = \
image/stock_dialog_warning_48.xpm \
image/text2pcap.rc.in \
image/tfshark.rc.in \
- image/toolbar/16x16/edit-find.png \
- image/toolbar/16x16/edit-find.svg \
+ image/toolbar/16x16/edit-find.png \
+ image/toolbar/16x16/edit-find.svg \
+ image/toolbar/16x16/edit-find@2x.png \
image/toolbar/16x16/go-first.png \
image/toolbar/16x16/go-first.svg \
- image/toolbar/16x16/go-jump.png \
- image/toolbar/16x16/go-jump.svg \
- image/toolbar/16x16/go-last.png \
- image/toolbar/16x16/go-last.svg \
- image/toolbar/16x16/go-next.png \
- image/toolbar/16x16/go-next.svg \
+ image/toolbar/16x16/go-first@2x.png \
+ image/toolbar/16x16/go-jump.png \
+ image/toolbar/16x16/go-jump.svg \
+ image/toolbar/16x16/go-jump@2x.png \
+ image/toolbar/16x16/go-last.png \
+ image/toolbar/16x16/go-last.svg \
+ image/toolbar/16x16/go-last@2x.png \
+ image/toolbar/16x16/go-next.png \
+ image/toolbar/16x16/go-next.svg \
+ image/toolbar/16x16/go-next@2x.png \
image/toolbar/16x16/go-previous.png \
image/toolbar/16x16/go-previous.svg \
- image/toolbar/16x16/x-capture-file-close.png \
- image/toolbar/16x16/x-capture-file-close.svg \
- image/toolbar/16x16/x-capture-file-reload.png \
- image/toolbar/16x16/x-capture-file-reload.svg \
- image/toolbar/16x16/x-capture-file-save.png \
- image/toolbar/16x16/x-capture-options-gear.svg \
+ image/toolbar/16x16/go-previous@2x.png \
+ image/toolbar/16x16/x-capture-file-close.png \
+ image/toolbar/16x16/x-capture-file-close.svg \
+ image/toolbar/16x16/x-capture-file-close@2x.png \
+ image/toolbar/16x16/x-capture-file-close@2x.svg \
+ image/toolbar/16x16/x-capture-file-reload.png \
+ image/toolbar/16x16/x-capture-file-reload.svg \
+ image/toolbar/16x16/x-capture-file-reload@2x.png \
+ image/toolbar/16x16/x-capture-file-save.png \
+ image/toolbar/16x16/x-capture-file-save.svg \
+ image/toolbar/16x16/x-capture-file-save@2x.png \
+ image/toolbar/16x16/x-capture-file-save@2x.svg \
+ image/toolbar/16x16/x-capture-options-gear.svg \
image/toolbar/16x16/x-capture-options-wrench.svg \
- image/toolbar/16x16/x-capture-options.png \
- image/toolbar/16x16/x-capture-restart-fin.svg \
+ image/toolbar/16x16/x-capture-options.png \
+ image/toolbar/16x16/x-capture-options@2x.png \
+ image/toolbar/16x16/x-capture-restart-fin.svg \
image/toolbar/16x16/x-capture-restart-triangle1.svg \
image/toolbar/16x16/x-capture-restart-triangle2.svg \
- image/toolbar/16x16/x-capture-restart-turn1.svg \
- image/toolbar/16x16/x-capture-restart-turn2.svg \
- image/toolbar/16x16/x-capture-restart.png \
- image/toolbar/16x16/x-capture-start.on.png \
- image/toolbar/16x16/x-capture-start.on.svg \
- image/toolbar/16x16/x-capture-start.png \
- image/toolbar/16x16/x-capture-start.svg \
- image/toolbar/16x16/x-capture-stop-red.svg \
- image/toolbar/16x16/x-capture-stop-white.svg \
- image/toolbar/16x16/x-capture-stop.png \
+ image/toolbar/16x16/x-capture-restart-turn1.svg \
+ image/toolbar/16x16/x-capture-restart-turn2.svg \
+ image/toolbar/16x16/x-capture-restart.png \
+ image/toolbar/16x16/x-capture-restart@2x.png \
+ image/toolbar/16x16/x-capture-start.on.png \
+ image/toolbar/16x16/x-capture-start.on.svg \
+ image/toolbar/16x16/x-capture-start.on@2x.png \
+ image/toolbar/16x16/x-capture-start.png \
+ image/toolbar/16x16/x-capture-start.svg \
+ image/toolbar/16x16/x-capture-start@2x.png \
+ image/toolbar/16x16/x-capture-stop-red.svg \
+ image/toolbar/16x16/x-capture-stop-white.svg \
+ image/toolbar/16x16/x-capture-stop.png \
+ image/toolbar/16x16/x-capture-stop@2x.png \
image/toolbar/16x16/x-colorize-packets.png \
image/toolbar/16x16/x-colorize-packets.svg \
+ image/toolbar/16x16/x-colorize-packets@2x.png \
image/toolbar/16x16/x-resize-columns.png \
image/toolbar/16x16/x-resize-columns.svg \
+ image/toolbar/16x16/x-resize-columns@2x.png \
image/toolbar/16x16/x-stay-last.png \
image/toolbar/16x16/x-stay-last.svg \
+ image/toolbar/16x16/x-stay-last@2x.png \
image/toolbar/16x16/zoom-in.png \
image/toolbar/16x16/zoom-in.svg \
+ image/toolbar/16x16/zoom-in@2x.png \
image/toolbar/16x16/zoom-original.png \
image/toolbar/16x16/zoom-original.svg \
+ image/toolbar/16x16/zoom-original@2x.png \
image/toolbar/16x16/zoom-out.png \
image/toolbar/16x16/zoom-out.svg \
+ image/toolbar/16x16/zoom-out@2x.png \
image/toolbar/24x24/edit-find.png \
image/toolbar/24x24/edit-find.svg \
image/toolbar/24x24/edit-find@2x.png \
@@ -964,7 +987,6 @@ EXTRA_DIST = \
image/toolbar/24x24/go-previous.png \
image/toolbar/24x24/go-previous.svg \
image/toolbar/24x24/go-previous@2x.png \
- image/toolbar/24x24/x-capture-file-close-orig.svg \
image/toolbar/24x24/x-capture-file-close.png \
image/toolbar/24x24/x-capture-file-close.svg \
image/toolbar/24x24/x-capture-file-close@2x.png \