AppStd/Modules
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Zooflow: Fix wrong image on dragdrop, prepare removal of manual database config

Browse Source
This commit is contained in:
Jonathan Jenne
2022-04-04 16:40:25 +02:00
parent de451e8c57
commit 8ff4ae5a27
11 changed files with 166 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb generated
View File

@@ -60,6 +60,7 @@ 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.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -134,9 +135,9 @@ 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.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.RibbonControl1.Location = New System.Drawing.Point(0, 0)
Me.RibbonControl1.MaxItemId = 37
Me.RibbonControl1.MaxItemId = 38
Me.RibbonControl1.Name = "RibbonControl1"
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -372,6 +373,13 @@ 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"
'
'RibbonPage1
'
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.RibbonPageGroup1})
@@ -383,6 +391,7 @@ 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.Name = "RibbonPageGroup2"
Me.RibbonPageGroup2.Text = "Daten"
'
@@ -941,4 +950,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
End Class

29
GUIs.ZooFlow/Administration/frmAdmin_Start.vb
View File

@@ -9,6 +9,7 @@ Imports DigitalData.GUIs.ZooFlow.Administration.ClassConstants
Imports DevExpress.XtraGrid
Imports DevExpress.XtraBars
Imports DigitalData.Modules.Language
Imports DigitalData.Controls.SQLConfig
Public Class frmAdmin_Start
Private CurrentModule As String
@@ -29,6 +30,13 @@ 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
@@ -283,7 +291,24 @@ Public Class frmAdmin_Start
oForm.ShowDialog()
End Sub
Private Sub RibbonControl1_Click(sender As Object, e As EventArgs) Handles RibbonControl1.Click
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
End Class