[Gambas-devel-svn] SF.net SVN: gambas:[1455] gambas/branches/2.0/app/src/gambas2

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

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

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

Modified Paths:
--------------
    gambas/branches/2.0/app/src/gambas2/.lang/.pot
    gambas/branches/2.0/app/src/gambas2/FAbout.form
    gambas/branches/2.0/app/src/gambas2/FWelcome.class
    gambas/branches/2.0/app/src/gambas2/FWelcome.form
    gambas/branches/2.0/app/src/gambas2/Project.module
    gambas/branches/2.0/app/src/gambas2/VersionControl.module

Modified: gambas/branches/2.0/app/src/gambas2/.lang/.pot
===================================================================
--- gambas/branches/2.0/app/src/gambas2/.lang/.pot	2008-07-17 00:16:44 UTC (rev 1454)
+++ gambas/branches/2.0/app/src/gambas2/.lang/.pot	2008-07-17 10:34:09 UTC (rev 1455)
@@ -254,7 +254,7 @@
 #: FGotoLine.class:56 FList.class:167 FMain.class:2395
 #: FMakeExecutable.class:146 FMenu.class:1072 FNewTranslation.class:64
 #: FOpenProject.class:403 FProjectEnv.class:325 FPropertyProject.class:243
-#: FSelectIcon.class:266 FText.class:101 Project.module:2523
+#: FSelectIcon.class:266 FText.class:101 Project.module:2526
 msgid "OK"
 msgstr ""
 
@@ -341,7 +341,7 @@
 #: FNewTranslation.class:70 FOpenProject.class:409 FProjectEnv.class:331
 #: FPropertyProject.class:1149 FSave.class:125 FSelectIcon.class:271
 #: FTextEditor.class:591 FText.class:107 FTranslate.class:548
-#: Project.module:267
+#: Project.module:270
 msgid "Cancel"
 msgstr ""
 
@@ -456,7 +456,7 @@
 "Do you really want to open another file?"
 msgstr ""
 
-#: FConflict.class:255 FOpenProject.class:320 Project.module:267
+#: FConflict.class:255 FOpenProject.class:320 Project.module:270
 msgid "Open"
 msgstr ""
 
@@ -1315,15 +1315,15 @@
 msgid "Gambas project"
 msgstr ""
 
-#: FInfo.class:65 Project.module:1012
+#: FInfo.class:65 Project.module:1015
 msgid "Modules"
 msgstr ""
 
-#: FInfo.class:66 Project.module:1013
+#: FInfo.class:66 Project.module:1016
 msgid "Classes"
 msgstr ""
 
-#: FInfo.class:67 Project.module:1015
+#: FInfo.class:67 Project.module:1018
 msgid "Forms"
 msgstr ""
 
@@ -1708,7 +1708,7 @@
 msgid "Save project"
 msgstr ""
 
-#: FMain.class:2064 Project.module:1639
+#: FMain.class:2064 Project.module:1642
 msgid "Save project as"
 msgstr ""
 
@@ -1853,7 +1853,7 @@
 msgstr ""
 
 #: FMakeInstall.class:278 FPropertyProject.class:1149 FSave.class:118
-#: FTranslate.class:680 Project.module:2174
+#: FTranslate.class:680 Project.module:2177
 msgid "Continue"
 msgstr ""
 
@@ -3170,224 +3170,224 @@
 msgid "Controls"
 msgstr ""
 
-#: Project.module:258
+#: Project.module:261
 msgid "This project does not exist."
 msgstr ""
 
-#: Project.module:267
+#: Project.module:270
 msgid ""
 "This is a Gambas 1.0 project.\n"
 "\n"
 "Do you want to open it anyway?"
 msgstr ""
 
-#: Project.module:273
+#: Project.module:276
 msgid "This is not a Gambas 2 project."
 msgstr ""
 
-#: Project.module:279
+#: Project.module:282
 msgid ""
 "This project seems to be already opened.\n"
 "\n"
 "Opening the same project twice can lead to data loss."
 msgstr ""
 
-#: Project.module:279
+#: Project.module:282
 msgid "Open after all"
 msgstr ""
 
-#: Project.module:279
+#: Project.module:282
 msgid "Do not open"
 msgstr ""
 
-#: Project.module:323
+#: Project.module:326
 msgid "This project is read-only."
 msgstr ""
 
