Rename the "image" directory to "resources".
The "image" directory contains resource compiler assets and other application resources, so name it "resources."
|
@ -490,7 +490,7 @@ if(WIN32)
|
|||
# Make sure everyone is using the same API and that it's sufficient
|
||||
# for our needs.
|
||||
# This should match the following:
|
||||
# - The <compatibility><application> section in image\wireshark.exe.manifest.in
|
||||
# - The <compatibility><application> section in resources\wireshark.exe.manifest.in
|
||||
# - The GetWindowsVersion parts of packaging\nsis\wireshark.nsi
|
||||
# - The VersionNT parts of packaging\wix\Prerequisites.wxi
|
||||
#
|
||||
|
@ -1695,18 +1695,18 @@ set(DOXYGEN_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
|
|||
|
||||
set(CFG_OUT_FILES
|
||||
doxygen.cfg
|
||||
image/dumpcap.rc
|
||||
image/libwireshark.rc
|
||||
image/libwiretap.rc
|
||||
image/libwsutil.rc
|
||||
image/wireshark.exe.manifest
|
||||
image/wireshark.rc
|
||||
packaging/macosx/Info.plist
|
||||
packaging/macosx/osx-app.sh
|
||||
packaging/macosx/osx-dmg.sh
|
||||
packaging/macosx/wireshark-app.dmgbuild
|
||||
packaging/macosx/wireshark-dsym.dmgbuild
|
||||
packaging/source/git-export-release.sh
|
||||
resources/dumpcap.rc
|
||||
resources/libwireshark.rc
|
||||
resources/libwiretap.rc
|
||||
resources/libwsutil.rc
|
||||
resources/wireshark.exe.manifest
|
||||
resources/wireshark.rc
|
||||
wireshark.pc
|
||||
)
|
||||
foreach( _cfg_file ${CFG_OUT_FILES} )
|
||||
|
@ -1858,7 +1858,7 @@ if(WIN32)
|
|||
ui/win32/file_dlg_win32.cpp
|
||||
)
|
||||
set(PLATFORM_UI_RC_FILES
|
||||
image/file_dlg_win32.rc
|
||||
resources/file_dlg_win32.rc
|
||||
)
|
||||
elseif(APPLE)
|
||||
set(PLATFORM_UI_SRC
|
||||
|
@ -3467,14 +3467,14 @@ if((BUILD_wireshark AND QT_FOUND) AND NOT (WIN32 OR APPLE))
|
|||
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
|
||||
endif()
|
||||
foreach(size 16 24 32 48 64 128 256)
|
||||
install(FILES image/wsicon${size}.png
|
||||
install(FILES resources/icons/wsicon${size}.png
|
||||
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${size}x${size}/apps"
|
||||
RENAME org.wireshark.Wireshark.png)
|
||||
install(FILES image/WiresharkDoc-${size}.png
|
||||
install(FILES resources/icons/WiresharkDoc-${size}.png
|
||||
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${size}x${size}/mimetypes"
|
||||
RENAME org.wireshark.Wireshark-mimetype.png)
|
||||
endforeach()
|
||||
install(FILES image/wsicon.svg
|
||||
install(FILES resources/icons/wsicon.svg
|
||||
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps"
|
||||
RENAME org.wireshark.Wireshark.svg)
|
||||
endif()
|
||||
|
@ -3736,7 +3736,7 @@ if(SHELLCHECK_EXECUTABLE)
|
|||
# added support for that.
|
||||
add_custom_command(TARGET shellcheck POST_BUILD
|
||||
COMMAND shellcheck --external-sources
|
||||
image/stock_icons/svg-to-png.sh
|
||||
resources/stock_icons/svg-to-png.sh
|
||||
packaging/appimage/AppRun
|
||||
"packaging/macosx/ChmodBPF/root/Library/Application Support/Wireshark/ChmodBPF/ChmodBPF"
|
||||
packaging/macosx/osx-app.sh.in
|
||||
|
|
|
@ -14,13 +14,13 @@ function(set_executable_resources EXE_NAME PROGRAM_NAME)
|
|||
# Use the original Wireshark / TShark .rc copyright.
|
||||
set(COPYRIGHT_INFO "2000 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and many others")
|
||||
endif()
|
||||
set(${EXE_NAME}_FILES ${${EXE_NAME}_FILES} ${CMAKE_BINARY_DIR}/image/${EXE_NAME}.rc PARENT_SCOPE)
|
||||
set(${EXE_NAME}_FILES ${${EXE_NAME}_FILES} ${CMAKE_BINARY_DIR}/resources/${EXE_NAME}.rc PARENT_SCOPE)
|
||||
if (EXE_RC_UNIQUE_RC)
|
||||
set (_in_file ${EXE_NAME})
|
||||
else()
|
||||
set (_in_file "cli_template")
|
||||
endif()
|
||||
set(ICON_PATH "${CMAKE_SOURCE_DIR}/image/")
|
||||
configure_file( ${CMAKE_SOURCE_DIR}/image/${_in_file}.rc.in ${CMAKE_BINARY_DIR}/image/${EXE_NAME}.rc @ONLY )
|
||||
set(ICON_PATH "${CMAKE_SOURCE_DIR}/resources/icons/")
|
||||
configure_file( ${CMAKE_SOURCE_DIR}/resources/${_in_file}.rc.in ${CMAKE_BINARY_DIR}/resources/${EXE_NAME}.rc @ONLY )
|
||||
endif()
|
||||
endfunction()
|
||||
|
|
|
@ -103,7 +103,7 @@ open when the capture file closes.
|
|||
===== Names
|
||||
|
||||
The code in _ui/qt_ directory uses three APIs: Qt (which uses upper camel case), GLib (which uses snake_case), and the Wireshark
|
||||
API (which also uses snake_case).
|
||||
API (which also uses snake_case).
|
||||
|
||||
As a general rule, for names, Wireshark’s Qt code:
|
||||
|
||||
|
@ -201,7 +201,7 @@ Qt makes translating the Wireshark UI into different languages easy. To add a ne
|
|||
translation, do the following:
|
||||
|
||||
- Add your translation (_ui/qt/wireshark_XX.ts_) to _ui/qt/CMakeLists.txt_
|
||||
- (Recommended) Add a flag image for your language in _image/languages/XX.svg_. Update _image/languages/languages.qrc_ accordingly.
|
||||
- (Recommended) Add a flag image for your language in _resources/languages/XX.svg_. Update _resources/languages/languages.qrc_ accordingly.
|
||||
- Run `lupdate ui/qt -ts ui/qt/wireshark_XX.ts` to generate/update your translation file.
|
||||
- Add ui/qt/wireshark_XX.ts to `.tx/config`.
|
||||
- Translate with Qt Linguist: `linguist ui/qt/wireshark_XX.ts`.
|
||||
|
@ -261,7 +261,7 @@ includes proper dark theme support by doing the following:
|
|||
|
||||
* You can use a macOS-style template icon by creating a monochrome SVG
|
||||
document with “.template” appended to the name, e.g.
|
||||
`image/stock_icons/24x24/edit-find.template.svg`.
|
||||
`resources/stock_icons/24x24/edit-find.template.svg`.
|
||||
* Qt draws unvisited links *Qt::blue* no matter what. You can work
|
||||
around this by using `ColorUtils::themeLinkBrush()` and
|
||||
`ColorUtils::themeLinkStyle()`.
|
||||
|
@ -274,7 +274,7 @@ The main window has many QActions which are shared with child widgets. See
|
|||
_ui/qt/proto_tree.cpp_ for an example of this.
|
||||
|
||||
To demonstrate the functionality of the plugin interface options, a
|
||||
demonstration plugin exists (pluginifdemo). See _doc/README.plugins_ and
|
||||
demonstration plugin exists (pluginifdemo). See _doc/README.plugins_ and
|
||||
_plugins/epan/pluginifdemo_.
|
||||
|
||||
https://www.kdab.com/development-resources/qt-tools/gammaray/[GammaRay] lets you inspect
|
||||
|
|
|
@ -51,7 +51,7 @@ PROJECT_BRIEF = "The Wireshark network protocol analyzer"
|
|||
# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
|
||||
# the logo to the output directory.
|
||||
|
||||
PROJECT_LOGO = @DOXYGEN_INPUT_DIRECTORY@/image/wsicon48.png
|
||||
PROJECT_LOGO = @DOXYGEN_INPUT_DIRECTORY@/resources/icons/wsicon48.png
|
||||
|
||||
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
|
||||
# into which the generated documentation will be written. If a relative path is
|
||||
|
|
|
@ -302,7 +302,7 @@ add_library(epan
|
|||
$<TARGET_OBJECTS:dissector-registration>
|
||||
$<TARGET_OBJECTS:ftypes>
|
||||
$<$<BOOL:${LUA_FOUND}>:$<TARGET_OBJECTS:wslua>>
|
||||
${CMAKE_BINARY_DIR}/image/libwireshark.rc
|
||||
${CMAKE_BINARY_DIR}/resources/libwireshark.rc
|
||||
)
|
||||
|
||||
set_target_properties(epan PROPERTIES
|
||||
|
|
|
@ -1,22 +0,0 @@
|
|||
<RCC>
|
||||
<qresource prefix="/wsicon">
|
||||
<file>wsiconcap16.png</file>
|
||||
<file>wsiconcap24.png</file>
|
||||
<file>wsiconcap32.png</file>
|
||||
<file>wsiconcap48.png</file>
|
||||
<file>wsiconcap64.png</file>
|
||||
<file>wsiconcap128.png</file>
|
||||
<file>wsiconcap256.png</file>
|
||||
<file>wsiconcap512.png</file>
|
||||
<file>wsiconcap1024.png</file>
|
||||
<file>wsicon16.png</file>
|
||||
<file>wsicon24.png</file>
|
||||
<file>wsicon32.png</file>
|
||||
<file>wsicon48.png</file>
|
||||
<file>wsicon64.png</file>
|
||||
<file>wsicon128.png</file>
|
||||
<file>wsicon256.png</file>
|
||||
<file>wsicon512.png</file>
|
||||
<file>wsicon1024.png</file>
|
||||
</qresource>
|
||||
</RCC>
|
|
@ -18,11 +18,11 @@ InstType "un.Default (keep Personal Settings and Npcap)"
|
|||
InstType "un.All (remove all)"
|
||||
|
||||
; Uninstaller icon
|
||||
UninstallIcon "..\..\image\wiresharkinst.ico"
|
||||
UninstallIcon "..\..\resources\wiresharkinst.ico"
|
||||
|
||||
!include "MUI.nsh"
|
||||
|
||||
!define MUI_UNICON "..\..\image\wiresharkinst.ico"
|
||||
!define MUI_UNICON "..\..\resources\wiresharkinst.ico"
|
||||
|
||||
; Uninstall stuff (NSIS 2.08: "\r\n" don't work here)
|
||||
!define MUI_UNCONFIRMPAGE_TEXT_TOP "The following ${PROGRAM_NAME} installation will be removed. Click 'Next' to continue."
|
||||
|
|
|
@ -40,7 +40,7 @@ ${StrRep}
|
|||
; The file to write
|
||||
OutFile "${OUTFILE_DIR}\${PROGRAM_NAME}-${WIRESHARK_TARGET_PLATFORM}-${VERSION}.exe"
|
||||
; Installer icon
|
||||
Icon "${TOP_SRC_DIR}\image\wiresharkinst.ico"
|
||||
Icon "${TOP_SRC_DIR}\resources\wiresharkinst.ico"
|
||||
|
||||
; ============================================================================
|
||||
; Modern UI
|
||||
|
@ -55,7 +55,7 @@ Icon "${TOP_SRC_DIR}\image\wiresharkinst.ico"
|
|||
!include "InstallOptions.nsh"
|
||||
;!addplugindir ".\Plugins"
|
||||
|
||||
!define MUI_ICON "${TOP_SRC_DIR}\image\wiresharkinst.ico"
|
||||
!define MUI_ICON "${TOP_SRC_DIR}\resources\wiresharkinst.ico"
|
||||
BrandingText "Wireshark${U+00ae} Installer"
|
||||
|
||||
!define MUI_COMPONENTSPAGE_SMALLDESC
|
||||
|
|
|
@ -116,10 +116,10 @@ macro( ADD_PORTABLEAPPS_PACKAGE_TARGET )
|
|||
${_portableapps_launcher_ini}
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/packaging/portableapps/help.html ${PORTABLEAPPS_LAUNCHER_STAGING_DIR}/help.html
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/packaging/portableapps/help.html ${PORTABLEAPPS_LAUNCHER_STAGING_DIR}/help.html
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/image/wireshark.ico ${PORTABLEAPPS_LAUNCHER_STAGING_DIR}/App/AppInfo/appicon.ico
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/image/wsicon16.png ${PORTABLEAPPS_LAUNCHER_STAGING_DIR}/App/AppInfo/appicon_16.png
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/image/wsicon32.png ${PORTABLEAPPS_LAUNCHER_STAGING_DIR}/App/AppInfo/appicon_32.png
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/image/wsicon128.png ${PORTABLEAPPS_LAUNCHER_STAGING_DIR}/App/AppInfo/appicon_128.png
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/resources/icons/wireshark.ico ${PORTABLEAPPS_LAUNCHER_STAGING_DIR}/App/AppInfo/appicon.ico
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/resources/icons/wsicon16.png ${PORTABLEAPPS_LAUNCHER_STAGING_DIR}/App/AppInfo/appicon_16.png
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/resources/icons/wsicon32.png ${PORTABLEAPPS_LAUNCHER_STAGING_DIR}/App/AppInfo/appicon_32.png
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/resources/icons/wsicon128.png ${PORTABLEAPPS_LAUNCHER_STAGING_DIR}/App/AppInfo/appicon_128.png
|
||||
COMMAND ${PORTABLEAPPS_LAUNCHER_GENERATOR_EXECUTABLE} ${_portableapps_native}
|
||||
)
|
||||
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
= Introduction
|
||||
|
||||
This directory contains a set of images and icons for the Wireshark
|
||||
suite of applications. Of particular note for people creating packages
|
||||
for distribution are the files wireshark.ico, wiresharkdoc.ico,
|
||||
wsicon*.png, and WiresharkDoc-*.png
|
||||
This directory contains a set of resources for the Wireshark suite of
|
||||
applications. Of particular note for people creating packages for
|
||||
distribution are the files wireshark.ico, wiresharkdoc.ico, wsicon*.png,
|
||||
and WiresharkDoc-*.png in the icons directory.
|
||||
|
||||
File descriptions:
|
||||
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 872 B After Width: | Height: | Size: 872 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 35 KiB |
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 5.6 KiB |
Before Width: | Height: | Size: 281 KiB After Width: | Height: | Size: 281 KiB |
Before Width: | Height: | Size: 281 KiB After Width: | Height: | Size: 281 KiB |
Before Width: | Height: | Size: 364 KiB After Width: | Height: | Size: 364 KiB |
Before Width: | Height: | Size: 281 KiB After Width: | Height: | Size: 281 KiB |
Before Width: | Height: | Size: 768 B After Width: | Height: | Size: 768 B |
Before Width: | Height: | Size: 7.0 KiB After Width: | Height: | Size: 7.0 KiB |
Before Width: | Height: | Size: 5.8 KiB After Width: | Height: | Size: 5.8 KiB |
Before Width: | Height: | Size: 282 KiB After Width: | Height: | Size: 282 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 775 B After Width: | Height: | Size: 775 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 45 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 139 KiB After Width: | Height: | Size: 139 KiB |
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 5.2 KiB |
Before Width: | Height: | Size: 6.4 KiB After Width: | Height: | Size: 6.4 KiB |
Before Width: | Height: | Size: 323 KiB After Width: | Height: | Size: 323 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 800 B After Width: | Height: | Size: 800 B |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 55 KiB |
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 4.0 KiB |
Before Width: | Height: | Size: 166 KiB After Width: | Height: | Size: 166 KiB |
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 6.2 KiB |
Before Width: | Height: | Size: 7.0 KiB After Width: | Height: | Size: 7.0 KiB |
Before Width: | Height: | Size: 257 KiB After Width: | Height: | Size: 257 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 814 B After Width: | Height: | Size: 814 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 41 KiB After Width: | Height: | Size: 41 KiB |
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
Before Width: | Height: | Size: 124 KiB After Width: | Height: | Size: 124 KiB |
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 5.2 KiB |
Before Width: | Height: | Size: 503 B After Width: | Height: | Size: 503 B |
Before Width: | Height: | Size: 522 B After Width: | Height: | Size: 522 B |
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 58 KiB |
Before Width: | Height: | Size: 310 B After Width: | Height: | Size: 310 B |
Before Width: | Height: | Size: 283 B After Width: | Height: | Size: 283 B |
Before Width: | Height: | Size: 267 B After Width: | Height: | Size: 267 B |
Before Width: | Height: | Size: 243 B After Width: | Height: | Size: 243 B |
Before Width: | Height: | Size: 265 B After Width: | Height: | Size: 265 B |
Before Width: | Height: | Size: 281 B After Width: | Height: | Size: 281 B |
Before Width: | Height: | Size: 396 B After Width: | Height: | Size: 396 B |
Before Width: | Height: | Size: 179 B After Width: | Height: | Size: 179 B |
Before Width: | Height: | Size: 895 B After Width: | Height: | Size: 895 B |
Before Width: | Height: | Size: 557 B After Width: | Height: | Size: 557 B |
Before Width: | Height: | Size: 1022 B After Width: | Height: | Size: 1022 B |
Before Width: | Height: | Size: 553 B After Width: | Height: | Size: 553 B |
Before Width: | Height: | Size: 1020 B After Width: | Height: | Size: 1020 B |
Before Width: | Height: | Size: 546 B After Width: | Height: | Size: 546 B |
Before Width: | Height: | Size: 1021 B After Width: | Height: | Size: 1021 B |
Before Width: | Height: | Size: 557 B After Width: | Height: | Size: 557 B |
Before Width: | Height: | Size: 1016 B After Width: | Height: | Size: 1016 B |
Before Width: | Height: | Size: 557 B After Width: | Height: | Size: 557 B |
Before Width: | Height: | Size: 990 B After Width: | Height: | Size: 990 B |
Before Width: | Height: | Size: 556 B After Width: | Height: | Size: 556 B |
Before Width: | Height: | Size: 1016 B After Width: | Height: | Size: 1016 B |
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 27 KiB |
|
@ -1,7 +1,7 @@
|
|||
<RCC>
|
||||
<qresource prefix="/menu/help">
|
||||
<file>wsicon16.png</file>
|
||||
<file>wsicon-ask.png</file>
|
||||
<file alias="wsicon16.png">icons/wsicon16.png</file>
|
||||
<file alias="wsicon-ask.png">icons/wsicon-ask.png</file>
|
||||
</qresource>
|
||||
<qresource prefix="">
|
||||
<file>stock_icons/8x8/list-add.template.png</file>
|
Before Width: | Height: | Size: 597 B After Width: | Height: | Size: 597 B |
Before Width: | Height: | Size: 60 KiB After Width: | Height: | Size: 60 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 250 B After Width: | Height: | Size: 250 B |
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 6.8 KiB |
Before Width: | Height: | Size: 407 B After Width: | Height: | Size: 407 B |
Before Width: | Height: | Size: 262 B After Width: | Height: | Size: 262 B |
Before Width: | Height: | Size: 247 B After Width: | Height: | Size: 247 B |
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 6.8 KiB |
Before Width: | Height: | Size: 408 B After Width: | Height: | Size: 408 B |
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 6.8 KiB |
Before Width: | Height: | Size: 404 B After Width: | Height: | Size: 404 B |