Merge branch 'testing'

Conflicts:
	utils/resedit/space.py

utils/resedit/fleet.py

@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+
+import data
+
+class Fleets:
+  def __init__(self):
+    self.fleets = {}
+    self.fleetsXML = "../../dat/fleet.xml"
+
+  def loadFleets(self, xmlfile=None):
+    if xmlfile == None:
+      xmlFile = self.fleetsXML
+    self.fleets = data.load(xmlfile, "fleet", True)
+
+  def data(self):
+    return self.fleets
+
+  def debug(self):
+    print "---FACTIONS---"
+    print self.fleets
+    print "--------------"
+

utils/resedit/resedit.py

@@ -4,20 +4,24 @@ try:
   import gtk, gtk.glade
   import gobject
 except:
-  print "You do not have python gtk bindings, or you're missin glade libs"
+  print "You do not have python gtk bindings, or you're missing glade libs"
   print "To use Lephisto's resedit you must install them"
   print "http://pygtk.org/"
   raise SystemExit
 
-import space, faction
+import space, faction, fleet
 
 # Load the factions
 factions = faction.Factions()
 factions.loadFactions("../../dat/faction.xml")
 factions.window()
 
+# Load the fleets.
+fleets = fleet.Fleets()
+fleets.loadFleets("../../dat/fleet.xml")
+
 # Load the universe.
-universe = space.Space(factions.data())
+universe = space.Space(factions.data(), fleets.data())
 universe.loadSystems("../../dat/ssys.xml")
 universe.loadPlanets("../../dat/planet.xml")
 universe.window()

utils/resedit/space.py

@@ -614,6 +614,9 @@ class Space:
     # Draw the frame at the end.
     area.window.draw_rectangle(sys_gc, False, 0, 0, ww-1, wh-1)
 
+  """
+  Add or remove jumps from a star system.
+  """
   def __jump_add(self, wgt=None, event=None):
     if self.space_sel in self.systems.keys() and self.cur_system in self.systems.keys():
       self.systems[self.cur_system]["jumps"].append(self.space_sel)
@@ -631,6 +634,9 @@ class Space:
       self.__supdate()
       self.__space_draw()
 
+  """
+  Add or remove fleets from a star system.
+  """
   def __fleet_sel(self):
     tree = self.__swidget("treFleets")
     model = tree.get_model()
@@ -644,7 +650,7 @@ class Space:
     fleet = self.__swidget("comFleets").get_active_text()
     value = self.__swidget("spiFleets").get_value_as_int()
     if fleet != "None" and value > 0:
-      self.systems[self.cur_system]["fleets"][fleet] = value
+      self.systems[self.cur_system]["fleets"][fleet] = str(value)
       self.__supdate()
 
   def __fleet_rm(self, wgt=None, event=None):
@@ -654,6 +660,9 @@ class Space:
     del self.systems[self.cur_system]["fleets"][sel]
     self.__supdate()
 
+  """
+  Create a new star system.
+  """
   def __snew(self, wgt=None, event=None):
     name = "new system"
     gen = { "asteroids":0, "interference":0, "stars":100 }
@@ -663,6 +672,9 @@ class Space:
     self.__create_treSystems()
     self.__selSys(name)
 
+  """
+  Create a new planet.
+  """
   def __pnew(self, wgt=None, event=None):
     name = "new planet"
     gfx = { "space":"none.png" }