Обновлена тема

7 years ago · e7dbf80c15
parent 5341abeedb
commit e7dbf80c15
39 changed files with 189 additions and 63 deletions
--- a/back.jpg
+++ b/back.jpg
--- 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
--- 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
--- a/dia_audio.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
--- 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
--- 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

    } {

--- 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 "Аўдыё"
--- 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 "Звук"
--- 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 ""
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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 ""
--- 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"
--- 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 "Аудио"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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 ""
--- 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"
--- 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"
--- 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"
--- 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"
--- 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 "Аудио"
--- 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"
--- 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"
--- 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"
--- 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 "Звук"
--- 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"
--- 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 "Аудіо"
--- 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