Browse Source

corrections, ajout des tables

olivier.massot 9 years ago
parent
commit
fa63f99342

+ 88 - 5
source/forms/frm_vcs.bas

@@ -22,11 +22,11 @@ Begin Form
     GridY =10
     Width =8163
     DatasheetFontHeight =11
-    ItemSuffix =18
+    ItemSuffix =20
     Left =3225
     Top =2415
-    Right =11385
-    Bottom =4785
+    Right =11835
+    Bottom =10335
     DatasheetGridlinesColor =14806254
     RecSrcDt = Begin
         0x97e87bbff3d2e440
@@ -143,7 +143,7 @@ Begin Form
         End
         Begin Section
             CanGrow = NotDefault
-            Height =2381
+            Height =2437
             Name ="Détail"
             AlternateBackColor =15921906
             AlternateBackThemeColorIndex =1
@@ -237,7 +237,7 @@ Begin Form
                     Overlaps =1
                 End
                 Begin Label
-                    OverlapFlags =85
+                    OverlapFlags =93
                     TextFontFamily =49
                     Left =165
                     Top =1185
@@ -303,6 +303,72 @@ Begin Form
                     ForeTint =100.0
                     ForeShade =50.0
                 End
+                Begin CommandButton
+                    Visible = NotDefault
+                    OverlapFlags =87
+                    Left =170
+                    Top =1927
+                    Width =340
+                    Height =340
+                    TabIndex =3
+                    ForeColor =4210752
+                    Name ="cmd_config"
+                    GridlineColor =10921638
+                    ImageData = Begin
+                        0x2800000010000000100000000100200000000000000000000000000000000000 ,
+                        0x0000000000000000000000000000000000000000000000000000000000000000 ,
+                        0x0000000000000000000000000000000000000000000000000000000000000000 ,
+                        0x0000000000000000c0a090ff604830ff604830ff604830ff604830ff604830ff ,
+                        0x604830ff604830ff604830ff604830ff604830ff604830ff0000000000000000 ,
+                        0x0000000000000000c0a890fffff8f0fffff0e0fff0e8e0fff0e0d0fff0d0c0ff ,
+                        0xf0c8b0ffe0c0a0ffe0b8a0ffe0b090ffe0a890ff604830ff0000000000000000 ,
+                        0x0000000000000000c0a8a0fffffff0ffc0a8a0ffb0a0a0fff0e8e0ffb0a090ff ,
+                        0xb09890ffb09890ffb09890ffb09890ffe0b090ff604830ff0000000000000000 ,
+                        0x0000000000000000c0a8a0fffffff0fffffff0fffff8f0fffff0e0fff0e8e0ff ,
+                        0xf0e0d0fff0d0c0fff0c8b0ffe0c0a0ffe0b8a0ff604830ff0000000000000000 ,
+                        0x0000000000000000c0a8a0fffffff0ffb0a8a0ffb0a0a0fffff8f0ffb0a090ff ,
+                        0xb09890ffb09890ffb09890ffb09890ffe0c0a0ff604830ff0000000000000000 ,
+                        0x0000000000000000c0b0a0fffffff0fffffff0fffffff0fffffff0fffff8f0ff ,
+                        0xfff0e0fff0e8e0fff0e0d0fff0d0c0fff0c8b0ff604830ff0000000000000000 ,
+                        0x0000000000000000c0b0a0fffffff0fffffff0fffffff0fffffff0fffffff0ff ,
+                        0xfff8f0ffc0c8c0ff406070fff0e0d0fff0d0c0ff604830ff0000000000000000 ,
+                        0x0000000040784010c0b0a0ffffffffffe0e8f0ff607880ffe0e0e0fffffff0ff ,
+                        0xc0c8d0ff506070ff30a8d0ff203840ffb0a0a0ff604830ff0000000000000000 ,
+                        0x40784070408050ffd0b0a0ffffffffff90a8b0ff80d0e0ff506070ffb0b8c0ff ,
+                        0x506070ff60c0e0ff506070ff30b8f0ff102830ff103040ff102830ff10203090 ,
+                        0x407840ff50a860ffd0b8a0ffffffffffd0d8e0ff90a8b0ff80e0f0ff506070ff ,
+                        0x80d0e0ff506070ff60d0f0ff406070ff30b0e0ff2098d0ff2088b0ff205070ff ,
+                        0x508860ff50b060ffd0b8a0ffd0b8a0ffd0b8a0ffb0b0a0ff90a8b0ff80e0f0ff ,
+                        0x506070ff80e0f0ff405870ff60d0f0ff50c8f0ff40c0f0ff20b0e0ff20a0d0ff ,
+                        0x609870ff50b870ff00000000000000000000000090a8b0ff2080a0ff90a8b0ff ,
+                        0x80e0f0ff405870ff80e0f0ff70d8f0ff60d0f0ff50c8f0ff40c0f0ff30b8f0ff ,
+                        0x70a880ff60c080ff00000000000000000000000090a8b09090a8b0ff2080a0ff ,
+                        0x90a8b0ff80e0f0ff80e0f0ff80e0f0ff70d8f0ff60d0f0ff60b0d0ff808890ff ,
+                        0xb0c0a0ff90d0a0ff000000000000000000000000000000000000000090a8b050 ,
+                        0x90a8b0b090a8b0ff90a0b0ff90a0a0ff8098a0ff8090a0ff808890ff80889080 ,
+                        0xa0b8a0ffb0c0a0ff000000000000000000000000000000000000000000000000 ,
+                        0x0000000000000000000000000000000000000000000000000000000000000000 ,
+                        0x0000000000000000
+                    End
+
+                    LayoutCachedLeft =170
+                    LayoutCachedTop =1927
+                    LayoutCachedWidth =510
+                    LayoutCachedHeight =2267
+                    UseTheme =0
+                    Gradient =0
+                    BackColor =14136213
+                    BorderColor =14136213
+                    HoverColor =15060409
+                    PressedColor =9592887
+                    HoverForeColor =4210752
+                    PressedForeColor =4210752
+                    WebImagePaddingLeft =2
+                    WebImagePaddingTop =2
+                    WebImagePaddingRight =1
+                    WebImagePaddingBottom =1
+                    Overlaps =1
+                End
             End
         End
     End
