diff --git a/app/src/gambas3/FAbout.form b/app/src/gambas3/FAbout.form index d905ee1c8..03720ebe7 100644 --- a/app/src/gambas3/FAbout.form +++ b/app/src/gambas3/FAbout.form @@ -103,7 +103,7 @@ Alignment = Align.TopNormal } { lblVersion Label - MoveScaled(32,0,14,7) + MoveScaled(32,0,25,7) Font = Font["Bold,+6"] Background = Color.SelectedBackground Foreground = &H9FCFFF& diff --git a/app/src/gambas3/FWelcome.class b/app/src/gambas3/FWelcome.class index ea4cebe42..3881b9a50 100644 --- a/app/src/gambas3/FWelcome.class +++ b/app/src/gambas3/FWelcome.class @@ -56,7 +56,7 @@ Public Sub Form_Open() chkSortRecent.Value = Settings["/FWelcome/SortRecent", False] FillRecent - lblVersion.Text = Project.Version 'Subst(("version &1"), Project.Version) + lblVersion.Text = Project.Version lblVersion.Move(lblGambas.X + lblGambas.Font.Width(lblGambas.Text) + 4, lblGambas.Y) If Project.GetRecentFiles().Count Then diff --git a/app/src/gambas3/FWelcome.form b/app/src/gambas3/FWelcome.form index ddabf4093..bfcd70971 100644 --- a/app/src/gambas3/FWelcome.form +++ b/app/src/gambas3/FWelcome.form @@ -1,7 +1,7 @@ # Gambas Form File 3.0 { Form Form - MoveScaled(0,2,69,66) + MoveScaled(0,2,76,69) Background = Color.TextBackground Foreground = Color.TextForeground Text = ("Welcome to Gambas 3") @@ -28,7 +28,7 @@ Alignment = Align.TopNormal } { lblVersion Label - MoveScaled(29,1,13,5) + MoveScaled(29,1,27,5) Font = Font["Bold,+6"] Background = Color.SelectedBackground Foreground = &H9FCFFF& diff --git a/app/src/gambas3/Project.module b/app/src/gambas3/Project.module index fd1cf3c6b..80b6568a7 100644 --- a/app/src/gambas3/Project.module +++ b/app/src/gambas3/Project.module @@ -214,6 +214,9 @@ Private Sub InitVersion() aVer.Remove(aVer.Max) Version = aVer.Join(".") + sVer = VersionControl.GetVersion(Application.Path) + If sVer Then Version &= " (r" & sVer & ")" + Catch Version = "?" diff --git a/app/src/gambas3/VersionControl.module b/app/src/gambas3/VersionControl.module index 6fa63ff3f..380dae399 100644 --- a/app/src/gambas3/VersionControl.module +++ b/app/src/gambas3/VersionControl.module @@ -254,3 +254,16 @@ Public Sub HasConflict() As Boolean Endif End + + +Public Sub GetVersion(sDir As String) As String + + Dim sRes As String + + If Exist(sDir &/ ".svn") Then + Shell "cd " & Quote.Shell(sDir) & "; LC_ALL=C svn info" To sRes + Try sRes = Scan(sRes, "*\nRevision: *\n*")[1] + Return sRes + Endif + +End