diff options
| author | Kali Kaneko <kali@leap.se> | 2014-05-29 12:45:46 -0500 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-05-29 14:20:49 -0500 |
| commit | 5f6e44241b4858f1c407f0babfc41f40a06405f1 (patch) | |
| tree | 007ec7e13fb5360255e2836e2328795bc678cca1 /src/leap/bitmask/gui/eip_status.py | |
| parent | 2174acd89500ebad2c9b3df034d276e0e857b6f8 (diff) | |
display restart error after SIGTERM[soft,tls-error]
- fix tls-error: is SIGTERM now
- connect to connection-died signal
- display error to user
Diffstat (limited to 'src/leap/bitmask/gui/eip_status.py')
| -rw-r--r-- | src/leap/bitmask/gui/eip_status.py | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/leap/bitmask/gui/eip_status.py b/src/leap/bitmask/gui/eip_status.py index ca209d6a..04acc167 100644 --- a/src/leap/bitmask/gui/eip_status.py +++ b/src/leap/bitmask/gui/eip_status.py @@ -361,7 +361,7 @@ class EIPStatusWidget(QtGui.QWidget): self.eipconnection.qtsigs.do_connect_signal) @QtCore.Slot(dict) - def eip_stopped(self, restart=False): + def eip_stopped(self, restart=False, failed=False): """ TRIGGERS: EIPConductor.qtsigs.disconnected_signal @@ -378,16 +378,29 @@ class EIPStatusWidget(QtGui.QWidget): # status positively. # Or better call it from the conductor... - clear_traffic = self.tr("Traffic is being routed in the clear") - unreachable_net = self.tr("Network is unreachable") + clear_traffic = self.tr("Traffic is being routed in the clear.") + unreachable_net = self.tr("Network is unreachable.") + failed_msg = self.tr("Cannot start Encrypted Proxy.") if restart: msg = unreachable_net + elif failed: + msg = failed_msg else: msg = clear_traffic self.ui.lblEIPMessage.setText(msg) self.ui.lblEIPStatus.show() + def eip_failed_to_restart(self): + """ + Update EIP messages. + """ + msg = self.tr("Could not restart Encrypted Proxy") + self.ui.lblEIPMessage.setText(msg) + self.ui.lblEIPStatus.show() + + self.set_eip_status(self.tr("You can start the service manually.")) + @QtCore.Slot(dict) def update_vpn_status(self, data=None): """ @@ -530,7 +543,7 @@ class EIPStatusWidget(QtGui.QWidget): self.set_eip_status(eip_status_label, error=True) # signal connection_aborted to state machine: - qtsigs = self._eip_connection.qtsigs + qtsigs = self._eipconnection.qtsigs qtsigs.connection_aborted_signal.emit() def _on_eip_openvpn_already_running(self): |