diff --git a/.gitignore b/.gitignore index 7f9f795..ef0ead1 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ *.txt *.tsv *.pdf +*.pyc *bin/Lephisto *bin/mksprite *bin/data diff --git a/utils/resedit/data.pyc b/utils/resedit/data.pyc deleted file mode 100644 index 20a6c5a..0000000 Binary files a/utils/resedit/data.pyc and /dev/null differ diff --git a/utils/resedit/faction.pyc b/utils/resedit/faction.pyc deleted file mode 100644 index 950f52a..0000000 Binary files a/utils/resedit/faction.pyc and /dev/null differ diff --git a/utils/resedit/space.glade b/utils/resedit/space.glade index 9b30dcf..7801c51 100644 --- a/utils/resedit/space.glade +++ b/utils/resedit/space.glade @@ -406,7 +406,7 @@ </widget> <packing> <property name="x">270</property> - <property name="y">460</property> + <property name="y">480</property> </packing> </child> <child> @@ -421,7 +421,7 @@ </widget> <packing> <property name="x">360</property> - <property name="y">460</property> + <property name="y">480</property> </packing> </child> <child> @@ -442,13 +442,13 @@ </child> <child> <widget class="GtkComboBox" id="comFleet"> - <property name="width_request">183</property> + <property name="width_request">189</property> <property name="height_request">20</property> <property name="visible">True</property> </widget> <packing> <property name="x">270</property> - <property name="y">425</property> + <property name="y">445</property> </packing> </child> <child> @@ -473,6 +473,43 @@ <property name="y">556</property> </packing> </child> + <child> + <widget class="GtkLabel" id="label5"> + <property name="width_request">72</property> + <property name="height_request">20</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Fleet</property> + </widget> + <packing> + <property name="x">278</property> + <property name="y">421</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label6"> + <property name="width_request">84</property> + <property name="height_request">23</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Chance</property> + </widget> + <packing> + <property name="x">430</property> + <property name="y">416</property> + </packing> + </child> + <child> + <widget class="GtkSpinButton" id="spiFleets"> + <property name="width_request">50</property> + <property name="height_request">20</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">0 0 100 1 10 10</property> + </widget> + <packing> + <property name="x">472</property> + <property name="y">445</property> + </packing> + </child> </widget> <packing> <property name="resize">True</property> diff --git a/utils/resedit/space.py b/utils/resedit/space.py index da9c403..651e80c 100644 --- a/utils/resedit/space.py +++ b/utils/resedit/space.py @@ -611,24 +611,29 @@ class Space: def __jump_rm(self, wgt=None, event=None): if self.space_sel in self.systems.keys() and self.cur_system in self.systems.keys(): - i = 0 - for e in self.systems[self.cur_system]["jumps"]: - if e == self.space_sel: - self.systems[self.cur_system]["jumps"].pop(i) - i = i + 1 - i = 0 - for e in self.systems[self.space_sel]["jumps"]: - if e == self.cur_system: - self.systems[self.space_sel]["jumps"].pop(i) - i = i + 1 + self.systems[self.cur_system]["jumps"].remove(self.space_sel) + self.systems[self.space_sel]["jumps"].remove(self.cur_system) self.__supdate() self.__space_draw() + def __fleet_sel(self): + tree = self.__swidget("treFleets") + model = tree.get_model() + try: + iter = tree.get_selection().get_selected()[1] + except: + return "" + return model.get_value(iter, 0) + def __fleet_add(self, wgt=None, event=None): return def __fleet_rm(self, wgt=None, event=None): - reutrn + sel = self.__fleet_sel() + if sel is "": + return + del self.systems[self.cur_system]["fleets"][sel] + self.__supdate() def __snew(self, wgt=None, event=None): name = "new system" diff --git a/utils/resedit/space.pyc b/utils/resedit/space.pyc deleted file mode 100644 index 2c00f96..0000000 Binary files a/utils/resedit/space.pyc and /dev/null differ