- fix last livecd patch

- can replace '_' with space in menu entries

4 files changed, 18 insertions, 4 deletions

diff --git a/themes/openSUSE/data-boot/gfxboot.cfg b/themes/openSUSE/data-boot/gfxboot.cfg
index 7d71804..fdf203a 100644
--- a/themes/openSUSE/data-boot/gfxboot.cfg
+++ b/themes/openSUSE/data-boot/gfxboot.cfg
@@ -67,6 +67,8 @@ panel.title.fg=0xffffff
 panel.f-key.fg=0xffe050
 ; default keymap (e.g. de_DE, czech)
 keymap=
+; replace underscores ('_') with space in menu entries
+_2space=1
 
 [800x600]
 ; screen size
diff --git a/themes/openSUSE/data-install/gfxboot.cfg b/themes/openSUSE/data-install/gfxboot.cfg
index 8ff8fb0..ebd196b 100644
--- a/themes/openSUSE/data-install/gfxboot.cfg
+++ b/themes/openSUSE/data-install/gfxboot.cfg
@@ -67,6 +67,8 @@ panel.title.fg=0xffffff
 panel.f-key.fg=0xffe050
 ; default keymap (e.g. de_DE, czech)
 keymap=
+; replace underscores ('_') with space in menu entries
+_2space=1
 
 [800x600]
 ; screen size
diff --git a/themes/openSUSE/src/common.inc b/themes/openSUSE/src/common.inc
index 46d9786..d0d1602 100644
--- a/themes/openSUSE/src/common.inc
+++ b/themes/openSUSE/src/common.inc
@@ -945,10 +945,19 @@
 % ( text ) == > ( new_text )
 /menuitemmap {
   translate
+  config._2space {
+    /mmm.tmp xfree
+    strdup /mmm.tmp over def
+    dup length 0 gt {
+      0 1 2 index length 1 sub {
+        over over get '_' eq { over exch ' ' put } { pop } ifelse
+      } for
+    } if
+  } if
   dup "memtest" eq over "memtest86" eq or { pop txt_memtest return } if
   dup "firmware" eq { pop txt_firmware return } if
   syslinux {
-    livecd {
+    config.livecd {
       dup "linux"     eq { pop "openSUSE LiveCD (english)" return } if
       dup "failsafe"  eq { pop "LiveCD - Safe Settings" return } if
       dup "linux2"    eq { pop "openSUSE LiveCD (deutsch)" return } if
@@ -1543,7 +1552,8 @@ ptheme {
 /config.beep           "beep"                     false gfxconfig.set.bool
 /config.volume         "volume"                      70 gfxconfig.set.int
 /config.talk           "talk"                     false gfxconfig.set.bool
-/livecd                "livecd"                   false gfxconfig.set.bool
+/config.livecd         "livecd"                   false gfxconfig.set.bool
+/config._2space        "_2space"                  false gfxconfig.set.bool
 /transp                "menu.transparency"         0x20 gfxconfig.set.int
 /config.screen.width
 /config.screen.height  "screen.size"            800 600 gfxconfig.set.int2
diff --git a/themes/openSUSE/src/panel.inc b/themes/openSUSE/src/panel.inc
index e891a20..1d3e89a 100644
--- a/themes/openSUSE/src/panel.inc
+++ b/themes/openSUSE/src/panel.inc
@@ -41,7 +41,7 @@
 
     syslinux {
 
-      livecd {
+      config.livecd {
 
         [ keyF2 0 "F2" /panel.lang /panel.lang.width /panel.lang.update /lang.init ]
         [ keyF3 0 "F3" /panel.video /panel.video.width /panel.video.update /video.init ]
@@ -179,7 +179,7 @@
   syslinux not { return } if
 
   % not for live cd
-  livecd { return } if
+  config.livecd { return } if
 
   % not for F1
   dup keyF1 eq { return } if