app/src/gambas3/.src/Editor/Version/FProjectVersion.class

@@ -18,13 +18,12 @@ End
 Public Sub Form_Open()
   
   ReadConfig
-  'Reload
   
 End
 
-Public Sub Reload()
+Public Sub Reload(Optional bForce As Boolean)
   
-  If Project.TimeStamp = $iTimeStamp Then Return
+  If Project.TimeStamp = $iTimeStamp And If Not bForce Then Return
   
   $iTimeStamp = Project.TimeStamp
   
@@ -62,9 +61,15 @@ Public Sub UpdateWorkspaceButtons(bShowSpace As Boolean)
   
 End
 
-Public Sub btnWorkspace_Click()
+Private Sub SaveLastCommitLog()
   
   Project.Config["/FProjectVersion/LastCommit"] = RTrim(GetChanges())
+  
+End
+
+Public Sub btnWorkspace_Click()
+  
+  SaveLastCommitLog()
   edtHistory.StopFillWithHistory()
   FMain.CloseCurrentWorkspace
   
@@ -73,8 +78,7 @@ End
 Public Sub OnProjectChange()
   
   If Project.Dir <> Project.PreviousDir Then
-    $iTimeStamp = -1
-    Reload()
+    Reload(True)
     trmVersionControl.Clear()
   Endif
   
@@ -111,6 +115,7 @@ Public Sub tabVersion_Click()
         
         InitEditor(edtJournal)
         InitEditor(edtDiff)
+        panNothing.Background = edtJournal.Background
         
         edtJournal.Text = RTrim(Project.Config["/FProjectVersion/LastCommit"]) & "\n\n" & VersionControl.GetDefaultJournal()
         edtJournal.Goto(0, 0)
@@ -277,16 +282,20 @@ Private Sub LoadDiff()
       edtDiff.Text = sDiff
       panDiff.Show
       panNothing.Hide
+      btnRevert.Show
+      edtDiff.Show
     Else
       edtDiff.Text = "-"
       panDiff.Hide
       panNothing.Show
+      btnRevert.Hide
+      edtDiff.Hide
     Endif
     
-    edtJournal.Enabled = panDiff.Visible
+    edtJournal.ReadOnly = Not panDiff.Visible
+    edtJournal.ShowCurrent = panDiff.Visible
+    edtJournal.ShowCursor = panDiff.Visible
     
-    'tabVersion[0].Enabled = edtDiff.Visible
-  
     Dec Application.Busy
     
   Endif
@@ -333,6 +342,8 @@ Private Sub DoCommit()
   Dim bCommit As Boolean
   Dim bPush As Boolean
   
+  SaveLastCommitLog()
+  
   If Last = btnCommit Or If Last = btnCommitPush Then bCommit = True
   If Last = btnCommitPush Or If Last = btnPush Then bPush = True
   
@@ -357,7 +368,9 @@ Private Sub DoCommit()
     VersionControl.Commit(sChange, Not bPush)
     tabVersion.Index = 1
     
-  Endif  
+  Endif 
+  
+  Reload(True)
   
 End
 
@@ -408,3 +421,9 @@ Public Sub btnRevert_Click()
   VersionControl.Revert()
 
 End
+
+Public Sub edtDiff_GotFocus()
+
+  edtJournal.SetFocus()
+
+End

app/src/gambas3/.src/Editor/Version/FProjectVersion.form

@@ -103,34 +103,14 @@
       Expand = True
       Arrangement = Arrange.Vertical
       { Panel1 VBox
-        MoveScaled(6,3,113,30)
+        MoveScaled(6,2,113,39)
         { tlbCommit ToolBar
-          MoveScaled(1,1,118,4)
+          MoveScaled(8,1,83,4)
           Key = "commit"
           ReadOnly = True
           Separator = True
-          { panNothing Panel
-            MoveScaled(1,0,35,4)
-            Visible = False
-            Arrangement = Arrange.Horizontal
-            AutoResize = True
-            { PictureBox1 PictureBox
-              MoveScaled(0,0,4,4)
-              Picture = Picture.Load("icon:/small/info")
-              Alignment = Align.Center
-            }
-            { lblNothingToCommit Label
-              MoveScaled(4,0,28,4)
-              Font = Font["Bold"]
-              AutoResize = True
-              Text = ("There is nothing to commit.")
-            }
-            { Panel2 Panel
-              MoveScaled(33,0,1,4)
-            }
-          }
           { btnCommit ToolButton
-            MoveScaled(39,0,13,4)
+            MoveScaled(1,0,13,4)
             Action = ".vc-commit"
             AutoResize = True
             Text = ("Commit")
@@ -138,7 +118,7 @@
           }
           { btnCommitPush ToolButton btnCommit
             Name = "btnCommitPush"
-            MoveScaled(53,0,21,4)
+            MoveScaled(15,0,21,4)
             Action = ".vc-commit-push"
             AutoResize = True
             Text = ("Commit and push") & "..."
@@ -146,22 +126,35 @@
           }
           { btnPush ToolButton btnCommit
             Name = "btnPush"
-            MoveScaled(76,0,11,4)
+            MoveScaled(38,0,11,4)
             Action = ".vc-push"
             AutoResize = True
             Text = ("Push") & "..."
             Picture = Picture["icon:/small/upload"]
           }
           { btnRevert ToolButton
-            MoveScaled(87,0,18,4)
+            MoveScaled(49,0,18,4)
             Action = ".vc-revert"
             AutoResize = True
             Text = Shortcut(("Undo changes"), "U")
             Picture = Picture["icon:/small/undo"]
           }
         }
+        { panNothing Panel
+          MoveScaled(3,12,89,6)
+          Background = Color.TextBackground
+          Arrangement = Arrange.Fill
+          Margin = True
+          { Label1 Label
+            MoveScaled(1,1,79,4)
+            Font = Font["+4,Bold"]
+            Foreground = Color.LightForeground
+            Expand = True
+            Text = ("There is nothing to commit.")
+          }
+        }
         { edtJournal TextEditor
-          MoveScaled(3,9,38,14)
+          MoveScaled(3,22,38,14)
           Expand = True
           Border = False
         }

app/src/gambas3/.src/VersionControl/CVersionControlGit.class

@@ -561,8 +561,8 @@ End
 
 Public Sub GetIdentity(ByRef sName As String, ByRef sEmail As String)
   
-  Try sName = RunShell("git config user.name")
-  Try sEmail = RunShell("git config user.email")
+  Try sName = Trim(RunShell("git config user.name"))
+  Try sEmail = Trim(RunShell("git config user.email"))
   
 End