From 1371e6c7fa12a2b7f37cfa1a1decd31a658f8a9f Mon Sep 17 00:00:00 2001
From: Marrub <marrub.xz@gmail.com>
Date: Mon, 25 Feb 2019 14:33:13 -0500
Subject: [PATCH] more code for tycho

---
 Cargo.toml         |  22 ++-
 data/icons.psd     | Bin 0 -> 33974 bytes
 data/lines.png     | Bin 0 -> 226 bytes
 data/points.png    | Bin 0 -> 205 bytes
 data/polys.png     | Bin 0 -> 538 bytes
 data/tycho.xml     | 454 +++++++++++++++++++++++++--------------------
 data/tycho_res.xml |   8 +-
 src/tycho/main.rs  | 109 +++++++----
 8 files changed, 347 insertions(+), 246 deletions(-)
 create mode 100644 data/icons.psd
 create mode 100644 data/lines.png
 create mode 100644 data/points.png
 create mode 100644 data/polys.png

diff --git a/Cargo.toml b/Cargo.toml
index a0ebcbc..2d8c3a9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,14 +22,20 @@ serde         = {version = "1.0", features = ["derive"]}
 serde_yaml    = "0.8"
 
 # note: these have to be updated all at once, check the gtk crate for versions
-atk        = "0.6"
-cairo-rs   = "0.6"
-gdk        = "0.10"
-gdk-pixbuf = "0.6"
-gtk        = "0.6"
-gio        = "0.6"
-glib       = "0.7"
-pango      = "0.6"
+atk          = "0.6"
+cairo-rs     = "0.6"
+cairo-sys-rs = "0.8"
+gdk          = "0.10"
+gdk-pixbuf   = "0.6"
+gio          = "0.6"
+gio-sys      = "0.8"
+glib         = "0.7"
+glib-sys     = "0.8"
+gobject-sys  = "0.8"
+gtk          = "0.6"
+gtk-sys      = "0.8"
+pango        = "0.6"
+pango-sys    = "0.8"
 
 [profile.dev]
 opt-level = 1
