Add Logray icons.

Add lricon.svg and lriconinst.svg, which provide the core graphic
element for the various Logray icons. Add lricon*.png, which were
created using the templates at
https://developer.apple.com/design/resources/. Add Logray.icns,
logray.ico, and lograyinst.ico, and use them in various packaging
resources.
This commit is contained in:
Gerald Combs 2022-08-31 17:36:49 -07:00
parent 9315cffd6a
commit ab4a4304ee
38 changed files with 1532 additions and 19 deletions

View File

@ -2587,7 +2587,7 @@ if(ENABLE_APPLICATION_BUNDLE)
# Logray.app/Contents/Resources
set(LOGRAY_BUNDLE_RESOURCE_FILES
${CMAKE_SOURCE_DIR}/packaging/macosx/Wireshark.icns
${CMAKE_SOURCE_DIR}/packaging/macosx/Logray.icns
${CMAKE_SOURCE_DIR}/packaging/macosx/Wiresharkdoc.icns
)
set_source_files_properties(${LOGRAY_BUNDLE_RESOURCE_FILES} PROPERTIES

Binary file not shown.

View File

@ -9,7 +9,7 @@
<key>CFBundleGetInfoString</key>
<string>@LOG_PROJECT_VERSION@, Copyright 1998-2022 Wireshark Development Team</string>
<key>CFBundleIconFile</key>
<string>Wireshark.icns</string>
<string>Logray.icns</string>
<key>CFBundleIdentifier</key>
<string>org.wireshark.Logray</string>
<key>CFBundleDocumentTypes</key>

View File

@ -73,7 +73,7 @@ symlinks = {
# image, *or* you can define badge_icon, in which case the icon file you specify
# will be used to badge the system's Removable Disk icon
#
badge_icon = os.path.join(lw_srcdir, 'packaging', 'macosx', 'wsiconvol.icns')
badge_icon = os.path.join(lw_srcdir, 'packaging', 'macosx', 'lriconvol.icns')
#badge_icon = icon_from_app(application)
# Where to put the icons

View File

@ -64,7 +64,7 @@ symlinks = {
# image, *or* you can define badge_icon, in which case the icon file you specify
# will be used to badge the system's Removable Disk icon
#
badge_icon = os.path.join(lw_srcdir, 'packaging', 'macosx', 'wsiconvol.icns')
badge_icon = os.path.join(lw_srcdir, 'packaging', 'macosx', 'lriconvol.icns')
#badge_icon = icon_from_app(application)
# Where to put the icons

Binary file not shown.

View File

@ -0,0 +1,112 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
version="1.1"
id="svg548"
sodipodi:version="0.32"
sodipodi:docname="lriconvol.svg"
inkscape:version="1.2 (dc2aeda, 2022-05-15)"
inkscape:export-filename="../../../../../../tmp/icon512x512.png"
inkscape:export-xdpi="2048"
inkscape:export-ydpi="2048"
x="0px"
y="0px"
width="24px"
height="24px"
viewBox="0 0 24 24"
enable-background="new 0 0 24 24"
xml:space="preserve"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
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/"><metadata
id="metadata3007"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
id="defs3005"><linearGradient
id="linearGradient5067"><stop
style="stop-color:#000000;stop-opacity:0.15753424;"
offset="0"
id="stop5069" /><stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop5071" /></linearGradient><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5067"
id="linearGradient5073"
x1="15"
y1="21.5"
x2="12.5"
y2="11.5"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.2395694,0,0,1.1444028,21.297859,-1.7705992)" /></defs>
<sodipodi:namedview
inkscape:snap-page="false"
inkscape:current-layer="svg548"
inkscape:window-width="1718"
showguides="true"
inkscape:guide-bbox="true"
inkscape:window-maximized="0"
inkscape:window-height="1032"
inkscape:cy="12.553259"
inkscape:cx="5.3990462"
inkscape:window-x="88"
id="base"
inkscape:window-y="25"
showgrid="true"
inkscape:zoom="26.208333"
inkscape:document-rotation="0"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1">
<inkscape:grid
type="xygrid"
enabled="true"
visible="true"
spacingx="0.5px"
spacingy="0.5px"
empspacing="5"
snapvisiblegridlinesonly="true"
id="grid3142">
</inkscape:grid>
<sodipodi:guide
position="22,24"
orientation="-1,0"
id="guide4492"
inkscape:locked="false"
inkscape:label=""
inkscape:color="rgb(0,134,229)" /></sodipodi:namedview>
<path
id="path4555"
inkscape:export-filename="/home/gerald/devel/wsweb/image/wslogo.png"
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc"
d="M 25.5,23.001143 C 25.5,23.001143 28.365885,3.2922387 46.267747,1 40.714476,11.678422 46,23.02632 46,23.02632 Z"
style="fill:url(#linearGradient5073);fill-opacity:1;stroke-width:1.19103" /><g
id="g707"
transform="matrix(1.6459427,0,0,1.6463495,-4.5976917,-1.8895397)"
style="display:inline;stroke-width:2.29598"><path
style="fill:#0b48a8;fill-opacity:1;stroke:#0b48a8;stroke-width:0.15187;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="M 4.9155105,6.3168663 C 3.1510496,6.1807775 -6.9248217,6.0446934 -6.7894091,6.0437654 c 2.0645557,-0.014153 9.9774501,0.010087 11.6061609,-0.035097 0.1278467,-0.00356 0.114655,0.018057 0.2201682,0.047086 1.1e-6,0.038862 0.05183,0.2744742 -0.1214095,0.2611119 z"
id="path756"
sodipodi:nodetypes="ssscs" /><path
style="fill:#0d54c6;fill-opacity:1;stroke:none;stroke-width:0.607479px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 10.504458,6.1363253 C 8.4561264,5.9809778 6.1785322,5.9037098 5.1864455,5.9229601 c -0.1943918,0.00379 -0.1959888,0.036076 -0.3100694,0.1675918 -0.074512,0.0859 -0.1390473,0.1554018 -0.077545,0.3474973 0.061505,0.1920957 1.1087694,1.7379333 1.5100956,2.450071 0.3101205,0.5502975 0.6333151,1.7976578 0.7203484,2.4874938 0.09574,0.758848 0.00953,1.143733 -0.1332328,1.640881 -0.090283,0.31439 -0.2791111,0.781283 -0.330594,0.887205 -0.072063,0.148263 -0.2435017,0.440633 -0.2793014,0.535415 -0.084985,0.225002 -0.055563,0.268573 0.1127841,0.339178 0.1448279,0.06074 1.4947135,-0.03312 1.8189014,-0.108295 0.3484458,-0.0808 0.7959495,-0.304824 1.153798,-0.564444 0.4286156,-0.310962 1.5398726,-1.46766 1.9476126,-2.247362 0.40774,-0.779701 1.30995,-2.069964 1.527854,-2.3466588 C 13.405788,8.8021141 14.044552,8.4303667 14.341796,8.2707007 14.798195,8.0255471 15.302115,8.1636171 15.832041,7.648229 16.073475,7.4134163 16.23424,7.1450744 16.159549,6.918057 16.084856,6.6910383 15.796341,6.6908994 15.596792,6.6509771 15.397245,6.611055 15.197209,6.5759459 14.985658,6.5505751 13.496228,6.37195 12.867999,6.3155701 10.504457,6.136317 Z"
id="path758"
sodipodi:nodetypes="ssssssssssssssssszsss" /><path
style="fill:#0e63eb;fill-opacity:1;stroke:none;stroke-width:0.607479px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 14.68102,5.1687594 C 14.632792,4.8793506 14.494394,4.279043 14.418502,3.96373 14.371472,3.7683246 14.295746,3.4377968 14.132375,3.0375952 13.991361,2.6921589 13.636975,2.0482008 13.487313,2.0423363 c -0.06215,-0.00244 -0.160772,0.099427 -0.211152,0.1662904 -0.06552,0.086958 -0.21967,0.4629 -0.323861,0.658964 -0.148619,0.2796657 -0.324762,0.6490847 -0.536167,0.9125886 -0.297268,0.3705279 -0.560112,0.5952285 -0.913923,0.847462 -0.453424,0.3232481 -0.944647,0.5884024 -1.200078,0.6800195 -0.6119605,0.2194989 -1.4093394,0.3249265 -2.0251934,0.5058723 0.684806,0.013598 1.7245154,0.038357 3.7174154,0.196428 1.686338,0.1337553 2.767654,0.2735737 3.108323,0.322583 C 14.787511,5.9233797 14.751038,5.597488 14.68102,5.1687594 Z"
id="path760"
sodipodi:nodetypes="csssssssscscc" /></g></svg>

After

Width:  |  Height:  |  Size: 5.9 KiB

View File

@ -31,7 +31,7 @@ Name "${DISPLAY_NAME}"
!define UNINSTALLER_NAME "uninstall-logray.exe"
VIAddVersionKey "ProductName" "${PROGRAM_NAME}"
VIAddVersionKey "Comments" "It's a great product with a great story to tell. I'm pumped!"
VIAddVersionKey "Comments" "My manta ray is all right."
VIAddVersionKey "CompanyName" "${PROGRAM_NAME} development team"
; NSIS handles U+00a9 but not a UTF-8 encoded copyright symbol.
VIAddVersionKey "LegalCopyright" "${U+00a9} Gerald Combs and many others"

View File

@ -38,7 +38,7 @@ SetCompressorDictSize 64 ; MB
; The file to write
OutFile "${OUTFILE_DIR}\${PROGRAM_NAME}-${WIRESHARK_TARGET_PLATFORM}-${VERSION}.exe"
; Installer icon
Icon "${TOP_SRC_DIR}\resources\icons\wiresharkinst.ico"
Icon "${TOP_SRC_DIR}\resources\icons\lograyinst.ico"
; ============================================================================
; Modern UI
@ -53,7 +53,7 @@ Icon "${TOP_SRC_DIR}\resources\icons\wiresharkinst.ico"
!include "InstallOptions.nsh"
;!addplugindir ".\Plugins"
!define MUI_ICON "${TOP_SRC_DIR}\resources\icons\wiresharkinst.ico"
!define MUI_ICON "${TOP_SRC_DIR}\resources\icons\lograyinst.ico"
BrandingText "Logray${U+00ae} Installer"
!define MUI_COMPONENTSPAGE_SMALLDESC

View File

@ -17,11 +17,11 @@ OutFile "${STAGING_DIR}\uninstall_logray_installer.exe"
InstType "un.All (remove all)"
; Uninstaller icon
UninstallIcon "..\..\resources\icons\wiresharkinst.ico"
UninstallIcon "..\..\resources\icons\lograyinst.ico"
!include "MUI.nsh"
!define MUI_UNICON "..\..\resources\icons\wiresharkinst.ico"
!define MUI_UNICON "..\..\resources\icons\lograyinst.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."

View File

@ -8,7 +8,7 @@ and WiresharkDoc-*.png in the icons directory.
File descriptions:
wsicon.svg::
Old vector source for the wireshark icon.
Old vector source for the Wireshark icon.
wsiconcap.svg::
Old vector source for the "capture" icon.
@ -23,17 +23,26 @@ wsiconcap16.png ... wsiconcap1024.png::
“Capture in progress” application icon in various sizes
wsiconinst16.png ... wsiconinst1024.png::
Wireshark installer icons in various sizes
Wireshark installer icons in various sizes.
WiresharkDoc-16.png ... WiresharkDoc-256.png
Capture document icon in various sizes
WiresharkDoc-16.png ... WiresharkDoc-256.png::
Capture document icon in various sizes.
wireshark.ico::
Windows application icon file with 16 and 32 pixel 3D logo icons, high and low color.
Windows application icon file with 16x16, 24x24 32x32, 48x48, and 256x256 pixel images.
wiresharkdoc.ico::
Windows document icon file with 16 and 32 pixel 3D logo icons, high and low color.
lricon.svg::
Vector source for the Logray icon.
lricon16.png ... lricon1024.png::
Logray application icons in various sizes.
logray.ico::
Windows application icon file with 16x16, 32x32, 48x48, and 256x256 pixel images.
*.rc.in::
MSVC++ resource templates

BIN
resources/icons/logray.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

1260
resources/icons/lricon.svg Normal file

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 94 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 382 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 863 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 94 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 425 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 932 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@ -1,7 +1,7 @@
#include "winver.h"
#pragma code_page(65001)
LOGRAY_ICON1 ICON "@ICON_PATH@wireshark.ico"
LOGRAY_ICON1 ICON "@ICON_PATH@logray.ico"
LOGRAY_ICON2 ICON "@ICON_PATH@wiresharkdoc.ico"
VS_VERSION_INFO VERSIONINFO

20
resources/lricon.qrc Normal file
View File

@ -0,0 +1,20 @@
<RCC>
<qresource prefix="/lricon">
<file alias="wsiconcap16.png">icons/wsiconcap16.png</file>
<file alias="wsiconcap32.png">icons/wsiconcap32.png</file>
<file alias="wsiconcap48.png">icons/wsiconcap48.png</file>
<file alias="wsiconcap64.png">icons/wsiconcap64.png</file>
<file alias="wsiconcap128.png">icons/wsiconcap128.png</file>
<file alias="wsiconcap256.png">icons/wsiconcap256.png</file>
<file alias="wsiconcap512.png">icons/wsiconcap512.png</file>
<file alias="wsiconcap1024.png">icons/wsiconcap1024.png</file>
<file alias="lricon16.png">icons/lricon16.png</file>
<file alias="lricon32.png">icons/lricon32.png</file>
<file alias="lricon48.png">icons/lricon48.png</file>
<file alias="lricon64.png">icons/lricon64.png</file>
<file alias="lricon128.png">icons/lricon128.png</file>
<file alias="lricon256.png">icons/lricon256.png</file>
<file alias="lricon512.png">icons/lricon512.png</file>
<file alias="lricon1024.png">icons/lricon1024.png</file>
</qresource>
</RCC>

View File

@ -587,8 +587,8 @@ set(LOGRAY_QT_QRC
../../resources/about.qrc
../../resources/languages/languages.qrc
../../resources/layout.qrc
../../resources/lricon.qrc
../../resources/stock_icons.qrc
../../resources/wsicon.qrc
${CMAKE_CURRENT_BINARY_DIR}/i18n.qrc
)

View File

@ -19,6 +19,7 @@ LograyApplication::LograyApplication(int &argc, char **argv) :
MainApplication(argc, argv)
{
lwApp = this;
Q_INIT_RESOURCE(lricon);
setApplicationName("Logray");
setDesktopFileName(QStringLiteral("org.wireshark.Logray"));
}

View File

@ -720,7 +720,7 @@
<action name="actionHelpWebsite">
<property name="icon">
<iconset resource="../../image/stock_icons.qrc">
<normaloff>:/menu/help/wsicon16.png</normaloff>:/menu/help/wsicon16.png</iconset>
<normaloff>:/menu/help/lricon16.png</normaloff>:/menu/help/lricon16.png</iconset>
</property>
<property name="text">
<string>Website</string>
@ -739,7 +739,7 @@
<action name="actionHelpWiki">
<property name="icon">
<iconset resource="../../image/stock_icons.qrc">
<normaloff>:/menu/help/wsicon16.png</normaloff>:/menu/help/wsicon16.png</iconset>
<normaloff>:/menu/help/lricon16.png</normaloff>:/menu/help/lricon16.png</iconset>
</property>
<property name="text">
<string>Wiki</string>

View File

@ -646,7 +646,6 @@ MainApplication::MainApplication(int &argc, char **argv) :
Q_INIT_RESOURCE(i18n);
Q_INIT_RESOURCE(layout);
Q_INIT_RESOURCE(stock_icons);
Q_INIT_RESOURCE(wsicon);
Q_INIT_RESOURCE(languages);
#ifdef Q_OS_WIN

View File

@ -15,6 +15,7 @@ WiresharkApplication::WiresharkApplication(int &argc, char **argv) :
MainApplication(argc, argv)
{
wsApp = this;
Q_INIT_RESOURCE(wsicon);
setApplicationName("Wireshark");
setDesktopFileName(QStringLiteral("org.wireshark.Wireshark"));
}