vice-emu-commit Mailing List for VICE (Page 14)
Versatile Commodore Emulator
Brought to you by:
blackystardust,
gpz
Menu
▾
▴
vice-emu-commit — Commit notifications for the source server
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
(38) |
May
(60) |
Jun
(122) |
Jul
(148) |
Aug
(178) |
Sep
(151) |
Oct
(131) |
Nov
(208) |
Dec
(129) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(193) |
Feb
(209) |
Mar
(221) |
Apr
(243) |
May
(165) |
Jun
(168) |
Jul
(198) |
Aug
(161) |
Sep
(103) |
Oct
(98) |
Nov
(168) |
Dec
(99) |
| 2010 |
Jan
(263) |
Feb
(156) |
Mar
(57) |
Apr
(93) |
May
(85) |
Jun
(124) |
Jul
(57) |
Aug
(58) |
Sep
(113) |
Oct
(148) |
Nov
(114) |
Dec
(193) |
| 2011 |
Jan
(200) |
Feb
(207) |
Mar
(91) |
Apr
(91) |
May
(142) |
Jun
(104) |
Jul
(115) |
Aug
(137) |
Sep
(266) |
Oct
(91) |
Nov
(85) |
Dec
(186) |
| 2012 |
Jan
(98) |
Feb
(146) |
Mar
(160) |
Apr
(99) |
May
(59) |
Jun
(257) |
Jul
(84) |
Aug
(103) |
Sep
(169) |
Oct
(206) |
Nov
(90) |
Dec
(296) |
| 2013 |
Jan
(294) |
Feb
(130) |
Mar
(36) |
Apr
(14) |
May
(51) |
Jun
(74) |
Jul
(180) |
Aug
(85) |
Sep
(26) |
Oct
(45) |
Nov
(29) |
Dec
(21) |
| 2014 |
Jan
(56) |
Feb
(40) |
Mar
(57) |
Apr
(30) |
May
(31) |
Jun
(11) |
Jul
(107) |
Aug
(135) |
Sep
(142) |
Oct
(195) |
Nov
(139) |
Dec
(133) |
| 2015 |
Jan
(293) |
Feb
(161) |
Mar
(146) |
Apr
(85) |
May
(139) |
Jun
(51) |
Jul
(21) |
Aug
(24) |
Sep
(29) |
Oct
(136) |
Nov
(212) |
Dec
(118) |
| 2016 |
Jan
(119) |
Feb
(165) |
Mar
(229) |
Apr
(219) |
May
(134) |
Jun
(119) |
Jul
(134) |
Aug
(236) |
Sep
(203) |
Oct
(215) |
Nov
(300) |
Dec
(140) |
| 2017 |
Jan
(188) |
Feb
(20) |
Mar
(147) |
Apr
(198) |
May
(26) |
Jun
(21) |
Jul
(67) |
Aug
(219) |
Sep
(209) |
Oct
(194) |
Nov
(144) |
Dec
(99) |
| 2018 |
Jan
(139) |
Feb
(122) |
Mar
(116) |
Apr
(85) |
May
(232) |
Jun
(181) |
Jul
(190) |
Aug
(105) |
Sep
(92) |
Oct
(178) |
Nov
(105) |
Dec
(86) |
| 2019 |
Jan
(119) |
Feb
(79) |
Mar
(74) |
Apr
(117) |
May
(115) |
Jun
(307) |
Jul
(107) |
Aug
(131) |
Sep
(103) |
Oct
(60) |
Nov
(118) |
Dec
(70) |
| 2020 |
Jan
(114) |
Feb
(103) |
Mar
(77) |
Apr
(121) |
May
(193) |
Jun
(110) |
Jul
(214) |
Aug
(210) |
Sep
(179) |
Oct
(260) |
Nov
(237) |
Dec
(334) |
| 2021 |
Jan
(163) |
Feb
(186) |
Mar
(58) |
Apr
(81) |
May
(108) |
Jun
(175) |
Jul
(154) |
Aug
(180) |
Sep
(217) |
Oct
(204) |
Nov
(232) |
Dec
(190) |
| 2022 |
Jan
(253) |
Feb
(134) |
Mar
(229) |
Apr
(190) |
May
(125) |
Jun
(70) |
Jul
(8) |
Aug
(22) |
Sep
(19) |
Oct
(33) |
Nov
(94) |
Dec
(164) |
| 2023 |
Jan
(158) |
Feb
(366) |
Mar
(272) |
Apr
(109) |
May
(198) |
Jun
(226) |
Jul
(200) |
Aug
(94) |
Sep
(108) |
Oct
(62) |
Nov
(175) |
Dec
(116) |
| 2024 |
Jan
(35) |
Feb
(40) |
Mar
(51) |
Apr
(89) |
May
(24) |
Jun
(26) |
Jul
(53) |
Aug
(71) |
Sep
(23) |
Oct
(11) |
Nov
(22) |
Dec
(58) |
| 2025 |
Jan
(26) |
Feb
(40) |
Mar
(107) |
Apr
(39) |
May
(35) |
Jun
(20) |
Jul
(11) |
Aug
(24) |
Sep
(35) |
Oct
(28) |
Nov
(12) |
Dec
|
|
From: <co...@us...> - 2025-02-14 19:14:52
|
Revision: 45495
http://sourceforge.net/p/vice-emu/code/45495
Author: compyx
Date: 2025-02-14 19:14:50 +0000 (Fri, 14 Feb 2025)
Log Message:
-----------
Github actions: add missing 'then' in .deb script
Modified Paths:
--------------
trunk/vice/build/github-actions/build-deb.sh
Modified: trunk/vice/build/github-actions/build-deb.sh
===================================================================
--- trunk/vice/build/github-actions/build-deb.sh 2025-02-14 18:54:27 UTC (rev 45494)
+++ trunk/vice/build/github-actions/build-deb.sh 2025-02-14 19:14:50 UTC (rev 45495)
@@ -75,7 +75,7 @@
${DEB_DIR}/usr/share/icons/hicolor/${size_}x${size_}/apps/vice-${name}.png
done
done
-elif [ "$UI" = "sdl1" -o "$UI" = "sdl2" ];
+elif [ "$UI" = "sdl1" -o "$UI" = "sdl2" ]; then
# Copy icon files
cp vice/data/common/vice-*_256.png ${DEB_DIR}/usr/share/vice/common/
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <co...@us...> - 2025-02-14 18:54:29
|
Revision: 45494
http://sourceforge.net/p/vice-emu/code/45494
Author: compyx
Date: 2025-02-14 18:54:27 +0000 (Fri, 14 Feb 2025)
Log Message:
-----------
Github actions: provide 256x256 icon files for SDL .deb packages
The merge of the compyx/desktop-icons branch broke the application icons for
the SDL .deb packages, this *should* fix that.
Modified Paths:
--------------
trunk/vice/build/github-actions/build-deb.sh
Modified: trunk/vice/build/github-actions/build-deb.sh
===================================================================
--- trunk/vice/build/github-actions/build-deb.sh 2025-02-14 18:23:49 UTC (rev 45493)
+++ trunk/vice/build/github-actions/build-deb.sh 2025-02-14 18:54:27 UTC (rev 45494)
@@ -75,6 +75,9 @@
${DEB_DIR}/usr/share/icons/hicolor/${size_}x${size_}/apps/vice-${name}.png
done
done
+elif [ "$UI" = "sdl1" -o "$UI" = "sdl2" ];
+ # Copy icon files
+ cp vice/data/common/vice-*_256.png ${DEB_DIR}/usr/share/vice/common/
fi
# Create copyright file, taking contributor info from src/infocontrib.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <co...@us...> - 2025-02-14 18:23:50
|
Revision: 45493
http://sourceforge.net/p/vice-emu/code/45493
Author: compyx
Date: 2025-02-14 18:23:49 +0000 (Fri, 14 Feb 2025)
Log Message:
-----------
Gtk3: properly uninstall 32x22 xvic icon (when using --enable-desktop-files)
Modified Paths:
--------------
trunk/vice/data/common/Makefile.am
Modified: trunk/vice/data/common/Makefile.am
===================================================================
--- trunk/vice/data/common/Makefile.am 2025-02-14 13:25:58 UTC (rev 45492)
+++ trunk/vice/data/common/Makefile.am 2025-02-14 18:23:49 UTC (rev 45493)
@@ -195,7 +195,7 @@
xdg-icon-resource uninstall --size 48 vice-xplus4
xdg-icon-resource uninstall --size 64 vice-xplus4
xdg-icon-resource uninstall --size 256 vice-xplus4
- xdg-icon-resource uninstall --size 32 vice-vic
+ xdg-icon-resource uninstall --size 32 vice-xvic
xdg-icon-resource uninstall --size 48 vice-xvic
xdg-icon-resource uninstall --size 64 vice-xvic
xdg-icon-resource uninstall --size 256 vice-xvic
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <co...@us...> - 2025-02-14 13:25:59
|
Revision: 45492
http://sourceforge.net/p/vice-emu/code/45492
Author: compyx
Date: 2025-02-14 13:25:58 +0000 (Fri, 14 Feb 2025)
Log Message:
-----------
Github actions: .deb package: don't quote array elements in for loops
Modified Paths:
--------------
trunk/vice/build/github-actions/build-deb.sh
Modified: trunk/vice/build/github-actions/build-deb.sh
===================================================================
--- trunk/vice/build/github-actions/build-deb.sh 2025-02-14 12:48:15 UTC (rev 45491)
+++ trunk/vice/build/github-actions/build-deb.sh 2025-02-14 13:25:58 UTC (rev 45492)
@@ -69,8 +69,8 @@
# Copy .desktop files
cp vice/data/common/*.desktop ${DEB_DIR}/usr/share/applications
# Copy icon files
- for name in "x64 x64dtv xscpu64 x128 xvic xplus4 xpet xcbm2 vsid"; do
- for size_ in "32 48 64 256"; do
+ for name in x64 x64dtv xscpu64 x128 xvic xplus4 xpet xcbm2 vsid; do
+ for size_ in 32 48 64 256; do
cp vice/data/common/vice-${name}_${size_}.png \
${DEB_DIR}/usr/share/icons/hicolor/${size_}x${size_}/apps/vice-${name}.png
done
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <co...@us...> - 2025-02-14 12:48:16
|
Revision: 45491
http://sourceforge.net/p/vice-emu/code/45491
Author: compyx
Date: 2025-02-14 12:48:15 +0000 (Fri, 14 Feb 2025)
Log Message:
-----------
Github actions: fix copying of icons files for Gtk3 .deb packages
Copy icon files stripping their size suffix so the .desktop files refer to the
correct icons.
Modified Paths:
--------------
trunk/vice/build/github-actions/build-deb.sh
Modified: trunk/vice/build/github-actions/build-deb.sh
===================================================================
--- trunk/vice/build/github-actions/build-deb.sh 2025-02-14 09:41:55 UTC (rev 45490)
+++ trunk/vice/build/github-actions/build-deb.sh 2025-02-14 12:48:15 UTC (rev 45491)
@@ -69,10 +69,12 @@
# Copy .desktop files
cp vice/data/common/*.desktop ${DEB_DIR}/usr/share/applications
# Copy icon files
- cp vice/data/common/vice-*_32.png ${DEB_DIR}/usr/share/icons/hicolor/32x32/apps
- cp vice/data/common/vice-*_48.png ${DEB_DIR}/usr/share/icons/hicolor/48x48/apps
- cp vice/data/common/vice-*_64.png ${DEB_DIR}/usr/share/icons/hicolor/64x64/apps
- cp vice/data/common/vice-*_256.png ${DEB_DIR}/usr/share/icons/hicolor/256x256/apps
+ for name in "x64 x64dtv xscpu64 x128 xvic xplus4 xpet xcbm2 vsid"; do
+ for size_ in "32 48 64 256"; do
+ cp vice/data/common/vice-${name}_${size_}.png \
+ ${DEB_DIR}/usr/share/icons/hicolor/${size_}x${size_}/apps/vice-${name}.png
+ done
+ done
fi
# Create copyright file, taking contributor info from src/infocontrib.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <co...@us...> - 2025-02-14 09:41:58
|
Revision: 45490
http://sourceforge.net/p/vice-emu/code/45490
Author: compyx
Date: 2025-02-14 09:41:55 +0000 (Fri, 14 Feb 2025)
Log Message:
-----------
Merge branch compyx/desktop-icons into trunk
Improve desktop file and icon installation on Unix (--enable-desktop-files).
Properly install icons with `xdg-icon-resource` and register .desktop files
with `dekstop-file-install`, run `update-desktop-database` after installing and
uninstalling. Icons are installed in four sizes: 32x32, 48x48, 64x64 and
256x256, the .desktop files refer to icons by their name, not path.
Delete .desktop files from build/debian/: the .desktop files in data/common/
are used both for `make install` and .deb packages now.
Keep the `gtk_window_set_icon()` fallback for now, KDE apparently needs it to
set the application window icon.
Modified Paths:
--------------
trunk/vice/build/github-actions/build-deb.sh
trunk/vice/configure.ac
trunk/vice/data/common/Makefile.am
trunk/vice/data/common/vice.gresource.xml
trunk/vice/src/arch/gtk3/data/Makefile.am
trunk/vice/src/arch/gtk3/data/win32/Makefile.am
trunk/vice/src/arch/shared/archdep_icon_path.c
Added Paths:
-----------
trunk/vice/data/common/vice-vsid_1024.svg
trunk/vice/data/common/vice-vsid_16.png
trunk/vice/data/common/vice-vsid_24.png
trunk/vice/data/common/vice-vsid_256.png
trunk/vice/data/common/vice-vsid_32.png
trunk/vice/data/common/vice-vsid_48.png
trunk/vice/data/common/vice-vsid_64.png
trunk/vice/data/common/vice-x128_1024.svg
trunk/vice/data/common/vice-x128_16.png
trunk/vice/data/common/vice-x128_24.png
trunk/vice/data/common/vice-x128_256.png
trunk/vice/data/common/vice-x128_32.png
trunk/vice/data/common/vice-x128_48.png
trunk/vice/data/common/vice-x128_64.png
trunk/vice/data/common/vice-x64_1024.svg
trunk/vice/data/common/vice-x64_16.png
trunk/vice/data/common/vice-x64_24.png
trunk/vice/data/common/vice-x64_256.png
trunk/vice/data/common/vice-x64_32.png
trunk/vice/data/common/vice-x64_48.png
trunk/vice/data/common/vice-x64_64.png
trunk/vice/data/common/vice-x64dtv_1024.svg
trunk/vice/data/common/vice-x64dtv_16.png
trunk/vice/data/common/vice-x64dtv_24.png
trunk/vice/data/common/vice-x64dtv_256.png
trunk/vice/data/common/vice-x64dtv_32.png
trunk/vice/data/common/vice-x64dtv_48.png
trunk/vice/data/common/vice-x64dtv_64.png
trunk/vice/data/common/vice-xcbm2_1024.svg
trunk/vice/data/common/vice-xcbm2_16.png
trunk/vice/data/common/vice-xcbm2_24.png
trunk/vice/data/common/vice-xcbm2_256.png
trunk/vice/data/common/vice-xcbm2_32.png
trunk/vice/data/common/vice-xcbm2_48.png
trunk/vice/data/common/vice-xcbm2_64.png
trunk/vice/data/common/vice-xpet_1024.svg
trunk/vice/data/common/vice-xpet_16.png
trunk/vice/data/common/vice-xpet_24.png
trunk/vice/data/common/vice-xpet_256.png
trunk/vice/data/common/vice-xpet_256.svg
trunk/vice/data/common/vice-xpet_32.png
trunk/vice/data/common/vice-xpet_48.png
trunk/vice/data/common/vice-xpet_64.png
trunk/vice/data/common/vice-xplus4_1024.svg
trunk/vice/data/common/vice-xplus4_16.png
trunk/vice/data/common/vice-xplus4_24.png
trunk/vice/data/common/vice-xplus4_256.png
trunk/vice/data/common/vice-xplus4_32.png
trunk/vice/data/common/vice-xplus4_48.png
trunk/vice/data/common/vice-xplus4_64.png
trunk/vice/data/common/vice-xscpu64_1024.svg
trunk/vice/data/common/vice-xscpu64_16.png
trunk/vice/data/common/vice-xscpu64_24.png
trunk/vice/data/common/vice-xscpu64_256.png
trunk/vice/data/common/vice-xscpu64_32.png
trunk/vice/data/common/vice-xscpu64_48.png
trunk/vice/data/common/vice-xscpu64_64.png
trunk/vice/data/common/vice-xvic_1024.svg
trunk/vice/data/common/vice-xvic_16.png
trunk/vice/data/common/vice-xvic_24.png
trunk/vice/data/common/vice-xvic_256.png
trunk/vice/data/common/vice-xvic_32.png
trunk/vice/data/common/vice-xvic_48.png
trunk/vice/data/common/vice-xvic_64.png
trunk/vice/data/common/vsid.desktop
trunk/vice/data/common/x128.desktop
trunk/vice/data/common/x64.desktop
trunk/vice/data/common/x64dtv.desktop
trunk/vice/data/common/x64sc.desktop
trunk/vice/data/common/xcbm2.desktop
trunk/vice/data/common/xcbm5x0.desktop
trunk/vice/data/common/xpet.desktop
trunk/vice/data/common/xplus4.desktop
trunk/vice/data/common/xscpu64.desktop
trunk/vice/data/common/xvic.desktop
Removed Paths:
-------------
trunk/vice/build/debian/vsid.desktop
trunk/vice/build/debian/x128.desktop
trunk/vice/build/debian/x64dtv.desktop
trunk/vice/build/debian/x64sc.desktop
trunk/vice/build/debian/xcbm2.desktop
trunk/vice/build/debian/xcbm5x0.desktop
trunk/vice/build/debian/xpet.desktop
trunk/vice/build/debian/xplus4.desktop
trunk/vice/build/debian/xscpu64.desktop
trunk/vice/build/debian/xvic.desktop
trunk/vice/data/common/C128_1024.svg
trunk/vice/data/common/C128_16.png
trunk/vice/data/common/C128_24.png
trunk/vice/data/common/C128_256.png
trunk/vice/data/common/C128_32.png
trunk/vice/data/common/C128_48.png
trunk/vice/data/common/C128_64.png
trunk/vice/data/common/C64_1024.svg
trunk/vice/data/common/C64_16.png
trunk/vice/data/common/C64_24.png
trunk/vice/data/common/C64_256.png
trunk/vice/data/common/C64_32.png
trunk/vice/data/common/C64_48.png
trunk/vice/data/common/C64_64.png
trunk/vice/data/common/CBM2_1024.svg
trunk/vice/data/common/CBM2_16.png
trunk/vice/data/common/CBM2_24.png
trunk/vice/data/common/CBM2_256.png
trunk/vice/data/common/CBM2_32.png
trunk/vice/data/common/CBM2_48.png
trunk/vice/data/common/CBM2_64.png
trunk/vice/data/common/DTV_1024.svg
trunk/vice/data/common/DTV_16.png
trunk/vice/data/common/DTV_24.png
trunk/vice/data/common/DTV_256.png
trunk/vice/data/common/DTV_32.png
trunk/vice/data/common/DTV_48.png
trunk/vice/data/common/DTV_64.png
trunk/vice/data/common/Ico...@2x...
trunk/vice/data/common/PET_1024.svg
trunk/vice/data/common/PET_16.png
trunk/vice/data/common/PET_24.png
trunk/vice/data/common/PET_256.png
trunk/vice/data/common/PET_256.svg
trunk/vice/data/common/PET_32.png
trunk/vice/data/common/PET_48.png
trunk/vice/data/common/PET_64.png
trunk/vice/data/common/Plus4_1024.svg
trunk/vice/data/common/Plus4_16.png
trunk/vice/data/common/Plus4_24.png
trunk/vice/data/common/Plus4_256.png
trunk/vice/data/common/Plus4_32.png
trunk/vice/data/common/Plus4_48.png
trunk/vice/data/common/Plus4_64.png
trunk/vice/data/common/SCPU_1024.svg
trunk/vice/data/common/SCPU_16.png
trunk/vice/data/common/SCPU_24.png
trunk/vice/data/common/SCPU_256.png
trunk/vice/data/common/SCPU_32.png
trunk/vice/data/common/SCPU_48.png
trunk/vice/data/common/SCPU_64.png
trunk/vice/data/common/SID_1024.svg
trunk/vice/data/common/SID_16.png
trunk/vice/data/common/SID_24.png
trunk/vice/data/common/SID_256.png
trunk/vice/data/common/SID_32.png
trunk/vice/data/common/SID_48.png
trunk/vice/data/common/SID_64.png
trunk/vice/data/common/VIC20_1024.svg
trunk/vice/data/common/VIC20_16.png
trunk/vice/data/common/VIC20_24.png
trunk/vice/data/common/VIC20_256.png
trunk/vice/data/common/VIC20_32.png
trunk/vice/data/common/VIC20_48.png
trunk/vice/data/common/VIC20_64.png
trunk/vice/data/common/icon.png
trunk/vice/data/common/icon1024x1024.png
trunk/vice/src/arch/gtk3/data/unix/
Deleted: trunk/vice/build/debian/vsid.desktop
===================================================================
--- trunk/vice/build/debian/vsid.desktop 2025-02-14 08:35:08 UTC (rev 45489)
+++ trunk/vice/build/debian/vsid.desktop 2025-02-14 09:41:55 UTC (rev 45490)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=VICE (vsid)
-Comment=SID Player
-Exec=/usr/bin/vsid
-Terminal=false
-Icon=/usr/share/icons/hicolor/scalable/apps/vsid.svg
-Categories=Audio;AudioVideo;Emulator;
Deleted: trunk/vice/build/debian/x128.desktop
===================================================================
--- trunk/vice/build/debian/x128.desktop 2025-02-14 08:35:08 UTC (rev 45489)
+++ trunk/vice/build/debian/x128.desktop 2025-02-14 09:41:55 UTC (rev 45490)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=VICE (x128)
-Comment=Commodore 128 emulator
-Exec=/usr/bin/x128
-Terminal=false
-Icon=/usr/share/icons/hicolor/scalable/apps/x128.svg
-Categories=Game;Emulator;
Deleted: trunk/vice/build/debian/x64dtv.desktop
===================================================================
--- trunk/vice/build/debian/x64dtv.desktop 2025-02-14 08:35:08 UTC (rev 45489)
+++ trunk/vice/build/debian/x64dtv.desktop 2025-02-14 09:41:55 UTC (rev 45490)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=VICE (x64dtv)
-Comment=C64DTV emulator
-Exec=/usr/bin/x64dtv
-Terminal=false
-Icon=/usr/share/icons/hicolor/scalable/apps/x64dtv.svg
-Categories=Game;Emulator;
Deleted: trunk/vice/build/debian/x64sc.desktop
===================================================================
--- trunk/vice/build/debian/x64sc.desktop 2025-02-14 08:35:08 UTC (rev 45489)
+++ trunk/vice/build/debian/x64sc.desktop 2025-02-14 09:41:55 UTC (rev 45490)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=VICE (x64sc)
-Comment=Commodore 64 emulator
-Exec=/usr/bin/x64sc
-Terminal=false
-Icon=/usr/share/icons/hicolor/scalable/apps/x64sc.svg
-Categories=Game;Emulator;
Deleted: trunk/vice/build/debian/xcbm2.desktop
===================================================================
--- trunk/vice/build/debian/xcbm2.desktop 2025-02-14 08:35:08 UTC (rev 45489)
+++ trunk/vice/build/debian/xcbm2.desktop 2025-02-14 09:41:55 UTC (rev 45490)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=VICE (xcbm2)
-Comment=Commodore CBM-II (600/700/B) emulator
-Exec=/usr/bin/xcbm2
-Terminal=false
-Icon=/usr/share/icons/hicolor/scalable/apps/xcbm2.svg
-Categories=Game;Emulator;
Deleted: trunk/vice/build/debian/xcbm5x0.desktop
===================================================================
--- trunk/vice/build/debian/xcbm5x0.desktop 2025-02-14 08:35:08 UTC (rev 45489)
+++ trunk/vice/build/debian/xcbm5x0.desktop 2025-02-14 09:41:55 UTC (rev 45490)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=VICE (xcbm5x0)
-Comment=Commodore CBM-II (500/P) emulator
-Exec=/usr/bin/xcbm5x0
-Terminal=false
-Icon=/usr/share/icons/hicolor/scalable/apps/xcbm2.svg
-Categories=Game;Emulator;
Deleted: trunk/vice/build/debian/xpet.desktop
===================================================================
--- trunk/vice/build/debian/xpet.desktop 2025-02-14 08:35:08 UTC (rev 45489)
+++ trunk/vice/build/debian/xpet.desktop 2025-02-14 09:41:55 UTC (rev 45490)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=VICE (xpet)
-Comment=Commodore PET emulator
-Exec=/usr/bin/xpet
-Terminal=false
-Icon=/usr/share/icons/hicolor/scalable/apps/xpet.svg
-Categories=Game;Emulator;
Deleted: trunk/vice/build/debian/xplus4.desktop
===================================================================
--- trunk/vice/build/debian/xplus4.desktop 2025-02-14 08:35:08 UTC (rev 45489)
+++ trunk/vice/build/debian/xplus4.desktop 2025-02-14 09:41:55 UTC (rev 45490)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=VICE (xplus4)
-Comment=Commodore Plus/4 emulator
-Exec=/usr/bin/xplus4
-Terminal=false
-Icon=/usr/share/icons/hicolor/scalable/apps/xplus4.svg
-Categories=Game;Emulator;
Deleted: trunk/vice/build/debian/xscpu64.desktop
===================================================================
--- trunk/vice/build/debian/xscpu64.desktop 2025-02-14 08:35:08 UTC (rev 45489)
+++ trunk/vice/build/debian/xscpu64.desktop 2025-02-14 09:41:55 UTC (rev 45490)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=VICE (xscpu64)
-Comment=Commodore 64 SuperCPU emulator
-Exec=/usr/bin/xscpu64
-Terminal=false
-Icon=/usr/share/icons/hicolor/scalable/apps/xscpu64.svg
-Categories=Game;Emulator;
Deleted: trunk/vice/build/debian/xvic.desktop
===================================================================
--- trunk/vice/build/debian/xvic.desktop 2025-02-14 08:35:08 UTC (rev 45489)
+++ trunk/vice/build/debian/xvic.desktop 2025-02-14 09:41:55 UTC (rev 45490)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=VICE (xvic)
-Comment=Commodore VIC-20 emulator
-Exec=/usr/bin/xvic
-Terminal=false
-Icon=/usr/share/icons/hicolor/scalable/apps/xvic.svg
-Categories=Game;Emulator;
Modified: trunk/vice/build/github-actions/build-deb.sh
===================================================================
--- trunk/vice/build/github-actions/build-deb.sh 2025-02-14 08:35:08 UTC (rev 45489)
+++ trunk/vice/build/github-actions/build-deb.sh 2025-02-14 09:41:55 UTC (rev 45490)
@@ -12,20 +12,6 @@
# TODO: Provide md5sums?
-# Mapping of emulators to their icon names in data/common/
-# There is no separate icon for xcbm5x0, so we use the xcbm2 icon
-declare -A ICONS=(
- [vsid]="SID"
- [x128]="C128"
- [x64dtv]="DTV"
- [x64sc]="C64"
- [xcbm2]="CBM2"
- [xpet]="PET"
- [xplus4]="Plus4"
- [xscpu64]="SCPU"
- [xvic]="VIC20"
-)
-
# Point release flag
RELEASE=0
@@ -72,7 +58,7 @@
mkdir -p ${DEB_DIR}/usr/share/doc/vice
if [ "$UI" = "gtk3" ]; then
mkdir -p ${DEB_DIR}/usr/share/applications
- mkdir -p ${DEB_DIR}/usr/share/icons/hicolor/scalable/apps
+ mkdir -p ${DEB_DIR}/usr/share/icons/hicolor/{32x32,48x48,64x64,256x256}/apps
fi
# Copy the files installed with `make install-strip`
@@ -79,19 +65,15 @@
cp -R ${HOME}/build/* ${DEB_DIR}/
# Copy the documentation
cp vice/doc/vice.pdf ${DEB_DIR}/usr/share/doc/vice/
-# Copy .desktop files
if [ "$UI" = "gtk3" ]; then
- cp vice/build/debian/*.desktop ${DEB_DIR}/usr/share/applications
+ # Copy .desktop files
+ cp vice/data/common/*.desktop ${DEB_DIR}/usr/share/applications
+ # Copy icon files
+ cp vice/data/common/vice-*_32.png ${DEB_DIR}/usr/share/icons/hicolor/32x32/apps
+ cp vice/data/common/vice-*_48.png ${DEB_DIR}/usr/share/icons/hicolor/48x48/apps
+ cp vice/data/common/vice-*_64.png ${DEB_DIR}/usr/share/icons/hicolor/64x64/apps
+ cp vice/data/common/vice-*_256.png ${DEB_DIR}/usr/share/icons/hicolor/256x256/apps
fi
-# Copy icon files
-if [ "$UI" = "gtk3" ]; then
- for emu in ${!ICONS[@]}
- do
- orig="vice/data/common/${ICONS[$emu]}_1024.svg"
- dest="${DEB_DIR}/usr/share/icons/hicolor/scalable/apps/${emu}.svg"
- cp ${orig} ${dest}
- done
-fi
# Create copyright file, taking contributor info from src/infocontrib.h
cat vice/build/debian/copyright.header > ${DEB_DIR}/usr/share/doc/vice/copyright
Modified: trunk/vice/configure.ac
===================================================================
--- trunk/vice/configure.ac 2025-02-14 08:35:08 UTC (rev 45489)
+++ trunk/vice/configure.ac 2025-02-14 09:41:55 UTC (rev 45490)
@@ -1752,30 +1752,38 @@
dnl
AM_CONDITIONAL(INSTALL_DESKTOP_FILES, false)
if test x"$enable_desktop_files" = "xyes"; then
- dnl Check Gtk3 UI
- if test x"$enable_gtk3ui" != "xyes"; then
- AC_MSG_ERROR([XDG desktop files requested but UI is not Gtk3.])
- fi
- dnl Check OS (Unix)
- if test x"$is_unix_x11" != "xyes"; then
- AC_MSG_ERROR([XDG desktop files requested but OS is not Unix.])
- fi
- dnl Check OS (not MacOS)
- if test x"$is_unix_macos" = "xyes"; then
- AC_MSG_ERROR([XDG desktop files requested but OS is MacOS.])
- fi
- dnl Check for xdg-desktop-menu
- AC_CHECK_PROG(XDG_DESKTOP_MENU, xdg-desktop-menu, xdg-desktop-menu, no)
- echo "$XDG_DESKTOP_MENU"
- if test x"$XDG_DESKTOP_MENU" = "xno"; then
- AC_MSG_ERROR([XDG desktop files requested but required tool xdg-desktop-menu is missing. Please install xgd-utils.])
- fi
+ dnl Check Gtk3 UI
+ if test x"$enable_gtk3ui" != "xyes"; then
+ AC_MSG_ERROR([XDG desktop files requested but UI is not Gtk3.])
+ fi
+ dnl Check OS (Unix)
+ if test x"$is_unix_x11" != "xyes"; then
+ AC_MSG_ERROR([XDG desktop files requested but OS is not Unix.])
+ fi
+ dnl Check OS (not MacOS)
+ if test x"$is_unix_macos" = "xyes"; then
+ AC_MSG_ERROR([XDG desktop files requested but OS is MacOS.])
+ fi
+ dnl Check for desktop-file-install
+ AC_CHECK_PROG(DESKTOP_FILE_INSTALL, desktop-file-install, desktop_file_install, no)
+ if test x"$DESKTOP_FILE_INSTALL" = "xno"; then
+ AC_MSG_ERROR([XDG desktop files requested but required tool desktop-file-install is missing. Please install desktop-file-utils.])
+ fi
+ dnl Check for xdg-icon-resource
+ AC_CHECK_PROG(XDG_ICON_RESOURCE, xdg-icon-resource, xdg-icon-resource, no)
+ if test x"$XDG_ICON_RESOURCE" = "xno"; then
+ AC_MSG_ERROR([XDG desktop files requested but required tool xdg-icon-resource is missing. Please install xdg-utils.])
+ fi
+ dnl Check for update-desktop-database
+ AC_CHECK_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, update-desktop-database, no)
+ if test x"$UPDATE_DESKTOP_DATABASE" = "xno"; then
+ AC_MSG_ERROR([XDG desktop files requested but required tool update-desktop-database is missing. Please install desktop-file-utils.])
+ fi
- dnl We got the UI + OS + tools:
- USE_DESKTOP_FILES="yes"
- AM_CONDITIONAL(INSTALL_DESKTOP_FILES, true)
- AC_SUBST([XDG_DESKTOP_MENU], ["$XDG_DESKTOP_MENU"])
-
+ dnl We got the UI + OS + tools:
+ USE_DESKTOP_FILES="yes"
+ AC_DEFINE(INSTALL_DESKTOP_FILES, , [Install XDG desktop files and icons])
+ AM_CONDITIONAL(INSTALL_DESKTOP_FILES, true)
fi
@@ -3414,7 +3422,6 @@
src/arch/gtk3/Makefile
src/arch/gtk3/data/Makefile
src/arch/gtk3/data/macos/Makefile
- src/arch/gtk3/data/unix/Makefile
src/arch/gtk3/data/win32/Makefile
src/arch/gtk3/joystickdrv/Makefile
src/arch/gtk3/novte/Makefile
Deleted: trunk/vice/data/common/C128_1024.svg
===================================================================
--- trunk/vice/data/common/C128_1024.svg 2025-02-14 08:35:08 UTC (rev 45489)
+++ trunk/vice/data/common/C128_1024.svg 2025-02-14 09:41:55 UTC (rev 45490)
@@ -1,438 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.1"
- id="Layer_1"
- x="0px"
- y="0px"
- viewBox="0 0 1024 1024"
- style="enable-background:new 0 0 1024 1024;"
- xml:space="preserve"
- sodipodi:docname="C128_1024.svg"
- inkscape:export-filename="C:\src\vice\vice\data\common\C128_128.png"
- inkscape:export-xdpi="12.336111"
- inkscape:export-ydpi="12.336111"
- inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"><metadata
- id="metadata696"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
- id="defs694" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="2364"
- inkscape:window-height="1415"
- id="namedview692"
- showgrid="true"
- inkscape:zoom="0.97531385"
- inkscape:cx="316.67826"
- inkscape:cy="512"
- inkscape:window-x="187"
- inkscape:window-y="-9"
- inkscape:window-maximized="1"
- inkscape:current-layer="Layer_1" />
-<style
- type="text/css"
- id="style560">
- .st0{display:none;}
- .st1{display:inline;}
- .st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);}
- .st3{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
- .st4{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
- .st5{display:inline;fill-rule:evenodd;clip-rule:evenodd;fill:#8A88A3;}
- .st6{display:inline;fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_4_);}
- .st7{fill:#FFFFFF;}
- .st8{fill-rule:evenodd;clip-rule:evenodd;}
- .st9{fill-rule:evenodd;clip-rule:evenodd;fill:#3A3A3A;}
- .st10{display:inline;fill:#FFFFFF;}
- .st11{display:inline;opacity:0.3;fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_5_);enable-background:new ;}
- .st12{fill-rule:evenodd;clip-rule:evenodd;fill:#3D3D3D;}
- .st13{fill-rule:evenodd;clip-rule:evenodd;fill:#595959;}
- .st14{opacity:0.5;}
- .st15{fill:none;stroke:#000000;stroke-width:20;stroke-miterlimit:10;}
- .st16{fill:none;stroke:#FFFFFF;stroke-width:20;stroke-miterlimit:10;}
- .st17{font-family:'EurostileLTStd-BoldEx2';}
- .st18{font-size:175px;}
- .st19{enable-background:new ;}
- .st20{fill:none;stroke:#000000;stroke-miterlimit:10;}
-</style>
-<g
- id="Layer_1_1_"
- class="st0">
- <g
- class="st1"
- id="g583">
-
- <linearGradient
- id="SVGID_1_"
- gradientUnits="userSpaceOnUse"
- x1="334.2704"
- y1="873.824"
- x2="400.9372"
- y2="-48.8426"
- gradientTransform="matrix(1 0 0 -1 0 1024)">
- <stop
- offset="0"
- style="stop-color:#68372B"
- id="stop562" />
- <stop
- offset="1"
- style="stop-color:#352879"
- id="stop564" />
- </linearGradient>
- <path
- class="st2"
- d="M584.8,342.9v-187C547,146,521.1,142,483.3,142c-198.9,0-372,165.1-372,370c0,212.8,175,370,374,370 c35.8,0,55.7-4,99.4-15.9v-191C541,697,519.1,703,483.3,703c-109.4,0-194.9-91.5-194.9-194.9c0-105.4,83.5-194.9,192.9-194.9 C519.1,313.1,550.9,323,584.8,342.9L584.8,342.9z"
- id="path567" />
-
- <linearGradient
- id="SVGID_2_"
- gradientUnits="userSpaceOnUse"
- x1="731.5681"
- y1="902.5305"
- x2="798.2347"
- y2="-20.1362"
- gradientTransform="matrix(1 0 0 -1 0 1024)">
- <stop
- offset="0"
- style="stop-color:#68372B"
- id="stop569" />
- <stop
- offset="1"
- style="stop-color:#352879"
- id="stop571" />
- </linearGradient>
- <polygon
- class="st3"
- points="912.7,353.1 594.4,353.1 594.4,498.3 769.5,498.3 "
- id="polygon574" />
-
- <linearGradient
- id="SVGID_3_"
- gradientUnits="userSpaceOnUse"
- x1="713.7708"
- y1="901.2445"
- x2="780.4375"
- y2="-21.4221"
- gradientTransform="matrix(1 0 0 -1 0 1024)">
- <stop
- offset="0"
- style="stop-color:#68372B"
- id="stop576" />
- <stop
- offset="1"
- style="stop-color:#352879"
- id="stop578" />
- </linearGradient>
- <polygon
- class="st4"
- points="771.5,528.1 594.4,528.1 594.4,673.3 912.7,673.3 "
- id="polygon581" />
- </g>
-</g>
-<g
- id="Layer_12"
- class="st0">
- <rect
- class="st5"
- width="1024"
- height="1024"
- id="rect586" />
-</g>
-<g
- id="Layer_11_copy"
- class="st0">
-
- <linearGradient
- id="SVGID_4_"
- gradientUnits="userSpaceOnUse"
- x1="512.05"
- y1="1017.1594"
- x2="512.05"
- y2="689.3555"
- gradientTransform="matrix(1 0 0 -1 0 1024)">
- <stop
- offset="0"
- style="stop-color:#68372B"
- id="stop589" />
- <stop
- offset="0.7388"
- style="stop-color:#352879"
- id="stop591" />
- </linearGradient>
- <path
- class="st6"
- d="M267.1,1010H139.3C70.1,1010,14,953.9,14,884.7V139.3C14,70.1,70.1,14,139.3,14h745.5 c69.2,0,125.3,56.1,125.3,125.3v745.5c0,69.2-56.1,125.3-125.3,125.3H756.7"
- id="path594" />
- <g
- class="st1"
- id="g600">
- <polygon
- class="st7"
- points="641.3,914 641.3,657 524,657 524,798.4 "
- id="polygon596" />
- <polygon
- class="st7"
- points="500,800 500,657 382.7,657 382.7,914 "
- id="polygon598" />
- </g>
-</g>
-<g
- id="Layer_11_copy_2"
- class="st0">
- <g
- class="st1"
- id="g607">
- <path
- class="st8"
- d="M267.1,1010H139.3C70.1,1010,14,953.9,14,884.7V139.3C14,70.1,70.1,14,139.3,14h745.5 c69.2,0,125.3,56.1,125.3,125.3v745.5c0,69.2-56.1,125.3-125.3,125.3H756.7L267.1,1010L267.1,1010z"
- id="path603" />
- <path
- class="st9"
- d="M14,497V139.3C14,70.1,70.1,14,139.3,14H512L14,497z"
- id="path605" />
- </g>
- <polygon
- class="st10"
- points="639.3,896 639.3,643 523.8,643 523.8,782.1 "
- id="polygon609" />
- <polygon
- class="st10"
- points="500.2,783.7 500.2,643 384.7,643 384.7,896 "
- id="polygon611" />
-
- <linearGradient
- id="SVGID_5_"
- gradientUnits="userSpaceOnUse"
- x1="-509"
- y1="953.407"
- x2="-509"
- y2="103.1061"
- gradientTransform="matrix(1 0 0 -1 0 1024)">
- <stop
- offset="4.442563e-02"
- style="stop-color:#68372B"
- id="stop613" />
- <stop
- offset="0.7388"
- style="stop-color:#352879"
- id="stop615" />
- </linearGradient>
- <path
- class="st11"
- d="M-741.6,970H-863c-65.7,0-119-53.3-119-119V143c0-65.7,53.3-119,119-119h708c65.7,0,119,53.3,119,119v708 c0,65.7-53.3,119-119,119h-121.6"
- id="path618" />
-</g>
-<g
- id="Layer_11_copy_3"
- inkscape:export-xdpi="1.5420139"
- inkscape:export-ydpi="1.5420139">
- <path
- class="st12"
- d="M267.1,1010H139.3C70.1,1010,14,953.9,14,884.7V139.3C14,70.1,70.1,14,139.3,14h745.5 c69.2,0,125.3,56.1,125.3,125.3v745.5c0,69.2-56.1,125.3-125.3,125.3H756.7L267.1,1010L267.1,1010z"
- id="path621" />
- <path
- class="st13"
- d="M267.1,1010H139.3C70.1,1010,14,953.9,14,884.7V809h996v75.7c0,69.2-56.1,125.3-125.3,125.3h-128H267.1z"
- id="path623" />
- <g
- class="st14"
- id="g645">
- <line
- class="st15"
- x1="14"
- y1="620"
- x2="1010"
- y2="620"
- id="line625" />
- <line
- class="st16"
- x1="14"
- y1="640"
- x2="1010"
- y2="640"
- id="line627" />
- <line
- class="st15"
- x1="14"
- y1="660"
- x2="1010"
- y2="660"
- id="line629" />
- <line
- class="st16"
- x1="14"
- y1="680"
- x2="1010"
- y2="680"
- id="line631" />
- <line
- class="st15"
- x1="14"
- y1="700"
- x2="1010"
- y2="700"
- id="line633" />
- <line
- class="st16"
- x1="14"
- y1="720"
- x2="1010"
- y2="720"
- id="line635" />
- <line
- class="st15"
- x1="14"
- y1="740"
- x2="1010"
- y2="740"
- id="line637" />
- <line
- class="st16"
- x1="14"
- y1="760"
- x2="1010"
- y2="760"
- id="line639" />
- <line
- class="st15"
- x1="14"
- y1="780"
- x2="1010"
- y2="780"
- id="line641" />
- <line
- class="st16"
- x1="14"
- y1="800"
- x2="1010"
- y2="800"
- id="line643" />
- </g>
-</g>
-<g
- id="Layer_11"
- class="st0">
-</g>
-<g
- id="VIC20"
- class="st0">
- <text
- transform="matrix(1 0 0 1 118.6028 556.6257)"
- class="st10 st17 st18"
- id="text649">VIC20</text>
-</g>
-<g
- id="Plus4"
- class="st0">
- <text
- transform="matrix(1 0 0 1 168.3914 556.6257)"
- class="st10 st17 st18"
- id="text652">Plus4</text>
-</g>
-<g
- id="DTV"
- class="st0">
- <text
- transform="matrix(1 0 0 1 243.9006 556.6257)"
- class="st10 st17 st18"
- id="text655">DTV</text>
-</g>
-<g
- id="C64"
- class="st0">
- <text
- transform="matrix(1 0 0 1 246.177 556.6257)"
- class="st10 st17 st18"
- id="text658">C64</text>
-</g>
-<g
- id="SID"
- class="st0">
- <text
- transform="matrix(1 0 0 1 289.3142 556.6257)"
- class="st10 st17 st18"
- id="text661">SID</text>
-</g>
-<g
- id="PET"
- class="st0">
- <text
- transform="matrix(1 0 0 1 265.6008 556.6257)"
- class="st10 st17 st18"
- id="text664">PET</text>
-</g>
-<g
- id="CBM2"
- class="st0">
- <text
- transform="matrix(1 0 0 1 122.9768 556.6257)"
- class="st10 st17 st18"
- id="text667">CBM2</text>
-</g>
-<g
- id="SCPU"
- class="st0">
- <text
- transform="matrix(1 0 0 1 149.052 556.6257)"
- class="st10 st17 st18"
- id="text670">SCPU</text>
-</g>
-<g
- id="C128"
- transform="matrix(1.1231875,0,0,1.1231875,-68.118507,-68.750969)">
- <g
- class="st19"
- id="g681">
- <path
- class="st7"
- d="m 170.1,474.4 c 0,-18.6 5.2,-30 14.8,-36.8 9.6,-6.8 23.5,-9 41,-9 h 22.8 22.8 c 27.7,0 43.3,3 51.9,10.4 8.6,7.4 10.4,19.4 10.2,37.3 h -19.4 -19.4 v -1.8 -1.8 c 0,-4.6 -1.7,-7.5 -4.8,-9.3 -3.1,-1.8 -7.7,-2.5 -13.4,-2.5 h -21.2 -21.2 c -10.2,0 -16.3,2.4 -19.8,6.8 -3.5,4.4 -4.5,10.7 -4.5,18.6 v 6.8 6.8 c 0,9.2 1,15.5 4.2,19.6 3.2,4.1 8.8,5.8 18,5.8 h 20.7 20.7 c 8.8,0 14.4,-0.4 17.9,-2.8 3.5,-2.4 4.8,-6.8 4.8,-14.7 h 19.4 19.4 v 5.9 5.9 c 0,10.7 -1.9,20.2 -8.7,27.1 -6.8,6.9 -18.3,11.3 -37.8,11.3 h -31.3 -31.3 c -17.5,0 -31.5,-2.2 -41,-9 -9.5,-6.8 -14.8,-18.3 -14.8,-36.8 v -18.9 z"
- id="path673" />
- <path
- class="st7"
- d="m 439.7,460.4 -23.4,15 -23.4,15 -8.8,-12.7 -8.8,-12.7 26.9,-17.5 26.9,-17.5 h 23.2 23.2 v 63.4 63.4 h -17.9 -17.9 v -48.1 z"
- id="path675" />
- <path
- class="st7"
- d="m 530.7,513.6 c 0,-7.8 2.5,-14.3 8.2,-19 5.7,-4.7 14.5,-7.8 27,-8.6 l 22.2,-1.4 22.2,-1.4 c 14.2,-0.9 21.7,-1.4 25.8,-3.3 4.1,-1.9 4.5,-5.1 4.5,-11.4 0,-5.2 -0.3,-8.3 -3.6,-10.2 -3.3,-1.9 -9.8,-2.4 -22.3,-2.4 H 601.8 589 c -8.2,0 -13.6,0.6 -16.9,2.9 -3.3,2.3 -4.6,6.1 -4.6,12.7 v 2.7 2.7 h -18.4 -18.4 v -7.4 -7.4 c 0,-12.5 3.7,-20.9 11.7,-26.1 8,-5.2 20.5,-7.3 38,-7.3 h 25.6 25.6 c 18.2,0 29.7,2.7 36.6,8.7 6.9,6 9.3,15.3 9.3,28.5 0,18.6 -1.7,29.5 -9.1,36.1 -7.4,6.6 -20.4,8.7 -43.1,10 l -20,1.1 -20,1.1 c -8.1,0.4 -12.8,1.4 -15.5,3.8 -2.7,2.4 -3.3,6 -3.3,11.6 h 56.4 56.4 v 13.4 13.7 h -74.2 -74.2 v -21.5 -21.6 z"
- id="path677" />
- <path
- class="st7"
- d="m 703.1,516.4 c 0,-6.8 1.4,-12.1 4.9,-15.9 3.5,-3.8 9.2,-6.3 17.7,-7.5 v -0.2 -0.2 c -5.6,-1 -11.1,-3.1 -15.1,-7.3 -4,-4.2 -6.7,-10.3 -6.7,-19.3 v -3.6 -3.6 c 0,-14.2 3.1,-21.7 12.4,-25.8 9.3,-4.1 24.8,-4.5 49.8,-4.5 h 19.2 19.2 c 16.2,0 28,1.5 35.7,6.1 7.7,4.6 11.4,12.1 11.4,24 v 4.1 4.1 c 0,6.8 -0.8,12.5 -3.9,16.8 -3.1,4.3 -8.4,7.1 -17.3,8.2 v 0.2 0.2 c 6.6,1.8 12.1,4.2 16,8.4 3.9,4.2 6.2,9.9 6.2,18.6 v 5.1 5.1 c 0,10.6 -3.4,17.8 -9.7,22.3 -6.3,4.5 -15.6,6.4 -27.4,6.4 h -36.6 -36.6 c -13.6,0 -23.4,-2.6 -29.8,-7.7 -6.4,-5.1 -9.4,-12.8 -9.4,-22.9 V 522 Z m 97.7,14.3 c 6.6,0 10.3,-1 12.4,-3 2.1,-2 2.6,-5.3 2.6,-9.7 0,-4.9 -0.4,-8.1 -2.8,-10 -2.4,-1.9 -6.6,-2.6 -14.3,-2.6 H 777.9 757 c -7.7,0 -12,0.7 -14.3,2.6 -2.3,1.9 -2.8,5.1 -2.8,10 0,4.5 0.5,7.7 2.6,9.7 2.1,2 5.9,3 12.4,3 h 22.9 z m -0.9,-51.6 c 5.7,0 9.4,-1.1 11.7,-3.2 2.3,-2.1 3.2,-5 3.2,-8.6 0,-4.4 -1.3,-7.3 -3.5,-9.1 -2.2,-1.8 -5.1,-2.5 -8.4,-2.5 h -25.2 -25.2 c -3.3,0 -6.3,0.7 -8.4,2.5 -2.1,1.8 -3.5,4.7 -3.5,9.1 0,3.6 0.9,6.5 3.2,8.6 2.3,2.1 6,3.2 11.7,3.2 h 22.2 z"
- id="path679" />
- </g>
-</g>
-<g
- id="Layer_4"
- class="st0">
- <g
- class="st1"
- id="g688">
- <line
- class="st20"
- x1="134.8"
- y1="0"
- x2="134.8"
- y2="1024"
- id="line684" />
- <line
- class="st20"
- x1="889.2"
- y1="0"
- x2="889.2"
- y2="1024"
- id="line686" />
- </g>
-</g>
-</svg>
Deleted: trunk/vice/data/common/C128_16.png
===================================================================
(Binary files differ)
Deleted: trunk/vice/data/common/C128_24.png
===================================================================
(Binary files differ)
Deleted: trunk/vice/data/common/C128_256.png
===================================================================
(Binary files differ)
Deleted: trunk/vice/data/common/C128_32.png
===================================================================
(Binary files differ)
Deleted: trunk/vice/data/common/C128_48.png
===================================================================
(Binary files differ)
Deleted: trunk/vice/data/common/C128_64.png
===================================================================
(Binary files differ)
Deleted: trunk/vice/data/common/C64_1024.svg
===================================================================
--- trunk/vice/data/common/C64_1024.svg 2025-02-14 08:35:08 UTC (rev 45489)
+++ trunk/vice/data/common/C64_1024.svg 2025-02-14 09:41:55 UTC (rev 45490)
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
-<style type="text/css">
- .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#3D3D3D;}
- .st1{fill-rule:evenodd;clip-rule:evenodd;fill:#595959;}
- .st2{fill:#2B2B2B;}
- .st3{fill:#7C7C7C;}
- .st4{display:none;}
- .st5{display:inline;}
- .st6{fill:#FFFFFF;}
-</style>
-<g id="Layer_11_copy_3">
- <path class="st0" d="M267.1,1010h-63.9h-63.9c-34.6,0-65.9-14-88.6-36.7C28,950.6,14,919.3,14,884.7V512V139.3
- c0-34.6,14-65.9,36.7-88.6s54-36.7,88.6-36.7H512h372.7c34.6,0,65.9,14,88.6,36.7c22.7,22.7,36.7,54,36.7,88.6V512v372.7
- c0,34.6-14,65.9-36.7,88.6c-22.7,22.7-54,36.7-88.6,36.7h-64h-64H511.9H267.1z"/>
- <path class="st1" d="M267.1,1010H139.3C70.1,1010,14,953.9,14,884.7V809h996v75.7c0,69.2-56.1,125.3-125.3,125.3H756.7H267.1z"/>
- <g>
- <g>
- <rect x="14" y="610" class="st2" width="996" height="20"/>
- <rect x="14" y="630" class="st3" width="996" height="20"/>
- </g>
- <g>
- <rect x="14" y="650" class="st2" width="996" height="20"/>
- <rect x="14" y="670" class="st3" width="996" height="20"/>
- </g>
- <g>
- <rect x="14" y="690" class="st2" width="996" height="20"/>
- <rect x="14" y="710" class="st3" width="996" height="20"/>
- </g>
- <g>
- <rect x="14" y="730" class="st2" width="996" height="20"/>
- <rect x="14" y="750" class="st3" width="996" height="20"/>
- </g>
- <g>
- <rect x="14" y="770" class="st2" width="996" height="20"/>
- <rect x="14" y="790" class="st3" width="996" height="20"/>
- </g>
- </g>
-</g>
-<g id="VIC20" class="st4">
- <g class="st5">
- <path class="st6" d="M130.7,433.5h20.7H172l24.1,45.7l24.1,45.7l24.1-45.7l24.1-45.7h20.7h20.7l-33.1,61.5l-33.1,61.5h-23.3h-23.3
- l-33.1-61.5L130.7,433.5z"/>
- <path class="st6" d="M325.2,433.5H344h18.9v61.5v61.5H344h-18.9v-61.5V433.5z"/>
- <path class="st6" d="M387.7,476.7c0-18,5.1-29.2,14.4-35.8s22.9-8.8,39.9-8.8h22.2h22.2c26.9,0,42,2.9,50.4,10.1
- s10.1,18.8,9.9,36.3h-18.9h-18.9v-1.7v-1.7c0-4.4-1.6-7.3-4.6-9s-7.4-2.4-13-2.4h-20.6h-20.6c-9.9,0-15.9,2.3-19.3,6.6
- s-4.4,10.4-4.4,18.1v6.6v6.6c0,8.9,0.9,15.1,4.1,19s8.6,5.6,17.5,5.6h20.1h20.1c8.5,0,14-0.4,17.4-2.8s4.7-6.6,4.7-14.2h18.9h18.9
- v5.8v5.8c0,10.4-1.9,19.6-8.5,26.3s-18,10.8-36.9,10.8h-30.4H442c-17,0-30.6-2.1-39.9-8.8s-14.4-17.8-14.4-35.8v-18.4V476.7z"/>
- <path class="st6" d="M570.1,514.8c0-7.6,2.5-13.9,8-18.5s14-7.5,26.2-8.4l21.6-1.4l21.6-1.4c13.8-0.9,21.1-1.4,25-3.3
- s4.4-5,4.4-11c0-5-0.3-8.1-3.5-9.9s-9.6-2.4-21.6-2.4h-12.5h-12.5c-8,0-13.2,0.6-16.4,2.8s-4.5,6-4.5,12.3v2.6v2.6H588h-17.8v-7.2
- v-7.2c0-12.2,3.6-20.3,11.4-25.4s19.9-7.1,36.9-7.1h24.8h24.8c17.7,0,28.8,2.6,35.5,8.5s9,14.9,9,27.7c0,18.1-1.7,28.7-8.8,35
- s-19.8,8.5-41.8,9.7l-19.5,1l-19.5,1c-7.9,0.4-12.5,1.4-15,3.7s-3.2,5.8-3.2,11.3h54.7h54.7v13.3v13.3h-72.1h-72.1v-20.9V514.8z"
- />
- <path class="st6" d="M734.2,480.5c0-18.7,3.4-30.8,11.8-38.2s21.9-10.1,42.1-10.1h22.1h22.1c20.1,0,33.6,2.7,42.1,10.1
- s11.8,19.5,11.8,38.2v17.2v17.2c0,16-3.7,26.8-11,33.6s-18.3,9.6-33,9.6h-32h-32c-14.7,0-25.7-2.8-33-9.6s-11-17.6-11-33.6v-17.2
- V480.5z M770.9,508.3c0,6.4,1,11.1,4.2,14.3s8.7,4.7,17.5,4.7h17.5h17.5c8.8,0,14.3-1.6,17.5-4.7s4.2-7.9,4.2-14.3v-13.3v-13.3
- c0-6.4-1-11.1-4.2-14.3s-8.7-4.7-17.5-4.7h-17.5h-17.5c-8.8,0-14.3,1.6-17.5,4.7s-4.2,7.9-4.2,14.3v13.3V508.3z"/>
- </g>
-</g>
-<g id="Plus4" class="st4">
- <g class="st5">
- <path class="st6" d="M141.9,414.7h59.3h59.3c20.7,0,33.5,5.2,41.2,13.9s10.2,20.8,10.2,34.7v6.1v6.1c0,10.6-2.3,22-8.5,30.7
- S287.2,521,271.8,521h-43.2h-43.2v17.8v17.8h-21.8h-21.8v-71V414.7z M185.4,485.7h33.8H253c5.1,0,8.6-1.7,10.9-4.4
- s3.2-6.5,3.2-10.7v-2.7v-2.7c0-4.8-1.2-8.6-4-11.1s-7.3-3.9-13.8-3.9h-31.9h-31.9v17.8V485.7z"/>
- <path class="st6" d="M335.7,414.7h18.8h18.8v71v71h-18.8h-18.8v-71V414.7z"/>
- <path class="st6" d="M535.2,556.6h-18.8h-18.8v-8v-8h-0.2h-0.2c-3.3,7-8.3,11.4-14.9,14s-15,3.6-25.1,3.6
- c-11.7,0-25.6-0.2-36.7-5.9s-19.2-16.7-19.2-38.2v-28.7v-28.7h18.8H439v28.7v28.7c0,4.9,2,8.6,6,11s10.1,3.7,18.3,3.7h4.3h4.3
- c8,0,14.5-1.9,18.9-5.5s6.8-9.1,6.8-16.2v-25.2v-25.2h18.8h18.8v50V556.6z"/>
- <path class="st6" d="M596.2,525.5c0,2.7,0.5,5,3.7,6.7s9,2.5,19.7,2.5h6.7h6.7c8.9,0,14.5-0.3,17.9-1.4s4.5-3,4.5-6
- c0-2.9-0.7-5-3.1-6.3s-6.5-1.9-13.1-1.9h-17.6h-17.6c-17.5-0.1-28.9-2.1-35.9-7.4s-9.6-14.1-9.6-27.9c0-12.4,5-19.6,13.2-23.6
- s19.7-5,32.6-5h13.1h13.1c24.6,0,39.1,1.7,47.4,6.4s10.6,12.2,10.8,24h-18.8h-18.8c-1-2.9-2.4-4.7-6.3-5.6s-10.5-1.2-21.7-1.2
- c-10.9,0-17.3,0.1-21.1,1.2s-4.8,2.9-4.8,6.3c0,2.2,0.7,3.6,3.9,4.6s8.8,1.3,18.6,1.3h13h13c22.5,0,34.6,3.8,41.1,9.8
- s7.3,14.2,7.3,23.2c0,13.2-2.6,21.6-10.7,26.6s-21.4,6.7-42.9,6.7h-17.8h-17.8c-17.3,0-29.2-2-36.7-7.1s-10.7-13.3-10.7-25.6h19.4
- H596.2z"/>
- <path class="st6" d="M713.8,476.3l50.7-30.8l50.7-30.8h25.1h25.1v40.9v40.9h10.5h10.5v15.9v15.9h-10.5h-10.5v14.2v14.2h-20.6
- h-20.6v-14.2v-14.2H769h-55.2v-26V476.3z M747.9,496.1v0.2v0.2H786h38.1v-23.8v-23.8L786,472.4L747.9,496.1z"/>
- </g>
-</g>
-<g id="DTV" class="st4">
- <g class="st5">
- <path class="st6" d="M135.3,368.4h87.1h87.1c28.9,0,48.4,4.7,60.6,15.3s17.4,26.9,17.4,50.2v28.6v28.6c0,23.3-5.1,39.6-17.4,50.2
- s-31.8,15.3-60.6,15.3h-87.1h-87.1v-94.1V368.4z M193,508.3h51.2h51.2c12.3,0,20.9-1.8,26.4-6.9s7.9-13.6,7.9-26.9v-12.7V449
- c0-13.4-2.4-21.8-7.9-26.9s-14.1-6.9-26.4-6.9h-51.2H193v46.5V508.3z"/>
- <path class="st6" d="M408.5,368.4h110h110v23.4v23.4h-40.6h-40.6v70.7v70.7h-28.9h-28.9v-70.7v-70.7h-40.6h-40.6v-23.4V368.4z"/>
- <path class="st6" d="M635.5,368.4h31.6h31.6l36.8,69.9l36.8,69.9l36.8-69.9l36.8-69.9h31.6H909l-50.6,94.1l-50.6,94.1h-35.6h-35.6
- l-50.6-94.1L635.5,368.4z"/>
- </g>
-</g>
-<g id="C64">
- <g>
- <path class="st6" d="M132.4,434.4c0-27.6,7.7-44.6,22-54.7s35-13.4,61-13.4h33.9h33.9c41.1,0,64.3,4.4,77.2,15.5
- s15.4,28.8,15.1,55.5h-28.9h-28.9v-2.6v-2.6c0-6.8-2.5-11.1-7.1-13.8s-11.4-3.6-20-3.6h-31.5h-31.5c-15.2,0-24.2,3.6-29.5,10.1
- s-6.7,15.9-6.7,27.6v10.1v10.1c0,13.6,1.4,23.1,6.3,29.1s13.1,8.6,26.7,8.6h30.8h30.8c13,0,21.4-0.6,26.6-4.2s7.1-10.1,7.1-21.8
- H349h28.9v8.8v8.8c0,15.9-2.9,30-13,40.2s-27.5,16.4-56.5,16.4h-46.5h-46.5c-26,0-46.7-3.2-61-13.4s-22-27.2-22-54.7v-28.1V434.4z
- "/>
- <path class="st6" d="M413.2,440.1c0-28.6,5.2-47.1,18.1-58.4s33.5-15.5,64.3-15.5h30h30c27.4,0,44.8,4.7,55.3,12.5
- s14.1,18.5,14.1,30.4v7.4v7.4h-25h-25c0-6.4-2.1-10.7-6.7-13.4s-11.8-3.8-21.9-3.8h-25.3h-25.3c-9.9,0-16.9,1.9-21.4,5.8
- s-6.6,9.5-6.6,16.9v11.2v11.2c4.7-4.7,9.7-8.3,16.5-10.7s15.1-3.6,26.4-3.6h26.9h26.9c27.8,0,44.2,4.6,53.6,13.5s11.9,22,11.9,39
- v8.2v8.2c0,23.1-5.7,36.2-16.9,43.5s-28.1,8.8-50.4,8.8h-41.1h-41.1c-22.5,0-39.3-4.3-50.5-14.7s-16.8-26.9-16.8-51.3v-26.3V440.1
- z M548.7,518.1c11,0,18.1-1.2,22.5-4.5s5.9-8.5,5.9-16.6c0-7.9-1.5-13.1-5.9-16.2s-11.8-4.3-23.5-4.3h-25.2h-25.2
- c-11.7,0-19,1.2-23.5,4.3s-5.9,8.3-5.9,16.2c0,8.1,1.6,13.3,5.9,16.6s11.4,4.5,22.5,4.5h26.3H548.7z"/>
- <path class="st6" d="M664.1,450l67.2-40.8l67.2-40.8h33.3h33.3v54.2v54.2H879h13.9v21.1v21.1H879h-13.9v18.8v18.8h-27.3h-27.3
- v-18.8v-18.8h-73.2h-73.2v-34.4V450z M709.3,476.3v0.3v0.3h50.6h50.6v-31.6v-31.6L759.9,445L709.3,476.3z"/>
- </g>
-</g>
-<g id="SID" class="st4">
- <g class="st5">
- <path class="st6" d="M197.3,495h28.9H255c0.1,10,2.2,15.4,6.3,18.3s10.3,3.3,18.6,3.3h35.4h35.4c6.1,0,12.3-0.3,16.9-2.5
- s7.8-6.1,7.8-13.4c0-8.2-1.7-12.5-12.7-14.9s-31.3-2.6-68.4-2.6c-43.4,0-67.6-2.6-80.9-11s-15.8-22.6-15.8-45.7
- c0-17,0.8-32.1,10.7-42.9s28.9-17.4,65.3-17.4h40.3H354c33.3,0,51.5,5.7,61.4,15.4s11.4,23.7,11.4,40.2v3v3H398h-28.9
- c0-6.9-0.4-11.8-4.1-14.9s-10.7-4.6-24-4.6h-32h-32c-6.5,0-12,1.1-15.8,3.5s-6,6-6,11.1c0,8.2,1.8,12.4,11.2,14.6
- s26.7,2.2,57.7,2.1c44.8-0.1,72.5,1.2,88.9,9.4s21.6,23.3,21.6,50.7c0,25.3-4.3,40.1-18.2,48.5s-37.3,10.5-75.7,10.5h-35h-35
- c-26.3,0-44.7-2.5-56.5-10s-17.1-20.2-17.1-40.7v-6.5V495z"/>
- <path class="st6" d="M473.4,368.4h28.9h28.9v94.1v94.1h-28.9h-28.9v-94.1V368.4z"/>
- <path class="st6" d="M575.3,368.4h87.1h87.1c28.9,0,48.4,4.7,60.6,15.3s17.4,26.9,17.4,50.2v28.6v28.6c0,23.3-5.1,39.6-17.4,50.2
- s-31.8,15.3-60.6,15.3h-87.1h-87.1v-94.1V368.4z M633,508.3h51.2h51.2c12.3,0,20.9-1.8,26.4-6.9s7.9-13.6,7.9-26.9v-12.7V449
- c0-13.4-2.4-21.8-7.9-26.9s-14.1-6.9-26.4-6.9h-51.2H633v46.5V508.3z"/>
- </g>
-</g>
-<g id="PET" class="st4">
- <g class="st5">
- <path class="st6" d="M165.4,368.4h78.6h78.6c27.4,0,44.5,6.9,54.6,18.4s13.5,27.6,13.5,46.1v8.1v8.1c0,14-3.1,29.1-11.2,40.7
- s-21.4,19.6-41.8,19.6h-57.3h-57.3V533v23.7h-28.9h-28.9v-94.1V368.4z M223.1,462.5H268h44.8c6.8,0,11.4-2.2,14.4-5.8
- s4.3-8.6,4.3-14.2v-3.6v-3.6c0-6.4-1.6-11.4-5.3-14.8s-9.7-5.2-18.4-5.2h-42.4h-42.4v23.7V462.5z"/>
- <path class="st6" d="M422,368.4h103h103v21.8v21.8h-74.1h-74.1v15.1v15.1H550h70.2v19.5v19.5H550h-70.2v15.1v15.1h75.8h75.8V534
- v22.6H526.7H422v-94.1V368.4z"/>
- <path class="st6" d="M652.4,368.4h110h110v23.4v23.4h-40.6h-40.6v70.7v70.7h-28.9h-28.9v-70.7v-70.7H693h-40.6v-23.4V368.4z"/>
- </g>
-</g>
-<g id="CBM2" class="st4">
- <g class="st5">
- <path class="st6" d="M133.3,474.4c0-18.6,5.2-30,14.8-36.8s23.5-9,41-9H212h22.8c27.7,0,43.3,3,51.9,10.4s10.4,19.4,10.2,37.3
- h-19.4h-19.4v-1.8v-1.8c0-4.5-1.7-7.5-4.8-9.3s-7.7-2.4-13.4-2.4h-21.2h-21.2c-10.2,0-16.3,2.4-19.8,6.8s-4.5,10.7-4.5,18.6v6.8
- v6.8c0,9.2,1,15.5,4.2,19.6s8.8,5.8,18,5.8h20.7h20.7c8.8,0,14.4-0.4,17.9-2.8s4.8-6.8,4.8-14.7h19.4h19.4v6v6
- c0,10.7-1.9,20.2-8.7,27.1s-18.5,11.1-38,11.1h-31.3h-31.3c-17.5,0-31.5-2.2-41-9s-14.8-18.3-14.8-36.8v-18.9V474.4z"/>
- <path class="st6" d="M322,429.9h55.9h55.9c15.5,0,27,2.1,34.6,7.3s11.4,13.5,11.4,25.9c0,10.9-2,17.3-5.3,21.5s-8,6-13.4,7.6v0.3
- v0.3c8.5,1,14.3,3.8,18,8.8s5.3,12,5.3,21.5c0,13.9-4.1,22.3-11,27.2s-16.6,6.4-27.7,6.4h-61.9H322v-63.4V429.9z M360.8,480.1
- h34.4h34.4c3.6,0,6.4-0.7,8.4-2.2s3-4,3-7.6c0-3.7-1.1-6.2-3-7.7s-4.8-2.2-8.4-2.2h-34.4h-34.4v9.9V480.1z M360.8,526.2h34.8h34.8
- c4.2,0,7.7-0.5,10.2-1.9s3.9-3.7,3.9-7.4c0-4.3-1.4-6.9-3.9-8.5s-6-2-10.2-2h-34.8h-34.8v9.9V526.2z"/>
- <path class="st6" d="M507.8,429.9h29.8h29.8l22,40.8l22,40.8l22-40.8l22-40.8h29.8H715v63.4v63.4h-18.9h-18.9v-45.5v-45.5H677
- h-0.2l-25.5,45.5l-25.5,45.5h-14.5h-14.5l-25.5-45.5L546,465.6h-0.2h-0.2v45.5v45.5h-18.9h-18.9v-63.4V429.9z"/>
- <path class="st6" d="M740.4,513.6c0-7.8,2.5-14.3,8.2-19s14.5-7.8,27-8.6l22.2-1.4l22.2-1.4c14.2-0.9,21.7-1.4,25.8-3.3
- s4.5-5.1,4.5-11.4c0-5.2-0.3-8.3-3.6-10.2s-9.8-2.4-22.3-2.4h-12.9h-12.9c-8.2,0-13.6,0.6-16.9,2.9s-4.6,6.1-4.6,12.7v2.7v2.7
- h-18.4h-18.4v-7.4v-7.4c0-12.5,3.7-20.9,11.7-26.1s20.5-7.3,38-7.3h25.6h25.6c18.2,0,29.7,2.7,36.6,8.7s9.3,15.3,9.3,28.5
- c0,18.6-1.7,29.5-9.1,36.1s-20.4,8.7-43.1,10l-20,1l-20,1c-8.1,0.4-12.8,1.4-15.5,3.8s-3.3,6-3.3,11.6h56.4h56.4V543v13.7h-74.2
- h-74.2v-21.5V513.6z"/>
- </g>
-</g>
-<g id="SCPU" class="st4">
- <g class="st5">
- <path class="st6" d="M159.9,515.2h19.4h19.4c0.1,6.7,1.5,10.4,4.3,12.3s6.9,2.2,12.5,2.2h23.8h23.8c4.1,0,8.3-0.2,11.4-1.7
- s5.2-4.1,5.2-9c0-5.5-1.1-8.4-8.5-10s-21-1.7-46.1-1.7c-29.2,0-45.5-1.8-54.5-7.4s-10.6-15.2-10.6-30.8c0-11.5,0.5-21.6,7.2-28.9
- s19.4-11.7,43.9-11.7h27.1h27.1c22.4,0,34.7,3.8,41.3,10.4s7.7,15.9,7.7,27.1v2v2H295h-19.4c0-4.6-0.3-7.9-2.8-10
- s-7.2-3.1-16.1-3.1h-21.5h-21.5c-4.4,0-8.1,0.7-10.6,2.3s-4.1,4-4.1,7.5c0,5.5,1.2,8.4,7.6,9.8s18,1.5,38.8,1.4
- c30.2-0.1,48.8,0.8,59.8,6.3s14.5,15.7,14.5,34.1c0,17.1-2.9,27-12.2,32.7s-25.1,7.1-50.9,7.1H233h-23.5c-17.7,0-30.1-1.7-38-6.8
- s-11.5-13.6-11.5-27.4v-4.4V515.2z"/>
- <path class="st6" d="M340.8,474.4c0-18.6,5.2-30,14.8-36.8s23.5-9,41-9h22.8h22.8c27.7,0,43.3,3,51.9,10.4s10.4,19.4,10.2,37.3
- h-19.4h-19.4v-1.8v-1.8c0-4.5-1.7-7.5-4.8-9.3s-7.7-2.4-13.4-2.4h-21.2h-21.2c-10.2,0-16.3,2.4-19.8,6.8s-4.5,10.7-4.5,18.6v6.8
- v6.8c0,9.2,1,15.5,4.2,19.6s8.8,5.8,18,5.8h20.7h20.7c8.8,0,14.4-0.4,17.9-2.8s4.8-6.8,4.8-14.7h19.4h19.4v6v6
- c0,10.7-1.9,20.2-8.7,27.1s-18.5,11.1-38,11.1H428h-31.3c-17.5,0-31.5-2.2-41-9s-14.8-18.3-14.8-36.8v-18.9V474.4z"/>
- <path class="st6" d="M529.5,429.9h52.9h52.9c18.5,0,29.9,4.6,36.8,12.4s9.1,18.6,9.1,31v5.4v5.4c0,9.5-2.1,19.6-7.5,27.4
- s-14.4,13.2-28.2,13.2h-38.6h-38.6v15.9v15.9h-19.4h-19.4v-63.4V429.9z M568.4,493.3h30.2h30.2c4.5,0,7.7-1.5,9.7-3.9
- s2.9-5.8,2.9-9.6v-2.5v-2.5c0-4.3-1.1-7.7-3.6-10s-6.5-3.5-12.4-3.5h-28.5h-28.5v15.9V493.3z"/>
- <path class="st6" d="M702.2,429.9h19.4h19.4v36.6v36.6c0,8,1.4,13.6,4.9,17.2s8.9,5.2,16.8,5.2H782h19.2c8,0,13.4-1.6,16.8-5.2
- s4.9-9.2,4.9-17.2v-36.6v-36.6h19.4h19.4v40.8v40.8c0,15.8-4.1,27.4-12.6,35.1S827.7,558,809.9,558H782h-27.8
- c-17.9,0-30.8-3.8-39.4-11.5s-12.6-19.3-12.6-35.1v-40.8V429.9z"/>
- </g>
-</g>
-</svg>
Deleted: trunk/vice/data/common/C64_16.png
===================================================================
(Binary files differ)
Deleted: trunk/vice/data/common/C64_24.png
===================================================================
(Binary files differ)
Deleted: trunk/vice/data/common/C64_256.png
===================================================================
(Binary files differ)
Deleted: trunk/vice/data/common/C64_32.png
===================================================================
(Binary files differ)
Deleted: trunk/vice/data/common/C64_48.png
===================================================================
(Binary files differ)
Deleted: trunk/vice/data/common/C64_64.png
===================================================================
(Binary files differ)
Deleted: trunk/vice/data/common/CBM2_1024.svg
===================================================================
--- trunk/vice/data/common/CBM2_1024.svg 2025-02-14 08:35:08 UTC (rev 45489)
+++ trunk/vice/data/common/CBM2_1024.svg 2025-02-14 09:41:55 UTC (rev 45490)
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
-<style type="text/css">
- .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#3D3D3D;}
- .st1{fill-rule:evenodd;clip-rule:evenodd;fill:#595959;}
- .st2{fill:#2B2B2B;}
- .st3{fill:#7C7C7C;}
- .st4{display:none;}
- .st5{display:inline;}
- .st6{fill:#FFFFFF;}
-</style>
-<g id="Layer_11_copy_3">
- <path class="st0" d="M267.1,1010h-63.9h-63.9c-34.6,0-65.9-14-88.6-36.7C28,950.6,14,919.3,14,884.7V512V139.3
- c0-34.6,14-65.9,36.7-88.6s54-36.7,88.6-36.7H512h372.7c34.6,0,65.9,14,88.6,36.7c22.7,22.7,36.7,54,36.7,88.6V512v372.7
- c0,34.6-14,65.9-36.7,88.6c-22.7,22.7-54,36.7-88.6,36.7h-64h-64H511.9H267.1z"/>
- <path class="st1" d="M267.1,1010H139.3C70.1,1010,14,953.9,14,884.7V809h996v75.7c0,69.2-56.1,125.3-125.3,125.3H756.7H267.1z"/>
- <g>
- <g>
- <rect x="14" y="610" class="st2" width="996" height="20"/>
- <rect x="14" y="630" class="st3" width="996" height="20"/>
- </g>
- <g>
- <rect x="14" y="650" class="st2" width="996" height="20"/>
- <rect x="14" y="670" class="st3" width="996" height="20"/>
- </g>
- <g>
- <rect x="14" y="690" class="st2" width="996" height="20"/>
- <rect x="14" y="710" class="st3" width="996" height="20"/>
- </g>
- <g>
- <rect x="14" y="730" class="st2" width="996" height="20"/>
- <rect x="14" y="750" class="st3" width="996" height="20"/>
- </g>
- <g>
- <rect x="14" y="770" class="st2" width="996" height="20"/>
- <rect x="14" y="790" class="st3" width="996" height="20"/>
- </g>
- </g>
-</g>
-<g id="VIC20" class="st4">
- <g class="st5">
- <path class="st6" d="M130.7,433.5h20.7H172l24.1,45.7l24.1,45.7l24.1-45.7l24.1-45.7h20.7h20.7l-33.1,61.5l-33.1,61.5h-23.3h-23.3
- l-33.1-61.5L130.7,433.5z"/>
- <path class="st6" d="M325.2,433.5H344h18.9v61.5v61.5H344h-18.9v-61.5V433.5z"/>
- <path class="st6" d="M387.7,476.7c0-18,5.1-29.2,14.4-35.8s22.9-8.8,39.9-8.8h22.2h22.2c26.9,0,42,2.9,50.4,10.1
- s10.1,18.8,9.9,36.3h-18.9h-18.9v-1.7v-1.7c0-4.4-1.6-7.3-4.6-9s-7.4-2.4-13-2.4h-20.6h-20.6c-9.9,0-15.9,2.3-19.3,6.6
- s-4.4,10.4-4.4,18.1v6.6v6.6c0,8.9,0.9,15.1,4.1,19s8.6,5.6,17.5,5.6h20.1h20.1c8.5,0,14-0.4,17.4-2.8s4.7-6.6,4.7-14.2h18.9h18.9
- v5.8v5.8c0,10.4-1.9,19.6-8.5,26.3s-18,10.8-36.9,10.8h-30.4H442c-17,0-30.6-2.1-39.9-8.8s-14.4-17.8-14.4-35.8v-18.4V476.7z"/>
- <path class="st6" d="M570.1,514.8c0-7.6,2.5-13.9,8-18.5s14-7.5,26.2-8.4l21.6-1.4l21.6-1.4c13.8-0.9,21.1-1.4,25-3.3
- s4.4-5,4.4-11c0-5-0.3-8.1-3.5-9.9s-9.6-2.4-21.6-2.4h-12.5h-12.5c-8,0-13.2,0.6-16.4,2.8s-4.5,6-4.5,12.3v2.6v2.6H588h-17.8v-7.2
- v-7.2c0-12.2,3.6-20.3,11.4-25.4s19.9-7.1,36.9-7.1h24.8h24.8c17.7,0,28.8,2.6,35.5,8.5s9,14.9,9,27.7c0,18.1-1.7,28.7-8.8,35
- s-19.8,8.5-41.8,9.7l-19.5,1l-19.5,1c-7.9,0.4-12.5,1.4-15,3.7s-3.2,5.8-3.2,11.3h54.7h54.7v13.3v13.3h-72.1h-72.1v-20.9V514.8z"
- />
- <path class="st6" d="M734.2,480.5c0-18.7,3.4-30.8,11.8-38.2s21.9-10.1,42.1-10.1h22.1h22.1c20.1,0,33.6,2.7,42.1,10.1
- s11.8,19.5,11.8,38.2v17.2v17.2c0,16-3.7,26.8-11,33.6s-18.3,9.6-33,9.6h-32h-32c-14.7,0-25.7-2.8-33-9.6s-11-17.6-11-33.6v-17.2
- V480.5z M770.9,508.3c0,6.4,1,11.1,4.2,14.3s8.7,4.7,17.5,4.7h17.5h17.5c8.8,0,14.3-1.6,17.5-4.7s4.2-7.9,4.2-14.3v-13.3v-13.3
- c0-6.4-1-11.1-4.2-14.3s-8.7-4.7-17.5-4.7h-17.5h-17.5c-8.8,0-14.3,1.6-17.5,4.7s-4.2,7.9-4.2,14.3v13.3V508.3z"/>
- </g>
-</g>
-<g id="Plus4" class="st4">
- <g class="st5">
- <path class="st6" d="M141.9,414.7h59.3h59.3c20.7,0,33.5,5.2,41.2,13.9s10.2,20.8,10.2,34.7v6.1v6.1c0,10.6-2.3,22-8.5,30.7
- S287.2,521,271.8,521h-43.2h-43.2v17.8v17.8h-21.8h-21.8v-71V414.7z M185.4,485.7h33.8H253c5.1,0,8.6-1.7,10.9-4.4
- s3.2-6.5,3.2-10.7v-2.7v-2.7c0-4.8-1.2-8.6-4-11.1s-7.3-3.9-13.8-3.9h-31.9h-31.9v17.8V485.7z"/>
- <path class="st6" d="M335.7,414.7h18.8h18.8v71v71h-18.8h-18.8v-71V414.7z"/>
- <path class="st6" d="M535.2,556.6h-18.8h-18.8v-8v-8h-0.2h-0.2c-3.3,7-8.3,11.4-14.9,14s-15,3.6-25.1,3.6
- c-11.7,0-25.6-0.2-36.7-5.9s-19.2-16.7-19.2-38.2v-28.7v-28.7h18.8H439v28.7v28.7c0,4.9,2,8.6,6,11s10.1,3.7,18.3,3.7h4.3h4.3
- c8,0,14.5-1.9,18.9-5.5s6.8-9.1,6.8-16.2v-25.2v-25.2h18.8h18.8v50V556.6z"/>
- <path class="st6" d="M596.2,525.5c0,2.7,0.5,5,3.7,6.7s9,2.5,19.7,2.5h6.7h6.7c8.9,0,14.5-0.3,17.9-1.4s4.5-3,4.5-6
- c0-2.9-0.7-5-3.1-6.3s-6.5-1.9-13.1-1.9h-17.6h-17.6c-17.5-0.1-28.9-2.1-35.9-7.4s-9.6-14.1-9.6-27.9c0-12.4,5-19.6,13.2-23.6
- s19.7-5,32.6-5h13.1h13.1c24.6,0,39.1,1.7,47.4,6.4s10.6,12.2,10.8,24h-18.8h-18.8c-1-2.9-2.4-4.7-6.3-5.6s-10.5-1.2-21.7-1.2
- c-10.9,0-17.3,0.1-21.1,1.2s-4.8,2.9-4.8,6.3c0,2.2,0.7,3.6,3.9,4.6s8.8,1.3,18.6,1.3h13h13c22.5,0,34.6,3.8,41.1,9.8
- s7.3,14.2,7.3,23.2c0,13.2-2.6,21.6-10.7,26.6s-21.4,6.7-42.9,6.7h-17.8h-17.8c-17.3,0-29.2-2-36.7-7.1s-10.7-13.3-10.7-25.6h19.4
- H596.2z"/>
- <path class="st6" d="M713.8,476.3l50.7-30.8l50.7-30.8h25.1h25.1v40.9v40.9h10.5h10.5v15.9v15.9h-10.5h-10.5v14.2v14.2h-20.6
- h-20.6v-14.2v-14.2H769h-55.2v-26V476.3z M747.9,496.1v0.2v0.2H786h38.1v-23.8v-23.8L786,472.4L747.9,496.1z"/>
- </g>
-</g>
-<g id="DTV" class="st4">
- <g class="st5">
- <path class="st6" d="M135.3,368.4h87.1h87.1c28.9,0,48.4,4.7,60.6,15.3s17.4,26.9,17.4,50.2v28.6v28.6c0,23.3-5.1,39.6-17.4,50.2
- s-31.8,15.3-60.6,15.3h-87.1h-87.1v-94.1V368.4z M193,508.3h51.2h51.2c12.3,0,20.9-1.8,26.4-6.9s7.9-13.6,7.9-26.9v-12.7V449
- c0-13.4-2.4-21.8-7.9-26.9s-14.1-6.9-26.4-6.9h-51.2H193v46.5V508.3z"/>
- <path class="st6" d="M408.5,368.4h110h110v23.4v23.4h-40.6h-40.6v70.7v70.7h-28.9h-28.9v-70.7v-70.7h-40.6h-40.6v-23.4V368.4z"/>
- <path class="st6" d="M635.5,368.4h31.6h31.6l36.8,69.9l36.8,69.9l36.8-69.9l36.8-69.9h31.6H909l-50.6,94.1l-50.6,94.1h-35.6h-35.6
- l-50.6-94.1L635.5,368.4z"/>
- </g>
-</g>
-<g id="C64" class="st4">
- <g class="st5">
- <path class="st6" d="M132.4,434.4c0-27.6,7.7-44.6,22-54.7s35-13.4,61-13.4h33.9h33.9c41.1,0,64.3,4.4,77.2,15.5
- s15.4,28.8,15.1,55.5h-28.9h-28.9v-2.6v-2.6c0-6.8-2.5-11.1-7.1-13.8s-11.4-3.6-20-3.6h-31.5h-31.5c-15.2,0-24.2,3.6-29.5,10.1
- s-6.7,15.9-6.7,27.6v10.1v10.1c0,13.6,1.4,23.1,6.3,29.1s13.1,8.6,26.7,8.6h30.8h30.8c13,0,21.4-0.6,26.6-4.2s7.1-10.1,7.1-21.8
- H349h28.9v8.8v8.8c0,15.9-2.9,30-13,40.2s-27.5,16.4-56.5,16.4h-46.5h-46.5c-26,0-46.7-3.2-61-13.4s-22-27.2-22-54.7v-28.1V434.4z
- "/>
- <path class="st6" d="M413.2,440.1c0-28.6,5.2-47.1,18.1-58.4s33.5-15.5,64.3-15.5h30h30c27.4,0,44.8,4.7,55.3,12.5
- s14.1,18.5,14.1,30.4v7.4v7.4h-25h-25c0-6.4-2.1-10.7-6.7-13.4s-11.8-3.8-21.9-3.8h-25.3h-25.3c-9.9,0-16.9,1.9-21.4,5.8
- s-6.6,9.5-6.6,16.9v11.2v11.2c4.7-4.7,9.7-8.3,16.5-10.7s15.1-3.6,26.4-3.6h26.9h26.9c27.8,0,44.2,4.6,53.6,13.5s11.9,22,11.9,39
- v8.2v8.2c0,23.1-5.7,36.2-16.9,43.5s-28.1,8.8-50.4,8.8h-41.1h-41.1c-22.5,0-39.3-4.3-50.5-14.7s-16.8-26.9-16.8-51.3v-26.3V440.1
- z M548.7,518.1c11,0,18.1-1.2,22.5-4.5s5.9-8.5,5.9-16.6c0-7.9-1.5-13.1-5.9-16.2s-11.8-4.3-23.5-4.3h-25.2h-25.2
- c-11.7,0-19,1.2-23.5,4.3s-5.9,8.3-5.9,16.2c0,8.1,1.6,13.3,5.9,16.6s11.4,4.5,22.5,4.5h26.3H548.7z"/>
- <path class="st6" d="M664.1,450l67.2-40.8l67.2-40.8h33.3h33.3v54.2v54.2H879h13.9v21.1v21.1H879h-13.9v18.8v18.8h-27.3h-27.3
- v-18.8v-18.8h-73.2h-73.2v-34.4V450z M709.3,476.3v0.3v0.3h50.6h50.6v-31.6v-31.6L759.9,445L709.3,476.3z"/>
- </g>
-</g>
-<g id="SID" class="st4">
- <g class="st5">
- <path class="st6" d="M197.3,495h28.9H255c0.1,10,2.2,15.4,6.3,18.3s10.3,3.3,18.6,3.3h35.4h35.4c6.1,0,12.3-0.3,16.9-2.5
- s7.8-6.1,7.8-13.4c0-8.2-1.7-12.5-12.7-14.9s-31.3-2.6-68.4-2.6c-43.4,0-67.6-2.6-80.9-11s-15.8-22.6-15.8-45.7
- c0-17,0.8-32.1,10.7-42.9s28.9-17.4,65.3-17.4h40.3H354c33.3,0,51.5,5.7,61.4,15.4s11.4,23.7,11.4,40.2v3v3H398h-28.9
- c0-6.9-0.4-11.8-4.1-14.9s-10.7-4.6-24-4.6h-32h-32c-6.5,0-12,1.1-15.8,3.5s-6,6-6,11.1c0,8.2,1.8,12.4,11.2,14.6
- s26.7,2.2,57.7,2.1c44.8-0.1,72.5,1.2,88.9,9.4s21.6,23.3,21.6,50.7c0,25.3-4.3,40.1-18.2,48.5s-37.3,10.5-75.7,10.5h-35h-35
- c-26.3,0-44.7-2.5-56.5-10s-17.1-20.2-17.1-40.7v-6.5V495z"/>
- <path class="st6" d="M473.4,368.4h28.9h28.9v94.1v94.1h-28.9h-28.9v-94.1V368.4z"/>
- <path class="st6" d="M575.3,368.4h87.1h87.1c28.9,0,48.4,4.7,60.6,15.3s17.4,26.9,17.4,50.2v28.6v28.6c0,23.3-5.1,39.6-17.4,50.2
- s-31.8,15.3-60.6,15.3h-87.1h-87.1v-94.1V368.4z M633,508.3h51.2h51.2c12.3,0,20.9-1.8,26.4-6.9s7.9-13.6,7.9-26.9v-12.7V449
- c0-13.4-2.4-21.8-7.9-26.9s-14.1-6.9-26.4-6.9h-51.2H633v46.5V508.3z"/>
- </g>
-</g>
-<g id="PET" class="st4">
- <g class="st5">
- <path class="st6" d="M165.4,368.4h78.6h78.6c27.4,0,44.5,6.9,54.6,18.4s13.5,27.6,13.5,46.1v8.1v8.1c0,14-3.1,29.1-11.2,40.7
- s-21.4,19.6-41.8,19.6h-57.3h-57.3V533v23.7h-28.9h-28.9v-94.1V368.4z M223.1,462.5H268h44.8c6.8,0,11.4-2.2,14.4-5.8
- s4.3-8.6,4.3-14.2v-3.6v-3.6c0-6.4-1.6-11.4-5.3-14.8s-9.7-5.2-18.4-5.2h-42.4h-42.4v23.7V462.5z"/>
- <path class="st6" d="M422,368.4h103h103v21.8v21.8h-74.1h-74.1v15.1v15.1H550h70.2v19.5v19.5H550h-70.2v15.1v15.1h75.8h75.8V534
- v22.6H526.7H422v-94.1V368.4z"/>
- <path class="st6" d="M652.4,368.4h110h110v23.4v23.4h-40.6h-40.6v70.7v70.7h-28.9h-28.9v-70.7v-70.7H693h-40.6v-23.4V368.4z"/>
- </g>
-</g>
-<g id="CBM2">
- <g>
- <path class="st6" d="M133.3,474.4c0-18.6,5.2-30,14.8-36.8s23.5-9,41-9H212h22.8c27.7,0,43.3,3,51.9,10.4s10.4,19.4,10.2,37.3
- h-19.4h-19.4v-1.8v-1.8c0-4.5-1.7-7.5-4.8-9.3s-7.7-2.4-13.4-2.4h-21.2h-21.2c-10.2,0-16.3,2.4-19.8,6.8s-4.5,10.7-4.5,18.6v6.8
- v6.8c0,9.2,1,15.5,4.2,19.6s8.8,5.8,18,5.8h20.7h20.7c8.8,0,14.4-0.4,17.9-2.8s4.8-6.8,4.8-14.7h19.4h19.4v6v6
- c0,10.7-1.9,20.2-8.7,27.1s-18.5,11.1-38,11.1h-31.3h-31.3c-17.5,0-31.5-2.2-41-9s-14.8-18.3-14.8-36.8v-18.9V474.4z"/>
- <path class="st6" d="M322,429.9h55.9h55.9c15.5,0,27,2.1,34.6,7.3s11.4,13.5,11.4,25.9c0,10.9-2,17.3-5.3,21.5s-8,6-13.4,7.6v0.3
- v0.3c8.5,1,14.3,3.8,18,8.8s5.3,12,5.3,21.5c0,13.9-4.1,22.3-11,27.2s-16.6,6.4-27.7,6.4h-61.9H322v-63.4V429.9z M360.8,480.1
- h34.4h34.4c3.6,0,6.4-0.7,8.4-2.2s3-4,3-7.6c0-3.7-1.1-6.2-3-7.7s-4.8-2.2-8.4-2.2h-34.4h-34.4v9.9V480.1z M360.8,526.2h34.8h34.8
- c4.2,0,7.7-0.5,10.2-1.9s3.9-3.7,3.9-7.4c0-4.3-1.4-6.9-3.9-8.5s-6-2-10.2-2h-34.8h-34.8v9.9V526.2z"/>
- <path class="st6" d="M507.8,429.9h29.8h29.8l22,40.8l22,40.8l22-40.8l22-40.8h29.8H715v63.4v63.4h-18.9h-18.9v-45.5v-45.5H677
- h-0.2l-25.5,45.5l-25.5,45.5h-14.5h-14.5l-25.5-45.5L546,465.6h-0.2h-0.2v45.5v45.5h-18.9h-18.9v-63.4V429.9z"/>
- <path class="st6" d="M740.4,513.6c0-7.8,2.5-14.3,8.2-19s14.5-7.8,27-8.6l22.2-1.4l22.2-1.4c14.2-0.9,21.7-1.4,25.8-3.3
- s4.5-5.1,4.5-11.4c0-5.2-0.3-8.3-3.6-10.2s-9.8-2.4-22.3-2.4h-12.9h-12.9c-8.2,0-13.6,0.6-16.9,2.9s-4.6,6.1-4.6,12.7v2.7v2.7
- h-18.4h-18.4v-7.4v-7.4c0-12.5,3.7-20.9,11.7-26.1s20.5-7.3,38-7.3h25.6h25.6c18.2,0,29.7,2.7,36.6,8.7s9.3,15.3,9.3,28.5
- c0,18.6-1.7,29.5-9.1,36.1s-20.4,8.7-43.1,10l-20,1l-20,1c-8.1,0.4-12.8,1.4-15.5,3.8s-3.3,6-3.3,11.6h56.4h56.4V543v13.7h-74.2
- h-74.2v-21.5V513.6z"/>
- </g>
-</g>
-<g id="SCPU" class="st4">
- <g class="st5">
- <path class="st6" d="M159.9,515.2h19.4h19.4c0.1,6.7,1.5,10.4,4.3,12.3s6.9,2.2,12.5,2.2h23.8h23.8c4.1,0,8.3-0.2,11.4-1.7
- s5.2-4.1,5.2-9c0-5.5-1.1-8.4-8.5-10s-21-1.7-46.1-1.7c-29.2,0-45.5-1.8-54.5-7.4s-10.6-15.2-10.6-30.8c0-11.5,0.5-21.6,7.2-28.9
- s19.4-11.7,43.9-11.7h27.1h27.1c22.4,0,34.7,3.8,41.3,10.4s7.7,15.9,7.7,27.1v2v2H295h-19.4c0-4.6-0.3-7.9-2.8-10
- s-7.2-3.1-16.1-3.1h-21.5h-21.5c-4.4,0-8.1,0.7-10.6,2.3s-4.1,4-4.1,7.5c0,5.5,1.2,8.4,7.6,9.8s18,1.5,38.8,1.4
- c30.2-0.1,48.8,0.8,59.8,6.3s14.5,15.7,14.5,34.1c0,17.1-2.9,27-12.2,32.7s-25.1,7.1-50.9,7.1H233h-23.5c-17.7,0-30.1-1.7-38-6.8
- s-11.5-13.6-11.5-27.4v-4.4V515.2z"/>
- <path class="st6" d="M340.8,474.4c0-18.6,5.2-30,14.8-36.8s23.5-9,41-9h22.8h22.8c27.7,0,43.3,3,51.9,10.4s10.4,19.4,10.2,37.3
- h-19.4h-19.4v-1.8v-1.8c0-4.5-1.7-7.5-4.8-9.3s-7.7-2.4-13.4-2.4h-21.2h-21.2c-10.2,0-16.3,2.4-19.8,6.8s-4.5,10.7-4.5,18.6v6.8
- v6.8c0,9.2,1,15.5,4.2,19.6s8.8,5.8,18,5.8h20.7h20.7c8.8,0,14.4-0.4,17.9-2.8s4.8-6.8,4.8-14.7h19.4h19.4v6v6
- c0,10.7-1.9,20.2-8.7,27.1s-18.5,11.1-38,11.1H428h-31.3c-17.5,0-31.5-2.2-41-9s-14.8-18.3-14.8-36.8v-18.9V474.4z"/>
- <path class="st6" d="M529.5,429.9h52.9h52.9c18.5,0,29.9,4.6,36.8,12.4s9.1,18.6,9.1,31v5.4v5.4c0,9.5-2.1,19.6-7.5,27.4
- s-14.4,13.2-28.2,13.2h-38.6h-38.6v15.9v15.9h-19.4h-19.4v-63.4V429.9z M568.4,493.3h30.2h30.2c4.5,0,7.7-1.5,9.7-3.9
- s2.9-5.8,2.9-9.6v-2.5v-2.5c0-4.3-1.1-7.7-3.6-10s-6.5-3.5-12.4-3.5h-28.5h-28.5v15.9V493.3z"/>
- <path class="st6" d="M702.2,429.9h19.4h19.4v36.6v36.6c0,8,1.4,13.6,4.9,17.2s8.9,5.2,16.8,5.2H782h19.2c8,0,13.4-1.6,16.8-5.2
- s4.9-9.2,4.9-17.2v-36.6v-36.6h19.4h19.4v40.8v40.8c0,15.8-4.1,27.4-12.6,35.1S827.7,558,809.9,558H782h-27.8
- c-17.9,0-30.8-3.8-39.4-11.5s-12.6-19.3-12.6-35.1v-40.8V429.9z"/>
- </g>
-</g>
-</svg>
Deleted: trunk/vice/data/common/CBM2_16.png
===================================================================
(Binary files differ)
Deleted: trunk/vice/data/common/CBM2_24.png
===================================================================
(Binary files differ)
Deleted: trunk/vice/data/common/CBM2_256.png
===================================================================
(Binary files differ)
Deleted: trunk/vice/data/common/CBM2_32.png
===================================================================
(Binary files differ)
Deleted: trunk/vice/data/common/CBM2_48.png
===================================================================
(Binary files differ)
Deleted: trunk/vice/data/common/CBM2_64.png
===================================================================
(Binary files differ)
Deleted: trunk/vice/data/common/DTV_1024.svg
===================================================================
--- trunk/vice/data/common/DTV_1024.svg 2025-02-14 08:35:08 UTC (rev 45489)
+++ trunk/vice/data/common/DTV_1024.svg 2025-02-14 09:41:55 UTC (rev 45490)
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
-<style type="text/css">
- .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#3D3D3D;}
- .st1{fill-rule:evenodd;clip-rule:evenodd;fill:#595959;}
- .st2{fill:#2B2B2B;}
- .st3{fill:#7C7C7C;}
- .st4{display:none;}
- .st5{display:inline;}
- .st6{fill:#FFFFFF;}
-</style>
-<g id="Layer_11_copy_3">
- <path class="st0" d="M267.1,1010h-63.9h-63.9c-34.6,0-65.9-14-88.6-36.7C28,950.6,14,919.3,14,884.7V512V139.3
- c0-34.6,14-65.9,36.7-88.6s54-36.7,88.6-36.7H512h372.7c34.6,0,65.9,14,88.6,36.7c22.7,22.7,3...
[truncated message content] |
|
From: <co...@us...> - 2025-02-14 08:35:09
|
Revision: 45489
http://sourceforge.net/p/vice-emu/code/45489
Author: compyx
Date: 2025-02-14 08:35:08 +0000 (Fri, 14 Feb 2025)
Log Message:
-----------
Remove old icon reference from GResource bundle
Modified Paths:
--------------
branches/compyx/desktop-icons/vice/data/common/vice.gresource.xml
Modified: branches/compyx/desktop-icons/vice/data/common/vice.gresource.xml
===================================================================
--- branches/compyx/desktop-icons/vice/data/common/vice.gresource.xml 2025-02-13 17:40:27 UTC (rev 45488)
+++ branches/compyx/desktop-icons/vice/data/common/vice.gresource.xml 2025-02-14 08:35:08 UTC (rev 45489)
@@ -6,7 +6,6 @@
<gresource prefix="/org/pokefinder/vice">
<file alias="vice-logo-black.svg">data/common/vice-logo-black.svg</file>
<file alias="CBM_Logo.svg">data/common/CBM_Logo.svg</file>
- <file alias="Ico...@2x...">data/common/Ico...@2x...</file>
<!-- emu icons, aliases are supposed to match `machine_name`, excl. 'svg'
currently xcbm5x0 uses the 'CBM-II' icon -->
<file alias="C64.svg">data/common/vice-x64_1024.svg</file>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <co...@us...> - 2025-02-13 17:40:29
|
Revision: 45488
http://sourceforge.net/p/vice-emu/code/45488
Author: compyx
Date: 2025-02-13 17:40:27 +0000 (Thu, 13 Feb 2025)
Log Message:
-----------
Update .deb build script to use updated .desktop and icon files
Copy 32x32, 48x48, 64x64 and 256x256 icons into `usr/share/icons/hicolor/` and
.desktop files into `/usr/share/applications`, dpkg's post-install hooks will
run `update-desktop-database` and other appropiate actions.
Untested, I'll have to set up 'act' to run github actions locally.
Modified Paths:
--------------
branches/compyx/desktop-icons/vice/build/github-actions/build-deb.sh
Modified: branches/compyx/desktop-icons/vice/build/github-actions/build-deb.sh
===================================================================
--- branches/compyx/desktop-icons/vice/build/github-actions/build-deb.sh 2025-02-13 17:12:29 UTC (rev 45487)
+++ branches/compyx/desktop-icons/vice/build/github-actions/build-deb.sh 2025-02-13 17:40:27 UTC (rev 45488)
@@ -12,20 +12,6 @@
# TODO: Provide md5sums?
-# Mapping of emulators to their icon names in data/common/
-# There is no separate icon for xcbm5x0, so we use the xcbm2 icon
-declare -A ICONS=(
- [vsid]="SID"
- [x128]="C128"
- [x64dtv]="DTV"
- [x64sc]="C64"
- [xcbm2]="CBM2"
- [xpet]="PET"
- [xplus4]="Plus4"
- [xscpu64]="SCPU"
- [xvic]="VIC20"
-)
-
# Point release flag
RELEASE=0
@@ -72,7 +58,7 @@
mkdir -p ${DEB_DIR}/usr/share/doc/vice
if [ "$UI" = "gtk3" ]; then
mkdir -p ${DEB_DIR}/usr/share/applications
- mkdir -p ${DEB_DIR}/usr/share/icons/hicolor/scalable/apps
+ mkdir -p ${DEB_DIR}/usr/share/icons/hicolor/{32x32,48x48,64x64,256x256}/apps
fi
# Copy the files installed with `make install-strip`
@@ -79,19 +65,15 @@
cp -R ${HOME}/build/* ${DEB_DIR}/
# Copy the documentation
cp vice/doc/vice.pdf ${DEB_DIR}/usr/share/doc/vice/
-# Copy .desktop files
if [ "$UI" = "gtk3" ]; then
- cp vice/build/debian/*.desktop ${DEB_DIR}/usr/share/applications
+ # Copy .desktop files
+ cp vice/data/common/*.desktop ${DEB_DIR}/usr/share/applications
+ # Copy icon files
+ cp vice/data/common/vice-*_32.png ${DEB_DIR}/usr/share/icons/hicolor/32x32/apps
+ cp vice/data/common/vice-*_48.png ${DEB_DIR}/usr/share/icons/hicolor/48x48/apps
+ cp vice/data/common/vice-*_64.png ${DEB_DIR}/usr/share/icons/hicolor/64x64/apps
+ cp vice/data/common/vice-*_256.png ${DEB_DIR}/usr/share/icons/hicolor/256x256/apps
fi
-# Copy icon files
-if [ "$UI" = "gtk3" ]; then
- for emu in ${!ICONS[@]}
- do
- orig="vice/data/common/${ICONS[$emu]}_1024.svg"
- dest="${DEB_DIR}/usr/share/icons/hicolor/scalable/apps/${emu}.svg"
- cp ${orig} ${dest}
- done
-fi
# Create copyright file, taking contributor info from src/infocontrib.h
cat vice/build/debian/copyright.header > ${DEB_DIR}/usr/share/doc/vice/copyright
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <co...@us...> - 2025-02-13 17:12:31
|
Revision: 45487
http://sourceforge.net/p/vice-emu/code/45487
Author: compyx
Date: 2025-02-13 17:12:29 +0000 (Thu, 13 Feb 2025)
Log Message:
-----------
Remove old .desktop files from build/debian
Removed Paths:
-------------
branches/compyx/desktop-icons/vice/build/debian/vsid.desktop
branches/compyx/desktop-icons/vice/build/debian/x128.desktop
branches/compyx/desktop-icons/vice/build/debian/x64dtv.desktop
branches/compyx/desktop-icons/vice/build/debian/x64sc.desktop
branches/compyx/desktop-icons/vice/build/debian/xcbm2.desktop
branches/compyx/desktop-icons/vice/build/debian/xcbm5x0.desktop
branches/compyx/desktop-icons/vice/build/debian/xpet.desktop
branches/compyx/desktop-icons/vice/build/debian/xplus4.desktop
branches/compyx/desktop-icons/vice/build/debian/xscpu64.desktop
branches/compyx/desktop-icons/vice/build/debian/xvic.desktop
Deleted: branches/compyx/desktop-icons/vice/build/debian/vsid.desktop
===================================================================
--- branches/compyx/desktop-icons/vice/build/debian/vsid.desktop 2025-02-13 16:47:23 UTC (rev 45486)
+++ branches/compyx/desktop-icons/vice/build/debian/vsid.desktop 2025-02-13 17:12:29 UTC (rev 45487)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=VICE (vsid)
-Comment=SID Player
-Exec=/usr/bin/vsid
-Terminal=false
-Icon=/usr/share/icons/hicolor/scalable/apps/vsid.svg
-Categories=Audio;AudioVideo;Emulator;
Deleted: branches/compyx/desktop-icons/vice/build/debian/x128.desktop
===================================================================
--- branches/compyx/desktop-icons/vice/build/debian/x128.desktop 2025-02-13 16:47:23 UTC (rev 45486)
+++ branches/compyx/desktop-icons/vice/build/debian/x128.desktop 2025-02-13 17:12:29 UTC (rev 45487)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=VICE (x128)
-Comment=Commodore 128 emulator
-Exec=/usr/bin/x128
-Terminal=false
-Icon=/usr/share/icons/hicolor/scalable/apps/x128.svg
-Categories=Game;Emulator;
Deleted: branches/compyx/desktop-icons/vice/build/debian/x64dtv.desktop
===================================================================
--- branches/compyx/desktop-icons/vice/build/debian/x64dtv.desktop 2025-02-13 16:47:23 UTC (rev 45486)
+++ branches/compyx/desktop-icons/vice/build/debian/x64dtv.desktop 2025-02-13 17:12:29 UTC (rev 45487)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=VICE (x64dtv)
-Comment=C64DTV emulator
-Exec=/usr/bin/x64dtv
-Terminal=false
-Icon=/usr/share/icons/hicolor/scalable/apps/x64dtv.svg
-Categories=Game;Emulator;
Deleted: branches/compyx/desktop-icons/vice/build/debian/x64sc.desktop
===================================================================
--- branches/compyx/desktop-icons/vice/build/debian/x64sc.desktop 2025-02-13 16:47:23 UTC (rev 45486)
+++ branches/compyx/desktop-icons/vice/build/debian/x64sc.desktop 2025-02-13 17:12:29 UTC (rev 45487)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=VICE (x64sc)
-Comment=Commodore 64 emulator
-Exec=/usr/bin/x64sc
-Terminal=false
-Icon=/usr/share/icons/hicolor/scalable/apps/x64sc.svg
-Categories=Game;Emulator;
Deleted: branches/compyx/desktop-icons/vice/build/debian/xcbm2.desktop
===================================================================
--- branches/compyx/desktop-icons/vice/build/debian/xcbm2.desktop 2025-02-13 16:47:23 UTC (rev 45486)
+++ branches/compyx/desktop-icons/vice/build/debian/xcbm2.desktop 2025-02-13 17:12:29 UTC (rev 45487)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=VICE (xcbm2)
-Comment=Commodore CBM-II (600/700/B) emulator
-Exec=/usr/bin/xcbm2
-Terminal=false
-Icon=/usr/share/icons/hicolor/scalable/apps/xcbm2.svg
-Categories=Game;Emulator;
Deleted: branches/compyx/desktop-icons/vice/build/debian/xcbm5x0.desktop
===================================================================
--- branches/compyx/desktop-icons/vice/build/debian/xcbm5x0.desktop 2025-02-13 16:47:23 UTC (rev 45486)
+++ branches/compyx/desktop-icons/vice/build/debian/xcbm5x0.desktop 2025-02-13 17:12:29 UTC (rev 45487)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=VICE (xcbm5x0)
-Comment=Commodore CBM-II (500/P) emulator
-Exec=/usr/bin/xcbm5x0
-Terminal=false
-Icon=/usr/share/icons/hicolor/scalable/apps/xcbm2.svg
-Categories=Game;Emulator;
Deleted: branches/compyx/desktop-icons/vice/build/debian/xpet.desktop
===================================================================
--- branches/compyx/desktop-icons/vice/build/debian/xpet.desktop 2025-02-13 16:47:23 UTC (rev 45486)
+++ branches/compyx/desktop-icons/vice/build/debian/xpet.desktop 2025-02-13 17:12:29 UTC (rev 45487)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=VICE (xpet)
-Comment=Commodore PET emulator
-Exec=/usr/bin/xpet
-Terminal=false
-Icon=/usr/share/icons/hicolor/scalable/apps/xpet.svg
-Categories=Game;Emulator;
Deleted: branches/compyx/desktop-icons/vice/build/debian/xplus4.desktop
===================================================================
--- branches/compyx/desktop-icons/vice/build/debian/xplus4.desktop 2025-02-13 16:47:23 UTC (rev 45486)
+++ branches/compyx/desktop-icons/vice/build/debian/xplus4.desktop 2025-02-13 17:12:29 UTC (rev 45487)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=VICE (xplus4)
-Comment=Commodore Plus/4 emulator
-Exec=/usr/bin/xplus4
-Terminal=false
-Icon=/usr/share/icons/hicolor/scalable/apps/xplus4.svg
-Categories=Game;Emulator;
Deleted: branches/compyx/desktop-icons/vice/build/debian/xscpu64.desktop
===================================================================
--- branches/compyx/desktop-icons/vice/build/debian/xscpu64.desktop 2025-02-13 16:47:23 UTC (rev 45486)
+++ branches/compyx/desktop-icons/vice/build/debian/xscpu64.desktop 2025-02-13 17:12:29 UTC (rev 45487)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=VICE (xscpu64)
-Comment=Commodore 64 SuperCPU emulator
-Exec=/usr/bin/xscpu64
-Terminal=false
-Icon=/usr/share/icons/hicolor/scalable/apps/xscpu64.svg
-Categories=Game;Emulator;
Deleted: branches/compyx/desktop-icons/vice/build/debian/xvic.desktop
===================================================================
--- branches/compyx/desktop-icons/vice/build/debian/xvic.desktop 2025-02-13 16:47:23 UTC (rev 45486)
+++ branches/compyx/desktop-icons/vice/build/debian/xvic.desktop 2025-02-13 17:12:29 UTC (rev 45487)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=VICE (xvic)
-Comment=Commodore VIC-20 emulator
-Exec=/usr/bin/xvic
-Terminal=false
-Icon=/usr/share/icons/hicolor/scalable/apps/xvic.svg
-Categories=Game;Emulator;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <co...@us...> - 2025-02-13 16:47:25
|
Revision: 45486
http://sourceforge.net/p/vice-emu/code/45486
Author: compyx
Date: 2025-02-13 16:47:23 +0000 (Thu, 13 Feb 2025)
Log Message:
-----------
Remove icon files from neolithic times
Modified Paths:
--------------
branches/compyx/desktop-icons/vice/data/common/Makefile.am
Removed Paths:
-------------
branches/compyx/desktop-icons/vice/data/common/Ico...@2x...
branches/compyx/desktop-icons/vice/data/common/icon.png
branches/compyx/desktop-icons/vice/data/common/icon1024x1024.png
Deleted: branches/compyx/desktop-icons/vice/data/common/Ico...@2x...
===================================================================
(Binary files differ)
Modified: branches/compyx/desktop-icons/vice/data/common/Makefile.am
===================================================================
--- branches/compyx/desktop-icons/vice/data/common/Makefile.am 2025-02-13 07:09:28 UTC (rev 45485)
+++ branches/compyx/desktop-icons/vice/data/common/Makefile.am 2025-02-13 16:47:23 UTC (rev 45486)
@@ -3,9 +3,7 @@
GRESOURCE_TARGET = $(builddir)/vice.gresource
GRESOURCE_XML = $(srcdir)/vice.gresource.xml
-icon_files = icon1024x1024.png \
- Ico...@2x... \
- vice-x128_16.png \
+icon_files = vice-x128_16.png \
vice-x128_24.png \
vice-x128_32.png \
vice-x128_48.png \
Deleted: branches/compyx/desktop-icons/vice/data/common/icon.png
===================================================================
(Binary files differ)
Deleted: branches/compyx/desktop-icons/vice/data/common/icon1024x1024.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <co...@us...> - 2025-02-13 07:09:31
|
Revision: 45485
http://sourceforge.net/p/vice-emu/code/45485
Author: compyx
Date: 2025-02-13 07:09:28 +0000 (Thu, 13 Feb 2025)
Log Message:
-----------
configure: export `INSTALL_DESKTOP_FILES` to config.h
Also remove the now unused `XDG_DESKTOP_MENU` program reference.
Modified Paths:
--------------
branches/compyx/desktop-icons/vice/configure.ac
Modified: branches/compyx/desktop-icons/vice/configure.ac
===================================================================
--- branches/compyx/desktop-icons/vice/configure.ac 2025-02-12 18:42:45 UTC (rev 45484)
+++ branches/compyx/desktop-icons/vice/configure.ac 2025-02-13 07:09:28 UTC (rev 45485)
@@ -1782,8 +1782,8 @@
dnl We got the UI + OS + tools:
USE_DESKTOP_FILES="yes"
+ AC_DEFINE(INSTALL_DESKTOP_FILES, , [Install XDG desktop files and icons])
AM_CONDITIONAL(INSTALL_DESKTOP_FILES, true)
- AC_SUBST([XDG_DESKTOP_MENU], ["$XDG_DESKTOP_MENU"])
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <co...@us...> - 2025-02-12 18:42:47
|
Revision: 45484
http://sourceforge.net/p/vice-emu/code/45484
Author: compyx
Date: 2025-02-12 18:42:45 +0000 (Wed, 12 Feb 2025)
Log Message:
-----------
Add installation of `.desktop` files
Implement install/uninstall hooks for .desktop files. The files are copied from
`build/debian` into `data/common` and updated to use simple executable names
(not paths) and icon names without paths. Script to build .deb packages needs
to be adjusted and the .desktop files in `builde/debian` need to be removed.
Currently proper .desktop file installation with program affixes (when using
configure's --program-prefix/--program-suffix switches) isn't implemented, that
gets messy quickly, see commint in `data/common/Makefile.am` for details.
Modified Paths:
--------------
branches/compyx/desktop-icons/vice/configure.ac
branches/compyx/desktop-icons/vice/data/common/Makefile.am
branches/compyx/desktop-icons/vice/src/arch/gtk3/data/Makefile.am
Added Paths:
-----------
branches/compyx/desktop-icons/vice/data/common/vsid.desktop
branches/compyx/desktop-icons/vice/data/common/x128.desktop
branches/compyx/desktop-icons/vice/data/common/x64.desktop
branches/compyx/desktop-icons/vice/data/common/x64dtv.desktop
branches/compyx/desktop-icons/vice/data/common/x64sc.desktop
branches/compyx/desktop-icons/vice/data/common/xcbm2.desktop
branches/compyx/desktop-icons/vice/data/common/xcbm5x0.desktop
branches/compyx/desktop-icons/vice/data/common/xpet.desktop
branches/compyx/desktop-icons/vice/data/common/xplus4.desktop
branches/compyx/desktop-icons/vice/data/common/xscpu64.desktop
branches/compyx/desktop-icons/vice/data/common/xvic.desktop
Removed Paths:
-------------
branches/compyx/desktop-icons/vice/src/arch/gtk3/data/unix/
Modified: branches/compyx/desktop-icons/vice/configure.ac
===================================================================
--- branches/compyx/desktop-icons/vice/configure.ac 2025-02-12 09:46:02 UTC (rev 45483)
+++ branches/compyx/desktop-icons/vice/configure.ac 2025-02-12 18:42:45 UTC (rev 45484)
@@ -1752,39 +1752,38 @@
dnl
AM_CONDITIONAL(INSTALL_DESKTOP_FILES, false)
if test x"$enable_desktop_files" = "xyes"; then
- dnl Check Gtk3 UI
- if test x"$enable_gtk3ui" != "xyes"; then
- AC_MSG_ERROR([XDG desktop files requested but UI is not Gtk3.])
- fi
- dnl Check OS (Unix)
- if test x"$is_unix_x11" != "xyes"; then
- AC_MSG_ERROR([XDG desktop files requested but OS is not Unix.])
- fi
- dnl Check OS (not MacOS)
- if test x"$is_unix_macos" = "xyes"; then
- AC_MSG_ERROR([XDG desktop files requested but OS is MacOS.])
- fi
- dnl Check for xdg-desktop-menu (Do we need this anymore?)
- AC_CHECK_PROG(XDG_DESKTOP_MENU, xdg-desktop-menu, xdg-desktop-menu, no)
- if test x"$XDG_DESKTOP_MENU" = "xno"; then
- AC_MSG_ERROR([XDG desktop files requested but required tool xdg-desktop-menu is missing. Please install xgd-utils.])
- fi
- dnl Check for xdg-icon-resource
- AC_CHECK_PROG(XDG_ICON_RESOURCE, xdg-icon-resource, xdg-icon-resource, no)
- if test x"$XDG_ICON_RESOURCE" = "xno"; then
- AC_MSG_ERROR([XDG desktop files requested but required tool xdg-icon-resource is missing. Please install xdg-utils.])
- fi
- dnl Check for update-desktop-database
- AC_CHECK_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, update-desktop-database, no)
- if test x"$UPDATE_DESKTOP_DATABASE" = "xno"; then
- AC_MSG_ERROR([XDG desktop files requested but required tool update-desktop-database is missing. Please install desktop-file-utils.])
- fi
+ dnl Check Gtk3 UI
+ if test x"$enable_gtk3ui" != "xyes"; then
+ AC_MSG_ERROR([XDG desktop files requested but UI is not Gtk3.])
+ fi
+ dnl Check OS (Unix)
+ if test x"$is_unix_x11" != "xyes"; then
+ AC_MSG_ERROR([XDG desktop files requested but OS is not Unix.])
+ fi
+ dnl Check OS (not MacOS)
+ if test x"$is_unix_macos" = "xyes"; then
+ AC_MSG_ERROR([XDG desktop files requested but OS is MacOS.])
+ fi
+ dnl Check for desktop-file-install
+ AC_CHECK_PROG(DESKTOP_FILE_INSTALL, desktop-file-install, desktop_file_install, no)
+ if test x"$DESKTOP_FILE_INSTALL" = "xno"; then
+ AC_MSG_ERROR([XDG desktop files requested but required tool desktop-file-install is missing. Please install desktop-file-utils.])
+ fi
+ dnl Check for xdg-icon-resource
+ AC_CHECK_PROG(XDG_ICON_RESOURCE, xdg-icon-resource, xdg-icon-resource, no)
+ if test x"$XDG_ICON_RESOURCE" = "xno"; then
+ AC_MSG_ERROR([XDG desktop files requested but required tool xdg-icon-resource is missing. Please install xdg-utils.])
+ fi
+ dnl Check for update-desktop-database
+ AC_CHECK_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, update-desktop-database, no)
+ if test x"$UPDATE_DESKTOP_DATABASE" = "xno"; then
+ AC_MSG_ERROR([XDG desktop files requested but required tool update-desktop-database is missing. Please install desktop-file-utils.])
+ fi
- dnl We got the UI + OS + tools:
- USE_DESKTOP_FILES="yes"
- AM_CONDITIONAL(INSTALL_DESKTOP_FILES, true)
- AC_SUBST([XDG_DESKTOP_MENU], ["$XDG_DESKTOP_MENU"])
-
+ dnl We got the UI + OS + tools:
+ USE_DESKTOP_FILES="yes"
+ AM_CONDITIONAL(INSTALL_DESKTOP_FILES, true)
+ AC_SUBST([XDG_DESKTOP_MENU], ["$XDG_DESKTOP_MENU"])
fi
@@ -3423,7 +3422,6 @@
src/arch/gtk3/Makefile
src/arch/gtk3/data/Makefile
src/arch/gtk3/data/macos/Makefile
- src/arch/gtk3/data/unix/Makefile
src/arch/gtk3/data/win32/Makefile
src/arch/gtk3/joystickdrv/Makefile
src/arch/gtk3/novte/Makefile
Modified: branches/compyx/desktop-icons/vice/data/common/Makefile.am
===================================================================
--- branches/compyx/desktop-icons/vice/data/common/Makefile.am 2025-02-12 09:46:02 UTC (rev 45483)
+++ branches/compyx/desktop-icons/vice/data/common/Makefile.am 2025-02-12 18:42:45 UTC (rev 45484)
@@ -82,6 +82,18 @@
PetMe64.ttf \
PetMe.ttf
+desktop_files = x64.desktop \
+ x64sc.desktop \
+ x64dtv.desktop \
+ xscpu64.desktop \
+ x128.desktop \
+ xvic.desktop \
+ xplus4.desktop \
+ xpet.desktop \
+ xcbm2.desktop \
+ xcbm5x0.desktop \
+ vsid.desktop
+
# Don't install icon files into VICE data dir if we have --enable-desktop-files,
# we use install hooks with xdg-icon-resource for those:
if INSTALL_DESKTOP_FILES
@@ -96,6 +108,7 @@
EXTRA_DIST = $(icon_files) \
$(logo_files) \
$(font_files) \
+ $(desktop_files) \
PetMe-FreeLicense.txt \
x64.rc \
x64sc.rc \
@@ -120,7 +133,7 @@
if INSTALL_DESKTOP_FILES
-.PHONY: install-icons uinstall-icons
+.PHONY: install-icons install-desktop-files uinstall-icons
# Install icon files in their proper place. The default context is 'apps' and
# the default mode is 'system' when running as root and 'user' when not running
@@ -162,7 +175,6 @@
xdg-icon-resource install --size 48 $(top_srcdir)/data/common/vice-vsid_48.png vice-vsid
xdg-icon-resource install --size 64 $(top_srcdir)/data/common/vice-vsid_64.png vice-vsid
xdg-icon-resource install --size 256 $(top_srcdir)/data/common/vice-vsid_256.png vice-vsid
- update-desktop-database
uninstall-icons:
xdg-icon-resource uninstall --size 32 vice-x64
@@ -201,12 +213,50 @@
xdg-icon-resource uninstall --size 48 vice-vsid
xdg-icon-resource uninstall --size 64 vice-vsid
xdg-icon-resource uninstall --size 256 vice-vsid
+
+# We can use the program prefix/suffix set via configure's --program-prefix= /
+# --program-suffix= switches via:
+# --set-key=Exec --set-value=@PROGRAM_PREFIX@x64sc@PROGRAM_SUFFIX@, but icon
+# lookup appears to depend on the .desktop file's name matching (the part
+# after the optional vendor prefix) the executable name.
+#
+# So for example using --program-suffix=-gtk3 won't work since "x64sc-gtk3.desktop"
+# means the vendor is "x64sc" and the executable "gtk3". For now we'll just make
+# this work for the canonical emulator names, alternate names will be a TODO.
+install-desktop-files:
+if SUPPORT_X64
+ desktop-file-install $(top_srcdir)/data/common/x64.desktop
+endif
+ desktop-file-install $(top_srcdir)/data/common/x64sc.desktop
+ desktop-file-install $(top_srcdir)/data/common/x64dtv.desktop
+ desktop-file-install $(top_srcdir)/data/common/xscpu64.desktop
+ desktop-file-install $(top_srcdir)/data/common/x128.desktop
+ desktop-file-install $(top_srcdir)/data/common/xplus4.desktop
+ desktop-file-install $(top_srcdir)/data/common/xvic.desktop
+ desktop-file-install $(top_srcdir)/data/common/xpet.desktop
+ desktop-file-install $(top_srcdir)/data/common/xcbm2.desktop
+ desktop-file-install $(top_srcdir)/data/common/xcbm5x0.desktop
+ desktop-file-install $(top_srcdir)/data/common/vsid.desktop
+
+# No `desktop-file-uninstall` exists, nor is there an uninstall option for
+# `desktop-file-install` or `desktop-file-uninstall`, so a simple `rm` will
+# have to do.
+uninstall-desktop-files:
+ rm -f /usr/share/applications/x64{,dtv,sc}.desktop
+ rm -f /usr/share/applications/xscpu64.desktop
+ rm -f /usr/share/applications/x128.desktop
+ rm -f /usr/share/applications/xplus4.desktop
+ rm -f /usr/share/applications/xpet.desktop
+ rm -f /usr/share/applications/xcbm{2,5x0}.desktop
+ rm -f /usr/share/applications/xvic.desktop
+ rm -f /usr/share/applications/vsid.desktop
+
+install-data-hook: install-icons install-desktop-files
update-desktop-database
-install-data-hook: install-icons
+uninstall-hook: uninstall-icons uninstall-desktop-files
+ update-desktop-database
-uninstall-hook: uninstall-icons
-
endif
# The *.ico and *.res files are currently generated in
Copied: branches/compyx/desktop-icons/vice/data/common/vsid.desktop (from rev 45480, branches/compyx/desktop-icons/vice/build/debian/vsid.desktop)
===================================================================
--- branches/compyx/desktop-icons/vice/data/common/vsid.desktop (rev 0)
+++ branches/compyx/desktop-icons/vice/data/common/vsid.desktop 2025-02-12 18:42:45 UTC (rev 45484)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=VICE (vsid)
+Comment=SID Player
+Exec=vsid
+Terminal=false
+Icon=vice-vsid
+Categories=Audio;AudioVideo;Emulator;
Copied: branches/compyx/desktop-icons/vice/data/common/x128.desktop (from rev 45480, branches/compyx/desktop-icons/vice/build/debian/x128.desktop)
===================================================================
--- branches/compyx/desktop-icons/vice/data/common/x128.desktop (rev 0)
+++ branches/compyx/desktop-icons/vice/data/common/x128.desktop 2025-02-12 18:42:45 UTC (rev 45484)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=VICE (x128)
+Comment=Commodore 128 emulator
+Exec=x128
+Terminal=false
+Icon=vice-x128
+Categories=Game;Emulator;
Added: branches/compyx/desktop-icons/vice/data/common/x64.desktop
===================================================================
--- branches/compyx/desktop-icons/vice/data/common/x64.desktop (rev 0)
+++ branches/compyx/desktop-icons/vice/data/common/x64.desktop 2025-02-12 18:42:45 UTC (rev 45484)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=VICE (x64)
+Comment=Commodore 64 emulator
+Exec=x64
+Terminal=false
+Icon=vice-x64
+Categories=Game;Emulator;
Copied: branches/compyx/desktop-icons/vice/data/common/x64dtv.desktop (from rev 45480, branches/compyx/desktop-icons/vice/build/debian/x64dtv.desktop)
===================================================================
--- branches/compyx/desktop-icons/vice/data/common/x64dtv.desktop (rev 0)
+++ branches/compyx/desktop-icons/vice/data/common/x64dtv.desktop 2025-02-12 18:42:45 UTC (rev 45484)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=VICE (x64dtv)
+Comment=C64DTV emulator
+Exec=x64dtv
+Terminal=false
+Icon=vice-x64dtv
+Categories=Game;Emulator;
Copied: branches/compyx/desktop-icons/vice/data/common/x64sc.desktop (from rev 45480, branches/compyx/desktop-icons/vice/build/debian/x64sc.desktop)
===================================================================
--- branches/compyx/desktop-icons/vice/data/common/x64sc.desktop (rev 0)
+++ branches/compyx/desktop-icons/vice/data/common/x64sc.desktop 2025-02-12 18:42:45 UTC (rev 45484)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=VICE (x64sc)
+Comment=Commodore 64 emulator
+Exec=x64sc
+Terminal=false
+Icon=vice-x64
+Categories=Game;Emulator;
Copied: branches/compyx/desktop-icons/vice/data/common/xcbm2.desktop (from rev 45480, branches/compyx/desktop-icons/vice/build/debian/xcbm2.desktop)
===================================================================
--- branches/compyx/desktop-icons/vice/data/common/xcbm2.desktop (rev 0)
+++ branches/compyx/desktop-icons/vice/data/common/xcbm2.desktop 2025-02-12 18:42:45 UTC (rev 45484)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=VICE (xcbm2)
+Comment=Commodore CBM-II (600/700/B) emulator
+Exec=xcbm2
+Terminal=false
+Icon=vice-xcbm2
+Categories=Game;Emulator;
Copied: branches/compyx/desktop-icons/vice/data/common/xcbm5x0.desktop (from rev 45480, branches/compyx/desktop-icons/vice/build/debian/xcbm5x0.desktop)
===================================================================
--- branches/compyx/desktop-icons/vice/data/common/xcbm5x0.desktop (rev 0)
+++ branches/compyx/desktop-icons/vice/data/common/xcbm5x0.desktop 2025-02-12 18:42:45 UTC (rev 45484)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=VICE (xcbm5x0)
+Comment=Commodore CBM-II (500/P) emulator
+Exec=xcbm5x0
+Terminal=false
+Icon=vice-xcbm2
+Categories=Game;Emulator;
Copied: branches/compyx/desktop-icons/vice/data/common/xpet.desktop (from rev 45480, branches/compyx/desktop-icons/vice/build/debian/xpet.desktop)
===================================================================
--- branches/compyx/desktop-icons/vice/data/common/xpet.desktop (rev 0)
+++ branches/compyx/desktop-icons/vice/data/common/xpet.desktop 2025-02-12 18:42:45 UTC (rev 45484)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=VICE (xpet)
+Comment=Commodore PET emulator
+Exec=xpet
+Terminal=false
+Icon=vice-xpet
+Categories=Game;Emulator;
Copied: branches/compyx/desktop-icons/vice/data/common/xplus4.desktop (from rev 45480, branches/compyx/desktop-icons/vice/build/debian/xplus4.desktop)
===================================================================
--- branches/compyx/desktop-icons/vice/data/common/xplus4.desktop (rev 0)
+++ branches/compyx/desktop-icons/vice/data/common/xplus4.desktop 2025-02-12 18:42:45 UTC (rev 45484)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=VICE (xplus4)
+Comment=Commodore Plus/4 emulator
+Exec=xplus4
+Terminal=false
+Icon=vice-xplus4
+Categories=Game;Emulator;
Copied: branches/compyx/desktop-icons/vice/data/common/xscpu64.desktop (from rev 45480, branches/compyx/desktop-icons/vice/build/debian/xscpu64.desktop)
===================================================================
--- branches/compyx/desktop-icons/vice/data/common/xscpu64.desktop (rev 0)
+++ branches/compyx/desktop-icons/vice/data/common/xscpu64.desktop 2025-02-12 18:42:45 UTC (rev 45484)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=VICE (xscpu64)
+Comment=Commodore 64 SuperCPU emulator
+Exec=xscpu64
+Terminal=false
+Icon=vice-xscpu64
+Categories=Game;Emulator;
Copied: branches/compyx/desktop-icons/vice/data/common/xvic.desktop (from rev 45480, branches/compyx/desktop-icons/vice/build/debian/xvic.desktop)
===================================================================
--- branches/compyx/desktop-icons/vice/data/common/xvic.desktop (rev 0)
+++ branches/compyx/desktop-icons/vice/data/common/xvic.desktop 2025-02-12 18:42:45 UTC (rev 45484)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=VICE (xvic)
+Comment=Commodore VIC-20 emulator
+Exec=xvic
+Terminal=false
+Icon=vice-xvic
+Categories=Game;Emulator;
Modified: branches/compyx/desktop-icons/vice/src/arch/gtk3/data/Makefile.am
===================================================================
--- branches/compyx/desktop-icons/vice/src/arch/gtk3/data/Makefile.am 2025-02-12 09:46:02 UTC (rev 45483)
+++ branches/compyx/desktop-icons/vice/src/arch/gtk3/data/Makefile.am 2025-02-12 18:42:45 UTC (rev 45484)
@@ -3,4 +3,4 @@
# The per-OS files are in subdirs and the things needed for every OS are
# handled here.
-SUBDIRS = macos unix win32
+SUBDIRS = macos win32
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <co...@us...> - 2025-02-12 09:46:03
|
Revision: 45483
http://sourceforge.net/p/vice-emu/code/45483
Author: compyx
Date: 2025-02-12 09:46:02 +0000 (Wed, 12 Feb 2025)
Log Message:
-----------
Add install/uninstall hooks for icon files
Use `xdg-icon-resource` to install/uninstall icon files and update the icon
cache with `update-desktop-database`.
Make configure check for `update-desktop-database` (in the `desktop-file-utils`
package on Debian).
Modified Paths:
--------------
branches/compyx/desktop-icons/vice/configure.ac
branches/compyx/desktop-icons/vice/data/common/Makefile.am
Modified: branches/compyx/desktop-icons/vice/configure.ac
===================================================================
--- branches/compyx/desktop-icons/vice/configure.ac 2025-02-11 15:31:51 UTC (rev 45482)
+++ branches/compyx/desktop-icons/vice/configure.ac 2025-02-12 09:46:02 UTC (rev 45483)
@@ -1774,6 +1774,11 @@
if test x"$XDG_ICON_RESOURCE" = "xno"; then
AC_MSG_ERROR([XDG desktop files requested but required tool xdg-icon-resource is missing. Please install xdg-utils.])
fi
+ dnl Check for update-desktop-database
+ AC_CHECK_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, update-desktop-database, no)
+ if test x"$UPDATE_DESKTOP_DATABASE" = "xno"; then
+ AC_MSG_ERROR([XDG desktop files requested but required tool update-desktop-database is missing. Please install desktop-file-utils.])
+ fi
dnl We got the UI + OS + tools:
USE_DESKTOP_FILES="yes"
Modified: branches/compyx/desktop-icons/vice/data/common/Makefile.am
===================================================================
--- branches/compyx/desktop-icons/vice/data/common/Makefile.am 2025-02-11 15:31:51 UTC (rev 45482)
+++ branches/compyx/desktop-icons/vice/data/common/Makefile.am 2025-02-12 09:46:02 UTC (rev 45483)
@@ -118,6 +118,97 @@
common_DATA += $(GRESOURCE_TARGET)
+
+if INSTALL_DESKTOP_FILES
+.PHONY: install-icons uinstall-icons
+
+# Install icon files in their proper place. The default context is 'apps' and
+# the default mode is 'system' when running as root and 'user' when not running
+# as root, both defaults are what we want.
+install-icons:
+ xdg-icon-resource install --size 32 $(top_srcdir)/data/common/vice-x64_32.png vice-x64
+ xdg-icon-resource install --size 48 $(top_srcdir)/data/common/vice-x64_48.png vice-x64
+ xdg-icon-resource install --size 64 $(top_srcdir)/data/common/vice-x64_64.png vice-x64
+ xdg-icon-resource install --size 256 $(top_srcdir)/data/common/vice-x64_256.png vice-x64
+ xdg-icon-resource install --size 32 $(top_srcdir)/data/common/vice-x64dtv_32.png vice-x64dtv
+ xdg-icon-resource install --size 48 $(top_srcdir)/data/common/vice-x64dtv_48.png vice-x64dtv
+ xdg-icon-resource install --size 64 $(top_srcdir)/data/common/vice-x64dtv_64.png vice-x64dtv
+ xdg-icon-resource install --size 256 $(top_srcdir)/data/common/vice-x64dtv_256.png vice-x64dtv
+ xdg-icon-resource install --size 32 $(top_srcdir)/data/common/vice-xscpu64_32.png vice-xscpu64
+ xdg-icon-resource install --size 48 $(top_srcdir)/data/common/vice-xscpu64_48.png vice-xscpu64
+ xdg-icon-resource install --size 64 $(top_srcdir)/data/common/vice-xscpu64_64.png vice-xscpu64
+ xdg-icon-resource install --size 256 $(top_srcdir)/data/common/vice-xscpu64_256.png vice-xscpu64
+ xdg-icon-resource install --size 32 $(top_srcdir)/data/common/vice-x128_32.png vice-x128
+ xdg-icon-resource install --size 48 $(top_srcdir)/data/common/vice-x128_48.png vice-x128
+ xdg-icon-resource install --size 64 $(top_srcdir)/data/common/vice-x128_64.png vice-x128
+ xdg-icon-resource install --size 256 $(top_srcdir)/data/common/vice-x128_256.png vice-x128
+ xdg-icon-resource install --size 32 $(top_srcdir)/data/common/vice-xplus4_32.png vice-xplus4
+ xdg-icon-resource install --size 48 $(top_srcdir)/data/common/vice-xplus4_48.png vice-xplus4
+ xdg-icon-resource install --size 64 $(top_srcdir)/data/common/vice-xplus4_64.png vice-xplus4
+ xdg-icon-resource install --size 256 $(top_srcdir)/data/common/vice-xplus4_256.png vice-xplus4
+ xdg-icon-resource install --size 32 $(top_srcdir)/data/common/vice-xvic_32.png vice-xvic
+ xdg-icon-resource install --size 48 $(top_srcdir)/data/common/vice-xvic_48.png vice-xvic
+ xdg-icon-resource install --size 64 $(top_srcdir)/data/common/vice-xvic_64.png vice-xvic
+ xdg-icon-resource install --size 256 $(top_srcdir)/data/common/vice-xvic_256.png vice-xvic
+ xdg-icon-resource install --size 32 $(top_srcdir)/data/common/vice-xpet_32.png vice-xpet
+ xdg-icon-resource install --size 48 $(top_srcdir)/data/common/vice-xpet_48.png vice-xpet
+ xdg-icon-resource install --size 64 $(top_srcdir)/data/common/vice-xpet_64.png vice-xpet
+ xdg-icon-resource install --size 256 $(top_srcdir)/data/common/vice-xpet_256.png vice-xpet
+ xdg-icon-resource install --size 32 $(top_srcdir)/data/common/vice-xcbm2_32.png vice-xcbm2
+ xdg-icon-resource install --size 48 $(top_srcdir)/data/common/vice-xcbm2_48.png vice-xcbm2
+ xdg-icon-resource install --size 64 $(top_srcdir)/data/common/vice-xcbm2_64.png vice-xcbm2
+ xdg-icon-resource install --size 256 $(top_srcdir)/data/common/vice-xcbm2_256.png vice-xcbm2
+ xdg-icon-resource install --size 32 $(top_srcdir)/data/common/vice-vsid_32.png vice-vsid
+ xdg-icon-resource install --size 48 $(top_srcdir)/data/common/vice-vsid_48.png vice-vsid
+ xdg-icon-resource install --size 64 $(top_srcdir)/data/common/vice-vsid_64.png vice-vsid
+ xdg-icon-resource install --size 256 $(top_srcdir)/data/common/vice-vsid_256.png vice-vsid
+ update-desktop-database
+
+uninstall-icons:
+ xdg-icon-resource uninstall --size 32 vice-x64
+ xdg-icon-resource uninstall --size 48 vice-x64
+ xdg-icon-resource uninstall --size 64 vice-x64
+ xdg-icon-resource uninstall --size 256 vice-x64
+ xdg-icon-resource uninstall --size 32 vice-x64dtv
+ xdg-icon-resource uninstall --size 48 vice-x64dtv
+ xdg-icon-resource uninstall --size 64 vice-x64dtv
+ xdg-icon-resource uninstall --size 256 vice-x64dtv
+ xdg-icon-resource uninstall --size 32 vice-xscpu64
+ xdg-icon-resource uninstall --size 48 vice-xscpu64
+ xdg-icon-resource uninstall --size 64 vice-xscpu64
+ xdg-icon-resource uninstall --size 256 vice-xscpu64
+ xdg-icon-resource uninstall --size 32 vice-x128
+ xdg-icon-resource uninstall --size 48 vice-x128
+ xdg-icon-resource uninstall --size 64 vice-x128
+ xdg-icon-resource uninstall --size 256 vice-x128
+ xdg-icon-resource uninstall --size 32 vice-xplus4
+ xdg-icon-resource uninstall --size 48 vice-xplus4
+ xdg-icon-resource uninstall --size 64 vice-xplus4
+ xdg-icon-resource uninstall --size 256 vice-xplus4
+ xdg-icon-resource uninstall --size 32 vice-vic
+ xdg-icon-resource uninstall --size 48 vice-xvic
+ xdg-icon-resource uninstall --size 64 vice-xvic
+ xdg-icon-resource uninstall --size 256 vice-xvic
+ xdg-icon-resource uninstall --size 32 vice-xpet
+ xdg-icon-resource uninstall --size 48 vice-xpet
+ xdg-icon-resource uninstall --size 64 vice-xpet
+ xdg-icon-resource uninstall --size 256 vice-xpet
+ xdg-icon-resource uninstall --size 32 vice-xcbm2
+ xdg-icon-resource uninstall --size 48 vice-xcbm2
+ xdg-icon-resource uninstall --size 64 vice-xcbm2
+ xdg-icon-resource uninstall --size 256 vice-xcbm2
+ xdg-icon-resource uninstall --size 32 vice-vsid
+ xdg-icon-resource uninstall --size 48 vice-vsid
+ xdg-icon-resource uninstall --size 64 vice-vsid
+ xdg-icon-resource uninstall --size 256 vice-vsid
+ update-desktop-database
+
+install-data-hook: install-icons
+
+uninstall-hook: uninstall-icons
+
+endif
+
# The *.ico and *.res files are currently generated in
# src/arch/gtk3/data/win32/Makefile.am, but the plan is to move that to here
# to also be able to generate the files for linking with SDL binaries on Win32
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <co...@us...> - 2025-02-11 15:31:53
|
Revision: 45482
http://sourceforge.net/p/vice-emu/code/45482
Author: compyx
Date: 2025-02-11 15:31:51 +0000 (Tue, 11 Feb 2025)
Log Message:
-----------
Don't install the icon files into VICE_DATADIR when --enable-desktop-files
We'll be installing the icon files in their proper place at /usr/share/icons
with install hooks utilizing xdg-icon-resource, and the icons for the fallback
gtk_window_set_icon() are stored in the GResource bundle.
Due to the latter we may not have to install the icon files into VICE_DATADIR
at all for Gtk3.
Modified Paths:
--------------
branches/compyx/desktop-icons/vice/data/common/Makefile.am
Modified: branches/compyx/desktop-icons/vice/data/common/Makefile.am
===================================================================
--- branches/compyx/desktop-icons/vice/data/common/Makefile.am 2025-02-11 07:50:18 UTC (rev 45481)
+++ branches/compyx/desktop-icons/vice/data/common/Makefile.am 2025-02-11 15:31:51 UTC (rev 45482)
@@ -82,9 +82,16 @@
PetMe64.ttf \
PetMe.ttf
+# Don't install icon files into VICE data dir if we have --enable-desktop-files,
+# we use install hooks with xdg-icon-resource for those:
+if INSTALL_DESKTOP_FILES
+common_DATA = $(logo_files) \
+ $(font_files)
+else
common_DATA = $(icon_files) \
$(logo_files) \
$(font_files)
+endif
EXTRA_DIST = $(icon_files) \
$(logo_files) \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <co...@us...> - 2025-02-11 07:50:19
|
Revision: 45481
http://sourceforge.net/p/vice-emu/code/45481
Author: compyx
Date: 2025-02-11 07:50:18 +0000 (Tue, 11 Feb 2025)
Log Message:
-----------
configure: check for `xdg-icon-resource` with `--enable-desktop-files`
We'll need the `xdg-icon-resource` program to install icons at their correct
location and update the desktop icon cache.
Modified Paths:
--------------
branches/compyx/desktop-icons/vice/configure.ac
Modified: branches/compyx/desktop-icons/vice/configure.ac
===================================================================
--- branches/compyx/desktop-icons/vice/configure.ac 2025-02-10 23:31:34 UTC (rev 45480)
+++ branches/compyx/desktop-icons/vice/configure.ac 2025-02-11 07:50:18 UTC (rev 45481)
@@ -1764,12 +1764,16 @@
if test x"$is_unix_macos" = "xyes"; then
AC_MSG_ERROR([XDG desktop files requested but OS is MacOS.])
fi
- dnl Check for xdg-desktop-menu
+ dnl Check for xdg-desktop-menu (Do we need this anymore?)
AC_CHECK_PROG(XDG_DESKTOP_MENU, xdg-desktop-menu, xdg-desktop-menu, no)
- echo "$XDG_DESKTOP_MENU"
if test x"$XDG_DESKTOP_MENU" = "xno"; then
AC_MSG_ERROR([XDG desktop files requested but required tool xdg-desktop-menu is missing. Please install xgd-utils.])
fi
+ dnl Check for xdg-icon-resource
+ AC_CHECK_PROG(XDG_ICON_RESOURCE, xdg-icon-resource, xdg-icon-resource, no)
+ if test x"$XDG_ICON_RESOURCE" = "xno"; then
+ AC_MSG_ERROR([XDG desktop files requested but required tool xdg-icon-resource is missing. Please install xdg-utils.])
+ fi
dnl We got the UI + OS + tools:
USE_DESKTOP_FILES="yes"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <co...@us...> - 2025-02-10 23:31:35
|
Revision: 45480
http://sourceforge.net/p/vice-emu/code/45480
Author: compyx
Date: 2025-02-10 23:31:34 +0000 (Mon, 10 Feb 2025)
Log Message:
-----------
SDL: fix PNG icon loading
Update `archdep_icon_path()` to use the new file names for the application
icons.
Modified Paths:
--------------
branches/compyx/desktop-icons/vice/src/arch/shared/archdep_icon_path.c
Modified: branches/compyx/desktop-icons/vice/src/arch/shared/archdep_icon_path.c
===================================================================
--- branches/compyx/desktop-icons/vice/src/arch/shared/archdep_icon_path.c 2025-02-10 21:57:10 UTC (rev 45479)
+++ branches/compyx/desktop-icons/vice/src/arch/shared/archdep_icon_path.c 2025-02-10 23:31:34 UTC (rev 45480)
@@ -47,8 +47,8 @@
*/
char *archdep_app_icon_path_png(int size)
{
- char buffer[256];
- char *path = NULL;
+ char buffer[256];
+ char *path = NULL;
const char *icon;
/*
@@ -58,39 +58,39 @@
switch (machine_class) {
case VICE_MACHINE_C64: /* fall through */
case VICE_MACHINE_C64SC:
- icon = "C64";
+ icon = "x64";
break;
case VICE_MACHINE_C64DTV:
- icon = "DTV";
+ icon = "x64dtv";
break;
case VICE_MACHINE_SCPU64:
- icon = "SCPU";
+ icon = "xscpu64";
break;
case VICE_MACHINE_C128:
- icon = "C128";
+ icon = "x128";
break;
case VICE_MACHINE_PET:
- icon = "PET";
+ icon = "xpet";
break;
case VICE_MACHINE_VIC20:
- icon = "VIC20";
+ icon = "xvic";
break;
case VICE_MACHINE_CBM5x0: /* fall through */
case VICE_MACHINE_CBM6x0:
- icon = "CBM2";
+ icon = "xcbm2";
break;
case VICE_MACHINE_PLUS4:
- icon = "Plus4";
+ icon = "xplus4";
break;
case VICE_MACHINE_VSID:
- icon = "SID";
+ icon = "vsid";
break;
default:
- icon = "unknown-emulator-machine-class";
+ icon = "error";
}
- snprintf(buffer, sizeof(buffer), "%s_%d.png", icon, size);
- buffer[sizeof(buffer) - 1] = '\0';
+ snprintf(buffer, sizeof buffer, "vice-%s_%d.png", icon, size);
+ buffer[sizeof buffer - 1u] = '\0';
sysfile_locate(buffer, "common", &path);
return path;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <co...@us...> - 2025-02-10 21:57:11
|
Revision: 45479
http://sourceforge.net/p/vice-emu/code/45479
Author: compyx
Date: 2025-02-10 21:57:10 +0000 (Mon, 10 Feb 2025)
Log Message:
-----------
Gtk3: fix Windows icons
Update build system to use the updated icon file names for Windows builds.
Modified Paths:
--------------
branches/compyx/desktop-icons/vice/src/arch/gtk3/data/win32/Makefile.am
Modified: branches/compyx/desktop-icons/vice/src/arch/gtk3/data/win32/Makefile.am
===================================================================
--- branches/compyx/desktop-icons/vice/src/arch/gtk3/data/win32/Makefile.am 2025-02-10 17:18:14 UTC (rev 45478)
+++ branches/compyx/desktop-icons/vice/src/arch/gtk3/data/win32/Makefile.am 2025-02-10 21:57:10 UTC (rev 45479)
@@ -11,74 +11,74 @@
# TODO: check if we can use patsubst here, to simplify the rules a bit.
-X64SC_ICONS = $(top_srcdir)/data/common/C64_16.png \
- $(top_srcdir)/data/common/C64_24.png \
- $(top_srcdir)/data/common/C64_32.png \
- $(top_srcdir)/data/common/C64_48.png \
- $(top_srcdir)/data/common/C64_64.png \
- $(top_srcdir)/data/common/C64_256.png
+X64SC_ICONS = $(top_srcdir)/data/common/vice-x64_16.png \
+ $(top_srcdir)/data/common/vice-x64_24.png \
+ $(top_srcdir)/data/common/vice-x64_32.png \
+ $(top_srcdir)/data/common/vice-x64_48.png \
+ $(top_srcdir)/data/common/vice-x64_64.png \
+ $(top_srcdir)/data/common/vice-x64_256.png
if SUPPORT_X64
X64_ICONS = $(X64SC_ICONS)
endif
-X64DTV_ICONS = $(top_srcdir)/data/common/DTV_16.png \
- $(top_srcdir)/data/common/DTV_24.png \
- $(top_srcdir)/data/common/DTV_32.png \
- $(top_srcdir)/data/common/DTV_48.png \
- $(top_srcdir)/data/common/DTV_64.png \
- $(top_srcdir)/data/common/DTV_256.png
+X64DTV_ICONS = $(top_srcdir)/data/common/vice-x64dtv_16.png \
+ $(top_srcdir)/data/common/vice-x64dtv_24.png \
+ $(top_srcdir)/data/common/vice-x64dtv_32.png \
+ $(top_srcdir)/data/common/vice-x64dtv_48.png \
+ $(top_srcdir)/data/common/vice-x64dtv_64.png \
+ $(top_srcdir)/data/common/vice-x64dtv_256.png
-XSCPU64_ICONS = $(top_srcdir)/data/common/SCPU_16.png \
- $(top_srcdir)/data/common/SCPU_24.png \
- $(top_srcdir)/data/common/SCPU_32.png \
- $(top_srcdir)/data/common/SCPU_48.png \
- $(top_srcdir)/data/common/SCPU_64.png \
- $(top_srcdir)/data/common/SCPU_256.png
+XSCPU64_ICONS = $(top_srcdir)/data/common/vice-xscpu64_16.png \
+ $(top_srcdir)/data/common/vice-xscpu64_24.png \
+ $(top_srcdir)/data/common/vice-xscpu64_32.png \
+ $(top_srcdir)/data/common/vice-xscpu64_48.png \
+ $(top_srcdir)/data/common/vice-xscpu64_64.png \
+ $(top_srcdir)/data/common/vice-xscpu64_256.png
-X128_ICONS = $(top_srcdir)/data/common/C128_16.png \
- $(top_srcdir)/data/common/C128_24.png \
- $(top_srcdir)/data/common/C128_32.png \
- $(top_srcdir)/data/common/C128_48.png \
- $(top_srcdir)/data/common/C128_64.png \
- $(top_srcdir)/data/common/C128_256.png
+X128_ICONS = $(top_srcdir)/data/common/vice-x128_16.png \
+ $(top_srcdir)/data/common/vice-x128_24.png \
+ $(top_srcdir)/data/common/vice-x128_32.png \
+ $(top_srcdir)/data/common/vice-x128_48.png \
+ $(top_srcdir)/data/common/vice-x128_64.png \
+ $(top_srcdir)/data/common/vice-x128_256.png
-XVIC_ICONS = $(top_srcdir)/data/common/VIC20_16.png \
- $(top_srcdir)/data/common/VIC20_24.png \
- $(top_srcdir)/data/common/VIC20_32.png \
- $(top_srcdir)/data/common/VIC20_48.png \
- $(top_srcdir)/data/common/VIC20_64.png \
- $(top_srcdir)/data/common/VIC20_256.png
+XVIC_ICONS = $(top_srcdir)/data/common/vice-xvic_16.png \
+ $(top_srcdir)/data/common/vice-xvic_24.png \
+ $(top_srcdir)/data/common/vice-xvic_32.png \
+ $(top_srcdir)/data/common/vice-xvic_48.png \
+ $(top_srcdir)/data/common/vice-xvic_64.png \
+ $(top_srcdir)/data/common/vice-xvic_256.png
-XPLUS4_ICONS = $(top_srcdir)/data/common/Plus4_16.png \
- $(top_srcdir)/data/common/Plus4_24.png \
- $(top_srcdir)/data/common/Plus4_32.png \
- $(top_srcdir)/data/common/Plus4_48.png \
- $(top_srcdir)/data/common/Plus4_64.png \
- $(top_srcdir)/data/common/Plus4_256.png
+XPLUS4_ICONS = $(top_srcdir)/data/common/vice-xplus4_16.png \
+ $(top_srcdir)/data/common/vice-xplus4_24.png \
+ $(top_srcdir)/data/common/vice-xplus4_32.png \
+ $(top_srcdir)/data/common/vice-xplus4_48.png \
+ $(top_srcdir)/data/common/vice-xplus4_64.png \
+ $(top_srcdir)/data/common/vice-xplus4_256.png
-XPET_ICONS = $(top_srcdir)/data/common/PET_16.png \
- $(top_srcdir)/data/common/PET_24.png \
- $(top_srcdir)/data/common/PET_32.png \
- $(top_srcdir)/data/common/PET_48.png \
- $(top_srcdir)/data/common/PET_64.png \
- $(top_srcdir)/data/common/PET_256.png
+XPET_ICONS = $(top_srcdir)/data/common/vice-xpet_16.png \
+ $(top_srcdir)/data/common/vice-xpet_24.png \
+ $(top_srcdir)/data/common/vice-xpet_32.png \
+ $(top_srcdir)/data/common/vice-xpet_48.png \
+ $(top_srcdir)/data/common/vice-xpet_64.png \
+ $(top_srcdir)/data/common/vice-xpet_256.png
-XCBM2_ICONS = $(top_srcdir)/data/common/CBM2_16.png \
- $(top_srcdir)/data/common/CBM2_24.png \
- $(top_srcdir)/data/common/CBM2_32.png \
- $(top_srcdir)/data/common/CBM2_48.png \
- $(top_srcdir)/data/common/CBM2_64.png \
- $(top_srcdir)/data/common/CBM2_256.png
+XCBM2_ICONS = $(top_srcdir)/data/common/vice-xcbm2_16.png \
+ $(top_srcdir)/data/common/vice-xcbm2_24.png \
+ $(top_srcdir)/data/common/vice-xcbm2_32.png \
+ $(top_srcdir)/data/common/vice-xcbm2_48.png \
+ $(top_srcdir)/data/common/vice-xcbm2_64.png \
+ $(top_srcdir)/data/common/vice-xcbm2_256.png
XCBM5x0_ICONS = $(XCBM2_ICONS)
-VSID_ICONS = $(top_srcdir)/data/common/SID_16.png \
- $(top_srcdir)/data/common/SID_24.png \
- $(top_srcdir)/data/common/SID_32.png \
- $(top_srcdir)/data/common/SID_48.png \
- $(top_srcdir)/data/common/SID_64.png \
- $(top_srcdir)/data/common/SID_256.png
+VSID_ICONS = $(top_srcdir)/data/common/vice-vsid_16.png \
+ $(top_srcdir)/data/common/vice-vsid_24.png \
+ $(top_srcdir)/data/common/vice-vsid_32.png \
+ $(top_srcdir)/data/common/vice-vsid_48.png \
+ $(top_srcdir)/data/common/vice-vsid_64.png \
+ $(top_srcdir)/data/common/vice-vsid_256.png
# Do we use the old x64 emu?
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <co...@us...> - 2025-02-10 17:18:18
|
Revision: 45478
http://sourceforge.net/p/vice-emu/code/45478
Author: compyx
Date: 2025-02-10 17:18:14 +0000 (Mon, 10 Feb 2025)
Log Message:
-----------
Rename desktop icons
Rename desktop icon png/svg files to more closely follow the XDG specs and
update GResource file for the fallback icons on X11. Breaks everything except
the X11 fallback (which doesn't work on a modern Gnome install anyway).
Modified Paths:
--------------
branches/compyx/desktop-icons/vice/data/common/Makefile.am
branches/compyx/desktop-icons/vice/data/common/vice.gresource.xml
Added Paths:
-----------
branches/compyx/desktop-icons/vice/data/common/vice-vsid_1024.svg
branches/compyx/desktop-icons/vice/data/common/vice-vsid_16.png
branches/compyx/desktop-icons/vice/data/common/vice-vsid_24.png
branches/compyx/desktop-icons/vice/data/common/vice-vsid_256.png
branches/compyx/desktop-icons/vice/data/common/vice-vsid_32.png
branches/compyx/desktop-icons/vice/data/common/vice-vsid_48.png
branches/compyx/desktop-icons/vice/data/common/vice-vsid_64.png
branches/compyx/desktop-icons/vice/data/common/vice-x128_1024.svg
branches/compyx/desktop-icons/vice/data/common/vice-x128_16.png
branches/compyx/desktop-icons/vice/data/common/vice-x128_24.png
branches/compyx/desktop-icons/vice/data/common/vice-x128_256.png
branches/compyx/desktop-icons/vice/data/common/vice-x128_32.png
branches/compyx/desktop-icons/vice/data/common/vice-x128_48.png
branches/compyx/desktop-icons/vice/data/common/vice-x128_64.png
branches/compyx/desktop-icons/vice/data/common/vice-x64_1024.svg
branches/compyx/desktop-icons/vice/data/common/vice-x64_16.png
branches/compyx/desktop-icons/vice/data/common/vice-x64_24.png
branches/compyx/desktop-icons/vice/data/common/vice-x64_256.png
branches/compyx/desktop-icons/vice/data/common/vice-x64_32.png
branches/compyx/desktop-icons/vice/data/common/vice-x64_48.png
branches/compyx/desktop-icons/vice/data/common/vice-x64_64.png
branches/compyx/desktop-icons/vice/data/common/vice-x64dtv_1024.svg
branches/compyx/desktop-icons/vice/data/common/vice-x64dtv_16.png
branches/compyx/desktop-icons/vice/data/common/vice-x64dtv_24.png
branches/compyx/desktop-icons/vice/data/common/vice-x64dtv_256.png
branches/compyx/desktop-icons/vice/data/common/vice-x64dtv_32.png
branches/compyx/desktop-icons/vice/data/common/vice-x64dtv_48.png
branches/compyx/desktop-icons/vice/data/common/vice-x64dtv_64.png
branches/compyx/desktop-icons/vice/data/common/vice-xcbm2_1024.svg
branches/compyx/desktop-icons/vice/data/common/vice-xcbm2_16.png
branches/compyx/desktop-icons/vice/data/common/vice-xcbm2_24.png
branches/compyx/desktop-icons/vice/data/common/vice-xcbm2_256.png
branches/compyx/desktop-icons/vice/data/common/vice-xcbm2_32.png
branches/compyx/desktop-icons/vice/data/common/vice-xcbm2_48.png
branches/compyx/desktop-icons/vice/data/common/vice-xcbm2_64.png
branches/compyx/desktop-icons/vice/data/common/vice-xpet_1024.svg
branches/compyx/desktop-icons/vice/data/common/vice-xpet_16.png
branches/compyx/desktop-icons/vice/data/common/vice-xpet_24.png
branches/compyx/desktop-icons/vice/data/common/vice-xpet_256.png
branches/compyx/desktop-icons/vice/data/common/vice-xpet_256.svg
branches/compyx/desktop-icons/vice/data/common/vice-xpet_32.png
branches/compyx/desktop-icons/vice/data/common/vice-xpet_48.png
branches/compyx/desktop-icons/vice/data/common/vice-xpet_64.png
branches/compyx/desktop-icons/vice/data/common/vice-xplus4_1024.svg
branches/compyx/desktop-icons/vice/data/common/vice-xplus4_16.png
branches/compyx/desktop-icons/vice/data/common/vice-xplus4_24.png
branches/compyx/desktop-icons/vice/data/common/vice-xplus4_256.png
branches/compyx/desktop-icons/vice/data/common/vice-xplus4_32.png
branches/compyx/desktop-icons/vice/data/common/vice-xplus4_48.png
branches/compyx/desktop-icons/vice/data/common/vice-xplus4_64.png
branches/compyx/desktop-icons/vice/data/common/vice-xscpu64_1024.svg
branches/compyx/desktop-icons/vice/data/common/vice-xscpu64_16.png
branches/compyx/desktop-icons/vice/data/common/vice-xscpu64_24.png
branches/compyx/desktop-icons/vice/data/common/vice-xscpu64_256.png
branches/compyx/desktop-icons/vice/data/common/vice-xscpu64_32.png
branches/compyx/desktop-icons/vice/data/common/vice-xscpu64_48.png
branches/compyx/desktop-icons/vice/data/common/vice-xscpu64_64.png
branches/compyx/desktop-icons/vice/data/common/vice-xvic_1024.svg
branches/compyx/desktop-icons/vice/data/common/vice-xvic_16.png
branches/compyx/desktop-icons/vice/data/common/vice-xvic_24.png
branches/compyx/desktop-icons/vice/data/common/vice-xvic_256.png
branches/compyx/desktop-icons/vice/data/common/vice-xvic_32.png
branches/compyx/desktop-icons/vice/data/common/vice-xvic_48.png
branches/compyx/desktop-icons/vice/data/common/vice-xvic_64.png
Removed Paths:
-------------
branches/compyx/desktop-icons/vice/data/common/C128_1024.svg
branches/compyx/desktop-icons/vice/data/common/C128_16.png
branches/compyx/desktop-icons/vice/data/common/C128_24.png
branches/compyx/desktop-icons/vice/data/common/C128_256.png
branches/compyx/desktop-icons/vice/data/common/C128_32.png
branches/compyx/desktop-icons/vice/data/common/C128_48.png
branches/compyx/desktop-icons/vice/data/common/C128_64.png
branches/compyx/desktop-icons/vice/data/common/C64_1024.svg
branches/compyx/desktop-icons/vice/data/common/C64_16.png
branches/compyx/desktop-icons/vice/data/common/C64_24.png
branches/compyx/desktop-icons/vice/data/common/C64_256.png
branches/compyx/desktop-icons/vice/data/common/C64_32.png
branches/compyx/desktop-icons/vice/data/common/C64_48.png
branches/compyx/desktop-icons/vice/data/common/C64_64.png
branches/compyx/desktop-icons/vice/data/common/CBM2_1024.svg
branches/compyx/desktop-icons/vice/data/common/CBM2_16.png
branches/compyx/desktop-icons/vice/data/common/CBM2_24.png
branches/compyx/desktop-icons/vice/data/common/CBM2_256.png
branches/compyx/desktop-icons/vice/data/common/CBM2_32.png
branches/compyx/desktop-icons/vice/data/common/CBM2_48.png
branches/compyx/desktop-icons/vice/data/common/CBM2_64.png
branches/compyx/desktop-icons/vice/data/common/DTV_1024.svg
branches/compyx/desktop-icons/vice/data/common/DTV_16.png
branches/compyx/desktop-icons/vice/data/common/DTV_24.png
branches/compyx/desktop-icons/vice/data/common/DTV_256.png
branches/compyx/desktop-icons/vice/data/common/DTV_32.png
branches/compyx/desktop-icons/vice/data/common/DTV_48.png
branches/compyx/desktop-icons/vice/data/common/DTV_64.png
branches/compyx/desktop-icons/vice/data/common/PET_1024.svg
branches/compyx/desktop-icons/vice/data/common/PET_16.png
branches/compyx/desktop-icons/vice/data/common/PET_24.png
branches/compyx/desktop-icons/vice/data/common/PET_256.png
branches/compyx/desktop-icons/vice/data/common/PET_256.svg
branches/compyx/desktop-icons/vice/data/common/PET_32.png
branches/compyx/desktop-icons/vice/data/common/PET_48.png
branches/compyx/desktop-icons/vice/data/common/PET_64.png
branches/compyx/desktop-icons/vice/data/common/Plus4_1024.svg
branches/compyx/desktop-icons/vice/data/common/Plus4_16.png
branches/compyx/desktop-icons/vice/data/common/Plus4_24.png
branches/compyx/desktop-icons/vice/data/common/Plus4_256.png
branches/compyx/desktop-icons/vice/data/common/Plus4_32.png
branches/compyx/desktop-icons/vice/data/common/Plus4_48.png
branches/compyx/desktop-icons/vice/data/common/Plus4_64.png
branches/compyx/desktop-icons/vice/data/common/SCPU_1024.svg
branches/compyx/desktop-icons/vice/data/common/SCPU_16.png
branches/compyx/desktop-icons/vice/data/common/SCPU_24.png
branches/compyx/desktop-icons/vice/data/common/SCPU_256.png
branches/compyx/desktop-icons/vice/data/common/SCPU_32.png
branches/compyx/desktop-icons/vice/data/common/SCPU_48.png
branches/compyx/desktop-icons/vice/data/common/SCPU_64.png
branches/compyx/desktop-icons/vice/data/common/SID_1024.svg
branches/compyx/desktop-icons/vice/data/common/SID_16.png
branches/compyx/desktop-icons/vice/data/common/SID_24.png
branches/compyx/desktop-icons/vice/data/common/SID_256.png
branches/compyx/desktop-icons/vice/data/common/SID_32.png
branches/compyx/desktop-icons/vice/data/common/SID_48.png
branches/compyx/desktop-icons/vice/data/common/SID_64.png
branches/compyx/desktop-icons/vice/data/common/VIC20_1024.svg
branches/compyx/desktop-icons/vice/data/common/VIC20_16.png
branches/compyx/desktop-icons/vice/data/common/VIC20_24.png
branches/compyx/desktop-icons/vice/data/common/VIC20_256.png
branches/compyx/desktop-icons/vice/data/common/VIC20_32.png
branches/compyx/desktop-icons/vice/data/common/VIC20_48.png
branches/compyx/desktop-icons/vice/data/common/VIC20_64.png
Deleted: branches/compyx/desktop-icons/vice/data/common/C128_1024.svg
===================================================================
--- branches/compyx/desktop-icons/vice/data/common/C128_1024.svg 2025-02-10 16:16:39 UTC (rev 45477)
+++ branches/compyx/desktop-icons/vice/data/common/C128_1024.svg 2025-02-10 17:18:14 UTC (rev 45478)
@@ -1,438 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.1"
- id="Layer_1"
- x="0px"
- y="0px"
- viewBox="0 0 1024 1024"
- style="enable-background:new 0 0 1024 1024;"
- xml:space="preserve"
- sodipodi:docname="C128_1024.svg"
- inkscape:export-filename="C:\src\vice\vice\data\common\C128_128.png"
- inkscape:export-xdpi="12.336111"
- inkscape:export-ydpi="12.336111"
- inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"><metadata
- id="metadata696"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
- id="defs694" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="2364"
- inkscape:window-height="1415"
- id="namedview692"
- showgrid="true"
- inkscape:zoom="0.97531385"
- inkscape:cx="316.67826"
- inkscape:cy="512"
- inkscape:window-x="187"
- inkscape:window-y="-9"
- inkscape:window-maximized="1"
- inkscape:current-layer="Layer_1" />
-<style
- type="text/css"
- id="style560">
- .st0{display:none;}
- .st1{display:inline;}
- .st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);}
- .st3{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
- .st4{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
- .st5{display:inline;fill-rule:evenodd;clip-rule:evenodd;fill:#8A88A3;}
- .st6{display:inline;fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_4_);}
- .st7{fill:#FFFFFF;}
- .st8{fill-rule:evenodd;clip-rule:evenodd;}
- .st9{fill-rule:evenodd;clip-rule:evenodd;fill:#3A3A3A;}
- .st10{display:inline;fill:#FFFFFF;}
- .st11{display:inline;opacity:0.3;fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_5_);enable-background:new ;}
- .st12{fill-rule:evenodd;clip-rule:evenodd;fill:#3D3D3D;}
- .st13{fill-rule:evenodd;clip-rule:evenodd;fill:#595959;}
- .st14{opacity:0.5;}
- .st15{fill:none;stroke:#000000;stroke-width:20;stroke-miterlimit:10;}
- .st16{fill:none;stroke:#FFFFFF;stroke-width:20;stroke-miterlimit:10;}
- .st17{font-family:'EurostileLTStd-BoldEx2';}
- .st18{font-size:175px;}
- .st19{enable-background:new ;}
- .st20{fill:none;stroke:#000000;stroke-miterlimit:10;}
-</style>
-<g
- id="Layer_1_1_"
- class="st0">
- <g
- class="st1"
- id="g583">
-
- <linearGradient
- id="SVGID_1_"
- gradientUnits="userSpaceOnUse"
- x1="334.2704"
- y1="873.824"
- x2="400.9372"
- y2="-48.8426"
- gradientTransform="matrix(1 0 0 -1 0 1024)">
- <stop
- offset="0"
- style="stop-color:#68372B"
- id="stop562" />
- <stop
- offset="1"
- style="stop-color:#352879"
- id="stop564" />
- </linearGradient>
- <path
- class="st2"
- d="M584.8,342.9v-187C547,146,521.1,142,483.3,142c-198.9,0-372,165.1-372,370c0,212.8,175,370,374,370 c35.8,0,55.7-4,99.4-15.9v-191C541,697,519.1,703,483.3,703c-109.4,0-194.9-91.5-194.9-194.9c0-105.4,83.5-194.9,192.9-194.9 C519.1,313.1,550.9,323,584.8,342.9L584.8,342.9z"
- id="path567" />
-
- <linearGradient
- id="SVGID_2_"
- gradientUnits="userSpaceOnUse"
- x1="731.5681"
- y1="902.5305"
- x2="798.2347"
- y2="-20.1362"
- gradientTransform="matrix(1 0 0 -1 0 1024)">
- <stop
- offset="0"
- style="stop-color:#68372B"
- id="stop569" />
- <stop
- offset="1"
- style="stop-color:#352879"
- id="stop571" />
- </linearGradient>
- <polygon
- class="st3"
- points="912.7,353.1 594.4,353.1 594.4,498.3 769.5,498.3 "
- id="polygon574" />
-
- <linearGradient
- id="SVGID_3_"
- gradientUnits="userSpaceOnUse"
- x1="713.7708"
- y1="901.2445"
- x2="780.4375"
- y2="-21.4221"
- gradientTransform="matrix(1 0 0 -1 0 1024)">
- <stop
- offset="0"
- style="stop-color:#68372B"
- id="stop576" />
- <stop
- offset="1"
- style="stop-color:#352879"
- id="stop578" />
- </linearGradient>
- <polygon
- class="st4"
- points="771.5,528.1 594.4,528.1 594.4,673.3 912.7,673.3 "
- id="polygon581" />
- </g>
-</g>
-<g
- id="Layer_12"
- class="st0">
- <rect
- class="st5"
- width="1024"
- height="1024"
- id="rect586" />
-</g>
-<g
- id="Layer_11_copy"
- class="st0">
-
- <linearGradient
- id="SVGID_4_"
- gradientUnits="userSpaceOnUse"
- x1="512.05"
- y1="1017.1594"
- x2="512.05"
- y2="689.3555"
- gradientTransform="matrix(1 0 0 -1 0 1024)">
- <stop
- offset="0"
- style="stop-color:#68372B"
- id="stop589" />
- <stop
- offset="0.7388"
- style="stop-color:#352879"
- id="stop591" />
- </linearGradient>
- <path
- class="st6"
- d="M267.1,1010H139.3C70.1,1010,14,953.9,14,884.7V139.3C14,70.1,70.1,14,139.3,14h745.5 c69.2,0,125.3,56.1,125.3,125.3v745.5c0,69.2-56.1,125.3-125.3,125.3H756.7"
- id="path594" />
- <g
- class="st1"
- id="g600">
- <polygon
- class="st7"
- points="641.3,914 641.3,657 524,657 524,798.4 "
- id="polygon596" />
- <polygon
- class="st7"
- points="500,800 500,657 382.7,657 382.7,914 "
- id="polygon598" />
- </g>
-</g>
-<g
- id="Layer_11_copy_2"
- class="st0">
- <g
- class="st1"
- id="g607">
- <path
- class="st8"
- d="M267.1,1010H139.3C70.1,1010,14,953.9,14,884.7V139.3C14,70.1,70.1,14,139.3,14h745.5 c69.2,0,125.3,56.1,125.3,125.3v745.5c0,69.2-56.1,125.3-125.3,125.3H756.7L267.1,1010L267.1,1010z"
- id="path603" />
- <path
- class="st9"
- d="M14,497V139.3C14,70.1,70.1,14,139.3,14H512L14,497z"
- id="path605" />
- </g>
- <polygon
- class="st10"
- points="639.3,896 639.3,643 523.8,643 523.8,782.1 "
- id="polygon609" />
- <polygon
- class="st10"
- points="500.2,783.7 500.2,643 384.7,643 384.7,896 "
- id="polygon611" />
-
- <linearGradient
- id="SVGID_5_"
- gradientUnits="userSpaceOnUse"
- x1="-509"
- y1="953.407"
- x2="-509"
- y2="103.1061"
- gradientTransform="matrix(1 0 0 -1 0 1024)">
- <stop
- offset="4.442563e-02"
- style="stop-color:#68372B"
- id="stop613" />
- <stop
- offset="0.7388"
- style="stop-color:#352879"
- id="stop615" />
- </linearGradient>
- <path
- class="st11"
- d="M-741.6,970H-863c-65.7,0-119-53.3-119-119V143c0-65.7,53.3-119,119-119h708c65.7,0,119,53.3,119,119v708 c0,65.7-53.3,119-119,119h-121.6"
- id="path618" />
-</g>
-<g
- id="Layer_11_copy_3"
- inkscape:export-xdpi="1.5420139"
- inkscape:export-ydpi="1.5420139">
- <path
- class="st12"
- d="M267.1,1010H139.3C70.1,1010,14,953.9,14,884.7V139.3C14,70.1,70.1,14,139.3,14h745.5 c69.2,0,125.3,56.1,125.3,125.3v745.5c0,69.2-56.1,125.3-125.3,125.3H756.7L267.1,1010L267.1,1010z"
- id="path621" />
- <path
- class="st13"
- d="M267.1,1010H139.3C70.1,1010,14,953.9,14,884.7V809h996v75.7c0,69.2-56.1,125.3-125.3,125.3h-128H267.1z"
- id="path623" />
- <g
- class="st14"
- id="g645">
- <line
- class="st15"
- x1="14"
- y1="620"
- x2="1010"
- y2="620"
- id="line625" />
- <line
- class="st16"
- x1="14"
- y1="640"
- x2="1010"
- y2="640"
- id="line627" />
- <line
- class="st15"
- x1="14"
- y1="660"
- x2="1010"
- y2="660"
- id="line629" />
- <line
- class="st16"
- x1="14"
- y1="680"
- x2="1010"
- y2="680"
- id="line631" />
- <line
- class="st15"
- x1="14"
- y1="700"
- x2="1010"
- y2="700"
- id="line633" />
- <line
- class="st16"
- x1="14"
- y1="720"
- x2="1010"
- y2="720"
- id="line635" />
- <line
- class="st15"
- x1="14"
- y1="740"
- x2="1010"
- y2="740"
- id="line637" />
- <line
- class="st16"
- x1="14"
- y1="760"
- x2="1010"
- y2="760"
- id="line639" />
- <line
- class="st15"
- x1="14"
- y1="780"
- x2="1010"
- y2="780"
- id="line641" />
- <line
- class="st16"
- x1="14"
- y1="800"
- x2="1010"
- y2="800"
- id="line643" />
- </g>
-</g>
-<g
- id="Layer_11"
- class="st0">
-</g>
-<g
- id="VIC20"
- class="st0">
- <text
- transform="matrix(1 0 0 1 118.6028 556.6257)"
- class="st10 st17 st18"
- id="text649">VIC20</text>
-</g>
-<g
- id="Plus4"
- class="st0">
- <text
- transform="matrix(1 0 0 1 168.3914 556.6257)"
- class="st10 st17 st18"
- id="text652">Plus4</text>
-</g>
-<g
- id="DTV"
- class="st0">
- <text
- transform="matrix(1 0 0 1 243.9006 556.6257)"
- class="st10 st17 st18"
- id="text655">DTV</text>
-</g>
-<g
- id="C64"
- class="st0">
- <text
- transform="matrix(1 0 0 1 246.177 556.6257)"
- class="st10 st17 st18"
- id="text658">C64</text>
-</g>
-<g
- id="SID"
- class="st0">
- <text
- transform="matrix(1 0 0 1 289.3142 556.6257)"
- class="st10 st17 st18"
- id="text661">SID</text>
-</g>
-<g
- id="PET"
- class="st0">
- <text
- transform="matrix(1 0 0 1 265.6008 556.6257)"
- class="st10 st17 st18"
- id="text664">PET</text>
-</g>
-<g
- id="CBM2"
- class="st0">
- <text
- transform="matrix(1 0 0 1 122.9768 556.6257)"
- class="st10 st17 st18"
- id="text667">CBM2</text>
-</g>
-<g
- id="SCPU"
- class="st0">
- <text
- transform="matrix(1 0 0 1 149.052 556.6257)"
- class="st10 st17 st18"
- id="text670">SCPU</text>
-</g>
-<g
- id="C128"
- transform="matrix(1.1231875,0,0,1.1231875,-68.118507,-68.750969)">
- <g
- class="st19"
- id="g681">
- <path
- class="st7"
- d="m 170.1,474.4 c 0,-18.6 5.2,-30 14.8,-36.8 9.6,-6.8 23.5,-9 41,-9 h 22.8 22.8 c 27.7,0 43.3,3 51.9,10.4 8.6,7.4 10.4,19.4 10.2,37.3 h -19.4 -19.4 v -1.8 -1.8 c 0,-4.6 -1.7,-7.5 -4.8,-9.3 -3.1,-1.8 -7.7,-2.5 -13.4,-2.5 h -21.2 -21.2 c -10.2,0 -16.3,2.4 -19.8,6.8 -3.5,4.4 -4.5,10.7 -4.5,18.6 v 6.8 6.8 c 0,9.2 1,15.5 4.2,19.6 3.2,4.1 8.8,5.8 18,5.8 h 20.7 20.7 c 8.8,0 14.4,-0.4 17.9,-2.8 3.5,-2.4 4.8,-6.8 4.8,-14.7 h 19.4 19.4 v 5.9 5.9 c 0,10.7 -1.9,20.2 -8.7,27.1 -6.8,6.9 -18.3,11.3 -37.8,11.3 h -31.3 -31.3 c -17.5,0 -31.5,-2.2 -41,-9 -9.5,-6.8 -14.8,-18.3 -14.8,-36.8 v -18.9 z"
- id="path673" />
- <path
- class="st7"
- d="m 439.7,460.4 -23.4,15 -23.4,15 -8.8,-12.7 -8.8,-12.7 26.9,-17.5 26.9,-17.5 h 23.2 23.2 v 63.4 63.4 h -17.9 -17.9 v -48.1 z"
- id="path675" />
- <path
- class="st7"
- d="m 530.7,513.6 c 0,-7.8 2.5,-14.3 8.2,-19 5.7,-4.7 14.5,-7.8 27,-8.6 l 22.2,-1.4 22.2,-1.4 c 14.2,-0.9 21.7,-1.4 25.8,-3.3 4.1,-1.9 4.5,-5.1 4.5,-11.4 0,-5.2 -0.3,-8.3 -3.6,-10.2 -3.3,-1.9 -9.8,-2.4 -22.3,-2.4 H 601.8 589 c -8.2,0 -13.6,0.6 -16.9,2.9 -3.3,2.3 -4.6,6.1 -4.6,12.7 v 2.7 2.7 h -18.4 -18.4 v -7.4 -7.4 c 0,-12.5 3.7,-20.9 11.7,-26.1 8,-5.2 20.5,-7.3 38,-7.3 h 25.6 25.6 c 18.2,0 29.7,2.7 36.6,8.7 6.9,6 9.3,15.3 9.3,28.5 0,18.6 -1.7,29.5 -9.1,36.1 -7.4,6.6 -20.4,8.7 -43.1,10 l -20,1.1 -20,1.1 c -8.1,0.4 -12.8,1.4 -15.5,3.8 -2.7,2.4 -3.3,6 -3.3,11.6 h 56.4 56.4 v 13.4 13.7 h -74.2 -74.2 v -21.5 -21.6 z"
- id="path677" />
- <path
- class="st7"
- d="m 703.1,516.4 c 0,-6.8 1.4,-12.1 4.9,-15.9 3.5,-3.8 9.2,-6.3 17.7,-7.5 v -0.2 -0.2 c -5.6,-1 -11.1,-3.1 -15.1,-7.3 -4,-4.2 -6.7,-10.3 -6.7,-19.3 v -3.6 -3.6 c 0,-14.2 3.1,-21.7 12.4,-25.8 9.3,-4.1 24.8,-4.5 49.8,-4.5 h 19.2 19.2 c 16.2,0 28,1.5 35.7,6.1 7.7,4.6 11.4,12.1 11.4,24 v 4.1 4.1 c 0,6.8 -0.8,12.5 -3.9,16.8 -3.1,4.3 -8.4,7.1 -17.3,8.2 v 0.2 0.2 c 6.6,1.8 12.1,4.2 16,8.4 3.9,4.2 6.2,9.9 6.2,18.6 v 5.1 5.1 c 0,10.6 -3.4,17.8 -9.7,22.3 -6.3,4.5 -15.6,6.4 -27.4,6.4 h -36.6 -36.6 c -13.6,0 -23.4,-2.6 -29.8,-7.7 -6.4,-5.1 -9.4,-12.8 -9.4,-22.9 V 522 Z m 97.7,14.3 c 6.6,0 10.3,-1 12.4,-3 2.1,-2 2.6,-5.3 2.6,-9.7 0,-4.9 -0.4,-8.1 -2.8,-10 -2.4,-1.9 -6.6,-2.6 -14.3,-2.6 H 777.9 757 c -7.7,0 -12,0.7 -14.3,2.6 -2.3,1.9 -2.8,5.1 -2.8,10 0,4.5 0.5,7.7 2.6,9.7 2.1,2 5.9,3 12.4,3 h 22.9 z m -0.9,-51.6 c 5.7,0 9.4,-1.1 11.7,-3.2 2.3,-2.1 3.2,-5 3.2,-8.6 0,-4.4 -1.3,-7.3 -3.5,-9.1 -2.2,-1.8 -5.1,-2.5 -8.4,-2.5 h -25.2 -25.2 c -3.3,0 -6.3,0.7 -8.4,2.5 -2.1,1.8 -3.5,4.7 -3.5,9.1 0,3.6 0.9,6.5 3.2,8.6 2.3,2.1 6,3.2 11.7,3.2 h 22.2 z"
- id="path679" />
- </g>
-</g>
-<g
- id="Layer_4"
- class="st0">
- <g
- class="st1"
- id="g688">
- <line
- class="st20"
- x1="134.8"
- y1="0"
- x2="134.8"
- y2="1024"
- id="line684" />
- <line
- class="st20"
- x1="889.2"
- y1="0"
- x2="889.2"
- y2="1024"
- id="line686" />
- </g>
-</g>
-</svg>
Deleted: branches/compyx/desktop-icons/vice/data/common/C128_16.png
===================================================================
(Binary files differ)
Deleted: branches/compyx/desktop-icons/vice/data/common/C128_24.png
===================================================================
(Binary files differ)
Deleted: branches/compyx/desktop-icons/vice/data/common/C128_256.png
===================================================================
(Binary files differ)
Deleted: branches/compyx/desktop-icons/vice/data/common/C128_32.png
===================================================================
(Binary files differ)
Deleted: branches/compyx/desktop-icons/vice/data/common/C128_48.png
===================================================================
(Binary files differ)
Deleted: branches/compyx/desktop-icons/vice/data/common/C128_64.png
===================================================================
(Binary files differ)
Deleted: branches/compyx/desktop-icons/vice/data/common/C64_1024.svg
===================================================================
--- branches/compyx/desktop-icons/vice/data/common/C64_1024.svg 2025-02-10 16:16:39 UTC (rev 45477)
+++ branches/compyx/desktop-icons/vice/data/common/C64_1024.svg 2025-02-10 17:18:14 UTC (rev 45478)
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
-<style type="text/css">
- .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#3D3D3D;}
- .st1{fill-rule:evenodd;clip-rule:evenodd;fill:#595959;}
- .st2{fill:#2B2B2B;}
- .st3{fill:#7C7C7C;}
- .st4{display:none;}
- .st5{display:inline;}
- .st6{fill:#FFFFFF;}
-</style>
-<g id="Layer_11_copy_3">
- <path class="st0" d="M267.1,1010h-63.9h-63.9c-34.6,0-65.9-14-88.6-36.7C28,950.6,14,919.3,14,884.7V512V139.3
- c0-34.6,14-65.9,36.7-88.6s54-36.7,88.6-36.7H512h372.7c34.6,0,65.9,14,88.6,36.7c22.7,22.7,36.7,54,36.7,88.6V512v372.7
- c0,34.6-14,65.9-36.7,88.6c-22.7,22.7-54,36.7-88.6,36.7h-64h-64H511.9H267.1z"/>
- <path class="st1" d="M267.1,1010H139.3C70.1,1010,14,953.9,14,884.7V809h996v75.7c0,69.2-56.1,125.3-125.3,125.3H756.7H267.1z"/>
- <g>
- <g>
- <rect x="14" y="610" class="st2" width="996" height="20"/>
- <rect x="14" y="630" class="st3" width="996" height="20"/>
- </g>
- <g>
- <rect x="14" y="650" class="st2" width="996" height="20"/>
- <rect x="14" y="670" class="st3" width="996" height="20"/>
- </g>
- <g>
- <rect x="14" y="690" class="st2" width="996" height="20"/>
- <rect x="14" y="710" class="st3" width="996" height="20"/>
- </g>
- <g>
- <rect x="14" y="730" class="st2" width="996" height="20"/>
- <rect x="14" y="750" class="st3" width="996" height="20"/>
- </g>
- <g>
- <rect x="14" y="770" class="st2" width="996" height="20"/>
- <rect x="14" y="790" class="st3" width="996" height="20"/>
- </g>
- </g>
-</g>
-<g id="VIC20" class="st4">
- <g class="st5">
- <path class="st6" d="M130.7,433.5h20.7H172l24.1,45.7l24.1,45.7l24.1-45.7l24.1-45.7h20.7h20.7l-33.1,61.5l-33.1,61.5h-23.3h-23.3
- l-33.1-61.5L130.7,433.5z"/>
- <path class="st6" d="M325.2,433.5H344h18.9v61.5v61.5H344h-18.9v-61.5V433.5z"/>
- <path class="st6" d="M387.7,476.7c0-18,5.1-29.2,14.4-35.8s22.9-8.8,39.9-8.8h22.2h22.2c26.9,0,42,2.9,50.4,10.1
- s10.1,18.8,9.9,36.3h-18.9h-18.9v-1.7v-1.7c0-4.4-1.6-7.3-4.6-9s-7.4-2.4-13-2.4h-20.6h-20.6c-9.9,0-15.9,2.3-19.3,6.6
- s-4.4,10.4-4.4,18.1v6.6v6.6c0,8.9,0.9,15.1,4.1,19s8.6,5.6,17.5,5.6h20.1h20.1c8.5,0,14-0.4,17.4-2.8s4.7-6.6,4.7-14.2h18.9h18.9
- v5.8v5.8c0,10.4-1.9,19.6-8.5,26.3s-18,10.8-36.9,10.8h-30.4H442c-17,0-30.6-2.1-39.9-8.8s-14.4-17.8-14.4-35.8v-18.4V476.7z"/>
- <path class="st6" d="M570.1,514.8c0-7.6,2.5-13.9,8-18.5s14-7.5,26.2-8.4l21.6-1.4l21.6-1.4c13.8-0.9,21.1-1.4,25-3.3
- s4.4-5,4.4-11c0-5-0.3-8.1-3.5-9.9s-9.6-2.4-21.6-2.4h-12.5h-12.5c-8,0-13.2,0.6-16.4,2.8s-4.5,6-4.5,12.3v2.6v2.6H588h-17.8v-7.2
- v-7.2c0-12.2,3.6-20.3,11.4-25.4s19.9-7.1,36.9-7.1h24.8h24.8c17.7,0,28.8,2.6,35.5,8.5s9,14.9,9,27.7c0,18.1-1.7,28.7-8.8,35
- s-19.8,8.5-41.8,9.7l-19.5,1l-19.5,1c-7.9,0.4-12.5,1.4-15,3.7s-3.2,5.8-3.2,11.3h54.7h54.7v13.3v13.3h-72.1h-72.1v-20.9V514.8z"
- />
- <path class="st6" d="M734.2,480.5c0-18.7,3.4-30.8,11.8-38.2s21.9-10.1,42.1-10.1h22.1h22.1c20.1,0,33.6,2.7,42.1,10.1
- s11.8,19.5,11.8,38.2v17.2v17.2c0,16-3.7,26.8-11,33.6s-18.3,9.6-33,9.6h-32h-32c-14.7,0-25.7-2.8-33-9.6s-11-17.6-11-33.6v-17.2
- V480.5z M770.9,508.3c0,6.4,1,11.1,4.2,14.3s8.7,4.7,17.5,4.7h17.5h17.5c8.8,0,14.3-1.6,17.5-4.7s4.2-7.9,4.2-14.3v-13.3v-13.3
- c0-6.4-1-11.1-4.2-14.3s-8.7-4.7-17.5-4.7h-17.5h-17.5c-8.8,0-14.3,1.6-17.5,4.7s-4.2,7.9-4.2,14.3v13.3V508.3z"/>
- </g>
-</g>
-<g id="Plus4" class="st4">
- <g class="st5">
- <path class="st6" d="M141.9,414.7h59.3h59.3c20.7,0,33.5,5.2,41.2,13.9s10.2,20.8,10.2,34.7v6.1v6.1c0,10.6-2.3,22-8.5,30.7
- S287.2,521,271.8,521h-43.2h-43.2v17.8v17.8h-21.8h-21.8v-71V414.7z M185.4,485.7h33.8H253c5.1,0,8.6-1.7,10.9-4.4
- s3.2-6.5,3.2-10.7v-2.7v-2.7c0-4.8-1.2-8.6-4-11.1s-7.3-3.9-13.8-3.9h-31.9h-31.9v17.8V485.7z"/>
- <path class="st6" d="M335.7,414.7h18.8h18.8v71v71h-18.8h-18.8v-71V414.7z"/>
- <path class="st6" d="M535.2,556.6h-18.8h-18.8v-8v-8h-0.2h-0.2c-3.3,7-8.3,11.4-14.9,14s-15,3.6-25.1,3.6
- c-11.7,0-25.6-0.2-36.7-5.9s-19.2-16.7-19.2-38.2v-28.7v-28.7h18.8H439v28.7v28.7c0,4.9,2,8.6,6,11s10.1,3.7,18.3,3.7h4.3h4.3
- c8,0,14.5-1.9,18.9-5.5s6.8-9.1,6.8-16.2v-25.2v-25.2h18.8h18.8v50V556.6z"/>
- <path class="st6" d="M596.2,525.5c0,2.7,0.5,5,3.7,6.7s9,2.5,19.7,2.5h6.7h6.7c8.9,0,14.5-0.3,17.9-1.4s4.5-3,4.5-6
- c0-2.9-0.7-5-3.1-6.3s-6.5-1.9-13.1-1.9h-17.6h-17.6c-17.5-0.1-28.9-2.1-35.9-7.4s-9.6-14.1-9.6-27.9c0-12.4,5-19.6,13.2-23.6
- s19.7-5,32.6-5h13.1h13.1c24.6,0,39.1,1.7,47.4,6.4s10.6,12.2,10.8,24h-18.8h-18.8c-1-2.9-2.4-4.7-6.3-5.6s-10.5-1.2-21.7-1.2
- c-10.9,0-17.3,0.1-21.1,1.2s-4.8,2.9-4.8,6.3c0,2.2,0.7,3.6,3.9,4.6s8.8,1.3,18.6,1.3h13h13c22.5,0,34.6,3.8,41.1,9.8
- s7.3,14.2,7.3,23.2c0,13.2-2.6,21.6-10.7,26.6s-21.4,6.7-42.9,6.7h-17.8h-17.8c-17.3,0-29.2-2-36.7-7.1s-10.7-13.3-10.7-25.6h19.4
- H596.2z"/>
- <path class="st6" d="M713.8,476.3l50.7-30.8l50.7-30.8h25.1h25.1v40.9v40.9h10.5h10.5v15.9v15.9h-10.5h-10.5v14.2v14.2h-20.6
- h-20.6v-14.2v-14.2H769h-55.2v-26V476.3z M747.9,496.1v0.2v0.2H786h38.1v-23.8v-23.8L786,472.4L747.9,496.1z"/>
- </g>
-</g>
-<g id="DTV" class="st4">
- <g class="st5">
- <path class="st6" d="M135.3,368.4h87.1h87.1c28.9,0,48.4,4.7,60.6,15.3s17.4,26.9,17.4,50.2v28.6v28.6c0,23.3-5.1,39.6-17.4,50.2
- s-31.8,15.3-60.6,15.3h-87.1h-87.1v-94.1V368.4z M193,508.3h51.2h51.2c12.3,0,20.9-1.8,26.4-6.9s7.9-13.6,7.9-26.9v-12.7V449
- c0-13.4-2.4-21.8-7.9-26.9s-14.1-6.9-26.4-6.9h-51.2H193v46.5V508.3z"/>
- <path class="st6" d="M408.5,368.4h110h110v23.4v23.4h-40.6h-40.6v70.7v70.7h-28.9h-28.9v-70.7v-70.7h-40.6h-40.6v-23.4V368.4z"/>
- <path class="st6" d="M635.5,368.4h31.6h31.6l36.8,69.9l36.8,69.9l36.8-69.9l36.8-69.9h31.6H909l-50.6,94.1l-50.6,94.1h-35.6h-35.6
- l-50.6-94.1L635.5,368.4z"/>
- </g>
-</g>
-<g id="C64">
- <g>
- <path class="st6" d="M132.4,434.4c0-27.6,7.7-44.6,22-54.7s35-13.4,61-13.4h33.9h33.9c41.1,0,64.3,4.4,77.2,15.5
- s15.4,28.8,15.1,55.5h-28.9h-28.9v-2.6v-2.6c0-6.8-2.5-11.1-7.1-13.8s-11.4-3.6-20-3.6h-31.5h-31.5c-15.2,0-24.2,3.6-29.5,10.1
- s-6.7,15.9-6.7,27.6v10.1v10.1c0,13.6,1.4,23.1,6.3,29.1s13.1,8.6,26.7,8.6h30.8h30.8c13,0,21.4-0.6,26.6-4.2s7.1-10.1,7.1-21.8
- H349h28.9v8.8v8.8c0,15.9-2.9,30-13,40.2s-27.5,16.4-56.5,16.4h-46.5h-46.5c-26,0-46.7-3.2-61-13.4s-22-27.2-22-54.7v-28.1V434.4z
- "/>
- <path class="st6" d="M413.2,440.1c0-28.6,5.2-47.1,18.1-58.4s33.5-15.5,64.3-15.5h30h30c27.4,0,44.8,4.7,55.3,12.5
- s14.1,18.5,14.1,30.4v7.4v7.4h-25h-25c0-6.4-2.1-10.7-6.7-13.4s-11.8-3.8-21.9-3.8h-25.3h-25.3c-9.9,0-16.9,1.9-21.4,5.8
- s-6.6,9.5-6.6,16.9v11.2v11.2c4.7-4.7,9.7-8.3,16.5-10.7s15.1-3.6,26.4-3.6h26.9h26.9c27.8,0,44.2,4.6,53.6,13.5s11.9,22,11.9,39
- v8.2v8.2c0,23.1-5.7,36.2-16.9,43.5s-28.1,8.8-50.4,8.8h-41.1h-41.1c-22.5,0-39.3-4.3-50.5-14.7s-16.8-26.9-16.8-51.3v-26.3V440.1
- z M548.7,518.1c11,0,18.1-1.2,22.5-4.5s5.9-8.5,5.9-16.6c0-7.9-1.5-13.1-5.9-16.2s-11.8-4.3-23.5-4.3h-25.2h-25.2
- c-11.7,0-19,1.2-23.5,4.3s-5.9,8.3-5.9,16.2c0,8.1,1.6,13.3,5.9,16.6s11.4,4.5,22.5,4.5h26.3H548.7z"/>
- <path class="st6" d="M664.1,450l67.2-40.8l67.2-40.8h33.3h33.3v54.2v54.2H879h13.9v21.1v21.1H879h-13.9v18.8v18.8h-27.3h-27.3
- v-18.8v-18.8h-73.2h-73.2v-34.4V450z M709.3,476.3v0.3v0.3h50.6h50.6v-31.6v-31.6L759.9,445L709.3,476.3z"/>
- </g>
-</g>
-<g id="SID" class="st4">
- <g class="st5">
- <path class="st6" d="M197.3,495h28.9H255c0.1,10,2.2,15.4,6.3,18.3s10.3,3.3,18.6,3.3h35.4h35.4c6.1,0,12.3-0.3,16.9-2.5
- s7.8-6.1,7.8-13.4c0-8.2-1.7-12.5-12.7-14.9s-31.3-2.6-68.4-2.6c-43.4,0-67.6-2.6-80.9-11s-15.8-22.6-15.8-45.7
- c0-17,0.8-32.1,10.7-42.9s28.9-17.4,65.3-17.4h40.3H354c33.3,0,51.5,5.7,61.4,15.4s11.4,23.7,11.4,40.2v3v3H398h-28.9
- c0-6.9-0.4-11.8-4.1-14.9s-10.7-4.6-24-4.6h-32h-32c-6.5,0-12,1.1-15.8,3.5s-6,6-6,11.1c0,8.2,1.8,12.4,11.2,14.6
- s26.7,2.2,57.7,2.1c44.8-0.1,72.5,1.2,88.9,9.4s21.6,23.3,21.6,50.7c0,25.3-4.3,40.1-18.2,48.5s-37.3,10.5-75.7,10.5h-35h-35
- c-26.3,0-44.7-2.5-56.5-10s-17.1-20.2-17.1-40.7v-6.5V495z"/>
- <path class="st6" d="M473.4,368.4h28.9h28.9v94.1v94.1h-28.9h-28.9v-94.1V368.4z"/>
- <path class="st6" d="M575.3,368.4h87.1h87.1c28.9,0,48.4,4.7,60.6,15.3s17.4,26.9,17.4,50.2v28.6v28.6c0,23.3-5.1,39.6-17.4,50.2
- s-31.8,15.3-60.6,15.3h-87.1h-87.1v-94.1V368.4z M633,508.3h51.2h51.2c12.3,0,20.9-1.8,26.4-6.9s7.9-13.6,7.9-26.9v-12.7V449
- c0-13.4-2.4-21.8-7.9-26.9s-14.1-6.9-26.4-6.9h-51.2H633v46.5V508.3z"/>
- </g>
-</g>
-<g id="PET" class="st4">
- <g class="st5">
- <path class="st6" d="M165.4,368.4h78.6h78.6c27.4,0,44.5,6.9,54.6,18.4s13.5,27.6,13.5,46.1v8.1v8.1c0,14-3.1,29.1-11.2,40.7
- s-21.4,19.6-41.8,19.6h-57.3h-57.3V533v23.7h-28.9h-28.9v-94.1V368.4z M223.1,462.5H268h44.8c6.8,0,11.4-2.2,14.4-5.8
- s4.3-8.6,4.3-14.2v-3.6v-3.6c0-6.4-1.6-11.4-5.3-14.8s-9.7-5.2-18.4-5.2h-42.4h-42.4v23.7V462.5z"/>
- <path class="st6" d="M422,368.4h103h103v21.8v21.8h-74.1h-74.1v15.1v15.1H550h70.2v19.5v19.5H550h-70.2v15.1v15.1h75.8h75.8V534
- v22.6H526.7H422v-94.1V368.4z"/>
- <path class="st6" d="M652.4,368.4h110h110v23.4v23.4h-40.6h-40.6v70.7v70.7h-28.9h-28.9v-70.7v-70.7H693h-40.6v-23.4V368.4z"/>
- </g>
-</g>
-<g id="CBM2" class="st4">
- <g class="st5">
- <path class="st6" d="M133.3,474.4c0-18.6,5.2-30,14.8-36.8s23.5-9,41-9H212h22.8c27.7,0,43.3,3,51.9,10.4s10.4,19.4,10.2,37.3
- h-19.4h-19.4v-1.8v-1.8c0-4.5-1.7-7.5-4.8-9.3s-7.7-2.4-13.4-2.4h-21.2h-21.2c-10.2,0-16.3,2.4-19.8,6.8s-4.5,10.7-4.5,18.6v6.8
- v6.8c0,9.2,1,15.5,4.2,19.6s8.8,5.8,18,5.8h20.7h20.7c8.8,0,14.4-0.4,17.9-2.8s4.8-6.8,4.8-14.7h19.4h19.4v6v6
- c0,10.7-1.9,20.2-8.7,27.1s-18.5,11.1-38,11.1h-31.3h-31.3c-17.5,0-31.5-2.2-41-9s-14.8-18.3-14.8-36.8v-18.9V474.4z"/>
- <path class="st6" d="M322,429.9h55.9h55.9c15.5,0,27,2.1,34.6,7.3s11.4,13.5,11.4,25.9c0,10.9-2,17.3-5.3,21.5s-8,6-13.4,7.6v0.3
- v0.3c8.5,1,14.3,3.8,18,8.8s5.3,12,5.3,21.5c0,13.9-4.1,22.3-11,27.2s-16.6,6.4-27.7,6.4h-61.9H322v-63.4V429.9z M360.8,480.1
- h34.4h34.4c3.6,0,6.4-0.7,8.4-2.2s3-4,3-7.6c0-3.7-1.1-6.2-3-7.7s-4.8-2.2-8.4-2.2h-34.4h-34.4v9.9V480.1z M360.8,526.2h34.8h34.8
- c4.2,0,7.7-0.5,10.2-1.9s3.9-3.7,3.9-7.4c0-4.3-1.4-6.9-3.9-8.5s-6-2-10.2-2h-34.8h-34.8v9.9V526.2z"/>
- <path class="st6" d="M507.8,429.9h29.8h29.8l22,40.8l22,40.8l22-40.8l22-40.8h29.8H715v63.4v63.4h-18.9h-18.9v-45.5v-45.5H677
- h-0.2l-25.5,45.5l-25.5,45.5h-14.5h-14.5l-25.5-45.5L546,465.6h-0.2h-0.2v45.5v45.5h-18.9h-18.9v-63.4V429.9z"/>
- <path class="st6" d="M740.4,513.6c0-7.8,2.5-14.3,8.2-19s14.5-7.8,27-8.6l22.2-1.4l22.2-1.4c14.2-0.9,21.7-1.4,25.8-3.3
- s4.5-5.1,4.5-11.4c0-5.2-0.3-8.3-3.6-10.2s-9.8-2.4-22.3-2.4h-12.9h-12.9c-8.2,0-13.6,0.6-16.9,2.9s-4.6,6.1-4.6,12.7v2.7v2.7
- h-18.4h-18.4v-7.4v-7.4c0-12.5,3.7-20.9,11.7-26.1s20.5-7.3,38-7.3h25.6h25.6c18.2,0,29.7,2.7,36.6,8.7s9.3,15.3,9.3,28.5
- c0,18.6-1.7,29.5-9.1,36.1s-20.4,8.7-43.1,10l-20,1l-20,1c-8.1,0.4-12.8,1.4-15.5,3.8s-3.3,6-3.3,11.6h56.4h56.4V543v13.7h-74.2
- h-74.2v-21.5V513.6z"/>
- </g>
-</g>
-<g id="SCPU" class="st4">
- <g class="st5">
- <path class="st6" d="M159.9,515.2h19.4h19.4c0.1,6.7,1.5,10.4,4.3,12.3s6.9,2.2,12.5,2.2h23.8h23.8c4.1,0,8.3-0.2,11.4-1.7
- s5.2-4.1,5.2-9c0-5.5-1.1-8.4-8.5-10s-21-1.7-46.1-1.7c-29.2,0-45.5-1.8-54.5-7.4s-10.6-15.2-10.6-30.8c0-11.5,0.5-21.6,7.2-28.9
- s19.4-11.7,43.9-11.7h27.1h27.1c22.4,0,34.7,3.8,41.3,10.4s7.7,15.9,7.7,27.1v2v2H295h-19.4c0-4.6-0.3-7.9-2.8-10
- s-7.2-3.1-16.1-3.1h-21.5h-21.5c-4.4,0-8.1,0.7-10.6,2.3s-4.1,4-4.1,7.5c0,5.5,1.2,8.4,7.6,9.8s18,1.5,38.8,1.4
- c30.2-0.1,48.8,0.8,59.8,6.3s14.5,15.7,14.5,34.1c0,17.1-2.9,27-12.2,32.7s-25.1,7.1-50.9,7.1H233h-23.5c-17.7,0-30.1-1.7-38-6.8
- s-11.5-13.6-11.5-27.4v-4.4V515.2z"/>
- <path class="st6" d="M340.8,474.4c0-18.6,5.2-30,14.8-36.8s23.5-9,41-9h22.8h22.8c27.7,0,43.3,3,51.9,10.4s10.4,19.4,10.2,37.3
- h-19.4h-19.4v-1.8v-1.8c0-4.5-1.7-7.5-4.8-9.3s-7.7-2.4-13.4-2.4h-21.2h-21.2c-10.2,0-16.3,2.4-19.8,6.8s-4.5,10.7-4.5,18.6v6.8
- v6.8c0,9.2,1,15.5,4.2,19.6s8.8,5.8,18,5.8h20.7h20.7c8.8,0,14.4-0.4,17.9-2.8s4.8-6.8,4.8-14.7h19.4h19.4v6v6
- c0,10.7-1.9,20.2-8.7,27.1s-18.5,11.1-38,11.1H428h-31.3c-17.5,0-31.5-2.2-41-9s-14.8-18.3-14.8-36.8v-18.9V474.4z"/>
- <path class="st6" d="M529.5,429.9h52.9h52.9c18.5,0,29.9,4.6,36.8,12.4s9.1,18.6,9.1,31v5.4v5.4c0,9.5-2.1,19.6-7.5,27.4
- s-14.4,13.2-28.2,13.2h-38.6h-38.6v15.9v15.9h-19.4h-19.4v-63.4V429.9z M568.4,493.3h30.2h30.2c4.5,0,7.7-1.5,9.7-3.9
- s2.9-5.8,2.9-9.6v-2.5v-2.5c0-4.3-1.1-7.7-3.6-10s-6.5-3.5-12.4-3.5h-28.5h-28.5v15.9V493.3z"/>
- <path class="st6" d="M702.2,429.9h19.4h19.4v36.6v36.6c0,8,1.4,13.6,4.9,17.2s8.9,5.2,16.8,5.2H782h19.2c8,0,13.4-1.6,16.8-5.2
- s4.9-9.2,4.9-17.2v-36.6v-36.6h19.4h19.4v40.8v40.8c0,15.8-4.1,27.4-12.6,35.1S827.7,558,809.9,558H782h-27.8
- c-17.9,0-30.8-3.8-39.4-11.5s-12.6-19.3-12.6-35.1v-40.8V429.9z"/>
- </g>
-</g>
-</svg>
Deleted: branches/compyx/desktop-icons/vice/data/common/C64_16.png
===================================================================
(Binary files differ)
Deleted: branches/compyx/desktop-icons/vice/data/common/C64_24.png
===================================================================
(Binary files differ)
Deleted: branches/compyx/desktop-icons/vice/data/common/C64_256.png
===================================================================
(Binary files differ)
Deleted: branches/compyx/desktop-icons/vice/data/common/C64_32.png
===================================================================
(Binary files differ)
Deleted: branches/compyx/desktop-icons/vice/data/common/C64_48.png
===================================================================
(Binary files differ)
Deleted: branches/compyx/desktop-icons/vice/data/common/C64_64.png
===================================================================
(Binary files differ)
Deleted: branches/compyx/desktop-icons/vice/data/common/CBM2_1024.svg
===================================================================
--- branches/compyx/desktop-icons/vice/data/common/CBM2_1024.svg 2025-02-10 16:16:39 UTC (rev 45477)
+++ branches/compyx/desktop-icons/vice/data/common/CBM2_1024.svg 2025-02-10 17:18:14 UTC (rev 45478)
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
-<style type="text/css">
- .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#3D3D3D;}
- .st1{fill-rule:evenodd;clip-rule:evenodd;fill:#595959;}
- .st2{fill:#2B2B2B;}
- .st3{fill:#7C7C7C;}
- .st4{display:none;}
- .st5{display:inline;}
- .st6{fill:#FFFFFF;}
-</style>
-<g id="Layer_11_copy_3">
- <path class="st0" d="M267.1,1010h-63.9h-63.9c-34.6,0-65.9-14-88.6-36.7C28,950.6,14,919.3,14,884.7V512V139.3
- c0-34.6,14-65.9,36.7-88.6s54-36.7,88.6-36.7H512h372.7c34.6,0,65.9,14,88.6,36.7c22.7,22.7,36.7,54,36.7,88.6V512v372.7
- c0,34.6-14,65.9-36.7,88.6c-22.7,22.7-54,36.7-88.6,36.7h-64h-64H511.9H267.1z"/>
- <path class="st1" d="M267.1,1010H139.3C70.1,1010,14,953.9,14,884.7V809h996v75.7c0,69.2-56.1,125.3-125.3,125.3H756.7H267.1z"/>
- <g>
- <g>
- <rect x="14" y="610" class="st2" width="996" height="20"/>
- <rect x="14" y="630" class="st3" width="996" height="20"/>
- </g>
- <g>
- <rect x="14" y="650" class="st2" width="996" height="20"/>
- <rect x="14" y="670" class="st3" width="996" height="20"/>
- </g>
- <g>
- <rect x="14" y="690" class="st2" width="996" height="20"/>
- <rect x="14" y="710" class="st3" width="996" height="20"/>
- </g>
- <g>
- <rect x="14" y="730" class="st2" width="996" height="20"/>
- <rect x="14" y="750" class="st3" width="996" height="20"/>
- </g>
- <g>
- <rect x="14" y="770" class="st2" width="996" height="20"/>
- <rect x="14" y="790" class="st3" width="996" height="20"/>
- </g>
- </g>
-</g>
-<g id="VIC20" class="st4">
- <g class="st5">
- <path class="st6" d="M130.7,433.5h20.7H172l24.1,45.7l24.1,45.7l24.1-45.7l24.1-45.7h20.7h20.7l-33.1,61.5l-33.1,61.5h-23.3h-23.3
- l-33.1-61.5L130.7,433.5z"/>
- <path class="st6" d="M325.2,433.5H344h18.9v61.5v61.5H344h-18.9v-61.5V433.5z"/>
- <path class="st6" d="M387.7,476.7c0-18,5.1-29.2,14.4-35.8s22.9-8.8,39.9-8.8h22.2h22.2c26.9,0,42,2.9,50.4,10.1
- s10.1,18.8,9.9,36.3h-18.9h-18.9v-1.7v-1.7c0-4.4-1.6-7.3-4.6-9s-7.4-2.4-13-2.4h-20.6h-20.6c-9.9,0-15.9,2.3-19.3,6.6
- s-4.4,10.4-4.4,18.1v6.6v6.6c0,8.9,0.9,15.1,4.1,19s8.6,5.6,17.5,5.6h20.1h20.1c8.5,0,14-0.4,17.4-2.8s4.7-6.6,4.7-14.2h18.9h18.9
- v5.8v5.8c0,10.4-1.9,19.6-8.5,26.3s-18,10.8-36.9,10.8h-30.4H442c-17,0-30.6-2.1-39.9-8.8s-14.4-17.8-14.4-35.8v-18.4V476.7z"/>
- <path class="st6" d="M570.1,514.8c0-7.6,2.5-13.9,8-18.5s14-7.5,26.2-8.4l21.6-1.4l21.6-1.4c13.8-0.9,21.1-1.4,25-3.3
- s4.4-5,4.4-11c0-5-0.3-8.1-3.5-9.9s-9.6-2.4-21.6-2.4h-12.5h-12.5c-8,0-13.2,0.6-16.4,2.8s-4.5,6-4.5,12.3v2.6v2.6H588h-17.8v-7.2
- v-7.2c0-12.2,3.6-20.3,11.4-25.4s19.9-7.1,36.9-7.1h24.8h24.8c17.7,0,28.8,2.6,35.5,8.5s9,14.9,9,27.7c0,18.1-1.7,28.7-8.8,35
- s-19.8,8.5-41.8,9.7l-19.5,1l-19.5,1c-7.9,0.4-12.5,1.4-15,3.7s-3.2,5.8-3.2,11.3h54.7h54.7v13.3v13.3h-72.1h-72.1v-20.9V514.8z"
- />
- <path class="st6" d="M734.2,480.5c0-18.7,3.4-30.8,11.8-38.2s21.9-10.1,42.1-10.1h22.1h22.1c20.1,0,33.6,2.7,42.1,10.1
- s11.8,19.5,11.8,38.2v17.2v17.2c0,16-3.7,26.8-11,33.6s-18.3,9.6-33,9.6h-32h-32c-14.7,0-25.7-2.8-33-9.6s-11-17.6-11-33.6v-17.2
- V480.5z M770.9,508.3c0,6.4,1,11.1,4.2,14.3s8.7,4.7,17.5,4.7h17.5h17.5c8.8,0,14.3-1.6,17.5-4.7s4.2-7.9,4.2-14.3v-13.3v-13.3
- c0-6.4-1-11.1-4.2-14.3s-8.7-4.7-17.5-4.7h-17.5h-17.5c-8.8,0-14.3,1.6-17.5,4.7s-4.2,7.9-4.2,14.3v13.3V508.3z"/>
- </g>
-</g>
-<g id="Plus4" class="st4">
- <g class="st5">
- <path class="st6" d="M141.9,414.7h59.3h59.3c20.7,0,33.5,5.2,41.2,13.9s10.2,20.8,10.2,34.7v6.1v6.1c0,10.6-2.3,22-8.5,30.7
- S287.2,521,271.8,521h-43.2h-43.2v17.8v17.8h-21.8h-21.8v-71V414.7z M185.4,485.7h33.8H253c5.1,0,8.6-1.7,10.9-4.4
- s3.2-6.5,3.2-10.7v-2.7v-2.7c0-4.8-1.2-8.6-4-11.1s-7.3-3.9-13.8-3.9h-31.9h-31.9v17.8V485.7z"/>
- <path class="st6" d="M335.7,414.7h18.8h18.8v71v71h-18.8h-18.8v-71V414.7z"/>
- <path class="st6" d="M535.2,556.6h-18.8h-18.8v-8v-8h-0.2h-0.2c-3.3,7-8.3,11.4-14.9,14s-15,3.6-25.1,3.6
- c-11.7,0-25.6-0.2-36.7-5.9s-19.2-16.7-19.2-38.2v-28.7v-28.7h18.8H439v28.7v28.7c0,4.9,2,8.6,6,11s10.1,3.7,18.3,3.7h4.3h4.3
- c8,0,14.5-1.9,18.9-5.5s6.8-9.1,6.8-16.2v-25.2v-25.2h18.8h18.8v50V556.6z"/>
- <path class="st6" d="M596.2,525.5c0,2.7,0.5,5,3.7,6.7s9,2.5,19.7,2.5h6.7h6.7c8.9,0,14.5-0.3,17.9-1.4s4.5-3,4.5-6
- c0-2.9-0.7-5-3.1-6.3s-6.5-1.9-13.1-1.9h-17.6h-17.6c-17.5-0.1-28.9-2.1-35.9-7.4s-9.6-14.1-9.6-27.9c0-12.4,5-19.6,13.2-23.6
- s19.7-5,32.6-5h13.1h13.1c24.6,0,39.1,1.7,47.4,6.4s10.6,12.2,10.8,24h-18.8h-18.8c-1-2.9-2.4-4.7-6.3-5.6s-10.5-1.2-21.7-1.2
- c-10.9,0-17.3,0.1-21.1,1.2s-4.8,2.9-4.8,6.3c0,2.2,0.7,3.6,3.9,4.6s8.8,1.3,18.6,1.3h13h13c22.5,0,34.6,3.8,41.1,9.8
- s7.3,14.2,7.3,23.2c0,13.2-2.6,21.6-10.7,26.6s-21.4,6.7-42.9,6.7h-17.8h-17.8c-17.3,0-29.2-2-36.7-7.1s-10.7-13.3-10.7-25.6h19.4
- H596.2z"/>
- <path class="st6" d="M713.8,476.3l50.7-30.8l50.7-30.8h25.1h25.1v40.9v40.9h10.5h10.5v15.9v15.9h-10.5h-10.5v14.2v14.2h-20.6
- h-20.6v-14.2v-14.2H769h-55.2v-26V476.3z M747.9,496.1v0.2v0.2H786h38.1v-23.8v-23.8L786,472.4L747.9,496.1z"/>
- </g>
-</g>
-<g id="DTV" class="st4">
- <g class="st5">
- <path class="st6" d="M135.3,368.4h87.1h87.1c28.9,0,48.4,4.7,60.6,15.3s17.4,26.9,17.4,50.2v28.6v28.6c0,23.3-5.1,39.6-17.4,50.2
- s-31.8,15.3-60.6,15.3h-87.1h-87.1v-94.1V368.4z M193,508.3h51.2h51.2c12.3,0,20.9-1.8,26.4-6.9s7.9-13.6,7.9-26.9v-12.7V449
- c0-13.4-2.4-21.8-7.9-26.9s-14.1-6.9-26.4-6.9h-51.2H193v46.5V508.3z"/>
- <path class="st6" d="M408.5,368.4h110h110v23.4v23.4h-40.6h-40.6v70.7v70.7h-28.9h-28.9v-70.7v-70.7h-40.6h-40.6v-23.4V368.4z"/>
- <path class="st6" d="M635.5,368.4h31.6h31.6l36.8,69.9l36.8,69.9l36.8-69.9l36.8-69.9h31.6H909l-50.6,94.1l-50.6,94.1h-35.6h-35.6
- l-50.6-94.1L635.5,368.4z"/>
- </g>
-</g>
-<g id="C64" class="st4">
- <g class="st5">
- <path class="st6" d="M132.4,434.4c0-27.6,7.7-44.6,22-54.7s35-13.4,61-13.4h33.9h33.9c41.1,0,64.3,4.4,77.2,15.5
- s15.4,28.8,15.1,55.5h-28.9h-28.9v-2.6v-2.6c0-6.8-2.5-11.1-7.1-13.8s-11.4-3.6-20-3.6h-31.5h-31.5c-15.2,0-24.2,3.6-29.5,10.1
- s-6.7,15.9-6.7,27.6v10.1v10.1c0,13.6,1.4,23.1,6.3,29.1s13.1,8.6,26.7,8.6h30.8h30.8c13,0,21.4-0.6,26.6-4.2s7.1-10.1,7.1-21.8
- H349h28.9v8.8v8.8c0,15.9-2.9,30-13,40.2s-27.5,16.4-56.5,16.4h-46.5h-46.5c-26,0-46.7-3.2-61-13.4s-22-27.2-22-54.7v-28.1V434.4z
- "/>
- <path class="st6" d="M413.2,440.1c0-28.6,5.2-47.1,18.1-58.4s33.5-15.5,64.3-15.5h30h30c27.4,0,44.8,4.7,55.3,12.5
- s14.1,18.5,14.1,30.4v7.4v7.4h-25h-25c0-6.4-2.1-10.7-6.7-13.4s-11.8-3.8-21.9-3.8h-25.3h-25.3c-9.9,0-16.9,1.9-21.4,5.8
- s-6.6,9.5-6.6,16.9v11.2v11.2c4.7-4.7,9.7-8.3,16.5-10.7s15.1-3.6,26.4-3.6h26.9h26.9c27.8,0,44.2,4.6,53.6,13.5s11.9,22,11.9,39
- v8.2v8.2c0,23.1-5.7,36.2-16.9,43.5s-28.1,8.8-50.4,8.8h-41.1h-41.1c-22.5,0-39.3-4.3-50.5-14.7s-16.8-26.9-16.8-51.3v-26.3V440.1
- z M548.7,518.1c11,0,18.1-1.2,22.5-4.5s5.9-8.5,5.9-16.6c0-7.9-1.5-13.1-5.9-16.2s-11.8-4.3-23.5-4.3h-25.2h-25.2
- c-11.7,0-19,1.2-23.5,4.3s-5.9,8.3-5.9,16.2c0,8.1,1.6,13.3,5.9,16.6s11.4,4.5,22.5,4.5h26.3H548.7z"/>
- <path class="st6" d="M664.1,450l67.2-40.8l67.2-40.8h33.3h33.3v54.2v54.2H879h13.9v21.1v21.1H879h-13.9v18.8v18.8h-27.3h-27.3
- v-18.8v-18.8h-73.2h-73.2v-34.4V450z M709.3,476.3v0.3v0.3h50.6h50.6v-31.6v-31.6L759.9,445L709.3,476.3z"/>
- </g>
-</g>
-<g id="SID" class="st4">
- <g class="st5">
- <path class="st6" d="M197.3,495h28.9H255c0.1,10,2.2,15.4,6.3,18.3s10.3,3.3,18.6,3.3h35.4h35.4c6.1,0,12.3-0.3,16.9-2.5
- s7.8-6.1,7.8-13.4c0-8.2-1.7-12.5-12.7-14.9s-31.3-2.6-68.4-2.6c-43.4,0-67.6-2.6-80.9-11s-15.8-22.6-15.8-45.7
- c0-17,0.8-32.1,10.7-42.9s28.9-17.4,65.3-17.4h40.3H354c33.3,0,51.5,5.7,61.4,15.4s11.4,23.7,11.4,40.2v3v3H398h-28.9
- c0-6.9-0.4-11.8-4.1-14.9s-10.7-4.6-24-4.6h-32h-32c-6.5,0-12,1.1-15.8,3.5s-6,6-6,11.1c0,8.2,1.8,12.4,11.2,14.6
- s26.7,2.2,57.7,2.1c44.8-0.1,72.5,1.2,88.9,9.4s21.6,23.3,21.6,50.7c0,25.3-4.3,40.1-18.2,48.5s-37.3,10.5-75.7,10.5h-35h-35
- c-26.3,0-44.7-2.5-56.5-10s-17.1-20.2-17.1-40.7v-6.5V495z"/>
- <path class="st6" d="M473.4,368.4h28.9h28.9v94.1v94.1h-28.9h-28.9v-94.1V368.4z"/>
- <path class="st6" d="M575.3,368.4h87.1h87.1c28.9,0,48.4,4.7,60.6,15.3s17.4,26.9,17.4,50.2v28.6v28.6c0,23.3-5.1,39.6-17.4,50.2
- s-31.8,15.3-60.6,15.3h-87.1h-87.1v-94.1V368.4z M633,508.3h51.2h51.2c12.3,0,20.9-1.8,26.4-6.9s7.9-13.6,7.9-26.9v-12.7V449
- c0-13.4-2.4-21.8-7.9-26.9s-14.1-6.9-26.4-6.9h-51.2H633v46.5V508.3z"/>
- </g>
-</g>
-<g id="PET" class="st4">
- <g class="st5">
- <path class="st6" d="M165.4,368.4h78.6h78.6c27.4,0,44.5,6.9,54.6,18.4s13.5,27.6,13.5,46.1v8.1v8.1c0,14-3.1,29.1-11.2,40.7
- s-21.4,19.6-41.8,19.6h-57.3h-57.3V533v23.7h-28.9h-28.9v-94.1V368.4z M223.1,462.5H268h44.8c6.8,0,11.4-2.2,14.4-5.8
- s4.3-8.6,4.3-14.2v-3.6v-3.6c0-6.4-1.6-11.4-5.3-14.8s-9.7-5.2-18.4-5.2h-42.4h-42.4v23.7V462.5z"/>
- <path class="st6" d="M422,368.4h103h103v21.8v21.8h-74.1h-74.1v15.1v15.1H550h70.2v19.5v19.5H550h-70.2v15.1v15.1h75.8h75.8V534
- v22.6H526.7H422v-94.1V368.4z"/>
- <path class="st6" d="M652.4,368.4h110h110v23.4v23.4h-40.6h-40.6v70.7v70.7h-28.9h-28.9v-70.7v-70.7H693h-40.6v-23.4V368.4z"/>
- </g>
-</g>
-<g id="CBM2">
- <g>
- <path class="st6" d="M133.3,474.4c0-18.6,5.2-30,14.8-36.8s23.5-9,41-9H212h22.8c27.7,0,43.3,3,51.9,10.4s10.4,19.4,10.2,37.3
- h-19.4h-19.4v-1.8v-1.8c0-4.5-1.7-7.5-4.8-9.3s-7.7-2.4-13.4-2.4h-21.2h-21.2c-10.2,0-16.3,2.4-19.8,6.8s-4.5,10.7-4.5,18.6v6.8
- v6.8c0,9.2,1,15.5,4.2,19.6s8.8,5.8,18,5.8h20.7h20.7c8.8,0,14.4-0.4,17.9-2.8s4.8-6.8,4.8-14.7h19.4h19.4v6v6
- c0,10.7-1.9,20.2-8.7,27.1s-18.5,11.1-38,11.1h-31.3h-31.3c-17.5,0-31.5-2.2-41-9s-14.8-18.3-14.8-36.8v-18.9V474.4z"/>
- <path class="st6" d="M322,429.9h55.9h55.9c15.5,0,27,2.1,34.6,7.3s11.4,13.5,11.4,25.9c0,10.9-2,17.3-5.3,21.5s-8,6-13.4,7.6v0.3
- v0.3c8.5,1,14.3,3.8,18,8.8s5.3,12,5.3,21.5c0,13.9-4.1,22.3-11,27.2s-16.6,6.4-27.7,6.4h-61.9H322v-63.4V429.9z M360.8,480.1
- h34.4h34.4c3.6,0,6.4-0.7,8.4-2.2s3-4,3-7.6c0-3.7-1.1-6.2-3-7.7s-4.8-2.2-8.4-2.2h-34.4h-34.4v9.9V480.1z M360.8,526.2h34.8h34.8
- c4.2,0,7.7-0.5,10.2-1.9s3.9-3.7,3.9-7.4c0-4.3-1.4-6.9-3.9-8.5s-6-2-10.2-2h-34.8h-34.8v9.9V526.2z"/>
- <path class="st6" d="M507.8,429.9h29.8h29.8l22,40.8l22,40.8l22-40.8l22-40.8h29.8H715v63.4v63.4h-18.9h-18.9v-45.5v-45.5H677
- h-0.2l-25.5,45.5l-25.5,45.5h-14.5h-14.5l-25.5-45.5L546,465.6h-0.2h-0.2v45.5v45.5h-18.9h-18.9v-63.4V429.9z"/>
- <path class="st6" d="M740.4,513.6c0-7.8,2.5-14.3,8.2-19s14.5-7.8,27-8.6l22.2-1.4l22.2-1.4c14.2-0.9,21.7-1.4,25.8-3.3
- s4.5-5.1,4.5-11.4c0-5.2-0.3-8.3-3.6-10.2s-9.8-2.4-22.3-2.4h-12.9h-12.9c-8.2,0-13.6,0.6-16.9,2.9s-4.6,6.1-4.6,12.7v2.7v2.7
- h-18.4h-18.4v-7.4v-7.4c0-12.5,3.7-20.9,11.7-26.1s20.5-7.3,38-7.3h25.6h25.6c18.2,0,29.7,2.7,36.6,8.7s9.3,15.3,9.3,28.5
- c0,18.6-1.7,29.5-9.1,36.1s-20.4,8.7-43.1,10l-20,1l-20,1c-8.1,0.4-12.8,1.4-15.5,3.8s-3.3,6-3.3,11.6h56.4h56.4V543v13.7h-74.2
- h-74.2v-21.5V513.6z"/>
- </g>
-</g>
-<g id="SCPU" class="st4">
- <g class="st5">
- <path class="st6" d="M159.9,515.2h19.4h19.4c0.1,6.7,1.5,10.4,4.3,12.3s6.9,2.2,12.5,2.2h23.8h23.8c4.1,0,8.3-0.2,11.4-1.7
- s5.2-4.1,5.2-9c0-5.5-1.1-8.4-8.5-10s-21-1.7-46.1-1.7c-29.2,0-45.5-1.8-54.5-7.4s-10.6-15.2-10.6-30.8c0-11.5,0.5-21.6,7.2-28.9
- s19.4-11.7,43.9-11.7h27.1h27.1c22.4,0,34.7,3.8,41.3,10.4s7.7,15.9,7.7,27.1v2v2H295h-19.4c0-4.6-0.3-7.9-2.8-10
- s-7.2-3.1-16.1-3.1h-21.5h-21.5c-4.4,0-8.1,0.7-10.6,2.3s-4.1,4-4.1,7.5c0,5.5,1.2,8.4,7.6,9.8s18,1.5,38.8,1.4
- c30.2-0.1,48.8,0.8,59.8,6.3s14.5,15.7,14.5,34.1c0,17.1-2.9,27-12.2,32.7s-25.1,7.1-50.9,7.1H233h-23.5c-17.7,0-30.1-1.7-38-6.8
- s-11.5-13.6-11.5-27.4v-4.4V515.2z"/>
- <path class="st6" d="M340.8,474.4c0-18.6,5.2-30,14.8-36.8s23.5-9,41-9h22.8h22.8c27.7,0,43.3,3,51.9,10.4s10.4,19.4,10.2,37.3
- h-19.4h-19.4v-1.8v-1.8c0-4.5-1.7-7.5-4.8-9.3s-7.7-2.4-13.4-2.4h-21.2h-21.2c-10.2,0-16.3,2.4-19.8,6.8s-4.5,10.7-4.5,18.6v6.8
- v6.8c0,9.2,1,15.5,4.2,19.6s8.8,5.8,18,5.8h20.7h20.7c8.8,0,14.4-0.4,17.9-2.8s4.8-6.8,4.8-14.7h19.4h19.4v6v6
- c0,10.7-1.9,20.2-8.7,27.1s-18.5,11.1-38,11.1H428h-31.3c-17.5,0-31.5-2.2-41-9s-14.8-18.3-14.8-36.8v-18.9V474.4z"/>
- <path class="st6" d="M529.5,429.9h52.9h52.9c18.5,0,29.9,4.6,36.8,12.4s9.1,18.6,9.1,31v5.4v5.4c0,9.5-2.1,19.6-7.5,27.4
- s-14.4,13.2-28.2,13.2h-38.6h-38.6v15.9v15.9h-19.4h-19.4v-63.4V429.9z M568.4,493.3h30.2h30.2c4.5,0,7.7-1.5,9.7-3.9
- s2.9-5.8,2.9-9.6v-2.5v-2.5c0-4.3-1.1-7.7-3.6-10s-6.5-3.5-12.4-3.5h-28.5h-28.5v15.9V493.3z"/>
- <path class="st6" d="M702.2,429.9h19.4h19.4v36.6v36.6c0,8,1.4,13.6,4.9,17.2s8.9,5.2,16.8,5.2H782h19.2c8,0,13.4-1.6,16.8-5.2
- s4.9-9.2,4.9-17.2v-36.6v-36.6h19.4h19.4v40.8v40.8c0,15.8-4.1,27.4-12.6,35.1S827.7,558,809.9,558H782h-27.8
- c-17.9,0-30.8-3.8-39.4-11.5s-12.6-19.3-12.6-35.1v-40.8V429.9z"/>
- </g>
-</g>
-</svg>
Deleted: branches/compyx/desktop-icons/vice/data/common/CBM2_16.png
===================================================================
(Binary files differ)
Deleted: branches/compyx/desktop-icons/vice/data/common/CBM2_24.png
===================================================================
(Binary files differ)
Deleted: branches/compyx/desktop-icons/vice/data/common/CBM2_256.png
===================================================================
(Binary files differ)
Deleted: branches/compyx/desktop-icons/vice/data/common/CBM2_32.png
===================================================================
(Binary files differ)
Deleted: branches/compyx/desktop-icons/vice/data/common/CBM2_48.png
===================================================================
(Binary files differ)
Deleted: branches/compyx/desktop-icons/vice/data/common/CBM2_64.png
===================================================================
(Binary files differ)
Deleted: branches/compyx/desktop-icons/vice/data/common/DTV_1024.svg
===================================================================
--- branches/compyx/desktop-icons/vice/data/common/DTV_1024.svg 2025-02-10 16:16:39 UTC (rev 45477)
+++ branches/compyx/desktop-icons/vice/data/common/DTV_1024.svg 2025-02-10 17:18:14 UTC (rev 45478)
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
-<style type="text/css">
- .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#3D3D3D;}
- .st1{fill-rule:evenodd;clip-rule:evenodd;fill:#595959;}
- .st2{fill:#2B2B2B;}
- .st3{fill:#7C7C7C;}
- .st4{display:none;}
- .st5{display:inline;}
- .st6{fill:#FFFFFF;}
-</style>
-<g id="Layer_11_copy_3">
- <path class="st0" d="M267.1,1010h-63.9h-63.9c-34.6,0-65.9-14-88.6-36.7C28,950.6,14,919.3,14,884.7V512V139.3
- c0-34.6,14-65.9,36.7-88.6s54-36.7,88.6-36.7H512h372.7c34.6,0,65.9,14,88.6,36.7c22.7,22.7,36.7,54,36.7,88.6V512v372.7
- c0,34.6-14,65.9-36.7,88.6c-22.7,22.7-54,36.7-88.6,36.7h-64h-64H511.9H267.1z"/>
- <path class="st1" d="M267.1,1010H139.3C70.1,1010,14,953.9,14,884.7V809h996v75.7c0,69.2-56.1,125.3-125.3,125.3H756.7H267.1z"/>
- <g>
- <g>
- <rect x="14" y="610" class="st2" width="996" height="20"/>
- <rect x="14" y="630" class="st3" width="996" height="20"/>
- </g>
- <g>
- <rect x="14" y="650" class="st2" width="996" height="20"/>
- <rect x="14" y="670" class="st3" width="996" height="20"/>
- </g>
- <g>
- <rect x="14" y="690" class="st2" width="996" height="20"/>
- <rect x="14" y="710" class="st3" width="996" height="20"/>
- </g>
- <g>
- <rect x="14" y="730" class="st2" width="996" height="20"/>
- <rect x="14" y="750" class="st3" width="996" height="20"/>
- </g>
- <g>
- <rect x="14" y="770" class="st2" width="996" height="20"/>
- <rect x="14" y="790" class="st3" width="996" height="20"/>
- </g>
- </g>
-</g>
-<g id="VIC20" class="st4">
- <g class="st5">
- <path class="st6" d="M130.7,433.5h20.7H172l24.1,45.7l24.1,45.7l24.1-45.7l24.1-45.7h20.7h20.7l-33.1,61.5l-33.1,61.5h-23.3h-23.3
- l-33.1-61.5L130.7,433.5z"/>
- <path class="st6" d="M325.2,433.5H344h18.9v61.5v61.5H344h-18.9v-61.5V433.5z"/>
- <path class="st6" d="M387.7,476.7c0-18,5.1-29.2,14.4-35.8s22.9-8.8,39.9-8.8h22.2h22.2c26.9,0,42,2.9,50.4,10.1
- s10.1,18.8,9.9,36.3h-18.9h-18.9v-1.7v-1.7c0-4.4-1.6-7.3-4.6-9s-7.4-2.4-13-2.4h-20.6h-20.6c-9.9,0-15.9,2.3-19.3,6.6
- s-4.4,10.4-4.4,18.1v6.6v6.6c0,8.9,0.9,15.1,4.1,19s8.6,5.6,17.5,5.6h20.1h20.1c8.5,0,14-0.4,17.4-2.8s4.7-6.6,4.7-14.2h18.9h18.9
- v5.8v5.8c0,10.4-1.9,19.6-8.5,26.3s-18,10.8-36.9,10.8h-30.4H442c-17,0-30.6-2.1-39.9-8.8s-14.4-17.8-14.4-35.8v-18.4V476.7z"/>
- <path class="st6" d="M570.1,514.8c0-7.6,2.5-13.9,8-18.5s14-7.5,26.2-8.4l21.6-1.4l21.6-1.4c13.8-0.9,21.1-1.4,25-3.3
- s4.4-5,4.4-11c0-5-0.3-8.1-3.5-9.9s-9.6-2.4-21.6-2.4h-12.5h-12.5c-8,0-13.2,0.6-16.4,2.8s-4.5,6-4.5,12.3v2.6v2.6H588h-17.8v-7.2
- v-7.2c0-12.2,3.6-20.3,11.4-25.4s19.9-7.1,36.9-7.1h24.8h24.8c17.7,0,28.8,2.6,35.5,8.5s9,14.9,9,27.7c0,18.1-1.7,28.7-8.8,35
- s-19.8,8.5-41.8,9.7l-19.5,1l-19.5,1c-7.9,0.4-12.5,1.4-15,3.7s-3.2,5.8-3.2,11.3h54.7h54.7v13.3v13.3h-72.1h-72.1v-20.9V514.8z"
- />
- <path class="st6" d="M734.2,480.5c0-18.7,3.4-30.8,11.8-38.2s21.9-10.1,42.1-10.1h22.1h22.1c20.1,0,33.6,2.7,42.1,10.1
- s11.8,19.5,11.8,38.2v17.2v17.2c0,16-3.7,26.8-11,33.6s-18.3,9.6-33,9.6h-32h-32c-14.7,0-25.7-2.8-33-9.6s-11-17.6-11-33.6v-17.2
- V480.5z M770.9,508.3c0,6.4,1,11.1,4.2,14.3s8.7,4.7,17.5,4.7h17.5h17.5c8.8,0,14.3-1.6,17.5-4.7s4.2-7.9,4.2-14.3v-13.3v-13.3
- c0-6.4-1-11.1-4.2-14.3s-8.7-4.7-17.5-4.7h-17.5h-17.5c-8.8,0-14.3,1.6-17.5,4.7s-4.2,7.9-4.2,14.3v13.3V508.3z"/>
- </g>
-</g>
-<g id="Plus4" class="st4">
- <g class="st5">
- <path class="st6" d="M141.9,414.7h59.3h59.3c20.7,0,33.5,5.2,41.2,13.9s10.2,20.8,10.2,34.7v6.1v6.1c0,10.6-2.3,22-8.5,30.7
- S287.2,521,271.8,521h-43.2h-43.2v17.8v17.8h-21.8h-21.8v-71V414.7z M185.4,485.7h33.8H253c5.1,0,8.6-1.7,10.9-4.4
- s3.2-6.5,3.2-10.7v-2.7v-2.7c0-4.8-1.2-8.6-4-11.1s-7.3-3.9-13.8-3.9h-31.9h-31.9v17.8V485.7z"/>
- <path class="st6" d="M335.7,414.7h18.8h18.8v71v71h-18.8h-18.8v-71V414.7z"/>
- <path class="st6" d="M535.2,556.6h-18.8h-18.8v-8v-8h-0.2h-0.2c-3.3,7-8.3,11.4-14.9,14s-15,3.6-25.1,3.6
- c-11.7,0-25.6-0.2-36.7-5.9s-19.2-16.7-19.2-38.2v-28.7v-28.7h18.8H439v28.7v28.7c0,4.9,2,8.6,6,11s10.1,3.7,18.3,3.7h4.3h4.3
- c8,0,14.5-1.9,18.9-5.5s6.8-9.1,6.8-16.2v-25.2v-25.2h18.8h18.8v50V556.6z"/>
- <path class="st6" d="M596.2,525.5c0,2.7,0.5,5,3.7,6.7s9,2.5,19.7,2.5h6.7h6.7c8.9,0,14.5-0.3,17.9-1.4s4.5-3,4.5-6
- c0-2.9-0.7-5-3.1-6.3s-6.5-1.9-13.1-1.9h-17.6h-17.6c-17.5-0.1-28.9-2.1-35.9-7.4s-9.6-14.1-9.6-27.9c0-12.4,5-19.6,13.2-23.6
- s19.7-5,32.6-5h13.1h13.1c24.6,0,39.1,1.7,47.4,6.4s10.6,12.2,10.8,24h-18.8h-18.8c-1-2.9-2.4-4.7-6.3-5.6s-10.5-1.2-21.7-1.2
- c-10.9,0-17.3,0.1-21.1,1.2s-4.8,2.9-4.8,6.3c0,2.2,0.7,3.6,3.9,4.6s8.8,1.3,18.6,1.3h13h13c22.5,0,34.6,3.8,41.1,9.8
- s7.3,14.2,7.3,23.2c0,13.2-2.6,21.6-10.7,26.6s-21.4,6.7-42.9,6.7h-17.8h-17.8c-17.3,0-29.2-2-36.7-7.1s-10.7-13.3-10.7-25.6h19.4
- H596.2z"/>
- <path class="st6" d="M713.8,476.3l50.7-30.8l50.7-30.8h25.1h25.1v40.9v40.9h10.5h10.5v15.9v15.9h-10.5h-10.5v14.2v14.2h-20.6
- h-20.6v-14.2v-14.2H769h-55.2v-26V476.3z M747.9,496.1v0.2v0.2H786h38.1v-23.8v-23.8L786,472.4L747.9,496.1z"/>
- </g>
-</g>
-<g id="DTV">
- <g>
- <path class="st6" d="M135.3,368.4h87.1h87.1c28.9,0,48.4,4.7,60.6,15.3s17.4,26.9,17.4,50.2v28.6v28.6c0,23.3-5.1,39.6-17.4,50.2
- s-31.8,15.3-60.6,15.3h-87.1h-87.1v-94.1V368.4z M193,508.3h51.2h51.2c12.3,0,20.9-1.8,26.4-6.9s7.9-13.6,7.9-26.9v-12.7V449
- c0-13.4-2.4-21.8-7.9-26.9s-14.1-6.9-26.4-6.9h-51.2H193v46.5V508.3z"/>
- <path class="st6" d="M408.5,368.4h110h110v23.4v23.4h-40.6h-40.6v70.7v70.7h-28.9h-28.9v-70.7v-70.7h-40.6h-40.6v-23.4V368.4z"/>
- <path class="st6" d="M635.5,368.4h31.6h31.6l36.8,69.9l36.8,69.9l36.8-69.9l36.8-69.9h31.6H909l-50.6,94.1l-50.6,94.1h-35.6h-35.6
- l-50.6-94.1L635.5,368.4z"/>
- </g>
-</g>
-<g id="C64" class="st4">
- <g class="st5">
- <path class="st6" d="M132.4,434.4c0-27.6,7.7-44.6,22-54.7s35-13.4,61-13.4h33.9h33.9c41.1,0,64.3,4.4,77.2,15.5
- s15.4,28.8,15.1,55.5h-28.9h-28.9v-2.6v-2.6c0-6.8-2.5-11.1-7.1-13.8s-11.4-3.6-20-3.6h-31.5h-31.5c-15.2,0-24.2,3.6-29.5,10.1
- s-6.7,15.9-6.7,27.6v10.1v10.1c0,13.6,1.4,23.1,6.3,29.1s13.1,8.6,26.7,8.6h30.8h30.8c13,0,21.4-0.6,26.6-4.2s7.1-10.1,7.1-21.8
- H349h28.9v8.8v8.8c0,15.9-2.9,30-13,40.2s-27.5,16.4-56.5,16.4h-46.5h-46.5c-26,0-46.7-3.2-61-13.4s-22-27.2-22-54.7v-28.1V434.4z
- "/>
- <path class="st6" d="M413.2,440.1c0-28.6,5.2-47.1,18.1-58.4s33.5-15.5,64.3-15.5h30h30c27.4,0,44.8,4.7,55.3,12.5
- s14.1,18.5,14.1,30.4v7.4v7.4h-25h-25c0-6.4-2.1-10.7-6.7-13.4s-11.8-3.8-21.9-3.8h-25.3h-25.3c-9.9,0-16.9,1.9-21.4,5.8
- s-6.6,9.5-6.6,16.9v11.2v11.2c4.7-4.7,9.7-8.3,16.5-10.7s15.1-3.6,26.4-3.6h26.9h26.9c27.8,0,44.2,4.6,53.6,13.5s11.9,22,11.9,39
- v8.2v8.2c0,23.1-5.7,36.2-16.9,43.5s-28.1,8.8-50.4,8.8h-41.1h-41.1c-22.5,0-39.3-4.3-50.5-14.7s-16.8-26.9-16.8-51.3v-26.3V440.1
- z M548.7,518.1c11,0,18.1-1.2,22.5-4.5s5.9-8.5,5.9-16.6c0-7.9-1.5-13.1-5.9-16.2s-11.8-4.3-23.5-4.3h-25.2h-25.2
- c-11.7,0-19,1.2-23.5,4.3s-5.9,8.3-5.9,16.2c0,8.1,1.6,13.3,5.9,16.6s11.4,4.5,22.5,4.5h26.3H548.7z"/>
- <path class="st6" d="M664.1,450l67.2-40.8l67.2-40.8h33.3h33.3v54.2v54.2H879h13.9v21.1v21.1H879h-13.9v18.8v18.8h-27.3h-27.3
- v-18.8v-18.8h-73.2h-73.2v-34.4V450z M709.3,476.3v0.3v0.3h50.6h50.6v-31.6v-31.6L759.9,445L709.3,476.3z"/>
- </g>
-</g>
-<g id="SID" class="st4">
- <g class="st5">
- <path class="st6" d="M197.3,495h28.9H255c0.1,10,2.2,15.4,6.3,18.3s10.3,3.3,18.6,3.3h35.4h35.4c6.1,0,12.3-0.3,16.9-2.5
- s7.8-6.1,7.8-13.4c0-8.2-1.7-12.5-12.7-14.9s-31.3-2.6-68.4-2.6c-43.4,0-67.6-2.6-80.9-11s-15.8-22.6-15.8-45.7
- c0-17,0.8-32.1,10.7-42.9s28.9-17.4,65.3-17.4h40.3H354c33.3,0,51.5,5.7,61.4,15.4s11.4,23.7,11.4,40.2v3v3H398h-28.9
- c0-6.9-0.4-11.8-4.1-14.9s-10.7-4.6-24-4.6h-32h-32c-6.5,0-12,1.1-15.8,3.5s-6,6-6,11.1c0,8.2,1.8,12.4,11.2,14.6
- s26.7,2.2,57.7,2.1c44.8-0.1,72.5,1.2,88.9,9.4s21.6,23.3,21.6,50.7c0,25.3-4.3,40.1-18.2,48.5s-37.3,10.5-75.7,10.5h-35h-35
- c-26.3,0-44.7-2.5-56.5-10s-17.1-20.2-17.1-40.7v-6.5V495z"/>
- <path class="st6" d="M473.4,368.4h28.9h28.9v94.1v94.1h-28.9h-28.9v-94.1V368.4z"/>
- <path class="st6" d="M575.3,368.4h87.1h87.1c28.9,0,48.4,4.7,60.6,15.3s17.4,26.9,17.4,50.2v28.6v28.6c0,23.3-5.1,39.6-17.4,50.2
- s-31.8,15.3-60.6,15.3h-87.1h-87.1v-94.1V368.4z M633,508.3h51.2h51.2c12.3,0,20.9-1.8,26.4-6.9s7.9-13.6,7.9-26.9v-12.7V449
- c0-13.4-2.4-21.8-7.9-26.9s-14.1-6.9-26.4-6.9h-51.2H633v46.5V508.3z"/>
- </g>
-</g>
-<g id="PET" class="st4">
- <g class="st5">
- <path class="st6" d="M165.4,368.4h78.6h78.6c27.4,0,44.5,6.9,54.6,18.4s13.5,27.6,13.5,46.1v8.1v8.1c0,14-3.1,29.1-11.2,40.7
- s-21.4,19.6-41.8,19.6h-57.3h-57.3V533v23.7h-28.9h-28.9v-94.1V368.4z M223.1,462.5H268h44.8c6.8,0,11.4-2.2,14.4-5.8
- s4.3-8.6,4.3-14.2v-3.6v-3.6c0-6.4-1.6-11.4-5.3-14.8s-9.7-5.2-18.4-5.2h-42.4h-42.4v23.7V462.5z"/>
- <path class="st6" d="M422,368.4h103h103v21.8v21.8h-74.1h-74.1v15.1v15.1H550h70.2v19.5v19.5H550h-70.2v15.1v15...
[truncated message content] |
|
From: <co...@us...> - 2025-02-10 16:16:40
|
Revision: 45477
http://sourceforge.net/p/vice-emu/code/45477
Author: compyx
Date: 2025-02-10 16:16:39 +0000 (Mon, 10 Feb 2025)
Log Message:
-----------
Create branch for desktop icons rework
Added Paths:
-----------
branches/compyx/desktop-icons/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gp...@us...> - 2025-02-09 15:27:59
|
Revision: 45476
http://sourceforge.net/p/vice-emu/code/45476
Author: gpz
Date: 2025-02-09 15:27:58 +0000 (Sun, 09 Feb 2025)
Log Message:
-----------
fix crash on -help in the SDL port. patch inspired by rtissera
Modified Paths:
--------------
trunk/vice/src/arch/sdl/menu_screenshot.c
Modified: trunk/vice/src/arch/sdl/menu_screenshot.c
===================================================================
--- trunk/vice/src/arch/sdl/menu_screenshot.c 2025-02-07 06:49:00 UTC (rev 45475)
+++ trunk/vice/src/arch/sdl/menu_screenshot.c 2025-02-09 15:27:58 UTC (rev 45476)
@@ -694,12 +694,14 @@
static void uiscreenshot_menu_free(ui_menu_entry_t *menu)
{
- ui_menu_entry_t *entry = menu;
- while (entry->string != NULL) {
- lib_free(entry->string);
- entry++;
+ if (menu) {
+ ui_menu_entry_t *entry = menu;
+ while (entry->string != NULL) {
+ lib_free(entry->string);
+ entry++;
+ }
+ lib_free(menu);
}
- lib_free(menu);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <co...@us...> - 2025-02-07 06:49:03
|
Revision: 45475
http://sourceforge.net/p/vice-emu/code/45475
Author: compyx
Date: 2025-02-07 06:49:00 +0000 (Fri, 07 Feb 2025)
Log Message:
-----------
Gtk3: remove cross-compiling magic from Windows bindist script
Cross compiling using Linux hasn't been tested in four years, in which time a
lot of changes have been made to the native (MSYS) portion of the script, but
the cross portion of the script remained untouched and untested.
Modified Paths:
--------------
trunk/vice/Makefile.am
trunk/vice/src/arch/gtk3/make-bindist_win32.sh
Modified: trunk/vice/Makefile.am
===================================================================
--- trunk/vice/Makefile.am 2025-02-06 10:27:38 UTC (rev 45474)
+++ trunk/vice/Makefile.am 2025-02-07 06:49:00 UTC (rev 45475)
@@ -148,13 +148,13 @@
if WINDOWS_COMPILE
if USE_GTK3UI
bindist:
- $(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ nozip @UNZIPBIN@ $(X64_INCLUDED) $(top_srcdir) $(host_cpu) $(abs_top_builddir) $(CROSS) $(objdump) $(CC) $(HTMLDOCS) $(SVN_REVISION_OVERRIDE)
+ $(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ nozip @UNZIPBIN@ $(X64_INCLUDED) $(top_srcdir) $(host_cpu) $(abs_top_builddir) $(objdump) $(CC) $(HTMLDOCS) $(SVN_REVISION_OVERRIDE)
bindistzip:
- $(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ zip @UNZIPBIN@ $(X64_INCLUDED) $(top_srcdir) $(host_cpu) $(abs_top_builddir) $(CROSS) $(objdump) $(CC) $(HTML_DOCS) $(SVN_REVISION_OVERRIDE)
+ $(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ zip @UNZIPBIN@ $(X64_INCLUDED) $(top_srcdir) $(host_cpu) $(abs_top_builddir) $(objdump) $(CC) $(HTML_DOCS) $(SVN_REVISION_OVERRIDE)
bindist7zip:
- $(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ 7zip @UNZIPBIN@ $(X64_INCLUDED) $(top_srcdir) $(host_cpu) $(abs_top_builddir) $(CROSS) $(objdump) $(CC) $(HTML_DOCS) $(SVN_REVISION_OVERRIDE)
+ $(SHELL) @ARCH_SRC_DIR@/make-bindist_win32.sh $(STRIP) $(VICE_VERSION) @ENABLE_ARCH@ 7zip @UNZIPBIN@ $(X64_INCLUDED) $(top_srcdir) $(host_cpu) $(abs_top_builddir) $(objdump) $(CC) $(HTML_DOCS) $(SVN_REVISION_OVERRIDE)
endif USE_GTK3UI
if USE_SDLUI
Modified: trunk/vice/src/arch/gtk3/make-bindist_win32.sh
===================================================================
--- trunk/vice/src/arch/gtk3/make-bindist_win32.sh 2025-02-06 10:27:38 UTC (rev 45474)
+++ trunk/vice/src/arch/gtk3/make-bindist_win32.sh 2025-02-07 06:49:00 UTC (rev 45475)
@@ -26,8 +26,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
# 02111-1307 USA.
#
-# Usage: make-bindist.sh <strip> <vice-version> <--enable-arch> <zip|nozip> <unzip-bin> <x64-included> <top-srcdir> <cpu> <abs-top-builddir> <cross> <objdump> <compiler> <html-docs> [<svn-revision-override>]
-# $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14
+# Usage: make-bindist.sh <strip> <vice-version> <--enable-arch> <zip|nozip> <unzip-bin> <x64-included> <top-srcdir> <cpu> <abs-top-builddir> <objdump> <compiler> <html-docs> [<svn-revision-override>]
+# $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13
#
STRIP=$1
@@ -41,9 +41,6 @@
TOPBUILDDIR=$9
shift
-CROSS=$9
-
-shift
OBJDUMP=$9
shift
@@ -137,115 +134,37 @@
$STRIP $BUILDPATH/bin/$(basename $i).exe
done
-if test x"$CROSS" != "xtrue"; then
+# Copy DLLs
+curdir=`pwd`
+cp `ntldd -R $BUILDPATH/bin/x64sc.exe|gawk '/\\\\bin\\\\/{print $3;}'|cygpath -f -` $BUILDPATH/bin
+cd $MINGW_PREFIX
+cp bin/lib{lzma-5,rsvg-2-2,xml2-2}.dll $BUILDPATH/bin
+cp --parents lib/gdk-pixbuf-2.0/2.10.0/loaders/*pixbufloader*{png,svg,xpm}.dll $BUILDPATH
+# generate loaders.cache from the copied loaders in the binidst, not the system loaders
+cd $BUILDPATH
+GDK_PIXBUF_MODULEDIR=lib/gdk-pixbuf-2.0/2.10.0/loaders gdk-pixbuf-query-loaders > lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
+cd $MINGW_PREFIX
+# get dependencies of the SVG loader
+# FIXME: only works for the updated SVG (renamed) SVG loader
+cp `ntldd -R $BUILDPATH/lib/gdk-pixbuf-2.0/2.10.0//loaders/pixbufloader_svg.dll | gawk '/\\\\bin\\\\/{print $3;}' | cygpath -f -` $BUILDPATH/bin
-# The following lines assume that this script is run by MSYS2.
- curdir=`pwd`
- cp `ntldd -R $BUILDPATH/bin/x64sc.exe|gawk '/\\\\bin\\\\/{print $3;}'|cygpath -f -` $BUILDPATH/bin
- cd $MINGW_PREFIX
- cp bin/lib{lzma-5,rsvg-2-2,xml2-2}.dll $BUILDPATH/bin
- cp --parents lib/gdk-pixbuf-2.0/2.10.0/loaders/*pixbufloader*{png,svg,xpm}.dll $BUILDPATH
- # generate loaders.cache from the copied loaders in the binidst, not the system loaders
- cd $BUILDPATH
- GDK_PIXBUF_MODULEDIR=lib/gdk-pixbuf-2.0/2.10.0/loaders gdk-pixbuf-query-loaders > lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
- cd $MINGW_PREFIX
- # get dependencies of the SVG loader
- # FIXME: only works for the updated SVG (renamed) SVG loader
- cp `ntldd -R $BUILDPATH/lib/gdk-pixbuf-2.0/2.10.0//loaders/pixbufloader_svg.dll | gawk '/\\\\bin\\\\/{print $3;}' | cygpath -f -` $BUILDPATH/bin
+# GTK3 accepts having only scalable icons,
+# which reduces the bindist size considerably.
+cp --parents -a share/icons/Adwaita/{index.*,scalable,symbolic} $BUILDPATH
+cp --parents share/icons/hicolor/index.theme $BUILDPATH
+cp --parents share/glib-2.0/schemas/gschemas.compiled $BUILDPATH
+cp bin/gspawn-win??-helper*.exe $BUILDPATH/bin
+cd - >/dev/null
- # GTK3 accepts having only scalable icons,
- # which reduces the bindist size considerably.
- cp --parents -a share/icons/Adwaita/{index.*,scalable,symbolic} $BUILDPATH
- cp --parents share/icons/hicolor/index.theme $BUILDPATH
- cp --parents share/glib-2.0/schemas/gschemas.compiled $BUILDPATH
- cp bin/gspawn-win??-helper*.exe $BUILDPATH/bin
- cd - >/dev/null
-
- # drop unzip.exe and its dependencies in the bin/ =)
- if test x"$UNZIPBIN" != "xno"; then
- cp $UNZIPBIN $BUILDPATH/bin
- cp `ntldd -R $UNZIPBIN | gawk '/\\\\bin\\\\/{print $3;}' | cygpath -f -` $BUILDPATH/bin
- fi
-
- cd "$curdir"
-
-else
-
-# The following lines assume a cross compiler,
-# with DLLs installed in the dll or bin dir. of that toolchain.
-#
-# 2019-10-02: Updated to work with FrankenVICE (Debian cross-compiler using
-# Fedora packages for Gtk3/GLib)
-# Currently a bit flakey, but it seems to work.
-#
-# 2020-07-07: More hacks added, makes the bindist run again, but on Windows 7
-# with 'Aero' or Win10, this still displays the white screen and
-# the screwed up 'X' in the window decorations
-# Also: liblzma-5.dll is missing, but this doesn't seem to matter
-# when I copy that DLL from an msys2 build.
-
-
- libm=`$COMPILER -print-file-name=libm.a`
- echo "libm.a = '$libm'"
- location=`dirname $libm`
- loc=`dirname $location`
- echo "loc = $loc"
- if test -d "$loc/dll"
- then dlldir="$loc/dll"
- else dlldir="$loc/bin"
- fi
- dlls=`$OBJDUMP -p src/x64sc.exe | gawk '/^\\tDLL N/{print $3;}'`
- for i in $dlls
- do test -e $dlldir/$i&&cp $dlldir/$i $BUILDPATH
- done
- # A few of these libs cannot be found by frankenvice, so perhaps we need to install
- # these or alter this command:
- cp $dlldir/lib{bz2-1,freetype-6,gcc_s_*,lzma-5,rsvg-2-2,xml2-2}.dll $BUILDPATH/bin
- gccname=`$COMPILER -print-file-name=libgcc.a`
- gccdir=`dirname $gccname`
- dlls=`find $gccdir -name 'libgcc*.dll' -o -name 'libstdc*.dll'`
- test -n "$dlls"&&cp $dlls $BUILDPATH
- get_dll_deps
- get_dll_deps
- current=`pwd`
- cd $loc
- cp --parents lib/gdk-pixbuf-2.0/2.*/loaders.cache lib/gdk-pixbuf-2.0/2.*/loaders/libpixbufloader-{svg,xpm}.dll $BUILDPATH
- test -e lib/gdk-pixbuf-2.0/2.*/loaders/libpixbufloader-png.dll&&cp --parents lib/gdk-pixbuf-2.0/2.*/loaders/libpixbufloader-png.dll $BUILDPATH
- # update loaders.cache
- cat <<EOF > $BUILDPATH/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
-# Generated by src/arch/gtk3/make-bindist_win32.h
-# Ugly hack which can break at any moment
-
-"lib\\\\gdk-pixbuf-2.0\\\\2.10.0\\\\loaders\\\\libpixbufloader-svg.dll"
-"svg" 6 "gdk-pixbuf" "Scalable Vector Graphics" "LGPL"
-"image/svg+xml" "image/svg" "image/svg-xml" "image/vnd.adobe.svg+xml" "text/xml-svg" "image/svg+xml-compressed" ""
-"svg" "svgz" "svg.gz" ""
-" <svg" "* " 100
-" <!DOCTYPE svg" "* " 100
-
-# Empty line after even the last entry is required, otherwise the parser fails. A little sucky.
-EOF
- cp --parents -a share/icons/Adwaita/{index.*,scalable} $BUILDPATH
- # Breaks: no hicolor/ in either Debian or Fedora, but doesn't seem to matter
- cp --parents share/icons/hicolor/index.theme $BUILDPATH
- cp --parents share/glib-2.0/schemas/gschemas.compiled $BUILDPATH
- cp bin/gspawn-win??-helper*.exe $BUILDPATH/bin
-
- # Ugly hack since we now have all emulators in bin/ and updating the above
- # with BUILDDIR/bin seems to miss some DLL's:
- mv $BUILDPATH/*.dll $BUILDPATH/bin/
-
- # Some hardcoded stuff, we really should improve this script, separate it
- # into a new file. (libwinpthread-1.dll is symlinked from libwinphread-1.dll
- # (note the absence of the 't' in the latter)
- cp $loc/lib/libwinpthread-1.dll $BUILDPATH/bin
- # XXX: perhaps also libgcc* ? These are not in $loc
-
- cd $current
-
+# drop unzip.exe and its dependencies in the bin/ =)
+if test x"$UNZIPBIN" != "xno"; then
+ cp $UNZIPBIN $BUILDPATH/bin
+ cp `ntldd -R $UNZIPBIN | gawk '/\\\\bin\\\\/{print $3;}' | cygpath -f -` $BUILDPATH/bin
fi
+cd "$curdir"
+# Copy VICE data files
cp -a $TOPSRCDIR/data/C128 $TOPSRCDIR/data/C64 $BUILDPATH
cp -a $TOPSRCDIR/data/C64DTV $TOPSRCDIR/data/CBM-II $BUILDPATH
cp -a $TOPSRCDIR/data/DRIVES $TOPSRCDIR/data/PET $BUILDPATH
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <co...@us...> - 2025-02-06 10:27:40
|
Revision: 45474
http://sourceforge.net/p/vice-emu/code/45474
Author: compyx
Date: 2025-02-06 10:27:38 +0000 (Thu, 06 Feb 2025)
Log Message:
-----------
Gtk3: bindist script: abort if old bindist dir cannot be removed
Modified Paths:
--------------
trunk/vice/src/arch/gtk3/make-bindist_win32.sh
Modified: trunk/vice/src/arch/gtk3/make-bindist_win32.sh
===================================================================
--- trunk/vice/src/arch/gtk3/make-bindist_win32.sh 2025-02-05 18:40:33 UTC (rev 45473)
+++ trunk/vice/src/arch/gtk3/make-bindist_win32.sh 2025-02-06 10:27:38 UTC (rev 45474)
@@ -123,6 +123,10 @@
echo "Removing an old $BUILDPATH ..."
rm -r -f $BUILDPATH
+if [ "$?" -ne "0" ]; then
+ echo "Failed to remove $BUILDPATH, aborting."
+ exit 1
+fi
echo "Generating a $WINXX GTK3 port binary distribution..."
mkdir -p $BUILDPATH/bin
@@ -242,9 +246,6 @@
fi
-echo "TOPSRCDIR = $TOPSRCDIR"
-echo "BUILDPATH = $BUILDPATH"
-
cp -a $TOPSRCDIR/data/C128 $TOPSRCDIR/data/C64 $BUILDPATH
cp -a $TOPSRCDIR/data/C64DTV $TOPSRCDIR/data/CBM-II $BUILDPATH
cp -a $TOPSRCDIR/data/DRIVES $TOPSRCDIR/data/PET $BUILDPATH
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <co...@us...> - 2025-02-05 18:40:34
|
Revision: 45473
http://sourceforge.net/p/vice-emu/code/45473
Author: compyx
Date: 2025-02-05 18:40:33 +0000 (Wed, 05 Feb 2025)
Log Message:
-----------
archdep_fix_streams(): attach console before redirecting
See bug #2065. With cmd.exe `-help` dumps on console and can be redirected to file, piping (to more) is broken. PowerShell is worse, redirecting to file doesn't even work, so perhaps we need to call AttachConsole() even if FILE_TYPE_DISK, but only when using PowerShell?
Modified Paths:
--------------
trunk/vice/src/arch/shared/archdep_fix_streams.c
Modified: trunk/vice/src/arch/shared/archdep_fix_streams.c
===================================================================
--- trunk/vice/src/arch/shared/archdep_fix_streams.c 2025-02-05 15:16:12 UTC (rev 45472)
+++ trunk/vice/src/arch/shared/archdep_fix_streams.c 2025-02-05 18:40:33 UTC (rev 45473)
@@ -8,6 +8,9 @@
*
* \author Bas Wassink <b.w...@zi...>
*
+ * (With help from elgonzo to fix some issues, see
+ * https://sourceforge.net/p/vice-emu/bugs/2065/#4eb6)
+ *
* OS support:
* - Windows
*/
@@ -44,17 +47,12 @@
* running application so we can log to the terminal, if any, using those
* streams.
*
- * \todo Properly detect (if possible) if we're already redirected to a file
- * or pipe so `x64sc -help > help.txt` works. GetFileType() should
- * return something other than FILE_TYPE_CHAR when redirected or piped,
- * but of course that doesn't actually work on this shitshow they call
- * Windows.
+ * \todo Prompt doesn't reappear, need to press Enter in cmd.exe
+ * \todo Prompt reappears at odd location (middle of console) in case of
+ * PowerShell.
+ * \todo Piping (to `more`) doesn't work
*/
-#if 0
-#define DEBUG_FIX
-#endif
-
#ifdef WINDOWS_COMPILE
#include <windows.h>
@@ -61,112 +59,46 @@
#include <io.h>
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
+
void archdep_fix_streams(void)
{
- /* With --enable-debug we compile with -mconsole on Windows, so the streams
- * are available as they should be. */
+ /* We build with -mconsole for debug builds, so the following code should
+ * only run with --disable-debug (configure's default) */
#ifndef DEBUG
- const char *msystem;
-#ifdef DEBUG_FIX
- FILE *log = fopen("winapisux", "w");
-#endif
+ const char *msystem = getenv("MSYSTEM");
- /* try to attach a console to the spawning process (cmd.exe), but not when
- * running from an msys2 shell */
- msystem = getenv("MSYSTEM");
-#ifdef DEBUG_FIX
- fprintf(log, "env('MSYSTEM') = %s\n", msystem ? msystem : "<NULL>");
-#endif
if (msystem == NULL || *msystem == '\0') {
-#ifdef DEBUG_FIX
- fprintf(log, "calling AttachConsole(ATTACH_PARENT_PROCESS): ");
- fflush(log);
-#endif
- if (AttachConsole(ATTACH_PARENT_PROCESS)) {
-#ifdef DEBUG_FIX
- fprintf(log, "OK\n");
-#endif
- FILE *fp_stdin = stdin;
- FILE *fp_stdout = stdout;
- FILE *fp_stderr = stderr;
- HANDLE stdhandle;
- DWORD ftype;
- BY_HANDLE_FILE_INFORMATION finfo; /* wtf? */
-#ifdef DEBUG_FIX
- DWORD size;
- char path[4096];
-#endif
+ /* Not running from an MSYS shell: redirect stdout and stderr */
+ FILE *fp_out;
+ FILE *fp_err;
+ HANDLE handle;
+ DWORD filetype;
+ BOOL is_cons;
- /* redirect stdin */
- stdhandle = GetStdHandle(STD_INPUT_HANDLE);
- if (stdhandle) {
- ftype = GetFileType(stdhandle);
-#ifdef DEBUG_FIX
- fprintf(log, "GetFileType(STD_INPUT_HANDLE) = %lu\n", ftype);
-#endif
- if (ftype == FILE_TYPE_CHAR) {
- freopen_s(&fp_stdin, "CONIN$", "r", stdin);
- }
- CloseHandle(stdhandle);
- }
+ handle = GetStdHandle(STD_OUTPUT_HANDLE);
+ filetype = GetFileType(handle);
+ is_cons = (filetype == FILE_TYPE_UNKNOWN || filetype == FILE_TYPE_CHAR);
- /* redirect stdout */
- stdhandle = GetStdHandle(STD_OUTPUT_HANDLE);
- if (stdhandle) {
- /* XXX: always 2 (FILE_TYPE_CHAR) */
- ftype = GetFileType(stdhandle);
-#ifdef DEBUG_FIX
- fprintf(log, "GetFileType(STD_OUTPUT_HANDLE) = %lu\n", ftype);
-#endif
- /* XXX: always fails */
- if (GetFileInformationByHandle(stdhandle, &finfo)) {
-#ifdef DEBUG_FIX
- fprintf(log,
- "GetFileInformationByHandle(STD_OUTPUT_HANDLE) = %lx\n",
- finfo.dwFileAttributes);
-#endif
- }
+ if (filetype == FILE_TYPE_DISK) {
+ /* don't call AttachConsole in case of redirecting to file */
+ return;
+ }
- /* XXX: size is always 0 */
-#ifdef DEBUG_FIX
- memset(path, 0, sizeof(path));
- size = GetFinalPathNameByHandleA(stdhandle, path, sizeof(path), 0);
- fprintf(log,
- "GetFinalPathNameByHandleA(STD_OUTPUT_HANDLE) = %lu, '%s'\n",
- size, path);
-#endif
-
- if (ftype == FILE_TYPE_CHAR) {
- freopen_s(&fp_stdout, "CONOUT$", "w", stdout);
- }
+ /* attach console to process for output redirection */
+ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
+ if (is_cons) {
+ /* stdout is an interactive console */
+ freopen_s(&fp_out, "CONOUT$", "wt", stdout);
+ /* just redirect stderr as well, no idea if windows supports
+ * redirecting stdout but not stderr (or vice versa) */
+ freopen_s(&fp_err, "CONOUT$", "wt", stderr);
}
+ }
- /* redirect stderr */
- stdhandle = GetStdHandle(STD_ERROR_HANDLE);
- if (stdhandle) {
- ftype = GetFileType(stdhandle);
-#ifdef DEBUG_FIX
- fprintf(log, "GetFileType(STD_ERROR_HANDLE) = %lu\n", ftype);
-#endif
- if (ftype == FILE_TYPE_CHAR) {
- freopen_s(&fp_stderr, "CONOUT$", "w", stderr);
- }
- CloseHandle(stdhandle);
- }
- } else {
- /* Can't report failure since we can't use (f)printf and VICE's
- * logging system isn't initialized yet =) */
- /* NOP */
-#ifdef DEBUG_FIX
- fprintf(log, "failed, giving up.\n");
-#endif
- }
+ /* clean up */
+ CloseHandle(handle);
}
-#ifdef DEBUG_FIX
- fclose(log);
-#endif
#endif /* ifndef DEBUG */
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gp...@us...> - 2025-02-05 15:16:14
|
Revision: 45472
http://sourceforge.net/p/vice-emu/code/45472
Author: gpz
Date: 2025-02-05 15:16:12 +0000 (Wed, 05 Feb 2025)
Log Message:
-----------
fix url to development builds
Modified Paths:
--------------
trunk/vice/README
Modified: trunk/vice/README
===================================================================
--- trunk/vice/README 2025-02-02 21:22:56 UTC (rev 45471)
+++ trunk/vice/README 2025-02-05 15:16:12 UTC (rev 45472)
@@ -152,9 +152,9 @@
- the VICE wiki at http://vice-emu.pokefinder.org/
- - Before reporting a bug, please try a recent nightly build and check if your
- issue is already fixed. You can fine nightly builds for windows here:
- <SF-uploads via Travis-CI?>
+ - Before reporting a bug, please try a recent development build and check if
+ your issue is already fixed. You can find development builds for windows
+ here: https://github.com/VICE-Team/svn-mirror/releases
- When you report a bug, please try to be as accurate as possible and describe
how it can be reproduced to the very detail. You should also tell us what
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gp...@us...> - 2025-02-02 21:22:58
|
Revision: 45471
http://sourceforge.net/p/vice-emu/code/45471
Author: gpz
Date: 2025-02-02 21:22:56 +0000 (Sun, 02 Feb 2025)
Log Message:
-----------
added support for the 'Profi-DOS' cartridge by REX Datentechnik. Thanks to SubZero for providing the cartridge over 15 years ago >_<
Modified Paths:
--------------
trunk/vice/doc/vice.texi
trunk/vice/src/c64/cart/Makefile.am
trunk/vice/src/c64/cart/c64cart.c
trunk/vice/src/c64/cart/c64carthooks.c
trunk/vice/src/c64/cart/c64cartmem.c
trunk/vice/src/cartridge.h
trunk/vice/src/tools/cartconv/c64-cartridges.c
Added Paths:
-----------
trunk/vice/src/c64/cart/profidos.c
trunk/vice/src/c64/cart/profidos.h
Modified: trunk/vice/doc/vice.texi
===================================================================
--- trunk/vice/doc/vice.texi 2025-02-02 18:20:13 UTC (rev 45470)
+++ trunk/vice/doc/vice.texi 2025-02-02 21:22:56 UTC (rev 45471)
@@ -9765,6 +9765,8 @@
@item
Prophet64
@item
+Profi-DOS
+@item
REX 256KiB EPROM Cart
@item
REX RAM-Floppy
@@ -10182,6 +10184,10 @@
81: Universal Cartridge 1.5
@item
82: Universal Cartridge 2
+@item
+83: BMP Data Turbo
+@item
+84: Profi-DOS
@end itemize
@vindex CartridgeFile
@@ -23102,6 +23108,8 @@
Pagefox .crt file
@item partner64
Partner 64 .crt file
+@item pd
+Profi-DOS .crt file
@item rep256
REX 256KiB EPROM Cart .crt file, extra files can be inserted (1)(2)(3)
@item rgcd
@@ -29835,6 +29843,8 @@
@tab Universal Cartridge 2
@item 83
@tab BMP Data Turbo 2000
+@item 84
+@tab Profi-DOS
@end multitable
(*Note: Ocean type 1 includes Navy Seals, Robocop 2 & 3, Shadow of the Beast,
@@ -34146,6 +34156,74 @@
area (typically $DF00) and may be re-enabled by writing into I/O-1 ($DE00).
@c @node FIXME
+@subsubsection 84 - Profi-DOS
+
+@multitable @columnfractions .3 .7
+@item Size
+@tab 16KiB (2 banks of 8KiB)
+@item EXROM
+@tab inactive (hi) (1)
+@item GAME
+@tab active (lo) (0)
+@item Load address
+@tab $E000-$FFFF
+@end multitable
+
+@example
+ 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F ASCII
+ ----------------------------------------------- ----------------
+0000: 43 36 34 20 43 41 52 54 52 49 44 47 45 20 20 20 C64 CARTRIDGE
+0010: 00 00 00 40 01 00 00 54 01 00 00 00 00 00 00 00 ...@...T........
+0020: 50 72 6f 66 69 2d 44 4f 53 00 00 00 00 00 00 00 Profi-DOS.......
+0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
+0040: 43 48 49 50 00 00 20 10 00 00 00 00 e0 00 20 00 CHIP.. ....... .
+0050: 8d 9d 02 a9 eb 48 a9 8e 48 ad 9c 02 48 ad 9d 02 .....H..H...H...
+..
+2050: 43 48 49 50 00 00 20 10 00 00 00 01 e0 00 20 00 CHIP.. ....... .
+2060: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ................
+@end example
+
+ The ROM is connected like this:
+
+@example
+ Port EPROM
+
+ D7 => D6
+ D6 => D4
+ D5 => D7
+ D4 => D5
+ D3 => D0
+ D2 => D3
+ D1 => D1
+ D0 => D2
+
+ A0 => A0
+ A1 => A1
+ A2 => A2
+ A3 => A3
+ A4 => A4
+ A5 => A5
+ A6 => A6
+ A7 => A7
+ A8 => A12
+ A9 => A10
+ A10 => A11
+ A11 => A9
+ A12 => A8
+ A13 => A13
+@end example
+
+ After reorganizing the ROM data as shown above, the first 8k bank of the ROM
+ contains the code. The second bank is used as a lookup table, and wired so
+ that when D0 becomes active (=0), then a counter is started which counts 4
+ cycles. If during those 4 cycles D1 becomes active (=0), then the EPROM is
+ enabled and the cartridge enables ultimax mode for ROMH. This way the cart
+ can patch the kernal, without having an explicit enable mechanism - which
+ makes it hard to dump (you'll have to know the addresses where this happens)
+
+ Any access (read or write) to IO2 ($dfxx) will disable the cartridge again.
+
+@c @node FIXME
@subsection C128 Cartridge Specifics
Note: Cartridges that work on both C64 and C128 get "C64 Cartridge" type and get a
Modified: trunk/vice/src/c64/cart/Makefile.am
===================================================================
--- trunk/vice/src/c64/cart/Makefile.am 2025-02-02 18:20:13 UTC (rev 45470)
+++ trunk/vice/src/c64/cart/Makefile.am 2025-02-02 21:22:56 UTC (rev 45471)
@@ -162,6 +162,8 @@
pagefox.h \
partner64.c \
partner64.h \
+ profidos.c \
+ profidos.h \
prophet64.c \
prophet64.h \
ramcart.c \
Modified: trunk/vice/src/c64/cart/c64cart.c
===================================================================
--- trunk/vice/src/c64/cart/c64cart.c 2025-02-02 18:20:13 UTC (rev 45470)
+++ trunk/vice/src/c64/cart/c64cart.c 2025-02-02 21:22:56 UTC (rev 45471)
@@ -115,6 +115,7 @@
#include "pagefox.h"
#include "partner64.h"
#include "prophet64.h"
+#include "profidos.h"
#include "ramlink.h"
#include "retroreplay.h"
#include "rexep256.h"
@@ -300,6 +301,7 @@
{ CARTRIDGE_NAME_P64, CARTRIDGE_P64, CARTRIDGE_GROUP_UTIL },
{ CARTRIDGE_NAME_PAGEFOX, CARTRIDGE_PAGEFOX, CARTRIDGE_GROUP_UTIL },
{ CARTRIDGE_NAME_PARTNER64, CARTRIDGE_PARTNER64, CARTRIDGE_GROUP_UTIL },
+ { CARTRIDGE_NAME_PROFIDOS, CARTRIDGE_PROFIDOS, CARTRIDGE_GROUP_UTIL },
{ CARTRIDGE_NAME_RAMLINK, CARTRIDGE_RAMLINK, CARTRIDGE_GROUP_UTIL },
{ CARTRIDGE_NAME_RETRO_REPLAY, CARTRIDGE_RETRO_REPLAY, CARTRIDGE_GROUP_FREEZER },
{ CARTRIDGE_NAME_REX, CARTRIDGE_REX, CARTRIDGE_GROUP_UTIL },
@@ -480,6 +482,7 @@
case CARTRIDGE_P64:
case CARTRIDGE_PAGEFOX:
case CARTRIDGE_PARTNER64:
+ case CARTRIDGE_PROFIDOS:
case CARTRIDGE_RAMLINK:
case CARTRIDGE_RETRO_REPLAY:
case CARTRIDGE_REX:
@@ -937,6 +940,9 @@
case CARTRIDGE_PARTNER64:
rc = partner64_crt_attach(fd, rawcart);
break;
+ case CARTRIDGE_PROFIDOS:
+ rc = profidos_crt_attach(fd, rawcart);
+ break;
case CARTRIDGE_UC1:
rc = uc1_crt_attach(fd, rawcart);
break;
Modified: trunk/vice/src/c64/cart/c64carthooks.c
===================================================================
--- trunk/vice/src/c64/cart/c64carthooks.c 2025-02-02 18:20:13 UTC (rev 45470)
+++ trunk/vice/src/c64/cart/c64carthooks.c 2025-02-02 21:22:56 UTC (rev 45471)
@@ -126,6 +126,7 @@
#include "pagefox.h"
#include "partner64.h"
#include "prophet64.h"
+#include "profidos.h"
#include "ramcart.h"
#include "ramlink.h"
#include "retroreplay.h"
@@ -401,6 +402,9 @@
{ "-cartpartner64", CALL_FUNCTION, CMDLINE_ATTRIB_NEED_ARGS,
cart_attach_cmdline, (void *)CARTRIDGE_PARTNER64, NULL, NULL,
"<Name>", "Attach raw 16KiB " CARTRIDGE_NAME_PARTNER64 " cartridge image" },
+ { "-cartpd", CALL_FUNCTION, CMDLINE_ATTRIB_NEED_ARGS,
+ cart_attach_cmdline, (void *)CARTRIDGE_PROFIDOS, NULL, NULL,
+ "<Name>", "Attach raw 16KiB " CARTRIDGE_NAME_PROFIDOS " cartridge image" },
{ "-cartramcart", CALL_FUNCTION, CMDLINE_ATTRIB_NEED_ARGS,
cart_attach_cmdline, (void *)CARTRIDGE_RAMCART, NULL, NULL,
"<Name>", "Attach raw RamCart cartridge image" },
@@ -1025,6 +1029,8 @@
return pagefox_bin_attach(filename, rawcart);
case CARTRIDGE_PARTNER64:
return partner64_bin_attach(filename, rawcart);
+ case CARTRIDGE_PROFIDOS:
+ return profidos_bin_attach(filename, rawcart);
case CARTRIDGE_RETRO_REPLAY:
return retroreplay_bin_attach(filename, rawcart);
case CARTRIDGE_REX:
@@ -1297,6 +1303,9 @@
case CARTRIDGE_PARTNER64:
partner64_config_setup(rawcart);
break;
+ case CARTRIDGE_PROFIDOS:
+ profidos_config_setup(rawcart);
+ break;
case CARTRIDGE_RETRO_REPLAY:
retroreplay_config_setup(rawcart);
break;
@@ -1906,6 +1915,9 @@
case CARTRIDGE_PARTNER64:
partner64_detach();
break;
+ case CARTRIDGE_PROFIDOS:
+ profidos_detach();
+ break;
case CARTRIDGE_RETRO_REPLAY:
retroreplay_detach();
break;
@@ -2211,6 +2223,9 @@
case CARTRIDGE_PARTNER64:
partner64_config_init();
break;
+ case CARTRIDGE_PROFIDOS:
+ profidos_config_init();
+ break;
case CARTRIDGE_RETRO_REPLAY:
retroreplay_config_init();
break;
@@ -2432,6 +2447,9 @@
case CARTRIDGE_PARTNER64:
partner64_reset();
break;
+ case CARTRIDGE_PROFIDOS:
+ profidos_reset();
+ break;
case CARTRIDGE_REX_RAMFLOPPY:
rexramfloppy_reset();
break;
@@ -3632,6 +3650,11 @@
return -1;
}
break;
+ case CARTRIDGE_PROFIDOS:
+ if (profidos_snapshot_write_module(s) < 0) {
+ return -1;
+ }
+ break;
case CARTRIDGE_RETRO_REPLAY:
if (retroreplay_snapshot_write_module(s) < 0) {
return -1;
@@ -4242,6 +4265,11 @@
goto fail2;
}
break;
+ case CARTRIDGE_PROFIDOS:
+ if (profidos_snapshot_read_module(s) < 0) {
+ goto fail2;
+ }
+ break;
case CARTRIDGE_RETRO_REPLAY:
if (retroreplay_snapshot_read_module(s) < 0) {
goto fail2;
Modified: trunk/vice/src/c64/cart/c64cartmem.c
===================================================================
--- trunk/vice/src/c64/cart/c64cartmem.c 2025-02-02 18:20:13 UTC (rev 45470)
+++ trunk/vice/src/c64/cart/c64cartmem.c 2025-02-02 21:22:56 UTC (rev 45471)
@@ -106,6 +106,7 @@
#include "pagefox.h"
#include "partner64.h"
#include "prophet64.h"
+#include "profidos.h"
#include "ramcart.h"
#include "ramlink.h"
#include "retroreplay.h"
@@ -695,6 +696,7 @@
case CARTRIDGE_FORMEL64:
case CARTRIDGE_GAME_KILLER:
case CARTRIDGE_MAGIC_FORMEL: /* ? */
+ case CARTRIDGE_PROFIDOS:
/* fake ultimax hack */
return mem_read_without_ultimax(addr);
case CARTRIDGE_ACTION_REPLAY4:
@@ -859,6 +861,7 @@
case CARTRIDGE_GMOD3:
case CARTRIDGE_STARDOS:
case CARTRIDGE_MAGIC_FORMEL: /* ? */
+ case CARTRIDGE_PROFIDOS:
/* fake ultimax hack */
mem_store_without_ultimax(addr, value);
return;
@@ -945,6 +948,7 @@
case CARTRIDGE_EXOS:
case CARTRIDGE_GMOD2:
case CARTRIDGE_STARDOS:
+ case CARTRIDGE_PROFIDOS:
/* fake ultimax hack, read from ram */
return ram_read(addr);
case CARTRIDGE_GMOD3:
@@ -1072,6 +1076,8 @@
return ocean_romh_read(addr);
case CARTRIDGE_PARTNER64:
return partner64_romh_read(addr);
+ case CARTRIDGE_PROFIDOS:
+ return profidos_romh_read_hirom(addr);
case CARTRIDGE_RETRO_REPLAY:
return retroreplay_romh_read(addr);
case CARTRIDGE_UC1:
@@ -1206,6 +1212,7 @@
case CARTRIDGE_GMOD3:
case CARTRIDGE_IEEEFLASH64:
case CARTRIDGE_MAGIC_FORMEL: /* ? */
+ case CARTRIDGE_PROFIDOS:
case CARTRIDGE_STARDOS:
case CARTRIDGE_SNAPSHOT64: /* ? */
/* fake ultimax hack, c64 ram */
@@ -1507,6 +1514,7 @@
case CARTRIDGE_KINGSOFT:
case CARTRIDGE_LT_KERNAL:
case CARTRIDGE_MAGIC_FORMEL:
+ case CARTRIDGE_PROFIDOS:
case CARTRIDGE_STARDOS:
/* fake ultimax hack, c64 ram */
return mem_read_without_ultimax(addr);
@@ -1601,6 +1609,7 @@
case CARTRIDGE_LT_KERNAL:
case CARTRIDGE_MAGIC_FORMEL:
case CARTRIDGE_PARTNER64:
+ case CARTRIDGE_PROFIDOS:
case CARTRIDGE_STARDOS:
/* fake ultimax hack, c64 ram */
mem_store_without_ultimax(addr, value);
@@ -1656,6 +1665,7 @@
case CARTRIDGE_GMOD3:
case CARTRIDGE_LT_KERNAL:
case CARTRIDGE_MAGIC_FORMEL:
+ case CARTRIDGE_PROFIDOS:
case CARTRIDGE_STARDOS:
/* fake ultimax hack, c64 basic, ram */
return mem_read_without_ultimax(addr);
@@ -1762,6 +1772,7 @@
case CARTRIDGE_GMOD3:
case CARTRIDGE_LT_KERNAL:
case CARTRIDGE_MAGIC_FORMEL:
+ case CARTRIDGE_PROFIDOS:
case CARTRIDGE_STARDOS:
/* fake ultimax hack, c64 ram */
mem_store_without_ultimax(addr, value);
@@ -1808,6 +1819,7 @@
case CARTRIDGE_KINGSOFT:
case CARTRIDGE_LT_KERNAL:
case CARTRIDGE_MAGIC_FORMEL:
+ case CARTRIDGE_PROFIDOS:
case CARTRIDGE_STARDOS:
/* fake ultimax hack, c64 ram */
return mem_read_without_ultimax(addr);
@@ -1886,6 +1898,7 @@
case CARTRIDGE_LT_KERNAL:
case CARTRIDGE_MAGIC_FORMEL:
case CARTRIDGE_PARTNER64:
+ case CARTRIDGE_PROFIDOS:
case CARTRIDGE_STARDOS:
/* fake ultimax hack, c64 ram */
mem_store_without_ultimax(addr, value);
@@ -1923,6 +1936,7 @@
case CARTRIDGE_KINGSOFT:
case CARTRIDGE_LT_KERNAL:
case CARTRIDGE_MAGIC_FORMEL:
+ case CARTRIDGE_PROFIDOS:
case CARTRIDGE_SNAPSHOT64: /* ? */
case CARTRIDGE_STARDOS:
/* fake ultimax hack, c64 io,colram,ram */
@@ -1997,6 +2011,7 @@
case CARTRIDGE_KINGSOFT:
case CARTRIDGE_LT_KERNAL:
case CARTRIDGE_MAGIC_FORMEL:
+ case CARTRIDGE_PROFIDOS:
case CARTRIDGE_SNAPSHOT64: /* ? */
case CARTRIDGE_STARDOS:
/* fake ultimax hack, c64 io,colram,ram */
@@ -2056,6 +2071,9 @@
case CARTRIDGE_MMC_REPLAY:
res = mmcreplay_romh_phi1_read(addr, value);
break;
+ case CARTRIDGE_PROFIDOS:
+ res = profidos_romh_phi1_read(addr, value);
+ break;
case CARTRIDGE_STARDOS:
res = stardos_romh_phi1_read(addr, value);
break;
@@ -2179,6 +2197,9 @@
case CARTRIDGE_MMC_REPLAY:
res = mmcreplay_romh_phi2_read(addr, value);
break;
+ case CARTRIDGE_PROFIDOS:
+ res = profidos_romh_phi2_read(addr, value);
+ break;
case CARTRIDGE_STARDOS:
res = stardos_romh_phi2_read(addr, value);
break;
@@ -2411,6 +2432,9 @@
case CARTRIDGE_MAGIC_FORMEL:
res = magicformel_peek_mem(&export_slotmain, addr, &value);
break;
+ case CARTRIDGE_PROFIDOS:
+ res = profidos_peek_mem(&export_slotmain, addr, &value);
+ break;
case CARTRIDGE_RETRO_REPLAY:
res = retroreplay_peek_mem(&export_slotmain, addr, &value);
break;
Added: trunk/vice/src/c64/cart/profidos.c
===================================================================
--- trunk/vice/src/c64/cart/profidos.c (rev 0)
+++ trunk/vice/src/c64/cart/profidos.c 2025-02-02 21:22:56 UTC (rev 45471)
@@ -0,0 +1,358 @@
+/*
+ * profidos.c - Cartridge handling, Profi-DOS cart.
+ *
+ * Written by
+ * groepaz <gr...@gm...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#include "vice.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#define CARTRIDGE_INCLUDE_SLOTMAIN_API
+#include "c64cartsystem.h"
+#undef CARTRIDGE_INCLUDE_SLOTMAIN_API
+#include "c64mem.h"
+#include "c64memrom.h"
+#include "c64rom.h"
+#include "cartio.h"
+#include "cartridge.h"
+#include "log.h"
+#include "maincpu.h"
+#include "monitor.h"
+#include "profidos.h"
+#include "export.h"
+#include "resources.h"
+#include "snapshot.h"
+#include "types.h"
+#include "util.h"
+#include "crt.h"
+
+/* #define DEBUG_PROFIDOS */
+
+#ifdef DEBUG_PROFIDOS
+#define DBG(x) log_printf x
+#else
+#define DBG(x)
+#endif
+
+/*
+ Profi-DOS (REX Datentechnik)
+
+ 16K ROM (27128)
+
+ The ROM is connected like this:
+
+ Port EPROM
+
+ D7 => D6
+ D6 => D4
+ D5 => D7
+ D4 => D5
+ D3 => D0
+ D2 => D3
+ D1 => D1
+ D0 => D2
+
+ A0 => A0
+ A1 => A1
+ A2 => A2
+ A3 => A3
+ A4 => A4
+ A5 => A5
+ A6 => A6
+ A7 => A7
+ A8 => A12
+ A9 => A10
+ A10 => A11
+ A11 => A9
+ A12 => A8
+ A13 => A13
+
+ After reorganizing the ROM data as shown above, the first 8k bank of the ROM
+ contains the code. The second bank is used as a lookup table, and wired so
+ that when D0 becomes active (=0), then a counter is started which counts 4
+ cycles. If during those 4 cycles D1 becomes active (=0), then the EPROM is
+ enabled and the cartridge enables ultimax mode for ROMH. This way the cart
+ can patch the kernal, without having an explicit enable mechanism - which
+ makes it hard to dump (you'll have to know the addresses where this happens)
+
+ Any access (read or write) to IO2 ($dfxx) will disable the cartridge again.
+*/
+
+static int enabled = 0;
+static CLOCK check_cycles = 0;
+
+static void profidos_io2_store(uint16_t addr, uint8_t value);
+static uint8_t profidos_io2_read(uint16_t addr);
+static int profidos_dump(void);
+
+static io_source_t profidos_io2_device = {
+ CARTRIDGE_NAME_PROFIDOS, /* name of the device */
+ IO_DETACH_CART, /* use cartridge ID to detach the device when involved in a read-collision */
+ IO_DETACH_NO_RESOURCE, /* does not use a resource for detach */
+ 0xdf00, 0xdfff, 0xff, /* range for the device, regs:$df00-$dfff */
+ 0, /* read is never valid */
+ profidos_io2_store, /* store function */
+ NULL, /* NO poke function */
+ profidos_io2_read, /* read function */
+ NULL, /* NO peek function */
+ profidos_dump, /* device state information dump function */
+ CARTRIDGE_PROFIDOS, /* cartridge ID */
+ IO_PRIO_NORMAL, /* normal priority, device read needs to be checked for collisions */
+ 0, /* insertion order, gets filled in by the registration function */
+ IO_MIRROR_NONE /* NO mirroring */
+};
+
+static const export_resource_t export_res = {
+ CARTRIDGE_NAME_PROFIDOS, 0, 1, NULL, &profidos_io2_device, CARTRIDGE_PROFIDOS
+};
+
+static io_source_list_t *profidos_io2_list_item = NULL;
+
+/* ---------------------------------------------------------------------*/
+
+static int profidos_dump(void)
+{
+ mon_out("enabled: %s\n", enabled ? "yes" : "no");
+ return 0;
+}
+
+static void profidos_io2_store(uint16_t addr, uint8_t value)
+{
+ DBG(("%08lx profidos_io2_store %04x %02x", maincpu_clk, addr, value));
+ enabled = 0;
+}
+
+static uint8_t profidos_io2_read(uint16_t addr)
+{
+ DBG(("%08lx profidos_io2_read %04x", maincpu_clk, addr));
+ enabled = 0;
+ return 0;
+}
+
+uint8_t profidos_romh_read_hirom(uint16_t addr)
+{
+ static int lastenabled = -1;
+
+ /* second ROM bank contains 0xfe (D0 active), 0xfd (D1 active)
+ at the enable address
+
+ e386: fe e387: fd
+ e5a8: fe e5a9: fd
+ e5ea: fe e5eb: fd
+ eb82: fe eb83: fd
+ eb8f: fe eb90: fd
+ eb91: fe eb92: fd
+ eb9f: fe eba0: fd
+ eba1: fe eba2: fd
+ f1cb: fe f1cc: fd
+ f3d5: fe f3d6: fd
+ f4c4: fe f4c5: fd
+ f615: fe f616: fd
+ fcea: fe fceb: fd
+ fd65: fe fd66: fd
+ fe73: fe fe74: fd
+
+ */
+
+ if ((romh_banks[0x2000 + (addr & 0x1fff)] & 1) == 0) {
+ /* D0 is active -> start the enable counter */
+ check_cycles = maincpu_clk;
+ DBG(("%08lx profidos_romh_read_hirom %04x enabled:%d %02x",
+ maincpu_clk, addr, enabled, romh_banks[0x2000 + (addr & 0x1fff)]));
+ }
+ if ((romh_banks[0x2000 + (addr & 0x1fff)] & 2) == 0) {
+ /* D1 is active -> enable the ROM */
+ if ((maincpu_clk - check_cycles) <= 4) {
+ enabled = 1;
+ }
+ DBG(("%08lx profidos_romh_read_hirom %04x enabled:%d %02x",
+ maincpu_clk, addr, enabled, romh_banks[0x2000 + (addr & 0x1fff)]));
+ }
+
+ if (enabled != lastenabled) {
+ DBG(("%08lx profidos_romh_read_hirom %04x enabled:%d %02x",
+ maincpu_clk, addr, enabled, romh_banks[0x2000 + (addr & 0x1fff)]));
+ lastenabled = enabled;
+ }
+
+ if (enabled) {
+ return romh_banks[(addr & 0x1fff)];
+ }
+
+ return mem_read_without_ultimax(addr);
+}
+
+int profidos_romh_phi1_read(uint16_t addr, uint8_t *value)
+{
+ return CART_READ_C64MEM;
+}
+
+int profidos_romh_phi2_read(uint16_t addr, uint8_t *value)
+{
+ return profidos_romh_phi1_read(addr, value);
+}
+
+int profidos_peek_mem(export_t *ex, uint16_t addr, uint8_t *value)
+{
+ if (addr >= 0xe000) {
+ *value = romh_banks[addr & 0x1fff];
+ return CART_READ_VALID;
+ }
+ return CART_READ_THROUGH;
+}
+
+void profidos_config_init(void)
+{
+ cart_config_changed_slotmain(CMODE_RAM, CMODE_ULTIMAX, CMODE_READ);
+}
+
+void profidos_reset(void)
+{
+ enabled = 0;
+ cart_config_changed_slotmain(CMODE_RAM, CMODE_ULTIMAX, CMODE_READ);
+}
+
+/* ---------------------------------------------------------------------*/
+
+void profidos_config_setup(uint8_t *rawcart)
+{
+ memcpy(romh_banks, &rawcart[0], 0x4000);
+ cart_config_changed_slotmain(CMODE_RAM, CMODE_ULTIMAX, CMODE_READ);
+}
+
+/* ---------------------------------------------------------------------*/
+
+static int profidos_common_attach(void)
+{
+ if (export_add(&export_res) < 0) {
+ return -1;
+ }
+
+ profidos_io2_list_item = io_source_register(&profidos_io2_device);
+
+ return 0;
+}
+
+int profidos_bin_attach(const char *filename, uint8_t *rawcart)
+{
+ if (util_file_load(filename, rawcart, 0x4000, UTIL_FILE_LOAD_SKIP_ADDRESS) < 0) {
+ return -1;
+ }
+
+ return profidos_common_attach();
+}
+
+int profidos_crt_attach(FILE *fd, uint8_t *rawcart)
+{
+ crt_chip_header_t chip;
+ int i, banks = 0;
+
+ for (i = 0; i <= 2; i++) {
+ if (crt_read_chip_header(&chip, fd)) {
+ break;
+ }
+
+ if (chip.bank > 2 || chip.size != 0x2000) {
+ break;
+ }
+
+ if (crt_read_chip(rawcart, chip.bank << 13, &chip, fd)) {
+ break;
+ }
+ ++banks;
+ }
+
+ if (banks != 2) {
+ return -1;
+ }
+
+ return profidos_common_attach();
+}
+
+void profidos_detach(void)
+{
+ export_remove(&export_res);
+}
+
+/* ---------------------------------------------------------------------*/
+
+/* CARTPROFIDOS snapshot module format:
+
+ type | name | description
+ --------------------------
+ ARRAY | ROMH | $4000 BYTES of ROMH data
+ */
+
+static const char snap_module_name[] = "CARTPROFIDOS";
+#define SNAP_MAJOR 0
+#define SNAP_MINOR 0
+
+int profidos_snapshot_write_module(snapshot_t *s)
+{
+ snapshot_module_t *m;
+
+ m = snapshot_module_create(s, snap_module_name, SNAP_MAJOR, SNAP_MINOR);
+
+ if (m == NULL) {
+ return -1;
+ }
+
+ if (SMW_BA(m, romh_banks, 0x4000) < 0) {
+ snapshot_module_close(m);
+ return -1;
+ }
+
+ return snapshot_module_close(m);
+}
+
+int profidos_snapshot_read_module(snapshot_t *s)
+{
+ uint8_t vmajor, vminor;
+ snapshot_module_t *m;
+
+ m = snapshot_module_open(s, snap_module_name, &vmajor, &vminor);
+
+ if (m == NULL) {
+ return -1;
+ }
+
+ /* Do not accept versions higher than current */
+ if (snapshot_version_is_bigger(vmajor, vminor, SNAP_MAJOR, SNAP_MINOR)) {
+ snapshot_set_error(SNAPSHOT_MODULE_HIGHER_VERSION);
+ goto fail;
+ }
+
+ if (SMR_BA(m, romh_banks, 0x4000) < 0) {
+ goto fail;
+ }
+
+ snapshot_module_close(m);
+
+ return profidos_common_attach();
+
+fail:
+ snapshot_module_close(m);
+ return -1;
+}
Added: trunk/vice/src/c64/cart/profidos.h
===================================================================
--- trunk/vice/src/c64/cart/profidos.h (rev 0)
+++ trunk/vice/src/c64/cart/profidos.h 2025-02-02 21:22:56 UTC (rev 45471)
@@ -0,0 +1,52 @@
+/*
+ * profidos.h - Cartridge handling, ProfiDOS cart.
+ *
+ * Written by
+ * groepaz <gr...@gm...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#ifndef VICE_PROFIDOS_H
+#define VICE_PROFIDOS_H
+
+#include <stdio.h>
+
+#include "types.h"
+#include "c64cart.h"
+
+struct snapshot_s;
+
+uint8_t profidos_romh_read_hirom(uint16_t addr);
+int profidos_romh_phi1_read(uint16_t addr, uint8_t *value);
+int profidos_romh_phi2_read(uint16_t addr, uint8_t *value);
+int profidos_peek_mem(export_t *export, uint16_t addr, uint8_t *value);
+
+void profidos_config_init(void);
+void profidos_reset(void);
+void profidos_config_setup(uint8_t *rawcart);
+int profidos_bin_attach(const char *filename, uint8_t *rawcart);
+int profidos_crt_attach(FILE *fd, uint8_t *rawcart);
+void profidos_detach(void);
+
+int profidos_snapshot_write_module(struct snapshot_s *s);
+int profidos_snapshot_read_module(struct snapshot_s *s);
+
+#endif
Modified: trunk/vice/src/cartridge.h
===================================================================
--- trunk/vice/src/cartridge.h 2025-02-02 18:20:13 UTC (rev 45470)
+++ trunk/vice/src/cartridge.h 2025-02-02 21:22:56 UTC (rev 45471)
@@ -266,7 +266,8 @@
#define CARTRIDGE_UC15 81 /* uc2.c */
#define CARTRIDGE_UC2 82 /* uc2.c */
#define CARTRIDGE_BMPDATATURBO 83 /* bmpdataturbo.c */
-#define CARTRIDGE_LAST 83 /* cartconv: last cartridge in list */
+#define CARTRIDGE_PROFIDOS 84 /* profidos.c */
+#define CARTRIDGE_LAST 84 /* cartconv: last cartridge in list */
/* list of canonical names for the c64 cartridges:
note: often it is hard to determine "the" official name, let alone the way it
@@ -352,6 +353,7 @@
#define CARTRIDGE_NAME_OCEAN "Ocean"
#define CARTRIDGE_NAME_PAGEFOX "Pagefox"
#define CARTRIDGE_NAME_PARTNER64 "Partner 64"
+#define CARTRIDGE_NAME_PROFIDOS "Profi-DOS"
#define CARTRIDGE_NAME_MIDI_PASSPORT "Passport MIDI"
#define CARTRIDGE_NAME_P64 "Prophet64" /* see http://www.prophet64.com/ */
#define CARTRIDGE_NAME_RAMCART "RamCart" /* see cc65 driver */
Modified: trunk/vice/src/tools/cartconv/c64-cartridges.c
===================================================================
--- trunk/vice/src/tools/cartconv/c64-cartridges.c 2025-02-02 18:20:13 UTC (rev 45470)
+++ trunk/vice/src/tools/cartconv/c64-cartridges.c 2025-02-02 21:22:56 UTC (rev 45471)
@@ -151,6 +151,7 @@
CARTRIDGE_SIZE_256KB |
CARTRIDGE_SIZE_512KB, 0x4000, 0x8000, 0, 2, CARTRIDGE_NAME_UC2, "uc2", save_regular_crt},
{0, 0, CARTRIDGE_SIZE_16KB, 0x4000, 0x8000, 1, 0, CARTRIDGE_NAME_BMPDATATURBO, "bdt", save_regular_crt},
+ {1, 0, CARTRIDGE_SIZE_16KB, 0x2000, 0xe000, 2, 0, CARTRIDGE_NAME_PROFIDOS, "pd", save_regular_crt},
{0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL}
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
19 messages has been excluded from this view by a project administrator.