remove mount_list quit function

modify network_init, add a default process in network configuration method
This commit is contained in:
Zhi Li
2010-07-31 10:52:03 +08:00
parent 53ba1ae4c1
commit 1318d9b4ac
5 changed files with 63 additions and 40 deletions

View File

@@ -13,21 +13,21 @@
<partition device='sdb4' start='0' id='0' size='0'/>
</partitions>
<raids>
<raid raid-type='raid1' raid-device='md0'>
<raid raid-type='raid1' raid-size='-1' raid-device='md0'>
<raw-device>sda1</raw-device>
<raw-device>sdb1</raw-device>
</raid>
</raids>
<mount-points>
<mount-point device='sda2' directory='' file-system='' format='no'/>
<mount-point device='sda3' directory='' file-system='' format='no'/>
<mount-point device='sda4' directory='' file-system='' format='no'/>
<mount-point device='sda3' directory='' file-system='ext3' format='no'/>
<mount-point device='sda4' directory='/' file-system='ext2' format='no'/>
<mount-point device='sdb2' directory='' file-system='' format='no'/>
<mount-point device='sdb3' directory='' file-system='' format='no'/>
<mount-point device='sdb4' directory='' file-system='' format='no'/>
<mount-point device='md0' directory='' file-system='' format='no'/>
<mount-point device='md0' directory='/opt' file-system='reiserfs' format='yes'/>
</mount-points>
<network domain='' secondary_dns='' ip='' hostname='' mask='' primary_dns='' configuration='' gateway=''/>
<network domain='' secondary_dns='' ip='' hostname='lizhi' mask='' primary_dns='' configuration='dynamic' gateway=''/>
<groups>
<group name='development' install='no'>
<description>

View File

@@ -22,7 +22,7 @@ row 4 | quit previous next |
<variable name='main.step_name' type='StringVar' />
<widget type='Label'>
<widget_attribute image='/home/zhi/git/install/graphicalinstall/images/linxlogo.gif'/>
<widget_attribute image='/home/zhi/work/linx/install/graphicalinstall/images/linxlogo.gif'/>
<grid_location row='0' column='0' sticky='W' padx='5' pady='5'/>
</widget>
<widget type='Label'>
@@ -255,7 +255,7 @@ row 4 | |
<widget_attribute width='40' height='15' listvariable='mount.list'/>
<grid_location row='0' column='0'/>
<variable name='mount.list' type='StringVar'/>
<action init='mount_list_init' quit='mount_list_quit'/>
<action init='mount_list_init'/>
<binding sequence='ListboxSelect' function='mount_list_modify' wrap='double'/>
</widget>
@@ -433,17 +433,18 @@ row 4 | |
column 0 column 1
________________________________________________
row 0 | Device /dev/xxx |
row 1 | Size xxx |
| _____________ |
row 1 | Directory |_____________| |
row 2 | Directory |_____________| |
| _ _ |
row 2 | |_| Format |_| Not-Format |
row 3 | |_| Format |_| Not-Format |
| ___________________ |
row 3 | | | |
row 4 | | | |
| filesystem | | |
| | | |
| |___________________| |
| |
row 4 | OK Cancel |
row 5 | OK Cancel |
|________________________________________________|
-->
<top_window name='mount_list_modify'>
@@ -456,6 +457,7 @@ row 4 | |
<grid_location row='0' column='0'/>
<variable name='mp_top_format' type='StringVar'/>
<action init='mp_top_init'/>
<widget type='Label'>
<widget_attribute text='Device'/>
<grid_location row='0' column='0' padx='10' sticky='W'/>
@@ -465,39 +467,53 @@ row 4 | |
<grid_location row='0' column='1' sticky='W'/>
<variable name='mp_top_dev' type='StringVar'/>
</widget>
<widget type='Label'>
<widget_attribute text='Size'/>
<grid_location row='1' column='0' padx='10' sticky='W'/>
</widget>
<widget type='Label'>
<widget_attribute textvariable='mp_top_size'/>
<grid_location row='1' column='1' sticky='W'/>
<variable name='mp_top_size' type='StringVar'/>
</widget>
<widget type='Label'>
<widget_attribute text='Directory'/>
<grid_location row='1' column='0' padx='10' sticky='W'/>
<grid_location row='2' column='0' padx='10' sticky='W'/>
</widget>
<widget type='Entry'>
<widget_attribute width='10' textvariable='mp_top_dir'/>
<grid_location row='1' column='1' sticky='W'/>
<grid_location row='2' column='1' sticky='W'/>
<variable name='mp_top_dir' type='StringVar'/>
</widget>
<widget type='Radiobutton' name='mp_top_format'>
<widget_attribute text='Format' variable='mp_top_format' value='yes'/>
<grid_location row='2' column='0'/>
<grid_location row='3' column='0'/>
</widget>
<widget type='Radiobutton' name='mp_top_not_format'>
<widget_attribute text='Not-Format' variable='mp_top_format' value='no'/>
<grid_location row='2' column='1'/>
<grid_location row='3' column='1'/>
</widget>
<widget type='Label'>
<widget_attribute text='Filesystem'/>
<grid_location row='3' column='0' sticky='W'/>
<grid_location row='4' column='0' sticky='W'/>
</widget>
<widget type='Listbox' name='mp_top_fs'>
<widget_attribute listvariable='mp_top_fs'/>
<grid_location row='3' column='1' sticky='W'/>
<grid_location row='4' column='1' sticky='W'/>
<variable name='mp_top_fs' type='StringVar' value='ext2 ext3 reiserfs xfs jfs'/>
</widget>
<widget type='Button'>
<widget_attribute text='OK' command='mp_top_ok'/>
<grid_location row='4' column='0'/>
<grid_location row='5' column='0'/>
</widget>
<widget type='Button'>
<widget_attribute text='Cancel' command='mp_top_cancel'/>
<grid_location row='4' column='1'/>
<grid_location row='5' column='1'/>
</widget>
</widget>
</top_window>