app/src/gambas3/.src/VersionControl/FBranchList.class

@@ -9,6 +9,8 @@ Private $aBranches As String[]
 
 Public Sub Init()
 
+  txtFilter.H = FMain.GetTabBarHeight()
+
   $sBranch = ""
   $aBranches = VersionControl.GetBranches(ByRef $sCurrent)
   
@@ -85,3 +87,9 @@ Public Sub lstBranch_GotFocus()
   txtFilter.SetFocus
 
 End
+
+Public Sub txtFilter_Click()
+
+  lstBranch_Activate
+
+End

app/src/gambas3/.src/VersionControl/FBranchList.form

@@ -6,11 +6,11 @@
   Resizable = False
   Arrangement = Arrange.Vertical
   { txtFilter ButtonBox
-    MoveScaled(2,1,34,3)
+    MoveScaled(2,1,34,4)
     Foreground = Color.LightForeground
+    Picture = Picture["icon:/small/ok"]
     Placeholder = ("Enter a filter")
     Border = False
-    Button = False
     ClearButton = True
     Filter = True
     FilterPicture = Picture["icon:/large/version-control"]

app/src/gambas3/.src/VersionControl/VersionControl.module

@@ -685,11 +685,22 @@ Private Function DoNotPush_Read() As Boolean
 
 End
 
+Private Sub RevertNotImportantFiles()
+
+  Dim sFile As String
+
+  For Each sFile In [".icon.png", ".gitignore"]
+    $hVC.Revert(Project.Dir &/ sFile)
+  Next
+
+End
+
 Public Sub SetBranch(sBranch As String)
 
   Dim sCurrent As String
 
-  Inc Application.Busy  
+  Inc Application.Busy
+  RevertNotImportantFiles()
   $hVC.SetBranch(sBranch)
   $sCurrentBranch = ""
   sCurrent = GetCurrentBranch()

comp/src/gb.db.form/.hidden/database.png

+../../gb.form.stock/gambas-thin/128/database.png
\ No newline at end of file

comp/src/gb.db.form/.project

 # Gambas Project File 3.0
 Title=Data bound controls
 Startup=FMain2
-Icon=.hidden/icon.png
+Icon=.hidden/database.png
 Version=3.18.90
 VersionFile=1
 Component=gb.image

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

 # Gambas Project File 3.0
 Title=Text editor with syntax highlighting
-Startup=FTestBruce
+Startup=FTestEditor
 Icon=.hidden/control/texteditor.png
 Version=3.18.90
 VersionFile=1
@@ -10,6 +10,7 @@ Component=gb.form
 Component=gb.util
 Component=gb.pcre
 Component=gb.highlight
+Component=gb.gui.webview
 TabSize=2
 Translate=1
 Language=en_US

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

@@ -17,6 +17,7 @@ Property EndOfLine As Integer
 Property CloseBraces As Boolean
 Property CloseStrings As Boolean
 Property Read DiffMode As Boolean
+Property CanRewrite As Boolean Use $bCanRewrite = True
 
 Public Const ROW_NOT_FOUND As Integer = -2
 
@@ -956,7 +957,7 @@ Private Sub StartHighlight() As Boolean
   
   $bHighlighting = True
 
-  $hHighlight.CanRewrite = True '_Mode.Name
+  $hHighlight.CanRewrite = $bCanRewrite
   
   If Not $bHighlightAll And If $hHighlight.CanRewrite Then
     For Each hView In GetAllViews()
@@ -1671,5 +1672,3 @@ Private Function DiffMode_Read() As Boolean
   Return DiffRemoved
 
 End
-
-

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

@@ -4,7 +4,7 @@ Export
 
 Inherits UserControl
 
-Public Const _Properties As String = "*,Border=True,ShowPreview,ScrollBar{Scroll.*}=Both,Highlight{None;Custom;C;CPlusPlus;CSS;Diff;Gambas;HTML;JavaScript;SQL;WebPage;Sh}=None,Mode{None;Custom;C;CPlusPlus;CSS;Diff;Gambas;HTML;JavaScript;SQL;WebPage;Sh}=None,ReadOnly,TabSize{Range:2;64}=2,TabIndent,Wrap,ShowPosition,ShowLimit,ShowCurrent,ShowLineNumber,ShowModified,ShowBraces,ShowIcon,ShowExpand,ShowCursor=True,ShowSpaces,ShowIndent,CloseBraces,CloseStrings"
+Public Const _Properties As String = "*,Border=True,ShowPreview,ScrollBar{Scroll.*}=Both,Highlight{None;Custom;C;CPlusPlus;CSS;Diff;Gambas;HTML;JavaScript;SQL;WebPage;Sh}=None,Mode{None;Custom;C;CPlusPlus;CSS;Diff;Gambas;HTML;JavaScript;SQL;WebPage;Sh}=None,Rewrite=True,ReadOnly,TabSize{Range:2;64}=2,TabIndent,Wrap,ShowPosition,ShowLimit,ShowCurrent,ShowLineNumber,ShowModified,ShowBraces,ShowIcon,ShowExpand,ShowCursor=True,ShowSpaces,ShowIndent,CloseBraces,CloseStrings"
 Public Const _DrawWith As String = "-"
 Public Const _DefaultEvent As String = "Change"
 Public Const _Similar As String = "TextArea"
@@ -294,6 +294,14 @@ Property CloseStrings As Boolean
 
 Property Theme As TextHighlighterTheme
 
+'' @{since 3.19}
+''
+'' Return or set if the highlighter can rewrite the highlighted contents.
+''
+'' This property is TRUE by default.
+
+Property Rewrite As Boolean
+
 Private Const MATCH_STRING As String = "()[]{}"
 
 Static Private $cShortcut As Collection
@@ -6284,9 +6292,11 @@ Public Sub SideBar_MouseMove()
       iCurLine = _ViewToReal(Min(Max(0, Floor((Mouse.Y - $iMD) / $fBarLineHeight)), iCount))
       $hSideBarViewer.GotoCenter(0, iCurLine)
       X = IIf(Me.RightToLeft, $hSideBar.Left + $hSideBar.Width, $hSideBar.Left - $hView.Width / 2)
-      $hSideBarViewer.Move(X, Min(Max(1, Mouse.Y - ($hView.Height / 5) / 2), $hSideBar.Height - $hSideBarViewer.Height))
-      $hSideBarViewer.Raise
-      $hSideBarViewer.Show
+      $hSideBarViewer.Move(X, Min(Max(1, Mouse.Y - $hSideBarViewer.Height / 2), $hSideBar.Height - $hSideBarViewer.Height))
+      If Not $hSideBarViewer.Visible Then
+        $hSideBarViewer.Raise
+        $hSideBarViewer.Show
+      Endif
       
   End Select
 
@@ -7060,3 +7070,15 @@ Public Sub mnuFind_Click()
   ShowFindPanel
   
 End
+
+Private Function Rewrite_Read() As Boolean
+
+  Return $hDoc.CanRewrite
+
+End
+
+Private Sub Rewrite_Write(Value As Boolean)
+
+  $hDoc.CanRewrite = Value
+
+End

comp/src/gb.form.editor/.src/test/FTestEditor.class

@@ -60,6 +60,8 @@ Public Sub Form_Open()
   
   'Image.Debug = True
   
+  WebView1.Url = "https://gambaswiki.org"
+  
   Reload
   'TextEditor1.Mode = "gambas"
   'TextEditor1.Load("~/asap/omogen/git/master/gambas/guygle.cgi/.src/GuygleObject.class")

comp/src/gb.form.editor/.src/test/FTestEditor.form

@@ -49,14 +49,14 @@
     }
   }
   { Panel1 Splitter
-    MoveScaled(8,11,76,52)
+    MoveScaled(8,11,105,52)
     Expand = True
-    Arrangement = Arrange.Vertical
     { TextEditor1 TextEditor
-      MoveScaled(14,5,47,33)
+      MoveScaled(5,12,28,33)
       Font = Font["Gambas,12"]
       Background = Color.TextBackground
       Border = False
+      ShowPreview = True
       Mode = "C"
       Wrap = True
       ShowPosition = True
@@ -71,6 +71,13 @@
       CloseBraces = True
       CloseStrings = True
     }
+    { TextArea1 TextArea
+      MoveScaled(36,6,20,33)
+      Border = False
+    }
+    { WebView1 WebView
+      MoveScaled(61,9,38,40)
+    }
   }
   { Timer1 #Timer
     #MoveScaled(48,67)