From 0e25043214ca2497b44e2b4b88ad945f6180ac08 Mon Sep 17 00:00:00 2001 From: Andreas Abraham Date: Fri, 18 Jun 2021 13:36:09 +0200 Subject: .gitignore changed --- .gitignore | 4 +++- .../at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8ec0355c..8df48b56 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,6 @@ log/ pdf-over-build/ release.properties *.jar-bak -*.iml \ No newline at end of file +*.iml +*.idea +/installer/windows/* \ No newline at end of file diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java index 269f72d3..91fd9023 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java @@ -746,6 +746,10 @@ public class SimpleConfigurationComposite extends BaseConfigurationComposite { setSignatureProfileSetting(); } + void adoptSignatureNoteText(){ + //TODO check if one of the text + } + void setSignatureProfileSetting(){ if (this.signer == null){ log.debug("In setSignatureProfileSettings: Signer was null"); -- cgit v1.2.3 From 7a032cc75008748df505f2939984f6d33d24d58e Mon Sep 17 00:00:00 2001 From: Andreas Abraham Date: Fri, 18 Jun 2021 16:16:31 +0200 Subject: added alignement of signature note text to selected profile --- .../composites/SimpleConfigurationComposite.java | 47 +++++++++++++++++++--- .../at/asit/pdfover/gui/messages.properties | 4 +- .../at/asit/pdfover/gui/messages_de.properties | 11 +++-- 3 files changed, 51 insertions(+), 11 deletions(-) diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java index 91fd9023..82468547 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.util.Locale; import javax.imageio.ImageIO; +import javax.swing.*; import at.asit.pdfover.signator.SignaturePosition; import org.eclipse.swt.SWT; @@ -551,8 +552,8 @@ public class SimpleConfigurationComposite extends BaseConfigurationComposite { this.btnSignatureNoteDefault.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - SimpleConfigurationComposite.this.txtSignatureNote.setText( - Messages.getString("simple_config.Note_Default", //$NON-NLS-1$ + SimpleConfigurationComposite.this.txtSignatureNote.setText(getSignatureBlockNoteTextAccordingToProfile( + SimpleConfigurationComposite.this.configurationContainer.getSignatureProfile(), SimpleConfigurationComposite.this.configurationContainer.getSignatureLocale())); } }); @@ -727,13 +728,15 @@ public class SimpleConfigurationComposite extends BaseConfigurationComposite { this.configurationContainer.setSignatureLocale(selected); this.cmbSignatureLang.select(this.getLocaleElementIndex(selected)); if (previous != null) { - String prev_default_note = Messages.getString("simple_config.Note_Default", previous); //$NON-NLS-1$ + String prev_default_note = getSignatureBlockNoteTextAccordingToProfile(this.configurationContainer.getSignatureProfile(), previous); if (this.txtSignatureNote.getText().equals(prev_default_note)) { - this.txtSignatureNote.setText(Messages.getString("simple_config.Note_Default", selected)); //$NON-NLS-1$); + this.txtSignatureNote.setText(getSignatureBlockNoteTextAccordingToProfile(this.configurationContainer.getSignatureProfile(), selected)); //$NON-NLS-1$); processSignatureNoteChanged(); } } } + + void preformProfileSelectionChanged(Profile selected) { log.debug("Signature Profile {} was selected", selected.name()); //$NON-NLS-1$ @@ -744,10 +747,42 @@ public class SimpleConfigurationComposite extends BaseConfigurationComposite { this.configurationContainer.setDefaultSignaturePosition(new SignaturePosition()); } setSignatureProfileSetting(); + alignSignatureNoteTextToProfile(selected); + + } + + void alignSignatureNoteTextToProfile(Profile profile){ + + if (detectChanges(profile) == false){ + this.txtSignatureNote.setText(getSignatureBlockNoteTextAccordingToProfile(profile)); + this.configurationContainer.setSignatureNote( + Messages.getString(getSignatureBlockNoteTextAccordingToProfile(profile)) + ); + } + + } + + boolean detectChanges(Profile profile){ + if (this.configurationContainer.getSignatureNote().equals(getSignatureBlockNoteTextAccordingToProfile(Profile.AMTSSIGNATURBLOCK)) || + this.configurationContainer.getSignatureNote().equals(getSignatureBlockNoteTextAccordingToProfile(Profile.SIGNATURBLOCK_SMALL))) { + return false; + } + return true; + } + + String getSignatureBlockNoteTextAccordingToProfile(Profile profile, Locale locale){ + + if (profile.equals(Profile.SIGNATURBLOCK_SMALL)){ + return Messages.getString("simple_config.Note_Default_Standard", locale); + } else if (profile.equals(Profile.AMTSSIGNATURBLOCK)){ + return Messages.getString("simple_config.Note_Default_OfficialSignature", locale); + } else { + return ""; + } } - void adoptSignatureNoteText(){ - //TODO check if one of the text + String getSignatureBlockNoteTextAccordingToProfile(Profile profile){ + return getSignatureBlockNoteTextAccordingToProfile(profile, this.configurationContainer.getSignatureLocale()); } void setSignatureProfileSetting(){ diff --git a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties index 31542be4..6ad3466e 100644 --- a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties +++ b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties @@ -223,7 +223,9 @@ simple_config.ExampleNumber_ToolTip=To use a default mobile phone number enter i simple_config.INVISIBLE=Invisible Signature simple_config.MobileBKU_Title=&Mobile signature simple_config.Note=Text\: -simple_config.Note_Default=This document is signed with a qualified electronic signature. According to Art.\u00A025 para.\u00A02 of the Regulation (EU) No 910/2014 of 23. July 2014 ("eIDAS-Regulation") it shall have the equivalent legal effect of a handwritten signature. +simple_config.Note_Default_Standard=This document is signed with a qualified electronic signature. According to Art.\u00A025 para.\u00A02 of the Regulation (EU) No 910/2014 of 23. July 2014 ("eIDAS-Regulation") it shall have the equivalent legal effect of a handwritten signature. +simple_config.Note_Default_OfficialSignature=This document was signed/sealed with an official signature. According to \u00a7 20 Austrian E-Government-Act a printout of this document is assumed to be authentic. +simple_config.Note_Default_Empty= simple_config.Note_Default_Old=This document is signed with a qualified electronic signature. According to \u00A7\u00A04 art.\u00A01 of the Signature Act it in principle is legally equivalent to a handwritten signature. simple_config.Note_SetDefault=Restore default simple_config.Note_Title=Signature &Note diff --git a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages_de.properties b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages_de.properties index 15f49526..033df83d 100644 --- a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages_de.properties +++ b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages_de.properties @@ -106,7 +106,7 @@ common.info=Information common.open=\u00D6ffnen common.warning=Warnung config.About=\u00DC&ber %s -config.AboutText=Diese Software wird von A-SIT unter den Bedingungen der EUPL frei zur Verfügung gestellt.\nLizenbedingungen unter https://technology.a-sit.at/lizenzbedingungen/.\n\nBeachten Sie, dass Komponenten unter eigenen Lizenzen zur Verfügung gestellt werden, die teilweise nur für EUPL-lizensierte Software zur freien Verwendung vorgesehen sind. +config.AboutText=Diese Software wird von A-SIT unter den Bedingungen der EUPL frei zur Verf�gung gestellt.\nLizenbedingungen unter https://technology.a-sit.at/lizenzbedingungen/.\n\nBeachten Sie, dass Komponenten unter eigenen Lizenzen zur Verf�gung gestellt werden, die teilweise nur f�r EUPL-lizensierte Software zur freien Verwendung vorgesehen sind. config.LicenseURL=https://technology.a-sit.at/lizenzbedingungen/ config.Advanced=Er&weitert config.Keystore=&Keystore @@ -133,7 +133,7 @@ error.InvalidPhoneNumber=Telefonnummer ung\u00FCltig\! Beispiel\: +4366412345678 error.InvalidSettings=Ung\u00FCltige Einstellungen vorhanden. Bitte \u00FCberpr\u00FCfen. error.KeyStore=Fehler beim Laden des KeyStores. Falsches Passwort? error.KeyStoreAliasExist=Key-Alias %s nicht im Keystore gefunden -error.KeyStoreAliasNoKey=Alias %s ist kein Schlüssel +error.KeyStoreAliasNoKey=Alias %s ist kein Schl�ssel error.KeyStoreFileNotExist=Keystore-Datei %s existiert nicht\! error.KeyStoreKeyPass=Schl\u00FCssel-Passwort nicht akzeptiert error.LocalBKU=Bitte pr\u00FCfen sie, ob Ihre lokale BKU (B\u00FCrgerkartenumgebung) l\u00E4uft\n\nSie ben\u00F6tigen eine BKU, um auf Ihre B\u00FCrgerkarte zuzugreifen. Weitere Informationen unter www.buergerkarte.at @@ -210,7 +210,10 @@ simple_config.ExampleNumber=+43676123456789 simple_config.ExampleNumber_ToolTip=Um die Handynummer voreinzustellen hier eingeben simple_config.MobileBKU_Title=&Handy-Signatur simple_config.Note=Text\: -simple_config.Note_Default=Dieses mit einer qualifizierten elektronischen Signatur versehene Dokument hat gem\u00E4\u00DF Art. 25 Abs. 2 der Verordnung (EU) Nr. 910/2014 vom 23.\u00A0Juli\u00A02014 ("eIDAS-VO") die gleiche Rechtswirkung wie ein handschriftlich unterschriebenes Dokument. +#simple_config.Note_Default=Dieses mit einer qualifizierten elektronischen Signatur versehene Dokument hat gem\u00E4\u00DF Art.�25 Abs.�2 der Verordnung (EU) Nr. 910/2014 vom 23.\u00A0Juli\u00A02014 ("eIDAS-VO") die gleiche Rechtswirkung wie ein handschriftlich unterschriebenes Dokument. +simple_config.Note_Default_Standard=Dieses mit einer qualifizierten elektronischen Signatur versehene Dokument hat gem\u00e4\u00df Art. 25 Abs. 2 der Verordnung (EU) Nr. 910/2014 vom 23. Juli 2014 (\"eIDAS-VO\") die gleiche Rechtswirkung wie ein handschriftlich unterschriebenes Dokument. +simple_config.Note_Default_OfficialSignature=Dieses Dokument wurde amtssigniert. Auch ein Ausdruck dieses Dokuments hat gem\u00e4\u00df \u00A7 20 E-Government-Gesetz die Beweiskraft einer \u00f6ffentlichen Urkunde. +simple_config.Note_Default_Empty= simple_config.Note_Default_Old=Dieses mit einer qualifizierten elektronischen Signatur versehene Dokument ist gem\u00E4\u00DF \u00A7\u00A04 Abs.\u00A01 Signaturgesetz einem handschriftlich unterschriebenen Dokument grunds\u00E4tzlich rechtlich gleichgestellt. simple_config.Note_SetDefault=Standard wiederherstellen simple_config.Note_Title=Signaturhi&nweis @@ -234,4 +237,4 @@ version_check.UpdateText=Version %s ist verf\u00FCgbar\nJetzt Download-Seite \u0 version_check.UpdateTitle=Neue Version verf\u00FCgbar\! waiting.message=Signaturerstellung l\u00E4uft... waiting_for_app.message=Bitte \u00f6ffnen Sie die Handy-Signatur App! -positioning.placeholder=Bitte wählen Sie den gewünschte\nPlatzhalter aus der Liste aus +positioning.placeholder=Bitte w�hlen Sie den gew�nschte\nPlatzhalter aus der Liste aus -- cgit v1.2.3 From 995742efd6130721f1ac559a61ceaf0b09727148 Mon Sep 17 00:00:00 2001 From: Andreas Abraham Date: Fri, 18 Jun 2021 16:44:05 +0200 Subject: fixed behaviour --- .../gui/composites/SimpleConfigurationComposite.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java index 82468547..05efd217 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java @@ -728,9 +728,10 @@ public class SimpleConfigurationComposite extends BaseConfigurationComposite { this.configurationContainer.setSignatureLocale(selected); this.cmbSignatureLang.select(this.getLocaleElementIndex(selected)); if (previous != null) { - String prev_default_note = getSignatureBlockNoteTextAccordingToProfile(this.configurationContainer.getSignatureProfile(), previous); + Profile profile = Profile.values()[this.cmbSignatureProfiles.getSelectionIndex()]; + String prev_default_note = getSignatureBlockNoteTextAccordingToProfile(profile, previous); if (this.txtSignatureNote.getText().equals(prev_default_note)) { - this.txtSignatureNote.setText(getSignatureBlockNoteTextAccordingToProfile(this.configurationContainer.getSignatureProfile(), selected)); //$NON-NLS-1$); + this.txtSignatureNote.setText(getSignatureBlockNoteTextAccordingToProfile(profile, selected)); //$NON-NLS-1$); processSignatureNoteChanged(); } } @@ -763,8 +764,13 @@ public class SimpleConfigurationComposite extends BaseConfigurationComposite { } boolean detectChanges(Profile profile){ - if (this.configurationContainer.getSignatureNote().equals(getSignatureBlockNoteTextAccordingToProfile(Profile.AMTSSIGNATURBLOCK)) || - this.configurationContainer.getSignatureNote().equals(getSignatureBlockNoteTextAccordingToProfile(Profile.SIGNATURBLOCK_SMALL))) { + + String note = this.txtSignatureNote.getText(); + note = note.replace("!",""); + if (note.equals(getSignatureBlockNoteTextAccordingToProfile(Profile.AMTSSIGNATURBLOCK)) || + note.equals(getSignatureBlockNoteTextAccordingToProfile(Profile.SIGNATURBLOCK_SMALL)) || + note.equals(getSignatureBlockNoteTextAccordingToProfile(Profile.INVISIBLE)) || + note.equals(getSignatureBlockNoteTextAccordingToProfile(Profile.BASE_LOGO))){ return false; } return true; -- cgit v1.2.3