summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/leap/bitmask/gui')
-rw-r--r--src/leap/bitmask/gui/eip_status.py4
-rw-r--r--src/leap/bitmask/gui/mainwindow.py4
-rw-r--r--src/leap/bitmask/gui/preferenceswindow.py2
-rw-r--r--src/leap/bitmask/gui/statemachines.py4
-rw-r--r--src/leap/bitmask/gui/ui/eip_status.ui6
5 files changed, 15 insertions, 5 deletions
diff --git a/src/leap/bitmask/gui/eip_status.py b/src/leap/bitmask/gui/eip_status.py
index 77685cd3..324586c0 100644
--- a/src/leap/bitmask/gui/eip_status.py
+++ b/src/leap/bitmask/gui/eip_status.py
@@ -269,6 +269,10 @@ class EIPStatusWidget(QtGui.QWidget):
:type error: bool
"""
leap_assert_type(error, bool)
+ if error:
+ logger.error(status)
+ else:
+ logger.debug(status)
self._eip_status = status
if error:
status = "<font color='red'>%s</font>" % (status,)
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 72dcf278..6af71e24 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -906,8 +906,8 @@ class MainWindow(QtGui.QMainWindow):
leap_assert(self._provider_config, "We need a provider config!")
if data[self._provider_bootstrapper.PASSED_KEY]:
- username = self._login_widget.get_user().encode("utf8")
- password = self._login_widget.get_password().encode("utf8")
+ username = self._login_widget.get_user()
+ password = self._login_widget.get_password()
self._hide_unsupported_services()
diff --git a/src/leap/bitmask/gui/preferenceswindow.py b/src/leap/bitmask/gui/preferenceswindow.py
index 58cb05ba..b043afe6 100644
--- a/src/leap/bitmask/gui/preferenceswindow.py
+++ b/src/leap/bitmask/gui/preferenceswindow.py
@@ -156,7 +156,7 @@ class PreferencesWindow(QtGui.QDialog):
"""
logger.debug("SRP password changed successfully.")
try:
- self._soledad.change_passphrase(str(new_password))
+ self._soledad.change_passphrase(new_password)
logger.debug("Soledad password changed successfully.")
except NoStorageSecret:
logger.debug(
diff --git a/src/leap/bitmask/gui/statemachines.py b/src/leap/bitmask/gui/statemachines.py
index ee16a4c6..386cb75f 100644
--- a/src/leap/bitmask/gui/statemachines.py
+++ b/src/leap/bitmask/gui/statemachines.py
@@ -55,8 +55,8 @@ class SignallingState(QState):
"""
Emits the signal on entry.
"""
- logger.debug('State %s entered. Emitting signal ...'
- % (self._name + self.__class__.__name__))
+ logger.debug('State %s::%s entered. Emitting signal ...'
+ % (self._name, self.objectName()))
if self._signal is not None:
self._signal.emit()
diff --git a/src/leap/bitmask/gui/ui/eip_status.ui b/src/leap/bitmask/gui/ui/eip_status.ui
index 25831118..d078ca0c 100644
--- a/src/leap/bitmask/gui/ui/eip_status.ui
+++ b/src/leap/bitmask/gui/ui/eip_status.ui
@@ -185,6 +185,9 @@
<property name="cursor">
<cursorShape>PointingHandCursor</cursorShape>
</property>
+ <property name="styleSheet">
+ <string notr="true">text-align: left;</string>
+ </property>
<property name="text">
<string>0.0 KB/s</string>
</property>
@@ -249,6 +252,9 @@
<property name="cursor">
<cursorShape>PointingHandCursor</cursorShape>
</property>
+ <property name="styleSheet">
+ <string notr="true">text-align: left;</string>
+ </property>
<property name="text">
<string>0.0 KB/s</string>
</property>