From 4dc6270630ff8d8d5021b450000c1dd9df1b8418 Mon Sep 17 00:00:00 2001
From: Daniel Napora <napcok@gmail.com>
Date: Sat, 10 Jun 2023 06:33:10 +0200
Subject: [PATCH] mb-music

---
 usr/bin/mb-music | 50 ++++++++++++++++--------------------------------
 1 file changed, 17 insertions(+), 33 deletions(-)

diff --git a/usr/bin/mb-music b/usr/bin/mb-music
index 57599fd..68c6650 100755
--- a/usr/bin/mb-music
+++ b/usr/bin/mb-music
@@ -79,7 +79,7 @@ esac
 out+=("^sep($SNM)")
 out+=("󰕾   $VOL	<span bgcolor='#333333' color='#d3d3d3'>  <small>W + v</small>  </span>,pavucontrol")
 out+=("^sep($RADIO)")
-out+=("$PYRADIO	<span bgcolor='#333333' color='#d3d3d3'>  <small>W + r</small>  </span>,terminator --geometry=564x440-20-20 -e pyradio")
+out+=("$PYRADIO	<span bgcolor='#333333' color='#d3d3d3'>  <small>W + r</small>  </span>,terminator --icon=/usr/share/icons/pyradio.png --geometry=564x440-20-20 -x pyradio -lt")
 
 out+=("^sep()")
 NOWPL="0"
@@ -226,39 +226,23 @@ clr="#444444"
 fi
 
 cat <<EOF > ${MENU_ITEMS}
-@rect,,${jgtools_padding},${jgtools_padding},300,100,0,left,top,,#222222 35,
-
-@rect,,${jgtools_padding},$((jgtools_padding+64)),8,36,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+10)),$((jgtools_padding+70)),8,30,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+20)),$((jgtools_padding+44)),8,56,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+30)),$((jgtools_padding+56)),8,44,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+40)),$((jgtools_padding+64)),8,36,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+50)),$((jgtools_padding+54)),8,46,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+60)),$((jgtools_padding+14)),8,86,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+70)),$((jgtools_padding+29)),8,71,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+80)),$((jgtools_padding+64)),8,36,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+90)),$((jgtools_padding+74)),8,26,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+100)),$((jgtools_padding+54)),8,46,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+110)),$((jgtools_padding+24)),8,76,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+120)),$((jgtools_padding+34)),8,66,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+130)),$((jgtools_padding+44)),8,56,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+140)),$((jgtools_padding+54)),8,46,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+150)),$((jgtools_padding+74)),8,26,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+160)),$((jgtools_padding+84)),8,16,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+170)),$((jgtools_padding+89)),8,11,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+180)),$((jgtools_padding+94)),8,6,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+190)),$((jgtools_padding+95)),8,5,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+200)),$((jgtools_padding+95)),8,5,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+210)),$((jgtools_padding+95)),8,5,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+220)),$((jgtools_padding+96)),8,4,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+230)),$((jgtools_padding+90)),8,10,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+240)),$((jgtools_padding+81)),8,19,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+250)),$((jgtools_padding+86)),8,14,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+260)),$((jgtools_padding+90)),8,10,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+270)),$((jgtools_padding+78)),8,22,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+280)),$((jgtools_padding+64)),8,36,0,left,top,,${clr} 100,
-@rect,,$((jgtools_padding+290)),$((jgtools_padding+58)),8,42,0,left,top,,${clr} 100,
+@rect,,${jgtools_padding},${jgtools_padding},300,100,0,left,top,,#ffffff 15,
 
+@rect,,${jgtools_padding},$((jgtools_padding+64)),18,36,0,left,top,,${clr} 100,
+@rect,,$((jgtools_padding+20)),$((jgtools_padding+44)),18,56,0,left,top,,${clr} 100,
+@rect,,$((jgtools_padding+40)),$((jgtools_padding+64)),18,36,0,left,top,,${clr} 100,
+@rect,,$((jgtools_padding+60)),$((jgtools_padding+14)),18,86,0,left,top,,${clr} 100,
+@rect,,$((jgtools_padding+80)),$((jgtools_padding+64)),18,36,0,left,top,,${clr} 100,
+@rect,,$((jgtools_padding+100)),$((jgtools_padding+54)),18,46,0,left,top,,${clr} 100,
+@rect,,$((jgtools_padding+120)),$((jgtools_padding+34)),18,66,0,left,top,,${clr} 100,
+@rect,,$((jgtools_padding+140)),$((jgtools_padding+54)),18,46,0,left,top,,${clr} 100,
+@rect,,$((jgtools_padding+160)),$((jgtools_padding+84)),18,16,0,left,top,,${clr} 100,
+@rect,,$((jgtools_padding+180)),$((jgtools_padding+94)),18,6,0,left,top,,${clr} 100,
+@rect,,$((jgtools_padding+200)),$((jgtools_padding+95)),18,5,0,left,top,,${clr} 100,
+@rect,,$((jgtools_padding+220)),$((jgtools_padding+96)),18,4,0,left,top,,${clr} 100,
+@rect,,$((jgtools_padding+240)),$((jgtools_padding+81)),18,19,0,left,top,,${clr} 100,
+@rect,,$((jgtools_padding+260)),$((jgtools_padding+90)),18,10,0,left,top,,${clr} 100,
+@rect,,$((jgtools_padding+280)),$((jgtools_padding+64)),18,36,0,left,top,,${clr} 100,
 
 ${NOWPLAYLINES}