[Vectorlinux-devel] [vinstall-ng commit] r229 - in branches/iVL: . .lang

[<cod...@go...>]

Author: M0...@gm...
Date: Tue Oct 14 14:30:57 2008
New Revision: 229

Added:
    branches/iVL/FrmSummary.class
    branches/iVL/FrmSummary.form
    branches/iVL/FrmSummaryOld.class
    branches/iVL/FrmSummaryOld.form
Modified:
    branches/iVL/.lang/FrmSummary.pot
    branches/iVL/DevLog
    branches/iVL/FMain.class

Log:
- Began working on new re-designed installation summary window
    (Not yet complete... but will be better)




Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot	(original)
+++ branches/iVL/.lang/FrmSummary.pot	Tue Oct 14 14:30:57 2008
@@ -14,7 +14,55 @@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"

-#: FrmSummary.class:87
-msgid "TextLabel1"
+#: FrmSummary.class:8
+msgid "Custom"
+msgstr ""
+
+#: FrmSummary.class:12
+msgid "Full"
+msgstr ""
+
+#: FrmSummary.class:28
+msgid "Partition"
+msgstr ""
+
+#: FrmSummary.class:30
+msgid "Size / GiB"
+msgstr ""
+
+#: FrmSummary.class:32
+msgid "Filesystem"
+msgstr ""
+
+#: FrmSummary.class:33
+msgid "Do Not Format"
+msgstr ""
+
+#: FrmSummary.class:34
+msgid "Mount Point"
+msgstr ""
+
+#: FrmSummary.class:40
+msgid "Not Used"
+msgstr ""
+
+#: FrmSummary.class:77
+msgid "Package Name"
+msgstr ""
+
+#: FrmSummary.class:79
+msgid "Size / KiB"
+msgstr ""
+
+#: FrmSummary.class:116
+msgid "Installation Type"
+msgstr ""
+
+#: FrmSummary.class:126
+msgid "Partition Selection Scheme"
+msgstr ""
+
+#: FrmSummary.class:136
+msgid "Software Selection"
  msgstr ""


Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog	(original)
+++ branches/iVL/DevLog	Tue Oct 14 14:30:57 2008
@@ -1,7 +1,4 @@
-- Cleaned up redundant unnecessary code in MdlCore
-- Cleaned up unnecessary code from the package selection click() event
-- Tuned the package selection description label
-- Added vertically scrolling credits during installation process ;)
-  * (Bug @ Lost&LovingLinux) ** Maybe gb.gtk bug?
+- Began working on new re-designed installation summary window
+   (Not yet complete... but will be better)



Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Tue Oct 14 14:30:57 2008
@@ -263,12 +263,12 @@
                frmNext = FrmPkgsel2
              ELSE
                ' Going for simple install. Now we are ready to summarize
-              MdlSummarize.SUMMARIZE_INSTALL
+' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' '                
MdlSummarize.SUMMARIZE_INSTALL
                frmNext = FrmSummary
              END IF
      CASE "FrmPkgsel2"
        ' summarize the build
-        MdlSummarize.SUMMARIZE_INSTALL
+' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' '          
MdlSummarize.SUMMARIZE_INSTALL
          frmNext = FrmSummary
          'frmNext = install
      CASE "FrmWinDrives"

