From 2af4c92d88ff1153cf510bde1709dc94061bd8c1 Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Sun, 16 Jun 2013 16:40:41 +0100
Subject: [PATCH] [Add] <resedit> Split glades up.

---
 utils/resedit/data.pyc       | Bin 3533 -> 3567 bytes
 utils/resedit/faction.py     |   2 +-
 utils/resedit/faction.pyc    | Bin 3814 -> 3817 bytes
 utils/resedit/factions.glade |  98 +++++
 utils/resedit/planets.glade  | 542 ++++++++++++++++++++++++
 utils/resedit/space.glade    | 780 +++++------------------------------
 utils/resedit/space.py       |  13 +-
 utils/resedit/space.pyc      | Bin 20716 -> 20783 bytes
 8 files changed, 761 insertions(+), 674 deletions(-)
 create mode 100644 utils/resedit/factions.glade
 create mode 100644 utils/resedit/planets.glade

diff --git a/utils/resedit/data.pyc b/utils/resedit/data.pyc
index 8e00a9b7eaf02fb2a9f727b5ee3e74be1201da8b..20a6c5aee8ef99f8997a695d1aea303d35f79209 100644
GIT binary patch
delta 513
zcmY+Ay)Oh&6vfY-?-{cc;$wFjK|)7EA|V8gX2Uib9}%+=v&^zaqIes{ZYd#Np|XF1
zM6@FQ07NHID77M+NOayEL=^Aj-TU4-_xIj?@D|v5GvmFEHZJXB<In;yqt;%YfRIqt
zAqXK*(oq?P03zZ}$>MSYs2WH#R87P_HdSdM(YZW$M`9q<P)F)AQPVKH{EVud<~m3$
z2%EEnhMJBgmEua*Y&|@Ma3RuDHEcXSfiO|IfG`j#gN?{R<f2BPIAQk>Uh@}EL*${R
zm=&aIDnkoj`-abEBmXx&%^8n}ARLA&8K|_;=>O^Me-r<hgpN>0m-?OE0u~u>O5T~b
zu6i<%FULiBWX;JJ>xKe(ZjaHUe6p`w{S+G@M)KsDvqCNM!`TlKQ`y$H%6r8^huRHh
zloUEy2BdHsl#_v%)5yCT@g9i!q~Xu^OsHe^g}}~Qr5GoL0luDP$+1kz#II8*KmCP{
Tes1)!^s=<GOv}~GHg$gidIDz2

delta 483
zcmY*VJxc>Y6r8>9JMRz)F(zq5C9$)yPz*v;1RK#bX;cs+;ssB0o?x*dNP?CM3sxd%
zXJH|>7J^`>wb+VSiueb7dm)O&4(z;n^X9$J>{HfMzdfgTRJ$>cwT2F0n%?dd11b!4
z6&&yZ&QLWF4q*eRYlx_%BXF@vUjvaMzx!W^R8$nSNKaiFnhIu?Ur{$>FAI?lZb~n%
zps8Ys+HBM<a7zlRS_9!BxD9Sd9gQsnC*V55OK=T-o27z<CIbs1=~Dr!D#DLWPzAn&
zCXp1ENK$u6S$mCi+IKtdu}>iw`JIk%OlAM4Ct`zG`Im{)k}6Vko7ybOGTx|o(eK5D
zF{jOM2kYY9cwpV)${c5p;?2C%sNWXX)(UfkYwz`xl62u=kD$~mAt%o4bJiy&oXl<6
zd1fpxa_&NZfohRKu(KMj2T>^}wP^_%36tW~ZLu|x^%j$ZlE_OKkdTm26bIfGOZ@<>
Cb6^nw

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 42bf0389df3f6691f56e79cd38c130815a85b52a..ddbe5ca37eb6eeb38f70badb8a9038b64134c156 100644
GIT binary patch
delta 34
qcmaDR`%;#j`7<w<%bmR&+2a^__!t-%(h`$PGV}9_H|H@{@B#qK{tGGq

delta 31
mcmaDU`%IRd`7<w9)a1gA>~V~o+zbp1#RZAUshbNKD|i8*RS8`H

diff --git a/utils/resedit/factions.glade b/utils/resedit/factions.glade
new file mode 100644
index 0000000..6c3b042
--- /dev/null
+++ b/utils/resedit/factions.glade
@@ -0,0 +1,98 @@
+<?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>
+    <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..752505f
--- /dev/null
+++ b/utils/resedit/planets.glade
@@ -0,0 +1,542 @@
+<?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>
+    <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..d7fb022 100644
--- a/utils/resedit/space.glade
+++ b/utils/resedit/space.glade
@@ -1,9 +1,10 @@
 <?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>
-    <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 +170,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 +206,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 +217,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 +229,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 +258,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 +274,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 +307,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 +371,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="treFleet">
+                    <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 +496,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..508be86 100644
--- a/utils/resedit/space.py
+++ b/utils/resedit/space.py
@@ -8,10 +8,11 @@ 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/"
+     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:
@@ -51,7 +52,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 = {
@@ -94,7 +95,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 = ""
 
diff --git a/utils/resedit/space.pyc b/utils/resedit/space.pyc
index 5fbc6f21f9a2adf8b970d29a73d3a66bc31bcf95..65606a64a6d573086b0ced5dc9b4160ee0241495 100644
GIT binary patch
delta 5175
zcmbVQ3viUx6~1?q>?R=zd1n(|A&Ii#5ex)EcpJb7kw9-K$ji;L`;+dH-A#7?yfkq^
zI!=p~k={P&6C$NfD^#4-+G3Sj>DZP*sjY2o)ppvc)9E-mPSw^5ZO?aZ*n||FX=j)(
z=bU@bx#xAy{g*dJ<RcGCSK8llv!}iC)T6F?hm7ea$E-vkLktPwO$UaU4mrd@DI|C&
zOVbQ5ML>vs4iU3NP_R;_h-8T&IZD%NyT>VnXp2uGjCcF|R$XV8FJQ%UiSO?6MJzi$
zDk&sMUETaTecrLMGK&~HrQ>BCJ13>%)sxctWtJXst<}$^6}XCNMG*gL+OslSkECzT
zz^P^Wz4U`#XxZrmq26$}!nrmU&EYB!d<MbZF3YmjWTI3)fd?9@fPi)5zCKIg6jg*p
z2dHd73HfkaX8T~=w!-nLdakpz$xU+h-5(8yqk*6uwBlpt6yjtneD(xWYn;kO>y`R_
zXV-EzgiKsDG^nN$H_lcCY$1f}xz#Rf^t-NO^RUiUu;H<ZdrQo+OzenrpEVd)nJ`nV
zpUEt8a%67(+su8^qi@M-Or(i`6bBt#)^rh^BmzuRcXT?iv^bE)ec@z2op{qXhIbP0
z;&rn>GsU}je^!dmWIj8^XE8r1krHIHAScC7Vm>#;=P;j_;&YjwEEW$-F|Z7s8Ojp}
zg;=|Lp4jCO!}QO1K3NQLlZW!f5Jj6W%JHW_lvC6)(es+vhVCzbt|T!r-a-*5WTJ>;
zn=ArFxE8~7anePoSlA`zmJm}aY|<_hA@^0HTr`i0DpJ&x6g5>e^MxbTd=V&4@B!0M
z0SVhAD`C;}@uE@|%`hT5jvS(*QN)$TYvb%p1eXr~tFYf&o#Jblzkxj@EmPqeMW9S1
zMoT}7Pw+tWUv_InFhh)%dG^(;kG91e=G{~k(-w1?FHiCFn6F4xt&VwWi_xl8e`wh}
zsj}%QIaB0(-I%kjh#XwVm2h$_Hwn95kL0)$3&c<+%d<q!s<ds$KkXA@I9m)kMW{gx
zWpmMxW#Sis4>TY@2h)sbu^4i}0*^vEreeY|%u=hnL}-BsEE1hu069>L#O(+*iqH}q
zxOTT&3{M)}Hbgzl+lI-l7ym!ElAq08?Wn~KZu2w|+Gzxx_CB6$W_Ut!`^MXpq`&&@
z$@R`D*jKD?&M(m`@}sg!pU&@*MadZjnKDCR!0B0q!|5|XT*@!g=L*C5m_=$Pfd@lX
zW$Wcdr{#j=UyDx2ga;BHMWsa1b3kl6fd?~GbpW;y*sy`=({4v&mP$ax6PiTcxEZ5n
z(C()t9!fT>LS<{v>R%J>>J3NK0q9{&by~L9PcofTI%~~6P{Dv!lw_ekN#MaaHKY0v
zs2TzriL%LHBpR?3Pg!J#%&5csq?|1+llLcIEG?0>jZm6KFfpQjEFdCv1d!1A?vkAx
z|9<d1O*JUEsy+w!Jm3p}>p6-?X`G{QOMMY=6mZqC{LIbf)%?1C#l2r{)4R*v^yKxG
z@0Q=uzbs!~(udt&B^dXze2t@Oo9@)n3YUB=*<bO7bT!bPHZ@y^rVf|JpcE(Ir?Jbo
zXLB^Ja`ly|m9kw=pSB>;gAK)iDnJJTXE9Fcx2*x23u)4EH#Y1C{4e3FFll)3I*;Xm
zyEhmKSOd%W5f0i`%oGsi3IzS?Ui!<s`g~oz7C-K)3^pbvu5Eg*d?LAP`rB!>h+EAD
z94BCHf0r*FHw9KC3*wHbCf!$c&bb6+yIxjpRSbaS3Udzn!JY;r^x5hSvPfstR9g6y
z7?%f58E%Zp2=@ZF26sTJOI0Op@$hDTd(o=wnbl`SY;I9?238QTdQ=~(nOFZk?7{0D
zw_<%ZT#hq_)qPk&-_w1H_`;UDpXkvJq9(}f?(GivZ0irnr8g{gBsdkE6kK7G1+K%l
zz;Y_S3H{@MlYj>SBY<xJP7rvqKy?ssTi{l5Ta5M1d2B%9cs6xMyE!9vfqrXN#ask!
z`e`ukWtX4F_KN@$GN>{@4fpb(Cr2(!-s>rKY#sBzk=EJ&paVO<50?Eu3-(E{XdLwe
zP{^Em3UC~NY^uir-vvBD6`!Uj&&jCh2m33)Sp7{bx^9lUfj!5Es`;*(=)4<>Z2RY+
zUIhF?-#KT8+^JuhbEc^S0=AB>;IA~(|20@RM8N5?eVv@1a4-^$5knn$V0~*=Fw)Iq
z^fS6}-l-W}K8_dF<V2Y1*8yAS^{ew5=i(F|!Ke^l8V`3Yhk=w}EGka^BYJh+cB%E3
z>ptDWnVn#o^*B46jz8j%KLP$sV7^gdRlN=vwRm9thHQUt%#5%R{q%f)?G{>QkHWrS
z#M{#wv^`uT_Q*+#{lNe^s|vX8hi}T3-_~Ecsl5&{np0B4O9gOL7z-&AoI`bimG7u8
zkY|$J^~)V{kv_e!GQnN{5R_6jg8T~rsq~azvtXJV*B`0#b#+DkK06qVC_jmKZ0_l`
zZQ_3iwXwd(3#WbpfMe=8z)t~Hg1+9ly1qSezR31qw`FEWr{3EzyN<)Lv9}jcMBpg|
z#d$ph>H@$xub*zHn^i+RPl1@K28lf2RmFvf512oL>UB=Xn~k~Y(f-Ke$xkfmla!I)
zFTNp>$^%cIxJ_e%16Oa60S?uSJXB3}67b{Q{P8VYHnr7zH{RUds>U4VfZ1!L?fPD0
zK~iU_cR`iB2mCwWAAt7(|I|kt_sUoGzZ;KKAlV;L;Ww8Q$#=D*srREc9%<StKS=(i
z=}H;}{rZZQl50D_ydrtJd1X~a2ae;=IWc^C9I^-W-7D21#Ab?F3<}eYOU?Zpi23@x
zUBQUOZON7BvLfn~&RDgwWkLl%1x?PtwF%&Y`AyyYgX#m?#;ryr^>+HzQGIAtef7&w
zM&Z>Jz`w8w^$r-lz@RGAudO;PWiq^arEJZmB{QzMzu5DcP~@K752}EGJF+(t>`~hx
z`tVz|v^h^UC)YPGlPxgK6W7e0>)HP`jEz}L4WH3_iq(ty!kTUJHeJ2;<-`dHMqrkW
zodlceQFR<FR}Uxi?{<Em&GqNV_F&;1f{7o3d~>R4fh*HVm4P9ivJtD_8>bX|guZLt
zdYaTfUUzZD4{22`1tbZ0x|+d0=FT~+9tXgbae_O4Sif+~jH(GWA3J;RfSQXd@Q}`L
z*)0P)(sHZ?6Ud}89R@o9=Lz_u7hhd8M&r>Kr*dqBn>M(J%{+Er;ER6r)*KnpCvQEr
zqLEg{S?#}SRV~E%cM?0!7QbENZ5>$OE(ek?tuK@%OQ6{RK!6@RfT~|#-r(Lf0FqOW
z>%iR_v%*pO@00yl`4NDN!cD+OW<fR~JNH3$8NhBJS@iUGw{DmB=%2Md`LQMl*nvz?
z#{rKKm?wb)Ta1`E|L|$t+d4Km`IJl0b#taFHs;B%Bx^S=kuy>ujO!@&kzKir?b+zw
zfVHQ$^I`pb+qwjM!l}T!rKSK}0Q`tDkv{;6!yg9K0bplS*-#Hd_6*=RfKz~H0k;Eo
z0V04XU?*S)AS~t*?gn`WzzY}zyaSkzWZVU62(U~)y=lA5)$Yx$H*O&TPb~VuX#Ovb
aKOQ@ydqS3<9$xIHAA#pKwdhNmr~U`!vEbDJ

delta 5035
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
F{$EXXtRVmZ