Ms
This commit is contained in:
parent
650ebd8848
commit
79a32d78e7
@ -23,12 +23,12 @@ Public Class frmAdmin2
|
||||
oSave = True
|
||||
Try
|
||||
Dim oFilename As String = String.Format("DevExLayoutAdmin2_Email.xml")
|
||||
Dim oXml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, oFilename)
|
||||
Dim oXml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), oFilename)
|
||||
If File.Exists(oXml) Then
|
||||
DataLayoutControl1.RestoreLayoutFromXml(oXml)
|
||||
End If
|
||||
oFilename = String.Format("DevExLayoutAdmin2_GUIPhrases.xml")
|
||||
oXml = System.IO.Path.Combine(CONFIG.UserConfigPath, oFilename)
|
||||
oXml = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), oFilename)
|
||||
If File.Exists(oXml) Then
|
||||
DataLayoutControl2.RestoreLayoutFromXml(oXml)
|
||||
End If
|
||||
@ -263,12 +263,12 @@ Public Class frmAdmin2
|
||||
End If
|
||||
Try
|
||||
Dim Filename As String = String.Format("DevExLayoutAdmin2_Email.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
'If File.Exists(xml) Then
|
||||
DataLayoutControl1.SaveLayoutToXml(xml)
|
||||
'End If
|
||||
Filename = String.Format("DevExLayoutAdmin2_GUIPhrases.xml")
|
||||
xml = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
|
||||
xml = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
DataLayoutControl2.SaveLayoutToXml(xml)
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
@ -283,7 +283,7 @@ Public Class frmAdmin2
|
||||
Private Sub BarButtonItem8_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem8.ItemClick
|
||||
Try
|
||||
Dim oFilename = String.Format("DevExLayoutAdmin2_GUIPhrases.xml")
|
||||
Dim oXml = System.IO.Path.Combine(CONFIG.UserConfigPath, oFilename)
|
||||
Dim oXml = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), oFilename)
|
||||
File.Delete(oXml)
|
||||
MsgBox("Form will now close to reload all controls!", MsgBoxStyle.Information)
|
||||
Me.Close()
|
||||
@ -298,7 +298,7 @@ Public Class frmAdmin2
|
||||
Private Sub BarButtonItem9_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem9.ItemClick
|
||||
Try
|
||||
Dim oFilename = String.Format("DevExLayoutAdmin2_Email.xml")
|
||||
Dim oXml = System.IO.Path.Combine(CONFIG.UserConfigPath, oFilename)
|
||||
Dim oXml = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), oFilename)
|
||||
File.Delete(oXml)
|
||||
MsgBox("Form will now close to reload all controls!", MsgBoxStyle.Information)
|
||||
Me.Close()
|
||||
|
||||
@ -176,7 +176,7 @@ Public Class frmKonfig
|
||||
End Sub
|
||||
|
||||
Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
|
||||
Process.Start(CONFIG.UserConfigPath)
|
||||
Process.Start(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""))
|
||||
End Sub
|
||||
|
||||
Private Sub btnopenlog_Click(sender As Object, e As EventArgs) Handles btnopenlog.Click
|
||||
@ -213,7 +213,7 @@ Public Class frmKonfig
|
||||
End Sub
|
||||
|
||||
Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
|
||||
Dim di As New IO.DirectoryInfo(CONFIG.UserConfigPath)
|
||||
Dim di As New IO.DirectoryInfo(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""))
|
||||
Dim diar1 As IO.FileInfo() = di.GetFiles()
|
||||
Dim dra As IO.FileInfo
|
||||
|
||||
|
||||
@ -453,7 +453,7 @@ Public Class frmMain
|
||||
|
||||
Private Function GetXML_OverviewLayoutName()
|
||||
Dim Filename As String = String.Format("DevExpressGridViewOverview_UserLayout_{0}.xml", GRID_LOAD_TYPE)
|
||||
Return System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
|
||||
Return System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
End Function
|
||||
|
||||
Private Sub SaveGridLayout()
|
||||
|
||||
@ -104,7 +104,7 @@ Public Class frmMonitor
|
||||
Load_Doc(oDocPath)
|
||||
|
||||
Catch ex As Exception
|
||||
MsgBox(ex.Message, MsgBoxStyle.Critical, "Error GridView1.FocusedRowChanged:")
|
||||
'MsgBox(ex.Message, MsgBoxStyle.Critical, "Error GridView1.FocusedRowChanged:")
|
||||
End Try
|
||||
End Sub
|
||||
Sub Load_Doc(oDocPath As String)
|
||||
@ -224,7 +224,7 @@ Public Class frmMonitor
|
||||
Sub LoadGrid1Layout()
|
||||
Try
|
||||
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid1.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
If File.Exists(xml) Then
|
||||
GridView1.RestoreLayoutFromXml(xml, OptionsLayoutBase.FullLayout)
|
||||
End If
|
||||
@ -237,7 +237,7 @@ Public Class frmMonitor
|
||||
Sub LoadGrid2Layout()
|
||||
Try
|
||||
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid2.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
If File.Exists(xml) Then
|
||||
GridView2.RestoreLayoutFromXml(xml, OptionsLayoutBase.FullLayout)
|
||||
End If
|
||||
@ -250,7 +250,7 @@ Public Class frmMonitor
|
||||
Sub LoadGrid3Layout()
|
||||
Try
|
||||
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid3.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
If File.Exists(xml) Then
|
||||
GridView3.RestoreLayoutFromXml(xml, OptionsLayoutBase.FullLayout)
|
||||
End If
|
||||
@ -263,7 +263,7 @@ Public Class frmMonitor
|
||||
Sub LoadGrid4Layout()
|
||||
Try
|
||||
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid4.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
If File.Exists(xml) Then
|
||||
GridView4.RestoreLayoutFromXml(xml, OptionsLayoutBase.FullLayout)
|
||||
End If
|
||||
@ -276,9 +276,9 @@ Public Class frmMonitor
|
||||
|
||||
Sub SaveGrid1layout()
|
||||
Try
|
||||
Dim o = CONFIG.UserConfigPath
|
||||
Dim o = CONFIG.UserConfigPath.Replace("UserConfig.xml", "")
|
||||
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid1.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
GridView1.SaveLayoutToXml(xml, OptionsLayoutBase.FullLayout)
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
@ -288,7 +288,7 @@ Public Class frmMonitor
|
||||
Sub RemoveLayout()
|
||||
Try
|
||||
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid1.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
IO.File.Delete(xml)
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
@ -298,7 +298,7 @@ Public Class frmMonitor
|
||||
Sub SaveGrid2layout()
|
||||
Try
|
||||
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid2.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
GridView2.SaveLayoutToXml(xml, OptionsLayoutBase.FullLayout)
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
@ -308,7 +308,7 @@ Public Class frmMonitor
|
||||
Sub RemoveLayout2()
|
||||
Try
|
||||
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid2.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
IO.File.Delete(xml)
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
@ -318,7 +318,7 @@ Public Class frmMonitor
|
||||
Sub SaveGrid3layout()
|
||||
Try
|
||||
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid3.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
GridView3.SaveLayoutToXml(xml, OptionsLayoutBase.FullLayout)
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
@ -328,7 +328,7 @@ Public Class frmMonitor
|
||||
Sub RemoveLayout3()
|
||||
Try
|
||||
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid3.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
IO.File.Delete(xml)
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
@ -338,7 +338,7 @@ Public Class frmMonitor
|
||||
Sub SaveGrid4layout()
|
||||
Try
|
||||
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid4.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
GridView4.SaveLayoutToXml(xml, OptionsLayoutBase.FullLayout)
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
@ -348,7 +348,7 @@ Public Class frmMonitor
|
||||
Sub RemoveLayout4()
|
||||
Try
|
||||
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid4.xml")
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
|
||||
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
IO.File.Delete(xml)
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
|
||||
@ -600,7 +600,7 @@ Public Class frmValidator
|
||||
control.Text = value
|
||||
oValue = value
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
LOGGER.Warn("Error in TextBoxLoadSQLData: " & ex.Message)
|
||||
|
||||
End Try
|
||||
ElseIf TypeOf control Is ComboBox Then
|
||||
@ -618,8 +618,7 @@ Public Class frmValidator
|
||||
oMyComboBox.SelectedIndex = oselectedIndex
|
||||
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
|
||||
LOGGER.Warn("Error in ComboBoxLoadSQLData: " & ex.Message)
|
||||
End Try
|
||||
ElseIf TypeOf control Is LookupControl2 Then
|
||||
Try
|
||||
@ -627,8 +626,8 @@ Public Class frmValidator
|
||||
|
||||
lookup.DataSource = oDTContent
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
|
||||
LOGGER.Warn("Error in LookUpLoadSQLData: " & ex.Message)
|
||||
End Try
|
||||
ElseIf TypeOf control Is GridControl Then
|
||||
Try
|
||||
@ -654,8 +653,7 @@ Public Class frmValidator
|
||||
dataGridView.DataSource = oDataSource
|
||||
End If
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
|
||||
LOGGER.Warn("Error in GridControlSQLData: " & ex.Message)
|
||||
End Try
|
||||
End If
|
||||
Next
|
||||
@ -5500,7 +5498,7 @@ Public Class frmValidator
|
||||
End Sub
|
||||
Private Function GetXML_OverviewLayoutName(pProfilID As Integer, pControlID As Integer)
|
||||
Dim Filename As String = String.Format($"DevExpressValidatorGridControl_{pProfilID}-{pControlID}.xml")
|
||||
Return System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
|
||||
Return System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
End Function
|
||||
Private Function Conversation_init()
|
||||
Try
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user