[Gambas-devel-svn] SF.net SVN: gambas:[1456] gambas/trunk/app/src/gambas3

[<ga...@us...>]

Revision: 1456
          http://gambas.svn.sourceforge.net/gambas/?rev=1456&view=rev
Author:   gambas
Date:     2008-07-17 10:35:49 +0000 (Thu, 17 Jul 2008)

Log Message:
-----------
[DEVELOPMENT ENVIRONMENT]
* NEW: Display subversion revision in the About dialog.

Modified Paths:
--------------
    gambas/trunk/app/src/gambas3/FAbout.form
    gambas/trunk/app/src/gambas3/FWelcome.class
    gambas/trunk/app/src/gambas3/FWelcome.form
    gambas/trunk/app/src/gambas3/Project.module
    gambas/trunk/app/src/gambas3/VersionControl.module

Modified: gambas/trunk/app/src/gambas3/FAbout.form
===================================================================
--- gambas/trunk/app/src/gambas3/FAbout.form	2008-07-17 10:34:09 UTC (rev 1455)
+++ gambas/trunk/app/src/gambas3/FAbout.form	2008-07-17 10:35:49 UTC (rev 1456)
@@ -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&

Modified: gambas/trunk/app/src/gambas3/FWelcome.class
===================================================================
--- gambas/trunk/app/src/gambas3/FWelcome.class	2008-07-17 10:34:09 UTC (rev 1455)
+++ gambas/trunk/app/src/gambas3/FWelcome.class	2008-07-17 10:35:49 UTC (rev 1456)
@@ -56,7 +56,7 @@
   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

Modified: gambas/trunk/app/src/gambas3/FWelcome.form
===================================================================
--- gambas/trunk/app/src/gambas3/FWelcome.form	2008-07-17 10:34:09 UTC (rev 1455)
+++ gambas/trunk/app/src/gambas3/FWelcome.form	2008-07-17 10:35:49 UTC (rev 1456)
@@ -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&

Modified: gambas/trunk/app/src/gambas3/Project.module
===================================================================
--- gambas/trunk/app/src/gambas3/Project.module	2008-07-17 10:34:09 UTC (rev 1455)
+++ gambas/trunk/app/src/gambas3/Project.module	2008-07-17 10:35:49 UTC (rev 1456)
@@ -214,6 +214,9 @@
   aVer.Remove(aVer.Max)
   Version = aVer.Join(".")
   
+  sVer = VersionControl.GetVersion(Application.Path)
+  If sVer Then Version &= " (r" & sVer & ")"
+  
 Catch 
 
   Version = "?"

Modified: gambas/trunk/app/src/gambas3/VersionControl.module
===================================================================
--- gambas/trunk/app/src/gambas3/VersionControl.module	2008-07-17 10:34:09 UTC (rev 1455)
+++ gambas/trunk/app/src/gambas3/VersionControl.module	2008-07-17 10:35:49 UTC (rev 1456)
@@ -254,3 +254,16 @@
   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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.