diff --git a/utils/resedit/faction.pyc b/utils/resedit/faction.pyc index ddbe5ca..950f52a 100644 Binary files a/utils/resedit/faction.pyc and b/utils/resedit/faction.pyc differ diff --git a/utils/resedit/factions.glade b/utils/resedit/factions.glade index 6c3b042..93e5310 100644 --- a/utils/resedit/factions.glade +++ b/utils/resedit/factions.glade @@ -1,6 +1,5 @@ - 400 diff --git a/utils/resedit/planets.glade b/utils/resedit/planets.glade index 752505f..e927270 100644 --- a/utils/resedit/planets.glade +++ b/utils/resedit/planets.glade @@ -1,6 +1,5 @@ - 600 diff --git a/utils/resedit/space.glade b/utils/resedit/space.glade index d7fb022..9b30dcf 100644 --- a/utils/resedit/space.glade +++ b/utils/resedit/space.glade @@ -1,6 +1,5 @@ - 750 @@ -383,7 +382,7 @@ - + 250 212 True diff --git a/utils/resedit/space.py b/utils/resedit/space.py index 508be86..da9c403 100644 --- a/utils/resedit/space.py +++ b/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 } diff --git a/utils/resedit/space.pyc b/utils/resedit/space.pyc index 65606a6..2c00f96 100644 Binary files a/utils/resedit/space.pyc and b/utils/resedit/space.pyc differ