Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r512 - Ommitted reiserfs from automatic partition options. Not doable yet
|
From: <cod...@go...> - 2009-03-18 21:24:37
|
Author: M0...@gm...
Date: Wed Mar 18 14:23:29 2009
New Revision: 512
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Step3a3.pot
branches/speedy/MdlAutoPartition.module
branches/speedy/Step3a3.class
branches/speedy/Step3a3a.class
branches/speedy/Step3a3a.form
branches/speedy/Step5.class
Log:
Ommitted reiserfs from automatic partition options. Not doable yet
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Wed Mar 18 14:23:29 2009
@@ -10,10 +10,6 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: .project:1
-msgid "VectorLinux Installer"
-msgstr ""
-
#: FMain.class:245 FMain0.class:246 FMain0Old.class:233
msgid "Process Overview"
msgstr ""
@@ -30,41 +26,47 @@
msgid "Quit"
msgstr ""
-#: MdlAutoPartition.module:129
+#: MdlAutoPartition.module:132
msgid "Try another partitioning method"
msgstr ""
-#: MdlAutoPartition.module:140
+#: MdlAutoPartition.module:143
msgid "Simulated resize of your ntfs partition"
msgstr ""
-#: MdlAutoPartition.module:140
+#: MdlAutoPartition.module:143
msgid ""
"It is not safe to perform this operation... Please use another
partitioning "
"method"
msgstr ""
-#: MdlAutoPartition.module:165
+#: MdlAutoPartition.module:175
msgid "Error deleting the ntfs filesytem"
msgstr ""
-#: MdlAutoPartition.module:170
+#: MdlAutoPartition.module:180
msgid "Error creating the ntfs filesystem after shrinking it"
msgstr ""
-#: MdlAutoPartition.module:468
+#: MdlAutoPartition.module:497
msgid "MB of free space"
msgstr ""
-#: MdlAutoPartition.module:508
+#: MdlAutoPartition.module:538
msgid "Existing Data"
msgstr ""
-#: MdlAutoPartition.module:530
+#: MdlAutoPartition.module:560
msgid "Total space for VectorLinux"
msgstr ""
-#: MdlAutoPartition.module:624
+#: MdlAutoPartition.module:617
+msgid ""
+"No resizable partitions found on your system. Please use the manual "
+"partitioning method"
+msgstr ""
+
+#: MdlAutoPartition.module:661
msgid "Select the location to which we will resize"
msgstr ""
@@ -515,7 +517,7 @@
msgid "Partitioning stage complete. Click"
msgstr ""
-#: Step3a1a.class:177 Step3a2.class:359 Step3a3a.class:69 Step5.class:177
+#: Step3a1a.class:177 Step3a2.class:359 Step3a3a.class:72 Step5.class:177
msgid "to continue"
msgstr ""
@@ -615,11 +617,23 @@
"back and select another partitioning method"
msgstr ""
-#: Step3a3.class:23 Step3a3a.class:113
+#: Step3a3.class:23 Step3a3a.class:116
msgid "Claim free space from existing partitions"
msgstr ""
-#: Step3a3.class:100
+#: Step3a3.class:39
+msgid ""
+"No resizable partitions found on your system. Please use the manual "
+"partitioning method."
+msgstr ""
+
+#: Step3a3.class:39
+msgid ""
+"This will allow you to use a partitioning tool to handle your
partitioning "
+"needs."
+msgstr ""
+
+#: Step3a3.class:107
msgid ""
"Select which partition to resize and use the slider below it to adjust
the "
"ammount of space to be used by VectorLinux"
@@ -648,21 +662,21 @@
msgid "button."
msgstr ""
-#: Step3a3a.class:64
+#: Step3a3a.class:67
msgid ""
"Shrinking partitions and creating new environment for VectorLinux ...
Please "
"Wait"
msgstr ""
-#: Step3a3a.class:69
+#: Step3a3a.class:72
msgid "Partitions are ready for VectorLinux. Click"
msgstr ""
-#: Step3a3a.class:130
+#: Step3a3a.class:133
msgid "Warning"
msgstr ""
-#: Step3a3a.class:160
+#: Step3a3a.class:163
msgid "Shrink partitions now"
msgstr ""
Modified: branches/speedy/.lang/Step3a3.pot
==============================================================================
--- branches/speedy/.lang/Step3a3.pot (original)
+++ branches/speedy/.lang/Step3a3.pot Wed Mar 18 14:23:29 2009
@@ -18,7 +18,15 @@
msgid "Claim free space from existing partitions"
msgstr ""
-#: Step3a3.class:100
+#: Step3a3.class:39
+msgid "No resizable partitions found on your system. Please use the manual
partitioning method."
+msgstr ""
+
+#: Step3a3.class:39
+msgid "This will allow you to use a partitioning tool to handle your
partitioning needs."
+msgstr ""
+
+#: Step3a3.class:107
msgid "Select which partition to resize and use the slider below it to
adjust the ammount of space to be used by VectorLinux"
msgstr ""
Modified: branches/speedy/MdlAutoPartition.module
==============================================================================
--- branches/speedy/MdlAutoPartition.module (original)
+++ branches/speedy/MdlAutoPartition.module Wed Mar 18 14:23:29 2009
@@ -94,21 +94,24 @@
- CASE "ext2", "ext3", "*fat*", "hfsx", "hfs+", "hfs", "linux-swap"
+
CASE "ext2", "ext3", "*fat*", "hfsx", "hfs+", "hfs", "linux-swap", "vfat", "VFAT"
SHELL "parted " & Left(sPartition, Len("/dev/hda")) & " unit mb
print | tr -s \' \',\"\" | grep \"^" & sPartPrefx & iPart & "\"" TO sDump
sDump = Trim(sDump)
'Number Start End Size Type File system Flags
'1 0.03MB 12256MB 12256MB primary reiserfs
partedDump = Split(sDump, " ")
- lEndMark = Trim(partedDump[2])
- sResizeCommand = "parted " & sPartition & " unit mb resize " &
iPart & Space(1) & Trim(partedDump[1]) & "m" & Space(1) & lEndMark -
lMBAmmountToUseForVL & "m"
+
+ 'RETURN 1
+ lEndMark = Left(partedDump[2], Len(partedDump[2]) - 2)
+ sResizeCommand = "parted " & Left(sPartition, Len("/dev/hda"))
& " unit mb -s \"resize " & iPart & Space(1) & Trim(partedDump[1]) &
Space(1) & (lEndMark - lMBAmmountToUseForVL) & "m\""
CASE "reiserfs"
'r resize_reiserfs -s -1G /dev/hda8 ( see man resize_reiserfs )
sResizeCommand = "echo \"y\" | resize_reiserfs -fq -s -" &
lMBAmmountToUseForVL & "M" & Space(1) & sPartition
PRINT "DEBUG: " & sResizeCommand
CASE ELSE
- Message.Error("I dont know how to resize a pertition type " &
sFs)
+ Message.Error("I dont know how to resize a partition type " &
sFs)
+ RETURN 1
END SELECT
@@ -149,6 +152,9 @@
' run the actual command
+ 'DEBUG sResizeCommand
+ 'RETURN 1
+ DEBUG sResizeCommand
hproc = SHELL sResizeCommand WAIT
PRINT " ---\\--> Shinking partition " & spartition
IF hproc.Value > 0 THEN
@@ -157,6 +163,10 @@
END IF
PRINT "Done"
+ 'DEBUG "done resizing"
+ '
+ 'RETURN 1
+
IF sFs LIKE "ntfs" THEN
PRINT " ----|=- Re-creating ntfs filesystem"
@@ -242,8 +252,8 @@
' determine where the free space is at
SHELL "parted " & Left(sPartition, Len("/dev/hda")) & " unit
mb print free | grep -i \"free space\" | tr -s \' \',\"\"" TO sDump
sDump = Trim(Replace(sDump, "MB", ""))
- 'Message(sDump)
-
+ Message(sDump)
+ IF Len(sDump) <= 0 THEN RETURN 1
sDumparr = Split(sDump, " ")
lMbStart = sDumparr[0]
lMbEnd = sDumparr[1]
@@ -391,6 +401,8 @@
DIM hr AS Separator
DIM picb AS PictureBox
DIM hobox AS Panel
+ DIM sFs AS String
+ DIM bgc AS Integer
objProgs = NEW Object[]
objSliders = NEW Object[]
@@ -455,17 +467,34 @@
FOR i = 0 TO sResults.Max
' Message(Trim(sResults[i]))
sLineArr = Split(Trim(sResults[i]), " ")
+ sFs = Trim(sLineArr[1])
lTotalMB = Trim(sLineArr[2])
lUsedMB = Trim(sLineArr[3])
lFreeMB = Trim(sLineArr[4])
'Message(sLineArr[0] & Space(1) & "fREE SPACE " & sLineArr[4] & "
Mb")
IF lFreeMB >= 10240 THEN ' only if free space is equal to or
greater than 10GB
- IF Trim(sLineArr[1]) <> "*xfs*" OR Trim(sLineArr[1]) <> "*jfs*"
THEN 'only if fs is not xfs or jfs
+ 'Message(sLineArr[1])
+ 'IF Trim(sLineArr[1]) <> "*xfs*" OR Trim(sLineArr[1])
<> "reiserfs" OR Trim(sLineArr[1]) <> "*jfs*" THEN 'only if fs is not xfs
or jfs
+ SELECT CASE sFs ' set the background color for the existing
data label
+ CASE "ntfs", "NTFS"
+ bgc = &h66FF66
+ CASE "fat32", "FAT32", "vfat", "VFAT"
+ bgc = &h33FF33
+ CASE "fat16", "FAT", "FAT16"
+ bgc = &h009900
+ CASE "ext2", "EXT2"
+ bgc = &h99CCFF
+ CASE "ext3", "EXT3"
+ bgc = &h336699
+ CASE ELSE
+ bgc = Color.LightBackground
+ END SELECT
+ IF sFS <> "reiserfs" THEN
sResizableList.Add(Trim(sResults[i]))
rb = NEW RadioButton(hostContainer) AS "PartitionOptions"
WITH rb
- .Text = Trim(sLineArr[0]) & Space(1) & "-" & Space(1) &
Trim(sLineArr[4]) & Space(1) & ("MB of free space")
+ .Text = Trim(sLineArr[0]) & Space(1) & "-" & Space(1) &
Trim(sLineArr[4]) & Space(1) & ("MB of free space") & " [ " & sFs & " ]"
.tag = Trim(sLineArr[0])
.Height = 21
.Expand = TRUE
@@ -503,7 +532,8 @@
'panels.Add(hobox)
tl = NEW TextLabel(hobox)
WITH tl
- .BackColor = Color.SelectedBackground
+ '.BackColor = Color.SelectedBackground
+ .BackColor = bgc
.Expand = FALSE
.Text = ("Existing Data")
.Width = .Parent.Width / 2
@@ -520,7 +550,7 @@
.Height = .Parent.Height
'.Width = .Parent.Width * 0.5
.Expand = TRUE
- .BackColor = Color.LightBackground
+ '.BackColor = Color.LightBackground
.Alignment = Align.Center
.Tag = .Parent.Tag & "R"
END WITH
@@ -581,7 +611,14 @@
NEXT
NEXT
-
+
+ IF objRbs.Count <= 0 THEN ' no partitions found
+ 'Message.Error("No resizable partitions found")
+ Step3a3.tlExp.Text = ("No resizable partitions found on your system.
Please use the manual partitioning method")
+ Step3a3.Refresh()
+ ClsGlobal.fRunningMainForm.btnext.enabled = objRbs.count >= 1
+
+ END IF
END
Modified: branches/speedy/Step3a3.class
==============================================================================
--- branches/speedy/Step3a3.class (original)
+++ branches/speedy/Step3a3.class Wed Mar 18 14:23:29 2009
@@ -34,6 +34,13 @@
WAIT
MdlAutoPartition.DISPLAY_PARTITIONS_WITH_FREE_SPACE(ME.ScrollView1) '(ME.ListContainer1) '(ME.ScrollView1) '(ME.HpnlChoices)
+ IF MdlAutoPartition.objRbs.Count <= 0 THEN
+ ME.tlExp.Text = ("No resizable partitions found on your system. Please
use the manual partitioning method.") & Space(1)&
+ ("This will allow you to use a partitioning tool to handle your
partitioning needs.")
+ 'ClsGlobal.fRunningMainForm.btnext.enabled = FALSE
+ END IF
+ ClsGlobal.fRunningMainForm.btnext.enabled =
MdlAutoPartition.objRbs.Count >= 1
+
END
PUBLIC SUB OnExit()
Modified: branches/speedy/Step3a3a.class
==============================================================================
--- branches/speedy/Step3a3a.class (original)
+++ branches/speedy/Step3a3a.class Wed Mar 18 14:23:29 2009
@@ -51,7 +51,10 @@
ME.HBox2.Visible = FALSE
ME.tlWarning.Visible = TRUE
ME.MovieBox1.Enabled = TRUE
+
ClsGlobal.fRunningMainForm.btnext.enabled = FALSE
+
+
END
Modified: branches/speedy/Step3a3a.form
==============================================================================
--- branches/speedy/Step3a3a.form (original)
+++ branches/speedy/Step3a3a.form Wed Mar 18 14:23:29 2009
@@ -34,21 +34,21 @@
Border = Border.Etched
}
{ HBox2 HBox
- MoveScaled(7,22,56,38)
+ MoveScaled(7,22,56,36)
Visible = False
Expand = True
{ MovieBox1 MovieBox
- MoveScaled(9,3,40,34)
+ MoveScaled(9,2,40,32)
Expand = True
Path = "/home/vluser/devel/speedy/images/throbber.gif"
}
}
{ HBox3 HBox
- MoveScaled(1,60,6,2)
+ MoveScaled(1,58,6,2)
Expand = True
}
{ btStart Button
- MoveScaled(1,62,20,3)
+ MoveScaled(1,60,20,3)
Text = ("Shrink partitions now")
}
}
Modified: branches/speedy/Step5.class
==============================================================================
--- branches/speedy/Step5.class (original)
+++ branches/speedy/Step5.class Wed Mar 18 14:23:29 2009
@@ -77,7 +77,7 @@
END IF
' FrmDiskPart.tlBanner.Text = "<h3>" & ("Loading gparted ... Please
wait") & "</h3>"
- ME.tlEmbDone.Text = "<h3><i>" & ("Loading partitioning utility...Please
Wait") & "</h3></i>"
+ ME.tlEmbDone.Text = "<h3><i>" & ("Loading partitioning utility...Please
Wait") & "</i></h3>"
ME.tlEmbDone.Visible = TRUE
SHELL "/usr/sbin/gparted"
WAIT 1
@@ -122,14 +122,14 @@
Message.Warning(("VectorLinux is about to launch the GParted
partitioning tool. Use this utility to") & gb.NewLine &
("move, resize, delete or create partitions.") & "<b>" & gb.NewLine &
gb.NewLine &
- ("When you are finished, you will need to exit the utility from the")
& Space(1) & "<i>" & ("GParted") & "</i>" & Space(1) & ("menu") & "</b>")
- FMain.btNext.Enabled = FALSE
- FMain0.btNext.Enabled = FALSE
- FMain.btBack.Enabled = FALSE
- FMain0.btBack.Enabled = FALSE
- FMain.btQuit.Enabled = FALSE
- FMain0.btQuit.Enabled = FALSE
-
+ ("When you are finished, you will need to exit the utility from the")
& Space(1) & ("GParted") & Space(1) & ("menu") & "</b>")
+ WITH ClsGlobal.fRunningMainForm
+ .btnext.Enabled = FALSE
+ .btBack.Enabled = FALSE
+ .btQuit.enabled = FALSE
+ END WITH
+ Embedder1.Raise
+ Embedder1.Visible = TRUE
END
PUBLIC FUNCTION CHECK_IF_REBOOT_NEEDED() AS Boolean
|
