Optimized: Localization, CodeModulTransfer

Author: josef-poetzl

access-add-in/DbmsConnectionWizard.accda

@@ -0,0 +1,52 @@
+Attribute VB_Name = "CodeModulSupport"
+Option Compare Database
+Option Explicit
+
+Private Const ConditionalCompilationArgumentsOptionName As String = "Conditional Compilation Arguments"
+Private Const CONFIG_USELOGINFORM_ArgName As String = "CONFIG_USELOGINFORM"
+
+Public Sub CheckConditionalCompilationArgumentsString(ByVal UseLoginForm As Boolean)
+
+   Dim ConditionalCompilationArgumentsString As String
+   Dim ConditionalCompilationArguments() As String
+   Dim TestString As String
+   Dim ArgExists As Boolean
+   Dim i As Long
+   
+   ConditionalCompilationArgumentsString = Trim(Nz(Application.GetOption(ConditionalCompilationArgumentsOptionName), vbNullString))
+   
+   If Len(ConditionalCompilationArgumentsString) = 0 And UseLoginForm Then
+      Application.SetOption ConditionalCompilationArgumentsOptionName, CONFIG_USELOGINFORM_ArgName & " = " & Abs(UseLoginForm)
+      Exit Sub
+   End If
+   
+   ConditionalCompilationArguments = GetConditionalCompilationArgumentsArray(ConditionalCompilationArgumentsString)
+   For i = LBound(ConditionalCompilationArguments) To UBound(ConditionalCompilationArguments)
+      If Replace(ConditionalCompilationArguments(i), " ", vbNullString) Like CONFIG_USELOGINFORM_ArgName & "=*" Then
+         ConditionalCompilationArguments(i) = CONFIG_USELOGINFORM_ArgName & " = " & Abs(UseLoginForm)
+         ArgExists = True
+         Exit For
+      End If
+   Next
+   
+   If ArgExists Then
+      ConditionalCompilationArgumentsString = Join(ConditionalCompilationArguments, ":")
+   Else
+      ConditionalCompilationArgumentsString = ConditionalCompilationArgumentsString & " : " & CONFIG_USELOGINFORM_ArgName & " = " & Abs(UseLoginForm)
+   End If
+   
+   ConditionalCompilationArgumentsString = Trim(ConditionalCompilationArgumentsString)
+   If Left(ConditionalCompilationArgumentsString, 1) = ":" Then
+      ConditionalCompilationArgumentsString = Trim(Mid(ConditionalCompilationArgumentsString, 2))
+   End If
+   If Right(ConditionalCompilationArgumentsString, 1) = ":" Then
+      ConditionalCompilationArgumentsString = Trim(Left(ConditionalCompilationArgumentsString, Len(ConditionalCompilationArgumentsString) - 1))
+   End If
+
+   Application.SetOption ConditionalCompilationArgumentsOptionName, ConditionalCompilationArgumentsString
+   
+End Sub
+
+Private Function GetConditionalCompilationArgumentsArray(ByVal FullString As String) As String()
+   GetConditionalCompilationArgumentsArray = Split(FullString, ":")
+End Function

source/CodeModulSupport.bas

@@ -1,6 +1,6 @@
 Attribute VB_Name = "_initDbConnectionWizard"
 '---------------------------------------------------------------------------------------
-' Modul: _initApplication (2009-07-08)
+' Modul: _initApplication
 '---------------------------------------------------------------------------------------
 '/* *
 ' <summary>
@@ -16,33 +16,33 @@ Option Explicit
 '---------------------------
 ' Initialisierungsfunktion
 '---------------------------
-Private Function initDbmsConnectionWizard() As Boolean
+Private Function InitDbmsConnectionWizard() As Boolean
    If Application.CurrentDb Is Nothing Then
       MsgBox "Bitte öffnen Sie zuerst eine Access-Anwendung.", vbCritical
-      initDbmsConnectionWizard = False
+      InitDbmsConnectionWizard = False
       Exit Function
    End If
-   initDbmsConnectionWizard = StartApplication
+   InitDbmsConnectionWizard = StartApplication
 End Function
 
 Public Function StartDbmsConnectionWizard() As Variant
