Zooflow: Readd Load_recent_files, add second service config
This commit is contained in:
@@ -61,6 +61,7 @@ Partial Class frmAdmin_Start
|
||||
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()
|
||||
@@ -135,9 +136,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.btnDatabaseConnection})
|
||||
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.Location = New System.Drawing.Point(0, 0)
|
||||
Me.RibbonControl1.MaxItemId = 38
|
||||
Me.RibbonControl1.MaxItemId = 39
|
||||
Me.RibbonControl1.Name = "RibbonControl1"
|
||||
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
|
||||
Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
|
||||
@@ -380,6 +381,13 @@ Partial Class frmAdmin_Start
|
||||
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})
|
||||
@@ -392,6 +400,7 @@ Partial Class frmAdmin_Start
|
||||
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"
|
||||
'
|
||||
@@ -951,4 +960,5 @@ Partial Class frmAdmin_Start
|
||||
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
|
||||
|
||||
@@ -311,4 +311,33 @@ Public Class frmAdmin_Start
|
||||
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
|
||||
Reference in New Issue
Block a user