Hello community, here is the log from the commit of package gfxboot checked in at Mon Jul 17 16:30:48 CEST 2006. -------- --- arch/i386/gfxboot/gfxboot.changes 2006-07-10 12:40:14.000000000 +0200 +++ gfxboot/gfxboot.changes 2006-07-17 15:34:09.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Jul 17 15:33:54 CEST 2006 - snwint@suse.de + +- more than one boot option line, finished (#160066) +- added 'about' button +- make it openSUSE +- added xen test config + +------------------------------------------------------------------- Old: ---- gfxboot-3.2.31.tar.bz2 New: ---- gfxboot-3.2.32.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gfxboot.spec ++++++ --- /var/tmp/diff_new_pack.C21L2M/_old 2006-07-17 16:09:41.000000000 +0200 +++ /var/tmp/diff_new_pack.C21L2M/_new 2006-07-17 16:09:41.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gfxboot (Version 3.2.31) +# spec file for package gfxboot (Version 3.2.32) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,10 +17,10 @@ Obsoletes: gfxboot-devel Autoreqprov: on Summary: Graphical Boot Logo for LILO and SYSLINUX -Version: 3.2.31 +Version: 3.2.32 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: gfxboot-3.2.31.tar.bz2 +Source: gfxboot-3.2.32.tar.bz2 Source1: NLD.tar.bz2 Source2: SLES.tar.bz2 Source3: SuSE.tar.bz2 @@ -60,6 +60,11 @@ /usr/share/gfxboot %changelog -n gfxboot +* Mon Jul 17 2006 - snwint@suse.de +- more than one boot option line, finished (#160066) +- added 'about' button +- make it openSUSE +- added xen test config * Mon Jul 10 2006 - snwint@suse.de - use disk image, not floppy for grub testing - updated Zen pictures ++++++ NLD.tar.bz2 ++++++ ++++++ SLES.tar.bz2 ++++++ ++++++ SuSE.tar.bz2 ++++++ Binary files old/themes/SuSE/16x16.fnt and new/themes/SuSE/16x16.fnt differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/Makefile new/themes/SuSE/Makefile --- old/themes/SuSE/Makefile 2006-06-27 13:10:42.000000000 +0200 +++ new/themes/SuSE/Makefile 2006-07-13 16:01:05.000000000 +0200 @@ -1,6 +1,6 @@ BINDIR := $(shell [ -x ../../mkbootmsg ] && echo ../../ ) -PRODUCT = "SUSE Linux 10.2" +PRODUCT = "openSUSE 10.2" export PRODUCT HELP2TXT = $(BINDIR)help2txt diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/boot.config new/themes/SuSE/boot.config --- old/themes/SuSE/boot.config 2006-03-31 14:15:53.000000000 +0200 +++ new/themes/SuSE/boot.config 2006-07-13 15:25:49.000000000 +0200 @@ -27,6 +27,7 @@ %% include dia_install.inc %% include dia_bits.inc %% include dia_options.inc +%% include dia_about.inc %% include panel.inc %% include keytables.inc %% include locale.inc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/common.inc new/themes/SuSE/common.inc --- old/themes/SuSE/common.inc 2006-07-10 12:00:53.000000000 +0200 +++ new/themes/SuSE/common.inc 2006-07-17 12:44:06.000000000 +0200 @@ -130,7 +130,7 @@ /KeyEvent { % timeout - dup 0 eq { boot.ed buildcmdline 2 return } if + dup 0 eq { boot.ed.list buildcmdline 2 return } if debug 4 ge { % print keycode somewhere @@ -224,7 +224,7 @@ debug 3 ge xxx.cmdline .undef eq and { /window.action actNothing def - boot.ed buildcmdline /xxx.menu exch def /xxx.cmdline exch def + boot.ed.list buildcmdline /xxx.menu exch def /xxx.cmdline exch def /dia window.dialog def dia .title "Kernel command line" put @@ -249,7 +249,7 @@ xxx.cmdline xxx.menu /xxx.cmdline .undef def } { - boot.ed buildcmdline + boot.ed.list buildcmdline } ifelse 2 return } ifelse @@ -283,7 +283,35 @@ /mem.min 128 string def /mem.msg 256 string def -% ( edit_object ) ==> ( cmdline menu_entry ) + +% ( edit_object_list ) ==> ( cmdline menu_entry ) +% +/buildcmdline { + menu.entry 0 lt menu.entry menu.texts length ge or { pop "" -1 return } if + + [ over + { + dup .inp_show get { + build1cmdline strdup + } { + pop + } ifelse + } forall + + % empty? -> pass at least the first edit object + dup [ eq { over 0 get build1cmdline strdup } if + + ] + + dup boot.splitstr join bc.cmd over strcpy pop free + dup { free } forall free + + pop bc.cmd menu.entry + +} def + + +% ( edit_object ) ==> ( cmdline ) % % grub: % just return @@ -291,9 +319,7 @@ % syslinux & lilo: % add kernel name at start of command line % -/buildcmdline { - menu.entry 0 lt menu.entry menu.texts length ge or { pop "" -1 return } if - +/build1cmdline { syslinux { % set new working directory xmenu.bits .xm_current get 1 eq { 64bit_boot_dir } { 32bit_boot_dir } ifelse @@ -480,7 +506,7 @@ % remove final space bc.cmd dropspaces - bc.cmd menu.entry + bc.cmd } def @@ -521,109 +547,6 @@ % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Split command line into hidden and normal part. -% -% ( edit_object ) == > ( ) -% -/splitcmdline { - dup length .inp_hidden le { pop return } if - dup .inp_hidden get .undef eq { pop return } if - - dup .inp_hidden get over .inp_buf get strcpy pop - - dup .inp_hidden get "showopts" bootopt.find dup { - dup "showopts" length add skipspaces - 2 index .inp_buf get exch strcpy dropspaces - 0 0 put - .inp_hidden get dropspaces - } { - pop dup .inp_hidden get 0 0 put - .inp_buf get dropspaces - } ifelse -} def - - -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -/redrawmenu { - menu.text.normal setcolor - - /x menu.start.x def - /y menu.start.y def - - 0 1 menu.visible.entries 1 sub { - x y moveto currentpoint menu.bar.width menu.bar.height image - x menu.text.xofs add y menu.text.yofs add moveto - menu.texts exch menu.shift add get menuitemmap - currentfont exch font.large setfont show setfont - /y y menu.item.height add def - } for - - /menu.bar.width - menu.bar.min.width - menu.texts { menuitemmap strsize pop menu.text.xofs 2 mul add 2 add max } forall - def - -} def - - -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% ( entry status ) ==> ( ) -% -% status: -% false not selected -% true selected -% -/MenuSelect { - /menu.status exch def - - /menu.idx over def - - menu.shift sub - menu.item.height mul menu.start.y add - menu.start.x exch - moveto - - currentpoint - menu.status { - menu.bar.color setcolor - currenttransparency - ptheme { 120 } { 70 } ifelse settransparency - menu.bar.width menu.bar.height - fillrect - settransparency - } { - currentpoint menu.bar.width menu.bar.height image - } ifelse - moveto - - menu.text.xofs menu.text.yofs rmoveto - menu.status { - menu.text.select - } { - menu.text.normal - } ifelse - setcolor - menu.texts menu.idx get menuitemmap - currentfont exch font.large setfont show setfont - - menu.status { - % init boot options - keepbootoptions .undef eq { bootoptions.init } if - - % set help context - "main" help.setcontext - menu.texts menu.idx get - dup help.findpage "" eq { - pop - } { - help.setcontext - } ifelse - } if - -} def - - -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % ( text errorcode ) ==> ( ) % errorcode: % 0 normal info @@ -692,7 +615,7 @@ syslinux info.type 6 eq and { dup .title "Driver Update" put - /info.msg "Put the SUSE Linux CD-ROM back into the drive." def + /info.msg "Put the openSUSE CD-ROM back into the drive." def } if dup .text info.msg put @@ -901,9 +824,9 @@ dup "memtest" eq over "memtest86" eq or { pop txt_memtest return } if syslinux { livecd { - dup "linux" eq { pop "SUSE Linux 10.2 LiveCD (english)" return } if + dup "linux" eq { pop "openSUSE 10.2 LiveCD (english)" return } if dup "failsafe" eq { pop "LiveCD - Safe Settings" return } if - dup "linux2" eq { pop "SUSE Linux 10.2 LiveCD (deutsch)" return } if + dup "linux2" eq { pop "openSUSE 10.2 LiveCD (deutsch)" return } if dup "failsaf2" eq { pop "LiveCD - Sichere Einstellungen" return } if dup "kde" eq { pop "LiveCD - KDE" return } if dup "gnome" eq { pop "LiveCD - GNOME" return } if @@ -911,7 +834,7 @@ dup "linux" eq { pop txt_install return } if dup "failsafe" eq { pop txt_safe_install return } if } ifelse - dup "live" eq { pop "SUSE Linux 10.2 LiveCD" return } if + dup "live" eq { pop "openSUSE 10.2 LiveCD" return } if dup "noacpi" eq { pop txt_noacpi_install return } if dup "noapic" eq { pop txt_noapic_install return } if dup "nolapic" eq { pop txt_nolapic_install return } if @@ -1467,7 +1390,7 @@ /debug 0 def ptheme small_layout or CapsLock or -% true or + true or { /bsplash.done { } def } { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/dia_about.inc new/themes/SuSE/dia_about.inc --- old/themes/SuSE/dia_about.inc 1970-01-01 01:00:00.000000000 +0100 +++ new/themes/SuSE/dia_about.inc 2006-07-13 15:42:07.000000000 +0200 @@ -0,0 +1,75 @@ +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% +% Panel 'about' entry. +% +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Show help window. +% +% ( ) => ( ) +% +/panel.about { + panel 0 panel.entry.help put + about.popup +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Return width of 'about' entry. +% +% ( ) => ( width ) +% +/panel.about.width { + "About" strsize pop +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Redraw panel entry. +% +% ( panel ) => ( ) +% +/panel.about.update { + panel.text.moveto + "About" show +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Show 'about' box. +% +% ( ) ==> ( ) +% +/about.popup { + window.dialog + + dup .title "About" put + dup .text about.msg put + dup .buttons [ + button.ok button.default actRedraw button.setaction + ] put + dup window.init + window.show +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Return 'about' text, if any. +% +% ( -- obj1 ) +% +% obj1: string with message or .undef +% +/about.msg { + + /about.msg + "about.txt" findfile dup .undef ne { + dup length string dup cvp rot dup length memcpy + } if + def + + about.msg + +} def + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/dia_options.inc new/themes/SuSE/dia_options.inc --- old/themes/SuSE/dia_options.inc 2006-07-06 12:42:08.000000000 +0200 +++ new/themes/SuSE/dia_options.inc 2006-07-11 14:16:09.000000000 +0200 @@ -12,11 +12,7 @@ /panel.options { /panel panel.full def - boot.show not { - /boot.show true def - boot.setup - bootoptions.init - } if + /boot.show true def /window.action actRedraw def } def diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/help-boot.hu.html new/themes/SuSE/help-boot.hu.html --- old/themes/SuSE/help-boot.hu.html 2006-03-13 14:32:45.000000000 +0100 +++ new/themes/SuSE/help-boot.hu.html 2006-07-13 16:02:44.000000000 +0200 @@ -101,7 +101,7 @@ Az ACPI (<em>Advanced Configuration and Power Interface</em>) szabvány meghatározza, hogy az operációs rendszer és a BIOS között hogyan működjenek az energiakezelési funkciók. Alapértelmezett esetben -a SUSE Linux akkor kapcsolja be az <em>acpi</em> opciót, ha a 2000. évnél +a openSUSE akkor kapcsolja be az <em>acpi</em> opciót, ha a 2000. évnél újabban készült BIOS verziót talál. Az ACPI viselkedését az alábbi opciókkal lehet pontosan meghatározni:<br> <br> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/help-install.bg.html new/themes/SuSE/help-install.bg.html --- old/themes/SuSE/help-install.bg.html 2006-03-13 14:32:45.000000000 +0100 +++ new/themes/SuSE/help-install.bg.html 2006-07-13 16:02:44.000000000 +0200 @@ -318,7 +318,7 @@ <hr><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <h3><a name="bits">Избор на типа софтуер</a></h3> -Можете да изберете да ли да инсталирате 32- или 64-битовата версия на SUSE Linux. +Можете да изберете да ли да инсталирате 32- или 64-битовата версия на openSUSE. <br><br>Връщане към <a href="#main">началната страница</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/help-install.cs.html new/themes/SuSE/help-install.cs.html --- old/themes/SuSE/help-install.cs.html 2006-03-13 14:32:45.000000000 +0100 +++ new/themes/SuSE/help-install.cs.html 2006-07-13 16:02:44.000000000 +0200 @@ -281,7 +281,7 @@ <hr><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <h3><a name="bits">Volba architektury</a></h3> -Můžete si zvolit mezi 32 nebo 64 bitovou verzí SUSE Linuxu. +Můžete si zvolit mezi 32 nebo 64 bitovou verzí openSUSEu. <br><br>Návrat na <a href="#main">Parametry startu</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/help-install.da.html new/themes/SuSE/help-install.da.html --- old/themes/SuSE/help-install.da.html 2006-03-13 14:32:45.000000000 +0100 +++ new/themes/SuSE/help-install.da.html 2006-07-13 16:02:44.000000000 +0200 @@ -369,7 +369,7 @@ <hr><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <h3><a name="bits">Softwaretype valg</a></h3> -Du kan vælge imellem at installere 32-bit eller 64-bit versionen af SUSE Linux. +Du kan vælge imellem at installere 32-bit eller 64-bit versionen af openSUSE. <br><br>Vend tilbage til <a href="#main">Startsiden</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/help-install.de.html new/themes/SuSE/help-install.de.html --- old/themes/SuSE/help-install.de.html 2006-05-02 15:44:29.000000000 +0200 +++ new/themes/SuSE/help-install.de.html 2006-07-13 16:02:44.000000000 +0200 @@ -355,7 +355,7 @@ <hr><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <h3><a name="bits">Auswahl des Softwaretyps</a></h3> -Sie können die 32-bit- oder die 64-bit-Version von SUSE Linux installieren. +Sie können die 32-bit- oder die 64-bit-Version von openSUSE installieren. <br><br>Return to <a href="#main">Startseite</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/help-install.el.html new/themes/SuSE/help-install.el.html --- old/themes/SuSE/help-install.el.html 2006-03-13 14:32:45.000000000 +0100 +++ new/themes/SuSE/help-install.el.html 2006-07-13 16:02:44.000000000 +0200 @@ -366,7 +366,7 @@ <hr><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <h3><a name="bits">Επιλογή Τύπου Λογισμικού</a></h3> -Έχετε την επιλογή να εγκαταστήσετε την 32-μπιτη ή την 64-μπιτη έκδοση του SUSE Linux. +Έχετε την επιλογή να εγκαταστήσετε την 32-μπιτη ή την 64-μπιτη έκδοση του openSUSE. <br><br>Επιστροφή στην <a href="#main">Αρχική Σελίδα</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/help-install.en.html new/themes/SuSE/help-install.en.html --- old/themes/SuSE/help-install.en.html 2006-03-13 14:32:45.000000000 +0100 +++ new/themes/SuSE/help-install.en.html 2006-07-13 16:02:44.000000000 +0200 @@ -372,7 +372,7 @@ <hr><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <h3><a name="bits">Software Type Selection</a></h3> -You have the choice to install the 32-bit or 64-bit version of SUSE Linux. +You have the choice to install the 32-bit or 64-bit version of openSUSE. <br><br>Return to <a href="#main">Start Page</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/help-install.es.html new/themes/SuSE/help-install.es.html --- old/themes/SuSE/help-install.es.html 2006-05-02 15:44:33.000000000 +0200 +++ new/themes/SuSE/help-install.es.html 2006-07-13 16:02:44.000000000 +0200 @@ -355,7 +355,7 @@ <hr><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <h3><a name="bits">Selección del tipo de programa</a></h3> -Pueden elegir entre instalar la versión 32-bit o la versión 64-bit de SUSE Linux +Pueden elegir entre instalar la versión 32-bit o la versión 64-bit de openSUSE <br><br>Volver a la <a href="#main">Página de inicio</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/help-install.fi.html new/themes/SuSE/help-install.fi.html --- old/themes/SuSE/help-install.fi.html 2006-03-27 16:06:47.000000000 +0200 +++ new/themes/SuSE/help-install.fi.html 2006-07-13 16:02:44.000000000 +0200 @@ -279,7 +279,7 @@ <hr><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <h3><a name="bits">Ohjelmistotyypin valinta</a></h3> -Voit valita asennatko 32- vai 64-bittisen version SUSE Linux:sta. +Voit valita asennatko 32- vai 64-bittisen version openSUSE:sta. <br><br>Palaa <a href="#main">Aloitussivulle</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/help-install.fr.html new/themes/SuSE/help-install.fr.html --- old/themes/SuSE/help-install.fr.html 2006-03-13 14:32:45.000000000 +0100 +++ new/themes/SuSE/help-install.fr.html 2006-07-13 16:02:44.000000000 +0200 @@ -411,7 +411,7 @@ <hr><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <h3><a name="bits">Sélection du type de logiciel</a></h3> -Vous avez le choix entre installer la version 32 bits ou la version 64 bits de SUSE Linux. +Vous avez le choix entre installer la version 32 bits ou la version 64 bits de openSUSE. <br><br>Retour à la <a href="#main">page de démarrage</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/help-install.hu.html new/themes/SuSE/help-install.hu.html --- old/themes/SuSE/help-install.hu.html 2006-04-07 15:49:54.000000000 +0200 +++ new/themes/SuSE/help-install.hu.html 2006-07-13 16:02:44.000000000 +0200 @@ -76,7 +76,7 @@ <hr><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> -<h3><a name="noacpi">Telepítés - ACPI támogatás nélkül</a></h3> A SUSE Linuxban a 2.6-os kernel ACPI támogatása elérhető a stabil 2.4-es kernelhez is. A nagyon friss hardvereszközök néha igénylik az ACPI meglétét a megszakítások kezeléséhez. Az ACPI teljesen felváltja a régi APM rendszert.. <BR><BR> Ha problémákba ütközik a kernel indítása során, válassza a <em>Telepítés - ACPI támogatás nélkül</em> lehetőséget. Ismert problémák hibás ACPI-vel rendelkező gépek esetén: <BR><BR> * a kernel lefagy rendszerindítás közben<BR> * a PCI kártyák nem kerülnek felismerésre, vagy nem sikerül tökéletesen inicializálni őket.<BR><BR><BR><BR> +<h3><a name="noacpi">Telepítés - ACPI támogatás nélkül</a></h3> A openSUSEban a 2.6-os kernel ACPI támogatása elérhető a stabil 2.4-es kernelhez is. A nagyon friss hardvereszközök néha igénylik az ACPI meglétét a megszakítások kezeléséhez. Az ACPI teljesen felváltja a régi APM rendszert.. <BR><BR> Ha problémákba ütközik a kernel indítása során, válassza a <em>Telepítés - ACPI támogatás nélkül</em> lehetőséget. Ismert problémák hibás ACPI-vel rendelkező gépek esetén: <BR><BR> * a kernel lefagy rendszerindítás közben<BR> * a PCI kártyák nem kerülnek felismerésre, vagy nem sikerül tökéletesen inicializálni őket.<BR><BR><BR><BR> <BR><BR>Visszatérés a <a href="#main">Kezdőoldalra</a> @@ -168,7 +168,7 @@ <hr><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <h3><a name="bits">Szoftvertípus kiválasztása</a></h3> -Telepítheti a SUSE Linux akár 32, akár 64 bites változatát. +Telepítheti a openSUSE akár 32, akár 64 bites változatát. <br><br>Visszatérés a <a href="#main">Kezdőoldalra</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/help-install.it.html new/themes/SuSE/help-install.it.html --- old/themes/SuSE/help-install.it.html 2006-05-02 15:47:20.000000000 +0200 +++ new/themes/SuSE/help-install.it.html 2006-07-13 16:02:44.000000000 +0200 @@ -392,7 +392,7 @@ <hr><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <h3><a name="bits">Selezione tipo di software</a></h3> -È possibile installare la versione di SUSE Linux a 32 o 64 bit. +È possibile installare la versione di openSUSE a 32 o 64 bit. <br><br>Ritorna alle <a href="#main">Pagina iniziale</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/help-install.ja.html new/themes/SuSE/help-install.ja.html --- old/themes/SuSE/help-install.ja.html 2006-03-13 14:32:45.000000000 +0100 +++ new/themes/SuSE/help-install.ja.html 2006-07-13 16:02:44.000000000 +0200 @@ -224,7 +224,7 @@ <hr><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <h3><a name="bits">ソフトウェアタイプの選択</a></h3> -SUSE Linuxの32ビットまたは64ビットバージョンをインストールする選択肢があります。 +openSUSEの32ビットまたは64ビットバージョンをインストールする選択肢があります。 <br><br><a href="#main">開始ページに戻る</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/help-install.nb.html new/themes/SuSE/help-install.nb.html --- old/themes/SuSE/help-install.nb.html 2006-03-13 14:32:45.000000000 +0100 +++ new/themes/SuSE/help-install.nb.html 2006-07-13 16:02:44.000000000 +0200 @@ -273,7 +273,7 @@ <hr><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <h3><a name="bits">Software Type Selection</a></h3> -You have the choice to install the 32-bit or 64-bit version of SUSE Linux. +You have the choice to install the 32-bit or 64-bit version of openSUSE. <br><br>Return to <a href="#main">Start Page</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/help-install.nl.html new/themes/SuSE/help-install.nl.html --- old/themes/SuSE/help-install.nl.html 2006-03-13 14:32:45.000000000 +0100 +++ new/themes/SuSE/help-install.nl.html 2006-07-13 16:02:44.000000000 +0200 @@ -346,7 +346,7 @@ <hr><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <h3><a name="bits">Type software selecteren</a></h3> -U kunt kiezen uit het installeren van de 32-bit of 64-bit versie van SUSE Linux. +U kunt kiezen uit het installeren van de 32-bit of 64-bit versie van openSUSE. <br><br>Terug naar <a href="#main">Beginpagina</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/help-install.pl.html new/themes/SuSE/help-install.pl.html --- old/themes/SuSE/help-install.pl.html 2006-05-02 15:46:46.000000000 +0200 +++ new/themes/SuSE/help-install.pl.html 2006-07-13 16:02:44.000000000 +0200 @@ -359,7 +359,7 @@ <hr><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <h3><a name="bits">Wybór rodzaju oprogramowania</a></h3> -Istnieje możliwość zainstalowania 32- lub 64-bitowej wersji systemu SUSE Linux. +Istnieje możliwość zainstalowania 32- lub 64-bitowej wersji systemu openSUSE. <br><br>Powrót do <a href="#opt">opcji rozruchowych</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/help-install.pt.html new/themes/SuSE/help-install.pt.html --- old/themes/SuSE/help-install.pt.html 2006-03-13 14:32:45.000000000 +0100 +++ new/themes/SuSE/help-install.pt.html 2006-07-13 16:02:44.000000000 +0200 @@ -283,7 +283,7 @@ <hr><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <h3><a name="bits">Selecção do Tipo de Software</a></h3> -Tem a opção de instalar a versão 32-bit ou 64-bit do SUSE Linux. +Tem a opção de instalar a versão 32-bit ou 64-bit do openSUSE. <br><br>Voltar à <a href="#main">Página de Início</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/help-install.pt_BR.html new/themes/SuSE/help-install.pt_BR.html --- old/themes/SuSE/help-install.pt_BR.html 2006-03-13 14:32:45.000000000 +0100 +++ new/themes/SuSE/help-install.pt_BR.html 2006-07-13 16:02:44.000000000 +0200 @@ -224,7 +224,7 @@ <hr><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <h3><a name="bits">Seleção de Tipo de Software</a></h3> -Você pode instalar a versão de 32 bits ou de 64 bits do SUSE Linux. +Você pode instalar a versão de 32 bits ou de 64 bits do openSUSE. <br><br>Retornar à <a href="#main">Página Inicial</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/help-install.ru.html new/themes/SuSE/help-install.ru.html --- old/themes/SuSE/help-install.ru.html 2006-03-13 14:32:45.000000000 +0100 +++ new/themes/SuSE/help-install.ru.html 2006-07-13 16:02:44.000000000 +0200 @@ -357,7 +357,7 @@ <hr><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <h3><a name="bits">Выбор типа программного обеспечения</a></h3> -Вы может выбрать какую версию устанавливать: 32 или 64 битовую версию SUSE Linux. +Вы может выбрать какую версию устанавливать: 32 или 64 битовую версию openSUSE. <br><br>Вернуться к <a href="#main">Начальной странице</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/help-install.sl.html new/themes/SuSE/help-install.sl.html --- old/themes/SuSE/help-install.sl.html 2006-03-13 14:32:45.000000000 +0100 +++ new/themes/SuSE/help-install.sl.html 2006-07-13 16:02:44.000000000 +0200 @@ -355,7 +355,7 @@ <h3><a name="bits">Izbira različice programske opreme</a></h3> Pri namestitvi mora izbrati ali želite namestiti 32-bitno ali 64-bitno -različico SUSE Linuxa. +različico openSUSEa. <br><br>Vrnitev na <a href="#main">Začetno stran</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/help-install.sv.html new/themes/SuSE/help-install.sv.html --- old/themes/SuSE/help-install.sv.html 2006-03-13 14:32:45.000000000 +0100 +++ new/themes/SuSE/help-install.sv.html 2006-07-13 16:02:44.000000000 +0200 @@ -368,7 +368,7 @@ <h3><a name="bits">Val av mjukvarutyp</a></h3> Du kan välja mellan att installera 32-bit eller 64-bit versionen av -SUSE Linux. +openSUSE. <br><br>Tillbaka till <a href="#main">Startsidan</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/help-install.uk.html new/themes/SuSE/help-install.uk.html --- old/themes/SuSE/help-install.uk.html 2006-03-13 14:32:45.000000000 +0100 +++ new/themes/SuSE/help-install.uk.html 2006-07-13 16:02:44.000000000 +0200 @@ -279,7 +279,7 @@ <hr><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <h3><a name="bits">Вибір типу ПЗ</a></h3> -Ви можете встановити 32-бітну або 64-бітну версію SUSE Linux. +Ви можете встановити 32-бітну або 64-бітну версію openSUSE. <br><br>Повернутись до <a href="#main">початку сторінки</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/help-install.zh_CN.html new/themes/SuSE/help-install.zh_CN.html --- old/themes/SuSE/help-install.zh_CN.html 2006-03-13 14:32:45.000000000 +0100 +++ new/themes/SuSE/help-install.zh_CN.html 2006-07-13 16:02:44.000000000 +0200 @@ -224,7 +224,7 @@ <hr><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <h3><a name="bits">软件类型选择</a></h3> -您可以选择安装 32 位或 64 位版本的 SUSE Linux。 +您可以选择安装 32 位或 64 位版本的 openSUSE。 <br><br>返回<a href="#main">启动页面</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/help-install.zh_TW.html new/themes/SuSE/help-install.zh_TW.html --- old/themes/SuSE/help-install.zh_TW.html 2006-05-02 15:45:55.000000000 +0200 +++ new/themes/SuSE/help-install.zh_TW.html 2006-07-13 16:02:44.000000000 +0200 @@ -224,7 +224,7 @@ <hr><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <h3><a name="bits">軟體類型選項</a></h3> -您可以選擇安裝 32 位元或 64 位元的 SUSE Linux。 +您可以選擇安裝 32 位元或 64 位元的 openSUSE。 <br><br>回到<a href="#main">起始頁面</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/install.config new/themes/SuSE/install.config --- old/themes/SuSE/install.config 2006-03-31 14:15:58.000000000 +0200 +++ new/themes/SuSE/install.config 2006-07-13 15:25:36.000000000 +0200 @@ -19,6 +19,7 @@ %% include dia_install.inc %% include dia_bits.inc %% include dia_options.inc +%% include dia_about.inc %% include panel.inc %% include keytables.inc %% include locale.inc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/main.inc new/themes/SuSE/main.inc --- old/themes/SuSE/main.inc 2006-07-10 12:03:28.000000000 +0200 +++ new/themes/SuSE/main.inc 2006-07-17 14:18:59.000000000 +0200 @@ -4,6 +4,12 @@ % % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% max number of boot option input fields +/boot.ed.max 3 def + +% boot option input line separator +/boot.splitchar 1 def +/boot.splitstr 1 string dup 0 boot.splitchar put def % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % Create new main window. @@ -38,20 +44,9 @@ % /main.redraw { - boot.show { - boot.text.options setcolor - window.current .font get setfont - boot.ed.list { - dup .inp_x get 10 sub over .inp_y get moveto - currentpoint - currentpoint 0 exch moveto - currentpoint rot fontheight image - moveto - .inp_label get exec showright - } forall - } if + boot.drawlabels - redrawmenu + main.drawmenu /keepbootoptions 1 def menu.entry true MenuSelect /keepbootoptions .undef def @@ -61,37 +56,84 @@ % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Setup boot option input field. +% Draw boot option input field labels. % % ( ) == > ( ) % -/boot.setup { +/boot.drawlabels { boot.show not { return } if - boot.window .ed.list boot.ed.list put - boot.window .ed.focus 0 put - + boot.text.options setcolor + window.current .font get setfont boot.ed.list { dup .inp_x get 10 sub over .inp_y get moveto - dup .inp_label get exec showright + currentpoint + currentpoint 0 exch moveto + currentpoint rot fontheight image + moveto + dup .inp_show get { + .inp_label get exec showright + } { pop } ifelse + } forall +} def - white setcolor + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Setup boot option input field. +% +% ( ) == > ( ) +% +/boot.input.setup { + % boot.show not { return } if + + boot.ed.list { dup .inp_x get over .inp_y get boot.ed.height add moveto + currentpoint boot.ed.width 2 image + + currentcolor currenttransparency + white setcolor 0xe0 settransparency - boot.ed.width 1 fillrect + + 2 index .inp_show get { + boot.ed.width 2 fillrect + } if settransparency + setcolor pop } forall - } def +/boot.input.preinit { + + boot.ed.list { dup .inp_show false put .inp_buf get 0 0 put } forall + + menu.args menu.entry get boot.splitchar split + + 0 1 boot.ed.list length 1 sub { + over over aget dup .undef ne { + boot.ed.list rot get dup .inp_show true put .inp_buf get exch strcpy pop + } { + pop pop exit + } ifelse + } for + + free + + config.nobootoptions 1 menu.entry shl and { + boot.ed.list 0 get .inp_show false put + } if + + boot.ed.list { splitcmdline } forall + +} def + % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % Activate boot option input field. % @@ -105,26 +147,135 @@ boot.window .ed.focus 0 put - boot.ed.list { .inp_buf get 0 0 put } forall - - menu.args menu.entry get - boot.ed.list 0 get .inp_buf get exch strcpy pop - - boot.ed.list { splitcmdline } forall - boot.show { boot.ed.list { - dup - dup dup .inp_buf get exch over edit.init - "" ne { ' ' edit.input } { pop } ifelse - edit.hidecursor + dup .inp_show get { + dup + dup dup .inp_buf get exch over edit.init + "" ne { ' ' edit.input } { pop } ifelse + edit.hidecursor + } { + edit.done + } ifelse + } forall + boot.ed.list boot.window .ed.focus get get dup .inp_show get { edit.showcursor } { pop } ifelse + + boot.ed.list { + dup .inp_show get .inp_visible exch put } forall - boot.ed.list boot.window .ed.focus get get edit.showcursor + } if } def % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Draw boot menu. +% +% No entry is marked as selected. +% +% ( ) == > ( ) +% +/main.drawmenu { + menu.text.normal setcolor + + /x menu.start.x def + /y menu.start.y def + + 0 1 menu.visible.entries 1 sub { + x y moveto currentpoint menu.bar.width menu.bar.height image + x menu.text.xofs add y menu.text.yofs add moveto + menu.texts exch menu.shift add get menuitemmap + currentfont exch font.large setfont show setfont + /y y menu.item.height add def + } for + + /menu.bar.width + menu.bar.min.width + menu.texts { menuitemmap strsize pop menu.text.xofs 2 mul add 2 add max } forall + def + +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Select/deselect menu entry. +% +% If an entry is selected (status = true), the boot options input field is +% initialized. +% +% ( entry status ) ==> ( ) +% +% status: +% false not selected +% true selected +% +% Note: menu.bar.width must be valid even if status = false. +% +/MenuSelect { + /menu.status exch def + + /menu.idx over def + + menu.shift sub + menu.item.height mul menu.start.y add + menu.start.x exch + moveto + + currentpoint + menu.status { + menu.bar.color setcolor + currenttransparency + ptheme { 120 } { 70 } ifelse settransparency + menu.bar.width menu.bar.height + fillrect + settransparency + } { + currentpoint menu.bar.width menu.bar.height image + } ifelse + moveto + + menu.text.xofs menu.text.yofs rmoveto + menu.status { + menu.text.select + } { + menu.text.normal + } ifelse + setcolor + menu.texts menu.idx get menuitemmap + currentfont exch font.large setfont show setfont + + menu.status { + % init boot options + keepbootoptions .undef eq { + + boot.input.preinit + + false + boot.ed.list { + dup .inp_show get exch .inp_visible get xor or + } forall + { + boot.input.setup + boot.drawlabels + } if + + bootoptions.init + } if + + % set help context + "main" help.setcontext + menu.texts menu.idx get + dup help.findpage "" eq { + pop + } { + help.setcontext + } ifelse + } if + +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % Draw main window. % % ( window ) ==> ( ) @@ -155,7 +306,7 @@ /boot.window window.current def /boot.ed.list [ - 0 1 0 { + 0 1 boot.ed.max 1 sub { [ boot.pos exch 10 add exch 1 sub 4 -1 roll boot.ed.height 5 add mul add over over moveto boot.ed.width boot.ed.height savescreen @@ -165,18 +316,22 @@ 0 0 cmdlinelength string - /txt_boot_harddisk + "More Options" + false + false ] } for ] def boot.ed.list 0 get .inp_label /txt_bootoptions put - /boot.ed boot.ed.list 0 get def + boot.window .ed.list boot.ed.list put + boot.window .ed.focus 0 put + + main.drawmenu - boot.setup + boot.drawlabels - redrawmenu menu.entry true MenuSelect % find default splash mode @@ -196,6 +351,29 @@ % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Split command line into hidden and normal part. +% +% ( edit_object ) == > ( ) +% +/splitcmdline { + dup length .inp_hidden le { pop return } if + dup .inp_hidden get .undef eq { pop return } if + + dup .inp_hidden get over .inp_buf get strcpy pop + + dup .inp_hidden get "showopts" bootopt.find dup { + dup "showopts" length add skipspaces + 2 index .inp_buf get exch strcpy dropspaces + 0 0 put + .inp_hidden get dropspaces + } { + pop dup .inp_hidden get 0 0 put + .inp_buf get dropspaces + } ifelse +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % Handle keyboard input. % % ( key_in ) ==> ( key_out ) @@ -222,7 +400,7 @@ menu.entry 0 gt { menu.entry false MenuSelect menu.entry menu.shift eq { - /menu.shift menu.shift 1 sub def redrawmenu + /menu.shift menu.shift 1 sub def main.drawmenu } if /menu.entry menu.entry 1 sub def menu.entry true MenuSelect @@ -234,7 +412,7 @@ menu.entry menu.texts length 1 sub lt { menu.entry false MenuSelect menu.visible.entries menu.entry menu.shift sub sub 1 eq { - /menu.shift menu.shift 1 add def redrawmenu + /menu.shift menu.shift 1 add def main.drawmenu } if /menu.entry menu.entry 1 add def menu.entry true MenuSelect @@ -247,7 +425,7 @@ menu.entry false MenuSelect /menu.entry 0 def menu.shift 0 ne { - /menu.shift 0 def redrawmenu + /menu.shift 0 def main.drawmenu } if menu.entry true MenuSelect } if @@ -259,7 +437,7 @@ menu.entry false MenuSelect /menu.entry menu.texts length 1 sub def menu.texts length menu.visible.entries sub dup menu.shift ne { - /menu.shift exch def redrawmenu + /menu.shift exch def main.drawmenu } { pop } ifelse diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/panel.inc new/themes/SuSE/panel.inc --- old/themes/SuSE/panel.inc 2006-07-06 12:43:32.000000000 +0200 +++ new/themes/SuSE/panel.inc 2006-07-13 15:38:44.000000000 +0200 @@ -29,12 +29,19 @@ /panel.back 0 panel.y moveto panel.size savescreen def + /panel.entry.help [ keyF1 0 "F1" /panel.help /panel.help.width /panel.help.update .undef ] def + /panel.entry.about [ keyF1 0 "F1" /panel.about /panel.about.width /panel.about.update .undef ] def + % define panel layout /panel.full [ % [ key x label show_func width_func update_func init_func ] - [ keyF1 0 "F1" /panel.help /panel.help.width /panel.help.update .undef ] + about.msg { + panel.entry.about + } { + panel.entry.help + } ifelse syslinux { @@ -204,7 +211,7 @@ /panel.extra.fkey 1 def menu.entry false MenuSelect menu.visible.entries menu.entry menu.shift sub sub 1 eq { - /menu.shift menu.shift 1 add def redrawmenu + /menu.shift menu.shift 1 add def main.drawmenu } if /menu.entry menu.entry 1 add def menu.entry true MenuSelect diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/po/Makefile new/themes/SuSE/po/Makefile --- old/themes/SuSE/po/Makefile 2006-06-27 13:11:25.000000000 +0200 +++ new/themes/SuSE/po/Makefile 2006-07-13 16:01:15.000000000 +0200 @@ -1,7 +1,7 @@ POFILES = $(wildcard *.po) TEXTS = $(addsuffix .tr,$(basename $(wildcard *.po))) -PRODUCT ?= "SUSE Linux 10.2" +PRODUCT ?= "openSUSE 10.2" all: text.inc $(TEXTS) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/system.inc new/themes/SuSE/system.inc --- old/themes/SuSE/system.inc 2006-07-07 14:19:09.000000000 +0200 +++ new/themes/SuSE/system.inc 2006-07-17 12:58:00.000000000 +0200 @@ -82,17 +82,19 @@ % input object fields -/.inp_x 0 def % x pos -/.inp_y 1 def % y pos -/.inp_back 2 def % background pixmap -/.inp_buf 3 def % input buffer -/.inp_buf_len 4 def % input buffer length -/.inp_cur 5 def % current edit char offset -/.inp_cursor 6 def % cursor pos (pixel) -/.inp_shift 7 def % input line shifted (pixel) +/.inp_x 0 def % x pos +/.inp_y 1 def % y pos +/.inp_back 2 def % background pixmap +/.inp_buf 3 def % input buffer +/.inp_buf_len 4 def % input buffer length +/.inp_cur 5 def % current edit char offset +/.inp_cursor 6 def % cursor pos (pixel) +/.inp_shift 7 def % input line shifted (pixel) % optional fields -/.inp_hidden 8 def % hidden buffer -/.inp_label 9 def % input field label +/.inp_hidden 8 def % hidden buffer +/.inp_label 9 def % input field label +/.inp_visible 10 def % field is visible +/.inp_show 11 def % field should be visible % boot loader @@ -297,6 +299,8 @@ /cvs { t_string settype } def +% base num char + % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % Convert object to number. % @@ -304,12 +308,22 @@ % /cvn { dup gettype t_string eq { - 0 exch + 1 % sign + exch dup 0 get '-' eq { + exch pop 1 add -1 exch + } if + 10 % initial base + 0 % value + rot { + dup 'a' ge { 0x20 sub } if + dup 'X' eq { pop pop pop 16 0 '0' } if '0' sub - dup 0 lt over 9 gt or { pop exit } if - exch 10 mul add + dup 9 gt { 7 sub } if + dup 0 lt over 4 index ge or { pop exit } if + exch 2 index mul add } forall + exch pop mul } { t_int settype } ifelse @@ -590,15 +604,18 @@ % /split { + % split does not work if str1 is in a special memory region (where + % 'cvp length' does not work). So we dup it first. + + exch strdup dup rot + currenteotchar exch seteotchar exch [ exch { - dup length 0 gt { - dup strdup exch - dup length add - } if + dup strdup exch + dup length add dup cvp length 1 le { pop exit } if @@ -610,6 +627,37 @@ exch seteotchar + exch free + +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% join - join array of strings +% +% group: +% +% ( array1 str1 -- str2 ) +% +% array1: array of strings +% str1: separator +% str2: complete string +% +/join { + over length 0 eq { pop pop 0 string return } if + + over length 1 sub over length mul + 2 index { length add } forall + string + + % note: last element is not followed by separator because it exceeds + % the destination string size + rot { + strcat over strcat + } forall + + exch pop + } def @@ -838,6 +886,16 @@ } def +% Bitmask for menu entries with no boot option input field. +% +% ( -- int ) +% +/config.nobootoptions { + "nobootoptions" getgfxconfig dup .undef ne { cvn } { pop 0 } ifelse + /config.nobootoptions over def +} def + + % Video memory in kb. % % ( -- int ) @@ -904,3 +962,15 @@ } def +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Get array element. +% +% Like get, but returns .undef if index is outside array bounds. +% +% ( array index -- obj ) +% +/aget { + over length over gt { get } { pop pop .undef } ifelse +} def + + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/window.inc new/themes/SuSE/window.inc --- old/themes/SuSE/window.inc 2006-07-07 12:55:28.000000000 +0200 +++ new/themes/SuSE/window.inc 2006-07-12 12:24:42.000000000 +0200 @@ -312,31 +312,41 @@ } if window.current .ed.list get { - dup keyDown eq over keyTab eq or { - window.current .ed.focus get - window.current .ed.list get over get edit.hidecursor - - 1 add window.current .ed.list get length mod - window.current .ed.focus 2 index put - window.current .ed.list get exch get edit.showcursor - pop 0 - } if - dup keyUp eq over keyShiftTab eq or { - window.current .ed.focus get - window.current .ed.list get over get edit.hidecursor - - 1 sub window.current .ed.list get length exch over add exch mod - window.current .ed.focus 2 index put - window.current .ed.list get exch get edit.showcursor - pop 0 - } if + window.current .ed.list get window.current .ed.focus get get .inp_show aget false ne { + + dup keyDown eq over keyTab eq or { + window.current .ed.focus get + window.current .ed.list get over get edit.hidecursor + + 1 add window.current .ed.list get length mod + window.current .ed.list get over get .inp_show aget false ne { } { pop 0 } ifelse + window.current .ed.focus 2 index put + window.current .ed.list get exch get edit.showcursor + pop 0 + } if + + dup keyUp eq over keyShiftTab eq or { + window.current .ed.focus get + window.current .ed.list get over get edit.hidecursor + + 1 sub window.current .ed.list get length exch over add exch mod + { + dup 0 eq { exit } if + window.current .ed.list get over get .inp_show aget false ne { exit } { 1 sub } ifelse + } loop + window.current .ed.focus 2 index put + window.current .ed.list get exch get edit.showcursor + pop 0 + } if + + % dup keyTab eq { + % window.findselected 1 add window.buttons length mod + % window.selectbutton + % pop 0 + % } if -% dup keyTab eq { -% window.findselected 1 add window.buttons length mod -% window.selectbutton -% pop 0 -% } if + } if } { has_buttons { @@ -379,7 +389,7 @@ setfont window.current .color.fg get setcolor - window.current .ed.focus get get exch edit.input + window.current .ed.focus get get dup .inp_show aget false ne { exch edit.input } { pop pop } ifelse 0 } { pop } ifelse } if ++++++ Zen.tar.bz2 ++++++ ++++++ gfxboot-3.2.31.tar.bz2 -> gfxboot-3.2.32.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-3.2.31/Changelog new/gfxboot-3.2.32/Changelog --- old/gfxboot-3.2.31/Changelog 2006-07-10 12:34:46.000000000 +0200 +++ new/gfxboot-3.2.32/Changelog 2006-07-17 15:33:19.000000000 +0200 @@ -1,3 +1,9 @@ +17/7/2006: v3.2.32 + - more than one boot option line, finished (#160066) + - added 'about' button + - make it openSUSE + - added xen test config + 10/7/2006: v3.2.31 - use disk image, not floppy for grub testing - updated Zen pictures diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-3.2.31/VERSION new/gfxboot-3.2.32/VERSION --- old/gfxboot-3.2.31/VERSION 2006-06-21 15:57:15.000000000 +0200 +++ new/gfxboot-3.2.32/VERSION 2006-07-10 12:40:31.000000000 +0200 @@ -1 +1 @@ -3.2.31 +3.2.32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org