Merge branch 'joyfullservice:dev' into dev

josef-poetzl · Nov 23, 2023 · 90b402f · 90b402f
2 parents 43c7133 + 3f01386
commit 90b402f
Show file tree

Hide file tree

Showing 58 changed files with 2,450 additions and 1,536 deletions.
diff --git a/Ribbon/Ribbon.xml b/Ribbon/Ribbon.xml
@@ -14,7 +14,7 @@
           <button id="btnExportSelected" size="large" label="Export Selected" supertip="Export the database component currently selected in the navigation pane." imageMso="SelectionPane" tag="RibbonName:=;inMenu:=;CustomTagValue1:=;CustomTagValue2:=;CustomTagValue3:=;CustomPicture:=;CustomPicturePath:=" onAction="OnActionButton" getVisible="GetVisible" getEnabled="GetEnabled" />
           <separator id="sep2" getVisible="GetVisible" />
           <button id="btnBuild" size="large" label="Build From Source" supertip="Build the current project from source files." imageMso="FileCompactAndRepairDatabase" tag="RibbonName:=;inMenu:=;CustomTagValue1:=;CustomTagValue2:=;CustomTagValue3:=;CustomPicture:=;CustomPicturePath:=" onAction="OnActionButton" getVisible="GetVisible" getEnabled="GetEnabled" />
-          <button id="btnMergeBuild" size="large" label="Merge Build" supertip="Merge changed source files into the current database." imageMso="AdpDiagramArrangeTables" tag="RibbonName:=;inMenu:=;CustomTagValue1:=;CustomTagValue2:=;CustomTagValue3:=;CustomPicture:=;CustomPicturePath:=" onAction="OnActionButton" getVisible="GetVisible" getEnabled="GetEnabled" />
+          <button id="btnMergeBuild" size="large" label="Merge Build" supertip="Merge changed source files into the current database." imageMso="CellsInsertDialog" tag="RibbonName:=;inMenu:=;CustomTagValue1:=;CustomTagValue2:=;CustomTagValue3:=;CustomPicture:=;CustomPicturePath:=" onAction="OnActionButton" getVisible="GetVisible" getEnabled="GetEnabled" />
           <button id="btnBuildAs" size="large" label="Build As․․․" supertip="Build from source files to a new name or location." imageMso="FileSaveAs" tag="RibbonName:=;inMenu:=;CustomTagValue1:=;CustomTagValue2:=;CustomTagValue3:=;CustomPicture:=;CustomPicturePath:=" onAction="OnActionButton" getVisible="GetVisible" getEnabled="GetEnabled" />
           <button id="btnLoadSelected" size="large" label="Load Selected" supertip="Import from source files the database component currently selected in the navigation pane." imageMso="AlignDialog" tag="RibbonName:=;inMenu:=;CustomTagValue1:=;CustomTagValue2:=;CustomTagValue3:=;CustomPicture:=;CustomPicturePath:=" onAction="OnActionButton" getVisible="GetVisible" getEnabled="GetEnabled" />
         </group>
@@ -29,6 +29,7 @@
             <button id="btnGoToLinkAdvancedTools" label="View Documentation" description="See documentation on the purpose and usage of these custom tools..." imageMso="TentativeAcceptInvitation" tag="RibbonName:=;inMenu:=mnu15;CustomTagValue1:=;CustomTagValue2:=;CustomTagValue3:=;CustomPicture:=;CustomPicturePath:=" onAction="OnActionButton" getVisible="GetVisible" getEnabled="GetEnabled" />
             <button id="btnLocalizeLibraryReferences" label="Localize Library References" description="Relink add-in library databases to the files located in the same folder as the current database" imageMso="MacroShowAllActions" tag="RibbonName:=;inMenu:=mnu15;CustomTagValue1:=;CustomTagValue2:=;CustomTagValue3:=;CustomPicture:=;CustomPicturePath:=" onAction="OnActionButton" getVisible="GetVisible" getEnabled="GetEnabled" />
             <button id="btnRepairColors" label="Repair Colors" description="Rebuild color definition blocks in form objects (See documentation for more info)" supertip="test2" imageMso="SmartArtChangeColorsGallery" tag="RibbonName:=;inMenu:=mnu15;CustomTagValue1:=;CustomTagValue2:=;CustomTagValue3:=;CustomPicture:=;CustomPicturePath:=" onAction="OnActionButton" getVisible="GetVisible" getEnabled="GetEnabled" />
