Fix index sorting and use 'gb.qt5' information file for all GUI components now.

[WIKI CGI SCRIPT]
* BUG: Fix index sorting.
* BUG: Use 'gb.qt5' information file for all GUI components now.

app/src/gambas-wiki/.project

@@ -3,7 +3,7 @@ Title=Gambas Wiki Web Application
 Startup=Main
 UseHttpServer=1
 Icon=icon.png
-Version=3.14.90
+Version=3.15.90
 VersionFile=1
 Component=gb.db
 Component=gb.net

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

@@ -49,10 +49,10 @@ Static Public Sub Init()
   
   $cImplement.Clear
   
-  $cRescue["3.0:Form"] = "gb.qt4"
-  $cRescue["3.0:OpenGLViewer"] = "gb.qt4.opengl"
+  $cRescue["3.0:Form"] = "gb.qt5"
+  $cRescue["3.0:OpenGLViewer"] = "gb.qt5.opengl"
   $cRescue["3.0:ImageIO"] = "gb.image.io"
-  $cRescue["3.0:EventLoop"] = "gb.qt4"
+  $cRescue["3.0:EventLoop"] = "gb.qt5"
   $cRescue["3.0:XML"] = "gb.xml"
   
   $cFeatures["form"] = ("Graphical form management")
@@ -528,6 +528,13 @@ Static Private Sub CreateClass(sClass As String, sParent As String, sComp As Str
   
 End
 
+Static Private Sub SubstInfo(sKey As String) As String
+  
+  If sKey Begins "gb.qt4" Then sKey = Replace(sKey, "gb.qt4", "gb.qt5")
+  Return sKey
+  
+End
+
 Public Sub Load()
   
   Dim aLine As String[]
@@ -548,6 +555,7 @@ Public Sub Load()
   Dim sElt As String
   Dim cCycle As Collection
   Dim I As Integer
+  Dim sInfo As String
   
   If $bLoaded Then Return
 
@@ -583,10 +591,12 @@ Public Sub Load()
 
   'sPath = Main.InfoFilePath &/ Name & ".info"
   
+  sInfo = SubstInfo(Key)
+  
   If Main.InfoDir Then
-    sPath = Main.InfoDir &/ Key & ".info"
+    sPath = Main.InfoDir &/ sInfo & ".info"
   Else
-    sPath = System.Path &/ "share/gambas" & System.Version &/ "info" &/ Key & ".info"
+    sPath = System.Path &/ "share/gambas" & System.Version &/ "info" &/ sInfo & ".info"
   Endif
   
   If Not Exist(sPath) Then

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

@@ -91,6 +91,7 @@ Public Sub Command(sCommand As String) As String[]
   Dim aClass As String[]
   Dim aSearch As String[]
   Dim sLink As String
+  Dim sSort As String
   
   aArg = Split(sCommand, " ", Chr$(34))
   sCommand = aArg[0]
@@ -107,6 +108,8 @@ Public Sub Command(sCommand As String) As String[]
       For I = 1 To aArg.Max
         If aArg[I] Begins "col=" Then
           Try NC = CInt(Mid$(aArg[I], 5))
+          aArg.Remove(I)
+          Break
         Endif
       Next
       
@@ -120,19 +123,20 @@ Public Sub Command(sCommand As String) As String[]
           sTitle = Main.GetPageTitle(sPath)
           If aArg.Count > 2 And If Comp(Left(sTitle, Len(aArg[2])), aArg[2], gb.Language + gb.IgnoreCase) = 0 Then sTitle = LTrim(Mid$(sTitle, Len(aArg[2]) + 1))
           
+          sSort = sTitle
           Do
-            sLetter = String.Left(sTitle)
+            sLetter = String.Left(sSort)
             If Len(sLetter) > 1 Then Break
             If Not IsPunct(sLetter) Then Break
             If Not sTitle Then Break
-            sTitle = String.Mid$(sTitle, 2)
+            sSort = String.Mid$(sSort, 2)
           Loop
           
-          If Not sTitle Then sTitle = " "
+          If Not sSort Then sSort = " "
           
-          If aDir.Exist(sTitle & "\n*", gb.Like) Then Continue
+          If aDir.Exist(sSort & "\n" & sTitle & "\n*", gb.Like) Then Continue
           
-          aDir.Add(sTitle & "\n[" & sPath & "]")
+          aDir.Add(sSort & "\n" & sTitle & "\n[" & sPath & "]")
         Next
         
         If aDir.Count Then
@@ -294,6 +298,7 @@ MAKE_INDEX_LETTER:
     For J = J To J + N - 1
       If J >= I Then Break
       iPos = InStr(aDir[J], "\n")
+      iPos = InStr(aDir[J], "\n", iPos + 1)
       aResult.Add(Mid$(aDir[J], iPos + 1) & "\\")
     Next