From 081449b5eacabf0e5295b30787dfe6330fa70487 Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Tue, 16 Apr 2013 13:10:39 +0100
Subject: [PATCH] [Add] resedit: SaraCraft presents... The new planet editor!

---
 utils/resedit/space.glade | 467 +++++++++++++++++++++++++++++++++++++-
 utils/resedit/space.py    |  12 +
 utils/resedit/space.pyc   | Bin 13757 -> 14178 bytes
 3 files changed, 477 insertions(+), 2 deletions(-)

diff --git a/utils/resedit/space.glade b/utils/resedit/space.glade
index 5180b2e..e21763d 100644
--- a/utils/resedit/space.glade
+++ b/utils/resedit/space.glade
@@ -180,8 +180,8 @@
                 </child>
                 <child>
                   <widget class="GtkDrawingArea" id="draSpace">
-                    <property name="width_request">296</property>
-                    <property name="height_request">248</property>
+                    <property name="width_request">300</property>
+                    <property name="height_request">250</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>
@@ -420,4 +420,467 @@
       </widget>
     </child>
   </widget>
+  <widget class="GtkWindow" id="winPlanets">
+    <property name="width_request">600</property>
+    <property name="height_request">450</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="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">129</property>
+                <property name="height_request">29</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">11</property>
+                <property name="y">94</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkTreeView" id="treCommodities">
+                <property name="width_request">188</property>
+                <property name="height_request">166</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">16</property>
+                <property name="y">116</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">287</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">15</property>
+                <property name="y">318</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">316</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkVSeparator" id="vseparator2">
+                <property name="width_request">20</property>
+                <property name="height_request">255</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">110</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">7</property>
+                <property name="y">360</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">232</property>
+                <property name="y">115</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">145</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">145</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">170</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">195</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">195</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">221</property>
+                <property name="y">217</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">246</property>
+                <property name="y">238</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">260</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkSpinButton" id="spinbutton1">
+                <property name="width_request">72</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">272</property>
+                <property name="y">260</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">225</property>
+                <property name="y">290</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">315</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">315</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">340</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">340</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkComboBox" id="comSystem">
+                <property name="width_request">160</property>
+                <property name="height_request">25</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">400</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">378</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">190</property>
+                <property name="y">377</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">227</property>
+                <property name="y">60</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 66e42c6..e437bf9 100644
--- a/utils/resedit/space.py
+++ b/utils/resedit/space.py
@@ -48,6 +48,7 @@ class space:
     hooks = {
         "winSystems":["destroy",self.__done],
         "treSystems":["button-release-event", self.__update],
+        "inpName":["changed", self.__update],
         "butDone":["clicked", self.__done],
         "butSave":["clicked",self.saveSystems],
         "butZoomIn":["clicked", self.__space_zoomin],
@@ -66,6 +67,7 @@ class space:
     self.zoom = 1
     self.space_sel = ""
     area = self.__swidget("draSpace")
+    area.set_double_buffered(True)
     area.set_events(gtk.gdk.EXPOSURE_MASK
         | gtk.gdk.LEAVE_NOTIFY_MASK
         | gtk.gdk.BUTTON_PRESS_MASK
@@ -83,6 +85,10 @@ class space:
 
     # ---------------- PLANETS --------------------
 
+    self.pwtree = gtk.glade.XML(self.glade, "winPlanets")
+    self.__pwidget("winPlanets").show_all()
+    self.cur_planet = ""
+
     # ---------------------------------------------
     gtk.main()
 
@@ -109,6 +115,9 @@ class space:
     """
     return self.swtree.get_widget(wgtname)
 
+  def __pwidget(self, wgtname):
+    return self.pwtree.get_widget(wgtname)
+
   def __update(self, wgt=None, index=None, iter=None):
     """
     Update the window
@@ -360,6 +369,9 @@ class space:
       layout = area.create_pango_layout(sys_name)
       area.window.draw_layout(gc, dx+r/2+2, dy-r/2, layout)
 
+    # Draw the frame at the end.
+    area.window.draw_rectangle(sys_gc, False, 0, 0, ww-1, wh-1)
+
   def __jump_add(self, wgt=None, event=None):
     if self.space_sel in self.systems.keys() and self.cur_system in self.systems.keys():
       self.systems[self.cur_system]["jumps"].append(self.space_sel)
diff --git a/utils/resedit/space.pyc b/utils/resedit/space.pyc
index 2f268201d811b7d53cdec08aad5e0868d9e8fd94..94b0522bea0ce8d3c9d01e6a88db69a4464ce05c 100644
GIT binary patch
delta 2870
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

delta 2618
zcmah~>u-})7(b`iy<OLK?YgbI$u6*WS2kdSff5*3Ck}Qdw;{IOT4%SeE$iFC6sWrK
zNidNUqhdf2FOZNB(rElb2;WRJ#zZ5An5aY(6Tg`F4|sl0*A58AUVc5l=bZDL=lq`M
zeR@A}YuaZ1r_AyGrkl2noY%>%Tx6?RB>yR4i)J=f$|4$DWNgeyb_ZMJY^;n$O3COd
zEOxR*6B~0EXc<uti@0c6Ig7Yy;4Lih&;nn9mJ_W|bRU_##QlY7AJNJJtsq)epnjq%
z=t?>xz#>&Ns9|DM59Fpzr>&+xx%|uCz#Y<2qGv5^(!?S*)*rF5lZ;K-h}(<YPQ0YZ
zONeVlt`T<>xr2CVk(Uy87P*sn8S6jA*@;a|-YIFzx>(?(8L|WxOpG7<mK{VS9=5<3
zS5`%WN;MA+ycDI<x|}U=cFMv|TG*728EQiXoAMV1m27ayR8<^R7e@g$s5WzKRcXrR
zebz9XzGU;!F|`kxD#%oqH>u-P3>+~`)#n4v$Jc;7TM+US6z_^6ZzSGC5jN+y_}Qpl
z$z-QvTHbJcV;<I9a_35Wc<!Fl%4M1BjJAQPm$lYxmKR-(UYn(l`|vjVxW+x)W6k~K
z+QDu8YLRHqHG8HwKP=xYU*w(A=bbB^Quee7E-bnAzWcmfSHoe$t}vEJ4Too<vf2N#
zZI|L=x4h!-;Un?~e{Xgt3?4uq0Pc+v1?i{}G@>UAF$!}#%$kBdv9vL2Bxj>yKkNqq
zhX98GV}K)o=K*fOQNRm;K?QmlMm9iDfgu+weZ3)!%nBm03Gpn5Rl!_1o{0(^Dtv%2
zU>q<ZLrvS|=5;oECKU-A(Nr!_^*7JHggIPWG$@FvFUxPA1?8Yg0A@r2Fb#lmVg?Xb
zpwodx872!d6m=pQV4g`vqH$7<VozC;DY0Lk4Q%z`3gQ(21s+1UPGlk&Ohdc(WLM3l
z0m|eltU91TCrt=Ku#q~@#0XDPLS|x#<g6lMgl_*`olOqcYW$8oRQrV=x26m0IEJz)
zPRr)H_56T5Qn%9mI;`{X1{qTFrgeui7@Ww=j?Slz=*(C0*SZ*QmqYb){6~4GezXk^
zbqjXoD+Z&D07@d_T1ujPsv*dK&RuMH(!|^3y%j5VQU+2FZH-YSAS-&{p^1FGxs(lx
zhU4+%MA(QW6JkJaX>1rNicVEXGRG1I#b7wpCKPFS!idd9sbY49<LT&fM#AH116MHS
zQ&Fm5@ua-b*xpU|cp7mG0T7$+#fa30@ZvmR=~=Nib@PzyZ))RbmGaN=-*TTf&2e?v
z&X$$kMRh2Ew4tgoum0QcFaVeX-~m#{XIuOu%O^w2{P9rW@yBE0I^YAqhk(m~j{sKy
zAIm>lUgVnGv+}JPI`GjHVbOUinoX;Gyix95mHEGgO|4$usuud?P-_{#mOIpX)$EKg
z)x!MB+puVpYddz8K9FR2rlYflDw-}%vQRL)ar!>_b;rS;3m7i9ns*hYhbb}}J|2w6
z5>cu!%5prK5E&^tw+$|*V=uNpMg_y9CMHhgf9Ay}aEnZ)=hMN-2{A73cJ_K+!{!j+
zD&U%|?z(L2QV&CVOy2G~DjT|g-$8YO_^4{8qw{G&1xTF^eT(dwMC_R8hLiu+`Hj^s
zKApR;dWdf*Iu+kz4>`<YwCn=S?$P8g$hzKxJR^<XyDex-)TLr7152H&Sa<numXgUe
z^_}<!5tkI?yTBvm{HdBCaVM3yDf#7^F}^5$Yp-vnw4KIm;h9p6A)TD15cTEgLTZUv
z0G!2QG=bUVan(z<s$T5m=j1c%Zq@W*9)9%YCV`X1XQ)62yhWnpnaOu#s;`dM%5!}K
zp?#RA;3<>?pd^p_TW8``KnBnS=ml&8YzOoJRs)a@u?Dafunqt*#4oa=Uu?lbn@O{4
vR?R~1UaefSdD}GIY1dqCo7<}CTDAJMxi`BVZns<09B5@row;4!?!WRcb9CH#