+            <button id="btnSplitFiles" label="Split Files" description="Duplicate files while preserving Git line history" imageMso="AdpDiagramArrangeTables" tag="RibbonName:=;inMenu:=mnuAdvancedTools;CustomTagValue1:=;CustomTagValue2:=;CustomTagValue3:=;CustomPicture:=;CustomPicturePath:=" onAction="OnActionButton" getVisible="GetVisible" getEnabled="GetEnabled" />
             <button id="btnActivateHook" label="Activate Hook" description="Enable Access Application hook to report saving of objects and enabling automatic export on save." supertip="Activate Hook" imageMso="Call" tag="RibbonName:=;inMenu:=;CustomTagValue1:=;CustomTagValue2:=;CustomTagValue3:=;CustomPicture:=;CustomPicturePath:=" onAction="OnActionButton" getVisible="GetVisible" getEnabled="GetEnabled" />
             <button id="btnReloadRibbon" label="Reload Ribbon" description="Refresh the add-in ribbon menu to reflect changes in XML source" imageMso="DataRefreshAll" tag="RibbonName:=;inMenu:=mnuAdvancedTools;CustomTagValue1:=;CustomTagValue2:=;CustomTagValue3:=;CustomPicture:=;CustomPicturePath:=" onAction="OnActionButton" getVisible="GetVisible" getEnabled="GetEnabled" />
           </menu>

diff --git a/Testing/Testing.accdb.src/dbs-properties.json b/Testing/Testing.accdb.src/dbs-properties.json
@@ -72,6 +72,10 @@
       "Value": "DAO",
       "Type": 10
     },
+    "Date stored as Text": {
+      "Value": "11/17/2023 2:15:08 PM",
+      "Type": 10
+    },
     "DesignMasterID": {
       "Value": "",
       "Type": 15
@@ -84,6 +88,10 @@
       "Value": 70,
       "Type": 3
     },
+    "ISO8601 Date as Text": {
+      "Value": "2023-11-17T17:51:00.000Z",
+      "Type": 10
+    },
     "Name": {
       "Value": "rel:Testing.accdb",
       "Type": 12
@@ -132,6 +140,10 @@
       "Value": "",
       "Type": 15
     },
+    "SavedDateValue": {
+      "Value": "2023-11-17T19:35:41.000Z",
+      "Type": 8
+    },
     "Show Navigation Pane Search Bar": {
       "Value": 1,
       "Type": 4

diff --git a/Testing/Testing.accdb.src/forms/frmColors.bas b/Testing/Testing.accdb.src/forms/frmColors.bas
@@ -936,9 +936,4 @@ Begin Form
     End
 End
 CodeBehindForm
-Attribute VB_GlobalNameSpace = False
-Attribute VB_Creatable = True
-Attribute VB_PredeclaredId = True
-Attribute VB_Exposed = False
-Option Compare Database
-Option Explicit
+' See "frmColors.cls"
diff --git a/Testing/Testing.accdb.src/forms/frmColors.cls b/Testing/Testing.accdb.src/forms/frmColors.cls
@@ -0,0 +1,6 @@
+Attribute VB_GlobalNameSpace = False
+Attribute VB_Creatable = True
+Attribute VB_PredeclaredId = True
+Attribute VB_Exposed = False
+Option Compare Database
+Option Explicit