app/src/gambas3/.src/Welcome/FAbout.class

@@ -96,25 +96,27 @@ End
 
 Private Sub FillAbout()
 
-  Dim hFic As File
+  Dim hFile As File
   Dim sText As String
   Dim sLig As String
   Dim sMail As String
   Dim sCountry As String
   Dim sName As String
   Dim aAuthor As New String[]
+  Dim aFinancial As New String[]
   Dim aSplit As String[]
   Dim iPos As Integer
   Dim I As Integer
   Dim N As Integer
   Dim sDesc As String
   Dim sColor As String
+  Dim hFont As Font
 
-  hFic = Open "AUTHORS"
+  hFile = Open "AUTHORS" For Input
 
-  While Not Eof(hFic)
+  While Not Eof(hFile)
 
-    Line Input #hFic, sLig
+    Line Input #hFile, sLig
     sLig = RTrim(sLig)
     If Not sLig Then Continue
     If Left(sLig) = "#" Then Continue
@@ -156,37 +158,42 @@ Private Sub FillAbout()
 
   If sName Then aAuthor.Add(sName & "\n\n" & sMail & "\n" & sCountry & "\n" & sDesc)
   
-  Close #hFic
+  Close #hFile
   
-  ' hFic = Open "support.txt"
+  hFile = Open "support.txt" For Input
   ' 
-  ' While Not Eof(hFic)
-  '   
-  '   Line Input #hFic, sLig
-  '   iPos = InStr(sLig, " ")
-  '   If iPos = 0 Then Break
-  '   sName = Mid$(sLig, iPos + 1)
-  '   sText = sName & "\n" & Left(sLig, iPos - 1)
-  '   
-  '   iPos = aAuthor.Find(sName & "\n*", gb.Like)
-  '   If iPos < 0 Then
-  '     aAuthor.Add(sText)
-  '   Else
-  '     aAuthor[iPos] = sText & Mid$(aAuthor[iPos], Len(sName) + 2)
-  '   Endif
-  '   
-  ' Wend
-  ' 
-  ' Close #hFic
+  While Not Eof(hFile)
+    
+    Line Input #hFile, sLig
+    
+    iPos = InStr(sLig, " ")
+    If iPos = 0 Then Break
+    
+    sName = Mid$(sLig, iPos + 1)
+    sText = sName & "\n" & Left(sLig, iPos - 1)
+
+    aFinancial.Add(sText)
+    
+    ' iPos = aAuthor.Find(sName & "\n*", gb.Like)
+    ' If iPos < 0 Then
+    '   aAuthor.Add(sText)
+    ' Else
+    '   aAuthor[iPos] = sText & Mid$(aAuthor[iPos], Len(sName) + 2)
+    ' Endif
+    
+  Wend
+  
+  Close #hFile
 
   aAuthor.Sort(gb.Language + gb.IgnoreCase)
+  aFinancial.Reverse()
   
   gvwAbout.Columns.Count = 1
   N = 6
   
-  gvwAbout.Rows.Count = aAuthor.Count + N + 1
+  gvwAbout.Rows.Count = aAuthor.Count + aFinancial.Count + N + 2
   gvwAbout.Columns[0].Width = Me.ClientWidth - Desktop.Scale * 6
-  gvwAbout.Padding = Desktop.Scale
+  gvwAbout.Padding = 0
   
   ' Space
   gvwAbout.Rows[0].H = dwgAbout.H
@@ -194,7 +201,7 @@ Private Sub FillAbout()
   gvwAbout[1, 0].RichText = "<b>G</b>ambas <b>A</b>lmost<br><b>M</b>eans <b>BAS</b>ic !"
   gvwAbout[1, 0].Font = Font["+10"]
   gvwAbout[1, 0].Alignment = Align.Top
-  gvwAbout[1, 0].WordWrap = True
+  'gvwAbout[1, 0].WordWrap = True
   ' Logo
   gvwAbout[2, 0].Picture = Picture["img/logo/logo.png"]
   gvwAbout[2, 0].Alignment = Align.Top
@@ -203,13 +210,13 @@ Private Sub FillAbout()
   'gvwAbout[3, 0].Font = Font["Bold,+2"]
   'gvwAbout[3, 0].Alignment = Align.Top
   ' Licence
-  gvwAbout[4, 0].RichText = "<h2>" & String.UCase(("License")) & "</h2><br>" & lblLicense.Text
+  gvwAbout[4, 0].RichText = "<h1>" & String.UCase(("License")) & "</h1><br>" & lblLicense.Text
   gvwAbout[4, 0].WordWrap = True
   gvwAbout[4, 0].Alignment = Align.Top
   gvwAbout[4, 0].Padding = Desktop.Scale * 3
   ' Authors title
-  gvwAbout[5, 0].RichText = "<h2>" & String.UCase(("Authors")) & "</h2>"
-  gvwAbout[5, 0].WordWrap = True
+  gvwAbout[5, 0].RichText = "<h1>" & String.UCase(("Authors")) & "</h1>"
+  'gvwAbout[5, 0].WordWrap = True
   gvwAbout[5, 0].Alignment = Align.Top
   
   For I = 1 To 5
@@ -224,7 +231,8 @@ Private Sub FillAbout()
     aSplit = Split(aAuthor[I], "\n")
     
     sName = String.UCase(aSplit[0])
