diff options
author | Gerald Combs <gerald@wireshark.org> | 2014-11-18 16:21:42 -0800 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2014-12-09 21:25:33 +0000 |
commit | 4921e559906aee70c4665f1c739057e227787e01 (patch) | |
tree | 4465cb9e9de152bfb57f00852e437994e2d85cd9 /image | |
parent | 3147087de323c0294b51006f97b641fc408f1b06 (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')
-rw-r--r-- | image/toolbar.qrc | 2 | ||||
-rw-r--r-- | image/toolbar/12x12/media-playback-start.png | bin | 0 -> 256 bytes | |||
-rw-r--r-- | image/toolbar/12x12/media-playback-start.svg | 185 | ||||
-rw-r--r-- | image/toolbar/12x12/media-playback-start@2x.png | bin | 0 -> 443 bytes | |||
-rwxr-xr-x | image/toolbar/svg-to-png.sh | 18 |
5 files changed, 197 insertions, 8 deletions
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 @@ <file>copy-8.png</file> </qresource> <qresource prefix="/icons"> + <file>toolbar/12x12/media-playback-start.png</file> + <file>toolbar/12x12/media-playback-start@2x.png</file> <file>toolbar/16x16/edit-find.png</file> <file>toolbar/16x16/edit-find@2x.png</file> <file>toolbar/16x16/go-first.png</file> diff --git a/image/toolbar/12x12/media-playback-start.png b/image/toolbar/12x12/media-playback-start.png Binary files differnew file mode 100644 index 0000000000..065d7550e2 --- /dev/null +++ b/image/toolbar/12x12/media-playback-start.png 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 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="12" + height="12" + id="svg2" + version="1.1" + inkscape:version="0.48.2 r9819" + sodipodi:docname="media-playback-start.svg"> + <defs + id="defs4"> + <linearGradient + id="linearGradient4324"> + <stop + style="stop-color:#ffffff;stop-opacity:0.15686275;" + offset="0" + id="stop4326" /> + <stop + style="stop-color:#fffffd;stop-opacity:0;" + offset="1" + id="stop4328" /> + </linearGradient> + <linearGradient + id="linearGradient4316"> + <stop + style="stop-color:#000000;stop-opacity:0.15686275;" + offset="0" + id="stop4318" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="1" + id="stop4320" /> + </linearGradient> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 526.18109 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="744.09448 : 526.18109 : 1" + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" + id="perspective10" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4316" + id="linearGradient4322" + x1="3" + y1="3.9245384" + x2="0" + y2="1.0377871" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4324" + id="linearGradient4330" + x1="-1" + y1="-0.8867138" + x2="2" + y2="2.0000374" + gradientUnits="userSpaceOnUse" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="44.416667" + inkscape:cx="6" + inkscape:cy="6" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:window-width="1261" + inkscape:window-height="702" + inkscape:window-x="1701" + inkscape:window-y="76" + inkscape:window-maximized="0"> + <inkscape:grid + type="xygrid" + id="grid2983" + empspacing="2" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-1040.3622)"> + <path + inkscape:transform-center-y="-3.9e-05" + inkscape:transform-center-x="-1.25" + transform="matrix(1,0,0,1.0392305,3,1044.2837)" + d="m 7,2 -7.5,4.330127 0,-8.660254 z" + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="1.0471976" + sodipodi:arg1="0" + sodipodi:r2="2.5" + sodipodi:r1="5" + sodipodi:cy="2" + sodipodi:cx="2" + sodipodi:sides="3" + id="path3802" + style="fill:#888a85;fill-opacity:1;stroke:#555753;stroke-width:0.98094367999999998;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + sodipodi:type="star" /> + <path + sodipodi:type="star" + style="fill:#888a85;fill-opacity:1;stroke:#555753;stroke-width:0.98094367999999998;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="path4312" + sodipodi:sides="3" + sodipodi:cx="2" + sodipodi:cy="2" + sodipodi:r1="5" + sodipodi:r2="2.5" + sodipodi:arg1="0" + sodipodi:arg2="1.0471976" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" + d="m 7,2 -7.5,4.330127 0,-8.660254 z" + transform="matrix(1,0,0,1.0392305,3,1044.2837)" + inkscape:transform-center-x="-1.25" + inkscape:transform-center-y="-3.9e-05" /> + <path + sodipodi:type="star" + style="fill:url(#linearGradient4330);fill-opacity:1;stroke:#555753;stroke-width:0.98094367999999998;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="path3760" + sodipodi:sides="3" + sodipodi:cx="2" + sodipodi:cy="2" + sodipodi:r1="5" + sodipodi:r2="2.5" + sodipodi:arg1="0" + sodipodi:arg2="1.0471976" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" + d="m 7,2 -7.5,4.330127 0,-8.660254 z" + transform="matrix(1,0,0,1.0392305,3,1044.2837)" + inkscape:transform-center-x="-1.25" + inkscape:transform-center-y="-3.9e-05" /> + <path + inkscape:transform-center-y="-3.9e-05" + inkscape:transform-center-x="-1.25" + transform="matrix(1,0,0,1.0392305,3,1044.2837)" + d="m 7,2 -7.5,4.330127 0,-8.660254 z" + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="1.0471976" + sodipodi:arg1="0" + sodipodi:r2="2.5" + sodipodi:r1="5" + sodipodi:cy="2" + sodipodi:cx="2" + sodipodi:sides="3" + id="path4314" + style="fill:url(#linearGradient4322);fill-opacity:1;stroke:#555753;stroke-width:0.98094367999999998;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + sodipodi:type="star" /> + </g> +</svg> diff --git a/image/toolbar/12x12/media-playback-start@2x.png b/image/toolbar/12x12/media-playback-start@2x.png Binary files differnew file mode 100644 index 0000000000..7bdf1bdeca --- /dev/null +++ b/image/toolbar/12x12/media-playback-start@2x.png 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 # |