2.0.0.4
This commit is contained in:
parent
c1081ca4b1
commit
e0fae60798
@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
|||||||
' übernehmen, indem Sie "*" eingeben:
|
' übernehmen, indem Sie "*" eingeben:
|
||||||
' <Assembly: AssemblyVersion("1.0.*")>
|
' <Assembly: AssemblyVersion("1.0.*")>
|
||||||
|
|
||||||
<Assembly: AssemblyVersion("2.0.0.3")>
|
<Assembly: AssemblyVersion("2.0.0.4")>
|
||||||
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
||||||
|
|||||||
@ -1,11 +1,12 @@
|
|||||||
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
|
||||||
DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
|
||||||
DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
|
||||||
DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||||
DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
|
||||||
DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
|
||||||
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
|
||||||
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
|
||||||
DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||||
|
DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||||
DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||||
|
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||||
|
DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||||
|
DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||||
|
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||||
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||||
|
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||||
|
DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||||
|
DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||||
|
|||||||
1234
app/DD_PM_WINDREAM/frmAdmin2.Designer.vb
generated
1234
app/DD_PM_WINDREAM/frmAdmin2.Designer.vb
generated
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -4,11 +4,12 @@ Imports System.IO
|
|||||||
Imports DevExpress.XtraTab
|
Imports DevExpress.XtraTab
|
||||||
|
|
||||||
Public Class frmAdmin2
|
Public Class frmAdmin2
|
||||||
|
Dim oSave As Boolean = True
|
||||||
|
|
||||||
Private Sub frmAdmin2_Load(sender As Object, e As EventArgs) Handles MyBase.Load
|
Private Sub frmAdmin2_Load(sender As Object, e As EventArgs) Handles MyBase.Load
|
||||||
Load_Email_template()
|
Load_Email_template()
|
||||||
Load_Gui_Phrases()
|
Load_Gui_Phrases()
|
||||||
|
oSave = True
|
||||||
Try
|
Try
|
||||||
Dim oFilename As String = String.Format("DevExLayoutAdmin2_Email.xml")
|
Dim oFilename As String = String.Format("DevExLayoutAdmin2_Email.xml")
|
||||||
Dim oXml As String = System.IO.Path.Combine(Application.UserAppDataPath(), oFilename)
|
Dim oXml As String = System.IO.Path.Combine(Application.UserAppDataPath(), oFilename)
|
||||||
@ -24,7 +25,7 @@ Public Class frmAdmin2
|
|||||||
|
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
LOGGER.Error(ex)
|
LOGGER.Error(ex)
|
||||||
LOGGER.Info("Error while restoring layout 1: " & ex.Message)
|
LOGGER.Info("Error while restoring Datalayout: " & ex.Message)
|
||||||
End Try
|
End Try
|
||||||
|
|
||||||
End Sub
|
End Sub
|
||||||
@ -145,15 +146,7 @@ Public Class frmAdmin2
|
|||||||
DD_DMSLiteDataSet.TBDD_GUI_LANGUAGE_PHRASE.ADDED_WHOColumn.DefaultValue = USER_USERNAME
|
DD_DMSLiteDataSet.TBDD_GUI_LANGUAGE_PHRASE.ADDED_WHOColumn.DefaultValue = USER_USERNAME
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Sub INTERNALCheckBox_CheckedChanged(sender As Object, e As EventArgs)
|
|
||||||
If INTERNALCheckEdit.Checked Then
|
|
||||||
TextEdit2.ReadOnly = True
|
|
||||||
OBJ_NAMETextEdit.ReadOnly = True
|
|
||||||
Else
|
|
||||||
TextEdit2.ReadOnly = False
|
|
||||||
OBJ_NAMETextEdit.ReadOnly = False
|
|
||||||
End If
|
|
||||||
End Sub
|
|
||||||
|
|
||||||
Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem7.ItemClick
|
Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem7.ItemClick
|
||||||
Dim oText = EMAIL_BODY1TextEdit.Text
|
Dim oText = EMAIL_BODY1TextEdit.Text
|
||||||
@ -169,6 +162,9 @@ Public Class frmAdmin2
|
|||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Sub frmAdmin2_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
|
Private Sub frmAdmin2_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
|
||||||
|
If oSave = False Then
|
||||||
|
Exit Sub
|
||||||
|
End If
|
||||||
Try
|
Try
|
||||||
Dim Filename As String = String.Format("DevExLayoutAdmin2_Email.xml")
|
Dim Filename As String = String.Format("DevExLayoutAdmin2_Email.xml")
|
||||||
Dim xml As String = System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
|
Dim xml As String = System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
|
||||||
@ -180,9 +176,53 @@ Public Class frmAdmin2
|
|||||||
DataLayoutControl2.SaveLayoutToXml(xml)
|
DataLayoutControl2.SaveLayoutToXml(xml)
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
LOGGER.Error(ex)
|
LOGGER.Error(ex)
|
||||||
LOGGER.Info("Error while restoring layout 1: " & ex.Message)
|
LOGGER.Info("Error while saving datalayout: " & ex.Message)
|
||||||
End Try
|
End Try
|
||||||
|
|
||||||
|
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
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(Application.UserAppDataPath(), oFilename)
|
||||||
|
File.Delete(oXml)
|
||||||
|
MsgBox("Form will now close to reload all controls!", MsgBoxStyle.Information)
|
||||||
|
Me.Close()
|
||||||
|
oSave = False
|
||||||
|
Catch ex As Exception
|
||||||
|
LOGGER.Error(ex)
|
||||||
|
End Try
|
||||||
|
|
||||||
|
|
||||||
|
End Sub
|
||||||
|
|
||||||
|
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(Application.UserAppDataPath(), oFilename)
|
||||||
|
File.Delete(oXml)
|
||||||
|
MsgBox("Form will now close to reload all controls!", MsgBoxStyle.Information)
|
||||||
|
Me.Close()
|
||||||
|
oSave = False
|
||||||
|
Catch ex As Exception
|
||||||
|
LOGGER.Error(ex)
|
||||||
|
End Try
|
||||||
|
End Sub
|
||||||
|
|
||||||
|
Private Sub INTERNALCheckEdit_CheckedChanged_1(sender As Object, e As EventArgs) Handles INTERNALCheckEdit.CheckedChanged
|
||||||
|
If INTERNALCheckEdit.Checked Then
|
||||||
|
TextEdit2.ReadOnly = True
|
||||||
|
OBJ_NAMETextEdit.ReadOnly = True
|
||||||
|
STRING1TextEdit.ReadOnly = True
|
||||||
|
STRING2TextEdit.ReadOnly = True
|
||||||
|
Else
|
||||||
|
TextEdit2.ReadOnly = False
|
||||||
|
OBJ_NAMETextEdit.ReadOnly = False
|
||||||
|
STRING1TextEdit.ReadOnly = False
|
||||||
|
STRING2TextEdit.ReadOnly = False
|
||||||
|
End If
|
||||||
|
End Sub
|
||||||
End Class
|
End Class
|
||||||
Loading…
x
Reference in New Issue
Block a user