[Pkg-privacy-commits] [tails-installer] 10/27: Hm, I guess there will be three category warnings

[Intrigeri]

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

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

commit 3cedde2cec417633845bcfaece0a370ec8b85e27
Author: Martin Briza <mbriza at redhat.com>
Date:   Tue Mar 1 14:44:20 2016 +0100

    Hm, I guess there will be three category warnings
---
 liveusb/components/DelegateImage.qml | 7 ++++++-
 liveusb/components/ImageList.qml     | 2 +-
 liveusb/gui.py                       | 6 +++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/liveusb/components/DelegateImage.qml b/liveusb/components/DelegateImage.qml
index a467303..a734d8d 100644
--- a/liveusb/components/DelegateImage.qml
+++ b/liveusb/components/DelegateImage.qml
@@ -6,7 +6,12 @@ Item {
     height: $(84)
 
     readonly property bool isTop: !liveUSBData.releaseProxyModel.get(index-1) || release.category != liveUSBData.releaseProxyModel.get(index-1).category
-    readonly property bool isBottom: !liveUSBData.releaseProxyModel.get(index+1) || (!liveUSBData.releaseProxyModel.isFront && release.category != liveUSBData.releaseProxyModel.get(index+1).category)
+    readonly property bool isBottom:
+        !liveUSBData.releaseProxyModel.isFront &&
+        (!liveUSBData.releaseProxyModel.get(index+1) ||
+         !liveUSBData.releaseProxyModel.get(index+1).category ||
+         release.category != liveUSBData.releaseProxyModel.get(index+1).category
+        )
 
     readonly property color color: mouse.containsPress ? "#ededed" : mouse.containsMouse ? "#f8f8f8" : "white"
 
diff --git a/liveusb/components/ImageList.qml b/liveusb/components/ImageList.qml
index 7d6206a..096b8ce 100644
--- a/liveusb/components/ImageList.qml
+++ b/liveusb/components/ImageList.qml
@@ -185,7 +185,7 @@ Item {
                 criteria: ViewSection.FullString
                 labelPositioning: ViewSection.InlineLabels
                 delegate: Item {
-                    height: section.length > 0 ? $(64) : 0
+                    height: section == "main" ? 0 : $(64)
                     width: parent.width
                     Text {
                         text: section
diff --git a/liveusb/gui.py b/liveusb/gui.py
index 646bb33..bc590cd 100755
--- a/liveusb/gui.py
+++ b/liveusb/gui.py
@@ -493,11 +493,11 @@ class Release(QObject):
     @pyqtProperty(str, constant=True)
     def category(self):
         if self._data['source'] in ['Local', 'Fedora Workstation', 'Fedora Server']:
-            return ''
+            return 'main'
         elif self._data['source'] == 'Spins':
-            return '<b>Fedora Spins </b>   Alternative desktops for Fedora'
+            return _('<b>Fedora Spins </b>   Alternative desktops for Fedora')
         elif self._data['source'] == 'Labs':
-            return '<b>Fedora Labs </b>   Functional bundles for Fedora'
+            return _('<b>Fedora Labs </b>   Functional bundles for Fedora')
         else:
             return '<b>Other</b>'
 

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