[WIKI CGI SCRIPT]

* NEW: Command for generating the package dependencies table.

[GB.COMPRESS.BZLIB2]
* NEW: Make that compress driver an explicit component.

[GB.COMPRESS.ZLIB]
* NEW: Make that compress driver an explicit component.

[GB.FORM.EDITOR]
* BUG: TextEditor: The right mouse button now has no effect to allow the
  popup menu to act on the current selection or cursor position.


git-svn-id: svn://localhost/gambas/trunk@7134 867c0c6c-44f3-4631-809d-bfa615b0a4ec

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

@@ -1137,3 +1137,31 @@ Public Sub GetDefaultPage() As String
   Return sResult
   
 End
+
+Public Sub GetPackageTable() As String[]
+
+  Dim aResult As String[]
+  Dim sComp As String
+  Dim sNeed As String
+  
+  aResult = New String[]
+  aResult.Add("[[")
+  aResult.Add("Package")
+  aResult.Add("--")
+  aResult.Add("Depends on these packages")
+  
+  For Each sComp In CComponent.ListAll()
+    
+    aResult.Add("==")
+    aResult.Add("'gambas3-" & Replace(sComp, ".", "-") & "'")
+    aResult.Add("--")
+    For Each sNeed In CComponent.Get(sComp).Require
+      aResult.Add("'gambas3-" & Replace(sNeed, ".", "-") & "'\\")
+    Next
+  Next
+  
+  aResult.Add("]]")
+  
+  Return aResult
+  
+End

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

@@ -200,6 +200,10 @@ Public Sub Command(sCommand As String) As String[]
   Else If sCommand = "changes" Then
     
     Return Main.GetChanges()
+    
+  Else If sCommand = "package-table" Then
+
+    Return Main.GetPackageTable()
 
   Else
     

comp/src/gb.form.editor/.project

@@ -8,7 +8,7 @@ Component=gb.image
 Component=gb.gui
 Component=gb.eval
 Component=gb.eval.highlight
-Environment="GB_GUI=gb.gtk"
+Environment="GB_GUI=gb.qt4"
 TabSize=2
 Language=fr
 Type=Component

comp/src/gb.form.editor/.src/TextEditor.class

@@ -825,6 +825,7 @@ Private Sub DrawMargin(X As Integer, Y As Integer, Width As Integer, Height As I
   Dim YL As Integer
   Dim S, SS As Float
   Dim H As Integer
+  Dim sStr As String
 
   hInfo = $hDoc.Info(Row)
   X += $hView.ScrollX
@@ -859,10 +860,18 @@ Private Sub DrawMargin(X As Integer, Y As Integer, Width As Integer, Height As I
   
   If YL < 0 Or If YL = Y Then
     If $bShowLineNumber Then
-      iCol = $iForeground
-      If (Row + 1) Mod 10 Then iCol = $iLimitColor
+      If (Row + 1) Mod 10 = 0 Then
+        iCol = $iForeground
+      Else
+        iCol = $iLimitColor
+      Endif
       Paint.Background = iCol
-      Paint.DrawText(CStr(Row + 1 + $iLineNumberOffset), X, Y, $iWidthLineNumber - 4, H, Align.Right)
+      sStr = CStr(Row + 1 + $iLineNumberOffset)
+      Paint.DrawText(sStr, X, Y, $iWidthLineNumber - 4, H, Align.Right)
+      ' If Row = $Y Then 
+      '   Paint.Background = Color.SetAlpha(iCol, 128)
+      '   Paint.DrawText(sStr, X + 1, Y, $iWidthLineNumber - 4, H, Align.Right)
+      ' Endif
     Endif
   Endif
   
@@ -1520,6 +1529,8 @@ Public Sub View_MouseDown()
   
   $bFirstFocus = True
   
+  If Mouse.Right Then Return
+  
   Y = PosToLine(Mouse.Y)
   RY = $hRows.RelativeY
   
@@ -1539,7 +1550,6 @@ Public Sub View_MouseDown()
   Endif
   
   $bMouseDown = True
-  
 
 End
 
@@ -1547,6 +1557,8 @@ Public Sub View_DblClick()
   
   Dim X, Y As Integer
   
+  If Mouse.Right Then Return
+  
   If $bShowIcon Or If $bShowExpand Then
     Y = PosToLine(Mouse.Y)
     If Mouse.X < $MW And If Mouse.X >= $iPosIcon Then 
@@ -1569,9 +1581,10 @@ Public Sub View_DblClick()
   
 End
 
-
 Public Sub View_MouseDrag()
   
+  If Mouse.Right Then Return
+  
   If Not $hTimerScroll Then
     $hTimerScroll = New Timer As "TimerScroll"
     $hTimerScroll.Delay = 50

gb.compress.bzlib2/component.am

@@ -0,0 +1 @@
+../component.am

gb.compress.bzlib2/src/Makefile.am

@@ -1,7 +1,10 @@
+COMPONENT = gb.compress.bzlib2
+include $(top_srcdir)/component.am
+
 gblib_LTLIBRARIES = gb.compress.bzlib2.la
 
 gb_compress_bzlib2_la_LIBADD = @BZLIB2_LIB@
 gb_compress_bzlib2_la_LDFLAGS = -module @LD_FLAGS@ @BZLIB2_LDFLAGS@
-gb_compress_bzlib2_la_CPPFLAGS = @BZLIB2_INC@
+gb_compress_bzlib2_la_CFLAGS = $(AM_CFLAGS) @BZLIB2_INC@
 
 gb_compress_bzlib2_la_SOURCES = main.h main.c

gb.compress.bzlib2/src/gb.compress.bzlib2.component

@@ -0,0 +1,5 @@
+[Component]
+Key=gb.compress.bzlib2
+Author=Daniel Campos Fernández
+Require=gb.compress
+ 

gb.compress.zlib/component.am

@@ -0,0 +1 @@
+../component.am

gb.compress.zlib/src/Makefile.am

@@ -1,7 +1,10 @@
+COMPONENT = gb.compress.zlib
+include $(top_srcdir)/component.am
+
 gblib_LTLIBRARIES = gb.compress.zlib.la
 
 gb_compress_zlib_la_LIBADD = @ZLIB_LIB@
 gb_compress_zlib_la_LDFLAGS = -module @LD_FLAGS@ @ZLIB_LDFLAGS@
-gb_compress_zlib_la_CPPFLAGS = @ZLIB_INC@
+gb_compress_zlib_la_CFLAGS = $(AM_CFLAGS) @ZLIB_INC@
 
 gb_compress_zlib_la_SOURCES = main.h main.c

gb.compress.zlib/src/gb.compress.zlib.component

@@ -0,0 +1,5 @@
+[Component]
+Key=gb.compress.zlib
+Author=Daniel Campos Fernández
+Require=gb.compress
+ 

main/lib/compress/gb.compress.component

@@ -1,8 +1,3 @@
 [Component]
 Key=gb.compress
-Name=Compression library
-Name[fr]=Librairie de compression/décompression
-Name[es]=Librería de compresión/descompresión
-Name[pl]=Biblioteka kompresji/dekompresji
-Name[tr]=Sıkıştırma kitaplığı
 Author=Daniel Campos Fernández