-   If Not initDbmsConnectionWizard Then Exit Function
-   checkTemplatesDb
+   If Not InitDbmsConnectionWizard Then Exit Function
+   CheckTemplatesDb
    DoCmd.OpenForm DCW_DbmsConfigFormName, acNormal, , , , acWindowNormal
 End Function
 
 Public Function StartDbmsConnectionLinkTableWizard() As Variant
-   If Not initDbmsConnectionWizard Then Exit Function
+   If Not InitDbmsConnectionWizard Then Exit Function
    DoCmd.OpenForm DCW_LinkTablesFormName, acNormal, , , , acWindowNormal
 End Function
 
 Public Function CreatePassThroughQuery() As Variant
-   If Not initDbmsConnectionWizard Then Exit Function
+   If Not InitDbmsConnectionWizard Then Exit Function
    DoCmd.OpenForm DCW_TestSqlFormName, acNormal, , , , acWindowNormal, DCW_RecordsetModes.DCW_DAOPT
 End Function
 
 Public Function InsertOdbcConnectionString(ByRef strObjektName As String, ByRef strTextFeldname As String, ByRef strAktuellerWert As String) As Variant
-   If Not initDbmsConnectionWizard Then Exit Function
+   If Not InitDbmsConnectionWizard Then Exit Function
    Select Case strTextFeldname
       Case "Query"
          strAktuellerWert = CurrentConnectionInfo.OdbcConnectionString
@@ -61,7 +61,7 @@ End Sub
 '
 ' Hilfsprozeduren
 
-Private Sub checkTemplatesDb()
+Private Sub CheckTemplatesDb()
 
    Dim db As DAO.Database
    Dim tdf As DAO.TableDef

source/_initDbConnectionWizard.bas

