Synchronising MPA branch with compromise branch where possible.

gui/Gui/Makeimage.py

@@ -134,6 +134,7 @@ def makeImageDot(dotdata,attackthread=None):
     # execute command
     p = Popen(cmd, shell=True, stdin=PIPE, stdout=PIPE)
 
+
     if attackthread:
         writeGraph(attackthread,dotdata,p.stdin)
     else:

gui/Gui/Preference.py

@@ -123,6 +123,13 @@ def testPIL():
 
 class Preferences(dict):
 
+    def setDict(self,d):
+        """
+        Copy dict into self.
+        """
+        for x in d.keys():
+            self[x] = d[x]
+
     def parse(self,line):
         line = line.strip()
 
@@ -213,6 +220,11 @@ def get(key,alt=None):
     else:
         return alt
 
+def getkeys():
+    global prefs
+
+    return prefs.keys()
+
 def set(key,value):
     global prefs
 

gui/Gui/Scytherthread.py

@@ -337,6 +337,9 @@ class ResultWindow(wx.Frame):
         claimdetails = str(cl.claimtype)
         if cl.parameter:
             claimdetails += " %s" % (cl.parameter)
+        # Cut off if very very long
+        if len(claimdetails) > 50:
+            claimdetails = claimdetails[:50] + "..."
         addtxt(claimdetails + "  ",xpos)
         xpos += 1