Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r255 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-10-31 20:59:21
|
Author: M0E.lnx
Date: Fri Oct 31 13:57:39 2008
New Revision: 255
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/.project
branches/iVL/FrmXconf.class
branches/iVL/FrmXconf.form
Log:
Added keyboard layout listing to FrmXconf form
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/.project
+# /home/vluser/devel/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/ClsGlobal.class
+# /home/vluser/devel/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/ClsPartSel.class
+# /home/vluser/devel/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/ClsWinDrives.class
+# /home/vluser/devel/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FMain.class
+# /home/vluser/devel/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmDiskPart.class
+# /home/vluser/devel/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmPartScheme.class
+# /home/vluser/devel/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmPartSel.class
+# /home/vluser/devel/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmPkgSel.class
+# /home/vluser/devel/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmSelISO.class
+# /home/vluser/devel/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -30,27 +30,31 @@
msgid "Unable to locate any installable media."
msgstr ""
-#: FrmSelISO.class:112
+#: FrmSelISO.class:82
+msgid "Installable media found."
+msgstr ""
+
+#: FrmSelISO.class:113
msgid "Unable to identify distro."
msgstr ""
-#: FrmSelISO.class:147
+#: FrmSelISO.class:148
msgid "Minimum Disk Space Requirements"
msgstr ""
-#: FrmSelISO.class:250
+#: FrmSelISO.class:251
msgid "No installable images found."
msgstr ""
-#: FrmSelISO.class:256
+#: FrmSelISO.class:257
msgid "Select which VectorLinux version you wish to install from the list
below"
msgstr ""
-#: FrmSelISO.class:261
+#: FrmSelISO.class:262
msgid "TextLabel1"
msgstr ""
-#: FrmSelISO.class:266
+#: FrmSelISO.class:267
msgid "Search Again"
msgstr ""
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmSummary.class
+# /home/vluser/devel/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmWinDrives.class
+# /home/vluser/devel/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlCore.module
+# /home/vluser/devel/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlDiskPart.module
+# /home/vluser/devel/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlObjSizer.module
+# /home/vluser/devel/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlPartSel.module
+# /home/vluser/devel/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlPkgSel.module
+# /home/vluser/devel/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlSetup.module
+# /home/vluser/devel/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlSummarize.module
+# /home/vluser/devel/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlWinDrives.module
+# /home/vluser/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Fri Oct 31 13:57:39 2008
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
-Startup=MdlCore
+Startup=FrmXconf
Version=0.0.120
Library=gb.gtk
Library=gb.form
Modified: branches/iVL/FrmXconf.class
==============================================================================
--- branches/iVL/FrmXconf.class (original)
+++ branches/iVL/FrmXconf.class Fri Oct 31 13:57:39 2008
@@ -86,6 +86,57 @@
END
+PUBLIC SUB LIST_KBD_LAYOUTS()
+
+ DIM sFile AS String '= File.Load("/etc/X11/xkb/rules/xorg.lst")
+ DIM i, ii AS Integer
+ DIM sArr AS String[] '= Split(sFile, "\n")
+ DIM sHack AS String
+
+ ' ugly hack to get a good list begins here
+ sHack = "#!/bin/bash \n" &
+ "echo /dev/null > /tmp/kbd.file \n" &
+ "while read code desc1 desc2 junk \n" &
+ "do \n" &
+ "echo \"$code\" \"$desc1\" \"$desc2\" \"$junk\" >> /tmp/kbd.file \n"
&
+ "done < /etc/X11/xkb/rules/xorg.lst"
+
+ File.Save("/tmp/kbd_strip.sh", sHack)
+ SHELL "chmod +x /tmp/kbd_strip.sh" WAIT
+ SHELL "sh /tmp/kbd_strip.sh" WAIT
+
+ ' END OF UGLY HACK HERE
+
+ sFile = File.Load("/tmp/kbd.file")
+ sarr = Split(sFile, "\n")
+
+
+ ii = 1
+ FOR i = 0 TO sArr.count - 1
+ 'PRINT sArr[i]
+ 'IF Left(sArr[i], Len("! Layout")) = "! Layout" THEN
+ IF Left(sArr[i]) = "!" AND InStr(sArr[i], "layout") THEN
+ 'REPEAT
+ IF Trim(sarr[i + ii]) <> "" THEN
+ REPEAT
+ 'PRINT sarr[i + ii]
+ ME.cvKbLayout.Add(Left(sarr[i + ii], InStr(sarr[i +
ii], " ")), Right(sarr[i + ii], Len(sarr[i + ii]) - InStr(sarr[i +
ii], " ")))
+ INC ii
+ 'END IF
+ UNTIL Trim(sarr[i + ii]) = "" OR InStr(sarr[i + ii], "variant")
= TRUE
+ END IF
+END IF
+ NEXT
+
+
+
+END
+
+
+
+
+
+
PUBLIC SUB Form_Resize()
WITH ME
@@ -99,5 +150,17 @@
'Message(Trim(Left(cbcolordepth.text, 2)))
+
+END
+
+PUBLIC SUB Form_Menu()
+
+ ME.LIST_KBD_LAYOUTS
+
+END
+
+PUBLIC SUB Frame1_Menu()
+
+ 'ME.LIST_KBD_LAYOUTS
END
Modified: branches/iVL/FrmXconf.form
==============================================================================
--- branches/iVL/FrmXconf.form (original)
+++ branches/iVL/FrmXconf.form Fri Oct 31 13:57:39 2008
@@ -38,28 +38,35 @@
}
}
{ Panel2 Panel
- MoveScaled(1,17,83,34)
- Arrangement = Arrange.Row
+ MoveScaled(1,17,83,5)
AutoResize = True
{ tlColorDepth TextLabel
MoveScaled(0,0,11,3)
Text = ("Color Depth")
Alignment = Align.Normal
}
+ { tlScreenRes TextLabel
+ MoveScaled(38,0,18,3)
+ Text = ("Screen Resolution")
+ Alignment = Align.Normal
+ }
{ cbColorDepth ComboBox
MoveScaled(10,0,24,3)
Text = ("")
List = [("24 bit True Color"), ("16 bit Pseudo Color"), ("8 bit 256
Color"), ("4 bit 16 Color"), ("1 bit Mono B/W")]
}
- { tlScreenRes TextLabel
- MoveScaled(0,4,18,3)
- Text = ("Screen Resolution")
- Alignment = Align.Normal
- }
{ cbScreenRes ComboBox
- MoveScaled(18,4,15,3)
+ MoveScaled(56,0,15,3)
Text = ("")
List = [("1920x1280"), ("1600x1200"), ("1440x900"), ("1280x1024"),
("1280x800"), ("1024x768"), ("800x600"), ("640x480")]
+ }
+ }
+ { pblKbdSets Panel
+ MoveScaled(2,23,78,29)
+ Expand = True
+ Arrangement = Arrange.Horizontal
+ { cvKbLayout ColumnView
+ MoveScaled(0,0,29,28)
}
}
}
|
