summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-12-27 12:48:12 -0300
committerTomás Touceda <chiiph@leap.se>2013-12-27 12:48:12 -0300
commit61e7c5bb403ba652994b54dcea3d3bc169ef23ec (patch)
tree4579f7ffe202910b645a1b140925a44630a241b1
parent477df116b6e7c2223fe70e73f979f43abb21288b (diff)
parent17b19d82439143193af8b8eefcfa05f20d011c89 (diff)
Merge remote-tracking branch 'refs/remotes/kali/remove_comments' into develop
-rw-r--r--src/leap/bitmask/gui/eip_status.py6
-rw-r--r--src/leap/bitmask/gui/mainwindow.py10
2 files changed, 11 insertions, 5 deletions
diff --git a/src/leap/bitmask/gui/eip_status.py b/src/leap/bitmask/gui/eip_status.py
index 92bb623e..19942d9d 100644
--- a/src/leap/bitmask/gui/eip_status.py
+++ b/src/leap/bitmask/gui/eip_status.py
@@ -248,10 +248,10 @@ class EIPStatusWidget(QtGui.QWidget):
Triggered when a default provider_config has not been found.
Disables the start button and adds instructions to the user.
"""
- logger.debug('Hiding EIP start button')
+ #logger.debug('Hiding EIP start button')
# you might be tempted to change this for a .setEnabled(False).
# it won't work. it's under the claws of the state machine.
- # probably the best thing would be to make a transitional
+ # probably the best thing would be to make a conditional
# transition there, but that's more involved.
self.eip_button.hide()
msg = self.tr("You must login to use {0}".format(self._service_name))
@@ -272,7 +272,7 @@ class EIPStatusWidget(QtGui.QWidget):
Triggered after a successful login.
Enables the start button.
"""
- logger.debug('Showing EIP start button')
+ #logger.debug('Showing EIP start button')
self.eip_button.show()
# Restore the eip action menu
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 51456473..c05d65fe 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -20,6 +20,7 @@ Main window for Bitmask.
import logging
from PySide import QtCore, QtGui
+from datetime import datetime
from functools import partial
from twisted.internet import threads
from zope.proxy import ProxyBase, setProxiedObject
@@ -828,10 +829,13 @@ class MainWindow(QtGui.QMainWindow):
Display the About Bitmask dialog
"""
+ today = datetime.now().date()
+ greet = ("Happy New 1984!... or not ;)<br><br>"
+ if today.month == 1 and today.day < 15 else "")
QtGui.QMessageBox.about(
self, self.tr("About Bitmask - %s") % (VERSION,),
self.tr("Version: <b>%s</b> (%s)<br>"
- "<br>"
+ "<br>%s"
"Bitmask is the Desktop client application for "
"the LEAP platform, supporting encrypted internet "
"proxy, secure email, and secure chat (coming soon).<br>"
@@ -843,7 +847,7 @@ class MainWindow(QtGui.QMainWindow):
"and widely available. <br>"
"<br>"
"<a href='https://leap.se'>More about LEAP"
- "</a>") % (VERSION, VERSION_HASH[:10]))
+ "</a>") % (VERSION, VERSION_HASH[:10], greet))
def changeEvent(self, e):
"""
@@ -1070,6 +1074,8 @@ class MainWindow(QtGui.QMainWindow):
logger.debug("Retrying soledad connection.")
if self._soledad_bootstrapper.should_retry_initialization():
self._soledad_bootstrapper.increment_retries_count()
+ # XXX should cancel the existing socket --- this
+ # is avoiding a clean termination.
threads.deferToThread(
self._soledad_bootstrapper.load_and_sync_soledad)
else: