diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2009-01-27 17:30:34 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2009-01-27 17:30:34 +0000 |
| commit | a218dc40a68bfe95d2307d9d2d115fc46e8f3cd8 (patch) | |
| tree | 2e9d17b2243e6e3627dd23c92d176aa273578fd4 /src | |
| parent | 3ac9b95be3f00fcf2c62e4acc290eb4099a70634 (diff) | |
| download | bootloader-theme-a218dc40a68bfe95d2307d9d2d115fc46e8f3cd8.tar bootloader-theme-a218dc40a68bfe95d2307d9d2d115fc46e8f3cd8.tar.gz bootloader-theme-a218dc40a68bfe95d2307d9d2d115fc46e8f3cd8.tar.bz2 bootloader-theme-a218dc40a68bfe95d2307d9d2d115fc46e8f3cd8.tar.xz bootloader-theme-a218dc40a68bfe95d2307d9d2d115fc46e8f3cd8.zip | |
one line "panel" instead of two lines
the default is now to display things like "F2 Language" and the chosen
language below. this patch reverts to previous behaviour: if you have a
"title" (eg: "Language") we use it, otherwise we display the chosen value.
this patch is useful to keep more room for the "Boot Options"
Diffstat (limited to 'src')
| -rw-r--r-- | src/dia_bits.inc | 2 | ||||
| -rw-r--r-- | src/dia_install.inc | 2 | ||||
| -rw-r--r-- | src/dia_video.inc | 2 | ||||
| -rw-r--r-- | src/panel.inc | 2 | ||||
| -rw-r--r-- | src/xmenu.inc | 14 |
5 files changed, 7 insertions, 15 deletions
diff --git a/src/dia_bits.inc b/src/dia_bits.inc index 01a4ea8..76c2689 100644 --- a/src/dia_bits.inc +++ b/src/dia_bits.inc @@ -40,8 +40,6 @@ bits.suffix 1 .undef put } if - xmenu .xm_title /txt_arch put - xmenu .xm_current bits.default put } def diff --git a/src/dia_install.inc b/src/dia_install.inc index 23cf426..db20f1d 100644 --- a/src/dia_install.inc +++ b/src/dia_install.inc @@ -31,8 +31,6 @@ % see install types (.inst_*) xmenu .xm_list [ is_dvd { "DVD" } { "CD-ROM" } ifelse "Other" ] put - xmenu .xm_title /txt_install_source put - install.set.install.option } def diff --git a/src/dia_video.inc b/src/dia_video.inc index 84ab80d..8bbba40 100644 --- a/src/dia_video.inc +++ b/src/dia_video.inc @@ -171,7 +171,7 @@ % add to menu xmenu .xm_list video.modes.text put - xmenu .xm_title /txt_video_mode put + xmenu .xm_title .undef put % select largest mode the monitor supports diff --git a/src/panel.inc b/src/panel.inc index 7511ca1..c559c23 100644 --- a/src/panel.inc +++ b/src/panel.inc @@ -8,7 +8,7 @@ % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % Some global vars. % -/panel.size { clip.size pop 48 } def +/panel.size { clip.size pop 24 } def /panel.y { clip.size exch pop panel.size exch pop sub 5 sub } def /panel.text.y { panel.y 5 add } def /panel.text.Fy 0 def diff --git a/src/xmenu.inc b/src/xmenu.inc index 1d1d2bd..d81fd83 100644 --- a/src/xmenu.inc +++ b/src/xmenu.inc @@ -375,10 +375,11 @@ 0 xmenu .xm_title get - dup .undef ne { exec strsize pop max } { pop } ifelse + dup .undef ne { exec strsize pop max } { pop xmenu .xm_list get xmenu .xm_current get get dup .undef ne { exec strsize pop max } { pop } ifelse + } ifelse } def @@ -397,16 +398,11 @@ panel.text.y moveto - currentpoint - xmenu .xm_title get - dup .undef ne { exec show.rtl } { pop } ifelse - - moveto 0 lineheight 4 add rmoveto - - panel.normal.fg setcolor - + dup .undef eq { + pop xmenu .xm_list get xmenu .xm_current get get + } if dup .undef ne { exec show.rtl } { pop } ifelse } def |