[fuse-emulator-cvs] [fuse] 03/04: Remove GTK names for XPM icons used in Xlib UI

[<sba...@us...>]

This is an automated email from the git hooks/post-receive-user script.

sbaldovi pushed a commit to branch master
in repository fuse.

View the commit online:
https://sourceforge.net/p/fuse-emulator/fuse/ci/8f1102713187dadea6ea7a78cfb3e5afda383c51/

commit 8f1102713187dadea6ea7a78cfb3e5afda383c51
Author: Sergio Baldoví <ser...@gm...>
AuthorDate: Sat Oct 19 09:41:22 2024 +0200

    Remove GTK names for XPM icons used in Xlib UI
---
 ui/xlib/xpixmaps.c.in | 22 +++++++++++-----------
 ui/xlib/xstatusbar.pl |  1 -
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/ui/xlib/xpixmaps.c.in b/ui/xlib/xpixmaps.c.in
index a86ecbda..7ae2dc90 100644
--- a/ui/xlib/xpixmaps.c.in
+++ b/ui/xlib/xpixmaps.c.in
@@ -23,7 +23,7 @@
 
 #error "This file is used to generate ui/xlib/xpixmaps.c and is not meant to be compiled"
 
-const char *gtkpixmap_tape_inactive[] = {
+const char *pixmap_tape_inactive[] = {
 "27 17 13 1",
 " 	c None",
 ".	c #D5D5D5",
@@ -56,7 +56,7 @@ const char *gtkpixmap_tape_inactive[] = {
 ".+..>.................>..+.",
 "....>.................>...."};
 
-const char *gtkpixmap_tape_active[] = {
+const char *pixmap_tape_active[] = {
 "27 17 13 1",
 " 	c None",
 ".	c #00D500",
@@ -89,7 +89,7 @@ const char *gtkpixmap_tape_active[] = {
 ".+..>.................>..+.",
 "....>.................>...."};
 
-const char *gtkpixmap_mdr_inactive[] = {
+const char *pixmap_mdr_inactive[] = {
 "15 20 6 1",
 " 	c None",
 ".	c #000000",
@@ -118,7 +118,7 @@ const char *gtkpixmap_mdr_inactive[] = {
 "+++++++++++++++",
 "+++++++++++++++"};
 
-const char *gtkpixmap_mdr_active[] = {
+const char *pixmap_mdr_active[] = {
 "15 20 6 1",
 " 	c None",
 ".	c #000000",
@@ -147,7 +147,7 @@ const char *gtkpixmap_mdr_active[] = {
 "+++++++++++++++",
 "+++++++++++++++"};
 
-const char *gtkpixmap_disk_inactive[] = {
+const char *pixmap_disk_inactive[] = {
 "15 20 7 1",
 " 	c None",
 ".	c #A5A5A5",
@@ -177,7 +177,7 @@ const char *gtkpixmap_disk_inactive[] = {
 "++@@@@@@@#@@#..",
 "..##@#@@@@#@#.+"};
 
-const char *gtkpixmap_disk_active[] = {
+const char *pixmap_disk_active[] = {
 "15 20 7 1",
 " 	c None",
 ".	c #00A500",
@@ -207,7 +207,7 @@ const char *gtkpixmap_disk_active[] = {
 "++@@@@@@@#@@#..",
 "..##@#@@@@#@#.+"};
 
-const char *gtkpixmap_pause_inactive[] = {
+const char *pixmap_pause_inactive[] = {
 "30 21 7 1",
 " 	c None",
 ".	c #6C6C6C",
@@ -238,7 +238,7 @@ const char *gtkpixmap_pause_inactive[] = {
 "                   #$$$$+     ",
 "                     %$@      "};
 
-const char *gtkpixmap_pause_active[] = {
+const char *pixmap_pause_active[] = {
 "30 21 7 1",
 " 	c None",
 ".	c #D80000",
@@ -269,7 +269,7 @@ const char *gtkpixmap_pause_active[] = {
 "                   #$$$$+     ",
 "                     %$@      "};
 
-const char *gtkpixmap_tape_marker[] = {
+const char *pixmap_tape_marker[] = {
 "8 16 2 1",
 " 	c None",
 ".	c #212FC6",
@@ -290,7 +290,7 @@ const char *gtkpixmap_tape_marker[] = {
 "..      ",
 ".       "};
 
-const char *gtkpixmap_mouse_inactive[] = {
+const char *pixmap_mouse_inactive[] = {
 "14 21 4 1",
 "     c None",
 "#    c #6C6C6C",
@@ -318,7 +318,7 @@ const char *gtkpixmap_mouse_inactive[] = {
 " +##########+ ",
 "  ++######++  "};
 
-const char *gtkpixmap_mouse_active[] = {
+const char *pixmap_mouse_active[] = {
 "14 21 4 1",
 "     c None",
 "#    c #0000D0",
diff --git a/ui/xlib/xstatusbar.pl b/ui/xlib/xstatusbar.pl
index fd6644dd..979bf1ba 100644
--- a/ui/xlib/xstatusbar.pl
+++ b/ui/xlib/xstatusbar.pl
@@ -174,7 +174,6 @@ sub xpm_read() {
         next if($var_name =~ /tape_marker/);
         next if($var_name =~ /pause/);
         next if($var_name =~ /mouse/);
-        $var_name =~ s/gtkpixmap/pixmap/;
         %colors = ();
         $def = '';
         $col = 'AA';