diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-12-13 09:34:39 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-12-13 09:34:39 -0300 |
| commit | b1ebbc2b5ca9c5d0591c10c876b871e9cfb2e367 (patch) | |
| tree | d53f1f01b8e35bff3367258afae085765e53ef31 /src/leap/bitmask/gui/mainwindow.py | |
| parent | 8969c7396c61be96040206ff18a29ec56e20825e (diff) | |
| parent | 2a8632e60a538828e8c5b417c5b02fbdaaccc88d (diff) | |
Merge remote-tracking branch 'refs/remotes/elijah/feature/login-on-top' into develop
Diffstat (limited to 'src/leap/bitmask/gui/mainwindow.py')
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 44fee6b5..1c80cce8 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -248,6 +248,8 @@ class MainWindow(QtGui.QMainWindow): self._soledad_bootstrapper.soledad_failed.connect( self._mail_status.set_soledad_failed) + self.ui.action_preferences.triggered.connect(self._show_preferences) + self.ui.action_eip_preferences.triggered.connect(self._show_eip_preferences) 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) @@ -279,8 +281,9 @@ class MainWindow(QtGui.QMainWindow): self._action_visible = QtGui.QAction(self.tr("Hide Main Window"), self) self._action_visible.triggered.connect(self._toggle_visible) - self.ui.btnPreferences.clicked.connect(self._show_preferences) - self.ui.btnEIPPreferences.clicked.connect(self._show_eip_preferences) + # disable buttons for now, may come back later. + # self.ui.btnPreferences.clicked.connect(self._show_preferences) + # self.ui.btnEIPPreferences.clicked.connect(self._show_eip_preferences) self._enabled_services = [] @@ -467,7 +470,8 @@ class MainWindow(QtGui.QMainWindow): """ SLOT TRIGGERS: - self.ui.btnPreferences.clicked + self.ui.btnPreferences.clicked (disabled for now) + self.ui.action_preferences Displays the preferences window. """ @@ -520,6 +524,7 @@ class MainWindow(QtGui.QMainWindow): SLOT TRIGGERS: self.ui.btnEIPPreferences.clicked + self.ui.action_eip_preferences (disabled for now) Displays the EIP preferences window. """ |