summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-12-23 17:30:23 -0300
committerTomás Touceda <chiiph@leap.se>2013-12-23 17:30:23 -0300
commit477df116b6e7c2223fe70e73f979f43abb21288b (patch)
treee92387847d26588bc0d0384ddc5df03de7a0a26f
parentbdc638e6fc3dadaaf9c60a19f4e850c5450cfc3e (diff)
parent6f93bd407cb9f36a7ff58e607ebdd069868888ae (diff)
Merge remote-tracking branch 'refs/remotes/kali/feature/moar-version-info' into develop
-rw-r--r--changes/feature_moar-version-info2
-rw-r--r--src/leap/bitmask/__init__.py1
-rw-r--r--src/leap/bitmask/_appname.py1
-rw-r--r--src/leap/bitmask/gui/mainwindow.py5
4 files changed, 7 insertions, 2 deletions
diff --git a/changes/feature_moar-version-info b/changes/feature_moar-version-info
new file mode 100644
index 00000000..fd5452ce
--- /dev/null
+++ b/changes/feature_moar-version-info
@@ -0,0 +1,2 @@
+- Show hash info in About bitmask (for debian versions).
+- Add the appname in the reported version string.
diff --git a/src/leap/bitmask/__init__.py b/src/leap/bitmask/__init__.py
index a4642e27..c844beb1 100644
--- a/src/leap/bitmask/__init__.py
+++ b/src/leap/bitmask/__init__.py
@@ -56,6 +56,7 @@ __short_version__ = "unknown"
try:
from leap.bitmask._version import get_versions
__version__ = get_versions()['version']
+ __version_hash__ = get_versions()['full']
IS_RELEASE_VERSION = _is_release_version(__version__)
del get_versions
except ImportError:
diff --git a/src/leap/bitmask/_appname.py b/src/leap/bitmask/_appname.py
new file mode 100644
index 00000000..82e8bd43
--- /dev/null
+++ b/src/leap/bitmask/_appname.py
@@ -0,0 +1 @@
+__appname__ = "bitmask"
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 96aa8074..51456473 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -25,6 +25,7 @@ from twisted.internet import threads
from zope.proxy import ProxyBase, setProxiedObject
from leap.bitmask import __version__ as VERSION
+from leap.bitmask import __version_hash__ as VERSION_HASH
from leap.bitmask.config.leapsettings import LeapSettings
from leap.bitmask.config.providerconfig import ProviderConfig
from leap.bitmask.crypto.srpauth import SRPAuth
@@ -829,7 +830,7 @@ class MainWindow(QtGui.QMainWindow):
"""
QtGui.QMessageBox.about(
self, self.tr("About Bitmask - %s") % (VERSION,),
- self.tr("Version: <b>%s</b><br>"
+ self.tr("Version: <b>%s</b> (%s)<br>"
"<br>"
"Bitmask is the Desktop client application for "
"the LEAP platform, supporting encrypted internet "
@@ -842,7 +843,7 @@ class MainWindow(QtGui.QMainWindow):
"and widely available. <br>"
"<br>"
"<a href='https://leap.se'>More about LEAP"
- "</a>") % (VERSION,))
+ "</a>") % (VERSION, VERSION_HASH[:10]))
def changeEvent(self, e):
"""