Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r484 - in branches/speedy: . .lang
|
From: <cod...@go...> - 2009-02-04 18:46:19
|
Author: M0...@gm...
Date: Wed Feb 4 09:08:46 2009
New Revision: 484
Added:
branches/speedy/.lang/MdlMain.pot
branches/speedy/.lang/Step5.pot
branches/speedy/MdlMain.module
branches/speedy/Step5.class
branches/speedy/Step5.form
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Step1.pot
branches/speedy/.lang/Step6.pot
branches/speedy/.project
branches/speedy/Step1.class
branches/speedy/Step3.class
branches/speedy/Step6.class
Log:
Added gparted window
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Wed Feb 4 09:08:46 2009
@@ -62,67 +62,67 @@
msgid "on"
msgstr ""
-#: Step1.class:127
+#: Step1.class:128
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:146
+#: Step1.class:147
msgid "Found"
msgstr ""
-#: Step1.class:146
+#: Step1.class:147
msgid "in partition"
msgstr ""
-#: Step1.class:177
+#: Step1.class:188
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:190
+#: Step1.class:201
msgid "Scanning"
msgstr ""
-#: Step1.class:200
+#: Step1.class:211
msgid "in"
msgstr ""
-#: Step1.class:228
+#: Step1.class:239
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:321
+#: Step1.class:332
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:324
+#: Step1.class:335
msgid "VERSION"
msgstr ""
-#: Step1.class:401
+#: Step1.class:412
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:401
+#: Step1.class:412
msgid "WARNING:"
msgstr ""
-#: Step1.class:401
+#: Step1.class:412
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:453
+#: Step1.class:464
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:471
+#: Step1.class:482
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:492
+#: Step1.class:503
msgid "Search Again"
msgstr ""
-#: Step1.class:516
+#: Step1.class:527
msgid "Check Installation media before installing"
msgstr ""
@@ -272,6 +272,68 @@
msgid "Install VectorLinux to existing partitions on my hard drive"
msgstr ""
+#: Step5.class:19
+msgid "Resize partitions using Gparted"
+msgstr ""
+
+#: Step5.class:64
+msgid ""
+"Gparted was not found on this system. Please install gparted and try
again"
+msgstr ""
+
+#: Step5.class:69
+msgid "Loading partitioning utility...Please Wait"
+msgstr ""
+
+#: Step5.class:92
+msgid ""
+"The VectorLinux installer is unable to embed the gparted partitioning "
+"utility."
+msgstr ""
+
+#: Step5.class:92
+msgid ""
+"Please consider using the automatic partition option, or use other means
of"
+msgstr ""
+
+#: Step5.class:92
+msgid "partitioning your hard drives."
+msgstr ""
+
+#: Step5.class:114
+msgid ""
+"VectorLinux is about to launch the GParted partitioning tool. Use this "
+"utility to"
+msgstr ""
+
+#: Step5.class:114
+msgid "move, resize, delete or create partitions."
+msgstr ""
+
+#: Step5.class:114
+msgid "When you are finished, you will need to exit the utility from the"
+msgstr ""
+
+#: Step5.class:114
+msgid "GParted"
+msgstr ""
+
+#: Step5.class:114
+msgid "menu"
+msgstr ""
+
+#: Step5.class:130
+msgid "PARTITIONING DONE"
+msgstr ""
+
+#: Step5.class:130
+msgid "CLick next to continue"
+msgstr ""
+
+#: Step5.class:194
+msgid "Loading partitioning utility ... Please Wait"
+msgstr ""
+
#: Step6.class:46
msgid "Partition"
msgstr ""
@@ -296,19 +358,19 @@
msgid "Do not format"
msgstr ""
-#: Step6.class:161
+#: Step6.class:160
msgid "You have already selected"
msgstr ""
-#: Step6.class:161
+#: Step6.class:160
msgid "as your"
msgstr ""
-#: Step6.class:161
+#: Step6.class:160
msgid "partition."
msgstr ""
-#: Step6.class:161
+#: Step6.class:160
msgid "Please select only one partition for this purpose"
msgstr ""
Added: branches/speedy/.lang/MdlMain.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/MdlMain.pot Wed Feb 4 09:08:46 2009
@@ -0,0 +1,16 @@
+# /home/vluser/devel/speedy/MdlMain.module
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01
04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
Modified: branches/speedy/.lang/Step1.pot
==============================================================================
--- branches/speedy/.lang/Step1.pot (original)
+++ branches/speedy/.lang/Step1.pot Wed Feb 4 09:08:46 2009
@@ -18,67 +18,67 @@
msgid "on"
msgstr ""
-#: Step1.class:127
+#: Step1.class:128
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:146
+#: Step1.class:147
msgid "Found"
msgstr ""
-#: Step1.class:146
+#: Step1.class:147
msgid "in partition"
msgstr ""
-#: Step1.class:177
+#: Step1.class:188
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:190
+#: Step1.class:201
msgid "Scanning"
msgstr ""
-#: Step1.class:200
+#: Step1.class:211
msgid "in"
msgstr ""
-#: Step1.class:228
+#: Step1.class:239
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:321
+#: Step1.class:332
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:324
+#: Step1.class:335
msgid "VERSION"
msgstr ""
-#: Step1.class:401
+#: Step1.class:412
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:401
+#: Step1.class:412
msgid "WARNING:"
msgstr ""
-#: Step1.class:401
+#: Step1.class:412
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:453
+#: Step1.class:464
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:471
+#: Step1.class:482
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:492
+#: Step1.class:503
msgid "Search Again"
msgstr ""
-#: Step1.class:516
+#: Step1.class:527
msgid "Check Installation media before installing"
msgstr ""
Added: branches/speedy/.lang/Step5.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Step5.pot Wed Feb 4 09:08:46 2009
@@ -0,0 +1,72 @@
+# /home/vluser/devel/speedy/Step5.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01
04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: Step5.class:19
+msgid "Resize partitions using Gparted"
+msgstr ""
+
+#: Step5.class:64
+msgid "Gparted was not found on this system. Please install gparted and
try again"
+msgstr ""
+
+#: Step5.class:69
+msgid "Loading partitioning utility...Please Wait"
+msgstr ""
+
+#: Step5.class:92
+msgid "The VectorLinux installer is unable to embed the gparted
partitioning utility."
+msgstr ""
+
+#: Step5.class:92
+msgid "Please consider using the automatic partition option, or use other
means of"
+msgstr ""
+
+#: Step5.class:92
+msgid "partitioning your hard drives."
+msgstr ""
+
+#: Step5.class:114
+msgid "VectorLinux is about to launch the GParted partitioning tool. Use
this utility to"
+msgstr ""
+
+#: Step5.class:114
+msgid "move, resize, delete or create partitions."
+msgstr ""
+
+#: Step5.class:114
+msgid "When you are finished, you will need to exit the utility from the"
+msgstr ""
+
+#: Step5.class:114
+msgid "GParted"
+msgstr ""
+
+#: Step5.class:114
+msgid "menu"
+msgstr ""
+
+#: Step5.class:130
+msgid "PARTITIONING DONE"
+msgstr ""
+
+#: Step5.class:130
+msgid "CLick next to continue"
+msgstr ""
+
+#: Step5.class:194
+msgid "Loading partitioning utility ... Please Wait"
+msgstr ""
+
Modified: branches/speedy/.lang/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot (original)
+++ branches/speedy/.lang/Step6.pot Wed Feb 4 09:08:46 2009
@@ -38,19 +38,19 @@
msgid "Do not format"
msgstr ""
-#: Step6.class:161
+#: Step6.class:160
msgid "You have already selected"
msgstr ""
-#: Step6.class:161
+#: Step6.class:160
msgid "as your"
msgstr ""
-#: Step6.class:161
+#: Step6.class:160
msgid "partition."
msgstr ""
-#: Step6.class:161
+#: Step6.class:160
msgid "Please select only one partition for this purpose"
msgstr ""
Modified: branches/speedy/.project
==============================================================================
--- branches/speedy/.project (original)
+++ branches/speedy/.project Wed Feb 4 09:08:46 2009
@@ -5,6 +5,7 @@
Version=0.0.1
Library=gb.gtk
Library=gb.form
+Library=gb.desktop
Library=gb.gtk.ext
Arguments="en_US"
TabSize=2
Added: branches/speedy/MdlMain.module
==============================================================================
--- (empty file)
+++ branches/speedy/MdlMain.module Wed Feb 4 09:08:46 2009
@@ -0,0 +1,48 @@
+' Gambas module file
+
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' 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 SUB NAVIGATION_LOCKDOWN()
+
+ WITH FMain
+ .btNext.Enabled = FALSE
+ .btBack.Enabled = FALSE
+ .btQuit.Enabled = FALSE
+ END WITH
+ WITH FMain0
+ .btNext.Enabled = FALSE
+ .btBack.Enabled = FALSE
+ .btQuit.Enabled = FALSE
+ END WITH
+
+
+END
+
+PUBLIC SUB NAVIGATION_RESTORE()
+
+ WITH FMain
+ .btNext.Enabled = TRUE
+ .btBack.Enabled = TRUE
+ .btQuit.Enabled = TRUE
+ END WITH
+ WITH FMain0
+ .btNext.Enabled = TRUE
+ .btBack.Enabled = TRUE
+ .btQuit.Enabled = TRUE
+ END WITH
+
+END
+
Modified: branches/speedy/Step1.class
==============================================================================
--- branches/speedy/Step1.class (original)
+++ branches/speedy/Step1.class Wed Feb 4 09:08:46 2009
@@ -77,6 +77,7 @@
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()
@@ -157,7 +158,12 @@
tlStatus.Text = ""
ME.ComboBox1.Enabled = TRUE
-
+ FMain.btNext.Enabled = TRUE
+ 'FMain.btBack.Enabled = TRUE
+ FMain0.btNext.Enabled = TRUE
+ 'FMain0.btBack.Enabled = TRUE
+ FMain0.btQuit.Enabled = TRUE
+ FMain.btQuit.Enabled = TRUE
@@ -174,6 +180,11 @@
ME.mvLooking.Playing = TRUE
WAIT 1
+
+ FMain0.btNext.Enabled = FALSE
+ FMain.btNext.Enabled = FALSE
+ FMain.btQuit.Enabled = FALSE
+ FMain0.btQuit.Enabled = FALSE
Step1.tlStatus.Text = ("Scanning for CD Media ... Please wait")
SHELL "/sbin/probedisk | grep \"cdrom\" | cut -f 1 -d \"|\"" TO sOutput
Modified: branches/speedy/Step3.class
==============================================================================
--- branches/speedy/Step3.class (original)
+++ branches/speedy/Step3.class Wed Feb 4 09:08:46 2009
@@ -45,8 +45,8 @@
END IF
IF ME.rbCustomPart.Value = TRUE THEN
'embed gparted
- Message("Gparted module not present yet")
- RETURN
+ 'Message("Gparted module not present yet")
+ RETURN "Step5"
END IF
IF ME.rbPrePartitioned.Value = TRUE THEN
' Use existing partitions
Added: branches/speedy/Step5.class
==============================================================================
--- (empty file)
+++ branches/speedy/Step5.class Wed Feb 4 09:08:46 2009
@@ -0,0 +1,141 @@
+' Gambas class file
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' 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 SUB Form_Open()
+
+ ME.tlbanner.Text = "<h2>" & ("Resize partitions using Gparted") & "</h2>"
+ 'ME.EMBED_GPARTED()
+END
+
+PUBLIC SUB OnExit()
+
+
+
+END
+
+
+PUBLIC SUB StartUp()
+
+ ME.EMBED_GPARTED()
+
+END
+
+
+PUBLIC FUNCTION GetNext() AS String
+
+ RETURN "Step6"
+
+END
+
+
+
+PUBLIC SUB EMBED_GPARTED()
+
+
+ DIM sTitle AS String
+ DIM sTitle1, sTitle2 AS String
+ DIM aHandle AS NEW Pointer[]
+ DIM iHandle AS Integer
+ DIM i AS Integer = 0
+ DIM sDump AS String
+ 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[]
+
+ ' The window can be found on the Desktop WM_CLASS property which can be
seen via the xprop application
+ ' We may need to implement this method here instead of the win window
title method.
+
+
+ IF Exist("/usr/sbin/gparted") = FALSE THEN
+ Message.Error(("Gparted was not found on this system. Please install
gparted and try again"))
+ RETURN
+ 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.Visible = TRUE
+ SHELL "/usr/sbin/gparted"
+ WAIT 1
+
+ REPEAT
+ WAIT 1
+ INC i
+ aHandle = Desktop.Find("", "*parted*", "")
+ UNTIL aHandle.Count = 1 OR i = 5
+
+ IF aHandle.Count > 0 THEN iHandle = aHandle[0]
+
+
+ IF iHandle THEN
+ ME.tlEmbDone.Text = ""
+ ME.tlEmbDone.Visible = FALSE
+ TRY Embedder1.Embed(iHandle)
+ CATCH
+ Message.Error(Error.Text & gb.NewLine & Error.Where)
+ ELSE
+ Message.Warning(("The VectorLinux installer is unable to embed the
gparted partitioning utility.") & gb.NewLine &
+ ("Please consider using the automatic partition option, or use other
means of") & gb.NewLine &
+ ("partitioning your hard drives."))
+ END IF
+
+
+
+
+END
+
+
+PUBLIC SUB Form_Resize()
+
+ ME.Panel1.Height = ME.ClientH - ME.HPanel1.Top - ME.HPanel1.Height - 12
+
+END
+
+PUBLIC SUB Embedder1_Embed()
+
+ ME.HBox1.Visible = FALSE
+ ME.tlEmbDone.Visible = FALSE
+
+ 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
+
+END
+
+PUBLIC SUB Embedder1_Close()
+
+ 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")
+
+
+
+ FMain.btNext.Enabled = TRUE
+ FMain0.btNext.Enabled = TRUE
+ FMain.btBack.Enabled = TRUE
+ FMain0.btBack.Enabled = TRUE
+ FMain.btQuit.Enabled = TRUE
+ FMain0.btQuit.Enabled = TRUE
+
+END
Added: branches/speedy/Step5.form
==============================================================================
--- (empty file)
+++ branches/speedy/Step5.form Wed Feb 4 09:08:46 2009
@@ -0,0 +1,41 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,64,46)
+ Expand = True
+ Text = ("")
+ Arrangement = Arrange.Row
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,19,3)
+ Expand = True
+ Text = ("")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+ { Panel1 Panel
+ MoveScaled(0,6,61,32)
+ Expand = True
+ Arrangement = Arrange.Vertical
+ { HBox1 HBox
+ MoveScaled(1,0,8,1)
+ Visible = False
+ Expand = True
+ }
+ { tlEmbDone TextLabel
+ MoveScaled(2,2,46,9)
+ Visible = False
+ Expand = True
+ Text = ("Loading partitioning utility ... Please Wait")
+ }
+ { Embedder1 Embedder
+ MoveScaled(3,6,52,18)
+ Expand = True
+ }
+ }
+}
Modified: branches/speedy/Step6.class
==============================================================================
--- branches/speedy/Step6.class (original)
+++ branches/speedy/Step6.class Wed Feb 4 09:08:46 2009
@@ -152,21 +152,19 @@
PUBLIC FUNCTION CheckEntry(sEntry AS String, iCurrRow AS Integer) AS
Integer
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 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"))
-
- RETURN 1
+ irow = 0
+ REPEAT
+ IF irow <> iCurrRow THEN
+ IF gvPartListing[irow, 2].Text AND 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"))
+ RETURN 1
+ END IF
END IF
- END IF
- INC irow
-
- NEXT
- RETURN 0
+ INC irow
+ UNTIL irow = gvPartListing.Rows.count - 1
+ RETURN 0
+
END
@@ -178,11 +176,13 @@
x = LAST.x
y = LAST.y
- IF ME.CheckEntry(LAST.text, gvPartListing.RowAt(LAST.y)) > 0 THEN
+ IF LAST.text <> ("Not Used") THEN
+ IF ME.CheckEntry(LAST.text, gvPartListing.RowAt(LAST.y)) > 0 THEN
LAST.text = ("Not Used")
STOP EVENT
RETURN
END IF
+ END IF
IF LAST.text <> ("Not Used") THEN
FOR EACH cb IN objFS
@@ -257,11 +257,11 @@
'x = gvPartListing.ColumnAt(LAST.x)
'y = gvPartListing.RowAt(LAST.y)
-
- IF y < 2 THEN RETURN
- IF LAST.text = ("Not Used") THEN LAST.text = ""
- gvPartListing[y, x].Text = Trim(LAST.text)
- LAST.visible = FALSE
+ '
+ ' IF y < 2 THEN RETURN
+ ' IF LAST.text = ("Not Used") THEN LAST.text = ""
+ ' gvPartListing[y, x].Text = Trim(LAST.text)
+ ' LAST.visible = FALSE
END
|
