diff --git a/utils/resedit/data.pyc b/utils/resedit/data.pyc
index 8e00a9b..20a6c5a 100644
Binary files a/utils/resedit/data.pyc and b/utils/resedit/data.pyc differ
diff --git a/utils/resedit/faction.py b/utils/resedit/faction.py
index e5b644d..591be51 100644
--- a/utils/resedit/faction.py
+++ b/utils/resedit/faction.py
@@ -9,7 +9,7 @@ class Factions:
def __init__(self):
self.faction = {}
self.factionsXML = "../../dat/faction.xml"
- self.glade = "space.glade"
+ self.glade = "factions.glade"
self.cur_faction = ""
def loadFactions(self, xmlfile=None):
diff --git a/utils/resedit/faction.pyc b/utils/resedit/faction.pyc
index 42bf038..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
new file mode 100644
index 0000000..93e5310
--- /dev/null
+++ b/utils/resedit/factions.glade
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<glade-interface>
+ <widget class="GtkWindow" id="winFactions">
+ <property name="width_request">400</property>
+ <property name="height_request">150</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <widget class="GtkHPaned" id="hpaned3">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <widget class="GtkTreeView" id="treFactions">
+ <property name="width_request">150</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_clickable">True</property>
+ </widget>
+ <packing>
+ <property name="resize">False</property>
+ <property name="shrink">True</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLayout" id="layout3">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <widget class="GtkLabel" id="label15">
+ <property name="width_request">72</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Name</property>
+ </widget>
+ <packing>
+ <property name="x">34</property>
+ <property name="y">17</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="entName">
+ <property name="width_request">100</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="x">108</property>
+ <property name="y">17</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="butSave">
+ <property name="width_request">62</property>
+ <property name="height_request">37</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Save</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="x">105</property>
+ <property name="y">46</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="butNew">
+ <property name="width_request">68</property>
+ <property name="height_request">37</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">New</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="x">13</property>
+ <property name="y">45</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="resize">True</property>
+ <property name="shrink">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+</glade-interface>
diff --git a/utils/resedit/planets.glade b/utils/resedit/planets.glade
new file mode 100644
index 0000000..e927270
--- /dev/null
+++ b/utils/resedit/planets.glade
@@ -0,0 +1,541 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<glade-interface>
+ <widget class="GtkWindow" id="winPlanets">
+ <property name="width_request">600</property>
+ <property name="height_request">500</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="title" translatable="yes">Planet Editor</property>
+ <child>
+ <widget class="GtkHPaned" id="hpaned2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <widget class="GtkTreeView" id="trePlanets">
+ <property name="width_request">150</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_clickable">True</property>
+ </widget>
+ <packing>
+ <property name="resize">False</property>
+ <property name="shrink">True</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLayout" id="layout2">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <widget class="GtkButton" id="butNew">
+ <property name="width_request">70</property>
+ <property name="height_request">37</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">New</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="x">17</property>
+ <property name="y">12</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label5">
+ <property name="width_request">80</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Name:</property>
+ </widget>
+ <packing>
+ <property name="x">94</property>
+ <property name="y">21</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="inpName">
+ <property name="width_request">121</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="x">160</property>
+ <property name="y">19</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox" id="comFaction">
+ <property name="width_request">182</property>
+ <property name="height_request">24</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="x">80</property>
+ <property name="y">58</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label6">
+ <property name="width_request">88</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Faction</property>
+ </widget>
+ <packing>
+ <property name="y">62</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHSeparator" id="hseparator4">
+ <property name="width_request">404</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="x">12</property>
+ <property name="y">173</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkTreeView" id="treCommodities">
+ <property name="width_request">188</property>
+ <property name="height_request">149</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_clickable">True</property>
+ </widget>
+ <packing>
+ <property name="x">17</property>
+ <property name="y">196</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox" id="comCommodities">
+ <property name="width_request">189</property>
+ <property name="height_request">24</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="x">15</property>
+ <property name="y">350</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="butComAdd">
+ <property name="width_request">86</property>
+ <property name="height_request">38</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Add</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="x">16</property>
+ <property name="y">380</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="butComRm">
+ <property name="width_request">88</property>
+ <property name="height_request">40</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Remove</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="x">115</property>
+ <property name="y">380</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVSeparator" id="vseparator2">
+ <property name="width_request">20</property>
+ <property name="height_request">171</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="x">209</property>
+ <property name="y">194</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHSeparator" id="hseparator5">
+ <property name="width_request">408</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="x">6</property>
+ <property name="y">419</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label7">
+ <property name="width_request">100</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Services</property>
+ </widget>
+ <packing>
+ <property name="x">254</property>
+ <property name="y">194</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="cheLand">
+ <property name="width_request">73</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Land</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="x">240</property>
+ <property name="y">215</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="cheBasic">
+ <property name="width_request">70</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Basic</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="x">320</property>
+ <property name="y">215</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="cheCommodity">
+ <property name="width_request">112</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Commodity</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="x">240</property>
+ <property name="y">235</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="cheOutfits">
+ <property name="width_request">80</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Outfits</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="x">240</property>
+ <property name="y">255</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="cheShipyard">
+ <property name="width_request">100</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Shipyard</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="x">320</property>
+ <property name="y">255</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHSeparator" id="hseparator6">
+ <property name="width_request">191</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="x">219</property>
+ <property name="y">274</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label8">
+ <property name="width_request">57</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Tech</property>
+ </widget>
+ <packing>
+ <property name="x">260</property>
+ <property name="y">293</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label9">
+ <property name="width_request">63</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Main</property>
+ </widget>
+ <packing>
+ <property name="x">222</property>
+ <property name="y">320</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="spiTech0">
+ <property name="width_request">58</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="adjustment">0 0 100000 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="x">300</property>
+ <property name="y">320</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label10">
+ <property name="width_request">67</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Special</property>
+ </widget>
+ <packing>
+ <property name="x">224</property>
+ <property name="y">345</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="spiTech1">
+ <property name="width_request">60</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="adjustment">0 0 100000 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="x">235</property>
+ <property name="y">365</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="spiTech2">
+ <property name="width_request">60</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="adjustment">0 0 100000 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="x">300</property>
+ <property name="y">365</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="spiTech3">
+ <property name="width_request">60</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="adjustment">0 0 100000 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="x">235</property>
+ <property name="y">390</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="spiTech4">
+ <property name="width_request">60</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="adjustment">0 0 100 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="x">300</property>
+ <property name="y">390</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox" id="comSystem">
+ <property name="width_request">160</property>
+ <property name="height_request">23</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="x">12</property>
+ <property name="y">465</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label11">
+ <property name="width_request">100</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">System</property>
+ </widget>
+ <packing>
+ <property name="y">440</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="butSave">
+ <property name="width_request">100</property>
+ <property name="height_request">50</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Save</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="x">189</property>
+ <property name="y">438</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label12">
+ <property name="width_request">62</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Class</property>
+ </widget>
+ <packing>
+ <property name="x">289</property>
+ <property name="y">20</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkImage" id="imaPlanet">
+ <property name="width_request">152</property>
+ <property name="height_request">122</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="x">260</property>
+ <property name="y">48</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox" id="comClass">
+ <property name="width_request">79</property>
+ <property name="height_request">33</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="x">341</property>
+ <property name="y">9</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label13">
+ <property name="width_request">101</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">GFX Space</property>
+ </widget>
+ <packing>
+ <property name="y">92</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox" id="comSpace">
+ <property name="width_request">163</property>
+ <property name="height_request">24</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="x">96</property>
+ <property name="y">89</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label14">
+ <property name="width_request">98</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">GFX Exterior</property>
+ </widget>
+ <packing>
+ <property name="x">10</property>
+ <property name="y">123</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox" id="comExterior">
+ <property name="width_request">154</property>
+ <property name="height_request">22</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="x">106</property>
+ <property name="y">120</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="resize">True</property>
+ <property name="shrink">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+</glade-interface>
diff --git a/utils/resedit/space.glade b/utils/resedit/space.glade
index 00a132e..9b30dcf 100644
--- a/utils/resedit/space.glade
+++ b/utils/resedit/space.glade
@@ -3,7 +3,7 @@
<glade-interface>
<widget class="GtkWindow" id="winSystems">
<property name="width_request">750</property>
- <property name="height_request">450</property>
+ <property name="height_request">675</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">System Editor</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
@@ -169,7 +169,7 @@
<child>
<widget class="GtkVSeparator" id="vseparator1">
<property name="width_request">20</property>
- <property name="height_request">322</property>
+ <property name="height_request">323</property>
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
</widget>
@@ -205,7 +205,7 @@
<child>
<widget class="GtkTreeView" id="treJumps">
<property name="width_request">193</property>
- <property name="height_request">110</property>
+ <property name="height_request">170</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -216,22 +216,6 @@
<property name="y">180</property>
</packing>
</child>
- <child>
- <widget class="GtkButton" id="butAddJump">
- <property name="width_request">70</property>
- <property name="height_request">27</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Add</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="x">20</property>
- <property name="y">296</property>
- </packing>
- </child>
<child>
<widget class="GtkButton" id="butRmJump">
<property name="width_request">70</property>
@@ -244,8 +228,8 @@
<property name="response_id">0</property>
</widget>
<packing>
- <property name="x">112</property>
- <property name="y">295</property>
+ <property name="x">110</property>
+ <property name="y">360</property>
</packing>
</child>
<child>
@@ -273,8 +257,8 @@
<property name="response_id">0</property>
</widget>
<packing>
- <property name="x">14</property>
- <property name="y">350</property>
+ <property name="x">328</property>
+ <property name="y">577</property>
</packing>
</child>
<child>
@@ -289,8 +273,8 @@
<property name="response_id">0</property>
</widget>
<packing>
- <property name="x">115</property>
- <property name="y">350</property>
+ <property name="x">422</property>
+ <property name="y">578</property>
</packing>
</child>
<child>
@@ -322,18 +306,6 @@
<property name="y">17</property>
</packing>
</child>
- <child>
- <widget class="GtkHSeparator" id="hseparator3">
- <property name="width_request">202</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">5</property>
- <property name="y">326</property>
- </packing>
- </child>
<child>
<widget class="GtkButton" id="butZoomIn">
<property name="width_request">35</property>
@@ -398,6 +370,109 @@
<property name="y">350</property>
</packing>
</child>
+ <child>
+ <widget class="GtkVSeparator" id="vseparator3">
+ <property name="width_request">20</property>
+ <property name="height_request">376</property>
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="x">530</property>
+ <property name="y">11</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkTreeView" id="treFleets">
+ <property name="width_request">250</property>
+ <property name="height_request">212</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_clickable">True</property>
+ </widget>
+ <packing>
+ <property name="x">10</property>
+ <property name="y">420</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="butFleetAdd">
+ <property name="width_request">70</property>
+ <property name="height_request">27</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="label" translatable="yes">Add</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="x">270</property>
+ <property name="y">460</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="butFleetRemove">
+ <property name="width_request">70</property>
+ <property name="height_request">27</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="label" translatable="yes">Remove</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="x">360</property>
+ <property name="y">460</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="butAddJump">
+ <property name="width_request">70</property>
+ <property name="height_request">27</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Add</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="x">20</property>
+ <property name="y">360</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox" id="comFleet">
+ <property name="width_request">183</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="x">270</property>
+ <property name="y">425</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHSeparator" id="hseparator4">
+ <property name="width_request">513</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="x">4</property>
+ <property name="y">393</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHSeparator" id="hseparator3">
+ <property name="width_request">228</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="x">289</property>
+ <property name="y">556</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="resize">True</property>
@@ -420,634 +495,4 @@
</widget>
</child>
</widget>
- <widget class="GtkWindow" id="winPlanets">
- <property name="width_request">600</property>
- <property name="height_request">500</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="title" translatable="yes">Planet Editor</property>
- <child>
- <widget class="GtkHPaned" id="hpaned2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <widget class="GtkTreeView" id="trePlanets">
- <property name="width_request">150</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="headers_clickable">True</property>
- </widget>
- <packing>
- <property name="resize">False</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLayout" id="layout2">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <widget class="GtkButton" id="butNew">
- <property name="width_request">70</property>
- <property name="height_request">37</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">New</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="x">17</property>
- <property name="y">12</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label5">
- <property name="width_request">80</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Name:</property>
- </widget>
- <packing>
- <property name="x">94</property>
- <property name="y">21</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="inpName">
- <property name="width_request">121</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">160</property>
- <property name="y">19</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="comFaction">
- <property name="width_request">182</property>
- <property name="height_request">24</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">80</property>
- <property name="y">58</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label6">
- <property name="width_request">88</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Faction</property>
- </widget>
- <packing>
- <property name="y">62</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator4">
- <property name="width_request">404</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">12</property>
- <property name="y">173</property>
- </packing>
- </child>
- <child>
- <widget class="GtkTreeView" id="treCommodities">
- <property name="width_request">188</property>
- <property name="height_request">149</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="headers_clickable">True</property>
- </widget>
- <packing>
- <property name="x">17</property>
- <property name="y">196</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="comCommodities">
- <property name="width_request">189</property>
- <property name="height_request">24</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">15</property>
- <property name="y">350</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="butComAdd">
- <property name="width_request">86</property>
- <property name="height_request">38</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Add</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="x">16</property>
- <property name="y">380</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="butComRm">
- <property name="width_request">88</property>
- <property name="height_request">40</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Remove</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="x">115</property>
- <property name="y">380</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVSeparator" id="vseparator2">
- <property name="width_request">20</property>
- <property name="height_request">171</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">209</property>
- <property name="y">194</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator5">
- <property name="width_request">408</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">6</property>
- <property name="y">419</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label7">
- <property name="width_request">100</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Services</property>
- </widget>
- <packing>
- <property name="x">254</property>
- <property name="y">194</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="cheLand">
- <property name="width_request">73</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Land</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="x">240</property>
- <property name="y">215</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="cheBasic">
- <property name="width_request">70</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Basic</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="x">320</property>
- <property name="y">215</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="cheCommodity">
- <property name="width_request">112</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Commodity</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="x">240</property>
- <property name="y">235</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="cheOutfits">
- <property name="width_request">80</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Outfits</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="x">240</property>
- <property name="y">255</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="cheShipyard">
- <property name="width_request">100</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Shipyard</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="x">320</property>
- <property name="y">255</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator6">
- <property name="width_request">191</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">219</property>
- <property name="y">274</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label8">
- <property name="width_request">57</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Tech</property>
- </widget>
- <packing>
- <property name="x">260</property>
- <property name="y">293</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label9">
- <property name="width_request">63</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Main</property>
- </widget>
- <packing>
- <property name="x">222</property>
- <property name="y">320</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spiTech0">
- <property name="width_request">58</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 100000 1 10 10</property>
- </widget>
- <packing>
- <property name="x">300</property>
- <property name="y">320</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label10">
- <property name="width_request">67</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Special</property>
- </widget>
- <packing>
- <property name="x">224</property>
- <property name="y">345</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spiTech1">
- <property name="width_request">60</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 100000 1 10 10</property>
- </widget>
- <packing>
- <property name="x">235</property>
- <property name="y">365</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spiTech2">
- <property name="width_request">60</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 100000 1 10 10</property>
- </widget>
- <packing>
- <property name="x">300</property>
- <property name="y">365</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spiTech3">
- <property name="width_request">60</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 100000 1 10 10</property>
- </widget>
- <packing>
- <property name="x">235</property>
- <property name="y">390</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spiTech4">
- <property name="width_request">60</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 100 1 10 10</property>
- </widget>
- <packing>
- <property name="x">300</property>
- <property name="y">390</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="comSystem">
- <property name="width_request">160</property>
- <property name="height_request">23</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">12</property>
- <property name="y">465</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label11">
- <property name="width_request">100</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">System</property>
- </widget>
- <packing>
- <property name="y">440</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="butSave">
- <property name="width_request">100</property>
- <property name="height_request">50</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Save</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="x">189</property>
- <property name="y">438</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label12">
- <property name="width_request">62</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Class</property>
- </widget>
- <packing>
- <property name="x">289</property>
- <property name="y">20</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage" id="imaPlanet">
- <property name="width_request">152</property>
- <property name="height_request">122</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="stock">gtk-missing-image</property>
- </widget>
- <packing>
- <property name="x">260</property>
- <property name="y">48</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="comClass">
- <property name="width_request">79</property>
- <property name="height_request">33</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">341</property>
- <property name="y">9</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label13">
- <property name="width_request">101</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">GFX Space</property>
- </widget>
- <packing>
- <property name="y">92</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="comSpace">
- <property name="width_request">163</property>
- <property name="height_request">24</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">96</property>
- <property name="y">89</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label14">
- <property name="width_request">98</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">GFX Exterior</property>
- </widget>
- <packing>
- <property name="x">10</property>
- <property name="y">123</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="comExterior">
- <property name="width_request">154</property>
- <property name="height_request">22</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">106</property>
- <property name="y">120</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="GtkWindow" id="winFactions">
- <property name="width_request">400</property>
- <property name="height_request">150</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <widget class="GtkHPaned" id="hpaned3">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <widget class="GtkTreeView" id="treFactions">
- <property name="width_request">150</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="headers_clickable">True</property>
- </widget>
- <packing>
- <property name="resize">False</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLayout" id="layout3">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <widget class="GtkLabel" id="label15">
- <property name="width_request">72</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Name</property>
- </widget>
- <packing>
- <property name="x">34</property>
- <property name="y">17</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="entName">
- <property name="width_request">100</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">108</property>
- <property name="y">17</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="butSave">
- <property name="width_request">62</property>
- <property name="height_request">37</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Save</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="x">105</property>
- <property name="y">46</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="butNew">
- <property name="width_request">68</property>
- <property name="height_request">37</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">New</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="x">13</property>
- <property name="y">45</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
</glade-interface>
diff --git a/utils/resedit/space.py b/utils/resedit/space.py
index c724e4e..da9c403 100644
--- a/utils/resedit/space.py
+++ b/utils/resedit/space.py
@@ -7,17 +7,21 @@ import data
class Space:
- def __init__(self, factions=None):
- self.glade = "space.glade"
- self.systemsXML = "../../dat/ssys.xml"
- self.planetsXML = "../../dat/planet.xml"
- self.planet_gfx = "../../gfx/planet/"
+ def __init__(self, factions=None, fleets=None):
+ self.space_glade = "space.glade"
+ self.planet_glade = "planets.glade"
+ self.systemsXML = "../../dat/ssys.xml"
+ self.planetsXML = "../../dat/planet.xml"
+ self.planet_gfx = "../../gfx/planet/"
self.loadSystems(self.systemsXML)
self.loadPlanets(self.planetsXML)
if factions==None:
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,
@@ -51,7 +55,7 @@ class Space:
create the window
"""
# --------------- SYSTEMS --------------------
- self.swtree = gtk.glade.XML(self.glade, "winSystems")
+ self.swtree = gtk.glade.XML(self.space_glade, "winSystems")
# Hook events and stuff.
hooks = {
@@ -65,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])
@@ -94,7 +100,7 @@ class Space:
# ---------------- PLANETS --------------------
- self.pwtree = gtk.glade.XML(self.glade, "winPlanets")
+ self.pwtree = gtk.glade.XML(self.planet_glade, "winPlanets")
self.__pwidget("winPlanets").show_all()
self.cur_planet = ""
@@ -218,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):
@@ -599,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 5fbc6f2..d9ca801 100644
Binary files a/utils/resedit/space.pyc and b/utils/resedit/space.pyc differ