Zooflow: Implement prefix for Config and Logging, Remove halbgar dev config

GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb

@@ -60,8 +60,6 @@ Partial Class frmAdmin_Start
         Me.btnEditRecord = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem26 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem27 = New DevExpress.XtraBars.BarButtonItem()
-        Me.btnDatabaseConnection = New DevExpress.XtraBars.BarButtonItem()
-        Me.btnSecondServiceConnection = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -114,6 +112,7 @@ Partial Class frmAdmin_Start
         Me.RibbonGroup_ClipboardWatcher_DocSearch = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonGroup_ClipboardWatcher_Profile = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPage_ClipboardWatcher = New DevExpress.XtraBars.Ribbon.RibbonPage()
+        Me.btnSecondServiceConnection = New DevExpress.XtraBars.BarButtonItem()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TreeListMenu, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.MainTreeImages, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -136,7 +135,7 @@ Partial Class frmAdmin_Start
         'RibbonControl1
         '
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.labelStatus, Me.labelError, Me.BarButtonItemAddAttribute, Me.BarButtonItemRefreshAttribute, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.BarButtonItem19, Me.BarButtonItem20, Me.BarButtonItem21, Me.BarButtonItem22, Me.BarButtonItem23, Me.BarButtonItem24, Me.BarButtonItem25, Me.btnAddRecord, Me.btnEditRecord, Me.BarButtonItem26, Me.BarButtonItem27, Me.btnDatabaseConnection, Me.btnSecondServiceConnection})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.labelStatus, Me.labelError, Me.BarButtonItemAddAttribute, Me.BarButtonItemRefreshAttribute, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.BarButtonItem19, Me.BarButtonItem20, Me.BarButtonItem21, Me.BarButtonItem22, Me.BarButtonItem23, Me.BarButtonItem24, Me.BarButtonItem25, Me.btnAddRecord, Me.btnEditRecord, Me.BarButtonItem26, Me.BarButtonItem27})
         Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
         Me.RibbonControl1.MaxItemId = 39
         Me.RibbonControl1.Name = "RibbonControl1"
@@ -374,20 +373,6 @@ Partial Class frmAdmin_Start
         Me.BarButtonItem27.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.text1
         Me.BarButtonItem27.Name = "BarButtonItem27"
         '
-        'btnDatabaseConnection
-        '
-        Me.btnDatabaseConnection.Caption = "Datenbank konfigurieren"
-        Me.btnDatabaseConnection.Id = 37
-        Me.btnDatabaseConnection.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.managedatasource3
-        Me.btnDatabaseConnection.Name = "btnDatabaseConnection"
-        '
-        'btnSecondServiceConnection
-        '
-        Me.btnSecondServiceConnection.Caption = "Dienstkonfiguration umschalten"
-        Me.btnSecondServiceConnection.Id = 38
-        Me.btnSecondServiceConnection.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.switchrowcolumns
-        Me.btnSecondServiceConnection.Name = "btnSecondServiceConnection"
-        '
         'RibbonPage1
         '
         Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.RibbonPageGroup1})
@@ -399,8 +384,6 @@ Partial Class frmAdmin_Start
         Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
         Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem27)
         Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem9)
-        Me.RibbonPageGroup2.ItemLinks.Add(Me.btnDatabaseConnection)
-        Me.RibbonPageGroup2.ItemLinks.Add(Me.btnSecondServiceConnection)
         Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
         Me.RibbonPageGroup2.Text = "Daten"
         '
@@ -835,6 +818,13 @@ Partial Class frmAdmin_Start
         Me.RibbonPage_ClipboardWatcher.Name = "RibbonPage_ClipboardWatcher"
         Me.RibbonPage_ClipboardWatcher.Text = "Clipboard Watcher"
         '
+        'btnSecondServiceConnection
+        '
+        Me.btnSecondServiceConnection.Caption = "Dienstkonfiguration umschalten"
+        Me.btnSecondServiceConnection.Id = 38
+        Me.btnSecondServiceConnection.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.switchrowcolumns
+        Me.btnSecondServiceConnection.Name = "btnSecondServiceConnection"
+        '
         'frmAdmin_Start
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -959,6 +949,5 @@ Partial Class frmAdmin_Start
     Friend WithEvents RibbonPage_ClipboardWatcher As DevExpress.XtraBars.Ribbon.RibbonPage
     Friend WithEvents BarButtonItem26 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarButtonItem27 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents btnDatabaseConnection As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents btnSecondServiceConnection As DevExpress.XtraBars.BarButtonItem
 End Class

GUIs.ZooFlow/Administration/frmAdmin_Start.vb

@@ -30,13 +30,6 @@ Public Class frmAdmin_Start
         DetailForm = New ClassDetailForm(My.LogConfig)
         AddHandler DetailForm.DetailFormClosed, AddressOf DetailForm_Closed
 
-        'If My.SystemConfig.ConnectionString = String.Empty Then
-        '    If ShowDatabaseSettings() = False Then
-        '        MsgBox("Die Datenbank verbindung wurde nicht konfiguriert. Die Administration kann nicht verwendet werden.", MsgBoxStyle.Critical, Text)
-        '        Exit Sub
-        '    End If
-        'End If
-
         DetailForm.LoadData()
         TreeListMenu.ExpandAll()
     End Sub
@@ -290,54 +283,4 @@ Public Class frmAdmin_Start
         Dim oForm As New frmAdmin_UserImport()
         oForm.ShowDialog()
     End Sub
-
-    Private Sub btnDatabaseConnection_ItemClick(sender As Object, e As ItemClickEventArgs) Handles btnDatabaseConnection.ItemClick
-        ShowDatabaseSettings()
-    End Sub
-
-    Private Function ShowDatabaseSettings() As Boolean
-        Dim oForm As New frmSQLConfig(My.LogConfig) With {
-            .ConnectionString = My.SystemConfig.ConnectionString,
-            .FormTitle = "ECM Datenbank"
-        }
-        Dim oResult = oForm.ShowDialog()
-
-        If oResult = DialogResult.OK Then
-            My.SystemConfig.ConnectionString = oForm.ConnectionString
-            My.SystemConfigManager.Save()
-
-            Return True
-        Else
-            Return False
-        End If
-    End Function
-
-    Private Sub btnSecondServiceConnection_ItemClick(sender As Object, e As ItemClickEventArgs) Handles btnSecondServiceConnection.ItemClick
-        If My.SystemConfig.AppServerConfigDevelopment = String.Empty Then
-            Dim oAnswer = MsgBox("Es ist keine zweite Dienstkonfiguration vorhanden. Wollen Sie nun eine hinterlegen?", MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text)
-            If oAnswer = MsgBoxResult.Yes Then
-                Dim oForm As New frmServiceConfig() With {
-                    .ServiceAddress = "",
-                    .ServiceOnline = False
-                }
-
-                oForm.ShowDialog()
-
-                My.SystemConfig.AppServerConfigDevelopment = oForm.ServiceAddress
-                My.SystemConfigManager.Save()
-            Else
-                ' Cancel
-                Exit Sub
-            End If
-        End If
-
-        Dim oServiceAddress = My.SystemConfig.AppServerConfig
-        If My.Application.Service.Client.ServerAddress = My.SystemConfig.AppServerConfig Then
-            oServiceAddress = My.SystemConfig.AppServerConfigDevelopment
-        Else
-            oServiceAddress = My.SystemConfig.AppServerConfig
-        End If
-
-        My.Application.Service.Client = New Modules.EDMI.API.Client(My.LogConfig, oServiceAddress)
-    End Sub
 End Class