From 4921e559906aee70c4665f1c739057e227787e01 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Tue, 18 Nov 2014 16:21:42 -0800 Subject: Qt: Initial VoIP Calls dialog. Add Telephony menu items for VoIP Calls and SIP Flows. Put VoIP Calls at the top, since that seems to be the primary item. Add configure-time checks for QtMultimediaWidgets in anticipation of adding a VoIP playback dialog. Add an icon for the playback button. (Yes, I've been avoiding GNOME-level gratuitous icons so far but this is one of the rare occiasions where it makes sense.) Add a help link define for the VoIP calls dialog. Change-Id: I5d0799685c598ad9af76fe9667f8ea7d14b66050 Reviewed-on: https://code.wireshark.org/review/5674 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs --- image/toolbar.qrc | 2 + image/toolbar/12x12/media-playback-start.png | Bin 0 -> 256 bytes image/toolbar/12x12/media-playback-start.svg | 185 ++++++++++++++++++++++++ image/toolbar/12x12/media-playback-start@2x.png | Bin 0 -> 443 bytes image/toolbar/svg-to-png.sh | 18 ++- 5 files changed, 197 insertions(+), 8 deletions(-) create mode 100644 image/toolbar/12x12/media-playback-start.png create mode 100644 image/toolbar/12x12/media-playback-start.svg create mode 100644 image/toolbar/12x12/media-playback-start@2x.png (limited to 'image') diff --git a/image/toolbar.qrc b/image/toolbar.qrc index 2fc46fcb53..dc72c68dc4 100644 --- a/image/toolbar.qrc +++ b/image/toolbar.qrc @@ -9,6 +9,8 @@ copy-8.png + toolbar/12x12/media-playback-start.png + toolbar/12x12/media-playback-start@2x.png toolbar/16x16/edit-find.png toolbar/16x16/edit-find@2x.png toolbar/16x16/go-first.png diff --git a/image/toolbar/12x12/media-playback-start.png b/image/toolbar/12x12/media-playback-start.png new file mode 100644 index 0000000000..065d7550e2 Binary files /dev/null and b/image/toolbar/12x12/media-playback-start.png differ diff --git a/image/toolbar/12x12/media-playback-start.svg b/image/toolbar/12x12/media-playback-start.svg new file mode 100644 index 0000000000..25156d9dd2 --- /dev/null +++ b/image/toolbar/12x12/media-playback-start.svg @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/image/toolbar/12x12/media-playback-start@2x.png b/image/toolbar/12x12/media-playback-start@2x.png new file mode 100644 index 0000000000..7bdf1bdeca Binary files /dev/null and b/image/toolbar/12x12/media-playback-start@2x.png differ diff --git a/image/toolbar/svg-to-png.sh b/image/toolbar/svg-to-png.sh index 739eea2e42..6796aad8d7 100755 --- a/image/toolbar/svg-to-png.sh +++ b/image/toolbar/svg-to-png.sh @@ -43,10 +43,6 @@ set_source_svgs() { if [ ! -f ${TWO_X_SVG} ] ; then TWO_X_SVG=$ONE_X_SVG fi - if [ ! -f ${ONE_X_SVG} ] ; then - >&2 echo "Can't find ${ONE_X_SVG}" - exit 1 - fi } ICONS=" @@ -56,6 +52,7 @@ ICONS=" go-last go-next go-previous + media-playback-start x-capture-file-close x-capture-file-save x-capture-file-reload @@ -75,7 +72,7 @@ ICONS=" QRC_FILES="" # XXX Add support for 16 pixel icons. -for SIZE in 16 24 ; do +for SIZE in 12 16 24 ; do SIZE_DIR=${SIZE}x${SIZE} TWO_X_SIZE=`expr $SIZE \* 2` @@ -87,6 +84,11 @@ for SIZE in 16 24 ; do for ICON in $ICONS ; do set_source_svgs $ICON + if [ ! -f ${ONE_X_SVG} ] ; then + >&2 echo "Skipping ${ONE_X_SVG}" + continue + fi + ONE_X_PNG=${ICON}.png TWO_X_PNG=${ICON}@2x.png @@ -100,15 +102,15 @@ for SIZE in 16 24 ; do --file=$TWO_X_SVG --export-png=$TWO_X_PNG || exit 1 fi - QRC_FILES="${QRC_FILES} ${ONE_X_PNG} ${TWO_X_PNG}" + QRC_FILES="${QRC_FILES} ${SIZE_DIR}/${ONE_X_PNG} ${SIZE_DIR}/${TWO_X_PNG}" done cd .. - + done for QRC_FILE in $QRC_FILES ; do - echo " toolbar/${SIZE_DIR}/${QRC_FILE}" + echo " toolbar/${QRC_FILE}" done # -- cgit v1.2.1