diff --git a/packaging/macosx/Logray.icns b/packaging/macosx/Logray.icns index bd8ad8e0ba..68949c3a72 100644 Binary files a/packaging/macosx/Logray.icns and b/packaging/macosx/Logray.icns differ diff --git a/packaging/macosx/logray-app.dmgbuild.in b/packaging/macosx/logray-app.dmgbuild.in index 28516d7aa2..d392109dd7 100644 --- a/packaging/macosx/logray-app.dmgbuild.in +++ b/packaging/macosx/logray-app.dmgbuild.in @@ -18,24 +18,24 @@ import os.path # .. Useful stuff .............................................................. -lw_version = '@LOG_PROJECT_VERSION@' -lw_volname = 'Logray ' + lw_version -lw_srcdir = '@CMAKE_SOURCE_DIR@' -lw_bindir = '@CMAKE_BINARY_DIR@' -lw_app = 'Logray.app' -lw_readme = 'Read me first.html' -lw_install_chmodbpf = 'Install ChmodBPF.pkg' -lw_uninstall_chmodbpf = 'Uninstall ChmodBPF.pkg' -lw_install_path_helper = 'Add Logray to the system path.pkg' -lw_uninstall_path_helper = 'Remove Logray from the system path.pkg' +lr_version = '@LOG_PROJECT_VERSION@' +lr_volname = 'Logray ' + lr_version +lr_srcdir = '@CMAKE_SOURCE_DIR@' +lr_bindir = '@CMAKE_BINARY_DIR@' +lr_app = 'Logray.app' +lr_readme = 'Read me first.html' +lr_install_chmodbpf = 'Install ChmodBPF.pkg' +lr_uninstall_chmodbpf = 'Uninstall ChmodBPF.pkg' +lr_install_path_helper = 'Add Logray to the system path.pkg' +lr_uninstall_path_helper = 'Remove Logray from the system path.pkg' # .. Basics .................................................................... # Uncomment to override the output filename -# filename = lw_volname + ' Intel 64.dmg' +# filename = lr_volname + ' Intel 64.dmg' # Uncomment to override the output volume name -# volume_name = 'Logray ' + lw_version +# volume_name = 'Logray ' + lr_version # From the hdiutil man page: # UDZO - UDIF zlib-compressed image @@ -54,17 +54,17 @@ size = None # Files to include files = [ - os.path.join(lw_bindir, 'run', lw_app), - os.path.join(lw_bindir, 'packaging', 'macosx', 'logray', lw_readme), + os.path.join(lr_bindir, 'run', lr_app), + os.path.join(lr_bindir, 'packaging', 'macosx', 'logray', lr_readme), ] # Symlinks to create symlinks = { 'Applications': '/Applications', - lw_install_chmodbpf: os.path.join(lw_app, 'Contents', 'Resources', 'Extras', lw_install_chmodbpf), - lw_uninstall_chmodbpf: os.path.join(lw_app, 'Contents', 'Resources', 'Extras', lw_uninstall_chmodbpf), - lw_install_path_helper: os.path.join(lw_app, 'Contents', 'Resources', 'Extras', lw_install_path_helper), - lw_uninstall_path_helper: os.path.join(lw_app, 'Contents', 'Resources', 'Extras', lw_uninstall_path_helper), + lr_install_chmodbpf: os.path.join(lr_app, 'Contents', 'Resources', 'Extras', lr_install_chmodbpf), + lr_uninstall_chmodbpf: os.path.join(lr_app, 'Contents', 'Resources', 'Extras', lr_uninstall_chmodbpf), + lr_install_path_helper: os.path.join(lr_app, 'Contents', 'Resources', 'Extras', lr_install_path_helper), + lr_uninstall_path_helper: os.path.join(lr_app, 'Contents', 'Resources', 'Extras', lr_uninstall_path_helper), } # Volume icon @@ -73,18 +73,18 @@ 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', 'lriconvol.icns') +badge_icon = os.path.join(lr_srcdir, 'packaging', 'macosx', 'lriconvol.icns') #badge_icon = icon_from_app(application) # Where to put the icons icon_locations = { - lw_app: ( 80, 64), + lr_app: ( 80, 64), 'Applications': (240, 64), - lw_readme: (160, 170), - lw_install_chmodbpf: ( 80, 276), - lw_uninstall_chmodbpf: (250, 276), - lw_install_path_helper: ( 80, 382), - lw_uninstall_path_helper: (250, 382), + lr_readme: (160, 170), + lr_install_chmodbpf: ( 80, 276), + lr_uninstall_chmodbpf: (250, 276), + lr_install_path_helper: ( 80, 382), + lr_uninstall_path_helper: (250, 382), } # .. Window configuration ...................................................... @@ -109,7 +109,7 @@ icon_locations = { # # Other color components may be expressed either in the range 0 to 1, or # as percentages (e.g. 60% is equivalent to 0.6). -background = os.path.join(lw_srcdir, 'packaging', 'macosx', 'dmg_background.png') +background = os.path.join(lr_srcdir, 'packaging', 'macosx', 'dmg_background.png') show_status_bar = False show_tab_view = False diff --git a/packaging/macosx/lriconvol.icns b/packaging/macosx/lriconvol.icns index b41a449370..8028249671 100644 Binary files a/packaging/macosx/lriconvol.icns and b/packaging/macosx/lriconvol.icns differ diff --git a/packaging/macosx/lriconvol.svg b/packaging/macosx/lriconvol.svg index 3112c38822..c25a8c820c 100644 --- a/packaging/macosx/lriconvol.svg +++ b/packaging/macosx/lriconvol.svg @@ -5,7 +5,7 @@ sodipodi:version="0.32" sodipodi:docname="lriconvol.svg" inkscape:version="1.2 (dc2aeda, 2022-05-15)" - inkscape:export-filename="../../../../../../tmp/icon512x512.png" + inkscape:export-filename="lriconvol.iconset/icon_512x512.png" inkscape:export-xdpi="2048" inkscape:export-ydpi="2048" x="0px" @@ -27,6 +27,14 @@ rdf:about="">image/svg+xml + xlink:href="#linearGradient1850" + id="linearGradient1852" + x1="0.90263927" + y1="14.816668" + x2="0.90263927" + y2="2.1164389" + gradientUnits="userSpaceOnUse" /> - + style="fill:url(#linearGradient1852);fill-opacity:1;stroke:none;stroke-width:0.604772px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 13.061635,5.2295311 C 13.013617,4.9413813 12.875822,4.3436854 12.80026,4.0297442 12.753435,3.8351889 12.645904,3.3934937 12.51538,3.1076385 12.355481,2.7574505 12.156827,2.4673879 11.900236,2.2341766 11.801496,2.1444339 11.623019,2.1134401 11.53973,2.1166641 11.323239,2.1250442 11.36145,2.1997672 11.305994,2.3921507 11.24828,2.5923659 11.224831,2.7057664 11.1125,2.9104136 10.960772,3.1868365 10.583333,3.7041667 10.31875,3.96875 9.9843113,4.3031885 9.5077152,4.5996551 9.2604168,4.7625 8.7662984,5.0878748 8.3389344,5.227556 8.0846163,5.3187745 7.475322,5.5373184 6.4981568,5.6783374 5.8414466,5.8117975 c 0.6818225,0.013539 2.5610101,0.097892 4.5452274,0.2552756 1.678991,0.1331734 2.755596,0.2723835 3.094781,0.3211796 -0.313793,-0.4073843 -0.350107,-0.7318582 -0.41982,-1.1587216 z" + id="path3207" + sodipodi:nodetypes="cssssssssscscc" /> diff --git a/resources/icons/logray.ico b/resources/icons/logray.ico index 7fb55cae44..89fe69c523 100644 Binary files a/resources/icons/logray.ico and b/resources/icons/logray.ico differ diff --git a/resources/icons/lograyinst.ico b/resources/icons/lograyinst.ico index 088cdc155e..7120633270 100644 Binary files a/resources/icons/lograyinst.ico and b/resources/icons/lograyinst.ico differ diff --git a/resources/icons/lricon.svg b/resources/icons/lricon.svg index bca46f773e..4dafb6af08 100644 --- a/resources/icons/lricon.svg +++ b/resources/icons/lricon.svg @@ -31,29 +31,58 @@ inkscape:pagecheckerboard="true" inkscape:deskcolor="#d1d1d1" inkscape:document-units="px" - showgrid="true" + showgrid="false" inkscape:zoom="14.640625" - inkscape:cx="23.940235" - inkscape:cy="32.068303" + inkscape:cx="32" + inkscape:cy="32" inkscape:window-width="1587" inkscape:window-height="1115" - inkscape:window-x="353" + inkscape:window-x="217" inkscape:window-y="25" inkscape:window-maximized="0" - inkscape:current-layer="layer1" + inkscape:current-layer="g308" borderlayer="true" showguides="true">Logray IconGerald Combs diff --git a/resources/icons/lricon1024.png b/resources/icons/lricon1024.png index f9556eea7e..df78a0791f 100644 Binary files a/resources/icons/lricon1024.png and b/resources/icons/lricon1024.png differ diff --git a/resources/icons/lricon128.png b/resources/icons/lricon128.png index 6b8fe9a187..03a58fd916 100644 Binary files a/resources/icons/lricon128.png and b/resources/icons/lricon128.png differ diff --git a/resources/icons/lricon16.png b/resources/icons/lricon16.png index e6339ddd2c..45f9ee440a 100644 Binary files a/resources/icons/lricon16.png and b/resources/icons/lricon16.png differ diff --git a/resources/icons/lricon256.png b/resources/icons/lricon256.png index abad4b3a8d..d7e0f3bffe 100644 Binary files a/resources/icons/lricon256.png and b/resources/icons/lricon256.png differ diff --git a/resources/icons/lricon32.png b/resources/icons/lricon32.png index 1ab9f5ff5a..6d511b578f 100644 Binary files a/resources/icons/lricon32.png and b/resources/icons/lricon32.png differ diff --git a/resources/icons/lricon48.png b/resources/icons/lricon48.png index 1dd84e8aa0..150aa6ae9d 100644 Binary files a/resources/icons/lricon48.png and b/resources/icons/lricon48.png differ diff --git a/resources/icons/lricon512.png b/resources/icons/lricon512.png index bfc84ce08a..da1fadcb46 100644 Binary files a/resources/icons/lricon512.png and b/resources/icons/lricon512.png differ diff --git a/resources/icons/lricon64.png b/resources/icons/lricon64.png index 3e9fb898dd..8ce68b4f21 100644 Binary files a/resources/icons/lricon64.png and b/resources/icons/lricon64.png differ diff --git a/resources/icons/lriconcap1024.png b/resources/icons/lriconcap1024.png index 3473371a6b..10835a3d8e 100644 Binary files a/resources/icons/lriconcap1024.png and b/resources/icons/lriconcap1024.png differ diff --git a/resources/icons/lriconcap128.png b/resources/icons/lriconcap128.png index 951640f7be..0cf9d46ad2 100644 Binary files a/resources/icons/lriconcap128.png and b/resources/icons/lriconcap128.png differ diff --git a/resources/icons/lriconcap16.png b/resources/icons/lriconcap16.png index bbb29a4250..131db77e5a 100644 Binary files a/resources/icons/lriconcap16.png and b/resources/icons/lriconcap16.png differ diff --git a/resources/icons/lriconcap256.png b/resources/icons/lriconcap256.png index ad8b067955..dc0b7421d6 100644 Binary files a/resources/icons/lriconcap256.png and b/resources/icons/lriconcap256.png differ diff --git a/resources/icons/lriconcap32.png b/resources/icons/lriconcap32.png index 3bf3e0aa83..df1e5985c7 100644 Binary files a/resources/icons/lriconcap32.png and b/resources/icons/lriconcap32.png differ diff --git a/resources/icons/lriconcap48.png b/resources/icons/lriconcap48.png index 883c71669a..3dc7696a4d 100644 Binary files a/resources/icons/lriconcap48.png and b/resources/icons/lriconcap48.png differ diff --git a/resources/icons/lriconcap512.png b/resources/icons/lriconcap512.png index 000151bb26..9efc34f1f0 100644 Binary files a/resources/icons/lriconcap512.png and b/resources/icons/lriconcap512.png differ diff --git a/resources/icons/lriconcap64.png b/resources/icons/lriconcap64.png index c9a2658fc7..122a3e10cd 100644 Binary files a/resources/icons/lriconcap64.png and b/resources/icons/lriconcap64.png differ diff --git a/resources/icons/lriconinst.svg b/resources/icons/lriconinst.svg index d8ab42a0ee..1ab5e1929c 100644 --- a/resources/icons/lriconinst.svg +++ b/resources/icons/lriconinst.svg @@ -8,7 +8,7 @@ version="1.1" id="svg5" inkscape:version="1.2 (dc2aeda, 2022-05-15)" - sodipodi:docname="lriconinst-2022-09-04.svg" + sodipodi:docname="lriconinst.svg" inkscape:export-filename="lricon256.png" inkscape:export-xdpi="384" inkscape:export-ydpi="384" @@ -33,11 +33,11 @@ inkscape:document-units="px" showgrid="true" inkscape:zoom="14.640625" - inkscape:cx="25.511206" - inkscape:cy="35.483458" + inkscape:cx="29.13127" + inkscape:cy="32.614728" inkscape:window-width="1587" inkscape:window-height="1115" - inkscape:window-x="354" + inkscape:window-x="353" inkscape:window-y="25" inkscape:window-maximized="0" inkscape:current-layer="layer3" @@ -67,45 +67,31 @@ style="stroke-width:0.666667" />Logray IconGerald Combs diff --git a/resources/icons/lriconinst1024.png b/resources/icons/lriconinst1024.png index f741c7cccf..f2f2a24989 100644 Binary files a/resources/icons/lriconinst1024.png and b/resources/icons/lriconinst1024.png differ diff --git a/resources/icons/lriconinst128.png b/resources/icons/lriconinst128.png index 2c062f7303..58c96d19df 100644 Binary files a/resources/icons/lriconinst128.png and b/resources/icons/lriconinst128.png differ diff --git a/resources/icons/lriconinst16.png b/resources/icons/lriconinst16.png index ad6e49a4de..7fad69ce8e 100644 Binary files a/resources/icons/lriconinst16.png and b/resources/icons/lriconinst16.png differ diff --git a/resources/icons/lriconinst256.png b/resources/icons/lriconinst256.png index 47dfffe605..1c3c840cce 100644 Binary files a/resources/icons/lriconinst256.png and b/resources/icons/lriconinst256.png differ diff --git a/resources/icons/lriconinst32.png b/resources/icons/lriconinst32.png index ae27bb56ac..0f9b09cab2 100644 Binary files a/resources/icons/lriconinst32.png and b/resources/icons/lriconinst32.png differ diff --git a/resources/icons/lriconinst48.png b/resources/icons/lriconinst48.png index 2297005d24..5a26f4dd64 100644 Binary files a/resources/icons/lriconinst48.png and b/resources/icons/lriconinst48.png differ diff --git a/resources/icons/lriconinst512.png b/resources/icons/lriconinst512.png index c728ee08a1..c8afd83615 100644 Binary files a/resources/icons/lriconinst512.png and b/resources/icons/lriconinst512.png differ diff --git a/resources/icons/lriconinst64.png b/resources/icons/lriconinst64.png index f703bc6f9c..11350d901a 100644 Binary files a/resources/icons/lriconinst64.png and b/resources/icons/lriconinst64.png differ