[Add] You may now remove fleets from systems.

This commit is contained in:
Allanis 2013-06-18 21:04:56 +01:00
parent d054492693
commit a9ad3298ac
6 changed files with 58 additions and 15 deletions

1
.gitignore vendored
View File

@ -23,6 +23,7 @@
*.txt *.txt
*.tsv *.tsv
*.pdf *.pdf
*.pyc
*bin/Lephisto *bin/Lephisto
*bin/mksprite *bin/mksprite
*bin/data *bin/data

Binary file not shown.

Binary file not shown.

View File

@ -406,7 +406,7 @@
</widget> </widget>
<packing> <packing>
<property name="x">270</property> <property name="x">270</property>
<property name="y">460</property> <property name="y">480</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -421,7 +421,7 @@
</widget> </widget>
<packing> <packing>
<property name="x">360</property> <property name="x">360</property>
<property name="y">460</property> <property name="y">480</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -442,13 +442,13 @@
</child> </child>
<child> <child>
<widget class="GtkComboBox" id="comFleet"> <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="height_request">20</property>
<property name="visible">True</property> <property name="visible">True</property>
</widget> </widget>
<packing> <packing>
<property name="x">270</property> <property name="x">270</property>
<property name="y">425</property> <property name="y">445</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -473,6 +473,43 @@
<property name="y">556</property> <property name="y">556</property>
</packing> </packing>
</child> </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> </widget>
<packing> <packing>
<property name="resize">True</property> <property name="resize">True</property>

View File

@ -611,24 +611,29 @@ class Space:
def __jump_rm(self, wgt=None, event=None): def __jump_rm(self, wgt=None, event=None):
if self.space_sel in self.systems.keys() and self.cur_system in self.systems.keys(): if self.space_sel in self.systems.keys() and self.cur_system in self.systems.keys():
i = 0 self.systems[self.cur_system]["jumps"].remove(self.space_sel)
for e in self.systems[self.cur_system]["jumps"]: self.systems[self.space_sel]["jumps"].remove(self.cur_system)
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.__supdate() self.__supdate()
self.__space_draw() 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): def __fleet_add(self, wgt=None, event=None):
return return
def __fleet_rm(self, wgt=None, event=None): 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): def __snew(self, wgt=None, event=None):
name = "new system" name = "new system"

Binary file not shown.