Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r481 - in branches/speedy: . .lang
|
From: <cod...@go...> - 2009-02-03 23:53:39
|
Author: M0...@gm...
Date: Tue Feb 3 14:31:16 2009
New Revision: 481
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/FMain.pot
branches/speedy/.lang/FMain0.pot
branches/speedy/.lang/Step1.pot
branches/speedy/.lang/Step2.pot
branches/speedy/.lang/Step6.pot
branches/speedy/.project
branches/speedy/FMain.form
branches/speedy/FMain0.form
branches/speedy/Step1.class
branches/speedy/Step1.form
branches/speedy/Step2.class
branches/speedy/Step2.form
branches/speedy/Step3.class
branches/speedy/Step6.class
branches/speedy/Step6.form
Log:
Implemented rescan feature, visual changes to partition selector
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Tue Feb 3 14:31:16 2009
@@ -14,19 +14,19 @@
msgid "VectorLinux Installer"
msgstr ""
-#: FMain.class:233 FMain0.class:225
+#: FMain.class:234 FMain0.class:230
msgid "Process Overview"
msgstr ""
-#: FMain.class:270 FMain0.class:262
+#: FMain.class:275 FMain0.class:267
msgid "Back"
msgstr ""
-#: FMain.class:281 FMain0.class:273
+#: FMain.class:286 FMain0.class:278
msgid "Next"
msgstr ""
-#: FMain.class:292 FMain0.class:284
+#: FMain.class:297 FMain0.class:289
msgid "Quit"
msgstr ""
@@ -62,67 +62,67 @@
msgid "on"
msgstr ""
-#: Step1.class:122
+#: Step1.class:127
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:141
+#: Step1.class:146
msgid "Found"
msgstr ""
-#: Step1.class:141
+#: Step1.class:146
msgid "in partition"
msgstr ""
-#: Step1.class:169
+#: Step1.class:177
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:182
+#: Step1.class:190
msgid "Scanning"
msgstr ""
-#: Step1.class:192
+#: Step1.class:200
msgid "in"
msgstr ""
-#: Step1.class:216
+#: Step1.class:228
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:307
+#: Step1.class:321
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:310
+#: Step1.class:324
msgid "VERSION"
msgstr ""
-#: Step1.class:387
+#: Step1.class:401
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:387
+#: Step1.class:401
msgid "WARNING:"
msgstr ""
-#: Step1.class:387
+#: Step1.class:401
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:425
+#: Step1.class:453
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:443
+#: Step1.class:471
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:464
+#: Step1.class:492
msgid "Search Again"
msgstr ""
-#: Step1.class:488
+#: Step1.class:516
msgid "Check Installation media before installing"
msgstr ""
@@ -140,89 +140,97 @@
msgid "Verifying data on compressed package"
msgstr ""
-#: Step2.class:81
+#: Step2.class:82
msgid "Testing file"
msgstr ""
-#: Step2.class:81
+#: Step2.class:82
msgid "of"
msgstr ""
-#: Step2.class:97
+#: Step2.class:101
+msgid "Canceling data integrity tests per user request"
+msgstr ""
+
+#: Step2.class:102
+msgid "Data integrity test canceled by user."
+msgstr ""
+
+#: Step2.class:115
msgid "FAILED"
msgstr ""
-#: Step2.class:99
+#: Step2.class:117
msgid "The following"
msgstr ""
-#: Step2.class:99
+#: Step2.class:117
msgid "required"
msgstr ""
-#: Step2.class:99
+#: Step2.class:117
msgid "has failed the integrity test. It is not safe to continue"
msgstr ""
-#: Step2.class:100
+#: Step2.class:118
msgid "Integrity test"
msgstr ""
-#: Step2.class:106
+#: Step2.class:124
msgid "PASSED"
msgstr ""
-#: Step2.class:136
+#: Step2.class:154
msgid ""
"has failed the data integrity test. All required packages have passed
this "
"test"
msgstr ""
-#: Step2.class:136
+#: Step2.class:154
msgid ""
"Possible causes for this are a corrupted download or a badly burnt cd.
You "
"can try the following options"
msgstr ""
-#: Step2.class:136
+#: Step2.class:154
msgid "Download a new installation image from www.vectorlinux.com"
msgstr ""
-#: Step2.class:136
+#: Step2.class:154
msgid "Burn the image at a lower speed rate"
msgstr ""
-#: Step2.class:156
+#: Step2.class:174
msgid "Data integrity test complete... all tests passed"
msgstr ""
-#: Step2.class:163
+#: Step2.class:181
msgid "All test passed. It is safe to continue with the installation
process."
msgstr ""
-#: Step2.class:180
+#: Step2.class:198
msgid ""
"Verifying installation files can prevent you from performing an
unsuccessful "
"install"
msgstr ""
-#: Step2.class:180
+#: Step2.class:198
msgid "Keep in mind however, that this process can take a while to
complete."
msgstr ""
-#: Step2.class:180
+#: Step2.class:198
msgid "Click"
msgstr ""
-#: Step2.class:180
+#: Step2.class:198
msgid "to abort this process at any time"
msgstr ""
-#: Step2.class:333
+#: Step2.class:352
msgid "TextLabel2"
msgstr ""
-#: Step2.class:347
+#: Step2.class:366
msgid "Stop"
msgstr ""
@@ -280,38 +288,38 @@
msgid "File System"
msgstr ""
-#: Step6.class:104
+#: Step6.class:106
msgid "Not Used"
msgstr ""
-#: Step6.class:115
+#: Step6.class:118
msgid "Do not format"
msgstr ""
-#: Step6.class:158
+#: Step6.class:161
msgid "You have already selected"
msgstr ""
-#: Step6.class:158
+#: Step6.class:161
msgid "as your"
msgstr ""
-#: Step6.class:158
+#: Step6.class:161
msgid "partition."
msgstr ""
-#: Step6.class:158
+#: Step6.class:161
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:232
+#: Step6.class:214
msgid "Select which partitions to use for installation"
msgstr ""
-#: Step6.class:367
+#: Step6.class:350
msgid "Yes"
msgstr ""
-#: Step6.class:367
+#: Step6.class:350
msgid "No"
msgstr ""
Modified: branches/speedy/.lang/FMain.pot
==============================================================================
--- branches/speedy/.lang/FMain.pot (original)
+++ branches/speedy/.lang/FMain.pot Tue Feb 3 14:31:16 2009
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:233
+#: FMain.class:234
msgid "Process Overview"
msgstr ""
-#: FMain.class:270
+#: FMain.class:275
msgid "Back"
msgstr ""
-#: FMain.class:281
+#: FMain.class:286
msgid "Next"
msgstr ""
-#: FMain.class:292
+#: FMain.class:297
msgid "Quit"
msgstr ""
Modified: branches/speedy/.lang/FMain0.pot
==============================================================================
--- branches/speedy/.lang/FMain0.pot (original)
+++ branches/speedy/.lang/FMain0.pot Tue Feb 3 14:31:16 2009
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain0.class:225
+#: FMain0.class:230
msgid "Process Overview"
msgstr ""
-#: FMain0.class:262
+#: FMain0.class:267
msgid "Back"
msgstr ""
-#: FMain0.class:273
+#: FMain0.class:278
msgid "Next"
msgstr ""
-#: FMain0.class:284
+#: FMain0.class:289
msgid "Quit"
msgstr ""
Modified: branches/speedy/.lang/Step1.pot
==============================================================================
--- branches/speedy/.lang/Step1.pot (original)
+++ branches/speedy/.lang/Step1.pot Tue Feb 3 14:31:16 2009
@@ -18,67 +18,67 @@
msgid "on"
msgstr ""
-#: Step1.class:122
+#: Step1.class:127
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:141
+#: Step1.class:146
msgid "Found"
msgstr ""
-#: Step1.class:141
+#: Step1.class:146
msgid "in partition"
msgstr ""
-#: Step1.class:169
+#: Step1.class:177
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:182
+#: Step1.class:190
msgid "Scanning"
msgstr ""
-#: Step1.class:192
+#: Step1.class:200
msgid "in"
msgstr ""
-#: Step1.class:216
+#: Step1.class:228
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:307
+#: Step1.class:321
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:310
+#: Step1.class:324
msgid "VERSION"
msgstr ""
-#: Step1.class:387
+#: Step1.class:401
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:387
+#: Step1.class:401
msgid "WARNING:"
msgstr ""
-#: Step1.class:387
+#: Step1.class:401
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:425
+#: Step1.class:453
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:443
+#: Step1.class:471
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:464
+#: Step1.class:492
msgid "Search Again"
msgstr ""
-#: Step1.class:488
+#: Step1.class:516
msgid "Check Installation media before installing"
msgstr ""
Modified: branches/speedy/.lang/Step2.pot
==============================================================================
--- branches/speedy/.lang/Step2.pot (original)
+++ branches/speedy/.lang/Step2.pot Tue Feb 3 14:31:16 2009
@@ -26,83 +26,91 @@
msgid "Verifying data on compressed package"
msgstr ""
-#: Step2.class:81
+#: Step2.class:82
msgid "Testing file"
msgstr ""
-#: Step2.class:81
+#: Step2.class:82
msgid "of"
msgstr ""
-#: Step2.class:97
+#: Step2.class:101
+msgid "Canceling data integrity tests per user request"
+msgstr ""
+
+#: Step2.class:102
+msgid "Data integrity test canceled by user."
+msgstr ""
+
+#: Step2.class:115
msgid "FAILED"
msgstr ""
-#: Step2.class:99
+#: Step2.class:117
msgid "The following"
msgstr ""
-#: Step2.class:99
+#: Step2.class:117
msgid "required"
msgstr ""
-#: Step2.class:99
+#: Step2.class:117
msgid "has failed the integrity test. It is not safe to continue"
msgstr ""
-#: Step2.class:100
+#: Step2.class:118
msgid "Integrity test"
msgstr ""
-#: Step2.class:106
+#: Step2.class:124
msgid "PASSED"
msgstr ""
-#: Step2.class:136
+#: Step2.class:154
msgid "has failed the data integrity test. All required packages have
passed this test"
msgstr ""
-#: Step2.class:136
+#: Step2.class:154
msgid "Possible causes for this are a corrupted download or a badly burnt
cd. You can try the following options"
msgstr ""
-#: Step2.class:136
+#: Step2.class:154
msgid "Download a new installation image from www.vectorlinux.com"
msgstr ""
-#: Step2.class:136
+#: Step2.class:154
msgid "Burn the image at a lower speed rate"
msgstr ""
-#: Step2.class:156
+#: Step2.class:174
msgid "Data integrity test complete... all tests passed"
msgstr ""
-#: Step2.class:163
+#: Step2.class:181
msgid "All test passed. It is safe to continue with the installation
process."
msgstr ""
-#: Step2.class:180
+#: Step2.class:198
msgid "Verifying installation files can prevent you from performing an
unsuccessful install"
msgstr ""
-#: Step2.class:180
+#: Step2.class:198
msgid "Keep in mind however, that this process can take a while to
complete."
msgstr ""
-#: Step2.class:180
+#: Step2.class:198
msgid "Click"
msgstr ""
-#: Step2.class:180
+#: Step2.class:198
msgid "to abort this process at any time"
msgstr ""
-#: Step2.class:333
+#: Step2.class:352
msgid "TextLabel2"
msgstr ""
-#: Step2.class:347
+#: Step2.class:366
msgid "Stop"
msgstr ""
Modified: branches/speedy/.lang/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot (original)
+++ branches/speedy/.lang/Step6.pot Tue Feb 3 14:31:16 2009
@@ -30,39 +30,39 @@
msgid "File System"
msgstr ""
-#: Step6.class:104
+#: Step6.class:106
msgid "Not Used"
msgstr ""
-#: Step6.class:115
+#: Step6.class:118
msgid "Do not format"
msgstr ""
-#: Step6.class:158
+#: Step6.class:161
msgid "You have already selected"
msgstr ""
-#: Step6.class:158
+#: Step6.class:161
msgid "as your"
msgstr ""
-#: Step6.class:158
+#: Step6.class:161
msgid "partition."
msgstr ""
-#: Step6.class:158
+#: Step6.class:161
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:232
+#: Step6.class:214
msgid "Select which partitions to use for installation"
msgstr ""
-#: Step6.class:367
+#: Step6.class:350
msgid "Yes"
msgstr ""
-#: Step6.class:367
+#: Step6.class:350
msgid "No"
msgstr ""
Modified: branches/speedy/.project
==============================================================================
--- branches/speedy/.project (original)
+++ branches/speedy/.project Tue Feb 3 14:31:16 2009
@@ -1,11 +1,12 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.10.2
Title=VectorLinux Installer
-Startup=Step6
+Startup=MdlStartUp
Version=0.0.1
Library=gb.gtk
Library=gb.form
Library=gb.gtk.ext
+Arguments="en_US"
TabSize=2
Translate=1
Language=en_US
Modified: branches/speedy/FMain.form
==============================================================================
--- branches/speedy/FMain.form (original)
+++ branches/speedy/FMain.form Tue Feb 3 14:31:16 2009
@@ -5,7 +5,7 @@
Text = ("")
Arrangement = Arrange.Vertical
{ HBox2 HBox
- MoveScaled(12,1,63,7)
+ MoveScaled(12,1,63,8)
Background = Color.SelectedBackground
{ Panel2 Panel
MoveScaled(1,3,4,2)
@@ -22,10 +22,10 @@
}
}
{ HBox4 HBox
- MoveScaled(3,8,72,1)
+ MoveScaled(3,9,72,1)
}
{ Panel1 Panel
- MoveScaled(1,10,80,40)
+ MoveScaled(1,11,80,40)
Expand = True
Arrangement = Arrange.Horizontal
{ SidePanel1 SidePanel
@@ -45,6 +45,9 @@
MoveScaled(2,3,16,21)
Expand = True
}
+ { HBox6 HBox
+ MoveScaled(3,34,13,1)
+ }
}
{ pnlStack Panel
MoveScaled(28,2,50,37)
@@ -53,10 +56,10 @@
}
}
{ HBox1 HBox
- MoveScaled(2,49,72,1)
+ MoveScaled(2,50,72,1)
}
{ HBox3 HBox
- MoveScaled(2,51,72,3)
+ MoveScaled(2,52,72,3)
{ Panel4 Panel
MoveScaled(0,0,17,3)
Expand = True
Modified: branches/speedy/FMain0.form
==============================================================================
--- branches/speedy/FMain0.form (original)
+++ branches/speedy/FMain0.form Tue Feb 3 14:31:16 2009
@@ -28,6 +28,9 @@
MoveScaled(1,10,80,40)
Expand = True
Arrangement = Arrange.Horizontal
+ { HBox1 HBox
+ MoveScaled(0,39,72,1)
+ }
{ SidePanel1 SidePanel
MoveScaled(1,2,26,35)
Arrangement = Arrange.Vertical
@@ -45,15 +48,15 @@
MoveScaled(4,4,16,8)
Expand = True
}
+ { HBox6 HBox
+ MoveScaled(2,34,13,1)
+ }
}
{ pnlStack Panel
MoveScaled(28,2,50,37)
Expand = True
Border = Border.Plain
}
- }
- { HBox1 HBox
- MoveScaled(2,49,72,1)
}
{ HBox3 HBox
MoveScaled(2,51,72,3)
Modified: branches/speedy/Step1.class
==============================================================================
--- branches/speedy/Step1.class (original)
+++ branches/speedy/Step1.class Tue Feb 3 14:31:16 2009
@@ -75,10 +75,15 @@
PUBLIC SUB Form_Open()
ME.TextLabel1.Text = "<h2>" & TextLabel1.text & "</h2>"
+ ME.mvLooking.path = "images/throbber.gif"
+ ME.mvLooking.Playing = TRUE
+ WAIT 0.25 ' a small wait time to avoid a solid blank form
ME.FIND_CD_INSTALL_MEDIA()
ME.FIND_ISO_INSTALL_MEDIA()
ME.FIND_PARTITION_INSTALL_MEDIA()
FMain.btNext.Enabled = ComboBox1.Count > 0
+ ME.mvLooking.Playing = FALSE
+ ME.mvLooking.Visible = FALSE
END
@@ -150,6 +155,7 @@
NEXT
tlStatus.Text = ""
+
ME.ComboBox1.Enabled = TRUE
@@ -166,6 +172,8 @@
DIM i AS Integer
DIM sDriveList AS String[]
+ ME.mvLooking.Playing = TRUE
+ WAIT 1
Step1.tlStatus.Text = ("Scanning for CD Media ... Please wait")
SHELL "/sbin/probedisk | grep \"cdrom\" | cut -f 1 -d \"|\"" TO sOutput
@@ -213,6 +221,10 @@
DIM sPartList AS String[]
ME.ComboBox1.Enabled = FALSE
+
+ ME.mvLooking.Playing = TRUE
+ WAIT 1
+
tlStatus.Text = ("Scanning system for installable ISO images")
PRINT tlStatus.Text
SHELL "/sbin/probepart | grep \"^/dev\" | grep -v -i \"linux swap\" | tr
-s \' \'\"\" | cut -f 1 -d \' \'" TO sOutput
@@ -293,6 +305,8 @@
sTempFileName = Replace(sTempFileName, "/dev/", "")
sTempFileName = Replace(sTempFileName, Space(1) & ("on") &
Space(1), "-")
+ ME.mvLooking.Playing = TRUE
+ WAIT 1
sDump = Split(File.Load(Temp(sTempFileName)), "\n")
FOR i = 0 TO sDump.Count - 1
sLine = Trim(sDump[i])
@@ -388,5 +402,18 @@
INC iCheckWarn
END IF
END IF
+
+END
+
+PUBLIC SUB btRescan_Click()
+ ME.mvLooking.Visible = TRUE
+ ME.ComboBox1.Clear()
+ ME.FIND_CD_INSTALL_MEDIA()
+ ME.FIND_ISO_INSTALL_MEDIA()
+ ME.FIND_PARTITION_INSTALL_MEDIA()
+ ME.mvLooking.Playing = FALSE
+ ME.mvLooking.Visible = FALSE
+ FMain.btNext.Enabled = ComboBox1.Count > 0
+
END
Modified: branches/speedy/Step1.form
==============================================================================
--- branches/speedy/Step1.form (original)
+++ branches/speedy/Step1.form Tue Feb 3 14:31:16 2009
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,65,45)
+ MoveScaled(0,0,67,59)
Text = ("")
Arrangement = Arrange.Vertical
{ HPanel1 HPanel
@@ -18,7 +18,7 @@
}
}
{ Panel1 Panel
- MoveScaled(1,8,60,34)
+ MoveScaled(1,8,60,45)
Expand = True
Arrangement = Arrange.Row
{ TextLabel2 TextLabel
@@ -62,6 +62,10 @@
MoveScaled(1,21,41,3)
Expand = True
Text = ("Check Installation media before installing")
+ }
+ { mvLooking MovieBox
+ MoveScaled(5,24,11,25)
+ Expand = True
}
}
}
Modified: branches/speedy/Step2.class
==============================================================================
--- branches/speedy/Step2.class (original)
+++ branches/speedy/Step2.class Tue Feb 3 14:31:16 2009
@@ -76,6 +76,7 @@
FOR EACH sfile IN Dir(sRequired, "*.tlz")
PRINT ("Verifying data on compressed package") & Space(1) &
Trim(sfile) & " .... "
+ IF iProcSig <> 225 THEN
hproc = SHELL "lzmadec < " & sRequired &/ Trim(sfile) & " >
/dev/null" ' wait
INC i
ME.tlTestingLbl.Text = ("Testing file") & Space(1) & i & Space(1)
& ("of") & Space(1) & iTotalBulks & " ... " & sfile
@@ -91,6 +92,23 @@
iProcSig = 225 OR hproc.State = Process.Stopped
IF ProgressBar1.Value < iInc * i THEN
ME.ProgressBar1.Value = i / iTotalBulks
END IF
+ END IF
+
+ IF iProcSig = 225 THEN 'canceled by user
+ 'shell
+ 'hproc.Kill
+ 'SHELL "kill -9 " & hproc.Id WAIT
+ PRINT ("Canceling data integrity tests per user request")
+ Message.Info(("Data integrity test canceled by user."))
+ ME.mbThrobbler.Playing = FALSE
+ ME.btStop.Enabled = FALSE
+ FMain.btNext.Enabled = TRUE
+ FMain0.btNext.Enabled = TRUE
+ FMain.btBack.Enabled = TRUE
+ FMain0.btBack.Enabled = TRUE
+ RETURN
+ END IF
+
iretval = hproc.Value
IF hproc.Value > 0 THEN
' Error in bulk
@@ -209,9 +227,15 @@
PUBLIC SUB btStop_Click()
-
- mbThrobbler.Playing = FALSE
- IF FMain.btNext THEN FMain.btNext.Enabled = TRUE
- IF FMain0.btNext THEN FMain0.btNext.Enabled = TRUE
+
+ iProcSig = 225
+ 'hproc.Kill
+ EXEC ["kill", "-9", hproc.Id] WAIT
+ EXEC ["killall", "lzmadec"] WAIT
+
+
+ ' mbThrobbler.Playing = FALSE
+ ' IF FMain.btNext THEN FMain.btNext.Enabled = TRUE
+ ' IF FMain0.btNext THEN FMain0.btNext.Enabled = TRUE
END
Modified: branches/speedy/Step2.form
==============================================================================
--- branches/speedy/Step2.form (original)
+++ branches/speedy/Step2.form Tue Feb 3 14:31:16 2009
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,78,51)
+ MoveScaled(0,0,78,66)
Text = ("")
Arrangement = Arrange.Vertical
{ HPanel1 HPanel
@@ -17,7 +17,7 @@
}
}
{ Panel1 Panel
- MoveScaled(1,7,76,43)
+ MoveScaled(2,8,76,55)
Expand = True
Arrangement = Arrange.Row
{ HPanel2 HPanel
@@ -30,30 +30,27 @@
}
}
{ HBox2 HBox
- MoveScaled(16,14,35,14)
+ MoveScaled(8,14,60,27)
Expand = True
{ Panel2 Panel
MoveScaled(1,3,7,8)
Expand = True
}
- { Panel4 Panel
- MoveScaled(8,1,24,24)
+ { mbThrobbler MovieBox
+ MoveScaled(21,2,21,22)
Expand = True
- { mbThrobbler MovieBox
- MoveScaled(4,2,14,9)
- }
}
{ Panel3 Panel
- MoveScaled(26,0,24,24)
+ MoveScaled(33,2,24,20)
Expand = True
}
}
{ HBox4 HBox
- MoveScaled(33,29,18,1)
+ MoveScaled(33,42,18,1)
Expand = True
}
{ HBox3 HBox
- MoveScaled(16,30,36,2)
+ MoveScaled(16,43,36,2)
Expand = True
{ ProgressBar1 ProgressBar
MoveScaled(0,0,30,2)
@@ -61,11 +58,11 @@
}
}
{ HBox6 HBox
- MoveScaled(34,32,14,1)
+ MoveScaled(34,45,14,1)
Expand = True
}
{ HBox5 HBox
- MoveScaled(2,34,43,3)
+ MoveScaled(2,46,43,3)
Expand = True
{ tlTestingLbl TextLabel
MoveScaled(1,0,40,2)
@@ -74,11 +71,11 @@
}
}
{ HBox7 HBox
- MoveScaled(33,38,12,1)
+ MoveScaled(33,50,12,1)
Expand = True
}
{ HBox1 HBox
- MoveScaled(2,39,57,3)
+ MoveScaled(0,51,57,3)
{ btStop Button
MoveScaled(0,0,16,3)
Text = ("Stop")
Modified: branches/speedy/Step3.class
==============================================================================
--- branches/speedy/Step3.class (original)
+++ branches/speedy/Step3.class Tue Feb 3 14:31:16 2009
@@ -40,7 +40,7 @@
IF ME.rbAutoPart.Value = TRUE THEN
'no module for auto partition written yet
- Message("Not ready yet")
+ 'Message("Not ready yet")
RETURN
END IF
IF ME.rbCustomPart.Value = TRUE THEN
Modified: branches/speedy/Step6.class
==============================================================================
--- branches/speedy/Step6.class (original)
+++ branches/speedy/Step6.class Tue Feb 3 14:31:16 2009
@@ -46,7 +46,7 @@
gvPartListing[0, 0].text = ("Partition")
gvPartListing[0, 1].text = ("Size")
gvPartListing[0, 2].text = ("Mount Point")
- gvPartListing[0, 3].text = ("File System")
+ gvPartListing[0, 4].text = ("File System")
'gvPartListing[0, 4].text = ("File System")
gvPartListing[0, 0].BackColor = Color.LightBackground
gvPartListing[0, 0].Font.Bold = TRUE
@@ -57,8 +57,9 @@
gvPartListing.Columns[2].Width = 120
gvPartListing[0, 3].BackColor = Color.LightBackground
gvPartListing[0, 3].Font.Bold = TRUE
- gvPartListing.Columns[3].Width = 120
+ gvPartListing.Columns[3].Width = 8
gvPartListing[0, 4].BackColor = Color.LightBackground
+ gvPartListing.Columns[4].Width = 120
gvPartListing[0, 4].Font.Bold = TRUE
gvPartListing[0, 5].BackColor = Color.LightBackground
gvPartListing[0, 5].Font.Bold = TRUE
@@ -94,24 +95,26 @@
ME.gvPartListing[irow, 0].text = Trim(sDisks[i]) &
Trim(sPartNo)
ME.gvPartListing[irow, 1].Text = Trim(sSize)
IF sFs LIKE "linux-swap" THEN
- gvPartListing[irow, 3].Text = Trim(sfs)
+ gvPartListing[irow, 4].Text = Trim(sfs)
ELSE
cbMntPoint = NEW ComboBox(gvPartListing.Parent)
AS "MountPointSel"
WITH cbMntPoint
.Move(gvPartListing[irow, 2].left, gvPartListing[irow,
2].top)
.Width = gvPartListing[irow, 2].Width
.Height = gvPartListing[irow, 2].Height
+ .ReadOnly = TRUE
.list = [("Not
Used"), "/", "/home", "/usr", "/opt", "/tmp", "/var", "/boot", "/mnt" &/
Right(gvPartListing[irow, 0].text, Len(gvPartListing[irow, 0].text) -
RInStr(gvPartListing[irow, 0].text, "/"))]
.Text = ("Not Used")
.tag = gvPartListing[irow, 0].Text
+ '.ReadOnly = TRUE
END WITH
objMntPoints.Add(cbMntPoint)
cbfs = NEW ComboBox(gvPartListing.Parent) AS "FsSel"
WITH cbfs
- .Move(gvPartListing[irow, 3].left, gvPartListing[irow,
3].top)
- .Width = gvPartListing[irow, 3].Width
- .Height = gvPartListing[irow, 3].Height
- '.list = [("Not
Used"), "/", "/home", "/usr", "/opt", "/tmp", "/var", "/boot", "/mnt" &/
Right(gvPartListing[irow, 0].text, Len(gvPartListing[irow, 0].text) -
RInStr(gvPartListing[irow, 0].text, "/"))]
+ .Move(gvPartListing[irow, 4].left, gvPartListing[irow,
3].top)
+ .Width = gvPartListing[irow, 4].Width
+ .Height = gvPartListing[irow, 4].Height
+ .ReadOnly = TRUE
.list = [("Do not
format"), "ext2", "ext3", "jfs", "xfs", "reiserfs"]
.Text = ("Do not format")
.tag = gvPartListing[irow, 0].Text
@@ -148,12 +151,12 @@
PUBLIC FUNCTION CheckEntry(sEntry AS String, iCurrRow AS Integer) AS
Integer
- DIM irow AS Integer = 2
- FOR irow = 2 TO ME.gvPartListing.Rows.count - 2
+ DIM irow AS Integer '= 2
+ FOR irow = 0 TO ME.gvPartListing.Rows.count - 1
IF irow <> iCurrRow THEN
- PRINT irow & "-" & iCurrRow
- IF gvPartListing[irow, 2].Text = sEntry THEN
+ 'PRINT irow & "-" & iCurrRow
+ IF gvPartListing[irow, 2].Text AND IF gvPartListing[irow, 2].Text
= sEntry THEN
Message.Error(("You have already selected") & Space(1) &
gvPartListing[irow, 0].Text & Space(1) & ("as your") & Space(1) &
Trim(sEntry) & Space(1) & ("partition.") & gb.NewLine &
("Please select only one partition for this purpose"))
@@ -186,12 +189,9 @@
IF cb.tag = LAST.tag THEN cb.Enabled = TRUE
NEXT
' save the text in the background to the gridview
- 'GOTO CHECK_ENTRY
ME.gvPartListing[gvPartListing.RowAt(y),
gvPartListing.ColumnAt(x)].Text = LAST.text
-
-
- 'Message(gvPartListing[gvPartListing.RowAt(y),
gvPartListing.ColumnAt(x)].Text)
+
ELSE
FOR EACH cb IN objFS
IF cb.tag = LAST.tag THEN cb.Enabled = FALSE
@@ -199,25 +199,7 @@
NEXT
END IF
-
- ' CHECK_ENTRY:
- ' irow = 2 ' we start at row 2, because 0 and 1 are meaningless for
this
- ' REPEAT
- ' 'Message(irow & "," & gvPartListing.RowAt(LAST.y))
- ' IF irow <> gvPartListing.RowAt(y) THEN
- ' 'Message(irow, gvPartListing.RowAt(y))
- ' IF Trim(gvPartListing[irow, 2].Text) = Trim(LAST.text) THEN
- ' 'problem here... there is already an entry for this
- ' Message.Error("Duplicate entry found")
- ' RETURN
- ' END IF
- ' 'ELSE
- ' END IF
- '
- '
- ' INC irow
- ' UNTIL
- ' irow = gvPartListing.Rows.Count - 2 ' the 2 rows we skipped to
start with
+
Modified: branches/speedy/Step6.form
==============================================================================
--- branches/speedy/Step6.form (original)
+++ branches/speedy/Step6.form Tue Feb 3 14:31:16 2009
@@ -31,6 +31,7 @@
MoveScaled(12,27,7,2)
Visible = False
Text = ("")
+ ReadOnly = True
}
{ cbYN ComboBox
MoveScaled(22,28,7,1)
@@ -43,6 +44,7 @@
MoveScaled(3,27,8,1)
Visible = False
Text = ("")
+ ReadOnly = True
}
}
}
|
