diff --git a/back.jpg b/back.jpg index 5e763fb..3ece0eb 100644 Binary files a/back.jpg and b/back.jpg differ diff --git a/boot.config b/boot.config index f3fe3d8..e9cf00d 100644 --- a/boot.config +++ b/boot.config @@ -16,7 +16,7 @@ %% include dia_modes.inc %% include dia_help.inc %% include dia_profile.inc -%% include dia_bits.inc +%% include dia_audio.inc %% include dia_options.inc %% include dia_fulloptions.inc %% include dia_videomodes.inc diff --git a/common.inc b/common.inc index 827fdcf..d60d74e 100644 --- a/common.inc +++ b/common.inc @@ -279,15 +279,6 @@ syslinux { /add_suffix .undef def - % set new working directory - xmenu.bits { - xmenu.bits .xm_current get 1 eq { 64bit_boot_dir } { 32bit_boot_dir } ifelse - } { .undef } ifelse - dup .undef ne { - dup getcwd ne { chdir } { pop } ifelse - } { - pop - } ifelse } if % getcwd 0 300 moveto show trace @@ -350,11 +341,13 @@ } if syslinux { + + menu.args menu.entry get "hd0" ne { video.modes.list .undef ne { video.modes.list xmenu.video .xm_current get get .vm_mode get dup 0 ge { - 0x200 add "vga=0x%x " bc.cmd dup length add sprintf + 0x200 add "vga=0x%x " bc.cmd dup length add sprintf } if } if @@ -390,6 +383,17 @@ } { pop } ifelse } if + audio.use { + xmenu.audio { + xmenu.audio .xm_current get dup 0 ne { + calculate.param + audio.values exch get + "audio:%s" + bc.cmd dup length add sprintf + } { pop } ifelse + } if + } if + video_modes.selected.append .undef ne { video_modes.selected.append 0 get 0 ne { calculate.param @@ -425,6 +429,7 @@ pop } ifelse } if + } if } if xmenu.access { @@ -469,6 +474,13 @@ menuconfig.init + "audio" getgfxconfig dup .undef ne { + "true" eq { + /audio.use true def + } { + /audio.use false def + } ifelse + } { pop } ifelse "foreground" getgfxconfig dup .undef ne { strtol /menu.text.select over def @@ -503,8 +515,8 @@ .undef 3 index { - skipspace dup 0 get 0 eq { exit } if - getword exch + skipspace dup 0 get 0 eq { exit } if + getword exch } loop pop ] def diff --git a/dia_bits.inc b/dia_audio.inc similarity index 58% rename from dia_bits.inc rename to dia_audio.inc index b6f6cc7..5f60d31 100644 --- a/dia_bits.inc +++ b/dia_audio.inc @@ -1,6 +1,6 @@ % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % -% 32/64 bit install selection dialog. +% audio selection dialog. % % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8,51 +8,44 @@ % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % Some global vars. % -/bits.default 0 def +/audio.use false def +/audio.default 0 def +/audio.changed false def -/bits.suffix [ - .undef - "64" +/audio.values [ + "pulseaudio" + "alsa" ] def - % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % Build menu list. % % ( ) ==> ( ) % -/bits.init { - /xmenu.bits .xm_size array def - - /xmenu xmenu.bits def - - xmenu .xm_list [ "32bit" ] put +/audio.init { + /xmenu.audio .xm_size array def - 32+64bit_source { - 64bit { - /bits.default 1 def - xmenu .xm_list [ "32bit" "64bit" ] put - } if - } if + /xmenu xmenu.audio def - % no '64' suffix - 32bit_boot_dir 64bit_boot_dir ne { - bits.suffix 1 .undef put - } if + xmenu .xm_list [ + "PulseAudio" + "ALSA" + ] put - xmenu .xm_current bits.default put + xmenu .xm_current 0 put + xmenu .xm_title "Audio" put pmenu.init } def % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Update bit selection menu. +% Update audio selection menu. % % ( ) ==> ( ) % -/bits.update { - /xmenu xmenu.bits def +/audio.update { + /xmenu xmenu.audio def /window.action actRedrawPanel def @@ -61,16 +54,16 @@ % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Show bit selection menu. +% Show audio selection menu. % % ( ) => ( ) % -/panel.bits { - "bits" help.setcontext +/panel.audio { + "audio" help.setcontext window.xmenu - dup .xmenu xmenu.bits put - dup .xmenu.update /bits.update put + dup .xmenu xmenu.audio put + dup .xmenu.update /audio.update put dup window.init window.show } def @@ -81,8 +74,8 @@ % % ( ) => ( width ) % -/panel.bits.width { - /xmenu xmenu.bits def +/panel.audio.width { + /xmenu xmenu.audio def pmenu.width } def @@ -93,8 +86,8 @@ % % ( panel ) => ( ) % -/panel.bits.update { - /xmenu xmenu.bits def +/panel.audio.update { + /xmenu xmenu.audio def pmenu.panel.update } def diff --git a/install.config b/install.config index 251b71a..66503a6 100644 --- a/install.config +++ b/install.config @@ -16,7 +16,7 @@ %% include dia_modes.inc %% include dia_help.inc %% include dia_profile.inc -%% include dia_bits.inc +%% include dia_audio.inc %% include dia_options.inc %% include dia_fulloptions.inc %% include dia_access.inc diff --git a/panel.inc b/panel.inc index b75eaca..0c1612c 100644 --- a/panel.inc +++ b/panel.inc @@ -44,21 +44,14 @@ [ .panel.both [ keyF2 0 "F2" /panel.lang /panel.lang.width /panel.lang.update /lang.init ] ] %[ .panel.both [ keyF3 0 "F3" /panel.keymap /panel.keymap.width /panel.keymap.update /keymap.init ] ] [ .panel.both [ keyF3 0 "F3" /panel.video_modes /panel.video_modes.width /panel.video_modes.update /video_modes.init ] ] - [ .panel.both [ keyF4 0 "F4" /panel.options /panel.fulloptions.width /panel.fulloptions.update /fulloptions.init ] ] + audio.use { + [ .panel.both [ keyF4 0 "F4" /panel.audio /panel.audio.width /panel.audio.update /audio.init ] ] + [ .panel.both [ keyF5 0 "F5" /panel.options /panel.fulloptions.width /panel.fulloptions.update /fulloptions.init ] ] + } { + [ .panel.both [ keyF4 0 "F4" /panel.options /panel.fulloptions.width /panel.fulloptions.update /fulloptions.init ] ] + } ifelse [ .panel.both [ .undef 0 "Tab" /panel.help /panel.help.width /panel.tab.update .undef ] ] - 32+64bit_source { - 64bit { - 32bit_boot_dir .undef ne - 64bit_boot_dir .undef ne - 32bit_boot_dir 64bit_boot_dir ne - and and { - [ .panel.full [ keyF7 0 "F7" /panel.bits /panel.bits.width /panel.bits.update /bits.init ] ] - } if - } if - } if - - xmenu.bits .undef eq { bits.init } if } { diff --git a/po/be.po b/po/be.po index 164233f..be1ef74 100644 --- a/po/be.po +++ b/po/be.po @@ -311,3 +311,7 @@ msgstr "" #. txt_no_composite msgid "No composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Аўдыё" diff --git a/po/bg.po b/po/bg.po index 74426a6..3916219 100644 --- a/po/bg.po +++ b/po/bg.po @@ -314,3 +314,7 @@ msgstr "" #. txt_no_composite msgid "No Composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Звук" diff --git a/po/bootloader.pot b/po/bootloader.pot index 8027831..9f515ad 100644 --- a/po/bootloader.pot +++ b/po/bootloader.pot @@ -289,3 +289,7 @@ msgstr "" #. txt_no_composite msgid "No composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "" diff --git a/po/bs.po b/po/bs.po index 44b5d2b..263da79 100644 --- a/po/bs.po +++ b/po/bs.po @@ -311,3 +311,7 @@ msgstr "" #. txt_no_composite msgid "No composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Zvuk" diff --git a/po/cs.po b/po/cs.po index d751396..dbdecbc 100644 --- a/po/cs.po +++ b/po/cs.po @@ -313,3 +313,7 @@ msgstr "" #. txt_no_composite msgid "No composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Zvuk" diff --git a/po/da.po b/po/da.po index ce852ed..5e66663 100644 --- a/po/da.po +++ b/po/da.po @@ -314,3 +314,7 @@ msgstr "" #. txt_no_composite msgid "No composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Lyd" diff --git a/po/de.po b/po/de.po index 05f91e5..8ac9797 100644 --- a/po/de.po +++ b/po/de.po @@ -312,3 +312,7 @@ msgstr "" #. txt_no_composite msgid "No Composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Sprache" diff --git a/po/es.po b/po/es.po index 1863ae7..9abcebb 100644 --- a/po/es.po +++ b/po/es.po @@ -313,3 +313,7 @@ msgstr "" #. txt_no_composite msgid "No Composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Sonido" diff --git a/po/et.po b/po/et.po index beb1830..21acc66 100644 --- a/po/et.po +++ b/po/et.po @@ -311,3 +311,7 @@ msgstr "" #. txt_no_composite msgid "No composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Heli" diff --git a/po/fi.po b/po/fi.po index 3ea2160..1ab8e9c 100644 --- a/po/fi.po +++ b/po/fi.po @@ -312,3 +312,7 @@ msgstr "" #. txt_no_composite msgid "No composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Ääni" diff --git a/po/fr.po b/po/fr.po index 8fdae14..ae5c970 100644 --- a/po/fr.po +++ b/po/fr.po @@ -315,3 +315,7 @@ msgstr "" #. txt_no_composite msgid "No Composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Áudio" diff --git a/po/hr.po b/po/hr.po index 1429290..8fe1370 100644 --- a/po/hr.po +++ b/po/hr.po @@ -311,3 +311,7 @@ msgstr "Auto" #. txt_no_composite msgid "No Composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Audio" diff --git a/po/hu.po b/po/hu.po index 5a7bb90..3515f0c 100644 --- a/po/hu.po +++ b/po/hu.po @@ -314,3 +314,7 @@ msgstr "" #. txt_no_composite msgid "No composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Hang" diff --git a/po/is.po b/po/is.po index 12a72a0..6bf51fb 100644 --- a/po/is.po +++ b/po/is.po @@ -313,3 +313,7 @@ msgstr "" #. txt_no_composite msgid "No composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "" diff --git a/po/it.po b/po/it.po index f57d4cd..b536460 100644 --- a/po/it.po +++ b/po/it.po @@ -313,3 +313,7 @@ msgstr "" #. txt_no_composite msgid "No Composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Audio" diff --git a/po/kk.po b/po/kk.po index d43e92c..f4828a5 100644 --- a/po/kk.po +++ b/po/kk.po @@ -311,3 +311,7 @@ msgstr "" #. txt_no_composite msgid "No composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Аудио" diff --git a/po/lt.po b/po/lt.po index 45007c0..6aad2f3 100644 --- a/po/lt.po +++ b/po/lt.po @@ -309,3 +309,7 @@ msgstr "" #. txt_no_composite msgid "No composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Audio" diff --git a/po/lv.po b/po/lv.po index b092bdf..60335c7 100644 --- a/po/lv.po +++ b/po/lv.po @@ -311,3 +311,7 @@ msgstr "" #. txt_no_composite msgid "No composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Audio" diff --git a/po/nl_BE.po b/po/nl_BE.po index b0bac03..fa8f02d 100644 --- a/po/nl_BE.po +++ b/po/nl_BE.po @@ -314,3 +314,7 @@ msgstr "Auto" #. txt_no_composite msgid "No Composite" msgstr "No Composite" + +#. txt_audio +msgid "Audio" +msgstr "Geluid" diff --git a/po/nl_NL.po b/po/nl_NL.po index b0bac03..fa8f02d 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -314,3 +314,7 @@ msgstr "Auto" #. txt_no_composite msgid "No Composite" msgstr "No Composite" + +#. txt_audio +msgid "Audio" +msgstr "Geluid" diff --git a/po/nn.po b/po/nn.po index a521ee1..d0af7fc 100644 --- a/po/nn.po +++ b/po/nn.po @@ -311,3 +311,7 @@ msgstr "" #. txt_no_composite msgid "No composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "" diff --git a/po/pl.po b/po/pl.po index 106acf7..2f573f0 100644 --- a/po/pl.po +++ b/po/pl.po @@ -309,3 +309,7 @@ msgstr "" #. txt_no_composite msgid "No Composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Dźwięk" diff --git a/po/pt.po b/po/pt.po index 69fbf62..9d81f68 100644 --- a/po/pt.po +++ b/po/pt.po @@ -312,3 +312,7 @@ msgstr "" #. txt_no_composite msgid "No composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Áudio" diff --git a/po/pt_BR.po b/po/pt_BR.po index 422758a..9dd9f60 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -308,3 +308,7 @@ msgstr "" #. txt_no_composite msgid "No Composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Áudio" diff --git a/po/ro.po b/po/ro.po index ecf8f51..c2f6b62 100644 --- a/po/ro.po +++ b/po/ro.po @@ -311,3 +311,7 @@ msgstr "" #. txt_no_composite msgid "No Composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Audio" diff --git a/po/ru.po b/po/ru.po index 1da3613..6a316b8 100644 --- a/po/ru.po +++ b/po/ru.po @@ -312,3 +312,7 @@ msgstr "Авто" #. txt_no_composite msgid "No Composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Аудио" diff --git a/po/sk.po b/po/sk.po index 850ee64..272c23c 100644 --- a/po/sk.po +++ b/po/sk.po @@ -313,3 +313,7 @@ msgstr "" #. txt_no_composite msgid "No composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Zvuk" diff --git a/po/sl.po b/po/sl.po index fd2be75..3fd2435 100644 --- a/po/sl.po +++ b/po/sl.po @@ -314,3 +314,7 @@ msgstr "" #. txt_no_composite msgid "No composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Zvok" diff --git a/po/sq.po b/po/sq.po index 5a6aee2..04456e7 100644 --- a/po/sq.po +++ b/po/sq.po @@ -311,3 +311,7 @@ msgstr "" #. txt_no_composite msgid "No composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Audio" diff --git a/po/sr.po b/po/sr.po index 3b66837..e99b3a2 100644 --- a/po/sr.po +++ b/po/sr.po @@ -311,3 +311,7 @@ msgstr "" #. txt_no_composite msgid "No composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Звук" diff --git a/po/sv.po b/po/sv.po index ab9e55a..bb40707 100644 --- a/po/sv.po +++ b/po/sv.po @@ -311,3 +311,7 @@ msgstr "" #. txt_no_composite msgid "No composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Ljud" diff --git a/po/uk.po b/po/uk.po index 52fc2a3..7a1cc14 100644 --- a/po/uk.po +++ b/po/uk.po @@ -312,3 +312,7 @@ msgstr "" #. txt_no_composite msgid "No Composite" msgstr "" + +#. txt_audio +msgid "Audio" +msgstr "Аудіо" diff --git a/theme_positions.inc b/theme_positions.inc index 5fb9207..b8f4d6b 100644 --- a/theme_positions.inc +++ b/theme_positions.inc @@ -1,4 +1,4 @@ /timer.position.x 620 def /timer.position.y { panel.text.y } def /menu.position.x 187 def -/menu.position.y 140 def +/menu.position.y 170 def