From c4f0d39319ffac5a5eee9a3c7c703d86de982e46 Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Sun, 16 Jun 2013 17:11:55 +0100
Subject: [PATCH] [Add] <resedit> Now see the fleets ance chance each system
has to generate fleet.
---
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 | 97 +++++
utils/resedit/planets.glade | 541 ++++++++++++++++++++++++
utils/resedit/space.glade | 779 +++++------------------------------
utils/resedit/space.py | 47 ++-
utils/resedit/space.pyc | Bin 20716 -> 21797 bytes
8 files changed, 790 insertions(+), 676 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..950f52a7aff33335ca84ca85a4ecb7179ad831c1 100644
GIT binary patch
delta 34
qcmaDR`%;#j`7<xqzlVD_vd1y<@G&qjq$MVoWaj4;Z_Z<^-~|BQpbO~$
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..93e5310
--- /dev/null
+++ b/utils/resedit/factions.glade
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<glade-interface>
+ <widget class="GtkWindow" id="winFactions">
+ <property name="width_request">400</property>
+ <property name="height_request">150</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <widget class="GtkHPaned" id="hpaned3">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <widget class="GtkTreeView" id="treFactions">
+ <property name="width_request">150</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_clickable">True</property>
+ </widget>
+ <packing>
+ <property name="resize">False</property>
+ <property name="shrink">True</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLayout" id="layout3">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <widget class="GtkLabel" id="label15">
+ <property name="width_request">72</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Name</property>
+ </widget>
+ <packing>
+ <property name="x">34</property>
+ <property name="y">17</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="entName">
+ <property name="width_request">100</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="x">108</property>
+ <property name="y">17</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="butSave">
+ <property name="width_request">62</property>
+ <property name="height_request">37</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Save</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="x">105</property>
+ <property name="y">46</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="butNew">
+ <property name="width_request">68</property>
+ <property name="height_request">37</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">New</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="x">13</property>
+ <property name="y">45</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="resize">True</property>
+ <property name="shrink">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+</glade-interface>
diff --git a/utils/resedit/planets.glade b/utils/resedit/planets.glade
new file mode 100644
index 0000000..e927270
--- /dev/null
+++ b/utils/resedit/planets.glade
@@ -0,0 +1,541 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<glade-interface>
+ <widget class="GtkWindow" id="winPlanets">
+ <property name="width_request">600</property>
+ <property name="height_request">500</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="title" translatable="yes">Planet Editor</property>
+ <child>
+ <widget class="GtkHPaned" id="hpaned2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <widget class="GtkTreeView" id="trePlanets">
+ <property name="width_request">150</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_clickable">True</property>
+ </widget>
+ <packing>
+ <property name="resize">False</property>
+ <property name="shrink">True</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLayout" id="layout2">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <widget class="GtkButton" id="butNew">
+ <property name="width_request">70</property>
+ <property name="height_request">37</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">New</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="x">17</property>
+ <property name="y">12</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label5">
+ <property name="width_request">80</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Name:</property>
+ </widget>
+ <packing>
+ <property name="x">94</property>
+ <property name="y">21</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="inpName">
+ <property name="width_request">121</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="x">160</property>
+ <property name="y">19</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox" id="comFaction">
+ <property name="width_request">182</property>
+ <property name="height_request">24</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="x">80</property>
+ <property name="y">58</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label6">
+ <property name="width_request">88</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Faction</property>
+ </widget>
+ <packing>
+ <property name="y">62</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHSeparator" id="hseparator4">
+ <property name="width_request">404</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="x">12</property>
+ <property name="y">173</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkTreeView" id="treCommodities">
+ <property name="width_request">188</property>
+ <property name="height_request">149</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_clickable">True</property>
+ </widget>
+ <packing>
+ <property name="x">17</property>
+ <property name="y">196</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox" id="comCommodities">
+ <property name="width_request">189</property>
+ <property name="height_request">24</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="x">15</property>
+ <property name="y">350</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="butComAdd">
+ <property name="width_request">86</property>
+ <property name="height_request">38</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Add</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="x">16</property>
+ <property name="y">380</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="butComRm">
+ <property name="width_request">88</property>
+ <property name="height_request">40</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Remove</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="x">115</property>
+ <property name="y">380</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVSeparator" id="vseparator2">
+ <property name="width_request">20</property>
+ <property name="height_request">171</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="x">209</property>
+ <property name="y">194</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHSeparator" id="hseparator5">
+ <property name="width_request">408</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="x">6</property>
+ <property name="y">419</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label7">
+ <property name="width_request">100</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Services</property>
+ </widget>
+ <packing>
+ <property name="x">254</property>
+ <property name="y">194</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="cheLand">
+ <property name="width_request">73</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Land</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="x">240</property>
+ <property name="y">215</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="cheBasic">
+ <property name="width_request">70</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Basic</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="x">320</property>
+ <property name="y">215</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="cheCommodity">
+ <property name="width_request">112</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Commodity</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="x">240</property>
+ <property name="y">235</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="cheOutfits">
+ <property name="width_request">80</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Outfits</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="x">240</property>
+ <property name="y">255</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="cheShipyard">
+ <property name="width_request">100</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Shipyard</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="x">320</property>
+ <property name="y">255</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHSeparator" id="hseparator6">
+ <property name="width_request">191</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="x">219</property>
+ <property name="y">274</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label8">
+ <property name="width_request">57</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Tech</property>
+ </widget>
+ <packing>
+ <property name="x">260</property>
+ <property name="y">293</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label9">
+ <property name="width_request">63</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Main</property>
+ </widget>
+ <packing>
+ <property name="x">222</property>
+ <property name="y">320</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="spiTech0">
+ <property name="width_request">58</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="adjustment">0 0 100000 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="x">300</property>
+ <property name="y">320</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label10">
+ <property name="width_request">67</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Special</property>
+ </widget>
+ <packing>
+ <property name="x">224</property>
+ <property name="y">345</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="spiTech1">
+ <property name="width_request">60</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="adjustment">0 0 100000 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="x">235</property>
+ <property name="y">365</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="spiTech2">
+ <property name="width_request">60</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="adjustment">0 0 100000 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="x">300</property>
+ <property name="y">365</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="spiTech3">
+ <property name="width_request">60</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="adjustment">0 0 100000 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="x">235</property>
+ <property name="y">390</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="spiTech4">
+ <property name="width_request">60</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="adjustment">0 0 100 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="x">300</property>
+ <property name="y">390</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox" id="comSystem">
+ <property name="width_request">160</property>
+ <property name="height_request">23</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="x">12</property>
+ <property name="y">465</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label11">
+ <property name="width_request">100</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">System</property>
+ </widget>
+ <packing>
+ <property name="y">440</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="butSave">
+ <property name="width_request">100</property>
+ <property name="height_request">50</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Save</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="x">189</property>
+ <property name="y">438</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label12">
+ <property name="width_request">62</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Class</property>
+ </widget>
+ <packing>
+ <property name="x">289</property>
+ <property name="y">20</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkImage" id="imaPlanet">
+ <property name="width_request">152</property>
+ <property name="height_request">122</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="x">260</property>
+ <property name="y">48</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox" id="comClass">
+ <property name="width_request">79</property>
+ <property name="height_request">33</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="x">341</property>
+ <property name="y">9</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label13">
+ <property name="width_request">101</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">GFX Space</property>
+ </widget>
+ <packing>
+ <property name="y">92</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox" id="comSpace">
+ <property name="width_request">163</property>
+ <property name="height_request">24</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="x">96</property>
+ <property name="y">89</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label14">
+ <property name="width_request">98</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">GFX Exterior</property>
+ </widget>
+ <packing>
+ <property name="x">10</property>
+ <property name="y">123</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox" id="comExterior">
+ <property name="width_request">154</property>
+ <property name="height_request">22</property>
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </widget>
+ <packing>
+ <property name="x">106</property>
+ <property name="y">120</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="resize">True</property>
+ <property name="shrink">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+</glade-interface>
diff --git a/utils/resedit/space.glade b/utils/resedit/space.glade
index 00a132e..9b30dcf 100644
--- a/utils/resedit/space.glade
+++ b/utils/resedit/space.glade
@@ -3,7 +3,7 @@
<glade-interface>
<widget class="GtkWindow" id="winSystems">
<property name="width_request">750</property>
- <property name="height_request">450</property>
+ <property name="height_request">675</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">System Editor</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
@@ -169,7 +169,7 @@
<child>
<widget class="GtkVSeparator" id="vseparator1">
<property name="width_request">20</property>
- <property name="height_request">322</property>
+ <property name="height_request">323</property>
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
</widget>
@@ -205,7 +205,7 @@
<child>
<widget class="GtkTreeView" id="treJumps">
<property name="width_request">193</property>
- <property name="height_request">110</property>
+ <property name="height_request">170</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -216,22 +216,6 @@
<property name="y">180</property>
</packing>
</child>
- <child>
- <widget class="GtkButton" id="butAddJump">
- <property name="width_request">70</property>
- <property name="height_request">27</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Add</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="x">20</property>
- <property name="y">296</property>
- </packing>
- </child>
<child>
<widget class="GtkButton" id="butRmJump">
<property name="width_request">70</property>
@@ -244,8 +228,8 @@
<property name="response_id">0</property>
</widget>
<packing>
- <property name="x">112</property>
- <property name="y">295</property>
+ <property name="x">110</property>
+ <property name="y">360</property>
</packing>
</child>
<child>
@@ -273,8 +257,8 @@
<property name="response_id">0</property>
</widget>
<packing>
- <property name="x">14</property>
- <property name="y">350</property>
+ <property name="x">328</property>
+ <property name="y">577</property>
</packing>
</child>
<child>
@@ -289,8 +273,8 @@
<property name="response_id">0</property>
</widget>
<packing>
- <property name="x">115</property>
- <property name="y">350</property>
+ <property name="x">422</property>
+ <property name="y">578</property>
</packing>
</child>
<child>
@@ -322,18 +306,6 @@
<property name="y">17</property>
</packing>
</child>
- <child>
- <widget class="GtkHSeparator" id="hseparator3">
- <property name="width_request">202</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">5</property>
- <property name="y">326</property>
- </packing>
- </child>
<child>
<widget class="GtkButton" id="butZoomIn">
<property name="width_request">35</property>
@@ -398,6 +370,109 @@
<property name="y">350</property>
</packing>
</child>
+ <child>
+ <widget class="GtkVSeparator" id="vseparator3">
+ <property name="width_request">20</property>
+ <property name="height_request">376</property>
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="x">530</property>
+ <property name="y">11</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkTreeView" id="treFleets">
+ <property name="width_request">250</property>
+ <property name="height_request">212</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_clickable">True</property>
+ </widget>
+ <packing>
+ <property name="x">10</property>
+ <property name="y">420</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="butFleetAdd">
+ <property name="width_request">70</property>
+ <property name="height_request">27</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="label" translatable="yes">Add</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="x">270</property>
+ <property name="y">460</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="butFleetRemove">
+ <property name="width_request">70</property>
+ <property name="height_request">27</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="label" translatable="yes">Remove</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="x">360</property>
+ <property name="y">460</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="butAddJump">
+ <property name="width_request">70</property>
+ <property name="height_request">27</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Add</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="x">20</property>
+ <property name="y">360</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox" id="comFleet">
+ <property name="width_request">183</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="x">270</property>
+ <property name="y">425</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHSeparator" id="hseparator4">
+ <property name="width_request">513</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="x">4</property>
+ <property name="y">393</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHSeparator" id="hseparator3">
+ <property name="width_request">228</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="x">289</property>
+ <property name="y">556</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="resize">True</property>
@@ -420,634 +495,4 @@
</widget>
</child>
</widget>
- <widget class="GtkWindow" id="winPlanets">
- <property name="width_request">600</property>
- <property name="height_request">500</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="title" translatable="yes">Planet Editor</property>
- <child>
- <widget class="GtkHPaned" id="hpaned2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <widget class="GtkTreeView" id="trePlanets">
- <property name="width_request">150</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="headers_clickable">True</property>
- </widget>
- <packing>
- <property name="resize">False</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLayout" id="layout2">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <widget class="GtkButton" id="butNew">
- <property name="width_request">70</property>
- <property name="height_request">37</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">New</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="x">17</property>
- <property name="y">12</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label5">
- <property name="width_request">80</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Name:</property>
- </widget>
- <packing>
- <property name="x">94</property>
- <property name="y">21</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="inpName">
- <property name="width_request">121</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">160</property>
- <property name="y">19</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="comFaction">
- <property name="width_request">182</property>
- <property name="height_request">24</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">80</property>
- <property name="y">58</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label6">
- <property name="width_request">88</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Faction</property>
- </widget>
- <packing>
- <property name="y">62</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator4">
- <property name="width_request">404</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">12</property>
- <property name="y">173</property>
- </packing>
- </child>
- <child>
- <widget class="GtkTreeView" id="treCommodities">
- <property name="width_request">188</property>
- <property name="height_request">149</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="headers_clickable">True</property>
- </widget>
- <packing>
- <property name="x">17</property>
- <property name="y">196</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="comCommodities">
- <property name="width_request">189</property>
- <property name="height_request">24</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">15</property>
- <property name="y">350</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="butComAdd">
- <property name="width_request">86</property>
- <property name="height_request">38</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Add</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="x">16</property>
- <property name="y">380</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="butComRm">
- <property name="width_request">88</property>
- <property name="height_request">40</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Remove</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="x">115</property>
- <property name="y">380</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVSeparator" id="vseparator2">
- <property name="width_request">20</property>
- <property name="height_request">171</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">209</property>
- <property name="y">194</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator5">
- <property name="width_request">408</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">6</property>
- <property name="y">419</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label7">
- <property name="width_request">100</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Services</property>
- </widget>
- <packing>
- <property name="x">254</property>
- <property name="y">194</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="cheLand">
- <property name="width_request">73</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Land</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="x">240</property>
- <property name="y">215</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="cheBasic">
- <property name="width_request">70</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Basic</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="x">320</property>
- <property name="y">215</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="cheCommodity">
- <property name="width_request">112</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Commodity</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="x">240</property>
- <property name="y">235</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="cheOutfits">
- <property name="width_request">80</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Outfits</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="x">240</property>
- <property name="y">255</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="cheShipyard">
- <property name="width_request">100</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Shipyard</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="x">320</property>
- <property name="y">255</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator6">
- <property name="width_request">191</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">219</property>
- <property name="y">274</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label8">
- <property name="width_request">57</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Tech</property>
- </widget>
- <packing>
- <property name="x">260</property>
- <property name="y">293</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label9">
- <property name="width_request">63</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Main</property>
- </widget>
- <packing>
- <property name="x">222</property>
- <property name="y">320</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spiTech0">
- <property name="width_request">58</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 100000 1 10 10</property>
- </widget>
- <packing>
- <property name="x">300</property>
- <property name="y">320</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label10">
- <property name="width_request">67</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Special</property>
- </widget>
- <packing>
- <property name="x">224</property>
- <property name="y">345</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spiTech1">
- <property name="width_request">60</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 100000 1 10 10</property>
- </widget>
- <packing>
- <property name="x">235</property>
- <property name="y">365</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spiTech2">
- <property name="width_request">60</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 100000 1 10 10</property>
- </widget>
- <packing>
- <property name="x">300</property>
- <property name="y">365</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spiTech3">
- <property name="width_request">60</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 100000 1 10 10</property>
- </widget>
- <packing>
- <property name="x">235</property>
- <property name="y">390</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spiTech4">
- <property name="width_request">60</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 100 1 10 10</property>
- </widget>
- <packing>
- <property name="x">300</property>
- <property name="y">390</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="comSystem">
- <property name="width_request">160</property>
- <property name="height_request">23</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">12</property>
- <property name="y">465</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label11">
- <property name="width_request">100</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">System</property>
- </widget>
- <packing>
- <property name="y">440</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="butSave">
- <property name="width_request">100</property>
- <property name="height_request">50</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Save</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="x">189</property>
- <property name="y">438</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label12">
- <property name="width_request">62</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Class</property>
- </widget>
- <packing>
- <property name="x">289</property>
- <property name="y">20</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage" id="imaPlanet">
- <property name="width_request">152</property>
- <property name="height_request">122</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="stock">gtk-missing-image</property>
- </widget>
- <packing>
- <property name="x">260</property>
- <property name="y">48</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="comClass">
- <property name="width_request">79</property>
- <property name="height_request">33</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">341</property>
- <property name="y">9</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label13">
- <property name="width_request">101</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">GFX Space</property>
- </widget>
- <packing>
- <property name="y">92</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="comSpace">
- <property name="width_request">163</property>
- <property name="height_request">24</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">96</property>
- <property name="y">89</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label14">
- <property name="width_request">98</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">GFX Exterior</property>
- </widget>
- <packing>
- <property name="x">10</property>
- <property name="y">123</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="comExterior">
- <property name="width_request">154</property>
- <property name="height_request">22</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">106</property>
- <property name="y">120</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="GtkWindow" id="winFactions">
- <property name="width_request">400</property>
- <property name="height_request">150</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <widget class="GtkHPaned" id="hpaned3">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <widget class="GtkTreeView" id="treFactions">
- <property name="width_request">150</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="headers_clickable">True</property>
- </widget>
- <packing>
- <property name="resize">False</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLayout" id="layout3">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <widget class="GtkLabel" id="label15">
- <property name="width_request">72</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Name</property>
- </widget>
- <packing>
- <property name="x">34</property>
- <property name="y">17</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="entName">
- <property name="width_request">100</property>
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- <packing>
- <property name="x">108</property>
- <property name="y">17</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="butSave">
- <property name="width_request">62</property>
- <property name="height_request">37</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Save</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="x">105</property>
- <property name="y">46</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="butNew">
- <property name="width_request">68</property>
- <property name="height_request">37</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">New</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="x">13</property>
- <property name="y">45</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
</glade-interface>
diff --git a/utils/resedit/space.py b/utils/resedit/space.py
index c724e4e..da9c403 100644
--- a/utils/resedit/space.py
+++ b/utils/resedit/space.py
@@ -7,17 +7,21 @@ import data
class Space:
- def __init__(self, factions=None):
- self.glade = "space.glade"
- self.systemsXML = "../../dat/ssys.xml"
- self.planetsXML = "../../dat/planet.xml"
- self.planet_gfx = "../../gfx/planet/"
+ def __init__(self, factions=None, fleets=None):
+ self.space_glade = "space.glade"
+ self.planet_glade = "planets.glade"
+ self.systemsXML = "../../dat/ssys.xml"
+ self.planetsXML = "../../dat/planet.xml"
+ self.planet_gfx = "../../gfx/planet/"
self.loadSystems(self.systemsXML)
self.loadPlanets(self.planetsXML)
if factions==None:
self.factions = {}
else:
self.factions = factions
+ if fleets==None:
+ self.fleets = {}
+ self.fleets = fleets
def loadSystems(self, xmlfile):
self.systems = data.load(xmlfile, "ssys", True,
@@ -51,7 +55,7 @@ class Space:
create the window
"""
# --------------- SYSTEMS --------------------
- self.swtree = gtk.glade.XML(self.glade, "winSystems")
+ self.swtree = gtk.glade.XML(self.space_glade, "winSystems")
# Hook events and stuff.
hooks = {
@@ -65,7 +69,9 @@ class Space:
"butReset":["clicked", self.__space_reset],
"butAddJump":["clicked", self.__jump_add],
"butRmJump":["clicked", self.__jump_rm],
- "butNew":["clicked", self.__snew]
+ "butNew":["clicked", self.__snew],
+ "butFleetAdd":["clicked", self.__fleet_add],
+ "butFleetRemove":["clicked", self.__fleet_rm]
}
for key, val in hooks.items():
self.__swidget(key).connect(val[0], val[1])
@@ -94,7 +100,7 @@ class Space:
# ---------------- PLANETS --------------------
- self.pwtree = gtk.glade.XML(self.glade, "winPlanets")
+ self.pwtree = gtk.glade.XML(self.planet_glade, "winPlanets")
self.__pwidget("winPlanets").show_all()
self.cur_planet = ""
@@ -218,6 +224,25 @@ class Space:
col.add_attribute(cell, 'text', 0)
wgt.set_model(jumps)
+ # Load fleets.
+ fleets = gtk.ListStore(str, int)
+ for fleet, chance in system["fleets"].items():
+ treenode = fleets.append([fleet, int(chance)])
+ wgt = self.__swidget("treFleets")
+ if wgt.get_column(0):
+ wgt.remove_column(wgt.get_column(0))
+ wgt.remove_column(wgt.get_column(0))
+ columns = [None]*2
+ columns[0] = gtk.TreeViewColumn('Fleet')
+ columns[1] = gtk.TreeViewColumn('Chance')
+ for n in range(2):
+ wgt.append_column(columns[n])
+ columns[n].cell = gtk.CellRendererText()
+ columns[n].pack_start(columns[n].cell, True)
+ columns[n].set_attributes(columns[n].cell, text = n)
+
+ wgt.set_model(fleets)
+
self.__space_draw()
def __pupdate(self, wgt=None, event=None):
@@ -599,6 +624,12 @@ class Space:
self.__supdate()
self.__space_draw()
+ def __fleet_add(self, wgt=None, event=None):
+ return
+
+ def __fleet_rm(self, wgt=None, event=None):
+ reutrn
+
def __snew(self, wgt=None, event=None):
name = "new system"
gen = { "asteroids":0, "interference":0, "stars":100 }
diff --git a/utils/resedit/space.pyc b/utils/resedit/space.pyc
index 5fbc6f21f9a2adf8b970d29a73d3a66bc31bcf95..d9ca801a75fc31f1c77824d44fb31251cd293611 100644
GIT binary patch
delta 6633
zcmbtY4RG8=72mzPTypumB+b_~UrkbS{R)J(Y12>I21;og>ZY`|P|oZ9|4r|jT#~zg
z(uO7;B?XmX%9I5JWQ2|&3U)?087(Lk1OXA~C@_eCqd3esqs6K?>Y(_3Z*!M4ATy4W
z<d=PKci+CReQ)pna6&%#u*`M;r6_;@yFWahdt=3;QV3g!-BMUB{42y!*YU50mKch#
zKpb_8-Nl*tLYf!5ON3P<j?zBAu!?z5N(*$mtSdJg%XnFZ*`>p>E@k+Y%&*Bvt70;c
zA*-33ogr(Otj&-CChIcfY$oe7WG#~o8M2Pa#td1%o9Q{iYG8Gngw@D{=FEyYydZ0K
z6O(g=)y&H-5UM9QR|pYt6X4H9e;ep8sdcBTHD%?9F(E=8V2sBxmza=3g7z}kZD?|}
z5C>c$VT-8XO?e{j6Jv66Jm$(QxHYqYW?ek%6LEpro}ibG?oJj!fx&RZE^F)U3tM)w
zh!}%?;kfN2^<%EBjrl}7*;OH4<P>HXg>->?f1?9o`}%C!6ohGxhahS9?NdG)sC<1Q
zw@W|gF0Bs`DWos^<ClI}C<|RaLZ8%U-NQKwC+fK8Vp*V1c(&z0bU^>jGZBJnEIBsZ
zKd6d9VbW-;N<iljupY`!BNi2eE~*r>tW|i#R<pn=CkP@43g)Q_QgTaP&uG%I`;!fN
zp?7m<HSyW@$UuMpfE9J3c5+IbD#JEN;j?Fm+Tc~WG}WyC;q6<+g5Zjbpixyz)HGRe
z42$_BwR&W${vh|hMKF=$=D<hB?(GTNHnzjM1NLZA<w4dg{ZwALmo2N-Z{{743-o2a
z3sT**%Atgkg0c&l<rbC{6DB!4B3dLY!_N`Dltxl?SZ-eDW!giu$xTChiO%JDvpz3N
z=kj`Amd;~3m7it!m{E|W^O-Kp(gjQxW$8kui?ehQ(<NEDm}!5OE@8S<bc{=JXeDk(
z%r8<CLUip}B(8CZar!l;mEv;HO^cO@F>*(lsKLK-QA2K#L;n^#;iqyzTP1Oc2+b1K
zEFM&_?NqudAYhy>uSdixg;Qm2DiPJ}?ivvbV33N@Xtr375YVVLJF3f$>cx7#^|ZH4
zSe1N010p0Ln^;xMYMjohX4V|TBGIG}1(hsnGFlsDsZyoNga-z+U_*$C(<FTX)2-*H
zMo?HanberaC(LKgOt}k0G)GLP!NP1*jBgh)9iXUi+N5G_%$S{F#4cpIHXF8!n5Mj$
z9=1=4+Wb$A+IL(WwRU4am3%7mRND2H!sX4@Vqq;2z13peq%v8xl*8v``!5#GVtt~p
zI<-WM<uTtUhC=S0h#9RDVmx1rc}1*4jOBBr5gMYGfwnr}(+Rg>Ef-_CCKG5c9aB5w
z7$)id<cio5VJ#EA95s1}y}duyDPk*dVAmefwP14D7+nlrHco2&`TtYPT276iQ{P|o
z*JiGBdxxFNP{r3-mV^45p_Sb~Fk+`~FJ2?(p}KSjR}wmIf?nqUS6$N>!1?UfEs7om
zLZ2&X_s+(;S$dtnLa+A67dfcIp&m4xP>2h4C`@OeSf9^L^s6R)(my22(+#D0GDo3M
z>(;VyPXh*L{8jpNS-+p#%N*ha(UMewUR8e5yOf5>G5vmdT{>^pjWQL)6l$lcB%qc_
zqpJvlP)1pR9Rv=9p`7+O0|{G^-vu{1hghMc=?kWF9K{y+ft`dcJEHc%4Fi3{{c&|8
z_^8jlwiAjFPZw6UZnz0sxL14uqc0K!(H~6jIfhXSfx}WsV0^%`6}Jtzl*FjpxQRYq
zStV~v|Gct7&g;acI)a%N9mWJKQg;9*w7<IIYPLVCxcV|?psKnHa5vx{z$Yn+E;~(8
zsHMIFxEGL7%%8W-yc@oz->SY|?$Uc|s;P&M)a;RI{c6psitDiYeu8PO@&sGeUGLQc
zf!u~uG?_%Cg^YLz(P7cjH_%`516TTvz&$cWK8pE-lS_Gp>NH*?4t1jLQVp(&dCYxj
z<qBUc#!JLlk%-ZSEynV(65KdyY$(?GV(1CURf4KlC9~)SMa7MJAXR%Q5{q3Ri_c?D
zr0^vBIGeb5S-EgIsYK5j_am6G0%27{))>8W%f+fm7L`@Q3W!yQhJ;gzEyU{D6A|Oo
zjz~Ny?iXXF)PzVfwiUuM;)THsQ4=uJ)YLMgDnZwa8^z=lwS~!16*nxJl~N8RsW#FH
z)XIu*C_gYsBeXXc)q~l3ZEZ_#2f4gk&DXKo@yZbztAhmm-s%hQ-8PU^#rj{hjmvS5
z_?gAGhpr0Ok7N`<<hsB#@7u6H9FN#hl!jnHH`gsn4P)~xKoh_sAWJFKbaNd0ki&P-
zWbzGI!0G$HWG+{zXxuTE6`7O>$9rvc8%`=tO&%3?oJ5pLot;!e#0v7ej$cl=muy8e
zZjnAn$*5x|%vHt3w4xDpb7s*<xNq3zcd4o(-t;R15;Z~908s8If9Xo1KJ>?v4xAF#
z=knI+?)oC{4~R-`*Wvn(26vgPlMS+jekx^+ERyB?Q%X2nHo4Mw)_>1E53y470S^$c
z!jZmkGHD9KcH*(u)k;0mblSTD3$M~Eo9zHS0wyaX2Y?I5cfp&`k2kN&RgYm@u5(%%
zZ8&dQC^%{;ye24INf0_yKe9DWH4-n#i_dqcJz`T>xRN}MZE&J`Lf_o7sQnolPJVz$
zjId{nfBMy}m_gN~Y8(&u+v+%WnfgN|ByVtd&<Z>D-_tARcDPdP5Oz(FmKk55si~77
z;c@ja06tUS1biLvAmAH-hX{f`j4T4qOw@GF%&F8pg9UIOC)?n_AbZ3q)$g|k7Q$$g
z(xb@`tNcqWe*<7l#)z|}g)8A`uuyJJ-xREL?U>TPlNPc5e67^8AX)#PVE1z%k&Nnj
zj64{<0ARzO!RRT#(|{jS-0O77f}8*c`#0cCWr49pw=Jk%!kPoj$BdcEbL3d|TM+R!
z;2nM4g55HyUt93)P74f{j;!DhEvAFCV1n-zRCdC>?4JH;d>}yt<>ir0n|;yvAUEL$
zblIYBHE{UYUPO}}VR|PYaz?+sXxT!X!X*e1;)@vMjAb)Cn53qv*!idQC2hOpBl@1U
zFKuMc&JfM}*gNcwKhkD(7Vswm^N|fw)j7bV#3P%o$d3#sOanZnpS&<KZwF1YM*ZPv
zJTx>Mb@-z(dx7iW!Kg*bs#1>ov5WHM)B5g<dfH&4Ib{R~pzNys0Ip3OXFeW2RIl^q
zYuiiZ^Xb9%RW7+qpIqFSf(-QtAS)xv4*<9_SaaTlNp4&WxGvn+HxLOs(Sf+?B^E16
zrO_e!J#3rG`w5U-AfTA~1>jXclL*j8C>q|I<csW#4%()69MJog%x`0J4q@#m0MDWs
zMOVF!38TDza!Fe&(uQk6LN#Lu@pzND@c)qcH>%FDJI*dE@(dh|zm(p;bVQOze%&!Q
zmGuKx$D~7L!o2+cNdnkZ#f5JN$O8oY^jm+`_U%`8w}-Z_>)EWP6lQ~2Yq)LN%V?U`
zm?)&oQUXvZfi8d>-~r@FefKh3exN^Ec02%Ye@ckYE-!Z#xwN~}`LvbCJ9oIsUFqL<
ze&{B<-&?)0;`}5q&8bAMU(*!e%fr^QZ}@ypw%hgR*Qlj1&%~3fH}?lbn^W3Kgb#-L
zqH&uulY`M`$5mSAtX;ElT6RLlEdX}H`99#7MNH@-qsmJj;cTO*hI%9FUVZc0_U7MV
zGh(mu;4vQ-A>@|XXN{^V{m$BBvL@Ys$r`yC;V>1OQ;apAgWa6AM=>fT;G`UmM~Bqa
zVEy-twPJm-+@0REex=+9(Oh&*>G>r2zlE?ViP`$Y<<4aE8~Vi!JEf(YyIR|k!eozm
z+<ItW;cGc?x^Yd#RJoWGK&A1DUD*#!cqiizZ)J!&Ph1``96aczL_#n-IAISviTKB*
z(|2^$`LrnW!7R}~l08Cqb$vhe5KVG>jFQ;NmYKa*rrU73@uh$y^Su}pGq1dT7=1)A
z^P>;nn`WBeRO+Qvf*|e;ar<B>NjVV|`tYTj<fwl3(wA2M41!hxP7`oPP|tvzQs+gG
z4*(#_Sj#2wh<@d=hNc3{90SZad*30of?TB@(f*Bl<PAE$@xF}+hl#xhJJ@>k2L70b
z$10Wn<UoRBKh<_j-g2uyhiz|iak}gBLV1gR@bddsXM2yS_EQ~a9nSweZJ8#E`|WgD
zM>h4yJJYXiDw7o}AiV<s1A}bZVg2D1)z@%m&)(n3=;Ncjd9}TaJscFyT0YVT-VE>H
z-KBD&6{~?jsTMuBd6&Fj|8(;cpIHe8D}cN+UjGq|rWw|S-RytpH0?bw6$3uyR}fIm
zo(gO&mZ#G5wl0^ASrevZ6zj;U<Vt;{dy9NQzueuDY9#@jI3a$rghCvoP>8<29qywq
z9n80*{B403XUzuW0`SFxVwc>G5&Pu`MjY?M7+np3o7AI#mjLeq(tuY8cB<VNUJFP7
zl7KycYXICjLKuAxuon;kgaP9KToAPy{z_qVJz$f5@=8^IISsw862C9U=i#4x-yUD7
z&+qg4+-0kD+qQ;F+$HW3UrD}?eoAUe{K(wNG}=KU^FneCnD6@eDcw7;H)coZ8A8*F
PzF9ea<wkvGTkU@U5DnJ0
delta 5794
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
WKM*E8<7L&MAMUJ`0sW)S*uMd|@j$Qu