Add revision: v2.0.3

Governikus · Jan 19, 2024 · 5b6ff95 · 5b6ff95
1 parent 76466ca
commit 5b6ff95
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 27 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -5726,11 +5726,6 @@ Um fortzufahren, verwenden Sie Ihren Ausweis, indem Sie die NFC-Schnittstelle au
         <extracomment>LABEL ALL_PLATFORMS Hint text for requested Transport PIN but both, Transport PIN and PIN, are not known.</extracomment>
         <translation>Dann fordern Sie jetzt mithilfe des PIN-Rücksetzdienstes kostenlos eine neue Karten-PIN an.</translation>
     </message>
-    <message>
-        <source>You may turn to the competent authority and set a new PIN there.&lt;br/&gt;&lt;br/&gt;For further information, please visit the ID card portal.</source>
-        <extracomment>LABEL ALL_PLATFORMS Hint text for requested Transport PIN but both, Transport PIN and PIN are not known.</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>governikus::ReaderModel</name>

diff --git 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
         <extracomment>LABEL ALL_PLATFORMS Hint text for requested Transport PIN but both, Transport PIN and PIN, are not known.</extracomment>
         <translation>Вы можете воспользоваться службой сброса PIN-кода, чтобы бесплатно запросить новый PIN-код карты.</translation>
     </message>
-    <message>
-        <source>You may turn to the competent authority and set a new PIN there.&lt;br/&gt;&lt;br/&gt;For further information, please visit the ID card portal.</source>
-        <extracomment>LABEL ALL_PLATFORMS Hint text for requested Transport PIN but both, Transport PIN and PIN are not known.</extracomment>
-        <translation></translation>
-    </message>
 </context>
 <context>
     <name>governikus::ReaderModel</name>

diff --git 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
         <extracomment>LABEL ALL_PLATFORMS Hint text for requested Transport PIN but both, Transport PIN and PIN, are not known.</extracomment>
         <translation>Ви можете скористатися службою скидання PIN-коду, щоб безкоштовно надіслати запит на новий PIN-код картки.</translation>
     </message>
-    <message>
-        <source>You may turn to the competent authority and set a new PIN there.&lt;br/&gt;&lt;br/&gt;For further information, please visit the ID card portal.</source>
-        <extracomment>LABEL ALL_PLATFORMS Hint text for requested Transport PIN but both, Transport PIN and PIN are not known.</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>governikus::ReaderModel</name>

diff --git 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.<br/><br/>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.<br/><br/>For further information, please visit the ID card portal.");
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ Release Notes @@
     .. toctree::
        :maxdepth: 1
+.0.3
 .0.2
 .0.1
 .0.0
@@ Expand Down @@