diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-06-23 20:26:30 +0200 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2015-06-24 17:10:01 +0000 |
commit | 17c59f5090cfac230723ee7f31c7af061fe7d60b (patch) | |
tree | 691b047cc709a38fce1b15a5f29b0bec38056bc9 | |
parent | 5dcd207cc63854f8d0f401baaa4733ed48cb2d0a (diff) |
Qt: Add Reload button on MainToolBar
Add @2x versions of x-capture-file-reload as well.
Change-Id: I08819cf66903884e0344a4f9bcd891befb582e90
Reviewed-on: https://code.wireshark.org/review/9066
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-rw-r--r-- | image/toolbar/16x16/x-capture-file-reload@2x.png | bin | 1121 -> 1924 bytes | |||
-rw-r--r-- | image/toolbar/16x16/x-capture-file-reload@2x.svg | 116 | ||||
-rw-r--r-- | image/toolbar/24x24/x-capture-file-reload@2x.png | bin | 2006 -> 3174 bytes | |||
-rw-r--r-- | image/toolbar/24x24/x-capture-file-reload@2x.svg | 114 | ||||
-rw-r--r-- | ui/qt/main_window.cpp | 2 | ||||
-rw-r--r-- | ui/qt/main_window.ui | 3 |
6 files changed, 233 insertions, 2 deletions
diff --git a/image/toolbar/16x16/x-capture-file-reload@2x.png b/image/toolbar/16x16/x-capture-file-reload@2x.png Binary files differindex 6acdd59a5a..87a9b7a6dc 100644 --- a/image/toolbar/16x16/x-capture-file-reload@2x.png +++ b/image/toolbar/16x16/x-capture-file-reload@2x.png diff --git a/image/toolbar/16x16/x-capture-file-reload@2x.svg b/image/toolbar/16x16/x-capture-file-reload@2x.svg new file mode 100644 index 0000000000..16bbbfab75 --- /dev/null +++ b/image/toolbar/16x16/x-capture-file-reload@2x.svg @@ -0,0 +1,116 @@ +<?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="32" + height="32" + id="svg2" + version="1.1" + inkscape:version="0.48.2 r9819" + sodipodi:docname="x-capture-file-reload@2x.svg" + inkscape:export-filename="x-capture-file-close.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs4"> + <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" /> + <marker + inkscape:stockid="TriangleInSxF" + orient="auto" + refY="0" + refX="0" + id="TriangleInSxF" + style="overflow:visible"> + <path + inkscape:connector-curvature="0" + id="path3031" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#204a87;fill-rule:evenodd;stroke:#204a87;stroke-width:1pt;marker-start:none" + transform="scale(-0.2,-0.2)" /> + </marker> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="17.90625" + inkscape:cx="16" + inkscape:cy="16" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:window-width="1200" + inkscape:window-height="742" + inkscape:window-x="86" + inkscape:window-y="75" + inkscape:window-maximized="0"> + <inkscape:grid + type="xygrid" + id="grid3064" + empspacing="4" + 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,-1020.3622)"> + <image + y="1020.3622" + x="0" + id="image3272" + xlink:href="file:///Users/gcombs/Development/wireshark/image/WiresharkDoc-32.png" + height="32" + width="32" /> + <path + style="fill:none;stroke:#888a85;stroke-width:2px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 3,1021.3622 0,30 26,0 0,-22 -8,-8 z" + id="path3140" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> + <path + sodipodi:open="true" + sodipodi:end="4.712389" + sodipodi:start="0" + transform="matrix(1.9687619,0,0,1.9838771,-62.53714,1020.3267)" + d="M 44.767801,8.8390093 A 4.8761611,4.8390093 0 1 1 39.89164,4" + sodipodi:ry="4.8390093" + sodipodi:rx="4.8761611" + sodipodi:cy="8.8390093" + sodipodi:cx="39.89164" + id="path2989" + style="fill:none;stroke:#204a87;stroke-width:2.42877483;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#TriangleInSxF)" + sodipodi:type="arc" /> + </g> +</svg> diff --git a/image/toolbar/24x24/x-capture-file-reload@2x.png b/image/toolbar/24x24/x-capture-file-reload@2x.png Binary files differindex 6e0adb188b..40abb815a0 100644 --- a/image/toolbar/24x24/x-capture-file-reload@2x.png +++ b/image/toolbar/24x24/x-capture-file-reload@2x.png diff --git a/image/toolbar/24x24/x-capture-file-reload@2x.svg b/image/toolbar/24x24/x-capture-file-reload@2x.svg new file mode 100644 index 0000000000..13516064e8 --- /dev/null +++ b/image/toolbar/24x24/x-capture-file-reload@2x.svg @@ -0,0 +1,114 @@ +<?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="48" + height="48" + id="svg2" + version="1.1" + inkscape:version="0.48.2 r9819" + sodipodi:docname="x-capture-file-reload@2x.svg"> + <defs + id="defs4"> + <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" /> + <marker + inkscape:stockid="TriangleInSxF" + orient="auto" + refY="0" + refX="0" + id="TriangleInSxF" + style="overflow:visible"> + <path + inkscape:connector-curvature="0" + id="path3031" + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill:#204a87;fill-rule:evenodd;stroke:#204a87;stroke-width:1pt;marker-start:none" + transform="scale(-0.2,-0.2)" /> + </marker> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="10.48775" + inkscape:cx="24" + inkscape:cy="24" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:window-width="1062" + inkscape:window-height="672" + inkscape:window-x="370" + inkscape:window-y="35" + inkscape:window-maximized="0"> + <inkscape:grid + type="xygrid" + id="grid3173" + 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,-1004.3622)"> + <image + sodipodi:absref="/Users/gcombs/Development/wireshark/image/toolbar/24x24/../../WiresharkDoc-48.png" + xlink:href="../../WiresharkDoc-48.png" + width="48" + height="48" + id="image4129" + x="0" + y="1004.3622" /> + <path + style="fill:none;stroke:#888a85;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + d="m 5,1005.3622 c 0,46 0,46 0,46 l 37,0 0,-37 -9.000002,-9 z" + id="path3240" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> + <path + sodipodi:open="true" + sodipodi:end="4.712389" + sodipodi:start="0" + transform="matrix(2.4609523,0,0,2.4590421,-74.171423,1006.6267)" + d="M 44.767801,8.8390093 A 4.8761611,4.8390093 0 1 1 39.89164,4" + sodipodi:ry="4.8390093" + sodipodi:rx="4.8761611" + sodipodi:cy="8.8390093" + sodipodi:cx="39.89164" + id="path2989" + style="fill:none;stroke:#204a87;stroke-width:1.62601817;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-mid:none;marker-end:url(#TriangleInSxF)" + sodipodi:type="arc" /> + </g> +</svg> diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index 76d3924f77..53d1f097f1 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -1506,7 +1506,7 @@ void MainWindow::initMainToolbarIcons() main_ui_->actionFileOpen->setIcon(StockIcon("document-open")); main_ui_->actionFileSave->setIcon(StockIcon("x-capture-file-save")); main_ui_->actionFileClose->setIcon(StockIcon("x-capture-file-close")); -// main_ui_->actionViewReload->setIcon(StockIcon("x-capture-file-reload")); + main_ui_->actionViewReload->setIcon(StockIcon("x-capture-file-reload")); main_ui_->actionEditFindPacket->setIcon(StockIcon("edit-find")); main_ui_->actionGoPreviousPacket->setIcon(StockIcon("go-previous")); diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui index 06b6dbc601..60b53fe48d 100644 --- a/ui/qt/main_window.ui +++ b/ui/qt/main_window.ui @@ -580,6 +580,7 @@ <addaction name="actionFileOpen"/> <addaction name="actionFileSave"/> <addaction name="actionFileClose"/> + <addaction name="actionViewReload"/> <addaction name="separator"/> <addaction name="actionEditFindPacket"/> <addaction name="actionGoPreviousPacket"/> @@ -995,7 +996,7 @@ <string>Ctrl+R</string> </property> <property name="iconVisibleInMenu"> - <bool>false</bool> + <bool>true</bool> </property> </action> <action name="actionCaptureOptions"> |