From 1eba05e5f7fcb8c61f00ac2248441c4cbc768b05 Mon Sep 17 00:00:00 2001 From: pitzm Date: Fri, 8 Dec 2023 11:23:20 +0100 Subject: [PATCH] 08-12-2023 --- EnvelopeGenerator.Common/Models/EnvelopeModel.vb | 2 +- EnvelopeGenerator.Common/Strings/Envelope.en.resx | 3 +++ EnvelopeGenerator.Common/Strings/Envelope.resx | 3 +++ EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb | 9 +++++++++ EnvelopeGenerator.Form/frmFieldEditor.vb | 7 ++++--- 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/EnvelopeGenerator.Common/Models/EnvelopeModel.vb b/EnvelopeGenerator.Common/Models/EnvelopeModel.vb index 32f34289..15142bb9 100644 --- a/EnvelopeGenerator.Common/Models/EnvelopeModel.vb +++ b/EnvelopeGenerator.Common/Models/EnvelopeModel.vb @@ -131,7 +131,7 @@ Public Class EnvelopeModel If Database.ExecuteNonQuery(oCommand) Then pEnvelope.Id = GetEnvelopeId(pEnvelope) - SetEnvelopeDate(pEnvelope) 'TODO JJ fragen + SetEnvelopeDate(pEnvelope) Return True Else Return False diff --git a/EnvelopeGenerator.Common/Strings/Envelope.en.resx b/EnvelopeGenerator.Common/Strings/Envelope.en.resx index a5b08ff0..9c4738bf 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope.en.resx +++ b/EnvelopeGenerator.Common/Strings/Envelope.en.resx @@ -231,6 +231,9 @@ There are already elements for this recipient. Do you still want to delete the recipient? + + There are unsaved changes. Do you want to save them? + You received a document to sign: diff --git a/EnvelopeGenerator.Common/Strings/Envelope.resx b/EnvelopeGenerator.Common/Strings/Envelope.resx index 4e10b1bc..58e5c8a3 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope.resx +++ b/EnvelopeGenerator.Common/Strings/Envelope.resx @@ -231,6 +231,9 @@ Es gibt für diesen Empfänger bereits Elemente. Wollen Sie den Empfänger trotzdem löschen? + + Es sind ungespeicherte Änderungen vorhanden. Wollen Sie diese Speichern? + Sie haben ein Dokument zum signieren erhalten: diff --git a/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb b/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb index a90fda87..af9ddbca 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb +++ b/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb @@ -406,6 +406,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Es sind ungespeicherte Änderungen vorhanden. Wollen Sie diese Speichern? ähnelt. + ''' + Public Shared ReadOnly Property There_are_unsaved_changes() As String + Get + Return ResourceManager.GetString("There are unsaved changes", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Sie haben ein Dokument zum signieren erhalten: ähnelt. ''' diff --git a/EnvelopeGenerator.Form/frmFieldEditor.vb b/EnvelopeGenerator.Form/frmFieldEditor.vb index badcf5c7..fa5147f3 100644 --- a/EnvelopeGenerator.Form/frmFieldEditor.vb +++ b/EnvelopeGenerator.Form/frmFieldEditor.vb @@ -25,7 +25,7 @@ Partial Public Class frmFieldEditor Private UnsavedChanges As Boolean = False - Private Const SIGNATURE_LABEL = "Signatur" + Private SIGNATURE_LABEL As String Private Const SIGNATURE_WIDTH As Single = 1 Private Const SIGNATURE_HEIGHT As Single = 0.5 @@ -39,6 +39,7 @@ Partial Public Class frmFieldEditor Private Sub Form1_Load(sender As Object, e As EventArgs) Handles Me.Load Text = $"{State.DbConfig.ExternalProgramName} - {Resources.Envelope.Signature_Editor}" + SIGNATURE_LABEL = Resources.Envelope.Signature If Document Is Nothing Then Throw New ArgumentNullException("Document") @@ -251,7 +252,7 @@ Partial Public Class frmFieldEditor Exit Sub End If - If MsgBox("Wollen Sie die Signatur löschen?", MsgBoxStyle.YesNo Or MsgBoxStyle.Question, Text) = DialogResult.Yes Then + If MsgBox(Resources.Envelope.Do_you_want_to_delete_the_signature, MsgBoxStyle.YesNo Or MsgBoxStyle.Question, Text) = DialogResult.Yes Then Dim oAnnotation = GDViewer.GetAnnotationFromIdx(oSelected) Dim oElement = Controller.GetElement(oAnnotation) @@ -410,7 +411,7 @@ Partial Public Class frmFieldEditor Private Sub frmFieldEditor_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing If UnsavedChanges Then - Dim oResult = MsgBox("Es sind ungespeicherte Änderungen vorhanden. Wollen Sie diese Speichern?", MsgBoxStyle.Question Or MsgBoxStyle.YesNoCancel, Text) + Dim oResult = MsgBox(Resources.Envelope.There_are_unsaved_changes, MsgBoxStyle.Question Or MsgBoxStyle.YesNoCancel, Text) Select Case oResult Case MsgBoxResult.Cancel