From f98fa39069610fd22806ed4414b5309f5ac34957 Mon Sep 17 00:00:00 2001 From: domichel Date: Mon, 6 Jan 2020 23:19:34 +0100 Subject: [PATCH 1/4] Fix converting of multi-images icon files --- bin/fvwm-menu-desktop.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/fvwm-menu-desktop.in b/bin/fvwm-menu-desktop.in index 955846ba1..f485e374b 100644 --- a/bin/fvwm-menu-desktop.in +++ b/bin/fvwm-menu-desktop.in @@ -2,6 +2,10 @@ # Modification History +# Changed on 18/03/19 by Dominique Michel: +# - Fix converting of multi-images icon files; +# use the first one. + # Changed on 18/03/19 by Jaimos Skriletz: # - Updated script for and require Python 3. # - Drop support for Python 2. @@ -629,7 +633,7 @@ def geticonfile(icon): os.system("if test \\( \\( ! -f '%s' \\) -o \\( '%s' -nt '%s' \\) \\) -o \\( '%s' != '%s' \\); then convert -background none '%s' -resize %i '%s' ; fi"% (iconfile, iconpath, iconfile, current_theme, previous_theme, iconpath, size, iconfile)) else: - os.system("if test \\( \\( ! -f '%s' \\) -o \\( '%s' -nt '%s' \\) \\) -o \\( '%s' != '%s' \\); then convert '%s' -resize %i '%s' ; fi"% + os.system("if test \\( \\( ! -f '%s' \\) -o \\( '%s' -nt '%s' \\) \\) -o \\( '%s' != '%s' \\); then convert '%s'[0] -resize %i '%s' ; fi"% (iconfile, iconpath, iconfile, current_theme, previous_theme, iconpath, size, iconfile)) else: sys.stderr.write("%s not found! Using default icon.\n" % iconpath) From 7dc527224685376020fbcd6fb35a7dc510531408 Mon Sep 17 00:00:00 2001 From: domichel Date: Mon, 6 Jan 2020 23:29:10 +0100 Subject: [PATCH 2/4] Oops, the date --- bin/fvwm-menu-desktop.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/fvwm-menu-desktop.in b/bin/fvwm-menu-desktop.in index f485e374b..a568f00ae 100644 --- a/bin/fvwm-menu-desktop.in +++ b/bin/fvwm-menu-desktop.in @@ -2,7 +2,7 @@ # Modification History -# Changed on 18/03/19 by Dominique Michel: +# Changed on 06/01/20 by Dominique Michel: # - Fix converting of multi-images icon files; # use the first one. From cf58ab12aca0d48f7bf7301b16966456a4221351 Mon Sep 17 00:00:00 2001 From: domichel Date: Tue, 7 Jan 2020 14:17:43 +0100 Subject: [PATCH 3/4] Fix converting of multi-images icon files --- bin/fvwm-menu-desktop.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/fvwm-menu-desktop.in b/bin/fvwm-menu-desktop.in index 955846ba1..a568f00ae 100644 --- a/bin/fvwm-menu-desktop.in +++ b/bin/fvwm-menu-desktop.in @@ -2,6 +2,10 @@ # Modification History +# Changed on 06/01/20 by Dominique Michel: +# - Fix converting of multi-images icon files; +# use the first one. + # Changed on 18/03/19 by Jaimos Skriletz: # - Updated script for and require Python 3. # - Drop support for Python 2. @@ -629,7 +633,7 @@ def geticonfile(icon): os.system("if test \\( \\( ! -f '%s' \\) -o \\( '%s' -nt '%s' \\) \\) -o \\( '%s' != '%s' \\); then convert -background none '%s' -resize %i '%s' ; fi"% (iconfile, iconpath, iconfile, current_theme, previous_theme, iconpath, size, iconfile)) else: - os.system("if test \\( \\( ! -f '%s' \\) -o \\( '%s' -nt '%s' \\) \\) -o \\( '%s' != '%s' \\); then convert '%s' -resize %i '%s' ; fi"% + os.system("if test \\( \\( ! -f '%s' \\) -o \\( '%s' -nt '%s' \\) \\) -o \\( '%s' != '%s' \\); then convert '%s'[0] -resize %i '%s' ; fi"% (iconfile, iconpath, iconfile, current_theme, previous_theme, iconpath, size, iconfile)) else: sys.stderr.write("%s not found! Using default icon.\n" % iconpath) From e4932a44bb13e41697b89131e15c35421fda31fd Mon Sep 17 00:00:00 2001 From: domichel Date: Tue, 7 Jan 2020 14:28:12 +0100 Subject: [PATCH 4/4] Back to origin --- bin/fvwm-menu-desktop.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/fvwm-menu-desktop.in b/bin/fvwm-menu-desktop.in index 955846ba1..a568f00ae 100644 --- a/bin/fvwm-menu-desktop.in +++ b/bin/fvwm-menu-desktop.in @@ -2,6 +2,10 @@ # Modification History +# Changed on 06/01/20 by Dominique Michel: +# - Fix converting of multi-images icon files; +# use the first one. + # Changed on 18/03/19 by Jaimos Skriletz: # - Updated script for and require Python 3. # - Drop support for Python 2. @@ -629,7 +633,7 @@ def geticonfile(icon): os.system("if test \\( \\( ! -f '%s' \\) -o \\( '%s' -nt '%s' \\) \\) -o \\( '%s' != '%s' \\); then convert -background none '%s' -resize %i '%s' ; fi"% (iconfile, iconpath, iconfile, current_theme, previous_theme, iconpath, size, iconfile)) else: - os.system("if test \\( \\( ! -f '%s' \\) -o \\( '%s' -nt '%s' \\) \\) -o \\( '%s' != '%s' \\); then convert '%s' -resize %i '%s' ; fi"% + os.system("if test \\( \\( ! -f '%s' \\) -o \\( '%s' -nt '%s' \\) \\) -o \\( '%s' != '%s' \\); then convert '%s'[0] -resize %i '%s' ; fi"% (iconfile, iconpath, iconfile, current_theme, previous_theme, iconpath, size, iconfile)) else: sys.stderr.write("%s not found! Using default icon.\n" % iconpath)