aboutsummaryrefslogtreecommitdiffstats
path: root/image/toolbar/svg-to-png.sh
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2014-11-18 16:21:42 -0800
committerGerald Combs <gerald@wireshark.org>2014-12-09 21:25:33 +0000
commit4921e559906aee70c4665f1c739057e227787e01 (patch)
tree4465cb9e9de152bfb57f00852e437994e2d85cd9 /image/toolbar/svg-to-png.sh
parent3147087de323c0294b51006f97b641fc408f1b06 (diff)
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 <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'image/toolbar/svg-to-png.sh')
-rwxr-xr-ximage/toolbar/svg-to-png.sh18
1 files changed, 10 insertions, 8 deletions
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 " <file>toolbar/${SIZE_DIR}/${QRC_FILE}</file>"
+ echo " <file>toolbar/${QRC_FILE}</file>"
done
#