This commit is contained in:
SchreiberM
2016-03-29 09:52:37 +02:00
parent 58788043c5
commit 49f2dc6f3f
18 changed files with 2619 additions and 815 deletions

View File

@@ -1243,12 +1243,20 @@ Public Class frmConstructor_Main
Me.tsButtonDelete.Enabled = True
Me.tsButtonAdd.Enabled = True
Me.tsButtonSave.Enabled = True
Me.tsButtonEditMode.Text = "Bearbeiten beenden"
Dim stg As String
If USER_LANGUAGE = "de-DE" Then
stg = "Bearbeiten beenden"
Else
stg = "End Working"
End If
Me.tsButtonEditMode.Text = stg
CURRENT_RECORD_ID = RECORD_ID
' Abhängige Listen laden
ClassControlValues.LoadControlValuesListWithPlaceholders(ENTITY_ID, RECORD_ID, PARENT_ID, CtrlBuilder.AllControls)
RECORD_ENABLED = True
CURRENT_RECORD_ENABLED = True
pnlDetails.Focus()
'If RECORD_ENABLED = False Then
' ClassControlValues.LoadControlValuesList(SELECTED_RECORD_ID, ENTITY_ID, CtrlBuilder.AllControls)
@@ -1258,11 +1266,19 @@ Public Class frmConstructor_Main
Sub DisableEditMode()
Lock_RecordControls(True)
RECORD_ENABLED = False
CURRENT_RECORD_ENABLED = False
' Me.pnlDetails.Enabled = False
Me.tsButtonDelete.Enabled = False
'Me.tsButtonAdd.Enabled = False
Me.tsButtonSave.Enabled = False
Me.tsButtonEditMode.Text = "Bearbeiten"
Dim stg As String
If USER_LANGUAGE = "de-DE" Then
stg = "Bearbeiten"
Else
stg = "Work record"
End If
Me.tsButtonEditMode.Text = stg
Me.tsButtonEditMode.Text = stg
'Funktion nur zum load der Inhalte
If RECORD_ENABLED = True Then
@@ -2576,8 +2592,13 @@ Public Class frmConstructor_Main
If windreamSucheErgebnisse.Count > 0 Then
TabWindream.Text = "windream-Dateien (" & windreamSucheErgebnisse.Count & ")"
Dim stg As String
If USER_LANGUAGE = "de-DE" Then
stg = "windream-Dateien"
Else
stg = "windream-files"
End If
TabWindream.Text = stg & " (" & windreamSucheErgebnisse.Count & ")"
AxObjectListControl.SetIconMode(True)
AxObjectListControl.RemoveAllColumnHeader()
@@ -2712,7 +2733,11 @@ Public Class frmConstructor_Main
Sub Clear_Windream_ResultList()
AxObjectListControl.RemoveAllColumnHeader()
Me.AxObjectListControl.ClearResultList()
TabWindream.Text = "windream-Dateien"
Dim stg As String = "windream-Dateien"
If USER_LANGUAGE <> "de-DE" Then
stg = "windream-files"
End If
TabWindream.Text = stg
End Sub
Sub CheckDocView()
Dim _index = AxObjectListControl.GetFirstSelectedObject
@@ -3356,7 +3381,7 @@ Public Class frmConstructor_Main
Cursor = Cursors.WaitCursor
If ClassOfficeTemplate.Open_Word_Template(TemplateID, RECORD_ID) = True Then
RUN_WD_SEARCH(WD_Suche, "RECORD")
Update_Status_Label(True, "Vorlagen-Datei erfolgreich nach windream importiert!", EditState.Insert)
Update_Status_Label(True, "Template file imported to windream", EditState.Insert)
End If
Cursor = Cursors.Default
Else