[CONFIGURATION]

* NEW: Update the state of many components.

[DEVELOPMENT ENVIRONMENT]
* NEW: The project property dialog now uses an IconPanel.
* NEW: New design of the component tab in the project property dialog.

[GB.GUI.BASE]
* NEW: GridView: The background of the sorted column is now lighter.

[GB.QT4.WEBKIT]
* NEW: WebView.History is a new virtual access to get the number of entries 
  in the history, to set or get the current history entry index, and to get
  or set the history maximum capacity.


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

app/src/gambas3/.src/FMain.form

@@ -1124,7 +1124,7 @@
         { picFilter PictureBox
           MoveScaled(0,0,3,3)
           Mouse = Mouse.Pointing
-          Picture = Picture["img/32/filter.png"]
+          Picture = Picture["img/32/filter-menu.png"]
           Stretch = True
           AutoResize = True
         }

app/src/gambas3/.src/Help/MHelp.module

@@ -444,6 +444,7 @@ Public Sub InitWebViewWith(hWebView As WebView, iType As Integer, sSymbol As Str
       'Debug sUrl
       hWebView.Url = sUrl
     Endif
+    hWebView.History.Clear
     
   Else
     

app/src/gambas3/.src/Project/FProjectProperty.class

@@ -1,6 +1,7 @@
 ' Gambas class file
 
 Static Private $bShowUsed As Boolean
+Static Private $bShowDeprecated As Boolean
 Static Private $bShowLibraries As Boolean
 
 Private $hCheck As Picture
@@ -103,11 +104,15 @@ Public Sub Form_Open()
   gvwComponent.Columns[3].Width = 24
   gvwComponent.Columns[3].Expand = False
 
-  chkShowUsed.Value = $bShowUsed
+  mnuShowUsed.Value = $bShowUsed
+  mnuShowDeprecated.Value = $bShowDeprecated
   'chkShowBeta.Value = $bShowBeta
   $bCanInitComponents = True
 
-  tabProject.Index = 0
+  ipnProject.Index = 0
+
+  panSearchProject.H = Desktop.Scale * 3.5
+  btnClearFilter.W = panSearchProject.H
 
   RefreshComponents
   RefreshLibraries
@@ -117,7 +122,7 @@ Public Sub Form_Open()
 
   If $bShowLibraries Then 
     $bShowLibraries = False
-    tabProject.Index = LIBRARY_TAB
+    ipnProject.Index = LIBRARY_TAB
   Endif
   
 End
@@ -408,10 +413,12 @@ Private Sub RefreshComponents(Optional bKeep As Boolean)
   For Each sLib In aComp
     hComp = CComponent.All[sLib]
     If hComp.Hidden Then Continue
-    If Not $bShowUsed Or If $cComp[hComp.Key].Value Then
-      If $sFilter And If Not hComp.Match($sFilter) Then Continue
-      $aComp.Add(hComp.Key)
+    If Not $cComp[hComp.Key].Value Then
+      If $bShowUsed Then Continue
+      If Not $bShowDeprecated And If hComp.State = CComponent.DEPRECATED Then Continue
     Endif
+    If $sFilter And If Not hComp.Match($sFilter) Then Continue
+    $aComp.Add(hComp.Key)
   Next
   
   If aNotFound.Count Then
@@ -421,7 +428,7 @@ Private Sub RefreshComponents(Optional bKeep As Boolean)
   gvwComponent.Rows.Count = $aComp.Count
   gvwComponent.Rows.Height = -1
   
-  tabProject_Arrange
+  gvwComponent_Arrange
   
 End
 
@@ -595,7 +602,7 @@ Public Sub gvwComponent_Click()
   Dim hCompItem As ComponentItem
   Dim sDep As String
   
-  If panAboutComponent.Visible Then AboutComponent
+  If webAboutComponent.Visible Then AboutComponent
   
   If gvwComponent.Column <> 0 Then Return
   
@@ -698,9 +705,16 @@ End
 ' END
 
 
-Public Sub chkShowUsed_Click()
+Public Sub mnuShowUsed_Click()
 
-  $bShowUsed = chkShowUsed.Value
+  $bShowUsed = mnuShowUsed.Value
+  RefreshComponents(True)
+
+End
+
+Public Sub mnuShowDeprecated_Click()
+
+  $bShowDeprecated = mnuShowDeprecated.Value
   RefreshComponents(True)
 
 End
@@ -764,35 +778,45 @@ End
 ' 
 ' End
 
-Private Sub AboutComponent()
+Private Sub AboutComponent() As Boolean
   
   Dim hCompItem As ComponentItem
   Dim sKey As String
   
   Try hCompItem = $cComp[$aComp[gvwComponent.Row]]
-  If Not hCompItem Then Return
+  If Not hCompItem Then Return True
   Try sKey = hCompItem.Key
-  If Not sKey Then Return 
+  If Not sKey Then Return True
   'MHelp.GotoComponent(sKey)
   webAboutComponent.Zoom = 0.75
-  MHelp.InitWebViewWith(webAboutComponent, MHelp.TYPE_COMPONENT, sKey)
+  MHelp.InitWebViewWith(webAboutComponent, MHelp.TYPE_COMPONENT, sKey,, "v&nh&l=" & MHelp.GetLanguage())
   
 End
 
 
 Public Sub btnHelp_Click()
 
-  If panAboutComponent.Visible Then
+  If webAboutComponent.Visible Then
     
-    panAboutComponent.Hide
-    btnHelp.Picture = Picture["icon:/small/up"]
+    If webAboutComponent.History.Index Then
+      webAboutComponent.Back
+    Else
+      webAboutComponent.Hide
+      btnForward.Hide
+      panComponent.Show
+      btnHelp.Picture = Picture["icon:/small/next"]
+      btnHelp.Text = Shortcut(("About component"), "A") & "..."
+    Endif
   
   Else
   
-    AboutComponent
-    panAboutComponent.Show
-    Try gvwComponent.Current.EnsureVisible
-    btnHelp.Picture = Picture["icon:/small/down"]
+    If AboutComponent() Then Return
+    webAboutComponent.Show
+    btnForward.Show
+    panComponent.Hide
+    'Try gvwComponent.Current.EnsureVisible
+    btnHelp.Text = ""
+    btnHelp.Picture = Picture["icon:/small/previous"]
     
   Endif
 
@@ -1097,12 +1121,6 @@ Private Sub UpdateIcon()
   
 End
 
-Public Sub lstComponent_Click()
-
-  If panAboutComponent.Visible Then AboutComponent
-
-End
-
 Public Sub btnInsertLib_Click()
 
   Dim hLib As CLibraryInfo
@@ -1171,7 +1189,7 @@ Private Sub RefreshLibraries()
     
   Next
   
-  tabProject_Arrange
+  gvwComponent_Arrange
   
 End
 
@@ -1247,7 +1265,7 @@ Public Sub UncheckComponents(aComp As String[])
   
 End
 
-Public Sub tabProject_Arrange()
+Public Sub gvwComponent_Arrange()
 
   Dim I As Integer
 
@@ -1343,13 +1361,13 @@ Public Sub timFilterComponent_Timer()
 
 End
 
-Public Sub tabProject_Click()
+Public Sub ipnProject_Click()
 
-  If tabProject.Text = ("Components") Then
+  If ipnProject.Text = ("Components") Then
     txtFilterComponent.SetFocus
-  Else If tabProject.Text = ("Options") Then
+  Else If ipnProject.Text = ("Options") Then
     panHttpServer.Enabled = IsChecked("gb.web") 'Project.Components.Exist("gb.web")
-  Else If tabProject.Text = ("Statistics") Then
+  Else If ipnProject.Text = ("Statistics") Then
     UpdateStat
   Endif
 
@@ -1393,3 +1411,21 @@ Private Sub UpdateStat()
   gvwStat.Columns[0].Width += 16
   
 End
+
+Public Sub btnForward_Click()
+
+  webAboutComponent.Forward
+
+End
+
+Public Sub webAboutComponent_Click((Frame) As WebFrame)
+
+  btnForward.Enabled = webAboutComponent.History.Index < webAboutComponent.History.Max
+
+End
+
+Public Sub picFilter_MouseDown()
+
+  mnuComponent.Popup(picFilter.ScreenX, picFilter.ScreenY + picFilter.H)
+
+End

app/src/gambas3/.src/Project/FProjectProperty.form

@@ -1,11 +1,12 @@
 # Gambas Form File 3.0
 
 { Form Form
-  MoveScaled(0,2,93,78)
+  MoveScaled(0,2,110,77)
   Text = ("Project properties")
   Icon = Picture["icon:/small/edit"]
   Persistent = True
   Resizable = False
+  Arrangement = Arrange.Vertical
   { mnuInsertEnv Menu
     { Menu1 Menu mnuInsertEnv
       Name = "Menu1"
@@ -72,10 +73,21 @@
       Tag = "LIBOVERLAY_SCROLLBAR=0"
     }
   }
-  { tabProject TabPanel
-    MoveScaled(1,1,91,71)
+  { mnuComponent Menu
+    { mnuShowUsed Menu
+      Text = ("Show only components used in project")
+      Toggle = True
+    }
+    { mnuShowDeprecated Menu
+      Text = ("Show deprecated components")
+      Toggle = True
+    }
+  }
+  { ipnProject IconPanel
+    MoveScaled(0,0,108,70)
+    Expand = True
     Arrangement = Arrange.Vertical
-    Count = 6
+    Count = 7
     Index = 0
     Text = ("General")
     { Panel1 Panel
@@ -94,7 +106,7 @@
       MoveScaled(53,11,29,0)
     }
     { HPanel1 HPanel
-      MoveScaled(1,11,84,55)
+      MoveScaled(1,11,84,58)
       Expand = True
       AutoResize = True
       Spacing = True
@@ -157,32 +169,29 @@
         Wrap = True
       }
       { Label11 Label
-        MoveScaled(0,37,16,4)
+        MoveScaled(0,38,16,4)
         Font = Font["Bold"]
         Text = ("Author(s)")
       }
       { txtAuthor TextArea
-        MoveScaled(18,37,57,17)
+        MoveScaled(18,38,57,20)
         Expand = True
         Wrap = True
       }
     }
     Index = 1
     Text = ("Components")
-    { Panel7 HBox
-      MoveScaled(1,1,88,6)
-      Spacing = True
-      Margin = True
+    { panComponent VBox
+      MoveScaled(2,2,82,35)
+      Expand = True
       { panSearchProject Panel
-        MoveScaled(1,1,29,3)
+        MoveScaled(0,0,29,3)
         Background = Color.TextBackground
-        Expand = True
         Arrangement = Arrange.Horizontal
-        Border = Border.Plain
         { picFilter PictureBox
           MoveScaled(0,0,3,3)
           Mouse = Mouse.Pointing
-          Picture = Picture["img/32/filter.png"]
+          Picture = Picture["img/32/filter-menu.png"]
           Stretch = True
           AutoResize = True
         }
@@ -198,61 +207,56 @@
           Picture = Picture["icon:/small/clear"]
         }
       }
-      { chkShowUsed CheckBox
-        MoveScaled(51,0,35,4)
-        AutoResize = True
-        Text = ("Show only components used in project")
+      { Separator4 Separator
+        MoveScaled(32,6,21,0)
       }
+      { gvwComponent GridView
+        MoveScaled(3,9,78,25)
+        Expand = True
+        Border = False
+        Mode = Select.Single
+        Grid = False
+        Padding = 4
+      }
+    }
+    { webAboutComponent HelpView
+      MoveScaled(6,38,46,7)
+      Visible = False
+      Expand = True
     }
     { timFilterComponent #Timer
-      #MoveScaled(34,1)
+      #MoveScaled(76,41)
       Delay = 500
     }
-    { Separator4 Separator
-      MoveScaled(34,8,21,0)
-    }
-    { gvwComponent GridView
-      MoveScaled(5,11,78,25)
-      Expand = True
-      Border = False
-      Mode = Select.Single
-      Grid = False
-      Padding = 4
-    }
     { Separator2 Separator
-      MoveScaled(1,38,24,0)
+      MoveScaled(2,50,24,0)
     }
     { HBox14 HBox
-      MoveScaled(1,39,84,6)
+      MoveScaled(2,61,79,6)
+      Spacing = True
       Margin = True
       { btnHelp Button
-        MoveScaled(0,0,35,4)
-        Text = Shortcut(("About component"), "c") & "..."
-        Picture = Picture["icon:/small/up"]
+        MoveScaled(0,0,23,4)
+        AutoResize = True
+        Text = Shortcut(("About component"), "A") & "..."
+        Picture = Picture["icon:/small/next"]
+      }
+      { btnForward Button
+        MoveScaled(24,0,4,4)
+        Visible = False
+        AutoResize = True
+        Picture = Picture["icon:/small/next"]
       }
       { Panel3 Panel
-        MoveScaled(39,0,7,4)
+        MoveScaled(51,0,7,4)
         Expand = True
       }
       { btnUndo Button
-        MoveScaled(62,0,17,4)
+        MoveScaled(60,0,17,4)
         Text = Shortcut(("Reset"), "R")
         Picture = Picture["icon:/small/undo"]
       }
     }
-    { panAboutComponent Panel
-      MoveScaled(1,46,84,13)
-      Visible = False
-      Expand = True
-      Arrangement = Arrange.Vertical
-      { Separator5 Separator
-        MoveScaled(24,1,24,0)
-      }
-      { webAboutComponent HelpView
-        MoveScaled(8,4,46,7)
-        Expand = True
-      }
-    }
     Index = 2
     Text = ("Libraries")
     { Panel4 Panel
@@ -283,6 +287,9 @@
       Border = False
       Mode = Select.Single
     }
+    { Separator7 Separator
+      MoveScaled(25,51,23,0)
+    }
     { HBox18 HBox
       MoveScaled(1,53,84,6)
       Spacing = True
@@ -317,85 +324,68 @@
     }
     Index = 3
     Text = ("Environment")
-    { VBox1 VBox
-      MoveScaled(1,1,84,29)
+    { tvwEnv TableView
+      MoveScaled(3,6,68,20)
       Expand = True
-      Margin = True
-      { Label17 Label
-        MoveScaled(1,1,24,3)
-        Font = Font["Bold"]
-        Text = ("Arguments")
-      }
-      { tvwArg TableView
-        MoveScaled(1,5,50,16)
-        Expand = True
-        Padding = 4
-        Header = GridView.Vertical
-      }
-      { Panel8 Panel
-        MoveScaled(21,22,5,1)
-      }
-      { HBox2 HBox
-        MoveScaled(2,24,53,4)
-        Spacing = True
-        { btnInsertArg Button
-          MoveScaled(0,0,17,4)
-          Text = Shortcut(("Insert"), "I")
-          Picture = Picture["icon:/small/add"]
-        }
-        { btnRemoveArg Button
-          MoveScaled(18,0,17,4)
-          Text = Shortcut(("Remove"), "R")
-          Picture = Picture["icon:/small/remove"]
-        }
-        { btnMoveUpArg Button
-          MoveScaled(36,0,6,4)
-          Picture = Picture["icon:/small/up"]
-        }
-        { btnMoveDownArg Button
-          MoveScaled(42,0,6,4)
-          Picture = Picture["icon:/small/down"]
-        }
-      }
+      Border = False
+      Padding = 4
+      Header = GridView.Horizontal
     }
-    { Separator1 Separator
-      MoveScaled(6,31,42,0)
+    { Separator8 Separator
+      MoveScaled(30,31,24,0)
     }
-    { Panel5 VBox
-      MoveScaled(1,33,85,26)
-      Expand = True
+    { HBox3 HBox
+      MoveScaled(1,36,40,6)
+      Spacing = True
       Margin = True
-      { Label18 Label
-        MoveScaled(0,0,24,3)
-        Font = Font["Bold"]
-        Text = ("Environment variables")
+      { btnInsertEnv MenuButton
+        MoveScaled(0,0,19,4)
+        Text = ("&Insert")
+        Picture = Picture["icon:/small/add"]
+        Menu = "mnuInsertEnv"
       }
-      { tvwEnv TableView
-        MoveScaled(0,4,68,13)
-        Expand = True
-        Padding = 4
-        Header = GridView.Horizontal
-      }
-      { Panel9 Panel
-        MoveScaled(20,18,7,1)
-      }
-      { HBox3 HBox
-        MoveScaled(0,21,40,4)
-        Spacing = True
-        { btnInsertEnv MenuButton
-          MoveScaled(0,0,19,4)
-          Text = ("&Insert")
-          Picture = Picture["icon:/small/add"]
-          Menu = "mnuInsertEnv"
-        }
-        { btnRemoveEnv Button
-          MoveScaled(20,0,17,4)
-          Text = Shortcut(("Remove"), "R")
-          Picture = Picture["icon:/small/remove"]
-        }
+      { btnRemoveEnv Button
+        MoveScaled(20,0,17,4)
+        Text = Shortcut(("Remove"), "R")
+        Picture = Picture["icon:/small/remove"]
       }
     }
     Index = 4
+    Text = ("Arguments")
+    { tvwArg TableView
+      MoveScaled(6,4,58,19)
+      Expand = True
+      Border = False
+      Padding = 4
+      Header = GridView.Vertical
+    }
+    { Separator9 Separator
+      MoveScaled(26,27,34,0)
+    }
+    { HBox2 HBox
+      MoveScaled(9,45,53,6)
+      Spacing = True
+      Margin = True
+      { btnInsertArg Button
+        MoveScaled(0,0,17,4)
+        Text = Shortcut(("Insert"), "I")
+        Picture = Picture["icon:/small/add"]
+      }
+      { btnRemoveArg Button
+        MoveScaled(18,0,17,4)
+        Text = Shortcut(("Remove"), "R")
+        Picture = Picture["icon:/small/remove"]
+      }
+      { btnMoveUpArg Button
+        MoveScaled(36,0,6,4)
+        Picture = Picture["icon:/small/up"]
+      }
+      { btnMoveDownArg Button
+        MoveScaled(42,0,6,4)
+        Picture = Picture["icon:/small/down"]
+      }
+    }
+    Index = 5
     Text = ("Options")
     { Panel6 VBox
       MoveScaled(0,0,89,66)
@@ -576,7 +566,7 @@
         }
       }
     }
-    Index = 5
+    Index = 6
     Text = ("Statistics")
     { gvwStat GridView
       MoveScaled(10,7,62,25)
@@ -586,14 +576,26 @@
     }
     Index = 0
   }
-  { btnOK Button
-    MoveScaled(59,73,16,4)
-    Text = ("OK")
-    Default = True
+  { Separator1 Separator
+    MoveScaled(54,70,23,0)
   }
-  { btnCancel Button
-    MoveScaled(76,73,16,4)
-    Text = ("Cancel")
-    Cancel = True
+  { Panel10 HBox
+    MoveScaled(29,71,63,6)
+    Spacing = True
+    Margin = True
+    { Panel11 Panel
+      MoveScaled(5,1,8,3)
+      Expand = True
+    }
+    { btnOK Button
+      MoveScaled(22,1,17,4)
+      Text = ("OK")
+      Default = True
+    }
+    { btnCancel Button
+      MoveScaled(40,1,18,4)
+      Text = ("Cancel")
+      Cancel = True
+    }
   }
 }

comp/src/gb.gui.base/.project

@@ -1,5 +1,5 @@
 # Gambas Project File 3.0
-# Compiled with Gambas 3.6.0
+# Compiled with Gambas 3.6.90
 Title=gb.gui.base
 Startup=FIconView
 Version=3.6.90

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

@@ -665,7 +665,7 @@ Public Sub ScrollArea_Draw()
     
     'Paint.Begin(Draw.Device)
     Paint.ClipRect = hClip
-    Paint.Brush = Paint.Color(Color.SetAlpha(Color.LightForeground, 224))
+    Paint.Brush = Paint.Color(Color.SetAlpha(Style.ForegroundOf(Me), 252))
     
     With $hColumns[iSort]
     

comp/src/gb.util/.component

@@ -1,4 +1,4 @@
 [Component]
 Key=gb.util
 Version=3.6.90
-State=2
+State=1

comp/src/gb.util/.src/MMain.module

@@ -5,7 +5,7 @@ Public Sub Main()
   Dim I As Integer
 
   For I = 2014 To 2030
-    Print I;; Date.Eastern(I)
+    Print I;; Date.EasterDay(I)
   Next
 
 End

gb.gtk/src/opengl/gb.gtk.opengl.component

@@ -3,4 +3,4 @@ Author=Benoît Minisini
 Require=gb.gtk,gb.opengl
 Type=Form
 Implement=OpenGLViewer
-State=NotFinished
+State=Stable

gb.httpd/src/gb.httpd.component

@@ -1,3 +1,3 @@
 [Component]
 Author=Benoît Minisini
-State=NotFinished
+State=Stable

gb.libxml/src/gb.libxml.component

@@ -1,12 +1,7 @@
 [Component]
 Key=gb.xml
-Name=XML tools based on libxml
-Name[es]=Herramientas XML basadas en libxml 
-Name[pl]=Narzędzia XML bazujące na libxml 
-Name[fr]=Outils XML basés sur libxml
-Name[tr]=libxml tabanlı XML araçları
 Author=Daniel Campos Fernández
-State=1
+State=Deprecated
 Implements=XML
 
 

gb.media/src/gb.media.component

@@ -1,4 +1,4 @@
 [Component]
 Author=Benoît Minisini
-State=NotFinished
+State=Stable
 Require=gb.image

gb.mime/src/gb.mime.component

@@ -1,3 +1,3 @@
 [Component]
 Author=Benoît Minisini
-State=NotFinished
+State=Stable

gb.opengl/src/gb.opengl.component

@@ -3,4 +3,4 @@ Key=gb.opengl
 Author=Laurent Carlier
 Need=OpenGLViewer
 Requires=gb.image
-State=1
+State=Stable

gb.opengl/src/glsl/gb.opengl.glsl.component

@@ -3,4 +3,4 @@ Key=gb.opengl.glsl
 Author=Laurent Carlier
 Need=OpenGLViewer
 Require=gb.opengl
-State=1
+State=Stable

gb.opengl/src/glu/gb.opengl.glu.component

@@ -3,4 +3,4 @@ Key=gb.opengl.glu
 Author=Laurent Carlier
 Need=OpenGLViewer
 Requires=gb.opengl
-State=1
+State=Stable

gb.opengl/src/sge/gb.opengl.sge.component

@@ -1,3 +1,3 @@
 [Component]
-Author=
-Alpha=1
+Author=Benoît Minisini
+State=Stable

gb.pdf/src/gb.pdf.component

@@ -1,12 +1,8 @@
 [Component]
 Key=gb.pdf
-Name=PDF renderer component based on Poppler library
-Name[fr]=Composant de rendu PDF basé sur la bibliothèque Poppler
-Name[es]= Componente para renderizado PDF basado en la librer<65> Poppler
-Name[tr]=Poppler kitaplığı tabanlı PDF karıştırıcı bileşeni
 Author=Daniel Campos Fernández,Benoît Minisini,Ian Haywood
 Requires=gb.image
-State=1
+State=Stable
 
 
 

gb.qt4/src/opengl/gb.qt4.opengl.component

@@ -3,4 +3,4 @@ Author=Laurent Carlier,Benoît Minisini
 Require=gb.qt4,gb.opengl
 Type=Form
 Implement=OpenGLViewer
-State=NotFinished
+State=Stable

gb.qt4/src/webkit/ccookiejar.cpp

@@ -151,7 +151,7 @@ BEGIN_METHOD_VOID(Cookie_free)
 
 END_METHOD
 
-GB_DESC CCookieDesc[] =
+GB_DESC CookieDesc[] =
 {
   GB_DECLARE("Cookie", sizeof(CCOOKIE)),
   

gb.qt4/src/webkit/ccookiejar.h

@@ -32,7 +32,7 @@
 
 #ifndef __CCOOKIEJAR_CPP
 
-extern GB_DESC CCookieDesc[];
+extern GB_DESC CookieDesc[];
 //extern GB_DESC CCookieJarDesc[];
 
 #else

gb.qt4/src/webkit/cwebdownload.cpp

@@ -163,7 +163,7 @@ BEGIN_METHOD_VOID(WebDownload_free)
 
 END_METHOD
 
-GB_DESC CWebDownloadDesc[] =
+GB_DESC WebDownloadDesc[] =
 {
   GB_DECLARE("WebDownload", sizeof(CWEBDOWNLOAD)),
   
@@ -241,7 +241,7 @@ BEGIN_METHOD_VOID(WebDownloads_exit)
 
 END_METHOD
 
-GB_DESC CWebDownloadsDesc[] =
+GB_DESC WebDownloadsDesc[] =
 {
   GB_DECLARE("WebDownloads", 0), GB_VIRTUAL_CLASS(),
 	

gb.qt4/src/webkit/cwebdownload.h

@@ -31,8 +31,8 @@
 
 #ifndef __CWEBDOWNLOAD_CPP
 
-extern GB_DESC CWebDownloadDesc[];
-extern GB_DESC CWebDownloadsDesc[];
+extern GB_DESC WebDownloadDesc[];
+extern GB_DESC WebDownloadsDesc[];
 
 #else
 

gb.qt4/src/webkit/cwebframe.cpp

@@ -144,7 +144,7 @@ END_PROPERTY
 
 //---------------------------------------------------------------------------
 
-GB_DESC CWebFrameChildrenDesc[] =
+GB_DESC WebFrameChildrenDesc[] =
 {
   GB_DECLARE(".WebFrame.Children", sizeof(CWEBFRAME)), GB_VIRTUAL_CLASS(),
 	
@@ -154,7 +154,7 @@ GB_DESC CWebFrameChildrenDesc[] =
 	GB_END_DECLARE
 };
 
-GB_DESC CWebFrameDesc[] =
+GB_DESC WebFrameDesc[] =
 {
   GB_DECLARE("WebFrame", sizeof(CWEBFRAME)),
 	

gb.qt4/src/webkit/cwebframe.h

@@ -32,8 +32,8 @@
 
 #ifndef __CWEBFRAME_CPP
 
-extern GB_DESC CWebFrameChildrenDesc[];
-extern GB_DESC CWebFrameDesc[];
+extern GB_DESC WebFrameChildrenDesc[];
+extern GB_DESC WebFrameDesc[];
 
 #else
 

gb.qt4/src/webkit/cwebhittest.cpp

@@ -89,7 +89,7 @@ BEGIN_PROPERTY(WebHitTest_Element)
 
 END_PROPERTY
 
-GB_DESC CWebHitTestDesc[] =
+GB_DESC WebHitTestDesc[] =
 {
   GB_DECLARE("WebHitTest", sizeof(CWEBHITTEST)), GB_NOT_CREATABLE(),
   

gb.qt4/src/webkit/cwebhittest.h

@@ -32,8 +32,7 @@
 
 #ifndef __CWEBHITTEST_CPP
 
-extern GB_DESC CWebHitTestDesc[];
-//extern GB_DESC CCookieJarDesc[];
+extern GB_DESC WebHitTestDesc[];
 
 #else
 

gb.qt4/src/webkit/cwebsettings.cpp

@@ -380,7 +380,7 @@ END_PROPERTY
 
 /***************************************************************************/
 
-GB_DESC CWebViewSettingsDesc[] =
+GB_DESC WebViewSettingsDesc[] =
 {
   GB_DECLARE(".WebView.Settings", 0),
 	
@@ -391,7 +391,7 @@ GB_DESC CWebViewSettingsDesc[] =
 	GB_END_DECLARE
 };
 
-GB_DESC CWebSettingsFontsDesc[] =
+GB_DESC WebSettingsFontsDesc[] =
 {
 	GB_DECLARE(".WebSettings.Fonts", 0), GB_VIRTUAL_CLASS(),
 
@@ -410,7 +410,7 @@ GB_DESC CWebSettingsFontsDesc[] =
 	GB_END_DECLARE
 };
 
-GB_DESC CWebSettingsIconDatabaseDesc[] =
+GB_DESC WebSettingsIconDatabaseDesc[] =
 {
   GB_DECLARE(".WebSettings.IconDatabase", 0), GB_VIRTUAL_CLASS(),
 	
@@ -421,7 +421,7 @@ GB_DESC CWebSettingsIconDatabaseDesc[] =
 	GB_END_DECLARE
 };
 
-GB_DESC CWebSettingsCacheDesc[] =
+GB_DESC WebSettingsCacheDesc[] =
 {
   GB_DECLARE(".WebSettings.Cache", 0), GB_VIRTUAL_CLASS(),
 	
@@ -432,7 +432,7 @@ GB_DESC CWebSettingsCacheDesc[] =
 	GB_END_DECLARE
 };
 
-GB_DESC CWebSettingsProxyDesc[] =
+GB_DESC WebSettingsProxyDesc[] =
 {
   GB_DECLARE(".WebSettings.Proxy", 0), GB_VIRTUAL_CLASS(),
 	
@@ -445,7 +445,7 @@ GB_DESC CWebSettingsProxyDesc[] =
 	GB_END_DECLARE
 };
 
-GB_DESC CWebSettingsDesc[] =
+GB_DESC WebSettingsDesc[] =
 {
   GB_DECLARE("WebSettings", 0),
 	

gb.qt4/src/webkit/cwebsettings.h

@@ -32,12 +32,12 @@
 
 #ifndef __CWEBSETTINGS_CPP
 
-extern GB_DESC CWebViewSettingsDesc[];
-extern GB_DESC CWebSettingsFontsDesc[];
-extern GB_DESC CWebSettingsIconDatabaseDesc[];
-extern GB_DESC CWebSettingsCacheDesc[];
-extern GB_DESC CWebSettingsProxyDesc[];
-extern GB_DESC CWebSettingsDesc[];
+extern GB_DESC WebViewSettingsDesc[];
+extern GB_DESC WebSettingsFontsDesc[];
+extern GB_DESC WebSettingsIconDatabaseDesc[];
+extern GB_DESC WebSettingsCacheDesc[];
+extern GB_DESC WebSettingsProxyDesc[];
+extern GB_DESC WebSettingsDesc[];
 
 #else
 

gb.qt4/src/webkit/cwebview.cpp

@@ -58,6 +58,9 @@ DECLARE_EVENT(EVENT_NEW_FRAME);
 DECLARE_EVENT(EVENT_AUTH);
 DECLARE_EVENT(EVENT_DOWNLOAD);
 
+#define HISTORY (WIDGET->history())
+
+
 static QNetworkAccessManager *_network_access_manager = 0;
 static CWEBVIEW *_network_access_manager_view = 0;
 static QT_COLOR_FUNC _old_after_set_color;
@@ -188,6 +191,8 @@ static void after_set_color(void *_object)
 	}
 }
 
+//-------------------------------------------------------------------------
+
 BEGIN_METHOD(WebView_new, GB_OBJECT parent)
 
   MyWebView *wid = new MyWebView(QT.GetContainer(VARG(parent)));
@@ -579,11 +584,59 @@ BEGIN_PROPERTY(WebView_Document)
 
 END_PROPERTY
 
-/***************************************************************************/
+//-------------------------------------------------------------------------
 
-GB_DESC CWebViewAuthDesc[] =
+BEGIN_PROPERTY(WebViewHistory_Count)
+
+	GB.ReturnInteger(HISTORY->count());
+
+END_PROPERTY
+
+BEGIN_PROPERTY(WebViewHistory_Max)
+
+	GB.ReturnInteger(HISTORY->count() - 1);
+
+END_PROPERTY
+
+BEGIN_PROPERTY(WebViewHistory_Index)
+
+	if (READ_PROPERTY)
+		GB.ReturnInteger(HISTORY->currentItemIndex());
+	else
+	{
+		int index = VPROP(GB_INTEGER);
+		if (index < 0 || index >= HISTORY->count())
+		{
+			GB.Error(GB_ERR_ARG);
+			return;
+		}
+		HISTORY->goToItem(HISTORY->itemAt(index));
+	}
+
+END_PROPERTY
+
+BEGIN_PROPERTY(WebViewHistory_MaxSize)
+
+	if (READ_PROPERTY)
+		GB.ReturnInteger(HISTORY->maximumItemCount());
+	else
+		HISTORY->setMaximumItemCount(VPROP(GB_INTEGER));
+
+END_PROPERTY
+
+BEGIN_METHOD_VOID(WebViewHistory_Clear)
+
+	int max = HISTORY->maximumItemCount();
+	HISTORY->setMaximumItemCount(0);
+	HISTORY->setMaximumItemCount(max);
+
+END_METHOD
+
+//-------------------------------------------------------------------------
+
+GB_DESC WebViewAuthDesc[] =
 {
-  GB_DECLARE(".WebView.Auth", sizeof(CWEBVIEW)), GB_VIRTUAL_CLASS(),
+  GB_DECLARE_VIRTUAL(".WebView.Auth"),
 	
 	GB_PROPERTY_READ("Url", "s", WebViewAuth_Url),
 	GB_PROPERTY_READ("Realm", "s", WebViewAuth_Realm),
@@ -593,7 +646,20 @@ GB_DESC CWebViewAuthDesc[] =
 	GB_END_DECLARE
 };
 
-GB_DESC CWebViewDesc[] =
+GB_DESC WebViewHistoryDesc[] =
+{
+	GB_DECLARE_VIRTUAL(".WebView.History"),
+
+	GB_PROPERTY_READ("Count", "i", WebViewHistory_Count),
+	GB_PROPERTY_READ("Max", "i", WebViewHistory_Max),
+	GB_PROPERTY("Index", "i", WebViewHistory_Index),
+	GB_PROPERTY("MaxSize", "i", WebViewHistory_MaxSize),
+	GB_METHOD("Clear", NULL, WebViewHistory_Clear, NULL),
+
+	GB_END_DECLARE
+};
+
+GB_DESC WebViewDesc[] =
 {
   GB_DECLARE("WebView", sizeof(CWEBVIEW)), GB_INHERITS("Control"),
 	
@@ -624,12 +690,13 @@ GB_DESC CWebViewDesc[] =
 	
 	GB_PROPERTY_SELF("Settings", ".WebView.Settings"),
 	GB_PROPERTY_SELF("Auth", ".WebView.Auth"),
+	GB_PROPERTY_SELF("History", ".WebView.History"),
 
 	GB_METHOD("Back", NULL, WebView_Back, NULL),
 	GB_METHOD("Forward", NULL, WebView_Forward, NULL),
 	GB_METHOD("Reload", NULL, WebView_Reload, "[(BypassCache)b]"),
 	GB_METHOD("Stop", NULL, WebView_Stop, NULL),
-	
+
 	GB_PROPERTY("NewView", "WebView", WebView_NewView),
 
 	GB_PROPERTY("Cookies", "Cookie[]", WebView_Cookies),

gb.qt4/src/webkit/cwebview.h

@@ -37,9 +37,10 @@
 
 #ifndef __CWEBVIEW_CPP
 
-extern GB_DESC CWebViewAuthDesc[];
-extern GB_DESC CWebViewDesc[];
-extern GB_DESC CWebViewDownloadsDesc[];
+extern GB_DESC WebViewAuthDesc[];
+extern GB_DESC WebViewHistoryDesc[];
+extern GB_DESC WebViewDownloadsDesc[];
+extern GB_DESC WebViewDesc[];
 
 #else
 

gb.qt4/src/webkit/gb.qt4.webkit.component

@@ -3,7 +3,7 @@ Key=gb.qt4.webkit
 Author=Benoît Minisini
 Type=Form
 Require=gb.qt4
-State=NotFinished
+State=Stable
 
 [Form]
 Control=WebView

gb.qt4/src/webkit/main.cpp

@@ -48,22 +48,23 @@ QT_INTERFACE QT;
 
 GB_DESC *GB_CLASSES[] EXPORT =
 {
-	CWebDownloadDesc,
-	CWebDownloadsDesc,
-	CWebHitTestDesc,
-	CCookieDesc,
-	CWebSettingsIconDatabaseDesc,
-	CWebSettingsCacheDesc,
-	CWebSettingsFontsDesc,
-	CWebSettingsProxyDesc,
-	CWebSettingsDesc,
+	WebDownloadDesc,
+	WebDownloadsDesc,
+	WebHitTestDesc,
+	CookieDesc,
+	WebSettingsIconDatabaseDesc,
+	WebSettingsCacheDesc,
+	WebSettingsFontsDesc,
+	WebSettingsProxyDesc,
+	WebSettingsDesc,
 	WebElementStyleDesc,
 	WebElementDesc,
-	CWebFrameChildrenDesc,
-	CWebFrameDesc,
-	CWebViewSettingsDesc,
-  CWebViewAuthDesc,
-	CWebViewDesc,
+	WebFrameChildrenDesc,
+	WebFrameDesc,
+	WebViewSettingsDesc,
+  WebViewAuthDesc,
+	WebViewHistoryDesc,
+	WebViewDesc,
   NULL
 };
 

gb.xml/src/gb.xml.component

@@ -1,5 +1,5 @@
 [Component]
 Key=gb.xml
 Author=Adrien Prokopowicz
-State=1
+State=Stable
 Implements=XML

gb.xml/src/html/gb.xml.html.component

@@ -1,5 +1,5 @@
 [Component]
 Key=gb.xml.html
 Author=Adrien Prokopowicz
-State=1
+State=Stable
 Require=gb.xml

gb.xml/src/xslt/gb.xml.xslt.component

@@ -1,11 +1,6 @@
 [Component]
 Key=gb.xml.xslt
-Name=XSLT tools based on libxslt
-Name[es]=Herramientas XSLT basadas en libxslt 
-Name[pl]=Narzędzia XSLT bazujące na libxslt
-Name[fr]=Outils XSLT basés sur libxslt
-Name[tr]=libxslt tabanlı XSLT araçları
 Author=Daniel Campos Fernández
 Require=gb.xml
-State=1
+State=Stable
 

main/lib/inotify/gb.inotify.component

@@ -1,3 +1,3 @@
 [Component]
 Author=Tobias Boege
-State=Unstable
+State=Stable