diff options
23 files changed, 547 insertions, 26 deletions
diff --git a/Makefile.am b/Makefile.am index eb057853ca..f1ca6d917b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -952,6 +952,24 @@ EXTRA_DIST = \ image/toolbar/14x14/x-capture-comment-update.png \ image/toolbar/14x14/x-capture-comment-update.svg \ image/toolbar/14x14/x-capture-comment-update@2x.png \ + image/toolbar/14x14/x-capture-filter-bookmark.active.png \ + image/toolbar/14x14/x-capture-filter-bookmark.active.svg \ + image/toolbar/14x14/x-capture-filter-bookmark.active@2x.png \ + image/toolbar/14x14/x-capture-filter-bookmark.png \ + image/toolbar/14x14/x-capture-filter-bookmark.selected.png \ + image/toolbar/14x14/x-capture-filter-bookmark.selected.svg \ + image/toolbar/14x14/x-capture-filter-bookmark.selected@2x.png \ + image/toolbar/14x14/x-capture-filter-bookmark.svg \ + image/toolbar/14x14/x-capture-filter-bookmark@2x.png \ + image/toolbar/14x14/x-display-filter-bookmark.active.png \ + image/toolbar/14x14/x-display-filter-bookmark.active.svg \ + image/toolbar/14x14/x-display-filter-bookmark.active@2x.png \ + image/toolbar/14x14/x-display-filter-bookmark.png \ + image/toolbar/14x14/x-display-filter-bookmark.selected.png \ + image/toolbar/14x14/x-display-filter-bookmark.selected.svg \ + image/toolbar/14x14/x-display-filter-bookmark.selected@2x.png \ + image/toolbar/14x14/x-display-filter-bookmark.svg \ + image/toolbar/14x14/x-display-filter-bookmark@2x.png \ image/toolbar/14x14/x-expert-chat.png \ image/toolbar/14x14/x-expert-chat@2x.png \ image/toolbar/14x14/x-expert-error.png \ @@ -963,15 +981,6 @@ EXTRA_DIST = \ image/toolbar/14x14/x-expert-note@2x.png \ image/toolbar/14x14/x-expert-warn.png \ image/toolbar/14x14/x-expert-warn@2x.png \ - image/toolbar/14x14/x-filter-bookmark.active.png \ - image/toolbar/14x14/x-filter-bookmark.active.svg \ - image/toolbar/14x14/x-filter-bookmark.active@2x.png \ - image/toolbar/14x14/x-filter-bookmark.png \ - image/toolbar/14x14/x-filter-bookmark.selected.png \ - image/toolbar/14x14/x-filter-bookmark.selected.svg \ - image/toolbar/14x14/x-filter-bookmark.selected@2x.png \ - image/toolbar/14x14/x-filter-bookmark.svg \ - image/toolbar/14x14/x-filter-bookmark@2x.png \ image/toolbar/14x14/x-filter-clear.active.png \ image/toolbar/14x14/x-filter-clear.active.svg \ image/toolbar/14x14/x-filter-clear.active@2x.png \ diff --git a/image/toolbar.qrc b/image/toolbar.qrc index f6839621d1..6974d641bc 100644 --- a/image/toolbar.qrc +++ b/image/toolbar.qrc @@ -11,6 +11,18 @@ <qresource prefix="/icons"> <file>toolbar/14x14/x-capture-comment-update.png</file> <file>toolbar/14x14/x-capture-comment-update@2x.png</file> + <file>toolbar/14x14/x-capture-filter-bookmark.png</file> + <file>toolbar/14x14/x-capture-filter-bookmark@2x.png</file> + <file>toolbar/14x14/x-capture-filter-bookmark.active.png</file> + <file>toolbar/14x14/x-capture-filter-bookmark.active@2x.png</file> + <file>toolbar/14x14/x-capture-filter-bookmark.selected.png</file> + <file>toolbar/14x14/x-capture-filter-bookmark.selected@2x.png</file> + <file>toolbar/14x14/x-display-filter-bookmark.png</file> + <file>toolbar/14x14/x-display-filter-bookmark@2x.png</file> + <file>toolbar/14x14/x-display-filter-bookmark.active.png</file> + <file>toolbar/14x14/x-display-filter-bookmark.active@2x.png</file> + <file>toolbar/14x14/x-display-filter-bookmark.selected.png</file> + <file>toolbar/14x14/x-display-filter-bookmark.selected@2x.png</file> <file>toolbar/14x14/x-expert-chat.png</file> <file>toolbar/14x14/x-expert-chat@2x.png</file> <file>toolbar/14x14/x-expert-error.png</file> @@ -27,12 +39,6 @@ <file>toolbar/14x14/x-filter-clear.active@2x.png</file> <file>toolbar/14x14/x-filter-clear.selected.png</file> <file>toolbar/14x14/x-filter-clear.selected@2x.png</file> - <file>toolbar/14x14/x-filter-bookmark.png</file> - <file>toolbar/14x14/x-filter-bookmark@2x.png</file> - <file>toolbar/14x14/x-filter-bookmark.active.png</file> - <file>toolbar/14x14/x-filter-bookmark.active@2x.png</file> - <file>toolbar/14x14/x-filter-bookmark.selected.png</file> - <file>toolbar/14x14/x-filter-bookmark.selected@2x.png</file> <file>toolbar/14x14/x-filter-dropdown.png</file> <file>toolbar/14x14/x-filter-dropdown@2x.png</file> <file>toolbar/14x14/x-filter-matching-bookmark.png</file> diff --git a/image/toolbar/14x14/x-capture-filter-bookmark.active.png b/image/toolbar/14x14/x-capture-filter-bookmark.active.png Binary files differnew file mode 100644 index 0000000000..5df57a378a --- /dev/null +++ b/image/toolbar/14x14/x-capture-filter-bookmark.active.png diff --git a/image/toolbar/14x14/x-capture-filter-bookmark.active.svg b/image/toolbar/14x14/x-capture-filter-bookmark.active.svg new file mode 100644 index 0000000000..f1085c1d18 --- /dev/null +++ b/image/toolbar/14x14/x-capture-filter-bookmark.active.svg @@ -0,0 +1,153 @@ +<?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="14" + height="14" + viewBox="0 0 14 14" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="x-capture-filter-bookmark.active.svg" + inkscape:export-filename="/tmp/x-capture-filter-bookmark.active.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs4"> + <linearGradient + id="Wireshark_highlight"> + <stop + style="stop-color:#ffffff;stop-opacity:0.15753424;" + offset="0" + id="stop4516" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop4518" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#Wireshark_highlight" + id="linearGradient5566" + x1="17.5" + y1="1038.3622" + x2="20" + y2="1044.8622" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-10,0)" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="8.4221469" + inkscape:cx="-2.4987657" + inkscape:cy="7" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + units="px" + showguides="true" + inkscape:guide-bbox="true" + inkscape:window-width="1401" + inkscape:window-height="817" + inkscape:window-x="434" + inkscape:window-y="33" + inkscape:window-maximized="0" + inkscape:object-nodes="true"> + <inkscape:grid + type="xygrid" + id="grid4136" + spacingx="0.5" + spacingy="0.5" /> + <sodipodi:guide + position="7,8" + orientation="0,1" + id="guide4140" /> + </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,-1038.3622)"> + <path + style="fill:#73d216;fill-opacity:1;fill-rule:evenodd;stroke:#73d216;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 10,1039.3622 0,12.0001 -3,-3.4286 -3,3.4286 0,-12.0001 z" + id="path4953" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient5566);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 4,1038.3613 c -0.552262,10e-5 -0.999945,0.4477 -1,1 l 0,12 c -6.63e-4,0.9232 1.143171,1.3543 1.751953,0.6602 L 7,1049.4512 l 2.248047,2.5703 c 0.608782,0.6941 1.752616,0.263 1.751953,-0.6602 l 0,-12 c -5.5e-5,-0.5523 -0.447738,-0.9999 -1,-1 z" + id="path5548" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccccc" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:125%;font-family:Sans;-inkscape-font-specification:Helvetica;letter-spacing:0px;word-spacing:0px;fill:#8ae234;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;" + x="15.498643" + y="1042.2798" + id="text4147" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4149" + x="15.498643" + y="1042.2798">Plain: 8ae234</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:125%;font-family:Sans;-inkscape-font-specification:Helvetica;letter-spacing:0px;word-spacing:0px;fill:#73d216;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;" + x="15.804076" + y="1047.2047" + id="text4151" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4153" + x="15.804076" + y="1047.2047">Active: 73d216</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:125%;font-family:Sans;-inkscape-font-specification:Helvetica;letter-spacing:0px;word-spacing:0px;fill:#4e9a06;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;" + x="15.526486" + y="1052.3054" + id="text4155" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4157" + x="15.526486" + y="1052.3054">Selected: 4e9a06</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:125%;font-family:Sans;-inkscape-font-specification:Helvetica;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="15.398189" + y="1057.6213" + id="text4159" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4161" + x="15.398189" + y="1057.6213">http://emilis.info/other/extended_tango/</tspan></text> + </g> +</svg> diff --git a/image/toolbar/14x14/x-capture-filter-bookmark.active@2x.png b/image/toolbar/14x14/x-capture-filter-bookmark.active@2x.png Binary files differnew file mode 100644 index 0000000000..0beeb62945 --- /dev/null +++ b/image/toolbar/14x14/x-capture-filter-bookmark.active@2x.png diff --git a/image/toolbar/14x14/x-capture-filter-bookmark.png b/image/toolbar/14x14/x-capture-filter-bookmark.png Binary files differnew file mode 100644 index 0000000000..63e3cebb49 --- /dev/null +++ b/image/toolbar/14x14/x-capture-filter-bookmark.png diff --git a/image/toolbar/14x14/x-capture-filter-bookmark.selected.png b/image/toolbar/14x14/x-capture-filter-bookmark.selected.png Binary files differnew file mode 100644 index 0000000000..ca7d0f0b64 --- /dev/null +++ b/image/toolbar/14x14/x-capture-filter-bookmark.selected.png diff --git a/image/toolbar/14x14/x-capture-filter-bookmark.selected.svg b/image/toolbar/14x14/x-capture-filter-bookmark.selected.svg new file mode 100644 index 0000000000..572ea701a1 --- /dev/null +++ b/image/toolbar/14x14/x-capture-filter-bookmark.selected.svg @@ -0,0 +1,153 @@ +<?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="14" + height="14" + viewBox="0 0 14 14" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="x-capture-filter-bookmark.selected.svg" + inkscape:export-filename="/tmp/x-capture-filter-bookmark.active.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs4"> + <linearGradient + id="Wireshark_highlight"> + <stop + style="stop-color:#ffffff;stop-opacity:0.15753424;" + offset="0" + id="stop4516" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop4518" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#Wireshark_highlight" + id="linearGradient5566" + x1="17.5" + y1="1038.3622" + x2="20" + y2="1044.8622" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-10,0)" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="47.071429" + inkscape:cx="7" + inkscape:cy="7" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + units="px" + showguides="true" + inkscape:guide-bbox="true" + inkscape:window-width="1401" + inkscape:window-height="817" + inkscape:window-x="434" + inkscape:window-y="33" + inkscape:window-maximized="0" + inkscape:object-nodes="true"> + <inkscape:grid + type="xygrid" + id="grid4136" + spacingx="0.5" + spacingy="0.5" /> + <sodipodi:guide + position="7,8" + orientation="0,1" + id="guide4140" /> + </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,-1038.3622)"> + <path + style="fill:#4e9a06;fill-opacity:1;fill-rule:evenodd;stroke:#4e9a06;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 10,1039.3622 0,12.0001 -3,-3.4286 -3,3.4286 0,-12.0001 z" + id="path4953" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient5566);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 4,1038.3613 c -0.552262,10e-5 -0.999945,0.4477 -1,1 l 0,12 c -6.63e-4,0.9232 1.143171,1.3543 1.751953,0.6602 L 7,1049.4512 l 2.248047,2.5703 c 0.608782,0.6941 1.752616,0.263 1.751953,-0.6602 l 0,-12 c -5.5e-5,-0.5523 -0.447738,-0.9999 -1,-1 z" + id="path5548" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccccc" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:125%;font-family:Sans;-inkscape-font-specification:Helvetica;letter-spacing:0px;word-spacing:0px;fill:#8ae234;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;" + x="15.498643" + y="1042.2798" + id="text4147" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4149" + x="15.498643" + y="1042.2798">Plain: 8ae234</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:125%;font-family:Sans;-inkscape-font-specification:Helvetica;letter-spacing:0px;word-spacing:0px;fill:#73d216;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;" + x="15.804076" + y="1047.2047" + id="text4151" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4153" + x="15.804076" + y="1047.2047">Active: 73d216</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:125%;font-family:Sans;-inkscape-font-specification:Helvetica;letter-spacing:0px;word-spacing:0px;fill:#4e9a06;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;" + x="15.526486" + y="1052.3054" + id="text4155" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4157" + x="15.526486" + y="1052.3054">Selected: 4e9a06</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:125%;font-family:Sans;-inkscape-font-specification:Helvetica;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="15.398189" + y="1057.6213" + id="text4159" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4161" + x="15.398189" + y="1057.6213">http://emilis.info/other/extended_tango/</tspan></text> + </g> +</svg> diff --git a/image/toolbar/14x14/x-capture-filter-bookmark.selected@2x.png b/image/toolbar/14x14/x-capture-filter-bookmark.selected@2x.png Binary files differnew file mode 100644 index 0000000000..7a6d87bbf9 --- /dev/null +++ b/image/toolbar/14x14/x-capture-filter-bookmark.selected@2x.png diff --git a/image/toolbar/14x14/x-capture-filter-bookmark.svg b/image/toolbar/14x14/x-capture-filter-bookmark.svg new file mode 100644 index 0000000000..5a9d9fe732 --- /dev/null +++ b/image/toolbar/14x14/x-capture-filter-bookmark.svg @@ -0,0 +1,153 @@ +<?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="14" + height="14" + viewBox="0 0 14 14" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="x-capture-filter-bookmark.svg" + inkscape:export-filename="/tmp/x-capture-filter-bookmark@2x.png" + inkscape:export-xdpi="180" + inkscape:export-ydpi="180"> + <defs + id="defs4"> + <linearGradient + id="Wireshark_highlight"> + <stop + style="stop-color:#ffffff;stop-opacity:0.15753424;" + offset="0" + id="stop4516" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop4518" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#Wireshark_highlight" + id="linearGradient5566" + x1="17.5" + y1="1038.3622" + x2="20" + y2="1044.8622" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-10,0)" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="46.928571" + inkscape:cx="7.0852359" + inkscape:cy="7" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + units="px" + showguides="true" + inkscape:guide-bbox="true" + inkscape:window-width="1401" + inkscape:window-height="817" + inkscape:window-x="265" + inkscape:window-y="274" + inkscape:window-maximized="0" + inkscape:object-nodes="true"> + <inkscape:grid + type="xygrid" + id="grid4136" + spacingx="0.5" + spacingy="0.5" /> + <sodipodi:guide + position="7,8" + orientation="0,1" + id="guide4140" /> + </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 /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-1038.3622)"> + <path + style="fill:#8ae234;fill-rule:evenodd;stroke:#8ae234;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1" + d="m 10,1039.3622 0,12.0001 -3,-3.4286 -3,3.4286 0,-12.0001 z" + id="path4953" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient5566);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 4,1038.3613 c -0.552262,10e-5 -0.999945,0.4477 -1,1 l 0,12 c -6.63e-4,0.9232 1.143171,1.3543 1.751953,0.6602 L 7,1049.4512 l 2.248047,2.5703 c 0.608782,0.6941 1.752616,0.263 1.751953,-0.6602 l 0,-12 c -5.5e-5,-0.5523 -0.447738,-0.9999 -1,-1 z" + id="path5548" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccccc" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:125%;font-family:Sans;-inkscape-font-specification:Helvetica;letter-spacing:0px;word-spacing:0px;fill:#8ae234;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;" + x="15.498643" + y="1042.2798" + id="text4147" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4149" + x="15.498643" + y="1042.2798">Plain: 8ae234</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:125%;font-family:Sans;-inkscape-font-specification:Helvetica;letter-spacing:0px;word-spacing:0px;fill:#73d216;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;" + x="15.804076" + y="1047.2047" + id="text4151" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4153" + x="15.804076" + y="1047.2047">Active: 73d216</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:125%;font-family:Sans;-inkscape-font-specification:Helvetica;letter-spacing:0px;word-spacing:0px;fill:#4e9a06;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;" + x="15.526486" + y="1052.3054" + id="text4155" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4157" + x="15.526486" + y="1052.3054">Selected: 4e9a06</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:125%;font-family:Sans;-inkscape-font-specification:Helvetica;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="15.398189" + y="1057.6213" + id="text4159" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4161" + x="15.398189" + y="1057.6213">http://emilis.info/other/extended_tango/</tspan></text> + </g> +</svg> diff --git a/image/toolbar/14x14/x-capture-filter-bookmark@2x.png b/image/toolbar/14x14/x-capture-filter-bookmark@2x.png Binary files differnew file mode 100644 index 0000000000..ac3b69e55c --- /dev/null +++ b/image/toolbar/14x14/x-capture-filter-bookmark@2x.png diff --git a/image/toolbar/14x14/x-filter-bookmark.active.png b/image/toolbar/14x14/x-display-filter-bookmark.active.png Binary files differindex a9bf35a7dd..a9bf35a7dd 100644 --- a/image/toolbar/14x14/x-filter-bookmark.active.png +++ b/image/toolbar/14x14/x-display-filter-bookmark.active.png diff --git a/image/toolbar/14x14/x-filter-bookmark.active.svg b/image/toolbar/14x14/x-display-filter-bookmark.active.svg index 59336bb970..59336bb970 100644 --- a/image/toolbar/14x14/x-filter-bookmark.active.svg +++ b/image/toolbar/14x14/x-display-filter-bookmark.active.svg diff --git a/image/toolbar/14x14/x-filter-bookmark.active@2x.png b/image/toolbar/14x14/x-display-filter-bookmark.active@2x.png Binary files differindex 1988700e55..1988700e55 100644 --- a/image/toolbar/14x14/x-filter-bookmark.active@2x.png +++ b/image/toolbar/14x14/x-display-filter-bookmark.active@2x.png diff --git a/image/toolbar/14x14/x-filter-bookmark.png b/image/toolbar/14x14/x-display-filter-bookmark.png Binary files differindex fbeeb3466d..fbeeb3466d 100644 --- a/image/toolbar/14x14/x-filter-bookmark.png +++ b/image/toolbar/14x14/x-display-filter-bookmark.png diff --git a/image/toolbar/14x14/x-filter-bookmark.selected.png b/image/toolbar/14x14/x-display-filter-bookmark.selected.png Binary files differindex 0bb4dcd817..0bb4dcd817 100644 --- a/image/toolbar/14x14/x-filter-bookmark.selected.png +++ b/image/toolbar/14x14/x-display-filter-bookmark.selected.png diff --git a/image/toolbar/14x14/x-filter-bookmark.selected.svg b/image/toolbar/14x14/x-display-filter-bookmark.selected.svg index 3690c887a3..3690c887a3 100644 --- a/image/toolbar/14x14/x-filter-bookmark.selected.svg +++ b/image/toolbar/14x14/x-display-filter-bookmark.selected.svg diff --git a/image/toolbar/14x14/x-filter-bookmark.selected@2x.png b/image/toolbar/14x14/x-display-filter-bookmark.selected@2x.png Binary files differindex ae64fd7a86..ae64fd7a86 100644 --- a/image/toolbar/14x14/x-filter-bookmark.selected@2x.png +++ b/image/toolbar/14x14/x-display-filter-bookmark.selected@2x.png diff --git a/image/toolbar/14x14/x-filter-bookmark.svg b/image/toolbar/14x14/x-display-filter-bookmark.svg index 1945279613..0e8dc9eff9 100644 --- a/image/toolbar/14x14/x-filter-bookmark.svg +++ b/image/toolbar/14x14/x-display-filter-bookmark.svg @@ -51,8 +51,8 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="26.663818" - inkscape:cx="3.9658628" + inkscape:zoom="21.601466" + inkscape:cx="12.646295" inkscape:cy="6.6686077" inkscape:document-units="px" inkscape:current-layer="layer1" @@ -62,8 +62,8 @@ inkscape:guide-bbox="true" inkscape:window-width="1401" inkscape:window-height="817" - inkscape:window-x="369" - inkscape:window-y="214" + inkscape:window-x="23" + inkscape:window-y="736" inkscape:window-maximized="0" inkscape:object-nodes="true"> <inkscape:grid @@ -105,5 +105,49 @@ id="path5548" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccc" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:125%;font-family:Sans;-inkscape-font-specification:Helvetica;letter-spacing:0px;word-spacing:0px;fill:#729fcf;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;" + x="15.498643" + y="1042.2798" + id="text4147" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4149" + x="15.498643" + y="1042.2798">Plain: 729fcf</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:125%;font-family:Sans;-inkscape-font-specification:Helvetica;letter-spacing:0px;word-spacing:0px;fill:#3565a4;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="15.804076" + y="1047.2047" + id="text4151" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4153" + x="15.804076" + y="1047.2047">Active: 3465a4</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:125%;font-family:Sans;-inkscape-font-specification:Helvetica;letter-spacing:0px;word-spacing:0px;fill:#204a87;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="15.526486" + y="1052.3054" + id="text4155" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4157" + x="15.526486" + y="1052.3054">Selected: 204a87</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:125%;font-family:Sans;-inkscape-font-specification:Helvetica;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="15.398189" + y="1057.6213" + id="text4159" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4161" + x="15.398189" + y="1057.6213">http://emilis.info/other/extended_tango/</tspan></text> </g> </svg> diff --git a/image/toolbar/14x14/x-filter-bookmark@2x.png b/image/toolbar/14x14/x-display-filter-bookmark@2x.png Binary files differindex 1ca597cdfc..1ca597cdfc 100644 --- a/image/toolbar/14x14/x-filter-bookmark@2x.png +++ b/image/toolbar/14x14/x-display-filter-bookmark@2x.png diff --git a/image/toolbar/svg-to-png.sh b/image/toolbar/svg-to-png.sh index a4fbc27152..bcdfa0cf58 100755 --- a/image/toolbar/svg-to-png.sh +++ b/image/toolbar/svg-to-png.sh @@ -55,18 +55,21 @@ ICONS=" x-capture-file-close x-capture-file-save x-capture-file-reload + x-capture-filter-bookmark + x-capture-filter-bookmark.active + x-capture-filter-bookmark.selected x-capture-options x-capture-restart x-capture-start.on x-capture-start x-capture-stop x-colorize-packets + x-display-filter-bookmark + x-display-filter-bookmark.active + x-display-filter-bookmark.selected x-filter-apply x-filter-apply.active x-filter-apply.selected - x-filter-bookmark - x-filter-bookmark.active - x-filter-bookmark.selected x-filter-clear x-filter-clear.active x-filter-clear.selected diff --git a/ui/qt/capture_filter_edit.cpp b/ui/qt/capture_filter_edit.cpp index 24b4fe37ac..da63638aa8 100644 --- a/ui/qt/capture_filter_edit.cpp +++ b/ui/qt/capture_filter_edit.cpp @@ -132,7 +132,7 @@ CaptureFilterEdit::CaptureFilterEdit(QWidget *parent, bool plain) : #endif if (!plain_) { - bookmark_button_ = new StockIconToolButton(this, "x-filter-bookmark"); + bookmark_button_ = new StockIconToolButton(this, "x-capture-filter-bookmark"); bookmark_button_->setCursor(Qt::ArrowCursor); bookmark_button_->setMenu(new QMenu()); bookmark_button_->setPopupMode(QToolButton::InstantPopup); @@ -315,7 +315,7 @@ void CaptureFilterEdit::checkFilter(const QString& filter) remove_action_->setVisible(true); } } else { - bookmark_button_->setStockIcon("x-filter-bookmark"); + bookmark_button_->setStockIcon("x-capture-filter-bookmark"); if (remove_action_) { remove_action_->setVisible(false); } diff --git a/ui/qt/display_filter_edit.cpp b/ui/qt/display_filter_edit.cpp index 749f856403..2c3d83131b 100644 --- a/ui/qt/display_filter_edit.cpp +++ b/ui/qt/display_filter_edit.cpp @@ -121,7 +121,7 @@ DisplayFilterEdit::DisplayFilterEdit(QWidget *parent, DisplayFilterEditType type // Combo drop-down if (type_ == DisplayFilterToApply) { - bookmark_button_ = new StockIconToolButton(this, "x-filter-bookmark"); + bookmark_button_ = new StockIconToolButton(this, "x-display-filter-bookmark"); bookmark_button_->setCursor(Qt::ArrowCursor); bookmark_button_->setMenu(new QMenu()); bookmark_button_->setPopupMode(QToolButton::InstantPopup); @@ -358,7 +358,7 @@ void DisplayFilterEdit::checkFilter(const QString& filter_text) remove_action_->setVisible(true); } } else { - bookmark_button_->setStockIcon("x-filter-bookmark"); + bookmark_button_->setStockIcon("x-display-filter-bookmark"); if (remove_action_) { remove_action_->setVisible(false); } |