path: root/image
AgeCommit message (Collapse)AuthorFilesLines
2018-03-07More licenses converted to SPDX.Dario Lombardo1-13/+1
Change-Id: Id4f987dcdacf06622d70263f4659a4400e30dc39 Reviewed-on: https://code.wireshark.org/review/26332 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-02Windows: Update target version infoGraham Bloice1-2/+0
Set the API target level to Win7, along with installer changes to match. Change-Id: Icd93964eadf93018c56218e3efdfed10b9f8959a Reviewed-on: https://code.wireshark.org/review/26218 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2018-02-10CMake: Don't shadow PROCESSOR_ARCHITECTURE.Gerald Combs1-2/+2
PROCESSOR_ARCHITECTURE is a standard Windows environment variable. Rename the CMake variable WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE. Change-Id: I03109d45d6fb5f00742cd43085a9d33d9e5ddf1f Reviewed-on: https://code.wireshark.org/review/25721 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-30Remove more unused images.Gerald Combs13-5846/+0
We stopped using various images in the following commits: 307c0d70fb (2011, not sure how they lasted that long) clist_*.xpm 20cc0d7ce9 (2010) stock_dialog_error_48.xpm stock_dialog_info_48.xpm stock_dialog_warning_48.xpm stock_dialog_stop_48.xpm 2e4e229739 (2004) stock_dialog_question_48.xpm 1a3e596609 (2011) voip_select.xpm 194a145c8f (2013) wssplash*.xpm 07c3d057b8 (2013) openhand-16.png rubberband-16.png Change-Id: I3647cb2cb47e3927a4359f519ce45eb57e5aa534 Reviewed-on: https://code.wireshark.org/review/25519 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-30Remove some unused images.Gerald Combs9-9/+2
The NSIS checkboxes were last used in 2003. I'm not sure if the KDE icons ({hi,lo}??-app-wireshark.png) were ever used. Change-Id: Ib548b0fcfb650b279e8d475f350cdba663f903c0 Reviewed-on: https://code.wireshark.org/review/25512 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-24Windows: Modify position of compress checkbox in Export Packets dialogGraham Bloice1-28/+28
The "Compress with gzip" checkbox was over on the right and cut-off. Move it to a (somewhat) better place. Change-Id: I241e6216ba69c5fa4e4709e311d45dfecdad2c2d Reviewed-on: https://code.wireshark.org/review/25448 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2018-01-05Qt: Move sized toolbar images to stock_icons.Gerald Combs207-144/+143
The sized (WWxHH) icons in the toolbar directory aren't limited to toolbars. Create a "stock_icons" directory and move them and their related SVGs there. Change-Id: I2c1852499594aa738371c79542f24bd3351653bb Reviewed-on: https://code.wireshark.org/review/25133 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-16Qt: Add UAT move up and down buttonsStig Bjørlykke5-0/+4
Add two new buttons for moving entries up and down in the list. Change-Id: I90e5c5812754391651885e2a622148cecc124099 Reviewed-on: https://code.wireshark.org/review/24413 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-14Qt: Change delete_list icon transparent valueStig Bjørlykke2-0/+0
Update the delete_list icon to have same transparent value as the other icons used in UAT handling. Change-Id: I5de7f3d6c0292e6ffde7d8cfd08a899e135fe108 Reviewed-on: https://code.wireshark.org/review/24411 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-26CMake: Set the Windows build target to Vista.Gerald Combs1-5/+10
Set NTDDI_VERSION and _WIN32_WINNT to their Vista values so that ws2tcpip.h will define inet_pton and inet_ntop. Remove the associated compiler version checks so that everyone is on the same page. Add breadcrumbs to the various parts of the code where we set a minimum Windows version. Change-Id: I83bba5fa1024bfbc02e07b120412807ad259e291 Reviewed-on: https://code.wireshark.org/review/24080 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-10-24Add 32x32 png file for UAT "clear list" iconMichael Mann3-1/+3
Change-Id: Ifff401d9014d58c3848e1fcb2f09f09d4391e61e Reviewed-on: https://code.wireshark.org/review/24043 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-21Add button in Qt UAT dialog/frame to remove all UAT entries at once.Michael Mann3-0/+3
Change-Id: If5a172cd69beeb0b9a22eb7f6b9e7cb25f350b49 Reviewed-on: https://code.wireshark.org/review/23968 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-30Expand Merge file dialog on WindowsMichael Mann1-1/+1
Resize so all options can be seen Bug: 13924 Change-Id: I1e347e83432305cc30f54f61efdb6e4c92e98d5a Reviewed-on: https://code.wireshark.org/review/22850 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-05A bunch of "{Mac} OS X" -> "macOS" changes.Guy Harris1-2/+2
Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X 10.0", for example. It was "Mac OS X" until 10.8 (although 10.7 was sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS X" from 10.8 to 10.11. Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3 Reviewed-on: https://code.wireshark.org/review/20933 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-09Remove name resolution from the file dialogs.Gerald Combs1-28/+28
A single name resolution checkbox was added to the file dialog way back in 2000 in g0f7cf64. At that time it was needed because resolution was synchronous and could drastically affect your load time. Since then we've added asynchronous name resolution and more recently made it mandatory (ge005bc8). We've also added more name resolution checkboxes and other controls. Remove the name resolution checkboxes. You can just as easily change resolution options before or after opening a file and they take up valuable real estate. Combine the size and packets in the Qt and Win32 dialogs and pretty-print the size. Combine the start and elapsed times in the Qt, Win32, and GTK+ dialogs. This lets us shrink the custom areas of the file dialogs even further. Make the default file type combo item more descriptive. Change-Id: Id770adc0f284a4c7f08ee5a7db84f8435f4bf907 Reviewed-on: https://code.wireshark.org/review/17597 Tested-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-30Recompress PNGs.Gerald Combs174-0/+0
Recompress PNGs using the current versions of various compressors: optipng 0.7.6 advpng 1.20 advdef 1.20 pngcrush 1.8.1 Parallelize PNG compression. Note why we're not using a couple of other compression utilities. Change-Id: I52757d0bc2d424013e7f00b693a0f5378427cc31 Reviewed-on: https://code.wireshark.org/review/16209 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-22Windows: rename wiretap-${PROJECT_VERSION}.dll to libwiretap.dllPascal Quantin1-1/+1
This aligns the name with what is done for other Wireshark shared libraries. Moreover it allows to compile a wiretap plugin once per major release, without the need to recompile it each time ${PROJECT_VERSION} changes (each nightly build / official release). Change-Id: I53c82277223a4f323079cf695168ac85c2fba523 Reviewed-on: https://code.wireshark.org/review/16058 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-15Remove Nmake build systemPascal Quantin1-109/+0
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61 Reviewed-on: https://code.wireshark.org/review/15777 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-01-30Update filter bookmark icons.Gerald Combs20-13/+525
Separate the capture and display filter bookmark icons. Make the capture icon green to match(-ish) the active capture icon. Tested on nice+new and janky+old displays. Change-Id: I6ed532c8a49da50fe2a7de3d8fbd0b1af7623b4a Reviewed-on: https://code.wireshark.org/review/13612 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-12-03Change codecs from static to dynamic libraryPascal Quantin2-1/+40
This allows to properly register codecs plugins. See https://www.wireshark.org/lists/wireshark-dev/201511/msg00202.html for details. Change-Id: Ibc13a19936abb7a2e81b86582a75fa424351565b Reviewed-on: https://code.wireshark.org/review/12385 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-16Fix dist.Gerald Combs1-0/+0
Fixup the name of the SVG file that contains all of the expert indicators. Change-Id: Ia45038fcf965973cc7585cc7c68dc24807e59168 Reviewed-on: https://code.wireshark.org/review/11099 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-16Use buttons to display the main status bar icons.Gerald Combs16-17/+942
Use QToolButtons to display the expert indicator and comment icons in the main status bar. Use the same style sheet hack we use in ProgressFrame to un-style the buttons. Make sure we specify the @2x comment icon in our .qrc file so that it's loaded and used on retina displays. Move the comment and expert .pngs to the stock icon directory and use StockIcon to load them. Remove status.qrc since it's no longer used. Change-Id: I84485b22656f8f9af29ad3c02446ffefb6657ed5 Reviewed-on: https://code.wireshark.org/review/11048 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-05Make the capture comment icon more Wireshark-y.Gerald Combs3-0/+930
Change-Id: Ic693c7afc1658c3b89ae5cddf9c7ab32c435cf2e Reviewed-on: https://code.wireshark.org/review/10788 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-23Use the Qt-provided media icons.Gerald Combs5-189/+2
Use Qt's standard pixmaps to build our media playback, stop, and pause icons. Note that we probably don't want to do this for all of the available standard pixmaps. Change-Id: I78541a46a65583d7365cd601c578ebe8f197c060 Reviewed-on: https://code.wireshark.org/review/10609 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-09-06Display filter edit updates.Gerald Combs59-27/+1860
Have the bookmark button operate on saved display filters, similar to the "Filter:" button in the GTK+ UI. Expose the saved display filter list via a popup menu. Update the display filter icons. Make the "Apply" button wider. Remove the old icon assets. Add a StockIconToolButton class along with note explaining why it's necessary. Rename the "Filter Bookmarks" preference to "Filter Shortcuts". Suggestion for a better name are welcome. Change-Id: I0082d3f01b017253fa75e51cbff9beb17c41a209 Reviewed-on: https://code.wireshark.org/review/10390 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2015-06-24Run compress-pngs.sh.Gerald Combs16-0/+0
Change-Id: If662cfbe6ad2ce80916d32750476e95f607fe902 Reviewed-on: https://code.wireshark.org/review/9100 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-24Qt: Add Reload button on MainToolBarAlexis La Goutte4-0/+230
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>
2015-06-07Restore image/expert_ok.png, it is used by GTK+ UIBalint Reczey1-0/+0
Change-Id: I22f414ca030dcb701c1b21808cd4356b7c291291 Reviewed-on: https://code.wireshark.org/review/8805 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-08Add the @2x expert indicators.Gerald Combs6-0/+5
We currently load the expert indicator resources using an <img> tag. According to QTBUG-36383 the @2x versions won't load unless you've built with Qt 5.4.0 or later. Change-Id: I003fd5d5f10e779f2e7ca6ba9fbb8e033df85b80 Reviewed-on: https://code.wireshark.org/review/7601 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-08Update the expert indicators.Gerald Combs8-203/+393
Add @2x versions. Remove expert_ok. It appears to be unused. Change-Id: If36f839f622e235334a4237a9c5424c15a9945bc Reviewed-on: https://code.wireshark.org/review/7594 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-02Qt: Add @2x images to the layout preferences.Gerald Combs9-0/+6
Run compress-pngs on the normal and @2x images. Change-Id: Ic5bc3c42273078f32511d986b299d8606c016f6d Reviewed-on: https://code.wireshark.org/review/7499 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-27Qt: Automatically scroll the packet list.Michal Labedzki6-27/+63
Add an "Auto Scroll in Live Capture" action to the Go menu. It's in the View menu in the GTK+ UI but it seems to make more sense as a navigation item. Use a timeout interval for automatic scrolling. I haven't run any tests to see if this makes a difference but it would seem that the less drawing we do during a high speed capture the better, particularly for remote displays. Update the x-stay-last icons. Note that we might want to make prefs.capture_auto_scroll a "recent" setting. Mark auto_scroll_live and packet_list_check_end GTK+ only. Bug: 10601 Co-authored-by: Gerald Combs <gerald@wireshark.org> Change-Id: I645d27c0814f0e4a0d5b01ae68be366847e2522d Reviewed-on: https://code.wireshark.org/review/7292 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-14WSUG and image updates.Gerald Combs1-15/+0
Update the protocol hierarchy, conversation, and endpoint sections of the User's Guide. When everything is an admonition nothing stands out. Make a series of "NOTE"s plain old paragraphs. Scale the new conversation and endpoint images to fit the page width. This looks funny in my browser but I'm not sure about the best way to fix it. Move image/compress-pngs to the tools directory. Use it to reduce the size of the WSUG and WSDG images. Fixup traffic table column names and window titles. Change-Id: I674342ed901fc64563b384ee5e1f35413736cb19 Reviewed-on: https://code.wireshark.org/review/7122 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-11Fix CMake generation and use of Windows .rc filesGraham Bloice12-12/+23
CMake now generates local copies of .rc files for all the Windows components and uses the files in the build of the components. The .rc.in files that include an icon were modified to allow the icon path to be set by CMake. The path is removed for nmake builds. Updated build architecture detection, required for wireshark.manifest.in Change-Id: I7b1ff43050e9b0efb861d1041636fb4aef49a4f8 Reviewed-on: https://code.wireshark.org/review/6482 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-12-09Qt: Initial VoIP Calls dialog.Gerald Combs5-8/+197
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>
2014-12-09Qt: Update and rename the summary dialog.Gerald Combs1-0/+3
Go back to a single view similar to the GTK+ UI. Apply layouts using Qt Designer. Rename the menu item and class to "Capture File Properties". It's not really a summary if it contains details such as "marked average bits per second". We might want to move this to a "Properties" item under the "File" menu similar to other applications. Add the GTK+ summary icon (for now) to the toolbar and open the properties dialog on clicking. Singleton dialogs delenda est[1]. Let the user open as many summaries on as many capture files as he or she wishes. Also, global cfile delenda est[2]. Don't blindly include QtGui. Add specific components instead. Use consistent method names, variable names, and patterns. Try to document what "consistent" means. Adjust the way we display some statistics to match the summary bar, e.g. displayed = captured if we don't have a filter applied. [1] Not really. [2] Yes, really. Change-Id: I11793b1d79dd0c3f70414ac8592b86181da59916 Reviewed-on: https://code.wireshark.org/review/5274 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-04Qt: Dynamic languagesMichal Labedzki8-0/+64
- get language as soon as possible (before creating any Qt objects) to make all translations working - dynamic list of supported languages - runtime change of GUI language (no need to restart application) - add flags icons support - search for *.qm languages in buildin resources, then data dir called "languages" (main directory in sources or /usr/share/wireshark/languages), then user directory (UNIX: ~/.wireshark/languages); "languages" directory should contains files wireshark_xx.qm where xx is language code (en, en_GB, etc.), and optional xx.svg for flag icon - try to fix some untranslated manually-created UI items (need manual reset text of those components) Change-Id: I62ca8a8cddce47cec9dbcad6b0bd68b6cfd92229 Reviewed-on: https://code.wireshark.org/review/5041 Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-02Add identification of Windows (Server) 10Pascal Quantin1-0/+2
Change-Id: I5ab7a4dc67ceac644faead0d9e460e3babaf6355 Reviewed-on: https://code.wireshark.org/review/5067 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-28Qt: Add a set of 2x 16-pixel toolbar icons.Gerald Combs88-78/+302
Optimize the toolbar PNGs. To do: The rest of the PNGs. Change-Id: Ieed8b0d099655994d43cdc9cf6c9a094d84c1802 Reviewed-on: https://code.wireshark.org/review/4978 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-28Add GPLv2+ license header to keep license-check happy.Jeff Morriss1-0/+20
This change must be reviewed/approved by the script's author (Gerald). Change-Id: Id89c1d05bf43cdd2d6823b5ef46162a9f11fb263 Reviewed-on: https://code.wireshark.org/review/4972 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-28Qt: Add a set of 2x 24-pixel toolbar icons.Gerald Combs37-23/+710
Add a script to create each PNG from its source SVG using Inkscape (which can conveniently be run from the command line). Change-Id: Ief7410cf76fb1553ce56f1c6bc1ade03ab5db1d6 Reviewed-on: https://code.wireshark.org/review/4964 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-23Qt: Add zoom and column resize actions.Gerald Combs19-123/+144
Plumb signals and slots for changing the text size in the main window. Remove the bold font code from WiresharkApplication. It was only used in ByteViewText. Adjust the icons a bit. Bug: When we change the font preferences the packet list stops drawing cached strings. I haven't been able to track down the cause. Change-Id: I609d740c9f26265628fa4b7de1b75b0e56651387 Reviewed-on: https://code.wireshark.org/review/4269 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-23Qt: Add the colorization action.Gerald Combs1-0/+2
Change-Id: I846a48c35c4ef3bbbcf17d03885acc5be8c9a6b5 Reviewed-on: https://code.wireshark.org/review/4259 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-23Qt: Re-enable menu icons.Gerald Combs2-26/+2
The GNOME HIG says "Where a corresponding toolbar icon exists, a menu icon should mirror its design." The Windows and OS X HIGs say that you should use them for common or familiar actions but otherwise avoid clutter. I think icons in the "File" menu look like crap. Try to strike a balance. Use the 16x16 application icon for both the main web site and the wiki since that's the favicon used on both sites. Assume that "Reload" isn't used very often and remove it from the toolbar. Don't use a menu icon for the about box. Other minor fixups. Change-Id: I855211c218d266c2e9ed5acbe05a08750ab6d157 Reviewed-on: https://code.wireshark.org/review/4246 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-22Qt: Use wsiconcap while we're capturing.Gerald Combs1-0/+22
Set the main window icon to the "wsiconcap" version while we're capturing similar to the GTK+ version. Verified on Windows. Not sure if this will do anything on other platforms. Change-Id: I9b082601a2c47e5f52cc38ac8d9b4d9f5fb9a4d9 Reviewed-on: https://code.wireshark.org/review/4230 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-21Qt: Multi-state capture start icon.Gerald Combs9-45/+312
Add ".on" versions of the x-capture-start icon along with corresponding code in the StockIcon constructor to look for ".on" variants and add them with the QIcon::On state. Make the plain versions of x-capture-start blue to match the general application icon. The goal is to make the toolbar and app icon fins blue when Wireshark is "at rest" and green when it's capturing. Change-Id: I31f4f9d910fc99c41d7c63bd9a722db1611760c7 Reviewed-on: https://code.wireshark.org/review/4225 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-20Qt: Update the x-capture-file-close icon.Gerald Combs4-49/+45
Change-Id: I9ea4fe42ccdbc85c8c3f22a426b6e08d595a7460 Reviewed-on: https://code.wireshark.org/review/4215 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-20Qt: Add stock icons.Gerald Combs104-6/+4574
The new icons are patterned after the existing capture icons. They could probably benefit from some adjustments here and there. Start moving toward icon names and a directory layout compliant with freedesktop.org's Icon Naming Specification and Icon Theme Specification. We aren't fully compliant and might never be but anyone with exposure to FDO icon themes should at least know where everything is. Make Capture Start (x-capture-start) the first icon in the toolbar. Define the Colorize Packets, Auto Scroll, and zoom icons even though the Qt UI doesn't use them yet. Leave the Capture Filter, Display Filter, Coloring Rules, Preferences, and Help icons off for now. The GTK+ toolbar is overly cluttered and I'm not sure they're necessary. Try not to break ui/gtk/toolbar_icons.h. Remove welcome.qrc. I initially added it in case we needed to overlay the welcome screen with translucent .pngs but that never happened. To do: - Move the old GTK+ icons to their own directory. - Find a better name for the "toolbar" directory. "stock"? - Make the toolbar configurable. Change-Id: Ie07592113d307b8db786aedace672312a870fe38 Reviewed-on: https://code.wireshark.org/review/4182 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-02Qt → wireshark. GTK+ → wireshark-gtk.Gerald Combs1-0/+1
Make sure the Qt UI is named "Wireshark" and its executable is named "wireshark" or "wireshark.exe". Make sure the GTK+ UI is named "Wireshark 1" or "Wireshark (GTK+)" depending on how much the target audience is likely to care about UI toolkits. Make sure the GTK+ executable is named "wireshark-gtk" or "wireshark-gtk.exe". It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps package. It's likely even more broken now. Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake 1.11.3) at some point. The first attempt to compile in ui/qt returns "error: source_file.cpp: No such file or directory". The second attempt works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1). Tested: - Nmake builds - NSIS packaging - CMake builds (Windows, OS X) - Autotools build and distcheck - RPM packaging To do: - Test Debian packaging - Fix PortableApps Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2 Reviewed-on: https://code.wireshark.org/review/3919 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-04Rip out the filetap codeEvan Huus2-40/+1
We decided at sharkfest that this wasn't the right design for file dissection; we have more-or-less settled on way forward, but nobody's shown interest in implementing it. Whether or not that ever happens, this code is effectively dead and should be removed. Change-Id: I14d6086df3204fffb6485228db39d9f407661417 Reviewed-on: https://code.wireshark.org/review/3400 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>