@@ -322,6 +388,23 @@ Private Sub cb_command_Change()
 
 End Sub
 
+'Private Sub cmd_config_Click()
+'
+'    If Not vcs_tbl_exists Then
+'        If Not MsgBox("The configuration table 'ztbl_vcs' does not exist, " & _
+'                        "do you want to create it?", vbYesNo) = vbNo Then
+'            Exit Function
+'        End If
+'
+'        DoCmd.SetWarnings False
+'        DoCmd.RunSQL "SELECT  INTO [ztbl_vcs] FROM [modele - ztbl_vcs];"
+'        DoCmd.SetWarnings True
+'    End If
+'
+'    DoCmd.OpenForm "frm_config"
+'
+'End Sub
+
 Private Sub cmd_run_Click()
 
     Call run

+ 11 - 0
source/modules/vcs.bas

@@ -273,4 +273,15 @@ End Function
 
 Private Function IsInArray(ByVal stringToBeFound As String, ByRef arr As Variant) As Boolean
     IsInArray = (UBound(Filter(arr, stringToBeFound)) > -1)
+End Function
+
+Function vcs_tbl_exists()
+On Error GoTo err
+    vcs_tbl_exists = (CurrentDb.TableDefs("ztbl_vcs").name = "ztbl_vcs")
+err:
+    If err.Number = 3265 Then
+        vcs_tbl_exists = False
+    Else
+        MsgBox "Error: " & err.Description, vbCritical
+    End If
 End Function

+ 5 - 0
source/tables/tbl_commands.txt

@@ -0,0 +1,5 @@
+cmd_name	function	description	order	with_args
+configure_git_repo	config_git_repo	Configure an existing Git repository to be used with VCS	3	Faux
+gitcmd	gitcmd	Runs a git command	4	Vrai
+make_sources	make_sources	Makes the source-code files from the current project	1	Faux
+update_from_sources	update_from_sources	Update the current project within the source-code files	2	Faux

+ 2 - 0
source/tables/ztbl_vcs.txt

@@ -0,0 +1,2 @@
+key	val
+include_tables	ztbl_vcs,tbl_commands

+ 1 - 1
source/tbldef/modele - ztbl_vcs.sql → source/tbldef/ztbl_vcs.sql

@@ -1,4 +1,4 @@
-CREATE TABLE [modele - ztbl_vcs] (
+CREATE TABLE [ztbl_vcs] (
   [key] VARCHAR (48) CONSTRAINT [Index_516D4AEC_BCC1_4E6B] UNIQUE  CONSTRAINT [PrimaryKey] PRIMARY KEY  UNIQUE  NOT NULL ,
   [val] VARCHAR (96)
 )