From a86c5f7cae7ec9a3398300555a0b644689d946a1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 19 Sep 2024 06:14:53 +0200 Subject: Merging upstream version 4.4.0. Signed-off-by: Daniel Baumann --- resources/file_dlg_win32.rc | 153 ---- resources/fonts/NotoSansMath-Regular.ttf | Bin 0 -> 586780 bytes .../fonts/NotoSansSymbols-VariableFont_wght.ttf | Bin 0 -> 375268 bytes resources/fonts/OFL.txt | 93 +++ .../freedesktop/org.wireshark.Wireshark-mime.xml | 10 + .../org.wireshark.Wireshark.metainfo.xml | 4 +- resources/layout_1.png | Bin 557 -> 700 bytes resources/layout_1@2x.png | Bin 1022 -> 1055 bytes resources/layout_2.png | Bin 553 -> 699 bytes resources/layout_2@2x.png | Bin 1020 -> 1062 bytes resources/layout_3.png | Bin 546 -> 699 bytes resources/layout_3@2x.png | Bin 1021 -> 1056 bytes resources/layout_4.png | Bin 557 -> 699 bytes resources/layout_4@2x.png | Bin 1016 -> 1051 bytes resources/layout_5.png | Bin 557 -> 712 bytes resources/layout_5@2x.png | Bin 990 -> 1047 bytes resources/layout_6.png | Bin 556 -> 693 bytes resources/layout_6@2x.png | Bin 1016 -> 1059 bytes resources/layouts.svg | 890 +++++++++++---------- resources/logray.exe.manifest.in | 7 +- resources/protocols/diameter/CiscoSystems.xml | 8 + resources/protocols/diameter/Starent.xml | 20 +- resources/protocols/diameter/Travelping.xml | 32 + resources/protocols/diameter/VerizonWireless.xml | 10 +- resources/protocols/diameter/dictionary.xml | 22 +- resources/protocols/radius/.editorconfig | 4 + .../protocols/radius/README.radius_dictionary | 117 +-- resources/protocols/radius/dictionary | 215 ++--- resources/protocols/radius/dictionary.3com | 5 +- resources/protocols/radius/dictionary.3gpp | 74 +- resources/protocols/radius/dictionary.3gpp2 | 480 +++++------ resources/protocols/radius/dictionary.acc | 4 +- resources/protocols/radius/dictionary.acme | 16 +- resources/protocols/radius/dictionary.actelis | 6 +- resources/protocols/radius/dictionary.adtran | 18 + resources/protocols/radius/dictionary.adva | 41 + resources/protocols/radius/dictionary.aerohive | 67 +- resources/protocols/radius/dictionary.airespace | 12 +- resources/protocols/radius/dictionary.alcatel | 6 +- .../protocols/radius/dictionary.alcatel-lucent.aaa | 6 +- resources/protocols/radius/dictionary.alcatel.esam | 3 +- resources/protocols/radius/dictionary.alcatel.sr | 393 ++++++++- resources/protocols/radius/dictionary.alphion | 74 ++ resources/protocols/radius/dictionary.alteon | 7 +- resources/protocols/radius/dictionary.altiga | 5 +- resources/protocols/radius/dictionary.alvarion | 6 +- .../radius/dictionary.alvarion.wimax.v2_2 | 6 +- resources/protocols/radius/dictionary.apc | 9 +- resources/protocols/radius/dictionary.aptilo | 3 + resources/protocols/radius/dictionary.aptis | 5 +- resources/protocols/radius/dictionary.arbor | 6 +- resources/protocols/radius/dictionary.arista | 29 + resources/protocols/radius/dictionary.aruba | 73 +- resources/protocols/radius/dictionary.ascend | 431 +--------- .../protocols/radius/dictionary.ascend.illegal | 432 ++++++++++ resources/protocols/radius/dictionary.asn | 6 +- resources/protocols/radius/dictionary.audiocodes | 6 +- resources/protocols/radius/dictionary.avaya | 5 +- resources/protocols/radius/dictionary.azaire | 6 +- resources/protocols/radius/dictionary.bay | 5 +- resources/protocols/radius/dictionary.bigswitch | 17 + resources/protocols/radius/dictionary.bintec | 5 +- resources/protocols/radius/dictionary.bluecoat | 6 +- resources/protocols/radius/dictionary.boingo | 48 ++ resources/protocols/radius/dictionary.bristol | 7 +- resources/protocols/radius/dictionary.broadsoft | 8 +- resources/protocols/radius/dictionary.brocade | 3 +- resources/protocols/radius/dictionary.bskyb | 8 +- resources/protocols/radius/dictionary.bt | 6 +- resources/protocols/radius/dictionary.cablelabs | 7 +- resources/protocols/radius/dictionary.cabletron | 5 +- resources/protocols/radius/dictionary.calix | 34 + resources/protocols/radius/dictionary.cambium | 82 ++ resources/protocols/radius/dictionary.camiant | 3 + resources/protocols/radius/dictionary.centec | 18 + resources/protocols/radius/dictionary.checkpoint | 13 + resources/protocols/radius/dictionary.chillispot | 6 +- resources/protocols/radius/dictionary.ciena | 41 + resources/protocols/radius/dictionary.cisco | 52 +- resources/protocols/radius/dictionary.cisco.asa | 5 +- resources/protocols/radius/dictionary.cisco.bbsm | 5 +- .../protocols/radius/dictionary.cisco.vpn3000 | 5 +- .../protocols/radius/dictionary.cisco.vpn5000 | 5 +- resources/protocols/radius/dictionary.citrix | 6 +- resources/protocols/radius/dictionary.ckey | 39 + resources/protocols/radius/dictionary.clavister | 6 +- resources/protocols/radius/dictionary.cnergee | 13 +- resources/protocols/radius/dictionary.colubris | 9 +- .../radius/dictionary.columbia_university | 8 +- resources/protocols/radius/dictionary.compat | 5 +- resources/protocols/radius/dictionary.compatible | 3 +- resources/protocols/radius/dictionary.cosine | 6 +- resources/protocols/radius/dictionary.covaro | 43 + resources/protocols/radius/dictionary.dante | 4 +- resources/protocols/radius/dictionary.dellemc | 3 +- resources/protocols/radius/dictionary.dhcp | 419 ---------- resources/protocols/radius/dictionary.digium | 6 +- resources/protocols/radius/dictionary.dlink | 6 +- resources/protocols/radius/dictionary.dragonwave | 6 +- resources/protocols/radius/dictionary.efficientip | 6 +- resources/protocols/radius/dictionary.eleven | 55 ++ resources/protocols/radius/dictionary.eltex | 5 +- resources/protocols/radius/dictionary.epygi | 5 +- resources/protocols/radius/dictionary.equallogic | 6 +- resources/protocols/radius/dictionary.ericsson | 8 +- resources/protocols/radius/dictionary.ericsson.ab | 716 ++++++----------- .../dictionary.ericsson.packet.core.networks | 4 +- resources/protocols/radius/dictionary.erx | 433 ++++++++++ resources/protocols/radius/dictionary.extreme | 111 +-- resources/protocols/radius/dictionary.f5 | 6 +- resources/protocols/radius/dictionary.fdxtended | 4 + resources/protocols/radius/dictionary.force10 | 10 + resources/protocols/radius/dictionary.fortinet | 39 +- resources/protocols/radius/dictionary.foundry | 13 +- resources/protocols/radius/dictionary.freedhcp | 6 +- resources/protocols/radius/dictionary.freeradius | 183 ++++- .../protocols/radius/dictionary.freeradius.evs5 | 22 + .../radius/dictionary.freeradius.internal | 210 +++-- resources/protocols/radius/dictionary.freeswitch | 7 +- resources/protocols/radius/dictionary.gandalf | 9 +- resources/protocols/radius/dictionary.garderos | 5 +- resources/protocols/radius/dictionary.gemtek | 4 +- resources/protocols/radius/dictionary.h3c | 146 ++-- resources/protocols/radius/dictionary.hillstone | 51 ++ resources/protocols/radius/dictionary.hp | 23 +- resources/protocols/radius/dictionary.huawei | 24 +- resources/protocols/radius/dictionary.iana | 14 +- resources/protocols/radius/dictionary.iea | 3 +- resources/protocols/radius/dictionary.infinera | 12 + resources/protocols/radius/dictionary.infoblox | 2 + resources/protocols/radius/dictionary.infonet | 5 +- resources/protocols/radius/dictionary.ipunplugged | 6 +- resources/protocols/radius/dictionary.issanni | 6 +- resources/protocols/radius/dictionary.itk | 5 +- resources/protocols/radius/dictionary.juniper | 20 +- resources/protocols/radius/dictionary.karlnet | 15 +- resources/protocols/radius/dictionary.kineto | 8 +- resources/protocols/radius/dictionary.lancom | 7 +- resources/protocols/radius/dictionary.lantronix | 13 + resources/protocols/radius/dictionary.livingston | 6 +- resources/protocols/radius/dictionary.localweb | 4 +- resources/protocols/radius/dictionary.lucent | 6 +- resources/protocols/radius/dictionary.manzara | 3 +- resources/protocols/radius/dictionary.meinberg | 6 +- resources/protocols/radius/dictionary.mellanox | 18 + resources/protocols/radius/dictionary.merit | 5 +- resources/protocols/radius/dictionary.meru | 5 +- resources/protocols/radius/dictionary.microsemi | 6 +- resources/protocols/radius/dictionary.microsoft | 60 +- resources/protocols/radius/dictionary.mikrotik | 16 +- resources/protocols/radius/dictionary.mimosa | 39 + resources/protocols/radius/dictionary.motorola | 20 +- .../protocols/radius/dictionary.motorola.illegal | 29 + .../protocols/radius/dictionary.motorola.wimax | 6 +- resources/protocols/radius/dictionary.navini | 5 +- resources/protocols/radius/dictionary.net | 132 +++ resources/protocols/radius/dictionary.netelastic | 55 ++ resources/protocols/radius/dictionary.netscreen | 3 +- .../protocols/radius/dictionary.networkphysics | 5 +- resources/protocols/radius/dictionary.nexans | 6 +- resources/protocols/radius/dictionary.nile | 20 + resources/protocols/radius/dictionary.nokia | 6 +- .../protocols/radius/dictionary.nokia.conflict | 6 +- resources/protocols/radius/dictionary.nomadix | 5 +- resources/protocols/radius/dictionary.nortel | 21 +- resources/protocols/radius/dictionary.ntua | 4 +- resources/protocols/radius/dictionary.openser | 6 +- resources/protocols/radius/dictionary.openwifi | 25 + resources/protocols/radius/dictionary.packeteer | 6 +- resources/protocols/radius/dictionary.paloalto | 12 +- resources/protocols/radius/dictionary.patton | 8 +- resources/protocols/radius/dictionary.perle | 2 + resources/protocols/radius/dictionary.pfsense | 18 + resources/protocols/radius/dictionary.pica8 | 20 + resources/protocols/radius/dictionary.propel | 7 +- resources/protocols/radius/dictionary.prosoft | 6 +- resources/protocols/radius/dictionary.proxim | 5 +- resources/protocols/radius/dictionary.purewave | 5 +- resources/protocols/radius/dictionary.quiconnect | 6 +- resources/protocols/radius/dictionary.quintum | 5 +- resources/protocols/radius/dictionary.rcntec | 19 + resources/protocols/radius/dictionary.redcreek | 5 +- resources/protocols/radius/dictionary.rfc2865 | 6 +- resources/protocols/radius/dictionary.rfc2866 | 5 +- resources/protocols/radius/dictionary.rfc2867 | 5 +- resources/protocols/radius/dictionary.rfc2868 | 5 +- resources/protocols/radius/dictionary.rfc2869 | 12 +- resources/protocols/radius/dictionary.rfc3162 | 5 +- resources/protocols/radius/dictionary.rfc3576 | 5 +- resources/protocols/radius/dictionary.rfc3580 | 5 +- resources/protocols/radius/dictionary.rfc4072 | 6 +- resources/protocols/radius/dictionary.rfc4372 | 6 +- resources/protocols/radius/dictionary.rfc4603 | 6 +- resources/protocols/radius/dictionary.rfc4675 | 5 +- resources/protocols/radius/dictionary.rfc4679 | 22 +- resources/protocols/radius/dictionary.rfc4818 | 6 +- resources/protocols/radius/dictionary.rfc4849 | 5 +- resources/protocols/radius/dictionary.rfc5090 | 5 +- resources/protocols/radius/dictionary.rfc5176 | 5 +- resources/protocols/radius/dictionary.rfc5447 | 5 +- resources/protocols/radius/dictionary.rfc5580 | 5 +- resources/protocols/radius/dictionary.rfc5607 | 5 +- resources/protocols/radius/dictionary.rfc5904 | 10 +- resources/protocols/radius/dictionary.rfc6519 | 7 +- resources/protocols/radius/dictionary.rfc6572 | 5 +- resources/protocols/radius/dictionary.rfc6677 | 3 +- resources/protocols/radius/dictionary.rfc6911 | 3 +- resources/protocols/radius/dictionary.rfc6929 | 3 +- resources/protocols/radius/dictionary.rfc6930 | 11 +- resources/protocols/radius/dictionary.rfc7055 | 3 +- resources/protocols/radius/dictionary.rfc7155 | 3 +- resources/protocols/radius/dictionary.rfc7268 | 5 +- resources/protocols/radius/dictionary.rfc7499 | 5 +- resources/protocols/radius/dictionary.rfc7930 | 3 +- resources/protocols/radius/dictionary.rfc8045 | 65 ++ resources/protocols/radius/dictionary.rfc8559 | 9 + resources/protocols/radius/dictionary.riverbed | 6 +- resources/protocols/radius/dictionary.riverstone | 6 +- .../protocols/radius/dictionary.roaringpenguin | 9 +- resources/protocols/radius/dictionary.ruckus | 49 +- resources/protocols/radius/dictionary.ruggedcom | 3 +- resources/protocols/radius/dictionary.sangoma | 2 + resources/protocols/radius/dictionary.sg | 5 +- resources/protocols/radius/dictionary.shasta | 3 +- resources/protocols/radius/dictionary.shiva | 5 +- resources/protocols/radius/dictionary.siemens | 6 +- resources/protocols/radius/dictionary.slipstream | 6 +- .../protocols/radius/dictionary.smartsharesystems | 33 + resources/protocols/radius/dictionary.sofaware | 6 +- resources/protocols/radius/dictionary.softbank | 32 + resources/protocols/radius/dictionary.sonicwall | 5 +- resources/protocols/radius/dictionary.springtide | 6 +- resources/protocols/radius/dictionary.starent | 33 +- resources/protocols/radius/dictionary.starent.vsa1 | 6 +- resources/protocols/radius/dictionary.surfnet | 6 +- .../protocols/radius/dictionary.t_systems_nova | 6 +- resources/protocols/radius/dictionary.telebit | 5 +- resources/protocols/radius/dictionary.telkom | 8 +- resources/protocols/radius/dictionary.telrad | 27 + resources/protocols/radius/dictionary.terena | 4 +- resources/protocols/radius/dictionary.tplink | 19 + resources/protocols/radius/dictionary.travelping | 1 + resources/protocols/radius/dictionary.tripplite | 63 ++ resources/protocols/radius/dictionary.tropos | 6 +- resources/protocols/radius/dictionary.ukerna | 15 +- resources/protocols/radius/dictionary.unix | 5 +- resources/protocols/radius/dictionary.usr | 133 +-- resources/protocols/radius/dictionary.usr.illegal | 49 ++ resources/protocols/radius/dictionary.utstarcom | 6 +- resources/protocols/radius/dictionary.valemount | 5 +- resources/protocols/radius/dictionary.vasexperts | 93 +++ resources/protocols/radius/dictionary.verizon | 4 +- resources/protocols/radius/dictionary.versanet | 3 +- resources/protocols/radius/dictionary.vqp | 112 --- resources/protocols/radius/dictionary.walabi | 6 +- resources/protocols/radius/dictionary.waverider | 5 +- resources/protocols/radius/dictionary.wichorus | 5 +- resources/protocols/radius/dictionary.wifialliance | 94 +++ resources/protocols/radius/dictionary.wimax | 320 +++++++- .../protocols/radius/dictionary.wimax.alvarion | 434 +++++----- .../protocols/radius/dictionary.wimax.wichorus | 6 +- resources/protocols/radius/dictionary.wispr | 21 +- resources/protocols/radius/dictionary.xedia | 6 +- resources/protocols/radius/dictionary.xylan | 15 +- resources/protocols/radius/dictionary.yubico | 6 +- resources/protocols/radius/dictionary.zeus | 4 +- resources/protocols/radius/dictionary.zte | 5 +- resources/protocols/radius/dictionary.zyxel | 6 +- resources/share/logray/colorfilters | 14 +- resources/share/logray/dfilter_buttons | 26 +- .../share/logray/profiles/CloudTrail/colorfilters | 4 + .../share/logray/profiles/CloudTrail/preferences | 18 + resources/share/logray/profiles/dfilter_buttons | 3 + resources/share/wireshark/cfilters | 2 + resources/share/wireshark/dfilter_macros | 6 - resources/share/wireshark/dfilters | 2 + resources/share/wireshark/dmacros | 5 + .../wireshark/profiles/No Reassembly/preferences | 4 + resources/stock_icons.qrc | 24 + resources/stock_icons/16x16/x-reset-layout_1.png | Bin 0 -> 452 bytes .../stock_icons/16x16/x-reset-layout_1@2x.png | Bin 0 -> 638 bytes resources/stock_icons/16x16/x-reset-layout_2.png | Bin 0 -> 454 bytes .../stock_icons/16x16/x-reset-layout_2@2x.png | Bin 0 -> 640 bytes resources/stock_icons/16x16/x-reset-layout_3.png | Bin 0 -> 451 bytes .../stock_icons/16x16/x-reset-layout_3@2x.png | Bin 0 -> 635 bytes resources/stock_icons/16x16/x-reset-layout_4.png | Bin 0 -> 451 bytes .../stock_icons/16x16/x-reset-layout_4@2x.png | Bin 0 -> 617 bytes resources/stock_icons/16x16/x-reset-layout_5.png | Bin 0 -> 440 bytes .../stock_icons/16x16/x-reset-layout_5@2x.png | Bin 0 -> 624 bytes resources/stock_icons/16x16/x-reset-layout_6.png | Bin 0 -> 437 bytes .../stock_icons/16x16/x-reset-layout_6@2x.png | Bin 0 -> 601 bytes resources/stock_icons/24x24/x-reset-layout_1.png | Bin 0 -> 510 bytes .../stock_icons/24x24/x-reset-layout_1@2x.png | Bin 0 -> 700 bytes resources/stock_icons/24x24/x-reset-layout_2.png | Bin 0 -> 511 bytes .../stock_icons/24x24/x-reset-layout_2@2x.png | Bin 0 -> 699 bytes resources/stock_icons/24x24/x-reset-layout_3.png | Bin 0 -> 512 bytes .../stock_icons/24x24/x-reset-layout_3@2x.png | Bin 0 -> 699 bytes resources/stock_icons/24x24/x-reset-layout_4.png | Bin 0 -> 518 bytes .../stock_icons/24x24/x-reset-layout_4@2x.png | Bin 0 -> 699 bytes resources/stock_icons/24x24/x-reset-layout_5.png | Bin 0 -> 510 bytes .../stock_icons/24x24/x-reset-layout_5@2x.png | Bin 0 -> 712 bytes resources/stock_icons/24x24/x-reset-layout_6.png | Bin 0 -> 491 bytes .../stock_icons/24x24/x-reset-layout_6@2x.png | Bin 0 -> 693 bytes resources/stock_icons/layouts-to-png.sh | 140 ++++ resources/wireshark.exe.manifest.in | 7 +- resources/wireshark.pc.in | 14 + 306 files changed, 6461 insertions(+), 3476 deletions(-) delete mode 100644 resources/file_dlg_win32.rc create mode 100644 resources/fonts/NotoSansMath-Regular.ttf create mode 100644 resources/fonts/NotoSansSymbols-VariableFont_wght.ttf create mode 100644 resources/fonts/OFL.txt create mode 100644 resources/protocols/diameter/Travelping.xml create mode 100644 resources/protocols/radius/.editorconfig create mode 100644 resources/protocols/radius/dictionary.adtran create mode 100644 resources/protocols/radius/dictionary.adva create mode 100644 resources/protocols/radius/dictionary.alphion create mode 100644 resources/protocols/radius/dictionary.arista create mode 100644 resources/protocols/radius/dictionary.ascend.illegal create mode 100644 resources/protocols/radius/dictionary.bigswitch create mode 100644 resources/protocols/radius/dictionary.boingo create mode 100644 resources/protocols/radius/dictionary.calix create mode 100644 resources/protocols/radius/dictionary.cambium create mode 100644 resources/protocols/radius/dictionary.centec create mode 100644 resources/protocols/radius/dictionary.checkpoint create mode 100644 resources/protocols/radius/dictionary.ciena create mode 100644 resources/protocols/radius/dictionary.ckey create mode 100644 resources/protocols/radius/dictionary.covaro delete mode 100644 resources/protocols/radius/dictionary.dhcp create mode 100644 resources/protocols/radius/dictionary.eleven create mode 100644 resources/protocols/radius/dictionary.erx create mode 100644 resources/protocols/radius/dictionary.force10 create mode 100644 resources/protocols/radius/dictionary.freeradius.evs5 create mode 100644 resources/protocols/radius/dictionary.hillstone create mode 100644 resources/protocols/radius/dictionary.infinera create mode 100644 resources/protocols/radius/dictionary.lantronix create mode 100644 resources/protocols/radius/dictionary.mellanox create mode 100644 resources/protocols/radius/dictionary.mimosa create mode 100644 resources/protocols/radius/dictionary.motorola.illegal create mode 100644 resources/protocols/radius/dictionary.net create mode 100644 resources/protocols/radius/dictionary.netelastic create mode 100644 resources/protocols/radius/dictionary.nile create mode 100644 resources/protocols/radius/dictionary.openwifi create mode 100644 resources/protocols/radius/dictionary.pfsense create mode 100644 resources/protocols/radius/dictionary.pica8 create mode 100644 resources/protocols/radius/dictionary.rcntec create mode 100644 resources/protocols/radius/dictionary.rfc8045 create mode 100644 resources/protocols/radius/dictionary.rfc8559 create mode 100644 resources/protocols/radius/dictionary.smartsharesystems create mode 100644 resources/protocols/radius/dictionary.softbank create mode 100644 resources/protocols/radius/dictionary.telrad create mode 100644 resources/protocols/radius/dictionary.tplink create mode 100644 resources/protocols/radius/dictionary.tripplite create mode 100644 resources/protocols/radius/dictionary.usr.illegal create mode 100644 resources/protocols/radius/dictionary.vasexperts delete mode 100644 resources/protocols/radius/dictionary.vqp create mode 100644 resources/protocols/radius/dictionary.wifialliance create mode 100644 resources/share/logray/profiles/CloudTrail/colorfilters create mode 100644 resources/share/logray/profiles/CloudTrail/preferences create mode 100644 resources/share/logray/profiles/dfilter_buttons delete mode 100644 resources/share/wireshark/dfilter_macros create mode 100644 resources/share/wireshark/dmacros create mode 100644 resources/stock_icons/16x16/x-reset-layout_1.png create mode 100644 resources/stock_icons/16x16/x-reset-layout_1@2x.png create mode 100644 resources/stock_icons/16x16/x-reset-layout_2.png create mode 100644 resources/stock_icons/16x16/x-reset-layout_2@2x.png create mode 100644 resources/stock_icons/16x16/x-reset-layout_3.png create mode 100644 resources/stock_icons/16x16/x-reset-layout_3@2x.png create mode 100644 resources/stock_icons/16x16/x-reset-layout_4.png create mode 100644 resources/stock_icons/16x16/x-reset-layout_4@2x.png create mode 100644 resources/stock_icons/16x16/x-reset-layout_5.png create mode 100644 resources/stock_icons/16x16/x-reset-layout_5@2x.png create mode 100644 resources/stock_icons/16x16/x-reset-layout_6.png create mode 100644 resources/stock_icons/16x16/x-reset-layout_6@2x.png create mode 100644 resources/stock_icons/24x24/x-reset-layout_1.png create mode 100644 resources/stock_icons/24x24/x-reset-layout_1@2x.png create mode 100644 resources/stock_icons/24x24/x-reset-layout_2.png create mode 100644 resources/stock_icons/24x24/x-reset-layout_2@2x.png create mode 100644 resources/stock_icons/24x24/x-reset-layout_3.png create mode 100644 resources/stock_icons/24x24/x-reset-layout_3@2x.png create mode 100644 resources/stock_icons/24x24/x-reset-layout_4.png create mode 100644 resources/stock_icons/24x24/x-reset-layout_4@2x.png create mode 100644 resources/stock_icons/24x24/x-reset-layout_5.png create mode 100644 resources/stock_icons/24x24/x-reset-layout_5@2x.png create mode 100644 resources/stock_icons/24x24/x-reset-layout_6.png create mode 100644 resources/stock_icons/24x24/x-reset-layout_6@2x.png create mode 100644 resources/stock_icons/layouts-to-png.sh create mode 100644 resources/wireshark.pc.in (limited to 'resources') diff --git a/resources/file_dlg_win32.rc b/resources/file_dlg_win32.rc deleted file mode 100644 index 34dbf60d..00000000 --- a/resources/file_dlg_win32.rc +++ /dev/null @@ -1,153 +0,0 @@ -#include -#include "richedit.h" -#include "../ui/win32/file_dlg_win32.h" - -// We should probably ensure that we're meeting the MS layout guidelines: -// https://docs.microsoft.com/en-us/windows/win32/uxguide/vis-layout -// Outer margin: 11px - -WIRESHARK_OPENFILENAME_TEMPLATE DIALOGEX 0, 0, 425, 47 -STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL -FONT 8, "MS Shell Dlg" -{ - // Filter button/entry - // PUSHBUTTON "Filter:", EWFD_FILTER_BTN, 7, 4, 35, 14 - LTEXT "Read filter:", EWFD_FILTER_LBL, 67, 2, 49, 14 - CONTROL "", EWFD_FILTER_EDIT, RICHEDIT_CLASS, ES_AUTOHSCROLL, 112, 0, 88, 12, WS_EX_CLIENTEDGE - - COMBOBOX EWFD_FORMAT_TYPE, 67, 17, 135, 8, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - // CHECKBOX "MAC name resolution", EWFD_MAC_NR_CB, 67, 30, 100, 8, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - // CHECKBOX "Transport name resolution", EWFD_TRANS_NR_CB, 67, 45, 100, 8, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - // CHECKBOX "Network name resolution", EWFD_NET_NR_CB, 67, 60, 100, 8, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - // CHECKBOX "Use external network name resolver", EWFD_EXTERNAL_NR_CB, 67, 75, 135, 8, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - - LTEXT "Format:", EWFD_PT_FORMAT, 224, 2, 60, 8 - LTEXT "-", EWFD_PTX_FORMAT, 275, 2, 150, 8 - LTEXT "Size:", EWFD_PT_SIZE, 224, 17, 60, 8 - LTEXT "-", EWFD_PTX_SIZE, 275, 17, 150, 8 - // LTEXT "Packets:", EWFD_PT_PACKETS, 224, 32, 60, 8 - // LTEXT "-", EWFD_PTX_PACKETS, 275, 32, 150, 8 - LTEXT "Start / elapsed:", EWFD_PT_START_ELAPSED, 224, 32, 60, 8 - LTEXT "-", EWFD_PTX_START_ELAPSED, 275, 32, 150, 8 - // 164/211, 79, 40/150, 8 - -} - -WIRESHARK_SAVEASFILENAME_TEMPLATE DIALOGEX 0, 0, 167, 15 -STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL -FONT 8, "MS Shell Dlg" -{ - CHECKBOX "Compress with gzip", EWFD_GZIP_CB, 67, 0, 100, 8, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -} - -WIRESHARK_SAVEASSTATSTREENAME_TEMPLATE DIALOGEX 0, 0, 167, 0 -STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL -FONT 8, "MS Shell Dlg" -{ -} - -WIRESHARK_EXPORT_SPECIFIED_PACKETS_FILENAME_TEMPLATE DIALOGEX 0, 0, 453, 136 -STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL -FONT 8, "MS Shell Dlg" -{ - CHECKBOX "Compress with gzip", EWFD_GZIP_CB, 67, 0, 100, 8, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - - GROUPBOX "Packet Range", -1, 67, 15, 270, 114 - - CONTROL "Captured", EWFD_CAPTURED_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 232, 26, 45, 10 - CONTROL "Displayed", EWFD_DISPLAYED_BTN, "Button", BS_AUTORADIOBUTTON, 282, 26, 47, 10 - - CONTROL "All packets", EWFD_ALL_PKTS_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 73, 38, 51, 10 - CONTROL "Selected packets only", EWFD_SEL_PKT_BTN, "Button", BS_AUTORADIOBUTTON, 73, 50, 80, 10 - CONTROL "Marked packets only", EWFD_MARKED_BTN, "Button", BS_AUTORADIOBUTTON, 73, 62, 78, 10 - CONTROL "First to last marked", EWFD_FIRST_LAST_BTN, "Button", BS_AUTORADIOBUTTON, 73, 74, 75, 10 - CONTROL "Range:", EWFD_RANGE_BTN, "Button", BS_AUTORADIOBUTTON, 73, 86, 35, 10 - CONTROL "", EWFD_RANGE_EDIT, RICHEDIT_CLASS, ES_AUTOHSCROLL, 112, 85, 110, 12, WS_EX_CLIENTEDGE - CONTROL "Remove Ignored packets", EWFD_REMOVE_IGN_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 73, 98, 100, 10 - CONTROL "Include depended upon packets", EWFD_INCLUDE_DPD_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 73, 110, 125, 10 - - LTEXT "0", EWFD_ALL_PKTS_CAP, 232, 39, 39, 8, SS_RIGHT - LTEXT "0", EWFD_SEL_PKT_CAP, 232, 51, 39, 8, SS_RIGHT - LTEXT "0", EWFD_MARKED_CAP, 232, 63, 39, 8, SS_RIGHT - LTEXT "0", EWFD_FIRST_LAST_CAP, 232, 75, 39, 8, SS_RIGHT - LTEXT "0", EWFD_RANGE_CAP, 232, 87, 39, 8, SS_RIGHT - LTEXT "0", EWFD_IGNORED_CAP, 232, 99, 39, 8, SS_RIGHT - LTEXT "0", EWFD_DEPENDED_CAP, 232, 111, 39, 8, SS_RIGHT - - LTEXT "0", EWFD_ALL_PKTS_DISP, 282, 39, 41, 8, SS_RIGHT - LTEXT "0", EWFD_SEL_PKT_DISP, 282, 51, 41, 8, SS_RIGHT - LTEXT "0", EWFD_MARKED_DISP, 282, 63, 41, 8, SS_RIGHT - LTEXT "0", EWFD_FIRST_LAST_DISP, 282, 75, 41, 8, SS_RIGHT - LTEXT "0", EWFD_RANGE_DISP, 282, 87, 41, 8, SS_RIGHT - LTEXT "0", EWFD_IGNORED_DISP, 282, 99, 41, 8, SS_RIGHT - LTEXT "0", EWFD_DEPENDED_DISP, 282, 111, 41, 8, SS_RIGHT -} - -WIRESHARK_MERGEFILENAME_TEMPLATE DIALOGEX 0, 0, 450, 80 -STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL -FONT 8, "MS Shell Dlg" -{ - // Filter button/entry - // PUSHBUTTON "Filter:", EWFD_FILTER_BTN, 7, 4, 35, 14 - LTEXT "Read filter:", EWFD_FILTER_LBL, 67, 2, 49, 14 - CONTROL "", EWFD_FILTER_EDIT, RICHEDIT_CLASS, ES_AUTOHSCROLL, 112, 0, 88, 12, WS_EX_CLIENTEDGE - - CONTROL "Prepend packets to existing file", EWFD_MERGE_PREPEND_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 67, 30, 120, 8 - CONTROL "Merge packets chronologically", EWFD_MERGE_CHRONO_BTN, "Button", BS_AUTORADIOBUTTON, 67, 45, 120, 8 - CONTROL "Append packets to existing file", EWFD_MERGE_APPEND_BTN, "Button", BS_AUTORADIOBUTTON, 67, 60, 120, 8 - - LTEXT "Format:", EWFD_PT_FORMAT, 224, 2, 60, 8 - LTEXT "-", EWFD_PTX_FORMAT, 275, 2, 150, 8 - LTEXT "Size:", EWFD_PT_SIZE, 224, 17, 60, 8 - LTEXT "-", EWFD_PTX_SIZE, 275, 17, 150, 8 - // LTEXT "Packets:", EWFD_PT_PACKETS, 224, 32, 60, 8 - // LTEXT "-", EWFD_PTX_PACKETS, 275, 32, 150, 8 - LTEXT "Start / elapsed:", EWFD_PT_START_ELAPSED, 224, 32, 60, 8 - LTEXT "-", EWFD_PTX_START_ELAPSED, 275, 32, 150, 8 - // 164/211, 79, 40/150, 8 -} - -WIRESHARK_EXPORTFILENAME_TEMPLATE DIALOGEX 0, 0, 469, 121 -STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Packet Range", -1, 67, 0, 270, 118 - - CONTROL "Captured", EWFD_CAPTURED_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 232, 11, 45, 10 - CONTROL "Displayed", EWFD_DISPLAYED_BTN, "Button", BS_AUTORADIOBUTTON, 282, 11, 47, 10 - - CONTROL "All packets", EWFD_ALL_PKTS_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 73, 23, 51, 10 - CONTROL "Selected packet", EWFD_SEL_PKT_BTN, "Button", BS_AUTORADIOBUTTON, 73, 35, 68, 10 - CONTROL "Marked packets", EWFD_MARKED_BTN, "Button", BS_AUTORADIOBUTTON, 73, 47, 67, 10 - CONTROL "First to last marked", EWFD_FIRST_LAST_BTN, "Button", BS_AUTORADIOBUTTON, 73, 59, 75, 10 - CONTROL "Range:", EWFD_RANGE_BTN, "Button", BS_AUTORADIOBUTTON, 73, 71, 35, 10 - CONTROL "", EWFD_RANGE_EDIT, RICHEDIT_CLASS, ES_AUTOHSCROLL, 112, 70, 110, 12, WS_EX_CLIENTEDGE - CONTROL "Remove Ignored packets", EWFD_REMOVE_IGN_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 73, 83, 100, 10 - CONTROL "Include depended upon packets", EWFD_INCLUDE_DPD_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 73, 95, 125, 10 - - LTEXT "0", EWFD_ALL_PKTS_CAP, 232, 24, 39, 8, SS_RIGHT - LTEXT "0", EWFD_SEL_PKT_CAP, 232, 36, 39, 8, SS_RIGHT - LTEXT "0", EWFD_MARKED_CAP, 232, 48, 39, 8, SS_RIGHT - LTEXT "0", EWFD_FIRST_LAST_CAP, 232, 60, 39, 8, SS_RIGHT - LTEXT "0", EWFD_RANGE_CAP, 232, 72, 39, 8, SS_RIGHT - LTEXT "0", EWFD_IGNORED_CAP, 232, 84, 39, 8, SS_RIGHT - LTEXT "0", EWFD_DEPENDED_CAP, 232, 96, 39, 8, SS_RIGHT - - LTEXT "0", EWFD_ALL_PKTS_DISP, 282, 24, 41, 8, SS_RIGHT - LTEXT "0", EWFD_SEL_PKT_DISP, 282, 36, 41, 8, SS_RIGHT - LTEXT "0", EWFD_MARKED_DISP, 282, 48, 41, 8, SS_RIGHT - LTEXT "0", EWFD_FIRST_LAST_DISP, 282, 60, 41, 8, SS_RIGHT - LTEXT "0", EWFD_RANGE_DISP, 282, 72, 41, 8, SS_RIGHT - LTEXT "0", EWFD_IGNORED_DISP, 282, 84, 41, 8, SS_RIGHT - LTEXT "0", EWFD_DEPENDED_DISP, 282, 96, 41, 8, SS_RIGHT - - GROUPBOX "Packet Format", EWFD_PKT_FORMAT_GB, 344, 0, 134, 106 - CONTROL "Packet summary line", EWFD_PKT_SUMMARY_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 350, 15, 84, 10 - CONTROL "Include column headings", EWFD_COL_HEADINGS_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 362, 27, 94, 10 - CONTROL "Packet details:", EWFD_PKT_DETAIL_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 350, 39, 95, 10 - COMBOBOX EWFD_PKT_DETAIL_COMBO, 362, 51, 74, 45, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Packet Bytes", EWFD_PKT_BYTES_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 350, 68, 80, 10 - CONTROL "Include secondary data sources", EWFD_DATA_SOURCES_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 362, 80, 112, 10 - CONTROL "Each packet on a new page", EWFD_PKT_NEW_PAGE_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 350, 92, 106, 10 - -} diff --git a/resources/fonts/NotoSansMath-Regular.ttf b/resources/fonts/NotoSansMath-Regular.ttf new file mode 100644 index 00000000..b257fa72 Binary files /dev/null and b/resources/fonts/NotoSansMath-Regular.ttf differ diff --git a/resources/fonts/NotoSansSymbols-VariableFont_wght.ttf b/resources/fonts/NotoSansSymbols-VariableFont_wght.ttf new file mode 100644 index 00000000..41fd4e3e Binary files /dev/null and b/resources/fonts/NotoSansSymbols-VariableFont_wght.ttf differ diff --git a/resources/fonts/OFL.txt b/resources/fonts/OFL.txt new file mode 100644 index 00000000..ce2c42c5 --- /dev/null +++ b/resources/fonts/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2022 The Noto Project Authors (https://github.com/notofonts/symbols) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/resources/freedesktop/org.wireshark.Wireshark-mime.xml b/resources/freedesktop/org.wireshark.Wireshark-mime.xml index e297d273..95025aee 100644 --- a/resources/freedesktop/org.wireshark.Wireshark-mime.xml +++ b/resources/freedesktop/org.wireshark.Wireshark-mime.xml @@ -59,12 +59,16 @@ + + + + @@ -254,4 +258,10 @@ + + + EGNOS Message Server (EMS) file + + + diff --git a/resources/freedesktop/org.wireshark.Wireshark.metainfo.xml b/resources/freedesktop/org.wireshark.Wireshark.metainfo.xml index 6526beb4..6748684d 100644 --- a/resources/freedesktop/org.wireshark.Wireshark.metainfo.xml +++ b/resources/freedesktop/org.wireshark.Wireshark.metainfo.xml @@ -7,8 +7,10 @@ org.wireshark.Wireshark + org.wireshark.Wireshark.desktop Wireshark - Wireshark is the world's foremost protocol analyzer + Network protocol analyzer + The Wireshark developer community CC0-1.0 GPL-2.0 diff --git a/resources/layout_1.png b/resources/layout_1.png index 312ed860..fdcb5f78 100644 Binary files a/resources/layout_1.png and b/resources/layout_1.png differ diff --git a/resources/layout_1@2x.png b/resources/layout_1@2x.png index d656f7f3..5a44f488 100644 Binary files a/resources/layout_1@2x.png and b/resources/layout_1@2x.png differ diff --git a/resources/layout_2.png b/resources/layout_2.png index 62560aff..ccc880a0 100644 Binary files a/resources/layout_2.png and b/resources/layout_2.png differ diff --git a/resources/layout_2@2x.png b/resources/layout_2@2x.png index c79cb6eb..19c8bfe4 100644 Binary files a/resources/layout_2@2x.png and b/resources/layout_2@2x.png differ diff --git a/resources/layout_3.png b/resources/layout_3.png index fd9eb10e..1ae62fdf 100644 Binary files a/resources/layout_3.png and b/resources/layout_3.png differ diff --git a/resources/layout_3@2x.png b/resources/layout_3@2x.png index 7fe2fb20..39dc955b 100644 Binary files a/resources/layout_3@2x.png and b/resources/layout_3@2x.png differ diff --git a/resources/layout_4.png b/resources/layout_4.png index 16a8ff71..465c918c 100644 Binary files a/resources/layout_4.png and b/resources/layout_4.png differ diff --git a/resources/layout_4@2x.png b/resources/layout_4@2x.png index 2fca6e78..02a68c4b 100644 Binary files a/resources/layout_4@2x.png and b/resources/layout_4@2x.png differ diff --git a/resources/layout_5.png b/resources/layout_5.png index 967f9f85..746b0965 100644 Binary files a/resources/layout_5.png and b/resources/layout_5.png differ diff --git a/resources/layout_5@2x.png b/resources/layout_5@2x.png index fd151cad..b9c6eb8d 100644 Binary files a/resources/layout_5@2x.png and b/resources/layout_5@2x.png differ diff --git a/resources/layout_6.png b/resources/layout_6.png index af3a8fb4..218190c5 100644 Binary files a/resources/layout_6.png and b/resources/layout_6.png differ diff --git a/resources/layout_6@2x.png b/resources/layout_6@2x.png index 6253b703..36a04909 100644 Binary files a/resources/layout_6@2x.png and b/resources/layout_6@2x.png differ diff --git a/resources/layouts.svg b/resources/layouts.svg index a49b3249..c8a13733 100644 --- a/resources/layouts.svg +++ b/resources/layouts.svg @@ -2,19 +2,19 @@ + inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" + sodipodi:docname="layouts.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + inkscape:guide-bbox="true" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1"> + snapvisiblegridlinesonly="true" + originx="0" + originy="0" + spacingy="1" + spacingx="1" + units="px" /> + id="guide3837" + inkscape:locked="false" /> + id="guide3839" + inkscape:locked="false" /> + id="guide3845" + inkscape:locked="false" /> + id="guide3849" + inkscape:locked="false" /> + id="guide3851" + inkscape:locked="false" /> + id="guide3853" + inkscape:locked="false" /> + id="guide3855" + inkscape:locked="false" /> + id="guide3857" + inkscape:locked="false" /> + id="guide3859" + inkscape:locked="false" /> + id="guide3861" + inkscape:locked="false" /> + id="guide3863" + inkscape:locked="false" /> + id="guide3865" + inkscape:locked="false" /> + id="guide3867" + inkscape:locked="false" /> + id="guide3869" + inkscape:locked="false" /> @@ -118,7 +140,7 @@ image/svg+xml - + Gerald Combs @@ -143,423 +165,449 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1004.3622)"> - - - - - - - - - - - - - - - - -   + + + + 1 - 1 + 2 - 2 + 3 - - 3 + + + + + + + 1 - 1 - 1 - 1 - 1 - 1 + 2 - 2 + 3 - 3 + + + + + + 1 + 2 - 2 + 3 - 3 + + + + + + 1 + 2 - 2 + 3 - 3 + + + + + + 1 + 2 - 2 + 3 - 3 + + + + + + 1 + 2 - 2 + 3 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none" + xml:space="preserve" + inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_6.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90">3 + diff --git a/resources/logray.exe.manifest.in b/resources/logray.exe.manifest.in index 407861d4..aa134c3d 100644 --- a/resources/logray.exe.manifest.in +++ b/resources/logray.exe.manifest.in @@ -35,12 +35,6 @@ - The NTDDI_VERSION and _WIN32_WINNT parts of cmakeconfig.h.in - The WinVer parts of packaging\nsis\logray.nsi --> - - - - - - @@ -57,6 +51,7 @@ of PerMonitor. Unfortunately that causes layout issues with Qt 5.6 and 5.9. For now enable PerMonitor DPI awareness by enabling Qt::AA_EnableHighDpiScaling in ui/qt/main.cpp. + Qt 6 is Per-Monitor DPI Aware V2 by default. --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/protocols/diameter/VerizonWireless.xml b/resources/protocols/diameter/VerizonWireless.xml index ab39ecc9..04015bbf 100644 --- a/resources/protocols/diameter/VerizonWireless.xml +++ b/resources/protocols/diameter/VerizonWireless.xml @@ -11,13 +11,21 @@ - + + + + + + + + + diff --git a/resources/protocols/diameter/dictionary.xml b/resources/protocols/diameter/dictionary.xml index cdbd7778..4e69196a 100644 --- a/resources/protocols/diameter/dictionary.xml +++ b/resources/protocols/diameter/dictionary.xml @@ -34,6 +34,7 @@ + ]> @@ -304,6 +305,17 @@ The UTF8String MUST not contain any octets with a value of zero. --> + + - - - - - - @@ -58,6 +52,7 @@ of PerMonitor. Unfortunately that causes layout issues with Qt 5.6 and 5.9. For now enable PerMonitor DPI awareness by enabling Qt::AA_EnableHighDpiScaling in ui/qt/main.cpp. + Qt 6 is is Per-Monitor DPI Aware V2 by default. -->