|
From: <cod...@go...> - 2009-05-26 15:00:01
|
Author: M0...@gm...
Date: Tue May 26 07:58:50 2009
New Revision: 557
Added:
branches/speedy/scroller/
branches/speedy/scroller/.directory
branches/speedy/scroller/.icon.png (contents, props changed)
branches/speedy/scroller/.project
branches/speedy/scroller/.settings
branches/speedy/scroller/FMain.class
branches/speedy/scroller/FMain.form
branches/speedy/scroller/StartUp.module
branches/speedy/scroller/scroller.gambas (contents, props changed)
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/MdlMain.pot
branches/speedy/.lang/Step9.pot
branches/speedy/MdlMain.module
branches/speedy/Step9.class
branches/speedy/Step9.form
Log:
- Restored credits scroller (bug fixed)
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Tue May 26 07:58:50 2009
@@ -711,15 +711,15 @@
msgid "Unable to continue."
msgstr ""
-#: MdlMain.module:761
+#: MdlMain.module:765
msgid "Installing"
msgstr ""
-#: MdlMain.module:761
+#: MdlMain.module:765
msgid "Part of"
msgstr ""
-#: MdlMain.module:764
+#: MdlMain.module:768
msgid "Error installing"
msgstr ""
@@ -1637,34 +1637,34 @@
msgid "is being installed to your computer. Please wait."
msgstr ""
-#: Step9.class:85
+#: Step9.class:91
msgid "Prepare Partitions"
msgstr ""
-#: Step9.class:85
+#: Step9.class:91
msgid "Install Base System (required)"
msgstr ""
-#: Step9.class:85
+#: Step9.class:91
msgid "Install User-Selected Software"
msgstr ""
-#: Step9.class:149
+#: Step9.class:156
msgid "Starting installation process"
msgstr ""
-#: Step9.class:156
+#: Step9.class:163
msgid "Something went wrong during installation. Please try again"
msgstr ""
-#: Step9.class:205
+#: Step9.class:212
msgid "Installation in progress"
msgstr ""
-#: Step9.class:287
+#: Step9.class:294
msgid "Install Process"
msgstr ""
-#: Step9.class:304
+#: Step9.class:310
msgid "The development Crew"
msgstr ""
Modified: branches/speedy/.lang/MdlMain.pot
==============================================================================
--- branches/speedy/.lang/MdlMain.pot (original)
+++ branches/speedy/.lang/MdlMain.pot Tue May 26 07:58:50 2009
@@ -82,15 +82,15 @@
msgid "Unable to continue."
msgstr ""
-#: MdlMain.module:761
+#: MdlMain.module:765
msgid "Installing"
msgstr ""
-#: MdlMain.module:761
+#: MdlMain.module:765
msgid "Part of"
msgstr ""
-#: MdlMain.module:764
+#: MdlMain.module:768
msgid "Error installing"
msgstr ""
Modified: branches/speedy/.lang/Step9.pot
==============================================================================
--- branches/speedy/.lang/Step9.pot (original)
+++ branches/speedy/.lang/Step9.pot Tue May 26 07:58:50 2009
@@ -18,35 +18,35 @@
msgid "is being installed to your computer. Please wait."
msgstr ""
-#: Step9.class:85
+#: Step9.class:91
msgid "Prepare Partitions"
msgstr ""
-#: Step9.class:85
+#: Step9.class:91
msgid "Install Base System (required)"
msgstr ""
-#: Step9.class:85
+#: Step9.class:91
msgid "Install User-Selected Software"
msgstr ""
-#: Step9.class:149
+#: Step9.class:156
msgid "Starting installation process"
msgstr ""
-#: Step9.class:156
+#: Step9.class:163
msgid "Something went wrong during installation. Please try again"
msgstr ""
-#: Step9.class:205
+#: Step9.class:212
msgid "Installation in progress"
msgstr ""
-#: Step9.class:287
+#: Step9.class:294
msgid "Install Process"
msgstr ""
-#: Step9.class:304
+#: Step9.class:310
msgid "The development Crew"
msgstr ""
Modified: branches/speedy/MdlMain.module
==============================================================================
--- branches/speedy/MdlMain.module (original)
+++ branches/speedy/MdlMain.module Tue May 26 07:58:50 2009
@@ -756,6 +756,10 @@
'$path = ME.GET_PACKAGE_FULL_PATH($list[i]) ' Old method using
pkgname.
$path = ME.Get_FULL_TLZ_PACKAGE($list[i]) ' New method not using
pkgname
IF $path THEN
+
+ 'WAIT 0.12
+ 'WAIT 0.025
+ 'WAIT 0.0512
WAIT 0.125
'INC $currpkg
tlStatus.Text = ("Installing") & Space(1) & $path & Space(1)
& "(" & ("Part of") & Space(1) & sBulkName & ")"
Modified: branches/speedy/Step9.class
==============================================================================
--- branches/speedy/Step9.class (original)
+++ branches/speedy/Step9.class Tue May 26 07:58:50 2009
@@ -49,6 +49,12 @@
' ELSE
' RETURN
' END IF
+
+ ' Embed the credits scroller
+' EXEC ["scroller/scroller.gambas", Embedder1.Id, "/mnt/source/CREDIT"]
+SHELL "scroller/scroller.gambas " & Embedder1.Id
+'ME.Embedder1.Raise()
+
END
@@ -122,7 +128,8 @@
ME.svInstallProc.Width = svinstallproc.Parent.Width -
(svinstallproc.left * 2)
ME.svInstallProc.Height = svinstallproc.Parent.Height -
(svinstallproc.top * 1.25)
'ME.ScrlCredits.Move(4, 36, ScrlCredits.Parent.Width - (ScrlCredits.x *
2), ScrlCredits.Parent.Height - (ScrlCredits.Top * 1.5))
- ME.wsScroll.Move(4, 36, wsScroll.Parent.Width - (wsscroll.x * 2),
wsscroll.Parent.Height - (wsscroll.top + 12))
+' ME.wsScroll.Move(4, 36, wsScroll.Parent.Width - (wsscroll.x * 2),
wsscroll.Parent.Height - (wsscroll.top + 12))
+ ME.Embedder1.Move(4, 36, Embedder1.Parent.Width - (Embedder1.x * 2),
Embedder1.Parent.Height - (Embedder1.Top + 24))
END
@@ -150,7 +157,7 @@
' perform partitioning as requested.
- i = MdlMain.INSTALL_PACKAGES(tlcurrpkg, pbinstall,
ClsGlobal.iInstallMethod)
+ i = MdlMain.INSTALL_PACKAGES(tlcurrpkg, pbInstall,
ClsGlobal.iInstallMethod)
IF i > 0 THEN
Message.Error(("Something went wrong during installation. Please try
again"))
Modified: branches/speedy/Step9.form
==============================================================================
--- branches/speedy/Step9.form (original)
+++ branches/speedy/Step9.form Tue May 26 07:58:50 2009
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,78,60)
+ MoveScaled(0,0,95,60)
Text = ("")
Arrangement = Arrange.Row
{ HPanel1 HPanel
@@ -92,11 +92,10 @@
}
{ Frame2 Frame
MoveScaled(37,1,33,28)
- Visible = False
Expand = True
Text = ("The development Crew")
- { wsScroll Workspace
- MoveScaled(1,3,31,24)
+ { Embedder1 Embedder
+ MoveScaled(1,2,31,25)
}
}
}
Added: branches/speedy/scroller/.directory
==============================================================================
--- (empty file)
+++ branches/speedy/scroller/.directory Tue May 26 07:58:50 2009
@@ -0,0 +1,2 @@
+[Desktop Entry]
+Icon=./.icon.png
Added: branches/speedy/scroller/.icon.png
==============================================================================
Binary file. No diff available.
Added: branches/speedy/scroller/.project
==============================================================================
--- (empty file)
+++ branches/speedy/scroller/.project Tue May 26 07:58:50 2009
@@ -0,0 +1,9 @@
+# Gambas Project File 2.0
+# Compiled with Gambas 2.12
+Title=scroller
+Startup=StartUp
+Version=0.0.6
+Library=gb.gtk
+Library=gb.form
+Library=gb.gtk.ext
+TabSize=2
Added: branches/speedy/scroller/.settings
==============================================================================
--- (empty file)
+++ branches/speedy/scroller/.settings Tue May 26 07:58:50 2009
@@ -0,0 +1,23 @@
+[Breakpoints]
+Count=0
+
+[DebugWindow]
+Count=0
+
+[FFind]
+SearchIn="Module"
+CaseSensitive=False
+SearchWord=False
+SearchComment=False
+SearchString=True
+
+[OpenFile]
+File[1]="FMain.form"
+File[2]="StartUp.module:15.0"
+Active=2
+File[3]="FMain.class:15.0"
+Count=3
+
+[Watches]
+Count=0
+
Added: branches/speedy/scroller/FMain.class
==============================================================================
--- (empty file)
+++ branches/speedy/scroller/FMain.class Tue May 26 07:58:50 2009
@@ -0,0 +1,98 @@
+' Gambas class file
+
+' 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 _new()
+
+END
+
+PUBLIC SUB Form_Open()
+
+
+prepare_array()
+Timer1.Enabled = TRUE
+
+END
+PUBLIC SUB prepare_array()
+
+ 'DIM sList AS String[] =
["Moises", "linux", "vluser", "uelsk8s", "", "is", "an", "array", "with", "tons", "of", "scrolling", "stuff", "on", "it", "and", "we", "ware", "running", "a", "test"]
+ DIM sFile AS String
+ DIM sList AS String[]
+ DIM i AS Integer
+ DIM tl AS TextLabel
+ DIM sText, strline AS String
+
+ 'sList = Split(Trim(File.Load(Application.Args[2])), gb.NewLine) ' The
path to the credit file must be fed trhough the 2nd argument to the scroller
+ sList = Split(File.Load("/mnt/source/CREDIT"), gb.NewLine)
+
+tl = NEW TextLabel(scrollview1)
+tl.Height = scrollview1.Height
+tl.Expand = TRUE
+
+ FOR i = 0 TO sList.Max
+ 'FOR EACH strline IN sList
+ tl = NEW TextLabel(scrollview1)
+ tl.Expand = TRUE
+ tl.Height = 28
+ tl.Alignment = Align.Center
+ sText = Replace(sList[i], "(", "[ ")
+ sText = Replace(sText, ")", " ]")
+ IF InStr(sText, "M0E-lnx") THEN
+ tl.Height = 28 * 2
+ 'tl.Text = "<b>" & Left(sText, InStr(sText, "[") - 1) & "</b><br>"
& Right(sText, Len(sText) - InStr(sText, "[") + 1)
+ tl.Text = "<b>" & Left(sText, InStr(sText, "[") - 1) & "</b><br>"
& "[ Gui Installer, vpackager, vasmCC ]"
+ ELSE IF InStr(sText, "Uelsk8s") THEN
+ tl.Height = 28 * 2
+ tl.Text = "<b>" & Left(sText, InStr(sText, "[") - 1) & "</b><br>"
& "[ ISO Master, Gui Istaller ]"
+ ELSE IF InStr(sText, "Vector") THEN
+ tl.Height = 28 * 2
+ tl.Text = "<b>" & Left(sText, InStr(sText, "[") - 1) & "</b><br>"
& Right(sText, Len(sText) - InStr(sText, "[") + 1)
+ ELSE IF InStr(sText, "[") THEN
+ tl.Height = 28 * 2
+ tl.Text = Left(sText, InStr(sText, "[") - 1) & "<br>" &
Right(sText, Len(sText) - InStr(sText, "[") + 1)
+ ELSE
+ tl.Text = sText
+ END IF
+
+ ' IF InStr(sText, "(") THEN
+ ' sText = "<b>" & Left(sList[i], InStr(sList[i], "(") - 1)
& "</b><br>" & gb.NewLine & "[ " & Replace(Right(sList[i], Len(sList[i]) -
InStr(sList[i], "(")), ")", " ]")
+ ' tl.Height = 28 * 2.5
+ '
+
+
+ NEXT
+
+
+END
+
+PUBLIC SUB Timer1_Timer()
+
+ INC scrollview1.ScrollY
+ IF scrollview1.ScrollY = ScrollView1.Scrollh - scrollview1.h THEN
+ Timer1.Enabled = FALSE
+ REPEAT
+ DEC ScrollView1.ScrollY
+ UNTIL scrollview1.ScrollY = 0
+ END IF
+ Timer1.Enabled = TRUE
+
+
+ ' INC ScrollView1.ScrollY
+ ' 'PRINT ScrollView1.scrolly & " |" & ScrollView1.ScrollH & " | " &
ScrollView1.Height
+ ' IF ScrollView1.ScrollY = ScrollView1.scrollh - ScrollView1.Height
THEN ScrollView1.Scroll(0, 0)
+
+
+END
Added: branches/speedy/scroller/FMain.form
==============================================================================
--- (empty file)
+++ branches/speedy/scroller/FMain.form Tue May 26 07:58:50 2009
@@ -0,0 +1,20 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,50,50)
+ Text = ("")
+ Arrangement = Arrange.Fill
+ { ScrollView1 ScrollView
+ MoveScaled(1,3,45,42)
+ Arrangement = Arrange.Row
+ Spacing = 4
+ Padding = 2
+ Border = False
+ ScrollBar = Scroll.None
+ }
+ { Timer1 #Timer
+ #X = 368
+ #Y = 24
+ Delay = 30
+ }
+}
Added: branches/speedy/scroller/StartUp.module
==============================================================================
--- (empty file)
+++ branches/speedy/scroller/StartUp.module Tue May 26 07:58:50 2009
@@ -0,0 +1,25 @@
+' Gambas module file
+
+' 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 Main()
+
+ IF Application.Args[1] THEN
+ Application.Embedder = Application.Args[1]
+ END IF
+ FMain.Show()
+
+END
Added: branches/speedy/scroller/scroller.gambas
==============================================================================
Binary file. No diff available.
|