diff --git a/boot.config b/boot.config index 9d4c833..08ec06b 100644 --- a/boot.config +++ b/boot.config @@ -18,7 +18,7 @@ %% include dia_install.inc %% include dia_bits.inc %% include dia_options.inc -%% include dia_dimode.inc +%% include dia_fulloptions.inc %% include dia_access.inc %% include panel.inc %% include keytables.inc diff --git a/common.inc b/common.inc index f9f3b1d..6759643 100644 --- a/common.inc +++ b/common.inc @@ -357,9 +357,9 @@ } if - xmenu.dimode { - dimode.option .undef ne { - dimode.option "%s " bc.cmd dup length add sprintf + xmenu.fulloptions { + fulloptions.option .undef ne { + fulloptions.option "%s " bc.cmd dup length add sprintf } if } if diff --git a/debian/changelog b/debian/changelog index 967d655..b6dd730 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ gfxboot-theme-ubuntu (0.5.2) UNRELEASED; urgency=low * Ask for language before displaying the main menu (LP: #39888). * Filter out translations for various languages (Arabic, Dzongkha, Indic, Mongolian, Thai) that we cannot render properly for various reasons. + * Give checkbox semantics to the items in the F6 "Other Options" menu. -- Colin Watson Sun, 03 Feb 2008 18:09:54 +0000 diff --git a/dia_dimode.inc b/dia_dimode.inc deleted file mode 100644 index 1d0aaa6..0000000 --- a/dia_dimode.inc +++ /dev/null @@ -1,88 +0,0 @@ -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% -% Panel d-i mode selector. -% -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -/dimode.option .undef def - -/.dimode.normal 0 def -/.dimode.expert 1 def - - -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Initialise d-i mode menu. -% -% ( ) ==> ( ) -% -/dimode.init { - /xmenu.dimode .xm_size array def - /xmenu xmenu.dimode def - - xmenu .xm_current .dimode.normal put - - xmenu .xm_list [ /txt_normal_mode /txt_expert_mode ] put - - pmenu.init -} def - - -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Update d-i mode status. -% -% ( ) ==> ( ) -% -/dimode.update { - /xmenu xmenu.dimode def - - xmenu .xm_current get .dimode.normal eq { - /dimode.option .undef def - } { - /dimode.option "priority=low" def - } ifelse - - /window.action actRedrawPanel def - - pmenu.update -} def - - -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Show window. -% -% ( ) => ( ) -% -/panel.dimode { - "dimode" help.setcontext - - window.xmenu - dup .xmenu xmenu.dimode put - dup .xmenu.update /dimode.update put - dup window.init - window.show -} def - - -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Return width of panel entry. -% -% ( ) => ( width ) -% -/panel.dimode.width { - /xmenu xmenu.dimode def - - pmenu.width -} def - - -% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -% Redraw panel entry. -% -% ( panel ) => ( ) -% -/panel.dimode.update { - /xmenu xmenu.dimode def - - pmenu.panel.update -} def diff --git a/dia_fulloptions.inc b/dia_fulloptions.inc new file mode 100644 index 0000000..97536a9 --- /dev/null +++ b/dia_fulloptions.inc @@ -0,0 +1,124 @@ +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% +% Panel boot options selector. +% +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +/fulloptions.option .undef def + +/.fulloptions.expert 0 def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Initialise boot options menu. +% +% ( ) ==> ( ) +% +/fulloptions.init { + /xmenu.fulloptions .xm_size array def + /xmenu xmenu.fulloptions def + + xmenu .xm_current .fulloptions.expert put + + xmenu .xm_list [ /txt_expert_mode ] put + + xmenu .xm_title /txt_other_options put + xmenu .xm_check 1 put + xmenu .xm_allselected xmenu .xm_list get length array put + 0 1 xmenu .xm_list get length 1 sub { + xmenu .xm_allselected get exch false put + } for + + pmenu.init +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Change boot options status. +% +% ( ) ==> ( ) +% +/fulloptions.change { + /xmenu xmenu.fulloptions def + + /fulloptions.option 0 string def + + xmenu .xm_allselected get + 0 1 xmenu .xm_allselected get length 1 sub { + over over get { + .undef + over .fulloptions.expert eq { pop "priority=low" } if + dup { + % append new option string + dup length fulloptions.option length add 1 add string + /fulloptions.newoption exch def + dup fulloptions.option "%s %s" fulloptions.newoption sprintf + fulloptions.option free + /fulloptions.option fulloptions.newoption def + } if + pop + } if + pop + } for + pop + + fulloptions.option length { + /fulloptions.option inc + } { + /fulloptions.option .undef def + } ifelse +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Update boot options status. +% +% ( ) ==> ( ) +% +/fulloptions.update { + fulloptions.change + /window.action actRedrawPanel def + pmenu.update +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Show window. +% +% ( ) => ( ) +% +/panel.fulloptions { + "fulloptions" help.setcontext + + window.xmenu + dup .xmenu xmenu.fulloptions put + dup .xmenu.change /fulloptions.change put + dup .xmenu.update /fulloptions.update put + dup window.init + window.show +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Return width of panel entry. +% +% ( ) => ( width ) +% +/panel.fulloptions.width { + /xmenu xmenu.fulloptions def + + pmenu.width +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Redraw panel entry. +% +% ( panel ) => ( ) +% +/panel.fulloptions.update { + /xmenu xmenu.fulloptions def + + pmenu.panel.update +} def diff --git a/install.config b/install.config index 99df501..92d2b16 100644 --- a/install.config +++ b/install.config @@ -18,7 +18,7 @@ %% include dia_install.inc %% include dia_bits.inc %% include dia_options.inc -%% include dia_dimode.inc +%% include dia_fulloptions.inc %% include dia_access.inc %% include panel.inc %% include keytables.inc diff --git a/panel.inc b/panel.inc index 2efb3a0..0926c08 100644 --- a/panel.inc +++ b/panel.inc @@ -49,7 +49,7 @@ [ .panel.short [ keyF6 0 "F6" /panel.options /panel.options.width /panel.options.update .undef ] ] is_live not { - [ .panel.full [ keyF6 0 "F6" /panel.dimode /panel.dimode.width /panel.dimode.update /dimode.init ] ] + [ .panel.full [ keyF6 0 "F6" /panel.fulloptions /panel.fulloptions.width /panel.fulloptions.update /fulloptions.init ] ] } if 32+64bit_source { diff --git a/po/af.po b/po/af.po index 147f233..bbe97e5 100644 --- a/po/af.po +++ b/po/af.po @@ -234,11 +234,6 @@ msgstr "Taal" msgid "Keymap" msgstr "Sleutelkaart" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Normale modus" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/am.po b/po/am.po index 505df39..252a4cb 100644 --- a/po/am.po +++ b/po/am.po @@ -216,11 +216,6 @@ msgstr "" msgid "Keymap" msgstr "" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/ar.po b/po/ar.po index 977b589..fa85ed7 100644 --- a/po/ar.po +++ b/po/ar.po @@ -232,11 +232,6 @@ msgstr "ﺔﻐﻠﻟﺍ" msgid "Keymap" msgstr "ﺢﻴﺗﺎﻔﻤﻟﺍ ﺔﻃﺭﺎﺧ" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "ﻱﺩﺎﻌﻟﺍ ﺭﻮﻄﻟﺍ" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/be.po b/po/be.po index 448e817..be17487 100644 --- a/po/be.po +++ b/po/be.po @@ -234,11 +234,6 @@ msgstr "Мова" msgid "Keymap" msgstr "Раскладка клявіятуры" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Звычайны рэжым" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/bg.po b/po/bg.po index bbb640f..d36be31 100644 --- a/po/bg.po +++ b/po/bg.po @@ -237,11 +237,6 @@ msgstr "Език" msgid "Keymap" msgstr "Клавишен код" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Нормален режим" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/bn.po b/po/bn.po index 6b248a4..4bf8423 100644 --- a/po/bn.po +++ b/po/bn.po @@ -237,11 +237,6 @@ msgstr "ভাষা" msgid "Keymap" msgstr "কী-ম্যাপ" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "সাধারন মোড" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/bootloader.pot b/po/bootloader.pot index 595dc12..4a6732e 100644 --- a/po/bootloader.pot +++ b/po/bootloader.pot @@ -201,11 +201,6 @@ msgstr "" msgid "Keymap" msgstr "" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/br.po b/po/br.po index 20f34e3..7b0c0fd 100644 --- a/po/br.po +++ b/po/br.po @@ -234,11 +234,6 @@ msgstr "Yezh" msgid "Keymap" msgstr "Alc'hwezhiad" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Mod boutin" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/bs.po b/po/bs.po index ec54297..74dd2f6 100644 --- a/po/bs.po +++ b/po/bs.po @@ -234,11 +234,6 @@ msgstr "Jezik" msgid "Keymap" msgstr "Raspored tastature" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Normalni način" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/ca.po b/po/ca.po index 3cbc29d..2d130c4 100644 --- a/po/ca.po +++ b/po/ca.po @@ -235,11 +235,6 @@ msgstr "Idioma" msgid "Keymap" msgstr "Mapa de teclat" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Mode normal" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/cs.po b/po/cs.po index 70c9f39..fb93159 100644 --- a/po/cs.po +++ b/po/cs.po @@ -236,11 +236,6 @@ msgstr "Jazyk" msgid "Keymap" msgstr "Klávesnice" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Normální režim" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/csb.po b/po/csb.po index d020cce..7614cff 100644 --- a/po/csb.po +++ b/po/csb.po @@ -234,11 +234,6 @@ msgstr "Jãzëk" msgid "Keymap" msgstr "Klawiatura" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Zwëczajny ôrt" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/da.po b/po/da.po index e7be3cb..1be91eb 100644 --- a/po/da.po +++ b/po/da.po @@ -235,11 +235,6 @@ msgstr "Sprog" msgid "Keymap" msgstr "Tastaturlayout" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Normal tilstand" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/de.po b/po/de.po index 61e9609..3704cb6 100644 --- a/po/de.po +++ b/po/de.po @@ -235,11 +235,6 @@ msgstr "Sprache" msgid "Keymap" msgstr "Tastaturbelegung" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Normaler Modus" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/el.po b/po/el.po index 0b28330..e59d9d2 100644 --- a/po/el.po +++ b/po/el.po @@ -236,11 +236,6 @@ msgstr "Γλώσσα" msgid "Keymap" msgstr "Διάταξη πληκτρολογίου" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Κανονική λειτουργία" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/eo.po b/po/eo.po index c84fd85..a985178 100644 --- a/po/eo.po +++ b/po/eo.po @@ -234,11 +234,6 @@ msgstr "Lingvo" msgid "Keymap" msgstr "Klavaro" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Normala reĝimo" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/es.po b/po/es.po index a86dfd5..9243591 100644 --- a/po/es.po +++ b/po/es.po @@ -236,11 +236,6 @@ msgstr "Idioma" msgid "Keymap" msgstr "Teclado" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Modo normal" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/et.po b/po/et.po index f36b25a..71714c7 100644 --- a/po/et.po +++ b/po/et.po @@ -236,11 +236,6 @@ msgstr "Keel" msgid "Keymap" msgstr "Võtmekaart" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Tavaline laad" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/eu.po b/po/eu.po index 70fabe0..5e58127 100644 --- a/po/eu.po +++ b/po/eu.po @@ -234,11 +234,6 @@ msgstr "Hizkuntza" msgid "Keymap" msgstr "Teklatua" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Modu normala" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/fa.po b/po/fa.po index ed458a8..aac03f2 100644 --- a/po/fa.po +++ b/po/fa.po @@ -234,11 +234,6 @@ msgstr "زبان" msgid "Keymap" msgstr "نقشه کلید" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "طریق عادی" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/fi.po b/po/fi.po index df9fbe8..2d8bd2c 100644 --- a/po/fi.po +++ b/po/fi.po @@ -235,11 +235,6 @@ msgstr "Kieli" msgid "Keymap" msgstr "Näppäimistökartta" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Perustila" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/fil.po b/po/fil.po index 3ecf838..d0aabf7 100644 --- a/po/fil.po +++ b/po/fil.po @@ -242,11 +242,6 @@ msgstr "Wika" msgid "Keymap" msgstr "" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/fr.po b/po/fr.po index 3daea3d..ba4eada 100644 --- a/po/fr.po +++ b/po/fr.po @@ -240,11 +240,6 @@ msgstr "Langue" msgid "Keymap" msgstr "Clavier" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Mode normal" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/fur.po b/po/fur.po index 90e39a6..187b440 100644 --- a/po/fur.po +++ b/po/fur.po @@ -232,11 +232,6 @@ msgstr "Lenghe" msgid "Keymap" msgstr "Batonêra" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Môt como al solit" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/ga.po b/po/ga.po index affddb9..ff88b5f 100644 --- a/po/ga.po +++ b/po/ga.po @@ -234,11 +234,6 @@ msgstr "Teanga" msgid "Keymap" msgstr "Léarscáil" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Gnáthmodh" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/gl.po b/po/gl.po index b9bfe16..f5ce15e 100644 --- a/po/gl.po +++ b/po/gl.po @@ -232,11 +232,6 @@ msgstr "Idioma" msgid "Keymap" msgstr "Mapa de Teclas" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Modo normal" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/he.po b/po/he.po index 16e8956..b1d49a6 100644 --- a/po/he.po +++ b/po/he.po @@ -232,11 +232,6 @@ msgstr "שפה" msgid "Keymap" msgstr "פריסת מקשים" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "מצב רגיל" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/hi.po b/po/hi.po index 0f21ed0..6f5bc46 100644 --- a/po/hi.po +++ b/po/hi.po @@ -230,11 +230,6 @@ msgstr "" msgid "Keymap" msgstr "" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/hr.po b/po/hr.po index 0dff43d..9d2a30c 100644 --- a/po/hr.po +++ b/po/hr.po @@ -234,11 +234,6 @@ msgstr "Jezik" msgid "Keymap" msgstr "Raspored tipkovnice" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Normalni način" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/hu.po b/po/hu.po index 516975b..9c016a1 100644 --- a/po/hu.po +++ b/po/hu.po @@ -237,11 +237,6 @@ msgstr "Nyelv" msgid "Keymap" msgstr "Billentyűzet" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Normál mód" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/id.po b/po/id.po index 1e90b11..694c090 100644 --- a/po/id.po +++ b/po/id.po @@ -234,11 +234,6 @@ msgstr "Bahasa" msgid "Keymap" msgstr "Keymap" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Mode Normal" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/is.po b/po/is.po index 45e2c5f..5563f60 100644 --- a/po/is.po +++ b/po/is.po @@ -234,11 +234,6 @@ msgstr "Tungumál" msgid "Keymap" msgstr "Lyklavörpun" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Venjulegur hamur" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/it.po b/po/it.po index 870e95e..b9d0c8b 100644 --- a/po/it.po +++ b/po/it.po @@ -236,11 +236,6 @@ msgstr "Lingua" msgid "Keymap" msgstr "Tastiera" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Modalità normale" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/ja.po b/po/ja.po index 4544f24..91c328f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -232,11 +232,6 @@ msgstr "言語" msgid "Keymap" msgstr "キーマップ" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "ノーマルモード" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/ka.po b/po/ka.po index 4cb1479..9358f14 100644 --- a/po/ka.po +++ b/po/ka.po @@ -236,11 +236,6 @@ msgstr "ენა" msgid "Keymap" msgstr "Keymap" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "ჩვეულებრივი რეჟიმი" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/kn.po b/po/kn.po index c7e5617..2ff9719 100644 --- a/po/kn.po +++ b/po/kn.po @@ -234,11 +234,6 @@ msgstr "ಭಾಷೆ" msgid "Keymap" msgstr "ಕೀಮ್ಯಾಪ್" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "ಸಾಧಾರಣ ವಿಧಾನ" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/ko.po b/po/ko.po index 1145151..34e1701 100644 --- a/po/ko.po +++ b/po/ko.po @@ -234,11 +234,6 @@ msgstr "언어" msgid "Keymap" msgstr "키 맵" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "일반 모드" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/ku.po b/po/ku.po index cfbe47c..e7298a0 100644 --- a/po/ku.po +++ b/po/ku.po @@ -231,11 +231,6 @@ msgstr "Ziman" msgid "Keymap" msgstr "Klavye" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Moda asayî" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/la.po b/po/la.po index 111353b..5266ad3 100644 --- a/po/la.po +++ b/po/la.po @@ -232,11 +232,6 @@ msgstr "Lingua" msgid "Keymap" msgstr "" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Modus normalis" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/lb.po b/po/lb.po index 36ee20f..0138f7a 100644 --- a/po/lb.po +++ b/po/lb.po @@ -234,11 +234,6 @@ msgstr "Sprooch" msgid "Keymap" msgstr "Tastaturbeléung" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Normalmodus" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/lt.po b/po/lt.po index 54ad861..8c4b8ed 100644 --- a/po/lt.po +++ b/po/lt.po @@ -232,11 +232,6 @@ msgstr "Kalba/Lang." msgid "Keymap" msgstr "Klaviatūra" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Normalus režimas" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/lv.po b/po/lv.po index f8e957d..ac55e0b 100644 --- a/po/lv.po +++ b/po/lv.po @@ -233,11 +233,6 @@ msgstr "Valoda" msgid "Keymap" msgstr "Taustiņkarte" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Parastais režīms" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/mk.po b/po/mk.po index 3827964..c785cc7 100644 --- a/po/mk.po +++ b/po/mk.po @@ -236,11 +236,6 @@ msgstr "Јазик" msgid "Keymap" msgstr "Тастатура" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Обичен режим" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/ml.po b/po/ml.po index 900a82f..ae56b18 100644 --- a/po/ml.po +++ b/po/ml.po @@ -216,11 +216,6 @@ msgstr "" msgid "Keymap" msgstr "" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/mn.po b/po/mn.po index 1741a70..289d871 100644 --- a/po/mn.po +++ b/po/mn.po @@ -241,11 +241,6 @@ msgstr "Хэл" msgid "Keymap" msgstr "Гарын байршил" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Хэвийн горим" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/ms.po b/po/ms.po index 5c81669..120a1eb 100644 --- a/po/ms.po +++ b/po/ms.po @@ -234,11 +234,6 @@ msgstr "Bahasa" msgid "Keymap" msgstr "Peta kunci" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Mod Normal" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/mt.po b/po/mt.po index 19a2dcd..a317390 100644 --- a/po/mt.po +++ b/po/mt.po @@ -216,11 +216,6 @@ msgstr "" msgid "Keymap" msgstr "" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/nb.po b/po/nb.po index b58b7d2..6372b94 100644 --- a/po/nb.po +++ b/po/nb.po @@ -237,11 +237,6 @@ msgstr "Språk" msgid "Keymap" msgstr "Tastaturoppsett" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Normal modus" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/nds.po b/po/nds.po index 1e23569..9d74abb 100644 --- a/po/nds.po +++ b/po/nds.po @@ -234,11 +234,6 @@ msgstr "Sprache" msgid "Keymap" msgstr "Tastaturlayout" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "normaler Modus" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/nl.po b/po/nl.po index 2237674..43c2144 100644 --- a/po/nl.po +++ b/po/nl.po @@ -237,11 +237,6 @@ msgstr "Taal" msgid "Keymap" msgstr "Toetsenindeling" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Normale modus" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/nn.po b/po/nn.po index d6d3ce0..f17c9b2 100644 --- a/po/nn.po +++ b/po/nn.po @@ -231,11 +231,6 @@ msgstr "" msgid "Keymap" msgstr "" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/oc.po b/po/oc.po index 2f231ff..89b1b49 100644 --- a/po/oc.po +++ b/po/oc.po @@ -233,11 +233,6 @@ msgstr "Lenga" msgid "Keymap" msgstr "Clavièr" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Mòde normal" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/pl.po b/po/pl.po index df2cc17..edd719a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -232,11 +232,6 @@ msgstr "Język" msgid "Keymap" msgstr "Klawiatura" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Tryb standardowy" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/pt.po b/po/pt.po index 51c4ccb..211ac69 100644 --- a/po/pt.po +++ b/po/pt.po @@ -235,11 +235,6 @@ msgstr "Idioma" msgid "Keymap" msgstr "Mapa de Teclas" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Modo normal" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/pt_BR.po b/po/pt_BR.po index c840bcd..5d8ec74 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -232,11 +232,6 @@ msgstr "Idioma" msgid "Keymap" msgstr "Mapa de teclas" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Modo Normal" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/ro.po b/po/ro.po index 5ff4a95..58e9f38 100644 --- a/po/ro.po +++ b/po/ro.po @@ -234,11 +234,6 @@ msgstr "Limbă" msgid "Keymap" msgstr "Mapare" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Mod normal" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/ru.po b/po/ru.po index ecbd04b..7d60938 100644 --- a/po/ru.po +++ b/po/ru.po @@ -235,11 +235,6 @@ msgstr "Язык" msgid "Keymap" msgstr "Клавиатура" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Обычный режим" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/sk.po b/po/sk.po index fe48562..e98f892 100644 --- a/po/sk.po +++ b/po/sk.po @@ -236,11 +236,6 @@ msgstr "Jazyk" msgid "Keymap" msgstr "Klávesnica" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Bežný spôsob inštalácie" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/sl.po b/po/sl.po index 6e6bf9f..87c2198 100644 --- a/po/sl.po +++ b/po/sl.po @@ -237,11 +237,6 @@ msgstr "Jezik" msgid "Keymap" msgstr "Razporeditev tipkovnice" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Navadni način" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/so.po b/po/so.po index bee67be..162c439 100644 --- a/po/so.po +++ b/po/so.po @@ -239,11 +239,6 @@ msgstr "" msgid "Keymap" msgstr "" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/sq.po b/po/sq.po index cb994c7..4c529fb 100644 --- a/po/sq.po +++ b/po/sq.po @@ -228,11 +228,6 @@ msgstr "Gjuha" msgid "Keymap" msgstr "Keymap" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Mënyra Normale" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/sr.po b/po/sr.po index a3a2513..dec3368 100644 --- a/po/sr.po +++ b/po/sr.po @@ -233,11 +233,6 @@ msgstr "Језик" msgid "Keymap" msgstr "Мапа тастера" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Нормалан режим" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/sv.po b/po/sv.po index cb6c94c..df04ef2 100644 --- a/po/sv.po +++ b/po/sv.po @@ -234,11 +234,6 @@ msgstr "Språk" msgid "Keymap" msgstr "Tangentbordslayout" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Normalt läge" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/ta.po b/po/ta.po index 454a17a..493aae0 100644 --- a/po/ta.po +++ b/po/ta.po @@ -236,11 +236,6 @@ msgstr "மொழி" msgid "Keymap" msgstr "விசைப்பலகை இட அமைவு" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "இயல்பான வகை" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/te.po b/po/te.po index 5969aea..c573845 100644 --- a/po/te.po +++ b/po/te.po @@ -229,11 +229,6 @@ msgstr "" msgid "Keymap" msgstr "" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/th.po b/po/th.po index 980d7a3..76fd03b 100644 --- a/po/th.po +++ b/po/th.po @@ -234,11 +234,6 @@ msgstr "ภาษา" msgid "Keymap" msgstr "ตารางปุ่มพิมพ์" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "แบบธรรมดา" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/tl.po b/po/tl.po index 568e66a..7f2db75 100644 --- a/po/tl.po +++ b/po/tl.po @@ -221,11 +221,6 @@ msgstr "" msgid "Keymap" msgstr "" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/tlh.po b/po/tlh.po index 1503ab1..959be23 100644 --- a/po/tlh.po +++ b/po/tlh.po @@ -244,11 +244,6 @@ msgstr "" msgid "Keymap" msgstr "" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/tr.po b/po/tr.po index cfe701b..3ca3a06 100644 --- a/po/tr.po +++ b/po/tr.po @@ -234,11 +234,6 @@ msgstr "Dil" msgid "Keymap" msgstr "Klavye" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Normal Kip" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/uk.po b/po/uk.po index deddc00..f014f0d 100644 --- a/po/uk.po +++ b/po/uk.po @@ -237,11 +237,6 @@ msgstr "Мова" msgid "Keymap" msgstr "Розкладка клавіатури" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Нормальний режим" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/ur.po b/po/ur.po index 1309051..a2ba68a 100644 --- a/po/ur.po +++ b/po/ur.po @@ -228,11 +228,6 @@ msgstr "زبان" msgid "Keymap" msgstr "" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/vi.po b/po/vi.po index 68fe175..b15a95f 100644 --- a/po/vi.po +++ b/po/vi.po @@ -235,11 +235,6 @@ msgstr "Ngôn ngữ" msgid "Keymap" msgstr "Sơ đồ phím" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "Chế độ thường" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/zh_CN.po b/po/zh_CN.po index d2602e3..a954332 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -232,11 +232,6 @@ msgstr "语言" msgid "Keymap" msgstr "键盘映射" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "正常模式" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/po/zh_TW.po b/po/zh_TW.po index 6072689..c1daab0 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -232,11 +232,6 @@ msgstr "語言" msgid "Keymap" msgstr "鍵盤對應表" -#. label for d-i mode menu -#. txt_normal_mode -msgid "Normal mode" -msgstr "一般模式" - #. label for d-i mode menu #. txt_expert_mode msgid "Expert mode" diff --git a/window.inc b/window.inc index 0fb9e92..1a81f69 100644 --- a/window.inc +++ b/window.inc @@ -93,6 +93,7 @@ /.ed.pw_field newfield /.xmenu newfield /.xmenu.update newfield +/.xmenu.change newfield % like update but the window remains shown /.xmenu.select newfield /.xmenu.input newfield diff --git a/xmenu.inc b/xmenu.inc index c6764d6..67e0329 100644 --- a/xmenu.inc +++ b/xmenu.inc @@ -40,7 +40,9 @@ small_layout { /.xm_vspace 9 def % vspace per menu /.xm_title 10 def % xmenu title /.xm_columns 11 def % menu columns -/.xm_size 12 def % xmenu size +/.xm_check 12 def % if non-zero, use checkboxes +/.xm_allselected 13 def % all selected checkboxes +/.xm_size 14 def % xmenu size % short hands @@ -82,12 +84,31 @@ small_layout { } if dup keyEnter eq { - window.current .xmenu.update get - window.done + xmenu .xm_check get { + xmenu .xm_allselected get xmenu .xm_current get over over get not put + xmenu .xm_current get xmenu.viewentry + window.current .xmenu.change get + } { + window.current .xmenu.update get + window.done + } ifelse exec pop 0 } if + dup ' ' eq { + xmenu .xm_check get { + xmenu .xm_allselected get xmenu .xm_current get over over get not put + xmenu .xm_current get xmenu.viewentry + window.current .xmenu.change get dup .undef ne { + exec + } { + pop window.current .xmenu.update get exec + } ifelse + } if + pop 0 + } if + dup keyDown eq { xmenu .xm_current get 1 add xmenu.select pop 0 @@ -166,7 +187,9 @@ small_layout { put xmenu .xm_width - 0 xmenu .xm_list get { exec strsize pop max } forall xmenu.hspace 2 mul add + 0 xmenu .xm_list get { exec strsize pop max } forall + xmenu .xm_check get { "x " strsize pop add } if + xmenu.hspace 2 mul add put } def @@ -292,6 +315,13 @@ small_layout { dup xmenu .xm_current get eq { xmenu.selected.fg } { xmenu.normal.fg } ifelse setcolor xmenu.pos.x xmenu.hspace add xmenu.pos.y xmenu.vspace add moveto + xmenu .xm_check get { + xmenu .xm_allselected get over get { + "x " show + } { + "x " strsize pop 0 rmoveto + } ifelse + } if xmenu .xm_list get over get exec show pop