Condensed API commands, applied similar info-naming scheme

src/bitmessagemain.py

@@ -848,19 +848,17 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
             data += ']}'
             return data
         elif method == 'clientStatus':
-            return '{ "networkConnections" : "%s" }' % str(len(shared.connectedHostsList))
-        elif method == 'networkTabInfo':
-            data = '{\n    \"Total Connections\" : "%s"\n' % str(len(shared.connectedHostsList))
-            data += '    \"P2P Messages Processed\" : "%s"\n' % str(shared.messagesTotals)
-            data += '    \"Broadcast Messages Processed\" : "%s"\n' % str(shared.broadcastTotals)
-            data += '    \"Public Keys Processed\" : "%s"\n' % str(shared.pubkeysTotals)
+            data = '{\n    "networkConnections" : "%s"\n' % str(len(shared.connectedHostsList))
+            data += '    "processedP2Pmessages" : "%s"\n' % str(shared.messagesTotals)
+            data += '    "processedBroadcastMessages" : "%s"\n' % str(shared.broadcastTotals)
+            data += '    "processedPublicKeys" : "%s"\n' % str(shared.pubkeysTotals)
             if len(shared.connectedHostsList) == 0:
-                dataColor = 'red'
-            elif len(shared.connectedHostsList) > 0 and not shared.definitelyFullyConnected:
-                dataColor = 'yellow'
+                networkStatus = 'notConnected'
+            elif len(shared.connectedHostsList) > 0 and not shared.incomingConnections:
+                networkStatus = 'connectedButHaveNotReceivedIncomingConnections'
             else:
-                dataColor = 'green'
-            data += '    \"Icon Status\" : "%s"\n}' % dataColor
+                networkStatus = 'connectedAndReceivingIncomingConnections'
+            data += '    "networkStatus" : "%s"\n}' % networkStatus
             return data
         else:
             return 'API Error 0020: Invalid method: %s' % method

src/class_receiveDataThread.py

@@ -256,7 +256,7 @@ class receiveDataThread(threading.Thread):
     def connectionFullyEstablished(self):
         self.connectionIsOrWasFullyEstablished = True
         if not self.initiatedConnection:
-            shared.definitelyFullyConnected = True
+            shared.incomingConnections = True
             shared.UISignalQueue.put(('setStatusIcon', 'green'))
         self.sock.settimeout(
             600)  # We'll send out a pong every 5 minutes to make sure the connection stays alive if there has been no other traffic to send lately.

src/shared.py

@@ -69,7 +69,7 @@ ackdataForWhichImWatching = {}
 messagesTotals = 0
 broadcastTotals = 0
 pubkeysTotals = 0
-definitelyFullyConnected = False
+incomingConnections = False
 
 #If changed, these values will cause particularly unexpected behavior: You won't be able to either send or receive messages because the proof of work you do (or demand) won't match that done or demanded by others. Don't change them!
 networkDefaultProofOfWorkNonceTrialsPerByte = 320 #The amount of work that should be performed (and demanded) per byte of the payload. Double this number to double the work.