[Pkg-privacy-commits] [tails-installer] 03/21: Match the arch strings to the mockup

Intrigeri intrigeri at moszumanska.debian.org
Wed May 24 15:27:26 UTC 2017


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

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

commit 98e4f2a9c2b09594de6daab32feac7cd23ddd4b0
Author: Martin Briza <mbriza at redhat.com>
Date:   Thu Apr 14 14:56:54 2016 +0200

    Match the arch strings to the mockup
---
 liveusb/gui.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/liveusb/gui.py b/liveusb/gui.py
index 502e531..4df7f0b 100755
--- a/liveusb/gui.py
+++ b/liveusb/gui.py
@@ -317,7 +317,7 @@ class Release(QObject):
 
     _path = ''
 
-    _archMap = {'64bit': ['x86_64'], '32bit': ['i686','i386']} #, 'ARM': ['armv7hl']}
+    _archMap = {'Intel 64bit': ['x86_64'], 'Intel 32bit': ['i686','i386']} #, 'ARM': ['armv7hl']}
 
     def __init__(self, parent, index, live, data):
         QObject.__init__(self, parent)
@@ -547,7 +547,9 @@ class ReleaseListProxy(QSortFilterProxyModel):
     _nameFilter = ''
     _frontPage = True
 
-    _archMap = {'64bit': ['x86_64'], '32bit': ['i686','i386']} #, 'ARM': ['armv7hl']}
+    _archMap = {'Intel 64bit': ['x86_64'], 'Intel 32bit': ['i686','i386']} #, 'ARM': ['armv7hl']}
+    _archMapDetailed = {'Intel 64bit': _('ISO format image for Intel, AMD and other compatible PCs (64-bit)'), 'Intel 32bit': _('ISO format image for Intel, AMD and other compatible PCs (32-bit)')} #, 'ARM': ['armv7hl']}
+
 
     def __init__(self, parent, sourceModel):
         QSortFilterProxyModel.__init__(self, parent)
@@ -590,12 +592,16 @@ class ReleaseListProxy(QSortFilterProxyModel):
         return self._archMap.keys()
 
     @pyqtProperty(str, notify=archChanged)
+    def archFilterDetailed(self):
+        return self._archMapDetailed[self.archFilter]
+
+    @pyqtProperty(str, notify=archChanged)
     def archFilter(self):
         for name, abbrs in self._archMap.items():
             if abbrs == self._archFilter:
                 return name
-        self._archFilter = self._archMap['64bit']
-        return '64bit'
+        self._archFilter = self._archMap['Intel 64bit']
+        return 'Intel 64bit'
 
     @archFilter.setter
     def archFilter(self, value):

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



More information about the Pkg-privacy-commits mailing list