Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r143 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-08-25 20:26:50
|
Author: M0E.lnx
Date: Mon Aug 25 13:23:51 2008
New Revision: 143
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/FMain.class
branches/iVL/FrmDiskPart.class
branches/iVL/FrmPartScheme.form
branches/iVL/FrmPartSel.class
branches/iVL/FrmPartSel.form
branches/iVL/FrmSelISO.class
branches/iVL/MdlDiskPart.module
branches/iVL/MdlPartSel.module
Log:
- Added wait messages while forms load (specially for partition selection
and gparted embedding)
- Modified navigation.
- Added help dialog for partition window
- Added another attempt to embed GParted. Will try 3 different methods
before giving up.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Mon Aug 25 13:23:51 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FMain.class
+# /home/moe/area-51/projects/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:285
+#: FMain.class:308
msgid "Process Overview"
msgstr ""
-#: FMain.class:304
+#: FMain.class:327
msgid "Next"
msgstr ""
-#: FMain.class:310
+#: FMain.class:333
msgid "Back"
msgstr ""
-#: FMain.class:316
+#: FMain.class:339
msgid "Exit"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Mon Aug 25 13:23:51 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmDiskPart.class
+# /home/moe/area-51/projects/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,7 +14,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmDiskPart.class:102
+#: FrmDiskPart.class:115
msgid "Disk Partitioning:"
msgstr ""
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Mon Aug 25 13:23:51 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmPartScheme.class
+# /home/moe/area-51/projects/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 Mon Aug 25 13:23:51 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmPartSel.class
+# /home/moe/area-51/projects/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,15 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmPartSel.class:151
-msgid "Define where the operating system will be installed\n<br>\nLinux is
a modular operating system. This means that it has the ability to keep
system and user data separately.<br> A recommended setup would included a /
(root), a /home, and a swap partitions.\n<br>\nPlease select which
partitions you would like to use for your install"
+#: FrmPartSel.class:172
+msgid "Please select the partitions you wish to use and how to use them"
msgstr ""
-#: FrmPartSel.class:160
+#: FrmPartSel.class:181
msgid "Check this box if you have a Windows installation on your system or
any other windows partition (FAT, FAT32, NTFS) that you want auto-mounted
as soon as your computer starts"
msgstr ""
-#: FrmPartSel.class:161
+#: FrmPartSel.class:182
msgid "Detect and Setup Windows partitions for auto-mounting at boot"
+msgstr ""
+
+#: FrmPartSel.class:187
+msgid "Help"
msgstr ""
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Mon Aug 25 13:23:51 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmSelISO.class
+# /home/moe/area-51/projects/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmSelISO.class:228
+#: FrmSelISO.class:211
msgid "No installable images found."
msgstr ""
-#: FrmSelISO.class:234
+#: FrmSelISO.class:217
msgid "Select which distribution to install from the list below"
msgstr ""
-#: FrmSelISO.class:239
+#: FrmSelISO.class:222
msgid "TextLabel1"
msgstr ""
-#: FrmSelISO.class:244
+#: FrmSelISO.class:227
msgid "Search Again"
msgstr ""
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Mon Aug 25 13:23:51 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlDiskPart.module
+# /home/moe/area-51/projects/installer/MdlDiskPart.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 Mon Aug 25 13:23:51 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlPartSel.module
+# /home/moe/area-51/projects/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Mon Aug 25 13:23:51 2008
@@ -169,6 +169,29 @@
ELSE
MdlSetup.GO_WITH_SELECTED(sDev, "")
END IF
+ frmNext = FrmPartScheme
+
+
+ CASE "FrmPartScheme"
+ ' The next form is defined from the radio buttons in Frm
PartScheme. But let's see if we can display some status text
+
+ 'FMain.MovieBox1.Refresh
+ WITH FrmPartScheme
+ IF .rbEditPartitions.Value = TRUE THEN
+ .tlChoiceExp.text = .tlChoiceExp.text & gb.NewLine &
gb.NewLine & "<h3><br><br>Please wait while setup attampts to run the
partitioning utility</h3>"
+ ELSE IF .rbUseExisting.Value = TRUE THEN
+ .tlChoiceExp.Text = .tlChoiceExp.Text & gb.NewLine &
gb.NewLine & "<h3><br><br><hr>Please wait while setup analyses your current
partition setup. <br>This may take a while ...</h3>"
+
+ END IF
+
+
+
+ END WITH
+ 'FMain.MovieBox1.Playing = TRUE
+ WAIT
+
+
+
CASE "FrmPartSel"
IF NOT ClsPartSel.sRoot OR ClsPartSel.sRoot = "" THEN
Message.Error("You must select a \"/\" partition. This is the
target where the system will install to")
@@ -228,6 +251,7 @@
END SELECT
+
frmNext.Reparent(ME.pnlWinHost)
Modified: branches/iVL/FrmDiskPart.class
==============================================================================
--- branches/iVL/FrmDiskPart.class (original)
+++ branches/iVL/FrmDiskPart.class Mon Aug 25 13:23:51 2008
@@ -17,7 +17,7 @@
-
+PRIVATE sRevText AS String
PUBLIC SUB Form_Open()
@@ -31,9 +31,10 @@
"This portion of the setup process allows you to define an
installation target for your new operating system." &
"Please use the partition program below to create, resize, or delete
partitions, and make room for Vectorlinux."
.tlBanner.Adjust
+
END WITH
-
+ sRevText = ME.tlBanner.text
END
@@ -61,14 +62,26 @@
PUBLIC SUB EmbGPARTED_Close()
DIM bReboot AS Boolean
+
+ FrmDiskPart.tlBanner.Text = "<h3><br>Analyzing system partitioning
scheme... Please wait<br>This will take a few seconds...</h3>"
+ FrmDiskPart.tlBanner.Refresh
+ FrmDiskPart.tlBanner.Adjust
+ 'Message("Exiting GParted")
+ WAIT 1
+
bReboot = MdlSetup.CHECK_IF_REBOOT_NEEDED()
IF bReboot = TRUE THEN ' need to reboot
Message.Info("Your partition setup requires a system reboot. Your
computer will now reboot")
'SHELL "sudo shutdown -r now"
ELSE ' move to the next stage (select which partitions to use as what
+
FrmPartSel.Reparent(ME.Parent)
+
+
+
ME.Hide
+
FrmPartSel.Show
Modified: branches/iVL/FrmPartScheme.form
==============================================================================
--- branches/iVL/FrmPartScheme.form (original)
+++ branches/iVL/FrmPartScheme.form Mon Aug 25 13:23:51 2008
@@ -1,22 +1,22 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,81,50)
+ MoveScaled(0,0,81,65)
Text = ("")
{ tlBanner TextLabel
MoveScaled(1,1,51,4)
Text = ("Select your disk partition option")
}
{ rbUseExisting RadioButton
- MoveScaled(1,6,32,3.25)
+ MoveScaled(1,6,32,3.1429)
Text = ("Use existing disk partitions")
}
{ rbEditPartitions RadioButton
- MoveScaled(1,10,62,3.25)
+ MoveScaled(1,10,62,3.1429)
Text = ("Modify my disk partitions to make room for new installation")
}
{ tlChoiceExp TextLabel
- MoveScaled(1,16,76,23)
+ MoveScaled(1,16,76,27)
Text = ("TextLabel1")
}
}
Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class (original)
+++ branches/iVL/FrmPartSel.class Mon Aug 25 13:23:51 2008
@@ -35,10 +35,12 @@
PUBLIC SUB Form_Resize()
DIM cb AS ComboBox
DIM iWidth AS Integer = 0
+
WITH ME
- .tlBanner.Width = .ClientWidth - 16
- .scrollPartitions.Resize(.tlBanner.Width - 4, .ClientHeight
- .tlBanner.Height - (cbDoWin.Height * 3))
+ .tlBanner.Width = .ClientWidth - .btHelp.Width - 16
+ .scrollPartitions.Resize(.tlBanner.Width + 4
+ .btHelp.Width, .ClientHeight - .tlBanner.Height - (cbDoWin.Height * 3))
.cbDoWin.Move(.scrollPartitions.Left, .ClientHeight - .cbDoWin.Height -
8)
+ .btHelp.Move(.tlBanner.Left + .tlBanner.Width + 4, .tlBanner.top) '+
(.tlBanner.Height / 3))
' .tlPartRow.Move(4, 4)
' .tlPartRow2.Move(.tlPartRow.Left + (.tlPartRow.Width *
1.5), .tlPartRow.top)
' .tlPartRow3.Move(.tlPartRow2.left + (.tlPartRow3.Width *
1.9), .tlPartRow.top)
@@ -130,4 +132,22 @@
Form_Open
+END
+
+PUBLIC SUB btHelp_Click()
+
+ Message("<h3>ABOUT SYSTEM PARTITIONING IN LINUX</H3>" &
+ "Linux is a modular operating system. This means that is has the ability
to store system and <br>" &
+ "user data separately for added data security. You may install the
system to a single partition <br>" &
+ "by simply selecting a \"/\" value on this screen. The rest is optional.
The following is a <br>" &
+ "suggested setup for a typical Linux installation<br><br>" &
+ "<b>/</b> - Used to store system data. This particular install requires
a minimum of <i>" & ClsGlobal.iRootMin & "M</i> for this<br>" &
+ "but you should considear a higher value to make sure you have room to
install additional software<br>" &
+ "in case you wish to.<br>" &
+ "<b>/home</b> - Used to store user documents, pictures, videos. Give
yourself as much room as you want<br>" &
+ "Typically, you want to use the largest partition for this.<br>" &
+ "<b>swap</b> - Using a swap partition is suggested if your total RAM is
less than 1GB. Suggested ammount<br>" &
+ "for this is <i>" & ClsGlobal.iSwapMin & "M </i> but can also be
calculated as 2 times your ammount of RAM")
+
+
END
Modified: branches/iVL/FrmPartSel.form
==============================================================================
--- branches/iVL/FrmPartSel.form (original)
+++ branches/iVL/FrmPartSel.form Mon Aug 25 13:23:51 2008
@@ -4,15 +4,20 @@
MoveScaled(0,0,72,55)
Text = ("")
{ tlBanner TextLabel
- MoveScaled(1,1,70,14)
- Text = ("Define where the operating system will be
installed\n<br>\nLinux is a modular operating system. This means that it
has the ability to keep system and user data separately.<br> A recommended
setup would included a / (root), a /home, and a swap
partitions.\n<br>\nPlease select which partitions you would like to use for
your install")
+ MoveScaled(1,1,61,3.8571)
+ Text = ("Please select the partitions you wish to use and how to use
them")
}
{ scrollPartitions ScrollView
- MoveScaled(1,16,69,33)
+ MoveScaled(1,6,69,41)
}
{ cbDoWin CheckBox
- MoveScaled(1,50,57,3.3333)
+ MoveScaled(1,50,57,3.2857)
ToolTip = ("Check this box if you have a Windows installation on your
system or any other windows partition (FAT, FAT32, NTFS) that you want
auto-mounted as soon as your computer starts")
Text = ("Detect and Setup Windows partitions for auto-mounting at
boot")
+ }
+ { btHelp Button
+ MoveScaled(63,1,8,3)
+ Text = ("Help")
+ Picture = Picture["icon:/small/help"]
}
}
Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class (original)
+++ branches/iVL/FrmSelISO.class Mon Aug 25 13:23:51 2008
@@ -53,30 +53,13 @@
FMain.btnext.Height = FMain.btback.Height
FMain.sNextKey = "Prep0"
FMain.FrmCurr = ME
- FMain.frmNext = FrmPartScheme
+ 'FMain.frmNext = FrmPartScheme
' FMain.tvPlan["Prep0"].Selected = TRUE
' FMain.tvPlan["Prep0"].Picture = MdlCore.sNowPic
IF ClsGlobal.sBackNav.Find(ME) = -1 THEN
ClsGlobal.sBackNav.Add(ME)
END IF
-
- ' shape the main form according to the findings
- 'warn the user if no installable media was found
- ' ' IF FrmSelISO.lstInstallableImg.Count = 0 THEN
- ' ' FrmSelISO.lstInstallableImg.Add("No Installable Media Found")
- ' ' FrmSelISO.tlDistroDesc.Text = "Setup was unable to find any
installable media on your system. Please insert your VectorLinux " &
- ' ' "installation CD and click \'" & FrmSelISO.btResCan.Text & "\' to
try again"
- ' ' FMain.btnext.Enabled = FALSE
- ' ' FMain.btnext.ForeColor = Color.Gray
- ' ' ELSE
- ' ' FMain.btnext.Enabled = TRUE
- ' ' FMain.btnext.ForeColor = Color.Black
- ' ' END IF
-
-
-
-
END
Modified: branches/iVL/MdlDiskPart.module
==============================================================================
--- branches/iVL/MdlDiskPart.module (original)
+++ branches/iVL/MdlDiskPart.module Mon Aug 25 13:23:51 2008
@@ -28,6 +28,7 @@
DIM sWins AS String = "gpartedbin,Gpartedbin" '" GParted, / dev / sda -
GParted, / dev / hda - GParted ""
DIM sWons AS String[] = Split(sWins, ",")
DIM sType AS String
+ DIM sTypes AS String[]
'DIM sTypeArr AS String[]
'Desktop.Find("", "GParted")
@@ -37,7 +38,7 @@
' For now, try to determine what type of drive thsi is..
' The following line will get the first listed drive (/dev/sda or
/dev/hda) and use that
' as a starting point to search for a running instance of gparted
- SHELL "probedisk | grep -v \'cdrom\' | cut -f 1 -d \'|\' | grep \'a\'"
TO sType
+ SHELL "probedisk | grep -v \'cdrom\' | cut -f 1 -d \'|\'" TO sType
stype = Trim(sType)
'Message(sType)
IF stype = "" THEN
@@ -57,46 +58,32 @@
SHELL "/usr/sbin/gparted"
WAIT 1
+ sTypes = Split(sType, "\n")
+
aHandle = Desktop.Find("", "*parted*", "")
i = 0
IF aHandle.Count = 0 THEN 'lets give it a chance to start
REPEAT
- WAIT 2
- aHandle = Desktop.Find("", "*partedbi*", "")
+ WAIT 1
+ aHandle = Desktop.Find("", "*parted*", "")
INC i
UNTIL
aHandle.Count > 0 OR i > 5
END IF
- 'Message(aHandle.count)
- 'RETURN
- ' ' '
- ' ' '
- ' ' ' aHandle = Desktop.Find("GParted")
- ' ' ' IF aHandle.count = 0 THEN
- ' ' ' WAIT 1
- ' ' ' aHandle = Desktop.Find("GParted")
- ' ' ' IF aHandle.Count = 0 THEN
- ' ' ' ' this is too much... let's try to find it using the
drive name
- ' ' ' aHandle = Desktop.Find(sType & " - GParted")
- ' ' ' END IF
- ' ' ' END IF
- ' ' '
- ' ' '
- ' ' ' 'aHandle = Desktop.Find("*" & " - GParted", "gpartedbin")
- ' ' ' aHandle = Desktop.Find(sType & " - GParted")
- ' ' '
-
- ' i = 0
- ' aHandle = Desktop.Find("", Trim(sWons[i]))
- ' WAIT
- ' IF aHandle.Count = 0 THEN
- ' REPEAT
- ' WAIT 2
- ' INC i
- ' aHandle = Desktop.Find("", sWons[i])
- ' UNTIL
- ' aHandle.Count > 0 OR i = sWons.count - 1
- ' END IF
+
+ IF aHandle.count = 0 ' still struggling here
+ 'FOR i = 0 TO sTypes.Count - 1
+ i = 0
+ REPEAT
+ aHandle = Desktop.Find(Trim(sTypes[i]) & " - GParted")
+ INC i
+ UNTIL aHandle.coun > 0 OR i = sTypes.Count - 1
+ END IF
+
+ IF aHandle.count = 0 THEN
+ aHandle = Desktop.Find("GParted") ' one last attempt
+ END IF
+
IF aHandle.Count = 0 THEN
Message("Setup is unable to successfully run gparted on this
system. This may be a sign of \n" &
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Mon Aug 25 13:23:51 2008
@@ -41,6 +41,9 @@
DIM sSwaps AS String[]
DIM ii AS Integer
DIM sDrive, sPartNo, sBlank AS String
+
+
+
' fire up the arrays
oFsTypes = NEW Object[]
oMountPoints = NEW Object[]
@@ -244,7 +247,7 @@
y = y + cb.height + 4
ME.oSwaps.Add(cb)
- y = y + cb.Height + 4
+ 'y = y + cb.Height + 4
NEXT
END IF
|