Added: branches/iVL/FrmSummary.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmSummary.class	Tue Oct 14 14:30:57 2008
@@ -0,0 +1,95 @@
+' Gambas class file
+
+
+PUBLIC SUB Form_Open()
+
+
+    IF ClsPkgSel.bCustom = TRUE THEN
+      ME.TextBox1.text = ("Custom")
+      ME.Frame2.Visible = TRUE
+      ME.prepare_packages_summary()
+    ELSE
+      ME.TextBox1.text = ("Full")
+      ME.Frame2.Visible = FALSE
+      'ME.GridView2.Visible = FALSE
+    END IF
+ME.prepare_partition_summary()
+
+
+
+END
+PUBLIC SUB prepare_partition_summary()
+    DIM iRow AS Integer = 0
+    DIM cb AS ComboBox
+    DIM cb1 AS ComboBox
+    DIM sPart, sMountPnt, sFsType, sSize AS String
+
+    ME.GridView1.Columns.count = 4
+        ME.GridView1.Columns[0].text = ("Partition")
+        ME.GridView1.Columns[0].Width =  
MdlObjSizer.get_object_width("/dev/hda1***")
+        ME.GridView1.Columns[1].text = ("Size / GiB")
+        ME.GridView1.Columns[1].Width =  
MdlObjSizer.get_object_width(ME.GridView1.Columns[1].text) * 1.5
+        ME.GridView1.Columns[2].text = ("Filesystem")
+        ME.GridView1.Columns[2].Width = MdlObjSizer.get_object_width(("Do  
Not Format")) * 1.5
+        ME.GridView1.Columns[3].text = ("Mount Point")
+        'ME.GridView1.Columns[3].Width =  
MdlObjSizer.get_object_width(ME.GridView1.Columns[3].text)
+
+        ' tricky part to list the partitions on the summary
+              FOR EACH cb IN MdlPartSel.oMountPoints
+
+                IF cb.text <> ("Not Used") THEN
+                INC ME.GridView1.Rows.Count
+                  sPart = cb.Tag
+                  sMountPnt = cb.Text
+                    FOR EACH cb1 IN MdlPartSel.oFsTypes
+                      IF cb1.tag = cb.tag THEN sFsType = cb1.Text
+                    NEXT
+                  WITH ME
+                    .GridView1[irow, 0].text = sPart
+                    .GridView1[irow, 1].text = sSize
+                    .GridView1[irow, 2].text = sFsType
+                    .GridView1[irow, 3].Text = sMountPnt
+                  END WITH
+                INC irow ' increase this value... this determines the row  
to use.
+                END IF
+
+              NEXT
+
+              ' ADD SWAP PARTITIONS HERE.
+
+                      ' NEED TO ADD WINDOWS PARTITIONS HERE
+                      ' MAYBE CREATE A SEPARATED ROW BY SETTING IT'S BG  
COLOR TO SOMETHING BRIGHT AND BOLD FORE FONTS
+
+
+
+
+
+END
+
+PUBLIC SUB prepare_packages_summary()
+
+    DIM irow AS Integer = 0
+    DIM sPkg, sSize AS String
+    DIM cb AS CheckBox
+
+      WITH ME.GridView2
+      .Columns.count = 2
+      .Columns[0].Title = ("Package Name")
+      .Columns[0].Width = MdlObjSizer.get_object_width(.Columns[0].text) *  
2.5
+      .Columns[1].Title = ("Size / KiB")
+      .Columns[1].Width = MdlObjSizer.get_object_width(.Columns[1].Text) *  
1.5
+      END WITH
+
+            ' add bulk packages
+            FOR EACH cb IN MdlPkgSel.Bulks
+              IF cb.Value = TRUE THEN
+                INC ME.GridView2.Rows.Count
+                  GridView2[irow, 0].text = cb.Tag
+
+                  INC irow
+              END IF
+
+            NEXT
+
+END
+

Added: branches/iVL/FrmSummary.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmSummary.form	Tue Oct 14 14:30:57 2008
@@ -0,0 +1,29 @@
+# Gambas Form File 2.0
+
+{ Form Form
+  MoveScaled(0,0,73,61)
+  Text = ("")
+  { lbInstallType TextLabel
+    MoveScaled(8,4,13,3)
+    Text = ("Installation Type")
+  }
+  { TextBox1 TextBox
+    MoveScaled(22,4,14,3)
+    Text = ("")
+  }
+  { Frame1 Frame
+    MoveScaled(2,8,67,19)
+    Text = ("Partition Selection Scheme")
+    { GridView1 GridView
+      MoveScaled(1,2,65,16)
+      Header = GridView.Horizontal
+    }
+  }
+  { Frame2 Frame
+    MoveScaled(2,29,67,29)
+    Text = ("Software Selection")
+    { GridView2 GridView
+      MoveScaled(1,4,65,25)
+    }
+  }
+}

Added: branches/iVL/FrmSummaryOld.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmSummaryOld.class	Tue Oct 14 14:30:57 2008
@@ -0,0 +1,69 @@
+' 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()
+
+  WITH ME
+    .tlBanner.Text = "Setup is about to begin installing " &  
ClsGlobal.DISTRO & Space(1)&
+    ClsGlobal.VERSION & " to your system. Please verify that the  
information below is " &
+    "correct and click \"" & FMain.btnext.Text & "\" to continue. If you  
need to make" &
+    " changes to your settings, click the \"" & FMain.btback.Text & "\"  
button."
+    .tlBanner.Adjust
+    .tlSummary.Adjust
+  END WITH
+
+  FMain.FrmCurr = ME
+  FMain.tvPlan["Inst0"].Selected = TRUE
+  FMain.tvPlan["Prep3"].Picture = MdlCore.sDonePic
+  FMain.tvPlan["Inst0"].Picture = MdlCore.sNowPic
+  FMain.btback.Enabled = TRUE
+' FMain.btback.ForeColor = Color.Black
+
+END
+
+PUBLIC SUB Form_Resize()
+
+  WITH ME
+    .tlBanner.Move(4, 4, .ClientWidth - 8)
+    '.scrSumm.Move(4, .tlBanner.top + (.tlBanner.Height +  
8), .tlBanner.Width - (.tlBanner.Width / 2), .ClientH - .tlBanner.Height *  
1.5)
+    '.tlBanner.Width = .ClientWidth - 8
+    '.scrSumm.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height +  
8, .tlBanner.Width - 300, .ClientHeight - .tlBanner.Height * 1.5)
+    .scrSumm.Move(.tlBanner.left, .tlBanner.top + .tlBanner.Height +  
4, .tlBanner.Width - 4, .ClientHeight - .tlBanner.Height * 2)
+    '.scrSumm.Move(4, .tlBanner.top + .tlBanner.Height + 4)
+    '.scrSumm.Resize(.ClientWidth - 16, .tlBanner.top + .tlBanner.Height +  
4)
+    .tlSummary.Move(2, 4)
+    '.tlSummary.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height +  
4, .tlBanner.Width, .ClientH - 16)
+
+
+
+
+  END WITH
+
+END
+
+PUBLIC SUB Form_Show()
+
+  Form_Open()
+
+
+END
+
+PUBLIC SUB Form_Hide()
+
+'  FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
+
+END

Added: branches/iVL/FrmSummaryOld.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmSummaryOld.form	Tue Oct 14 14:30:57 2008
@@ -0,0 +1,19 @@
+# Gambas Form File 2.0
+
+{ Form Form
+  MoveScaled(0,0,64,64)
+  Text = ("")
+  { tlBanner TextLabel
+    MoveScaled(1,1,27,10)
+    Text = ("TextLabel1")
+    Alignment = Align.TopLeft
+  }
+  { scrSumm ScrollView
+    MoveScaled(0,12,61,43)
+    { tlSummary TextLabel
+      MoveScaled(2,1,55,85)
+      Expand = True
+      Text = ("TextLabel1")
+    }
+  }
+}