diff options
| author | Kali Kaneko <kali@leap.se> | 2013-07-16 19:29:58 +0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-07-16 19:29:58 +0200 |
| commit | b0f1fd4cd127d13fd4f64a9e8dc59ecab8571fa9 (patch) | |
| tree | 6c526fa994166b8f2b382019a66cb9b3137dab4a /src/leap | |
| parent | 7ac4e97c34a21a6c9eed480dd742b4230774bad6 (diff) | |
| parent | fec608699f903a17d31d6f0c903c785120c8c2a3 (diff) | |
Merge remote-tracking branch 'chiiph/bug/long_login_status' into develop
Diffstat (limited to 'src/leap')
| -rw-r--r-- | src/leap/gui/login.py | 4 | ||||
| -rw-r--r-- | src/leap/gui/ui/login.ui | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/leap/gui/login.py b/src/leap/gui/login.py index 8fc6ec24..80f2f3db 100644 --- a/src/leap/gui/login.py +++ b/src/leap/gui/login.py @@ -41,6 +41,8 @@ class LoginWidget(QtGui.QWidget): # combobox or click "Create Account" show_wizard = QtCore.Signal() + MAX_STATUS_WIDTH = 40 + def __init__(self, settings, parent=None): """ Constructs the LoginWidget. @@ -173,6 +175,8 @@ class LoginWidget(QtGui.QWidget): :param status: status message :type status: str """ + if len(status) > self.MAX_STATUS_WIDTH: + status = status[:self.MAX_STATUS_WIDTH] + "..." if error: status = "<font color='red'><b>%s</b></font>" % (status,) self.ui.lblStatus.setText(status) diff --git a/src/leap/gui/ui/login.ui b/src/leap/gui/ui/login.ui index 88c9ef44..42a6897a 100644 --- a/src/leap/gui/ui/login.ui +++ b/src/leap/gui/ui/login.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>356</width> - <height>219</height> + <height>223</height> </rect> </property> <property name="windowTitle"> @@ -112,6 +112,9 @@ <property name="alignment"> <set>Qt::AlignCenter</set> </property> + <property name="wordWrap"> + <bool>true</bool> + </property> </widget> </item> </layout> |