-#: Project.module:331
+#: Project.module:334
 msgid "Cannot open project file :\n"
 msgstr ""
 
-#: Project.module:865
+#: Project.module:868
 msgid "The following classes have circular inheritance:"
 msgstr ""
 
-#: Project.module:1017
+#: Project.module:1020
 msgid "Data"
 msgstr ""
 
-#: Project.module:1040
+#: Project.module:1043
 msgid "read-only"
 msgstr ""
 
-#: Project.module:1106
+#: Project.module:1109
 msgid "Loading &1..."
 msgstr ""
 
-#: Project.module:1154
+#: Project.module:1157
 msgid "Cannot open file."
 msgstr ""
 
-#: Project.module:1223
+#: Project.module:1226
 msgid "File not found!"
 msgstr ""
 
-#: Project.module:1336
+#: Project.module:1339
 msgid "in form definition"
 msgstr ""
 
-#: Project.module:1340
+#: Project.module:1343
 msgid "at line &1 in &2"
 msgstr ""
 
-#: Project.module:1490
+#: Project.module:1493
 msgid ""
 "Some project source files are in conflict.\n"
 "Please solve them if you want to compile the project."
 msgstr ""
 
-#: Project.module:1494
+#: Project.module:1497
 msgid "Compiling project"
 msgstr ""
 
-#: Project.module:1506
+#: Project.module:1509
 msgid "Nothing to do."
 msgstr ""
 
-#: Project.module:1645
+#: Project.module:1648
 msgid "This project already exists."
 msgstr ""
 
-#: Project.module:1658
+#: Project.module:1661
 msgid "Unable to save the project."
 msgstr ""
 
-#: Project.module:1671
+#: Project.module:1674
 msgid "File already exists."
 msgstr ""
 
-#: Project.module:1712
+#: Project.module:1715
 msgid "Cannot copy template file."
 msgstr ""
 
-#: Project.module:1731
+#: Project.module:1734
 msgid "Directory already exists."
 msgstr ""
 
-#: Project.module:1885
+#: Project.module:1888
 msgid "Making executable..."
 msgstr ""
 
-#: Project.module:1927
+#: Project.module:1930
 msgid "Cannot make executable."
 msgstr ""
 
-#: Project.module:2173
+#: Project.module:2176
 msgid "Some components are missing: &1"
 msgstr ""
 
-#: Project.module:2315
+#: Project.module:2318
 msgid "Cannot write project file."
 msgstr ""
 
-#: Project.module:2347
+#: Project.module:2350
 msgid "Unable to create desktop shortcut."
 msgstr ""
 
-#: Project.module:2428
+#: Project.module:2431
 msgid "Unable to install component."
 msgstr ""
 
-#: Project.module:2466
+#: Project.module:2469
 msgid "Unable to uninstall component."
 msgstr ""
 
-#: Project.module:2601
+#: Project.module:2604
 msgid "The directory will be removed at the next commit."
 msgstr ""
 
-#: Project.module:2620
+#: Project.module:2623
 msgid "You must define a startup class or form!"
 msgstr ""
 
-#: Project.module:2647
+#: Project.module:2650
 msgid "Please type a name."
 msgstr ""
 
-#: Project.module:2651
+#: Project.module:2654
 msgid "This name contains a forbidden character:"
 msgstr ""
 
-#: Project.module:2655
+#: Project.module:2658
 msgid "This name is already used. Choose another one."
 msgstr ""
 
-#: Project.module:2685
+#: Project.module:2688
 msgid ""
 "A class name must begin with a letter or an underscore, followed by any "
 "letter or digit."
 msgstr ""
 
-#: Project.module:2865
+#: Project.module:2868
 msgid "Unable to rename '&1'"
 msgstr ""
 
-#: Project.module:2984
+#: Project.module:2987
 msgid "Please type a project name."
 msgstr ""
 
-#: Project.module:2992
+#: Project.module:2995
 msgid "The project name cannot begin with a dot."
 msgstr ""
 
-#: Project.module:2995
+#: Project.module:2998
 msgid "Non-ASCII characters are forbidden in a project name."
 msgstr ""
 
-#: Project.module:2996
+#: Project.module:2999
 msgid ""
 "The following characters are forbidden in a project name: ? * / \\ SPACE"
 msgstr ""
 
