Excel add in - fixed: issue on start without existing config (#33)

josef-poetzl · web-flow · commit e71fb603fd06 · 2024-03-08T00:01:30.000+01:00
* excel-add-in + new lib files (prepare pre release)
* Fix: First start without config
* optimize user interface
diff --git a/access-add-in/AccUnitLoader.accda b/access-add-in/AccUnitLoader.accda
diff --git a/access-add-in/AccUnitLoader.accda.src/documents.json b/access-add-in/AccUnitLoader.accda.src/documents.json
@@ -7,6 +7,7 @@
     "Databases": {
       "SummaryInfo": {
         "Author": "Josef Pötzl",
+        "Comments": "Activate AccUnit for Access/VBA",
         "Company": "accunit-codelib.net",
         "Title": "AccUnit Loader"
       }
diff --git a/access-add-in/AccUnitLoader.accda.src/modules/modTypeLibCheck.bas b/access-add-in/AccUnitLoader.accda.src/modules/modTypeLibCheck.bas
@@ -29,7 +29,7 @@ Private Const EXTENSION_KEY_APPFILE As String = "AppFile"
 Public Property Get DefaultAccUnitLibFolder() As String
    Dim FilePath As String
    FilePath = CodeVBProject.FileName
-   FilePath = Left(FilePath, Len(FilePath) - InStrRev(FilePath, "\"))
+   FilePath = Left(FilePath, InStrRev(FilePath, "\"))
    DefaultAccUnitLibFolder = FilePath & "lib"
 End Property
 
diff --git a/access-add-in/AccUnitLoader.accda.src/nav-pane-groups.json b/access-add-in/AccUnitLoader.accda.src/nav-pane-groups.json
@@ -1,8 +1,7 @@
 ﻿{
   "Info": {
     "Class": "clsDbNavPaneGroup",
-    "Description": "Navigation Pane Custom Groups",
-    "Export File Format": 1.1
+    "Description": "Navigation Pane Custom Groups"
   },
   "Items": {
     "Categories": [
diff --git a/access-add-in/AccUnitLoader.accda.src/tbldefs/ACLib_ConfigTable.json b/access-add-in/AccUnitLoader.accda.src/tbldefs/ACLib_ConfigTable.json
@@ -7,7 +7,6 @@
     "Name": "ACLib_ConfigTable",
     "Connect": ";DATABASE=C:\\Users\\poetzl.joposol\\AppData\\Roaming\\AccessCodeLib\\ACLib_Config.accdu",
     "SourceTableName": "ACLib_ConfigTable",
-    "Attributes": 1073741824,
-    "PrimaryKey": "[PropName]"
+    "Attributes": 1073741824
   }
 }
diff --git a/access-add-in/AccUnitLoader.accda.src/vcs-options.json b/access-add-in/AccUnitLoader.accda.src/vcs-options.json
@@ -1,6 +1,6 @@
 ﻿{
   "Info": {
-    "AddinVersion": "4.0.23",
+    "AddinVersion": "4.0.34",
     "AccessVersion": "16.0 32-bit"
   },
   "Options": {
@@ -36,6 +36,7 @@
     "FormatSQL": true,
     "ForceImportOriginalQuerySQL": false,
     "SaveTableSQL": true,
+    "SplitLayoutFromVBA": false,
     "StripPublishOption": true,
     "SanitizeColors": 1,
     "SanitizeLevel": 2,
diff --git a/excel-add-in/AccUnitLoader.xlam b/excel-add-in/AccUnitLoader.xlam
diff --git a/excel-add-in/AccUnitLoader_Install.vbs b/excel-add-in/AccUnitLoader_Install.vbs
@@ -89,4 +89,4 @@ Function CopyFiles()
  
 End Function
 
-
+'Computer\HKEY_CURRENT_USER\Software\Microsoft\Office\16.0\Excel\Add-in Manager
diff --git a/excel-add-in/source/AccUnitLoaderForm.frm b/excel-add-in/source/AccUnitLoaderForm.frm
@@ -1,7 +1,7 @@
 VERSION 5.00
 Begin {C62A69F0-16DC-11CE-9E98-00AA00574A4F} AccUnitLoaderForm 
    Caption         =   "ACLib - AccUnit Loader"
-   ClientHeight    =   3822
+   ClientHeight    =   4473
    ClientLeft      =   119
    ClientTop       =   462
    ClientWidth     =   9373
@@ -65,7 +65,7 @@ Private Sub UserForm_Initialize()
       Me.Caption = .ApplicationTitle & " (Version " & .Version & ")"
    End With
    
-   LoadIconFromAppFiles
+'   LoadIconFromAppFiles
    
    With CurrentAccUnitConfiguration
 On Error GoTo ErrMissingPath
@@ -143,9 +143,11 @@ On Error GoTo HandleErr
       .AddMenuItem 11, "Import AccUnit files from directory"
 #End If
 
+If ThisWorkbook.CustomDocumentProperties.Count >= 5 Then
       .AddMenuItem -2, "", MF_SEPARATOR
       .AddMenuItem 21, "Export AccUnit files to directory"
       .AddMenuItem 22, "Remove AccUnit files from Add-In file"
+End If
 
       .AddMenuItem -3, "", MF_SEPARATOR
       .AddMenuItem 31, "Remove test environment incl. test classes"
@@ -160,12 +162,15 @@ On Error GoTo HandleErr
    Select Case mnu.OpenMenu(m_OpenMenuMouse_X, m_OpenMenuMouse_Y)
       Case 11
          ImportAccUnitFiles
+         SetEnableMode
          SuccessMessage = "AccUnit files imported"
       Case 21
          ExportAccUnitFiles
+         SetEnableMode
          SuccessMessage = "AccUnit files exported"
       Case 22
          RemoveAccUnitFilesFromAddInStorage
+         SetEnableMode
          SuccessMessage = "AccUnit files removed from Add-In file"
       Case 31
          RemoveTestEnvironment True
@@ -198,6 +203,22 @@ HandleErr:
 
 End Function
 
+Private Sub cmdExportFilesToFolder_Click()
+   
+On Error GoTo HandleErr
+
+   ExportAccUnitFiles
+   ShowSuccessInfo "AccUnit files exported"
+   
+ExitHere:
+   Exit Sub
+
+HandleErr:
+   ShowErrorHandlerInfo "cmdInsertFactoryModule_Click"
+   Resume ExitHere
+   
+End Sub
+
 Private Sub cmdSelectAccUnitDllPath_Click()
    
    Dim SelectedAccUnitDllPath As String
@@ -231,6 +252,10 @@ Private Sub SetEnableMode()
 
    Me.cmdSetAccUnitTlbReferenz.Enabled = bolPathExists
    Me.cmdInsertFactoryModule.Enabled = bolPathExists
+   With Me.cmdExportFilesToFolder
+      .Enabled = bolPathExists
+      .Visible = (ThisWorkbook.CustomDocumentProperties.Count >= 5)
+   End With
 
 End Sub
 
diff --git a/excel-add-in/source/AccUnitLoaderForm.frx b/excel-add-in/source/AccUnitLoaderForm.frx
diff --git a/excel-add-in/source/config_Application.bas b/excel-add-in/source/config_Application.bas
@@ -19,7 +19,7 @@ Option Explicit
 Option Private Module
 
 'Version nummer
-Private Const APPLICATION_VERSION As String = "0.9.2.240307"
+Private Const APPLICATION_VERSION As String = "0.9.3.240307"
 
 Private Const APPLICATION_NAME As String = "ACLib AccUnit Loader"
 Private Const APPLICATION_FULLNAME As String = "Access Code Library - AccUnit Loader"
diff --git a/excel-add-in/source/modTypeLibCheck.bas b/excel-add-in/source/modTypeLibCheck.bas
@@ -29,7 +29,7 @@ Private Const EXTENSION_KEY_APPFILE As String = "AppFile"
 Public Property Get DefaultAccUnitLibFolder() As String
    Dim FilePath As String
    FilePath = CodeVBProject.FileName
-   FilePath = Left(FilePath, Len(FilePath) - InStrRev(FilePath, "\"))
+   FilePath = Left(FilePath, InStrRev(FilePath, "\"))
    DefaultAccUnitLibFolder = FilePath & "lib"
 End Property
 
@@ -87,7 +87,7 @@ End Function
 
 Private Sub ExportTlbFile(ByVal LibFile As String)
    With CurrentApplication.Extensions(EXTENSION_KEY_APPFILE)
-      .CreateAppFile ACCUNIT_TYPELIB_FILE, LibFile
+      .CreateAppFile ACCUNIT_TYPELIB_FILE, LibFile, "BitInfo", CStr(GetCurrentVbaBitSystem)
    End With
 End Sub
 

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`"Databases": {`
`8`	`8`	`"SummaryInfo": {`
`9`	`9`	`"Author": "Josef Pötzl",`
	`10`	`+ "Comments": "Activate AccUnit for Access/VBA",`
`10`	`11`	`"Company": "accunit-codelib.net",`
`11`	`12`	`"Title": "AccUnit Loader"`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`"Name": "ACLib_ConfigTable",`
`8`	`8`	`"Connect": ";DATABASE=C:\\Users\\poetzl.joposol\\AppData\\Roaming\\AccessCodeLib\\ACLib_Config.accdu",`
`9`	`9`	`"SourceTableName": "ACLib_ConfigTable",`
`10`		`- "Attributes": 1073741824,`
`11`		`- "PrimaryKey": "[PropName]"`
	`10`	`+ "Attributes": 1073741824`
`12`	`11`	`}`
`13`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,4 +89,4 @@ Function CopyFiles()`
`89`	`89`
`90`	`90`	`End Function`
`91`	`91`
`92`		`-`
	`92`	`+'Computer\HKEY_CURRENT_USER\Software\Microsoft\Office\16.0\Excel\Add-in Manager`