app/src/gambas-wiki/.public/critical.png

+../../../../comp/src/gb.form.stock/gambas/32/error.png
\ No newline at end of file

app/src/gambas-wiki/.public/info.png

+../../../../comp/src/gb.form.stock/gambas/32/info.png
\ No newline at end of file

app/src/gambas-wiki/.public/style.css

@@ -86,7 +86,7 @@ A[id] {
 
 P {
   margin-bottom: 0;
-  margin-top: 0.75em;
+  margin-top: 0.5em;
 }
 
 H1,H2,H3,H4,H5,H6 {
@@ -132,10 +132,10 @@ TABLE.table, TABLE.error {
   border-bottom: solid #D0D0D0 1px;
   border-right: solid #D0D0D0 1px;
   padding: 0;
-  margin-top: 0.75em;
+  margin-top: 0.5em;
   border-spacing: 0;
   empty-cells: show;
-  line-height: 1.75em;
+  line-height: 1.5em;
 }
 
 TABLE.table > TBODY > TR > TD, TABLE.error > TBODY > TR > TD {
@@ -287,7 +287,7 @@ TABLE.desc > TBODY > TR > TH {
 }
 
 .page P {
-  line-height: 1.75em;
+  line-height: 1.5em;
 }
 
 .page > DIV:last-child {
@@ -366,11 +366,18 @@ DIV.box {
   padding: 0.5em;
 }
 
+DIV.image {
+  margin-top: 0.75em;
+  display: inline-block;
+  border: solid #606060 1px;
+  box-shadow: 0 0 0.25em black;
+}
+
 DIV.info {
   margin-top: 0.75em;
   display: inline-block;
   padding: 0.5em;
-  padding-left: 3em;
+  padding-left: 3.5em;
   background: url('<%/%>/info.png') 0.5em 0.5em no-repeat;
   min-height: 2em;
   background-color: #EFF7FF;
@@ -381,7 +388,7 @@ DIV.warning {
   margin-top: 0.75em;
   display: inline-block;
   padding: 0.5em;
-  padding-left: 3em;
+  padding-left: 3.5em;
   background: url('<%/%>/warning.png') 0.5em 0.5em no-repeat;
   min-height: 2em;
   background-color: #FFF6EF;
@@ -392,7 +399,7 @@ DIV.tip {
   margin-top: 0.75em;
   display: inline-block;
   padding: 0.5em;
-  padding-left: 3em;
+  padding-left: 3.5em;
   background: url('<%/%>/tip.png') 0.5em 0.5em no-repeat;
   min-height: 2em;
   background-color: #EFFFEF;
@@ -403,7 +410,7 @@ DIV.vb {
   margin-top: 0.75em;
   display: inline-block;
   padding: 0.5em;
-  padding-left: 3em;
+  padding-left: 3.5em;
   background: url('<%/%>/vb.png') 0.5em 0.5em no-repeat;
   min-height: 2em;
   background-color: #FFFCEF;
@@ -414,7 +421,7 @@ DIV.critical {
   margin-top: 0.75em;
   display: inline-block;
   padding: 0.5em;
-  padding-left: 3em;
+  padding-left: 3.5em;
   background: url('<%/%>/critical.png') 0.5em 0.5em no-repeat;
   min-height: 2em;
   background-color: #FFEFEF;

app/src/gambas-wiki/.public/warning.png

+../../../../comp/src/gb.form.stock/gambas/32/warning.png
\ No newline at end of file

app/src/gambas-wiki/.src/CClassInfo.class

@@ -536,32 +536,19 @@ Public Sub GetDescription() As String
   Dim sSave As String
   
   sPath = Main.GetPagePathFrom("/comp" &/ LCase(Component &/ Name))
-  If Not Exist(sPath) Then Return 
-  
-  ' aData = Split(File.Load(sPath), "\n")
-  ' While iPos < aData.Count
-  '   sData = LTrim(aData[iPos])
-  '   If sData Then
-  '     sCar = String.Left(sData)
-  '     If Len(sCar) >= 2 Or If IsLetter(sCar) Then
-  '       sData = Replace(sData, "[../", "[./")
-  '       sData = Replace(sData, "[./../", "[../")
-  '       sDesc &= sData & "\n"
-  '     Endif
-  '   Else If sDesc Then
-  '     Break
-  '   Endif
-  '   Inc iPos
-  ' Wend
-  
+  If Exist(sPath) Then 
     aData = Split(File.Load(sPath), "\n")
+  Else
+    aData = ["@{help}"]
+  Endif
+  
   While iPos < aData.Count
     sData = aData[iPos]
     If Trim(sData) = "@{help}" Then 
       sSave = Main.Class
       Main.Class = Me.Name
       aData.Remove(iPos)
-      aData.Insert(Split(Main.GetDefaultPage(), "\n"), iPos)
+      aData.Insert(Split(Main.GetDefaultHelp(), "\n"), iPos)
       Main.Class = sSave
       Continue
     Endif

app/src/gambas-wiki/.src/CComponent.class

@@ -49,10 +49,10 @@ Static Public Sub Init()
   
   $cImplement.Clear
   
-  $cRescue["3.0:Form"] = "gb.qt5"
-  $cRescue["3.0:OpenGLViewer"] = "gb.qt5.opengl"
+  $cRescue["3.0:Form"] = "gb.qt4"
+  $cRescue["3.0:OpenGLViewer"] = "gb.qt4.opengl"
   $cRescue["3.0:ImageIO"] = "gb.image.io"
-  $cRescue["3.0:EventLoop"] = "gb.qt5"
+  $cRescue["3.0:EventLoop"] = "gb.qt4"
   $cRescue["3.0:XML"] = "gb.xml"
   
   $cFeatures["form"] = ("Graphical form management")

app/src/gambas-wiki/.src/CSymbolInfo.class

@@ -574,7 +574,7 @@ Public Sub GetSyntax() As String[]
       sSyntax &= sName & " " & Keyword("=") & " " & Keyword("New") & " " & GetSyntaxType(Class)
       sSyntax &= " " & Keyword("(") & GetSyntaxSignature() & Keyword(")")
       If CComponent.Get(Component)[Class].HasEvents() Then
-        sSyntax &= " <b>[</b> " & Keyword("As") & " \"<i>event name</i>\" <b>]</b>"
+        sSyntax &= " <b>\\[</b> " & Keyword("As") & " \"<u>EventName</u>\" <b>]</b>"
       Endif
 
     Case Else
@@ -661,20 +661,18 @@ Public Sub GetDescription() As String
   Dim iPos As Integer
   Dim sData As String
   Dim sDesc As String
-  Dim sSave As String
   
   sPath = Main.GetPagePathFrom(Main.SolvePath("/comp" &/ LCase(Component &/ Class &/ Replace(Name, ":", "."))))
-  If Not Exist(sPath) Then Return
+  If Exist(sPath) Then aData = Split(File.Load(sPath), "\n")
+  
+  If Not aData Or If aData.Count = 0 Then aData = ["@{help}"]
   
-  aData = Split(File.Load(sPath), "\n")
   While iPos < aData.Count
     sData = aData[iPos]
     If Trim(sData) = "@{help}" Then 
-      sSave = Main.Symbol
-      Main.Symbol = Me.Name
       aData.Remove(iPos)
-      aData.Insert(Split(Main.GetDefaultPage(), "\n"), iPos)
-      Main.Symbol = sSave
+      'Return "« " & Main.GetDefaultHelp(Me.Component, Me.Class, Me.Name) & " »"
+      aData.Insert(Split(Main.GetDefaultHelp(Me.Component, Me.Class, Me.Name), "\n"), iPos)
       Continue
     Endif
     If sData Then

app/src/gambas-wiki/.src/Main.module

@@ -341,7 +341,7 @@ Public Sub AddCacheHeaders(Optional dLast As Date)
     If Error Then dLast = Now
   Endif
   'Response.AddHeader("Expires", CGI.FormatDate(DateAdd(Now, gb.Month, 2)))
-  Response.AddHeader("Cache-Control", "public,max-age=3600,must-revalidate")
+  Response.AddHeader("Cache-Control", "public,max-age=86400,must-revalidate")
   Response.AddHeader("Last-Modified", CGI.FormatDate(dLast))
 
 End
@@ -424,7 +424,6 @@ Public Sub Main()
 
   ' Print "data:image/png;base64,"; URL.Encode(Base64$(File.Load(".public/critical.png")));
   ' Quit
-  
   ' If Application.Host = "gambasfarm.org" Then
   '   Response.Redirect("http://gambasfarm.org/farm")
   '   Return
@@ -437,15 +436,15 @@ Public Sub Main()
 
   Select Case Args[1]
 
-    Case "-restore" 
-      If IsDir(Root) Then
-        Shell "rm -rf " & Shell$(Root & "~") & " >/dev/null 2>&1" Wait
-        Move Root To Root & "~"
-        Mkdir Root
-        'Copy "passwd" To Root &/ "passwd"
-      Endif
-      OldWiki.Restore
-      Return
+    ' Case "-restore" 
+    '   If IsDir(Root) Then
+    '     Shell "rm -rf " & Shell$(Root & "~") & " >/dev/null 2>&1" Wait
+    '     Move Root To Root & "~"
+    '     Mkdir Root
+    '     'Copy "passwd" To Root &/ "passwd"
+    '   Endif
+    '   OldWiki.Restore
+    '   Return
       
     Case "-convert-example" 
       ConvertExample
@@ -1159,7 +1158,7 @@ Public Sub GetToDo() As String[]
         
         sPath = "/comp" &/ LCase(sComp &/ hSymbol.Class &/ Replace(hSymbol.Name, ":", "."))
         If Not ExistPage(sPath) Then
-          
+          If Not HasDefaultHelp(sComp, hSymbol.Class, hSymbol.Name) Then
             If bPrintComponent Then
               aResult.Add("## [[" & sComp & "] (/comp" &/ sComp & ")]")
               aIndex.Add("- [" & sComp & "](#t" & CStr(aIndex.Count + 1) & ")")
@@ -1172,6 +1171,7 @@ Public Sub GetToDo() As String[]
             aResult.Add("  * [" & sPath & "]")
             Inc iCpt
           Endif
+        Endif
       Next
     Next
   
@@ -1280,7 +1280,34 @@ Public Sub Log(sText As String, Optional sUser As String)
 
 End
 
-Public Sub GetDefaultPage() As String
+Public Sub HasDefaultHelp(Optional sComp As String, sClass As String, sSymbol As String) As Boolean
+
+  Dim hClass As CClassInfo
+  Dim hSymbol As CSymbolInfo
+
+  If Not sComp Then sComp = Main.Component
+  If Not sClass Then sClass = Main.Class
+  If Not sSymbol Then sSymbol = Main.Symbol
+
+  Try hClass = CComponent.Get(sComp)[sClass]
+  If Not hClass Then Return
+  
+  If sSymbol Then
+  
+    Try hSymbol = hClass.Symbols[sSymbol]
+    If Not hSymbol Then Return
+    
+    If hSymbol.Help Then Return True
+    
+  Else 
+    
+    If hClass.Help Then Return True
+    
+  Endif
+
+End
+
+Public Sub GetDefaultHelp(Optional sComp As String, sClass As String, sSymbol As String) As String
   
   Dim hSymbol As CSymbolInfo
   Dim sSign As String
@@ -1289,12 +1316,16 @@ Public Sub GetDefaultPage() As String
   Dim iPos2 As Integer
   Dim hClass As CClassInfo
   
-  Try hClass = CComponent.Get(Main.Component)[Main.Class]
+  If Not sComp Then sComp = Main.Component
+  If Not sClass Then sClass = Main.Class
+  If Not sSymbol Then sSymbol = Main.Symbol
+
+  Try hClass = CComponent.Get(sComp)[sClass]
   If Not hClass Then Return
   
-  If Main.Symbol Then
+  If sSymbol Then
   
-    Try hSymbol = hClass.Symbols[Main.Symbol]
+    Try hSymbol = hClass.Symbols[sSymbol]
     If Not hSymbol Then Return
     
     If hSymbol.Help Then Return hSymbol.Help

app/src/gambas-wiki/.src/Wiki.class

@@ -161,10 +161,10 @@ Private Sub _PrintPage()
   If Main.Edit Then
     sPath = Main.GetPagePath()  
     If Exist(sPath) Then sData = File.Load(sPath)
-    If Not sData Then
-      sPath = Main.Path
-      sData = OldWiki.GetPage(sPath)
-    Endif
+    ' If Not sData Then
+    '   sPath = Main.Path
+    '   'sData = OldWiki.GetPage(sPath)
+    ' Endif
     If Not sData Then
       If Main.Symbol Then
         sData = "@{syntax}\n@{help}\n" '& Main.GetDefaultPage()
@@ -208,7 +208,7 @@ Private Sub _PrintPage()
       
     Endif
       
-    If Not Main.ExistPage(sPath) Then
+    If Not Main.ExistPage(sPath) And If Not Main.HasDefaultHelp() Then
     
       If Main.Symbol Then
       
@@ -221,7 +221,7 @@ Private Sub _PrintPage()
           Main.Class = hClass.Parent
   
           sPath = Main.SolvePath("/comp/" & LCase(Main.Component &/ Main.Class &/ Main.Symbol))
-          If Main.ExistPage(sPath) Then Break
+          If Main.ExistPage(sPath) Or If Main.HasDefaultHelp() Then Break
           
         Loop
         
@@ -240,9 +240,9 @@ Private Sub _PrintPage()
         ' We use an automatic page
         Main.Lang = Main.DEFAULT_LANG
         If Main.Symbol Then
-          sData = "@{syntax}\n" & Main.GetDefaultPage()
+          sData = "@{syntax}\n" & Main.GetDefaultHelp()
         Else If Main.Class Then
-          sData = "@{symbols}\n"
+          sData = Main.GetDefaultHelp() & "\n@{symbols}\n" 
         Endif
         Goto DISPLAY_PAGE
         
@@ -324,7 +324,7 @@ Private Sub _PrintPage()
     Endif
     
     sPath = Main.GetPagePathFrom(sPath)
-    If Session.Id Then Main.AddCacheHeaders(Stat(sPath).LastModified)
+    Main.AddCacheHeaders(Stat(sPath).LastModified)
     sData = LTrim(File.Load(sPath))
     
   Endif

app/src/gambas-wiki/.src/WikiMarkdown.class

@@ -220,7 +220,7 @@ Public Sub Command(sCommand As String) As String[]
     
   Else If sCommand = "help" And If Main.Class Then
     
-    Return Split(Main.GetDefaultPage(), "\n")
+    Return Split(Main.GetDefaultHelp(), "\n")
 
   Else If sCommand = "stat" Then
     

app/src/gambas3/.hidden/font/GambasRegular.sfd

@@ -50,7 +50,7 @@ NameList: AGL For New Fonts
 DisplaySize: 12
 AntiAlias: 1
 FitToEm: 0
-WinInfo: 0 51 15
+WinInfo: 51 51 15
 OnlyBitmaps: 1
 BeginPrivate: 0
 EndPrivate
@@ -22659,7 +22659,7 @@ Flags: W
 LayerCount: 2
 EndChar
 EndChars
-BitmapFont: 12 2848 10 2 1 xos4
+BitmapFont: 12 2849 10 2 1 xos4
 BDFStartProperties: 25
 FONT 1 "-xos4-Gambas-Medium-R-Normal--12-120-72-72-C-60-ISO10646-1"
 SIZE 1 "12 72 72"
@@ -22830,16 +22830,16 @@ BDFChar: 69 100 6 0 4 0 7
 #RG[2Lkpk3
 BDFChar: 70 101 6 0 4 0 5
 E/=:>J9V%o
-BDFChar: 71 102 6 2 4 0 7
+BDFChar: 71 102 6 1 3 0 7
 @"<dcJ:N0#
 BDFChar: 72 103 6 0 4 -2 5
 G_h03Lj02E
 BDFChar: 73 104 6 0 4 0 7
 J:R-FLkpkC
-BDFChar: 74 105 6 2 2 0 8
-J:IWMJ:N0#J,fQL
-BDFChar: 75 106 6 0 2 -2 8
-+<UY,+<VdL+<\H"
+BDFChar: 74 105 6 2 2 0 7
+J,k+MJ:N0#
+BDFChar: 75 106 6 0 2 -2 7
++93N,+<VdL+M[sW
 BDFChar: 76 107 6 1 4 0 7
 J:N`S^qcV)
 BDFChar: 77 108 6 2 3 0 7
@@ -27565,7 +27565,7 @@ E/9=+Lknm[
 BDFChar: 2847 956 6 0 4 -2 5
 LkpkCM"#qF
 EndBitmapFont
-BitmapFont: 13 2848 11 2 1 xos4
+BitmapFont: 13 2849 11 2 1 xos4
 BDFStartProperties: 39
 FONT 1 "-xos4-Gambas-Medium-R-Normal--13-120-75-75-C-70-ISO10646-1"
 SIZE 1 "12 75 75"
@@ -32875,7 +32875,7 @@ E/9=+Lkpj`fDkmO
 BDFChar: 2847 956 7 1 5 -2 6
 LkpkCLktPNJ,fQL
 EndBitmapFont
-BitmapFont: 16 2848 13 3 1 xos4
+BitmapFont: 16 2849 13 3 1 xos4
 BDFStartProperties: 39
 FONT 1 "-xos4-Gambas-Medium-R-Normal--16-150-75-75-P-89-ISO10646-1"
 SIZE 1 "15 75 75"

comp/src/gb.form/.src/Font/FFontChooser.class

@@ -31,9 +31,6 @@ Public Sub _new()
   Inc $iNoChange
   $bNoRefresh = True
   $bShowFont = True
-  'Me.Proxy = txtFilter
-  
-  'lstSize.List = ["6", "7", "8", "9", "10", "11", "12", "13", "14", "16", "18", "20", "24", "28", "32", "36", "40", "48", "56", "64", "72", "80", "96", "112", "128"]
   
   StylePanel = panStyle
   Preview = txtExample
@@ -489,11 +486,6 @@ Public Sub txtSize_Change()
     Size = txtSize.Value
   Endif
   sldSize.Value = txtSize.Value
-  If btnRelative.Value And If txtSize.Value > 0 Then
-    btnSize.Text = "+" & txtSize.Text
-  Else
-    btnSize.Text = txtSize.Text
-  Endif
   RefreshExample
   
 End
@@ -875,15 +867,13 @@ End
 
 Public Sub txtSize_LostFocus()
 
-  txtSize.Hide
-  btnSize.Show
+  txtSize.ReadOnly = True
 
 End
 
-Public Sub btnSize_Click()
+Public Sub txtSize_Enter()
 
-  btnSize.Hide
-  txtSize.Show
+  txtSize.ReadOnly = False
   txtSize.SetFocus
   txtSize.SelectAll
 

comp/src/gb.form/.src/Font/FFontChooser.form

@@ -85,13 +85,11 @@
         Expand = True
         Orientation = ScrollBar.Horizontal
       }
-      { btnSize ToolButton
-        MoveScaled(54,0,8,4)
-      }
       { txtSize SpinBox
         MoveScaled(63,0,8,4)
-        Visible = False
         Alignment = Align.Right
+        ReadOnly = True
+        ShowSign = True
       }
     }
     { sepToolbar Separator