From b7079e2343f0c2377b8433a6e389caa18c6fb5c5 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 18 Jul 2019 18:26:31 +1000
Subject: [PATCH] gui: restyle the drawing entries

---
 tuhi-gui.in                |  5 ++++
 tuhigui/data/ui/Drawing.ui | 61 ++++++++++++++++----------------------
 2 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/tuhi-gui.in b/tuhi-gui.in
index 76a6351..c5d90fd 100755
--- a/tuhi-gui.in
+++ b/tuhi-gui.in
@@ -26,6 +26,11 @@ def gtk_style():
     .bg-white {
       background-color: white;
     }
+    .drawing {
+      border: 2px outset #0d0d0d;
+      background-color: #c4dbff;
+      border-radius: 5px;
+    }
     """
 
     style_provider = Gtk.CssProvider()
diff --git a/tuhigui/data/ui/Drawing.ui b/tuhigui/data/ui/Drawing.ui
index a3b820b..c8a7efe 100644
--- a/tuhigui/data/ui/Drawing.ui
+++ b/tuhigui/data/ui/Drawing.ui
@@ -25,29 +25,15 @@
   <template class="Drawing" parent="GtkBox">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="margin_top">20</property>
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="halign">center</property>
-        <property name="margin_bottom">20</property>
+        <property name="margin_right">10</property>
+        <property name="margin_top">10</property>
+        <property name="margin_bottom">10</property>
         <property name="hexpand">True</property>
-        <child>
-          <object class="GtkButton" id="btn_remove">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="image">icon_remove</property>
-            <signal name="clicked" handler="_on_delete_button_clicked" swapped="no"/>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkLabel" id="label_timestamp">
             <property name="visible">True</property>
@@ -62,7 +48,7 @@
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -76,7 +62,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">2</property>
+            <property name="position">1</property>
           </packing>
         </child>
         <child>
@@ -90,7 +76,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">3</property>
+            <property name="position">2</property>
           </packing>
         </child>
         <child>
@@ -105,14 +91,28 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="btn_remove">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="image">icon_remove</property>
+            <signal name="clicked" handler="_on_delete_button_clicked" swapped="no"/>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">4</property>
           </packing>
         </child>
       </object>
       <packing>
-        <property name="expand">False</property>
+        <property name="expand">True</property>
         <property name="fill">True</property>
-        <property name="position">0</property>
+        <property name="position">1</property>
       </packing>
     </child>
     <child>
@@ -129,20 +129,11 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkSeparator">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="halign">baseline</property>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">3</property>
+        <property name="position">2</property>
       </packing>
     </child>
+    <style>
+      <class name="drawing"/>
+    </style>
   </template>
 </interface>