diff options
| -rw-r--r-- | changes/bug-4058_spacer-policy-problem | 1 | ||||
| -rw-r--r-- | changes/bug_display_mail_status_enabled | 2 | ||||
| -rw-r--r-- | changes/bug_hide_error_message | 2 | ||||
| -rw-r--r-- | changes/bug_util_menu_as_file | 1 | ||||
| -rw-r--r-- | data/images/mask-icon.png | bin | 16575 -> 8907 bytes | |||
| -rw-r--r-- | src/leap/bitmask/gui/login.py | 3 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 3 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/ui/wizard.ui | 8 |
8 files changed, 14 insertions, 6 deletions
diff --git a/changes/bug-4058_spacer-policy-problem b/changes/bug-4058_spacer-policy-problem new file mode 100644 index 00000000..b4759c7b --- /dev/null +++ b/changes/bug-4058_spacer-policy-problem @@ -0,0 +1 @@ + o Widget squashing problem in wizard cheking a new provider. Closes #4058. diff --git a/changes/bug_display_mail_status_enabled b/changes/bug_display_mail_status_enabled new file mode 100644 index 00000000..44a94d5f --- /dev/null +++ b/changes/bug_display_mail_status_enabled @@ -0,0 +1,2 @@ + o Display mail status in the tray icon as an enabled item. Fixes + #4036.
\ No newline at end of file diff --git a/changes/bug_hide_error_message b/changes/bug_hide_error_message new file mode 100644 index 00000000..512f35da --- /dev/null +++ b/changes/bug_hide_error_message @@ -0,0 +1,2 @@ + o Hide login error message when the user interacts with the widgets + to fix the potential problem. Fixes #4022.
\ No newline at end of file diff --git a/changes/bug_util_menu_as_file b/changes/bug_util_menu_as_file new file mode 100644 index 00000000..48228f26 --- /dev/null +++ b/changes/bug_util_menu_as_file @@ -0,0 +1 @@ + o Change the Util menu to be named File in OSX. Fixes #4039.
\ No newline at end of file diff --git a/data/images/mask-icon.png b/data/images/mask-icon.png Binary files differindex 3504bae9..97c5d7ec 100644 --- a/data/images/mask-icon.png +++ b/data/images/mask-icon.png diff --git a/src/leap/bitmask/gui/login.py b/src/leap/bitmask/gui/login.py index 582f26be..c8c5c402 100644 --- a/src/leap/bitmask/gui/login.py +++ b/src/leap/bitmask/gui/login.py @@ -94,6 +94,9 @@ class LoginWidget(QtGui.QWidget): self.ui.clblErrorMsg.hide() self.ui.clblErrorMsg.clicked.connect(self.ui.clblErrorMsg.hide) + self.ui.lnUser.textEdited.connect(self.ui.clblErrorMsg.hide) + self.ui.lnPassword.textEdited.connect(self.ui.clblErrorMsg.hide) + def _remember_state_changed(self, state): """ Saves the remember state in the LeapSettings diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 84f09fd9..dd625f52 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -258,7 +258,7 @@ class MainWindow(QtGui.QMainWindow): self._launch_wizard) if IS_MAC: - self.ui.menuFile.menuAction().setText(self.tr("Util")) + self.ui.menuFile.menuAction().setText(self.tr("File")) self.raise_window.connect(self._do_raise_mainwindow) @@ -268,7 +268,6 @@ class MainWindow(QtGui.QMainWindow): self._systray = None self._action_mail_status = QtGui.QAction(self.tr("Mail is OFF"), self) - self._action_mail_status.setEnabled(False) self._mail_status.set_action_mail_status(self._action_mail_status) self._action_eip_startstop = QtGui.QAction("", self) diff --git a/src/leap/bitmask/gui/ui/wizard.ui b/src/leap/bitmask/gui/ui/wizard.ui index 0f6eef6e..cf591470 100644 --- a/src/leap/bitmask/gui/ui/wizard.ui +++ b/src/leap/bitmask/gui/ui/wizard.ui @@ -7,19 +7,19 @@ <x>0</x> <y>0</y> <width>536</width> - <height>490</height> + <height>510</height> </rect> </property> <property name="minimumSize"> <size> <width>536</width> - <height>490</height> + <height>510</height> </size> </property> <property name="maximumSize"> <size> <width>536</width> - <height>490</height> + <height>510</height> </size> </property> <property name="windowTitle"> @@ -124,7 +124,7 @@ <enum>Qt::Vertical</enum> </property> <property name="sizeType"> - <enum>QSizePolicy::Fixed</enum> + <enum>QSizePolicy::Expanding</enum> </property> <property name="sizeHint" stdset="0"> <size> |
