Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r257 - branches/iVL
|
From: <cod...@go...> - 2008-11-03 19:30:46
|
Author: M0E.lnx
Date: Mon Nov 3 11:29:59 2008
New Revision: 257
Modified:
branches/iVL/.project
branches/iVL/FrmXconf.class
branches/iVL/FrmXconf.form
branches/iVL/installer.gambas
Log:
Added keyboard model and variant listings to xorg.conf window. Updated
binary
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Mon Nov 3 11:29:59 2008
@@ -1,8 +1,8 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
-Startup=FrmXconf
-Version=0.0.120
+Startup=MdlCore
+Version=0.0.122
Library=gb.gtk
Library=gb.form
Library=gb.debug
@@ -17,7 +17,6 @@
Language=en_US
ControlPublic=1
ModulePublic=1
-ExecPath=/home/uel/gui-installer/installer.gambas
Maintainer=M0E-lnx
Vendor=VectorLinux
Add...@gm...
Modified: branches/iVL/FrmXconf.class
==============================================================================
--- branches/iVL/FrmXconf.class (original)
+++ branches/iVL/FrmXconf.class Mon Nov 3 11:29:59 2008
@@ -132,6 +132,84 @@
END
+PUBLIC SUB LIST_KBD_VARIANTS()
+
+ DIM sFile AS String '= File.Load("/etc/X11/xkb/rules/xorg.lst")
+ DIM i, ii AS Integer
+ DIM sArr AS String[] '= Split(sFile, "\n")
+
+
+
+ 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], "variant") THEN
+ 'REPEAT
+ IF Trim(sarr[i + ii]) <> "" THEN
+ REPEAT
+ 'PRINT sarr[i + ii]
+ ME.cvKbdVar.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], "option") =
TRUE
+ END IF
+END IF
+ NEXT
+
+END
+
+
+
+PUBLIC SUB LIST_KBD_MODELS()
+
+ 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], "model") THEN
+ 'REPEAT
+ IF Trim(sarr[i + ii]) <> "" THEN
+ REPEAT
+ 'PRINT sarr[i + ii]
+ ME.cvKeybdModel.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], "layout") =
TRUE
+ END IF
+END IF
+ NEXT
+
+
+
+END
@@ -141,6 +219,7 @@
WITH ME
.TlBanner.Move(4, 24, .hbBanner.Width - (.TlBanner.Left * 2))
+ '.cvKbLayout.Move(4, 18, .frmkbdlay.Width - (.frmkbdlay.Left * 4))
END WITH
@@ -156,11 +235,31 @@
PUBLIC SUB Form_Menu()
ME.LIST_KBD_LAYOUTS
+ ME.LIST_KBD_MODELS
+ ME.LIST_KBD_VARIANTS
END
PUBLIC SUB Frame1_Menu()
'ME.LIST_KBD_LAYOUTS
+
+END
+
+PUBLIC SUB cvKbdVar_Click()
+
+ Message(LAST.current.key)
+
+END
+
+PUBLIC SUB cvKeybdModel_Click()
+
+ Message(LAST.current.key)
+
+END
+
+PUBLIC SUB cvKbLayout_Click()
+
+ Message(LAST.current.key)
END
Modified: branches/iVL/FrmXconf.form
==============================================================================
--- branches/iVL/FrmXconf.form (original)
+++ branches/iVL/FrmXconf.form Mon Nov 3 11:29:59 2008
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,89,59)
+ MoveScaled(0,0,103,59)
Text = ("")
Arrangement = Arrange.Vertical
{ hbBanner Panel
@@ -13,15 +13,15 @@
}
}
{ Panel1 Panel
- MoveScaled(0,6,69,10)
+ MoveScaled(0,6,98,10)
Arrangement = Arrange.Horizontal
AutoResize = True
{ Frame1 Frame
- MoveScaled(0,0,69,9)
+ MoveScaled(2,0,85,9)
Expand = True
Text = ("")
{ tlChoiceExp TextLabel
- MoveScaled(1,5,58,3)
+ MoveScaled(1,5,35,3)
Text = ("")
}
{ cbSetupMethod ComboBox
@@ -35,38 +35,59 @@
Text = ("Video Driver")
Alignment = Align.Normal
}
- }
- }
- { Panel2 Panel
- 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")]
- }
- { cbScreenRes ComboBox
- MoveScaled(56,0,15,3)
- Text = ("")
- List = [("1920x1280"), ("1600x1200"), ("1440x900"), ("1280x1024"),
("1280x800"), ("1024x768"), ("800x600"), ("640x480")]
+ { tlColorDepth TextLabel
+ MoveScaled(42,1,11,3)
+ Text = ("Color Depth")
+ Alignment = Align.Normal
+ }
+ { cbColorDepth ComboBox
+ MoveScaled(52,1,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(42,4,18,3)
+ Text = ("Screen Resolution")
+ Alignment = Align.Normal
+ }
+ { cbScreenRes ComboBox
+ MoveScaled(60,4,16,3)
+ Text = ("")
+ List = [("1920x1280"), ("1600x1200"), ("1440x900"), ("1280x1024"),
("1280x800"), ("1024x768"), ("800x600"), ("640x480")]
+ }
}
}
{ pblKbdSets Panel
- MoveScaled(2,23,78,29)
+ MoveScaled(1,17,96,27)
Expand = True
Arrangement = Arrange.Horizontal
- { cvKbLayout ColumnView
- MoveScaled(0,0,29,28)
+ AutoResize = True
+ { frmkbdlay Frame
+ MoveScaled(0,0,30,25)
+ Expand = True
+ Text = ("Keyboard Layout")
+ { cvKbLayout ColumnView
+ MoveScaled(1,3,28,20)
+ Expand = True
+ }
+ }
+ { frmKbdMod Frame
+ MoveScaled(33,0,32,24)
+ Expand = True
+ Text = ("Keyboard Model")
+ { cvKeybdModel ColumnView
+ MoveScaled(1,3,29,21)
+ Expand = True
+ }
+ }
+ { frmkeyVar Frame
+ MoveScaled(67,1,27,23)
+ Expand = True
+ Text = ("Keyboard Variant")
+ { cvKbdVar ColumnView
+ MoveScaled(8,3,11,21)
+ Expand = True
+ }
}
}
}
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