-    sText = "<b><font size=+1>" & sName & "</font>"
+    '"<font size=\"-2\" color=\"#808080\">" & String$(64, "─") & "</font>
+    sText = "<br><br><b><font size=+1>" & sName & "</font>"
 
     If aSplit.Count = 2 Then
       
@@ -236,7 +244,7 @@ Private Sub FillAbout()
       
       sText &= "</b>"
       If aSplit[3] Then sText &= " <i>(" & aSplit[3] & ")</i>"
-      If aSplit[2] Then sText &= "<br><tt>" & aSplit[2] & "</tt><br>────────────────────"
+      If aSplit[2] Then sText &= "<br><tt>" & aSplit[2] & "</tt>"
       sText &= "<blockquote>"
       sText &= "<font color=\"" & sCOlor & "\">"
       sText &= aSplit[4]
@@ -247,17 +255,45 @@ Private Sub FillAbout()
     
     sText &= "</blockquote>"
     
-    gvwAbout[I + N, 0].WordWrap = True
-    gvwAbout[I + N, 0].RichText = sText
-    gvwAbout[I + N, 0].Padding = Desktop.Scale * 3
-    gvwAbout[I + N, 0].Alignment = Align.Center
-    gvwAbout.Rows[I + N].Height = -1
-    'gvwAbout.Rows[I + N].Height += Desktop.Scale 
+    gvwAbout[N, 0].WordWrap = True
+    gvwAbout[N, 0].RichText = sText
+    gvwAbout[N, 0].Padding = Desktop.Scale 
+    gvwAbout[N, 0].Alignment = Align.Center
+    gvwAbout.Rows[N].Height = -1
+    Inc N
     
   Next
   
+  gvwAbout[N, 0].RichText = "<br><br><h1>" & String.UCase(("Financial support")) & "</h1>"
+  'gvwAbout[N, 0].WordWrap = True
+  gvwAbout[N, 0].Alignment = Align.Top
+  gvwAbout.Rows[N].H = -1
+  gvwAbout.Rows[N].H += Desktop.Scale * 3
+  Inc N
+  
+  hFont = gvwAbout.Font.Copy()
+  
+  For I = 0 To aFinancial.Max
+    
+    aSplit = Split(aFinancial[I], "\n")
+    
+    sText = String.UCase(aSplit[0])
+    
+    hFont.Size = Min(24, CInt(aSplit[1]) / 2 + 7)
+    gvwAbout[N, 0].Font = hFont
+    gvwAbout[N, 0].WordWrap = True
+    gvwAbout[N, 0].RichText = sText
+    'gvwAbout[N, 0].Padding = Desktop.Scale 
+    gvwAbout[N, 0].Alignment = Align.Center
+    gvwAbout[N, 0].Padding = 0
+    gvwAbout.Rows[N].Height = hFont.H + Desktop.Scale \ 4
+    Inc N
+
+  Next
+  
   ' Final space
-  gvwAbout.Rows[I + N].H = dwgAbout.H
+  'gvwAbout[N, 0].Background = Color.Yellow
+  gvwAbout.Rows[N].H = dwgAbout.H
 
 End
 
@@ -315,7 +351,7 @@ End
 
 Public Sub timAbout_Timer()
 
-  ScrollText(If($bPressed, 8, 1))
+  ScrollText(If($bPressed, 16, 1))
 
 End
 

app/src/gambas3/support.txt

 60 Maurizio Da Lio
-37 GNU/Linex
+37 GNU/Linex<sup>†</sup>
 33 Radoslav Dejanovic
 26 Chris McLennan
 24 Ricardo Díaz Martin
@@ -21,6 +21,7 @@
 12 Kitiipong Mapagdee
 12 Jacky Tripoteau
 12 Edward Kelm
+11 Sharon Mayost (שרון מיוסט)
 11 Gianluigi Gradaschi
 10 Thierry Senges
 10 Nando Favaro
@@ -36,7 +37,6 @@
 8 Evan Owen
 8 Mario Carena
 8 Christian Beck
-8 Sharon Myost (שרון מיוסט)
 8 Joel Barnett
 7 John Laurence
 7 Roy Jones

comp/src/gb.gui.base/.src/GridView/GridView.class

@@ -282,9 +282,7 @@ Private Sub DrawCell(X As Integer, Y As Integer, W As Integer, H As Integer, iRo
     
     Paint.Background = iColor
     
-    If .Font And If .Font.Modified Then 
-      Paint.Font = .Font
-    Endif
+    If .Font And If .Font.Modified Then Paint.Font = .Font
 
     If $bHasDrawEvent Then
       bCancel = Raise Draw(X, Y, W, H, iRow, iCol)
@@ -340,7 +338,7 @@ Private Sub DrawCell(X As Integer, Y As Integer, W As Integer, H As Integer, iRo
         Else If Align.IsRight(A) Then
           Paint.DrawRichText(.RichText, X + W - 4096, Y, 4096, H, .Alignment)
         Else
-          Paint.DrawRichText(.RichText, X + W \ 2 - 4096, Y, 4096, H, .Alignment)
+          Paint.DrawRichText(.RichText, X + W \ 2 - 4096, Y, 8192, H, .Alignment)
         Endif
       Endif
     Endif