@@ -95,7 +95,7 @@ Private Sub UpdateCodeModuleInTable(ByVal ModuleName As String, ByVal ACLibPath
    Dim DownLoadUrl As String
    Dim BranchName As String
 
-   TempFile = FileTools.TempPath & ModuleName & ".cls"
+   TempFile = FileTools.TempPath & ModuleName & FileTools.GetFileExtension(ACLibPath, True)
 
    If UseDraftBranch Then
       BranchName = "draft"

source/codelib/_codelib/addins/shared/ACLibGitHubImporter.cls

@@ -132,7 +132,7 @@ Public Function CheckCodeModule(ByVal ModulName As String, _
 
 End Function
 
-Private Sub TransferCodeModul(ByVal TargetProject As Access.CurrentProject, _
+Public Sub TransferCodeModul(ByVal TargetProject As Access.CurrentProject, _
                               ByVal ObjType As AcObjectType, ByVal ModulName As String)
 
    Dim FileName As String

source/codelib/_codelib/addins/shared/AppFileCodeModulTransfer.cls

@@ -34,6 +34,7 @@ Private Enum DbConnectionInfoErrorNumbers
    ERRNR_INACTIVE = vbObjectError + 3
 End Enum
 
+Private Const m_DefaultLoginFormName As String = "LoginForm"
 Private m_LoginFormName As String
 Private m_DbmsConfigFormName As String
 
@@ -86,7 +87,7 @@ Private m_UseLoginForm As Boolean
 Private m_SAVEPWD As Boolean
 
 #If CONFIG_USELOGINFORM = 1 Then
-Private WithEvents m_LoginForm As Form_frmLogin
+Private WithEvents m_LoginForm As Form_LoginForm
 Attribute m_LoginForm.VB_VarHelpID = -1
 #End If
 
@@ -341,10 +342,7 @@ Private Sub ReadDBMSprop(Optional ByVal withoutLoginForm As Boolean = False, Opt
       End If
 
       'm_LoginForm über Property LoginForm zugänglich machen und im LoginForm selbst setzen:
-
-      Set g_TempRef = Me
-      DoCmd.OpenForm m_LoginFormName, acNormal, , , acFormEdit, acDialog, m_CID & "@" & LoginUserName
-      Set g_TempRef = Nothing
+      DoCmd.OpenForm LoginFormName, acNormal, , , acFormEdit, acDialog, ObjPtr(Me) & "@" & m_CID & "@" & LoginUserName
 #Else
    Err.Raise vbObjectError, "DbConnectionInfo", "CONFIG_USELOGINFORM in Projekteigenschaften nicht gesetzt!"
 #End If
@@ -405,7 +403,7 @@ Private Sub m_LoginForm_Logon(ByVal LoginName As String, ByVal Password As Strin
    m_DBUSER = LoginName
    m_DBUSERPWD = Password
 
-   Call setConnectionStrings(False)
+   Call SetConnectionStrings(False)
 
    If CheckAdoConnection(m_OledbConnectionString, ErrMsg) = False Then
       If Len(ErrMsg) > 0 Then ErrMsg = vbNewLine & vbNewLine & ErrMsg
@@ -416,7 +414,7 @@ Private Sub m_LoginForm_Logon(ByVal LoginName As String, ByVal Password As Strin
    End If
 
    If Len(m_DBUSER) > 0 Then
-      CurrentDb.Execute "UPDATE (select * from usys_DbmsConnectionWHERE DBMS='" & m_DBMSNAME & "') SET dbmsUser = '" & m_DBUSER & "'" ' thanks to MSFT (https://support.office.com/en-us/article/access-error-query-is-corrupt-fad205a5-9fd4-49f1-be83-f21636caedec)
+      CurrentDb.Execute "UPDATE (select * from usys_DbmsConnection WHERE DBMS='" & m_DBMSNAME & "') SET dbmsUser = '" & m_DBUSER & "'" ' thanks to MSFT (https://support.office.com/en-us/article/access-error-query-is-corrupt-fad205a5-9fd4-49f1-be83-f21636caedec)
       SaveUserNameToConfigFile m_DBUSER
    End If
 
@@ -426,7 +424,7 @@ Private Sub m_LoginForm_Logon(ByVal LoginName As String, ByVal Password As Strin
 
 End Sub
 
-Private Sub setConnectionStrings(Optional ByVal bWithConnectionCheck As Boolean = True)
+Private Sub SetConnectionStrings(Optional ByVal bWithConnectionCheck As Boolean = True)
 
    Dim myConnectionStrings As DbmsConnectionStrings
    Dim ErrMsg As String
@@ -504,15 +502,15 @@ End Function
 
 Private Function CheckAdoConnection(ByVal sOleDbConnectionstring As String, ByRef Msg As String) As Boolean
 
-   Dim cnn As ADODB.Connection
+   Dim cnn As Object 'ADODB.Connection
    Dim i As Long
 
    If Len(sOleDbConnectionstring) = 0 Then
       CheckAdoConnection = False
       Exit Function
    End If
 
-   Set cnn = New ADODB.Connection
+   Set cnn = CreateObject("ADODB.Connection")
    With cnn
       .ConnectionString = sOleDbConnectionstring
       .ConnectionTimeout = m_CheckConnectionTimeout
@@ -587,7 +585,7 @@ End Function
 Public Property Get OledbConnectionString() As String
 
    If Len(m_OledbConnectionString) = 0 Then
-      setConnectionStrings
+      SetConnectionStrings
    End If
    OledbConnectionString = m_OledbConnectionString
 
@@ -609,7 +607,7 @@ End Property
 Public Property Get OdbcConnectionString(Optional ByVal bWithoutUserInfo As Boolean = False) As String
 
    If Len(m_OdbcConnectionString) = 0 Then
-      setConnectionStrings
+      SetConnectionStrings
    End If
    If bWithoutUserInfo Then
       OdbcConnectionString = Replace(m_OdbcConnectionString, getOdbcUserInfo(), "")
@@ -634,7 +632,7 @@ End Property
 Public Property Get DatabaseFile() As String
 
    If Len(m_DatabaseFile) = 0 Then
-      setConnectionStrings
+      SetConnectionStrings
    End If
    DatabaseFile = m_DatabaseFile
 
@@ -653,11 +651,11 @@ End Property
 ' </remarks>
 '**/
 '---------------------------------------------------------------------------------------
-Public Property Get DbUser(Optional ByVal withoutServerCheck As Boolean = False) As String
+Public Property Get DbUser(Optional ByVal WithoutServerCheck As Boolean = False) As String
 
-   If Not withoutServerCheck Then
+   If Not WithoutServerCheck Then
    If Not m_DbmsInfoReaded Then
-      setConnectionStrings
+      SetConnectionStrings
    End If
    End If
 
@@ -672,7 +670,7 @@ End Property
 '---------------------------------------------------------------------------------------
 ' Property: DbUserPassword
 '---------------------------------------------------------------------------------------
-'/** 'nicht exportieren (2. * für Export fehlt)
+'/**
 ' <summary>
 ' Passwort des Datenbankbenutzers, das bei Anmeldung eingegeben wurde
 ' </summary>
@@ -682,10 +680,10 @@ End Property
 ' </remarks>
 '**/
 '---------------------------------------------------------------------------------------
-Public Property Get DbUserPassword() As String
+Private Property Get DbUserPassword() As String
 
    If Not m_DbmsInfoReaded Then
-      setConnectionStrings
+      SetConnectionStrings
    End If
    DbUserPassword = m_DBUSERPWD
 
@@ -706,7 +704,7 @@ End Property
 Public Property Get SavePassword() As Boolean
 
    If Not m_DbmsInfoReaded Then
-      setConnectionStrings
+      SetConnectionStrings
    End If
    SavePassword = m_SAVEPWD
 
@@ -727,7 +725,7 @@ End Property
 Public Property Get UseLoginForm() As Boolean
 
    If Not m_DbmsInfoReaded Then
-      setConnectionStrings
+      SetConnectionStrings
    End If
    UseLoginForm = m_UseLoginForm
 
@@ -838,7 +836,7 @@ Public Function ChangeDbUserPassword( _
 
       If strLoginName = m_DBUSER Then
          m_DBUSERPWD = NewPassword
-         setConnectionStrings
+         SetConnectionStrings
          RaiseEvent PasswordChanged
       End If
 
@@ -1361,7 +1359,11 @@ End Property
 '**/
 '---------------------------------------------------------------------------------------
 Public Property Get LoginFormName() As String
-   LoginFormName = m_LoginFormName
+   If Len(m_LoginFormName) = 0 Then
+      LoginFormName = m_DefaultLoginFormName
+   Else
+      LoginFormName = m_LoginFormName
+   End If
 End Property
 
 Public Property Let LoginFormName(ByVal NewValue As String)

source/codelib/data/DbConnectionInfo.cls

@@ -8,7 +8,7 @@ Attribute VB_Creatable = False
 Attribute VB_PredeclaredId = False
 Attribute VB_Exposed = False
 '---------------------------------------------------------------------------------------
-' Klassenmodul: DbConnectionInfo
+' Klassenmodul: DbConnectionSettings
 '---------------------------------------------------------------------------------------
 '/**
 ' <summary>

source/codelib/data/DbConnectionSettings.cls

@@ -95,10 +95,6 @@ Public Sub DisposeDbConnection()
 
 On Error Resume Next
 
-#If CONFIG_USELOGINFORM = 1 Then
-   Set g_TempRef = Nothing
-#End If
-
    If Not (m_DbConnectionManager Is Nothing) Then
       m_DbConnectionManager.Dispose
    End If

source/codelib/data/modDbConnection.bas

@@ -15,11 +15,11 @@ Option Private Module
 
 Public Const DCW_AppName As String = "DbmsConnectionWizard"
 Public Const DCW_AppFullName As String = "DBMS Connection Wizard"
-Public Const DCW_Version As String = "1.4.1"
-Public Const DCW_VersionDate As String = "2023-05-24"
+Public Const DCW_Version As String = "1.4.2"
+Public Const DCW_VersionDate As String = "2023-05-26"
 
 'Formulare
-Public Const DCW_LoginFormName As String = g_ApplicationLoginFormName
+Public Const DCW_LoginFormName As String = "LoginForm"
 Public Const DCW_DbmsConfigFormName As String = "frmConfig_DBMS"
 Public Const DCW_LinkTablesFormName As String = "frmConfig_LinkTables"
 Public Const DCW_TestSqlFormName As String = "frmTest_SQL"