Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r389 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-12-10 23:24:27
|
Author: M0...@gm...
Date: Wed Dec 10 14:28:04 2008
New Revision: 389
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/FMain.class
branches/iVL/FrmPkgSel.class
branches/iVL/FrmSelISO.class
branches/iVL/FrmSelISO.form
branches/iVL/FrmSummary.class
branches/iVL/FrmUserAdd.class
branches/iVL/MdlPartSel.module
Log:
Debugged navigation
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Wed Dec 10 14:28:04 2008
@@ -14,111 +14,111 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:189
+#: FMain.class:190
msgid "Restart"
msgstr ""
-#: FMain.class:352
+#: FMain.class:353
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:354
+#: FMain.class:355
msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:354
+#: FMain.class:355
msgid "This may take a while ..."
msgstr ""
-#: FMain.class:374
+#: FMain.class:375
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:446
+#: FMain.class:447
msgid "You have not selected any operating systems for your boot menu."
msgstr ""
-#: FMain.class:446
+#: FMain.class:447
msgid "If you wish to bypass the bootloader setup, uncheck the"
msgstr ""
-#: FMain.class:446
+#: FMain.class:447
msgid "checkbox."
msgstr ""
-#: FMain.class:456
+#: FMain.class:457
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:457
+#: FMain.class:458
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:466
+#: FMain.class:467
msgid "Skipping boot loader setup"
msgstr ""
-#: FMain.class:492
+#: FMain.class:493
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:508
+#: FMain.class:509
msgid "Please enter the root password. For your security purposes, do not
leave this blank"
msgstr ""
-#: FMain.class:513
+#: FMain.class:514
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:527
+#: FMain.class:528
msgid "Setup has detected existing directories in the partition you
selected for /home."
msgstr ""
-#: FMain.class:527
+#: FMain.class:528
msgid "Would you like to import these user accounts into your new
Operating System"
msgstr ""
-#: FMain.class:527
+#: FMain.class:528
msgid "Yes"
msgstr ""
-#: FMain.class:527
+#: FMain.class:528
msgid "No"
msgstr ""
-#: FMain.class:547
+#: FMain.class:548
msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:547
+#: FMain.class:548
msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:547
+#: FMain.class:548
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:565
+#: FMain.class:566
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:570
+#: FMain.class:571
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:824
+#: FMain.class:828
msgid "Back"
msgstr ""
-#: FMain.class:835
+#: FMain.class:839
msgid "Exit Installation"
msgstr ""
-#: FMain.class:846
+#: FMain.class:850
msgid "Next"
msgstr ""
-#: FMain.class:860
+#: FMain.class:864
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Wed Dec 10 14:28:04 2008
@@ -14,39 +14,39 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmPkgSel.class:25
+#: FrmPkgSel.class:26
msgid "Choose your installation mode"
msgstr ""
-#: FrmPkgSel.class:40
+#: FrmPkgSel.class:36
msgid "Package"
msgstr ""
-#: FrmPkgSel.class:41
+#: FrmPkgSel.class:37
msgid "Description"
msgstr ""
-#: FrmPkgSel.class:42
+#: FrmPkgSel.class:38
msgid "Size"
msgstr ""
-#: FrmPkgSel.class:75
+#: FrmPkgSel.class:81
msgid "Installs all optional components in your VectorLinux media to your
system"
msgstr ""
-#: FrmPkgSel.class:85
+#: FrmPkgSel.class:91
msgid "Choose your optional components to install."
msgstr ""
-#: FrmPkgSel.class:197
+#: FrmPkgSel.class:203
msgid "TextLabel1"
msgstr ""
-#: FrmPkgSel.class:207
+#: FrmPkgSel.class:213
msgid "Full Install"
msgstr ""
-#: FrmPkgSel.class:212
+#: FrmPkgSel.class:218
msgid "Custom Install"
msgstr ""
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Wed Dec 10 14:28:04 2008
@@ -42,19 +42,19 @@
msgid "Minimum Disk Space Requirements"
msgstr ""
-#: FrmSelISO.class:255
+#: FrmSelISO.class:256
msgid "No installable images found."
msgstr ""
-#: FrmSelISO.class:261
+#: FrmSelISO.class:262
msgid "Select which VectorLinux version you wish to install from the list
below"
msgstr ""
-#: FrmSelISO.class:266
+#: FrmSelISO.class:267
msgid "TextLabel1"
msgstr ""
-#: FrmSelISO.class:271
+#: FrmSelISO.class:272
msgid "Search Again"
msgstr ""
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Wed Dec 10 14:28:04 2008
@@ -86,15 +86,15 @@
msgid "USER-SELECTED PACKAGES"
msgstr ""
-#: FrmSummary.class:290
+#: FrmSummary.class:293
msgid "Installation Type"
msgstr ""
-#: FrmSummary.class:300
+#: FrmSummary.class:303
msgid "Partition Selection Scheme"
msgstr ""
-#: FrmSummary.class:310
+#: FrmSummary.class:313
msgid "Software Selection"
msgstr ""
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Wed Dec 10 14:28:04 2008
@@ -26,19 +26,19 @@
msgid "FILESYSTEM"
msgstr ""
-#: MdlPartSel.module:141
+#: MdlPartSel.module:143
msgid "Do not format"
msgstr ""
-#: MdlPartSel.module:148
+#: MdlPartSel.module:150
msgid "Not Used"
msgstr ""
-#: MdlPartSel.module:294
+#: MdlPartSel.module:296
msgid "Please select only one "
msgstr ""
-#: MdlPartSel.module:294
+#: MdlPartSel.module:296
msgid "partition"
msgstr ""
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Wed Dec 10 14:28:04 2008
@@ -181,6 +181,7 @@
DIM cb AS CheckBox
DIM cbox AS ComboBox
+ MdlCore.WARN_STATUS("")
'tvPlan.Refresh()
'FMain.tlStatus.Text = ("Working ... Please wait")
FMain.btnext.Enabled = FALSE
@@ -421,10 +422,10 @@
' frmNext = FrmHostPrep ' prepare host
frmNext = FrmInstallSys
- FrmCredits.Reparent(FrmInstallSys.embCredits)
- FrmCredits.Show()
- FrmInstallSys.embCredits.Visible = TRUE
- MdlSetup.BEGIN_INSTALLATION()
+ ' ' ' ' ' ' ' FrmCredits.Reparent(FrmInstallSys.embCredits)
+ ' ' ' ' ' ' ' FrmCredits.Show()
+ ' ' ' ' ' ' ' FrmInstallSys.embCredits.Visible = TRUE
+ ' ' ' ' ' ' ' MdlSetup.BEGIN_INSTALLATION()
CASE "FrmInstallSys"
MdlInstallSys.WRITE_NEW_DISTRO_ID()
@@ -618,24 +619,26 @@
' IF ClsGlobal.sBackNav.Find(FrmCurr) = -1 THEN
ClsGlobal.sBackNav.Add(FrmCurr)
END IF
END IF
- ' IF frmNext.name <> "FrmInstallSys" THEN
- ' frmNext.Show
- ' ELSE
- ' frmNext.Show
- ' WAIT 1
- ' FrmCredits.Reparent(FrmInstallSys.embCredits)
- ' FrmCredits.Show()
- ' FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
- ' FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
- ' FMain.tvPlan["Inst1"].Selected = TRUE
- ' MdlSetup.BEGIN_INSTALLATION()
- ' END IF
+ IF frmNext.name <> "FrmInstallSys" THEN
+ frmNext.Show
+ ELSE
+ frmNext.Show
+ WAIT 1
+ FrmCredits.Reparent(FrmInstallSys.embCredits)
+ FrmCredits.Show()
+ FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
+ FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
+ FMain.tvPlan["Inst1"].Selected = TRUE
+ MdlSetup.BEGIN_INSTALLATION()
+ END IF
END IF
'''END IF
tvPlan.Refresh()
-ClsGlobal.sBackNav.Add(FrmCurr)
+IF ClsGlobal.sBackNav.Find(FrmCurr) = -1 THEN
ClsGlobal.sBackNav.Add(FrmCurr)
'FMain.tlStatus.Text = ""
+MdlCore.warn_status_off
+ME.tvPlan.Refresh()
END
@@ -664,6 +667,7 @@
iKey = ClsGlobal.sBackNav.Find(FrmCurr)
IF iKey <> -1 THEN
+ IF iKey - 1 < 0 THEN RETURN
frm = ClsGlobal.sBackNav[iKey - 1]
ClsGlobal.sBackNav.Delete(iKey)
WITH FMain
Modified: branches/iVL/FrmPkgSel.class
==============================================================================
--- branches/iVL/FrmPkgSel.class (original)
+++ branches/iVL/FrmPkgSel.class Wed Dec 10 14:28:04 2008
@@ -21,16 +21,12 @@
PUBLIC SUB Form_Open()
+MdlCore.WARN_STATUS("")
WITH ME
.tlBanner.Text = "<h3>" & ("Choose your installation mode") & "</h3>"
.rbFull_Click()
END WITH
- FMain.FrmCurr = ME
- FMain.tvPlan["Prep3"].Selected = TRUE
- FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic
- FMain.tvPlan["Prep3"].Picture = MdlCore.sNowPic
- FMain.btback.Enabled = TRUE
-FMain.btback.ForeColor = Color.Black
+
'ME.scrlInstallOpts.Columns.count = 4
WITH ME.scrlInstallOpts
@@ -44,14 +40,24 @@
.Columns[1].Width = 120
.Columns[2].Width = 350
END WITH
-MdlCore.WARN_STATUS("")
+
ME.FILL_IN_BULK_LIST()
FMain.btnext.Enabled = TRUE
-MdlCore.warn_status_off()
IF ME.rbCustom.Value = TRUE THEN
'ME.scrlInstallOpts.Enabled = TRUE
ME.rbCustom_Click()
END IF
+
+ FMain.FrmCurr = ME
+ FMain.tvPlan["Prep3"].Selected = TRUE
+ FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic
+ FMain.tvPlan["Prep3"].Picture = MdlCore.sNowPic
+ FMain.tvPlan.Refresh
+ FMain.btback.Enabled = TRUE
+FMain.btback.ForeColor = Color.Black
+
+
+MdlCore.warn_status_off()
END
PUBLIC SUB Form_Resize()
Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class (original)
+++ branches/iVL/FrmSelISO.class Wed Dec 10 14:28:04 2008
@@ -195,7 +195,8 @@
'.Resize(.Parent.Width, .Parent.Height)
.btResCan.Width = MdlObjSizer.get_object_width(.btResCan.text) + 36
' .btNext.Move(.Left + .Width - .btNext.Width - 8, .top + ME.Height
- .btNext.Height - 8)
- .tlBanner.Move(4, 8, MdlObjSizer.get_object_width(.tlBanner.text))
+ '.tlBanner.Move(4, 8, MdlObjSizer.get_object_width(.tlBanner.text))
+ .tlBanner.Move(4, 8, .ClientWidth - (.tlBanner.Left * 2))
.hrSep.Move(4, .tlBanner.top + .tlBanner.Height
- .hrSep.Height, .ClientWidth - (.hrSep.x * 2))
.btResCan.Move(.ClientWidth - (.btResCan.Width + 4), .hrSep.top
+ .hrSep.Height + 24) ', MdlObjSizer.get_object_width(.btResCan.text) + 36)
.lstInstallableImg.Move(4, .btResCan.top, .btResCan.Left -
(.lstInstallableImg.left * 2))
Modified: branches/iVL/FrmSelISO.form
==============================================================================
--- branches/iVL/FrmSelISO.form (original)
+++ branches/iVL/FrmSelISO.form Wed Dec 10 14:28:04 2008
@@ -10,7 +10,7 @@
ReadOnly = True
}
{ tlBanner TextLabel
- MoveScaled(1,1,58,5)
+ MoveScaled(1,1,59,5)
Text = ("Select which VectorLinux version you wish to install from the
list below")
}
{ tlDistroDesc TextLabel
Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class (original)
+++ branches/iVL/FrmSummary.class Wed Dec 10 14:28:04 2008
@@ -39,7 +39,7 @@
ME.GridView1.Columns[0].text = ("Partition")
ME.GridView1.Columns[0].Width =
MdlObjSizer.get_object_width("/dev/hda1***") + 36
ME.GridView1.Columns[1].text = ("Size")
- ME.GridView1.Columns[1].Width =
MdlObjSizer.get_object_width(ME.GridView1.Columns[1].text) * 2
+ ME.GridView1.Columns[1].Width =
MdlObjSizer.get_object_width("100000.00GB")
ME.GridView1.Columns[2].text = ("Filesystem")
ME.GridView1.Columns[2].Width =
MdlObjSizer.get_object_width(("Filesystem")) * 2
ME.GridView1.Columns[3].text = ("Mount Point")
@@ -251,8 +251,11 @@
.TextBox1.Move(.lbInstallType.Left + .lbInstallType.Width +
8, .lbInstallType.top, .lbInstallType.Width)
.Frame1.Move(4, .TextBox1.top + .TextBox1.Height + 12, .ClientWidth
- (.Frame1.Left * 2), (.ClientHeight - .Frame1.top) / 2.5)
.GridView1.Move(4, 16, .Frame1.Width - (.GridView1.Left *
2), .Frame1.Height - (.GridView1.top * 2))
- .Frame2.Move(4, .Frame1.top + .Frame1.Height + 8, .ClientWidth -
(.Frame2.Left * 2), (.ClientHeight - .Frame2.Top) - .TextBox1.Height)
- .GridView2.Move(4, 16, .Frame2.Width - (.GridView2.Left *
2), .Frame2.Height - (.GridView2.top * 2))
+ .Frame2.Move(4, Frame1.top + .Frame1.Height + 8, .ClientWidth -
(.Frame2.Left * 2), (.ClientHeight - .Frame2.Top) - (FMain.btnext.Height *
4))
+ .GridView2.Move(4, 16, .Frame2.Width - (.GridView2.Left *
2), .Frame2.Height - (.GridView2.top))
+ '.Frame2.Move(4, .Frame1.top + .Frame1.Height + 8, .ClientWidth -
(.Frame2.Left * 2), (.ClientHeight - .Frame2.Top) - .TextBox1.Height)
+
+ '.GridView2.Move(4, 16, .Frame2.Width - (.GridView2.Left *
2), .Frame2.Height - (.GridView2.top * 2) - FMain.btback.Height)
END WITH
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Wed Dec 10 14:28:04 2008
@@ -86,7 +86,7 @@
MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS(ME.fGroupSel)
' IF Len(MdlSetup.SCAN_HOME_DIRS(ClsGlobal.sTargetMnt &/ "home")) > 0
THEN
-IF MdlSetup.SCAN_HOME_DIRS() = 1 THEN
+IF MdlSetup.SCAN_HOME_DIRS(clsglobal.sTargetMnt &/ "home") = 1 THEN
ME.btImportAcct.Enabled = TRUE
ME.btImportAcct.ForeColor = Color.Black
ELSE
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Wed Dec 10 14:28:04 2008
@@ -57,7 +57,7 @@
SHELL " probepart | grep -e \" Linux$\" | cut -f 1 -d \' \' | grep /dev"
TO sDump1
sDump1 = Trim(sDump1)
-
+ MdlCore.WARN_STATUS("")
y = 8
x = 8
@@ -100,6 +100,8 @@
FOR i = 0 TO sPartList.Count - 1
+ MdlCore.WARN_STATUS("")
+ FMain.tlStatus.Visible = TRUE
sDrive = Left(sPartList[i], Len("/dev/hda"))
sPartNo = Right(sPartList[i], Len(sPartList[i]) - Len(sDrive))
IF Len(sPartNo) > 1 THEN
|
