Merge remote-tracking branch 'claws/develop' into develop

src/connectivity/helper.py

@@ -12,6 +12,9 @@
 from decorators import with_logger
 
 
+from PyQt4 import QtGui, uic
+
+
 @with_logger
 class RelayTest(QObject):
     finished = pyqtSignal()
@@ -150,9 +153,12 @@ def handle_SendNatPacket(self, msg):
         self._socket.writeDatagram(b'\x08'+message.encode(), QHostAddress(host), int(port))
 
     def handle_ConnectivityState(self, msg):
+        from client import ClientState
         state, addr = msg['args']
         if state == 'BLOCKED':
             self._logger.warning("Outbound traffic is blocked")
+            QtGui.QMessageBox.warning(None, "Traffic Blocked", "Your outbound traffic appears to be blocked. Try restarting FAF. <br/> If the error persists please contact a moderator and send your logs. <br/> We are already working on a solution to this problem.")
+            self._client.state = ClientState.NONE
         else:
             host, port = addr.split(':')
             self.state, self.mapped_address = state, (host, port)