[Pkg-privacy-commits] [tails-installer] 189/210: Show Fedora version along with its release date

[Intrigeri]

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to tag 3.90.0
in repository tails-installer.

commit 56228312a4065c756ccead11dbf3a0fd0957795e
Author: Martin Briza <mbriza at redhat.com>
Date:   Mon Nov 2 16:54:54 2015 +0100

    Show Fedora version along with its release date
---
 liveusb/components/ImageDetails.qml | 5 +++--
 liveusb/gui.py                      | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/liveusb/components/ImageDetails.qml b/liveusb/components/ImageDetails.qml
index e015537..31a2716 100644
--- a/liveusb/components/ImageDetails.qml
+++ b/liveusb/components/ImageDetails.qml
@@ -92,7 +92,7 @@ Item {
                     }
                     ColumnLayout {
                         Layout.fillHeight: true
-                        spacing: $(8)
+                        spacing: $(12)
                         RowLayout {
                             Layout.fillWidth: true
                             Text {
@@ -141,7 +141,8 @@ Item {
                                 }
                                 Text {
                                     // I'm sorry, everyone, I can't find a better way to determine if the date is valid
-                                    text: liveUSBData.currentImage.releaseDate.toLocaleDateString().length > 0 ? (qsTranslate("", "Released on %1").arg(liveUSBData.currentImage.releaseDate.toLocaleDateString())) : ""
+                                    text: liveUSBData.currentImage.version ? (qsTranslate("", "Version %1").arg(liveUSBData.currentImage.version) +
+                                        (liveUSBData.currentImage.releaseDate.toLocaleDateString().length > 0 ? (qsTranslate("", ", released on %1").arg(liveUSBData.currentImage.releaseDate.toLocaleDateString())) : "")) : ""
                                     font.pixelSize: $(11)
                                     color: "gray"
                                 }
diff --git a/liveusb/gui.py b/liveusb/gui.py
index 173476e..98b37e2 100755
--- a/liveusb/gui.py
+++ b/liveusb/gui.py
@@ -555,6 +555,10 @@ class Release(QObject):
                     ret.append(str(key))
         return ret
 
+    @pyqtProperty(str, constant=True)
+    def version(self):
+        return self._data['version']
+
     @pyqtProperty(QDateTime, constant=True)
     def releaseDate(self):
         return QDateTime.fromString(self._data['releaseDate'], Qt.ISODate)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git