diff --git a/data/icons.psd b/data/icons.psd
new file mode 100644
index 0000000000000000000000000000000000000000..cb007c9d9f06ca94bc053d039c7ed55d509dc357
GIT binary patch
literal 33974
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
N2zjafT>ZHr{QvqMcwYbj

literal 0
HcmV?d00001

diff --git a/data/lines.png b/data/lines.png
new file mode 100644
index 0000000000000000000000000000000000000000..a61134535094f6985a6a1675adab7abffe4fc8a7
GIT binary patch
literal 226
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjD?MEtLp(b7UfeBsSV6!wuqt3n
zsfTI4q+0VCJy+Ejb~%a8gJScy-s9msXnWAA{5V7Rb|(G=&-!TxxZc!!^XU+s@Yv9;
zuY+~M<5gW9GJ^Kpa~_?u3^6@go-mtH@3FCYMpr-6*^hz=uRFgp-Tf$+pmC3j=Xi9(
z${(Tzvj16U9NEv9_E9Q9N}us_1!qNr0FzRZkbWa;h3XNdxZRF!I*&{h6z?h3G5y<V
Z{%rHD({U1Vw}Fmk@O1TaS?83{1OV-SQxyOJ

literal 0
HcmV?d00001

diff --git a/data/points.png b/data/points.png
new file mode 100644
index 0000000000000000000000000000000000000000..43d8652f8661fc3d45a4a819f6371af36c711e81
GIT binary patch
literal 205
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjQ#@T9Lp(a)PIlyCR^(xD)?fHr
z`D4nTh}`?z%H=oMPPIF9`OBthdLm0s$W60S;1rzW&~qZ8AcukRoCA~Cf;EO~zvdle
zIa8C)wk+<TsKWD}nG09VkhFZRwet&?Sc3qQ(kDB^V_G}Db8$7S%41m-#k%zCv6Y4Y
z1q2Jv<#yfsJ<G2C-7nz>*Je1r5`FWp``g{-gAe>G7*!)4PkEbjLj>qP22WQ%mvv4F
FO#ll#Qwsn9

literal 0
HcmV?d00001

diff --git a/data/polys.png b/data/polys.png
new file mode 100644
index 0000000000000000000000000000000000000000..285871e0db3f027d4350795759c003c8a26f3fa4
GIT binary patch
literal 538
zcmV+#0_FXQP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0005uNkl<ZNQt$T
zziQiX5P&Zdbg-c<q79*g9-z?{p;{ChzeQd`Te}syly)eTJcDLMHrfnEQ;h9d#E`X9
z(3FyYoA^3ZXJnH&vXvejKBT+vL-zy!1dtkO0pEb%<*!v|PDJFXrZ>QM;F{IA27Ul<
zcNOddKY<%1CP_lS-zQ0us_3Td+pjA)0Db{?N*E4@^m;u+WSQM=m%(6A72TC{2b%<6
zfP0;Y;~3xfSHSD(`#y0TS4H>0*M|fKa0L)W5uWF51h1#(c|=j9l0PMHMQ{kPSS+>z
zujgX1P|2YRjDH&Gh=|PRb7>Nl`HmJU@I^$X(`h3?W!_&tELU_6;5bgB6*-QhD>|>9
z!7HEuFio?Oz%)%26u@g;(FYMR#^bRRMbT(QMN!CTG*Ygw#YYj5$z;+9t}&a<wCt>y
zDleW(u>67}5s`Mg{Val3tEJ_Uh=>560P;M?w(UlTY}+<@p6fw>R>2-{3XrBLhGFak
zHw=R`O%;9$?5RM2m%s%;7=}9u!Z1|$Mah$@K!EqaEkF<iTfu`MQ21@hdGtOw)=t-T
zYr$RDt^Qpf^TdTCzzIN>WmuNA5pG!)S(YjMWS#Yx;018Tc5znD)xMM80hcx5mu3IM
cck=&^zqj+_LuR{_EdT%j07*qoM6N<$g8GT@Y5)KL

literal 0
HcmV?d00001

diff --git a/data/tycho.xml b/data/tycho.xml
index 4459934..16fd650 100644
--- a/data/tycho.xml
+++ b/data/tycho.xml
@@ -33,14 +33,131 @@ Author: Alison Sanderson
   <!-- interface-description Tycho map editor for Maraiah. -->
   <!-- interface-copyright 2018-2019 Alison Sanderson -->
   <!-- interface-authors Alison Sanderson -->
+  <object class="GtkImage" id="im_lines">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="resource">/net/greyserv/maraiah/tycho/lines</property>
+  </object>
+  <object class="GtkImage" id="im_points">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="resource">/net/greyserv/maraiah/tycho/points</property>
+  </object>
+  <object class="GtkImage" id="im_polys">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="resource">/net/greyserv/maraiah/tycho/polys</property>
+  </object>
+  <object class="GtkWindow" id="win_tools">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Tool Palette</property>
+    <property name="default_height">250</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="has_resize_grip">True</property>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
+      <object class="GtkToolPalette">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkToolItemGroup">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Geometry</property>
+            <child>
+              <object class="GtkToolButton" id="btn_point">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Points</property>
+                <property name="use_underline">True</property>
+                <property name="icon_widget">im_points</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="btn_point-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes">Points Tool</property>
+                    <property name="AtkObject::accessible-description" translatable="yes">The tool that modifies points in the map.</property>
+                    <property name="AtkObject::accessible-role" translatable="yes">push-button</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="btn_lines">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Lines</property>
+                <property name="use_underline">True</property>
+                <property name="icon_widget">im_lines</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="btn_lines-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes">Lines Tool</property>
+                    <property name="AtkObject::accessible-description" translatable="yes">The tool which modifies line segments on the map.</property>
+                    <property name="AtkObject::accessible-role" translatable="yes">push-button</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="btn_polys">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Polygons</property>
+                <property name="use_underline">True</property>
+                <property name="icon_widget">im_polys</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="btn_polys-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes">Polygon Tool</property>
+                    <property name="AtkObject::accessible-description" translatable="yes">The tool which modifies polygon shapes on the map.</property>
+                    <property name="AtkObject::accessible-role" translatable="yes">push-button</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child internal-child="accessible">
+              <object class="AtkObject">
+                <property name="AtkObject::accessible-name" translatable="yes">Geometry Collection</property>
+                <property name="AtkObject::accessible-description" translatable="yes">All of the tools which modify map geometry.</property>
+                <property name="AtkObject::accessible-role" translatable="yes">column-header</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <child internal-child="accessible">
+      <object class="AtkObject" id="win_tools-atkobject">
+        <property name="AtkObject::accessible-name" translatable="yes">Tycho Tool Palette</property>
+        <property name="AtkObject::accessible-description" translatable="yes">Tycho's tool palette window.</property>
+        <property name="AtkObject::accessible-role" translatable="yes">window</property>
+      </object>
+    </child>
+  </object>
   <object class="GtkAboutDialog" id="win_about">
     <property name="can_focus">False</property>
+    <property name="modal">True</property>
+    <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
-    <property name="program_name">Tycho</property>
-    <property name="copyright" translatable="yes">2018-2019 Alison Sanderson</property>
+    <property name="program_name">Tycho Map Editor</property>
+    <property name="copyright" translatable="yes">Copyright © 2018-2019 Alison Sanderson</property>
     <property name="comments" translatable="yes">greetigs i am tico the of superior ai to durdumbal go shoot my soldiers because its funny or ill put you in space</property>
-    <property name="website_label" translatable="yes">Website</property>
-    <property name="logo">resource:///net/greyserv/maraiah/tycho/tycho2.png</property>
+    <property name="website_label" translatable="yes">Home Page</property>
+    <property name="logo_icon_name">image-loading</property>
     <property name="license_type">mit-x11</property>
     <child>
       <placeholder/>
@@ -66,253 +183,180 @@ Author: Alison Sanderson
         </child>
       </object>
     </child>
+    <child internal-child="accessible">
+      <object class="AtkObject" id="win_about-atkobject">
+        <property name="AtkObject::accessible-name" translatable="yes">About Screen</property>
+        <property name="AtkObject::accessible-description" translatable="yes">The about screen for Tycho.</property>
+        <property name="AtkObject::accessible-role" translatable="yes">dialog</property>
+      </object>
+    </child>
   </object>
-  <object class="GtkWindow" id="win_tycho">
+  <object class="GtkWindow" id="win_menus">
     <property name="can_focus">False</property>
-    <property name="default_width">440</property>
+    <property name="title" translatable="yes">Tycho</property>
     <property name="default_height">250</property>
+    <property name="has_resize_grip">True</property>
     <child>
       <placeholder/>
     </child>
     <child>
-      <object class="GtkBox">
+      <object class="GtkMenuBar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
+        <property name="pack_direction">ttb</property>
         <child>
-          <object class="GtkMenuBar">
+          <object class="GtkMenuItem">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <child>
-              <object class="GtkMenuItem">
+            <property name="label" translatable="yes">_File</property>
+            <property name="use_underline">True</property>
+            <child type="submenu">
+              <object class="GtkMenu">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_File</property>
-                <property name="use_underline">True</property>
-                <child type="submenu">
-                  <object class="GtkMenu">
+                <child>
+                  <object class="GtkImageMenuItem">
+                    <property name="label">gtk-new</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkImageMenuItem">
-                        <property name="label">gtk-new</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem">
-                        <property name="label">gtk-open</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem">
-                        <property name="label">gtk-save</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem">
-                        <property name="label">gtk-save-as</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSeparatorMenuItem">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem">
-                        <property name="label">gtk-quit</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
+                    <property name="use_underline">True</property>
+                    <property name="use_stock">True</property>
                   </object>
                 </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkMenuItem">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Edit</property>
-                <property name="use_underline">True</property>
-                <child type="submenu">
-                  <object class="GtkMenu">
+                <child>
+                  <object class="GtkImageMenuItem">
+                    <property name="label">gtk-open</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkImageMenuItem">
-                        <property name="label">gtk-cut</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem">
-                        <property name="label">gtk-copy</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem">
-                        <property name="label">gtk-paste</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem">
-                        <property name="label">gtk-delete</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
+                    <property name="use_underline">True</property>
+                    <property name="use_stock">True</property>
                   </object>
                 </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkMenuItem">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_View</property>
-                <property name="use_underline">True</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkMenuItem">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Help</property>
-                <property name="use_underline">True</property>
-                <child type="submenu">
-                  <object class="GtkMenu">
+                <child>
+                  <object class="GtkImageMenuItem">
+                    <property name="label">gtk-save</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkImageMenuItem" id="btn_about">
-                        <property name="label">gtk-about</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
+                    <property name="use_underline">True</property>
+                    <property name="use_stock">True</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkImageMenuItem">
+                    <property name="label">gtk-save-as</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="use_stock">True</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkSeparatorMenuItem">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkImageMenuItem">
+                    <property name="label">gtk-quit</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="use_stock">True</property>
                   </object>
                 </child>
               </object>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
-          <object class="GtkBox">
+          <object class="GtkMenuItem">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <child>
-              <object class="GtkToolPalette">
+            <property name="label" translatable="yes">_Edit</property>
+            <property name="use_underline">True</property>
+            <child type="submenu">
+              <object class="GtkMenu">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkToolItemGroup">
+                  <object class="GtkImageMenuItem">
+                    <property name="label">gtk-cut</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkToolButton">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Points</property>
-                        <property name="use_underline">True</property>
-                        <property name="stock_id">gtk-media-play</property>
-                      </object>
-                    </child>
+                    <property name="use_underline">True</property>
+                    <property name="use_stock">True</property>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkDrawingArea" id="draw_area">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkPaned">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <placeholder/>
                 </child>
                 <child>
-                  <placeholder/>
+                  <object class="GtkImageMenuItem">
+                    <property name="label">gtk-copy</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="use_stock">True</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkImageMenuItem">
+                    <property name="label">gtk-paste</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="use_stock">True</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkImageMenuItem">
+                    <property name="label">gtk-delete</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="use_stock">True</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkMenuItem">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">_View</property>
+            <property name="use_underline">True</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparatorMenuItem">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkMenuItem">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="right_justified">True</property>
+            <property name="label" translatable="yes">_Info</property>
+            <property name="use_underline">True</property>
+            <child type="submenu">
+              <object class="GtkMenu">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkImageMenuItem" id="btn_about">
+                    <property name="label">gtk-about</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="use_stock">True</property>
+                  </object>
                 </child>
               </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
         </child>
-      </object>
-    </child>
-    <child internal-child="accessible">
-      <object class="AtkObject" id="win_tycho-atkobject">
-        <property name="AtkObject::accessible-name" translatable="yes">Tycho Map Editor</property>
-        <property name="AtkObject::accessible-description" translatable="yes">The main window of the Tycho map editor.</property>
-        <property name="AtkObject::accessible-role" translatable="yes">window</property>
       </object>
     </child>
   </object>
diff --git a/data/tycho_res.xml b/data/tycho_res.xml
index a0417ec..b0892a8 100644
--- a/data/tycho_res.xml
+++ b/data/tycho_res.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
    <gresource prefix="/net/greyserv/maraiah/tycho">
-      <file compressed="true" alias="tycho1.png">data/tycho1.png</file>
-      <file compressed="true" alias="tycho2.png">data/tycho2.png</file>
+      <file compressed="true" alias="tycho1">data/tycho1.png</file>
+      <file compressed="true" alias="tycho2">data/tycho2.png</file>
+      <file compressed="true" alias="polys">data/polys.png</file>
+      <file compressed="true" alias="lines">data/lines.png</file>
+      <file compressed="true" alias="points">data/points.png</file>
+      <file compressed="true" preprocess="xml-stripblanks" alias="ui">data/tycho.xml</file>
    </gresource>
 </gresources>
diff --git a/src/tycho/main.rs b/src/tycho/main.rs
index b43a770..9d00d3a 100644
--- a/src/tycho/main.rs
+++ b/src/tycho/main.rs
@@ -2,54 +2,101 @@ use gtk::prelude::*;
 use gio::prelude::*;
 use maraiah::durandal::err::*;
 
-// TODO: add detached draw area mode, make everything detachable
-
-const RESOURCE: &'static [u8] =
-   include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/data/tycho.res"));
-
-const XML: &'static str =
-   include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/data/tycho.xml"));
-
-fn run_app(app: &gtk::Application)
+fn run_app(app: &gtk::Application) -> ResultS<()>
 {
-   let b = gtk::Builder::new_from_string(XML);
-
-   let win:    gtk::Window      = b.get_object("win_tycho").unwrap();
-   let abt:    gtk::AboutDialog = b.get_object("win_about").unwrap();
-   let bt_abt: gtk::MenuItem    = b.get_object("btn_about").unwrap();
-
-   abt.set_authors(&env!("CARGO_PKG_AUTHORS").split(';').collect::<Vec<_>>());
-   abt.set_version(env!("CARGO_PKG_VERSION"));
-   abt.set_website(env!("CARGO_PKG_HOMEPAGE"));
-
+   fn load_img(path: &'static str) -> ResultS<gdk_pixbuf::Pixbuf>
    {
-      let abt = abt.clone();
-      bt_abt.connect_activate(move |_| {
-         abt.run();
-         abt.hide();
-      });
+      Ok(gdk_pixbuf::Pixbuf::new_from_resource(path)?)
    }
 
-   win.set_application(app);
-   win.show_all();
+   fn get_obj<T>(b: &gtk::Builder, name: &str) -> ResultS<T>
+      where T: glib::object::IsA<glib::object::Object>
+   {
+      match b.get_object(name) {
+         Some(w) => Ok(w),
+         None => Err(err_msg("no object")),
+      }
+   }
+
+   let b = gtk::Builder::new_from_resource("/net/greyserv/maraiah/tycho/ui");
+
+   let win_menus: gtk::Window      = get_obj(&b, "win_menus")?;
+   let win_tools: gtk::Window      = get_obj(&b, "win_tools")?;
+   let win_about: gtk::AboutDialog = get_obj(&b, "win_about")?;
+   let btn_about: gtk::MenuItem    = get_obj(&b, "btn_about")?;
+   //t draw_area: gtk::DrawingArea = get_obj(&b, "draw_area")?;
+   //t btn_point: gtk::ToolButton  = get_obj(&b, "btn_point")?;
+   //t btn_lines: gtk::ToolButton  = get_obj(&b, "btn_lines")?;
+   //t btn_polys: gtk::ToolButton  = get_obj(&b, "btn_polys")?;
+
+   let authors: Vec<_> = env!("CARGO_PKG_AUTHORS").split(';').collect();
+
+   win_about.set_authors(&authors);
+   win_about.set_version(env!("CARGO_PKG_VERSION"));
+   win_about.set_website(env!("CARGO_PKG_HOMEPAGE"));
+   win_about.set_logo(&load_img("/net/greyserv/maraiah/tycho/tycho2")?);
+
+   btn_about.connect_activate(move |_| {
+      win_about.run();
+      win_about.hide();
+   });
+
+   win_tools.set_deletable(false);
+   win_tools.show_all();
+
+   win_menus.set_application(app);
+   win_menus.show_all();
+
+   Ok(())
 }
 
 fn main() -> ResultS<()>
 {
-   let rsrc = glib::Bytes::from(&RESOURCE[..]);
-   let rsrc = gio::Resource::new_from_data(&rsrc)?;
-   gio::resources_register(&rsrc);
+   // get jacked, punk. opaque data structures are for nerds.
+   const RESOURCE_DATA: &'static [u8] =
+      include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/data/tycho.res"));
+
+   let mut static_resource =
+      gio_sys::GStaticResource{data:     RESOURCE_DATA.as_ptr(),
+                               data_len: RESOURCE_DATA.len(),
+                               resource: std::ptr::null_mut(),
+                               next:     std::ptr::null_mut(),
+                               padding:  std::ptr::null_mut()};
+
+   unsafe {
+      gio_sys::g_static_resource_init(&mut static_resource);
+   }
 
    let app = gtk::Application::new("net.greyserv.maraiah.tycho",
                                    gio::ApplicationFlags::empty())?;
 
-   app.connect_activate(run_app);
+   app.connect_activate(|app| {
+      match run_app(app) {
+         Ok(()) => (),
+         Err(e) => {
+            // print out an error if init failed somehow, otherwise the main
+            // loop will proceed as normal (this is just to prevent panics in
+            // weird circumstances such as breaking the builder while devving)
+            gtk::MessageDialog::new(None::<&gtk::Window>,
+                                    gtk::DialogFlags::empty(),
+                                    gtk::MessageType::Error,
+                                    gtk::ButtonsType::Ok,
+                                    &format!("{:?}", e)).run();
+         }
+      }
+   });
 
-   if app.run(&[]) == 0 {
+   let ret = if app.run(&[]) == 0 {
       Ok(())
    } else {
       Err(err_msg("bad return"))
+   };
+
+   unsafe {
+      gio_sys::g_static_resource_fini(&mut static_resource);
    }
+
+   ret
 }
 
 // EOF