[Pkg-privacy-commits] [tails-installer] 139/210: Better Custom OS description

[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 a76428727c467c226bc6ad710380eb566623a246
Author: Martin Briza <mbriza at redhat.com>
Date:   Tue Aug 25 16:02:33 2015 +0200

    Better Custom OS description
---
 liveusb/components/ImageDetails.qml | 20 +++++++++++---------
 liveusb/releases.py                 |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/liveusb/components/ImageDetails.qml b/liveusb/components/ImageDetails.qml
index e600373..9ef2866 100644
--- a/liveusb/components/ImageDetails.qml
+++ b/liveusb/components/ImageDetails.qml
@@ -137,13 +137,17 @@ Item {
                                 }
                             }
 
-                            AdwaitaButton {
-                                text: qsTranslate("", "Select Live ISO")
-                                Layout.alignment: Qt.AlignHCenter
+                            RowLayout {
                                 visible: liveUSBData.currentImage.isLocal
-                                onClicked: {
-                                    fileDialog.visible = false // for some reason it got stuck in the closed state once in a while, so ensure it's actually closed
-                                    fileDialog.visible = true
+                                AdwaitaButton {
+                                    text: qsTranslate("", "Select Live ISO")
+                                    onClicked: {
+                                        fileDialog.visible = false // for some reason it got stuck in the closed state once in a while, so ensure it's actually closed
+                                        fileDialog.visible = true
+                                    }
+                                }
+                                Text {
+                                    text: qsTranslate("", "Selected file: %1").arg(liveUSBData.currentImage.path ? (((String)(liveUSBData.currentImage.path)).split("/").slice(-1)[0]) : qsTranslate("", "None"))
                                 }
                             }
                         }
@@ -159,9 +163,7 @@ Item {
                     Layout.fillWidth: true
                     width: Layout.width
                     wrapMode: Text.WordWrap
-                    text: liveUSBData.currentImage.isLocal ?
-                              (qsTranslate("", "Selected image: %1").arg(liveUSBData.currentImage.path ? (((String)(liveUSBData.currentImage.path)).split("/").slice(-1)[0]) : qsTranslate("", "None")))
-                              : liveUSBData.currentImage.description
+                    text: liveUSBData.currentImage.description
                     textFormat: Text.RichText
                     font.pointSize: 9
                 }
diff --git a/liveusb/releases.py b/liveusb/releases.py
index 1f8c2ed..a8c8417 100644
--- a/liveusb/releases.py
+++ b/liveusb/releases.py
@@ -213,7 +213,7 @@ def getProducts(url='https://getfedora.org/'):
 
 def get_fedora_flavors():
     releases = [{'name': _('Custom OS...'),
-              'description': _('Here you can choose a OS image from your hard drive to be written to your flash disk'),
+              'description': _('<p>Here you can choose a OS image from your hard drive to be written to your flash disk</p><p>Currently it is only supported to write raw disk images (.iso or .bin)</p>'),
               'logo': 'qrc:/icon-folder.svg',
               'screenshots': [],
               'summary': _('Pick a file from your drive(s)'),

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