From 5b6ff954e11f40df5cbcb3f6e41471d5dffd9c0b Mon Sep 17 00:00:00 2001 From: Governikus Date: Fri, 19 Jan 2024 10:36:28 +0100 Subject: [PATCH] Add revision: v2.0.3 --- CMakeLists.txt | 2 +- docs/releasenotes/2.0.2.rst | 13 +++++++++++ docs/releasenotes/2.0.3.rst | 17 ++++++++++++++ docs/releasenotes/appcast.rst | 1 + docs/releasenotes/versions.rst | 1 + .../qml/Governikus/Global/+desktop/GPane.qml | 23 +++++++++++-------- resources/translations/ausweisapp2_de.ts | 5 ---- resources/translations/ausweisapp2_ru.ts | 5 ---- resources/translations/ausweisapp2_uk.ts | 5 ---- src/ui/qml/PinResetInformationModel.cpp | 2 +- 10 files changed, 47 insertions(+), 27 deletions(-) create mode 100644 docs/releasenotes/2.0.2.rst create mode 100644 docs/releasenotes/2.0.3.rst diff --git a/CMakeLists.txt b/CMakeLists.txt index b172c463e..a379e35df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ if(UNIX AND NOT IOS) set(CMAKE_OSX_DEPLOYMENT_TARGET 11.0 CACHE STRING "Required macOS version") endif() -project(AusweisApp VERSION 2.0.2 LANGUAGES ${LANGUAGES}) +project(AusweisApp VERSION 2.0.3 LANGUAGES ${LANGUAGES}) # Set TWEAK if not defined in PROJECT_VERSION above to # have a valid tweak version without propagating it diff --git a/docs/releasenotes/2.0.2.rst b/docs/releasenotes/2.0.2.rst new file mode 100644 index 000000000..60d0cae94 --- /dev/null +++ b/docs/releasenotes/2.0.2.rst @@ -0,0 +1,13 @@ +AusweisApp 2.0.2 +^^^^^^^^^^^^^^^^ + +**Releasedatum:** 12. Januar 2024 + + +Anwender +"""""""" +- Vermeidung von Verweisen auf den PIN-Rücksetzdienst. + + +Entwickler +"""""""""" diff --git a/docs/releasenotes/2.0.3.rst b/docs/releasenotes/2.0.3.rst new file mode 100644 index 000000000..c507235d3 --- /dev/null +++ b/docs/releasenotes/2.0.3.rst @@ -0,0 +1,17 @@ +AusweisApp 2.0.3 +^^^^^^^^^^^^^^^^ + +**Releasedatum:** 19. Januar 2024 + + +Anwender +"""""""" +- Absturz unter macOS 11 korrigiert. + +- Fehlende deutsche Übersetzung ergänzt. + +- Anzeige der Release Notes korrigiert. + + +Entwickler +"""""""""" diff --git a/docs/releasenotes/appcast.rst b/docs/releasenotes/appcast.rst index 846d9be50..52afbedf2 100644 --- a/docs/releasenotes/appcast.rst +++ b/docs/releasenotes/appcast.rst @@ -4,6 +4,7 @@ Release Notes .. toctree:: :maxdepth: 1 + 2.0.3 2.0.2 2.0.1 2.0.0 diff --git a/docs/releasenotes/versions.rst b/docs/releasenotes/versions.rst index 06d8ca57f..72cc1152d 100644 --- a/docs/releasenotes/versions.rst +++ b/docs/releasenotes/versions.rst @@ -6,6 +6,7 @@ Versionszweig 2.0 .. toctree:: :maxdepth: 1 + 2.0.3 2.0.2 2.0.1 2.0.0 diff --git a/resources/qml/Governikus/Global/+desktop/GPane.qml b/resources/qml/Governikus/Global/+desktop/GPane.qml index d72ea36f0..354ecd2d0 100644 --- a/resources/qml/Governikus/Global/+desktop/GPane.qml +++ b/resources/qml/Governikus/Global/+desktop/GPane.qml @@ -11,6 +11,7 @@ GPaneBackground { id: root property alias content: paneContent + property int contentPadding: Constants.pane_padding default property alias data: paneContent.data property bool drawShadow: true property alias spacing: paneContent.spacing @@ -20,6 +21,7 @@ GPaneBackground { Accessible.focusable: title !== "" Accessible.name: title Accessible.role: Accessible.Grouping + Layout.maximumHeight: containerCol.Layout.maximumHeight activeFocusOnTab: title !== "" implicitHeight: containerCol.implicitHeight implicitWidth: containerCol.implicitWidth @@ -30,24 +32,22 @@ GPaneBackground { effect: GDropShadow { } } - Column { + ColumnLayout { id: containerCol - anchors.left: parent.left - anchors.leftMargin: Constants.pane_padding - anchors.right: parent.right - anchors.rightMargin: Constants.pane_padding - bottomPadding: Constants.pane_padding - spacing: Constants.pane_spacing - topPadding: Constants.pane_padding + anchors.fill: parent + spacing: Constants.text_spacing GText { id: titleText + Layout.leftMargin: Constants.pane_padding + Layout.rightMargin: Constants.pane_padding + Layout.topMargin: Constants.pane_padding elide: Text.ElideRight maximumLineCount: 1 textStyle: Style.text.subline - width: Math.min(parent.width, Math.ceil(implicitWidth)) + visible: text !== "" FocusFrame { scope: root @@ -56,8 +56,11 @@ GPaneBackground { ColumnLayout { id: paneContent + Layout.bottomMargin: root.contentPadding + Layout.leftMargin: root.contentPadding + Layout.rightMargin: root.contentPadding + Layout.topMargin: titleText.visible ? 0 : root.contentPadding spacing: Constants.pane_spacing - width: parent.width } } } diff --git a/resources/translations/ausweisapp2_de.ts b/resources/translations/ausweisapp2_de.ts index 528bcad28..e0875f658 100644 --- a/resources/translations/ausweisapp2_de.ts +++ b/resources/translations/ausweisapp2_de.ts @@ -5726,11 +5726,6 @@ Um fortzufahren, verwenden Sie Ihren Ausweis, indem Sie die NFC-Schnittstelle au LABEL ALL_PLATFORMS Hint text for requested Transport PIN but both, Transport PIN and PIN, are not known. Dann fordern Sie jetzt mithilfe des PIN-Rücksetzdienstes kostenlos eine neue Karten-PIN an. - - You may turn to the competent authority and set a new PIN there.<br/><br/>For further information, please visit the ID card portal. - LABEL ALL_PLATFORMS Hint text for requested Transport PIN but both, Transport PIN and PIN are not known. - - governikus::ReaderModel diff --git a/resources/translations/ausweisapp2_ru.ts b/resources/translations/ausweisapp2_ru.ts index f934f5808..a545fca43 100644 --- a/resources/translations/ausweisapp2_ru.ts +++ b/resources/translations/ausweisapp2_ru.ts @@ -5699,11 +5699,6 @@ To proceed use your ID card by selecting the NFC interface. If you want to set u LABEL ALL_PLATFORMS Hint text for requested Transport PIN but both, Transport PIN and PIN, are not known. Вы можете воспользоваться службой сброса PIN-кода, чтобы бесплатно запросить новый PIN-код карты. - - You may turn to the competent authority and set a new PIN there.<br/><br/>For further information, please visit the ID card portal. - LABEL ALL_PLATFORMS Hint text for requested Transport PIN but both, Transport PIN and PIN are not known. - - governikus::ReaderModel diff --git a/resources/translations/ausweisapp2_uk.ts b/resources/translations/ausweisapp2_uk.ts index c8d095308..daf2ac61f 100644 --- a/resources/translations/ausweisapp2_uk.ts +++ b/resources/translations/ausweisapp2_uk.ts @@ -5726,11 +5726,6 @@ To proceed use your ID card by selecting the NFC interface. If you want to set u LABEL ALL_PLATFORMS Hint text for requested Transport PIN but both, Transport PIN and PIN, are not known. Ви можете скористатися службою скидання PIN-коду, щоб безкоштовно надіслати запит на новий PIN-код картки. - - You may turn to the competent authority and set a new PIN there.<br/><br/>For further information, please visit the ID card portal. - LABEL ALL_PLATFORMS Hint text for requested Transport PIN but both, Transport PIN and PIN are not known. - - governikus::ReaderModel diff --git a/src/ui/qml/PinResetInformationModel.cpp b/src/ui/qml/PinResetInformationModel.cpp index 6555effce..685a4916d 100644 --- a/src/ui/qml/PinResetInformationModel.cpp +++ b/src/ui/qml/PinResetInformationModel.cpp @@ -99,7 +99,7 @@ QString PinResetInformationModel::getPinResetHintNoPin() const //: LABEL ALL_PLATFORMS Hint text for requested Transport PIN but both, Transport PIN and PIN, are not known. tr("You can use the PIN Reset Service to request a new card PIN free of charge.") : //: LABEL ALL_PLATFORMS Hint text for requested Transport PIN but both, Transport PIN and PIN are not known. - tr("You may turn to the competent authority and set a new PIN there.

For further information, please visit the ID card portal."); + tr("You may turn to the competent authority and set a new ID card PIN there.

For further information, please visit the ID card portal."); }