summaryrefslogtreecommitdiff
path: root/src/leap/gui
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-08-02 11:21:43 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-08-02 11:21:43 -0300
commita71cd3435186645032ec7bc3adabbd0f0d2eca62 (patch)
tree0392c2ef5afd96872d06177d5bfa1e4485f66bae /src/leap/gui
parent89934702c57fa2314f0d6d1f82942f6f42d10f94 (diff)
Replace 'sign out' with 'log out'.
Diffstat (limited to 'src/leap/gui')
-rw-r--r--src/leap/gui/mainwindow.py12
-rw-r--r--src/leap/gui/ui/mainwindow.ui8
2 files changed, 10 insertions, 10 deletions
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index 2325ecf0..395b9329 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -218,8 +218,8 @@ class MainWindow(QtGui.QMainWindow):
self._vpn.qtsigs.process_finished.connect(
self._eip_finished)
- self.ui.action_sign_out.setEnabled(False)
- self.ui.action_sign_out.triggered.connect(self._logout)
+ self.ui.action_log_out.setEnabled(False)
+ self.ui.action_log_out.triggered.connect(self._logout)
self.ui.action_about_leap.triggered.connect(self._about)
self.ui.action_quit.triggered.connect(self.quit)
self.ui.action_wizard.triggered.connect(self._launch_wizard)
@@ -563,7 +563,7 @@ class MainWindow(QtGui.QMainWindow):
systrayMenu.addAction(preferences_action)
systrayMenu.addAction(help_action)
systrayMenu.addSeparator()
- systrayMenu.addAction(self.ui.action_sign_out)
+ systrayMenu.addAction(self.ui.action_log_out)
systrayMenu.addAction(self.ui.action_quit)
self._systray = QtGui.QSystemTrayIcon(self)
self._systray.setContextMenu(systrayMenu)
@@ -866,7 +866,7 @@ class MainWindow(QtGui.QMainWindow):
self._login_widget.set_status(message, error=not ok)
if ok:
self._logged_user = self._login_widget.get_user()
- self.ui.action_sign_out.setEnabled(True)
+ self.ui.action_log_out.setEnabled(True)
# We leave a bit of room for the user to see the
# "Succeeded" message and then we switch to the EIP status
# panel
@@ -1233,7 +1233,7 @@ class MainWindow(QtGui.QMainWindow):
def _logout(self):
"""
SLOT
- TRIGGER: self.ui.action_sign_out.triggered
+ TRIGGER: self.ui.action_log_out.triggered
Starts the logout sequence
"""
@@ -1250,7 +1250,7 @@ class MainWindow(QtGui.QMainWindow):
logging out
"""
self._logged_user = None
- self.ui.action_sign_out.setEnabled(False)
+ self.ui.action_log_out.setEnabled(False)
self.ui.stackedWidget.setCurrentIndex(self.LOGIN_INDEX)
self._login_widget.set_password("")
self._login_widget.set_enabled(True)
diff --git a/src/leap/gui/ui/mainwindow.ui b/src/leap/gui/ui/mainwindow.ui
index 58827fe0..67d78736 100644
--- a/src/leap/gui/ui/mainwindow.ui
+++ b/src/leap/gui/ui/mainwindow.ui
@@ -253,14 +253,14 @@
<x>0</x>
<y>0</y>
<width>429</width>
- <height>25</height>
+ <height>21</height>
</rect>
</property>
<widget class="QMenu" name="menuSession">
<property name="title">
<string>&amp;Session</string>
</property>
- <addaction name="action_sign_out"/>
+ <addaction name="action_log_out"/>
<addaction name="separator"/>
<addaction name="action_quit"/>
</widget>
@@ -276,9 +276,9 @@
<addaction name="menuHelp"/>
</widget>
<widget class="QStatusBar" name="statusbar"/>
- <action name="action_sign_out">
+ <action name="action_log_out">
<property name="text">
- <string>&amp;Sign out</string>
+ <string>Log &amp;out</string>
</property>
</action>
<action name="action_quit">