-#: Project.module:3006
+#: Project.module:3009
 msgid "The project directory already exists."
 msgstr ""
 
-#: Project.module:3008
+#: Project.module:3011
 msgid ""
 "The project directory cannot be created because a file with the same name "
 "already exists."
 msgstr ""
 
-#: Project.module:3051
+#: Project.module:3054
 msgid "Create source package"
 msgstr ""
 
-#: Project.module:3052
+#: Project.module:3055
 msgid "Source packages"
 msgstr ""
 
-#: Project.module:3295
+#: Project.module:3298
 msgid "Cannot copy file &1."
 msgstr ""
 
-#: Project.module:3307
+#: Project.module:3310
 msgid "Linking a directory is forbidden."
 msgstr ""
 
-#: Project.module:3337
+#: Project.module:3340
 msgid "Cannot create link &1."
 msgstr ""
 
-#: Project.module:3349
+#: Project.module:3352
 msgid "Cannot move a directory inside itself."
 msgstr ""
 
-#: Project.module:3393
+#: Project.module:3396
 msgid "Cannot move file &1."
 msgstr ""
 
-#: Project.module:3924
+#: Project.module:3927
 msgid "modified"
 msgstr ""
 

Modified: gambas/branches/2.0/app/src/gambas2/FAbout.form
===================================================================
--- gambas/branches/2.0/app/src/gambas2/FAbout.form	2008-07-17 00:16:44 UTC (rev 1454)
+++ gambas/branches/2.0/app/src/gambas2/FAbout.form	2008-07-17 10:34:09 UTC (rev 1455)
@@ -92,7 +92,7 @@
         Alignment = Align.TopNormal
       }
       { lblVersion Label
-        MoveScaled(32,0,14,7)
+        MoveScaled(25,0,21,7)
         Font = Font["Bold,+6"]
         Background = Color.SelectedBackground
         Foreground = &H9FCFFF&

Modified: gambas/branches/2.0/app/src/gambas2/FWelcome.class
===================================================================
--- gambas/branches/2.0/app/src/gambas2/FWelcome.class	2008-07-17 00:16:44 UTC (rev 1454)
+++ gambas/branches/2.0/app/src/gambas2/FWelcome.class	2008-07-17 10:34:09 UTC (rev 1455)
@@ -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/branches/2.0/app/src/gambas2/FWelcome.form
===================================================================
--- gambas/branches/2.0/app/src/gambas2/FWelcome.form	2008-07-17 00:16:44 UTC (rev 1454)
+++ gambas/branches/2.0/app/src/gambas2/FWelcome.form	2008-07-17 10:34:09 UTC (rev 1455)
@@ -1,7 +1,7 @@
 # Gambas Form File 2.0
 
 { Form Form
-  MoveScaled(0,2,63,65)
+  MoveScaled(0,2,65,65)
   Background = Color.TextBackground
   Foreground = Color.TextForeground
   Text = ("Welcome to Gambas II")
@@ -28,7 +28,7 @@
         Alignment = Align.TopNormal
       }
       { lblVersion Label
-        MoveScaled(26,1,13,5)
+        MoveScaled(26,1,26,5)
         Font = Font["Bold,+6"]
         Background = Color.SelectedBackground
         Foreground = &H9FCFFF&

Modified: gambas/branches/2.0/app/src/gambas2/Project.module
===================================================================
--- gambas/branches/2.0/app/src/gambas2/Project.module	2008-07-17 00:16:44 UTC (rev 1454)
+++ gambas/branches/2.0/app/src/gambas2/Project.module	2008-07-17 10:34:09 UTC (rev 1455)
@@ -211,6 +211,9 @@
   aVer.Remove(aVer.Max)
   Version = aVer.Join(".")
   
+  sVer = VersionControl.GetVersion(Application.Path)
+  IF sVer THEN Version &= " (r" & sVer & ")"
+
 CATCH 
 
   Version = "?"

Modified: gambas/branches/2.0/app/src/gambas2/VersionControl.module
===================================================================
--- gambas/branches/2.0/app/src/gambas2/VersionControl.module	2008-07-17 00:16:44 UTC (rev 1454)
+++ gambas/branches/2.0/app/src/gambas2/VersionControl.module	2008-07-17 10:34:09 UTC (rev 1455)
@@ -254,3 +254,15 @@
   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.