Eash. Merging branch testing..

Conflicts:
	utils/resedit/faction.pyc
	utils/resedit/factions.glade
	utils/resedit/planets.glade
	utils/resedit/space.glade
	utils/resedit/space.py
	utils/resedit/space.pyc

utils/resedit/factions.glade

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.4 on Sun Apr 27 17:22:53 2008 -->
 <glade-interface>
   <widget class="GtkWindow" id="winFactions">
     <property name="width_request">400</property>

utils/resedit/planets.glade

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.4 on Sun Apr 27 17:23:22 2008 -->
 <glade-interface>
   <widget class="GtkWindow" id="winPlanets">
     <property name="width_request">600</property>

utils/resedit/space.glade

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.4 on Sun Apr 27 19:11:35 2008 -->
 <glade-interface>
   <widget class="GtkWindow" id="winSystems">
     <property name="width_request">750</property>
@@ -383,7 +382,7 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkTreeView" id="treFleet">
+                  <widget class="GtkTreeView" id="treFleets">
                     <property name="width_request">250</property>
                     <property name="height_request">212</property>
                     <property name="visible">True</property>

utils/resedit/space.py

@@ -7,7 +7,7 @@ import data
 
 class Space:
 
-  def __init__(self, factions=None):
+  def __init__(self, factions=None, fleets=None):
      self.space_glade   = "space.glade"
      self.planet_glade  = "planets.glade"
      self.systemsXML    = "../../dat/ssys.xml"
@@ -19,6 +19,9 @@ class Space:
        self.factions = {}
      else:
        self.factions = factions
+     if fleets==None:
+       self.fleets = {}
+       self.fleets = fleets
 
   def loadSystems(self, xmlfile):
     self.systems = data.load(xmlfile, "ssys", True,
@@ -66,7 +69,9 @@ class Space:
         "butReset":["clicked", self.__space_reset],
         "butAddJump":["clicked", self.__jump_add],
         "butRmJump":["clicked", self.__jump_rm],
-        "butNew":["clicked", self.__snew]
+        "butNew":["clicked", self.__snew],
+        "butFleetAdd":["clicked", self.__fleet_add],
+        "butFleetRemove":["clicked", self.__fleet_rm]
     }
     for key, val in hooks.items():
       self.__swidget(key).connect(val[0], val[1])
@@ -219,6 +224,25 @@ class Space:
     col.add_attribute(cell, 'text', 0)
     wgt.set_model(jumps)
 
+    # Load fleets.
+    fleets = gtk.ListStore(str, int)
+    for fleet, chance in system["fleets"].items():
+      treenode = fleets.append([fleet, int(chance)])
+    wgt = self.__swidget("treFleets")
+    if wgt.get_column(0):
+      wgt.remove_column(wgt.get_column(0))
+      wgt.remove_column(wgt.get_column(0))
+    columns = [None]*2
+    columns[0] = gtk.TreeViewColumn('Fleet')
+    columns[1] = gtk.TreeViewColumn('Chance')
+    for n in range(2):
+      wgt.append_column(columns[n])
+      columns[n].cell = gtk.CellRendererText()
+      columns[n].pack_start(columns[n].cell, True)
+      columns[n].set_attributes(columns[n].cell, text = n)
+
+    wgt.set_model(fleets)
+
     self.__space_draw()
 
   def __pupdate(self, wgt=None, event=None):
@@ -600,6 +624,12 @@ class Space:
       self.__supdate()
       self.__space_draw()
 
+  def __fleet_add(self, wgt=None, event=None):
+    return
+
+  def __fleet_rm(self, wgt=None, event=None):
+    reutrn
+
   def __snew(self, wgt=None, event=None):
     name = "new system"
     gen = { "asteroids":0, "interference":0, "stars":100 }