From e7dbf80c157ada5e75c8cb2e2f7274d7e8ce0bc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Wed, 21 Dec 2016 10:17:54 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D1=82=D0=B5=D0=BC=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back.jpg | Bin 8289 -> 7000 bytes boot.config | 2 +- common.inc | 36 ++++++++++++------- dia_bits.inc => dia_audio.inc | 63 +++++++++++++++------------------- install.config | 2 +- panel.inc | 19 ++++------ po/be.po | 4 +++ po/bg.po | 4 +++ po/bootloader.pot | 4 +++ po/bs.po | 4 +++ po/cs.po | 4 +++ po/da.po | 4 +++ po/de.po | 4 +++ po/es.po | 4 +++ po/et.po | 4 +++ po/fi.po | 4 +++ po/fr.po | 4 +++ po/hr.po | 4 +++ po/hu.po | 4 +++ po/is.po | 4 +++ po/it.po | 4 +++ po/kk.po | 4 +++ po/lt.po | 4 +++ po/lv.po | 4 +++ po/nl_BE.po | 4 +++ po/nl_NL.po | 4 +++ po/nn.po | 4 +++ po/pl.po | 4 +++ po/pt.po | 4 +++ po/pt_BR.po | 4 +++ po/ro.po | 4 +++ po/ru.po | 4 +++ po/sk.po | 4 +++ po/sl.po | 4 +++ po/sq.po | 4 +++ po/sr.po | 4 +++ po/sv.po | 4 +++ po/uk.po | 4 +++ theme_positions.inc | 2 +- 39 files changed, 189 insertions(+), 63 deletions(-) rename dia_bits.inc => dia_audio.inc (58%) diff --git a/back.jpg b/back.jpg index 5e763fbd4bff1954eb3628c9b933ccc194bc17f4..3ece0ebb0a4f17c723489447faf3f5d4f12a05fe 100644 GIT binary patch literal 7000 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 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