Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r485 - in branches/speedy: . .lang images
|
From: <cod...@go...> - 2009-02-04 22:45:10
|
Author: M0...@gm...
Date: Wed Feb 4 14:32:46 2009
New Revision: 485
Added:
branches/speedy/images/done.png (contents, props changed)
branches/speedy/images/now.png (contents, props changed)
branches/speedy/images/square.png (contents, props changed)
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/FMain.pot
branches/speedy/.lang/FMain0.pot
branches/speedy/.lang/Step0.pot
branches/speedy/.lang/Step1.pot
branches/speedy/.lang/Step5.pot
branches/speedy/ClsGlobal.class
branches/speedy/FMain.class
branches/speedy/FMain.form
branches/speedy/FMain0.class
branches/speedy/FMain0.form
branches/speedy/MdlStartUp.module
branches/speedy/Step0.class
branches/speedy/Step1.class
branches/speedy/Step5.class
branches/speedy/Step5.form
Log:
Added visual navigation
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Wed Feb 4 14:32:46 2009
@@ -14,19 +14,19 @@
msgid "VectorLinux Installer"
msgstr ""
-#: FMain.class:234 FMain0.class:230
+#: FMain.class:242 FMain0.class:232
msgid "Process Overview"
msgstr ""
-#: FMain.class:275 FMain0.class:267
+#: FMain.class:284 FMain0.class:270
msgid "Back"
msgstr ""
-#: FMain.class:286 FMain0.class:278
+#: FMain.class:295 FMain0.class:281
msgid "Next"
msgstr ""
-#: FMain.class:297 FMain0.class:289
+#: FMain.class:306 FMain0.class:292
msgid "Quit"
msgstr ""
@@ -42,19 +42,19 @@
msgid "English (US)"
msgstr ""
-#: Step0.class:249
+#: Step0.class:253
msgid "Select your language"
msgstr ""
-#: Step0.class:280
+#: Step0.class:284
msgid "Select your keyboard layout"
msgstr ""
-#: Step0.class:299
+#: Step0.class:303
msgid "Select your keyboard model"
msgstr ""
-#: Step0.class:321
+#: Step0.class:325
msgid "Use this box to test your keyboard settings"
msgstr ""
@@ -62,67 +62,67 @@
msgid "on"
msgstr ""
-#: Step1.class:128
+#: Step1.class:133
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:147
+#: Step1.class:152
msgid "Found"
msgstr ""
-#: Step1.class:147
+#: Step1.class:152
msgid "in partition"
msgstr ""
-#: Step1.class:188
+#: Step1.class:193
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:201
+#: Step1.class:206
msgid "Scanning"
msgstr ""
-#: Step1.class:211
+#: Step1.class:216
msgid "in"
msgstr ""
-#: Step1.class:239
+#: Step1.class:244
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:332
+#: Step1.class:337
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:335
+#: Step1.class:340
msgid "VERSION"
msgstr ""
-#: Step1.class:412
+#: Step1.class:417
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:412
+#: Step1.class:417
msgid "WARNING:"
msgstr ""
-#: Step1.class:412
+#: Step1.class:417
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:464
+#: Step1.class:469
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:482
+#: Step1.class:487
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:503
+#: Step1.class:508
msgid "Search Again"
msgstr ""
-#: Step1.class:527
+#: Step1.class:532
msgid "Check Installation media before installing"
msgstr ""
@@ -322,16 +322,50 @@
msgid "menu"
msgstr ""
-#: Step5.class:130
+#: Step5.class:169
+msgid "SYSTEM RESTART SUGGESTED"
+msgstr ""
+
+#: Step5.class:169
+msgid ""
+"Your system still contains some non-linux partitions. If you still have
a "
+"Windows operating system installed, it is recomended "
+msgstr ""
+
+#: Step5.class:169
+msgid "that you reboot your system at this time. "
+msgstr ""
+
+#: Step5.class:169
+msgid "Click the"
+msgstr ""
+
+#: Step5.class:169
+msgid "button to restart your computer now, or click"
+msgstr ""
+
+#: Step5.class:169
+msgid "to continue without restarting."
+msgstr ""
+
+#: Step5.class:174
msgid "PARTITIONING DONE"
msgstr ""
-#: Step5.class:130
+#: Step5.class:174
msgid "CLick next to continue"
msgstr ""
-#: Step5.class:194
+#: Step5.class:190
+msgid "Your computer will restart in 10 seconds"
+msgstr ""
+
+#: Step5.class:247
msgid "Loading partitioning utility ... Please Wait"
+msgstr ""
+
+#: Step5.class:256
+msgid "Restart Now"
msgstr ""
#: Step6.class:46
Modified: branches/speedy/.lang/FMain.pot
==============================================================================
--- branches/speedy/.lang/FMain.pot (original)
+++ branches/speedy/.lang/FMain.pot Wed Feb 4 14:32:46 2009
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:234
+#: FMain.class:242
msgid "Process Overview"
msgstr ""
-#: FMain.class:275
+#: FMain.class:284
msgid "Back"
msgstr ""
-#: FMain.class:286
+#: FMain.class:295
msgid "Next"
msgstr ""
-#: FMain.class:297
+#: FMain.class:306
msgid "Quit"
msgstr ""
Modified: branches/speedy/.lang/FMain0.pot
==============================================================================
--- branches/speedy/.lang/FMain0.pot (original)
+++ branches/speedy/.lang/FMain0.pot Wed Feb 4 14:32:46 2009
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain0.class:230
+#: FMain0.class:232
msgid "Process Overview"
msgstr ""
-#: FMain0.class:267
+#: FMain0.class:270
msgid "Back"
msgstr ""
-#: FMain0.class:278
+#: FMain0.class:281
msgid "Next"
msgstr ""
-#: FMain0.class:289
+#: FMain0.class:292
msgid "Quit"
msgstr ""
Modified: branches/speedy/.lang/Step0.pot
==============================================================================
--- branches/speedy/.lang/Step0.pot (original)
+++ branches/speedy/.lang/Step0.pot Wed Feb 4 14:32:46 2009
@@ -26,19 +26,19 @@
msgid "English (US)"
msgstr ""
-#: Step0.class:249
+#: Step0.class:253
msgid "Select your language"
msgstr ""
-#: Step0.class:280
+#: Step0.class:284
msgid "Select your keyboard layout"
msgstr ""
-#: Step0.class:299
+#: Step0.class:303
msgid "Select your keyboard model"
msgstr ""
-#: Step0.class:321
+#: Step0.class:325
msgid "Use this box to test your keyboard settings"
msgstr ""
Modified: branches/speedy/.lang/Step1.pot
==============================================================================
--- branches/speedy/.lang/Step1.pot (original)
+++ branches/speedy/.lang/Step1.pot Wed Feb 4 14:32:46 2009
@@ -18,67 +18,67 @@
msgid "on"
msgstr ""
-#: Step1.class:128
+#: Step1.class:133
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:147
+#: Step1.class:152
msgid "Found"
msgstr ""
-#: Step1.class:147
+#: Step1.class:152
msgid "in partition"
msgstr ""
-#: Step1.class:188
+#: Step1.class:193
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:201
+#: Step1.class:206
msgid "Scanning"
msgstr ""
-#: Step1.class:211
+#: Step1.class:216
msgid "in"
msgstr ""
-#: Step1.class:239
+#: Step1.class:244
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:332
+#: Step1.class:337
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:335
+#: Step1.class:340
msgid "VERSION"
msgstr ""
-#: Step1.class:412
+#: Step1.class:417
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:412
+#: Step1.class:417
msgid "WARNING:"
msgstr ""
-#: Step1.class:412
+#: Step1.class:417
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:464
+#: Step1.class:469
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:482
+#: Step1.class:487
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:503
+#: Step1.class:508
msgid "Search Again"
msgstr ""
-#: Step1.class:527
+#: Step1.class:532
msgid "Check Installation media before installing"
msgstr ""
Modified: branches/speedy/.lang/Step5.pot
==============================================================================
--- branches/speedy/.lang/Step5.pot (original)
+++ branches/speedy/.lang/Step5.pot Wed Feb 4 14:32:46 2009
@@ -58,15 +58,47 @@
msgid "menu"
msgstr ""
-#: Step5.class:130
+#: Step5.class:169
+msgid "SYSTEM RESTART SUGGESTED"
+msgstr ""
+
+#: Step5.class:169
+msgid "Your system still contains some non-linux partitions. If you still
have a Windows operating system installed, it is recomended "
+msgstr ""
+
+#: Step5.class:169
+msgid "that you reboot your system at this time. "
+msgstr ""
+
+#: Step5.class:169
+msgid "Click the"
+msgstr ""
+
+#: Step5.class:169
+msgid "button to restart your computer now, or click"
+msgstr ""
+
+#: Step5.class:169
+msgid "to continue without restarting."
+msgstr ""
+
+#: Step5.class:174
msgid "PARTITIONING DONE"
msgstr ""
-#: Step5.class:130
+#: Step5.class:174
msgid "CLick next to continue"
msgstr ""
-#: Step5.class:194
+#: Step5.class:190
+msgid "Your computer will restart in 10 seconds"
+msgstr ""
+
+#: Step5.class:247
msgid "Loading partitioning utility ... Please Wait"
+msgstr ""
+
+#: Step5.class:256
+msgid "Restart Now"
msgstr ""
Modified: branches/speedy/ClsGlobal.class
==============================================================================
--- branches/speedy/ClsGlobal.class (original)
+++ branches/speedy/ClsGlobal.class Wed Feb 4 14:32:46 2009
@@ -15,6 +15,8 @@
' You should have received a copy of the GNU General Public License
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+STATIC PUBLIC fRunningMainForm AS Object
+
STATIC PUBLIC sDistroName AS String
STATIC PUBLIC sDistroVer AS String
Modified: branches/speedy/FMain.class
==============================================================================
--- branches/speedy/FMain.class (original)
+++ branches/speedy/FMain.class Wed Feb 4 14:32:46 2009
@@ -24,6 +24,7 @@
PUBLIC SUB Form_Open()
+ClsGlobal.fRunningMainForm = ME
IF Application.Args[1] THEN
'System.Language = Trim(Application.Args[1])
$oCurrent = NEW Step1(pnlStack)
@@ -33,6 +34,12 @@
btBack.Enabled = FALSE
ME.auto_setup_for_resolution()
ME.Resize(1024, 600)
+MdlStartUp.LAYOUT_NAVIGATION_VISUALS()
+ IF Application.Args[1] THEN
+ ClsGlobal.fRunningMainForm.ListView1["Step0"].picture =
MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.ListView1["Step1"].picture = MdlStartUp.pNow
+ END IF
+
END
PUBLIC SUB auto_setup_for_resolution()
@@ -117,7 +124,8 @@
$oCurrent.width = pnlStack.Width
$oCurrent.Height = pnlStack.Height
$oCurrent.Startup() ' Call each form's startup sub
-
+
+ME.ListView1.Refresh
END
@@ -127,7 +135,7 @@
$oCurrent.height = pnlStack.Height
ME.SidePanel1.Height = pnlStack.Height
'hpanel1.Width = SidePanel1.Width
- PRINT ME.ClientWidth & "X" & ME.ClientHeight
+ 'PRINT ME.ClientWidth & "X" & ME.ClientHeight
END
Modified: branches/speedy/FMain.form
==============================================================================
--- branches/speedy/FMain.form (original)
+++ branches/speedy/FMain.form Wed Feb 4 14:32:46 2009
@@ -42,8 +42,9 @@
}
}
{ ListView1 ListView
- MoveScaled(2,3,16,21)
+ MoveScaled(2,3,20,28)
Expand = True
+ Mode = Select.None
}
{ HBox6 HBox
MoveScaled(3,34,13,1)
Modified: branches/speedy/FMain0.class
==============================================================================
--- branches/speedy/FMain0.class (original)
+++ branches/speedy/FMain0.class Wed Feb 4 14:32:46 2009
@@ -28,6 +28,8 @@
' 'System.Language = Trim(Application.Args[1])
' $oCurrent = NEW Step1(pnlStack)
' ELSE
+ClsGlobal.fRunningMainForm = ME
+
$oCurrent = NEW Step1(pnlStack)
'END IF
btBack.Enabled = FALSE
@@ -110,7 +112,7 @@
$oCurrent.Height = pnlStack.Height
$oCurrent.Startup() ' Call each form's startup sub
-
+ME.ListView1.Refresh
END
PUBLIC SUB Form_Resize()
@@ -119,7 +121,7 @@
$oCurrent.height = pnlStack.Height
ME.SidePanel1.Height = pnlStack.Height
'hpanel1.Width = SidePanel1.Width
- PRINT ME.ClientWidth & "X" & ME.ClientHeight
+ 'PRINT ME.ClientWidth & "X" & ME.ClientHeight
END
Modified: branches/speedy/FMain0.form
==============================================================================
--- branches/speedy/FMain0.form (original)
+++ branches/speedy/FMain0.form Wed Feb 4 14:32:46 2009
@@ -47,6 +47,7 @@
{ ListView1 ListView
MoveScaled(4,4,16,8)
Expand = True
+ Mode = Select.None
}
{ HBox6 HBox
MoveScaled(2,34,13,1)
Modified: branches/speedy/MdlStartUp.module
==============================================================================
--- branches/speedy/MdlStartUp.module (original)
+++ branches/speedy/MdlStartUp.module Wed Feb 4 14:32:46 2009
@@ -15,6 +15,10 @@
' You should have received a copy of the GNU General Public License
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+PUBLIC pDone AS Picture
+PUBLIC pNow AS Picture
+PUBLIC pToDo AS Picture
+
PUBLIC SUB MAIN()
IF Application.Args[1] THEN
@@ -24,4 +28,30 @@
fmain.Show
+
+END
+
+PUBLIC SUB LAYOUT_NAVIGATION_VISUALS()
+
+ pDone = Picture.Load("images/done.png")
+ pNow = Picture.Load("images/now.png")
+ pToDo = Picture.Load("images/square.png")
+
+ ClsGlobal.fRunningMainForm.listview1.add("Step0", "Select Language",
pNow)
+ ClsGlobal.fRunningMainForm.listview1.add("Step1", "Select Media", pToDo)
+ ClsGlobal.fRunningMainForm.listview1.add("Step2", "Disk Partitioning",
pToDo)
+ ClsGlobal.fRunningMainForm.listview1.add("Step3", "Software Selection",
pTodo)
+ ClsGlobal.fRunningMainForm.listview1.add("Step4", "Installation
Summary", pToDo)
+ ClsGlobal.fRunningMainForm.listview1.add("Step5", "Install VectorLinux",
pToDo)
+ ClsGlobal.fRunningMainForm.listview1.add("Step6", "System Boot Manager",
pToDo)
+ ClsGlobal.fRunningMainForm.listview1.add("Step7", "Regional Settings",
pToDo)
+ ClsGlobal.fRunningMainForm.listview1.add("Step8", "User Accounts", pToDo)
+ ClsGlobal.fRunningMainForm.listview1.add("Step9", "Network Settings",
pToDo)
+ ClsGlobal.fRunningMainForm.listview1.add("Step10", "Startup Options",
pToDo)
+ ClsGlobal.fRunningMainForm.listview1.add("Step11", "Final
Configuration", pToDo)
+
+ 'fmain.ListView1.Add(
+
END
+
+
Modified: branches/speedy/Step0.class
==============================================================================
--- branches/speedy/Step0.class (original)
+++ branches/speedy/Step0.class Wed Feb 4 14:32:46 2009
@@ -141,6 +141,10 @@
PUBLIC FUNCTION GetNext() AS String
'Step1.Resize(FMain.pnlStack.Width, FMain.pnlStack.Height)
+
+ ClsGlobal.fRunningMainForm.Listview1["Step0"].picture = MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.Listview1["Step1"].picture = MdlStartUp.pNow
+
IF System.Language = "en_US" THEN
RETURN "Step1"
ELSE
Modified: branches/speedy/Step1.class
==============================================================================
--- branches/speedy/Step1.class (original)
+++ branches/speedy/Step1.class Wed Feb 4 14:32:46 2009
@@ -91,6 +91,9 @@
PUBLIC FUNCTION GetNext() AS String
+ ClsGlobal.fRunningMainForm.listview1["Step1"].picture =
MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.listview1["Step2"].picture = MdlStartUp.pNow
+
IF bcheckmedia.Value = TRUE THEN
RETURN "Step2"
'IF Step2.sLastChecked <> Trim(ME.ComboBox1.Text) THEN
@@ -104,6 +107,8 @@
RETURN "Step3"
END IF
+
+ 'FMain.ListView1["step0"].pi
Modified: branches/speedy/Step5.class
==============================================================================
--- branches/speedy/Step5.class (original)
+++ branches/speedy/Step5.class Wed Feb 4 14:32:46 2009
@@ -121,14 +121,58 @@
END
+PUBLIC FUNCTION CHECK_IF_REBOOT_NEEDED() AS Boolean
+
+ ' KNOWN BUG:
+ ' This will make the user restart if there are FAT* partitions anywhere
on the box
+ ' even if that drive was not modified
+ ' END OF BUG -- FIX SOON
+
+ DIM sWinPartList AS String
+
+ 'SHELL "probepart | grep -e \"^/dev.*FAT32$\" | sed \'s/\\*/ /\' | grep
-e \"/dev\"" TO sFAT32List
+ 'SHELL "probepart | grep -e \"^/dev.*FAT$\" | sed \'s/\\*/ /\'|grep -e \"
/dev\"" TO sFATList
+
+ SHELL "probepart | grep \"^/dev\" | grep -i \"FAT*\" | tr -s \' \',\"\""
TO sWinPartList
+
+ sWinPartList = Trim(sWinPartList)
+ IF sWinPartList THEN RETURN TRUE
+ RETURN FALSE
+
+ ' IF sFAT32List <> "" THEN
+ ' RETURN TRUE ' reboot needed
+ ' ELSE IF sFATList <> "" THEN
+ ' RETURN TRUE ' reboot needed
+ ' ELSE
+ ' RETURN FALSE ' no reboot needed
+ ' END IF
+
+
+END
+
+
+
PUBLIC SUB Embedder1_Close()
+ ME.Panel1.Arrangement = Arrange.Row
ME.HBox1.Visible = TRUE
'ME.HBox2.Visible = TRUE
ME.tlEmbDone.Visible = TRUE
- ME.tlEmbDone.Text = "<h3>" & ("PARTITIONING DONE") & "</h3>" &
gb.NewLine & gb.NewLine &
- ("CLick next to continue")
+ IF ME.CHECK_IF_REBOOT_NEEDED() = TRUE THEN
+ ME.HBox2.Visible = TRUE
+ ME.tlEmbDone.Text = "<h3>" & ("SYSTEM RESTART SUGGESTED") & "</H3>"
& GB.NewLine &
+ "\n" &
+ ("Your system still contains some non-linux partitions. If you still
have a Windows operating system installed, it is recomended ")&
+ ("that you reboot your system at this time. ") & "<br><br>" &
+ ("Click the") & Space(1) & "\"" & "<b>" & ME.btRestart.Text & "</b>"
& "\"" & Space(1) & ("button to restart your computer now, or click") &
Space(1) & "\n" &
+ "\"" & "<b>" & ClsGlobal.fRunningMainForm.btNext.text & "</b>"
& "\"" & Space(1) & ("to continue without restarting.")
+
+
+ ELSE
+ ME.tlEmbDone.Text = "<h3>" & ("PARTITIONING DONE") & "</h3>" &
gb.NewLine & gb.NewLine &
+ ("CLick next to continue")
+ END IF
FMain.btNext.Enabled = TRUE
@@ -137,5 +181,12 @@
FMain0.btBack.Enabled = TRUE
FMain.btQuit.Enabled = TRUE
FMain0.btQuit.Enabled = TRUE
+
+END
+
+PUBLIC SUB btRestart_Click()
+
+ SHELL "shutdown -r -t 10 &"
+ Message.Warning(("Your computer will restart in 10 seconds"))
END
Modified: branches/speedy/Step5.form
==============================================================================
--- branches/speedy/Step5.form (original)
+++ branches/speedy/Step5.form Wed Feb 4 14:32:46 2009
@@ -33,8 +33,17 @@
Expand = True
Text = ("Loading partitioning utility ... Please Wait")
}
+ { HBox2 HBox
+ MoveScaled(2,6,36,3)
+ Visible = False
+ { btRestart Button
+ MoveScaled(0,0,34,3)
+ Text = ("Restart Now")
+ Picture = Picture["icon:/small/quit"]
+ }
+ }
{ Embedder1 Embedder
- MoveScaled(3,6,52,18)
+ MoveScaled(3,8,52,18)
Expand = True
}
}
Added: branches/speedy/images/done.png
==============================================================================
Binary file. No diff available.
Added: branches/speedy/images/now.png
==============================================================================
Binary file. No diff available.
Added: branches/speedy/images/square.png
==============================================================================
Binary file. No diff available.
|
