From eb26ca741873fdf60aa4690fbacdf012a10dd663 Mon Sep 17 00:00:00 2001
From: leca <leca@foxarmy.org>
Date: Tue, 9 Apr 2024 15:06:27 +0300
Subject: [PATCH] ui changes

---
 resources/cards/edit/ui.xml                  |  6 +-
 resources/cards/new/ui.xml                   |  3 +
 resources/widgets/card_entry/template.ui.xml | 62 +++++++++++++-------
 src/ui/cards/edit/imp.rs                     |  1 -
 4 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/resources/cards/edit/ui.xml b/resources/cards/edit/ui.xml
index cafe7e9..1ae24df 100644
--- a/resources/cards/edit/ui.xml
+++ b/resources/cards/edit/ui.xml
@@ -3,7 +3,7 @@
     <template class="MemoryCardsEditScene" parent="GtkApplicationWindow">
         <property name="title">Memory cards edit</property>
         <property name="height-request">1000</property>
-        <property name="width-request">1000</property>
+        <property name="width-request">200</property>
         <child>
             <object class="GtkBox" id="content">
                 <property name="orientation">vertical</property>
@@ -43,9 +43,7 @@
                                 <property name="orientation">vertical</property>
                                 <property name="hexpand">true</property>
                                 <property name="hexpand-set">true</property>
-                                <property name="vexpand">true</property>
-                                <property name="vexpand-set">true</property>
-                                <property name="homogeneous">true</property>
+                                <!-- <property name="homogeneous">true</property> -->
                                 <property name="orientation">vertical</property>
                                 <property name="halign">GTK_ALIGN_FILL</property>
                                 <property name="valign">GTK_ALIGN_FILL</property>
diff --git a/resources/cards/new/ui.xml b/resources/cards/new/ui.xml
index c82d635..c3e2986 100644
--- a/resources/cards/new/ui.xml
+++ b/resources/cards/new/ui.xml
@@ -6,6 +6,9 @@
         <property name="width-request">512</property>
         <child>
             <object class="GtkBox" id="content">
+                <property name="orientation">vertical</property>
+                <property name="halign">GTK_ALIGN_CENTER</property>
+                <property name="valign">GTK_ALIGN_CENTER</property>
                 <child>
                     <object class="GtkPicture" id="picture">
                         <property name="halign">GTK_ALIGN_CENTER</property>
diff --git a/resources/widgets/card_entry/template.ui.xml b/resources/widgets/card_entry/template.ui.xml
index 035095d..c57d3e7 100644
--- a/resources/widgets/card_entry/template.ui.xml
+++ b/resources/widgets/card_entry/template.ui.xml
@@ -2,28 +2,46 @@
 <interface>
     <template class="CardEntry" parent="GtkWidget">
         <child>
-            <object class="GtkPicture" id="picture">
-                <property name="halign">GTK_ALIGN_START</property>
-                <property name="valign">GTK_ALIGN_CENTER</property>
-            </object>
-        </child>
-        <child>
-            <object class="GtkLabel" id="hieroglyph_label">
-                <property name="halign">GTK_ALIGN_START</property>
-                <property name="valign">GTK_ALIGN_CENTER</property>
-            </object>
-        </child>
-        <child>
-            <object class="GtkLabel" id="reading_label">
-                <property name="halign">GTK_ALIGN_START</property>
-                <property name="valign">GTK_ALIGN_CENTER</property>
-            </object>
-        </child>
-        <child>
-            <object class="GtkButton" id="delete_button">
-                <property name="halign">GTK_ALIGN_END</property>
-                <property name="valign">GTK_ALIGN_CENTER</property>
-                <property name="label">delete</property>
+            <object class="GtkGrid">
+                <child>
+                    <object class="GtkPicture" id="picture">
+                        <property name="halign">GTK_ALIGN_START</property>
+                        <property name="valign">GTK_ALIGN_CENTER</property>
+                        <layout>
+                            <property name="column">0</property>
+                        </layout>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkLabel" id="hieroglyph_label">
+                        <property name="halign">GTK_ALIGN_START</property>
+                        <property name="valign">GTK_ALIGN_CENTER</property>
+                        <layout>
+                            <property name="column">1</property>
+                        </layout>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkLabel" id="reading_label">
+                        <property name="halign">GTK_ALIGN_START</property>
+                        <property name="valign">GTK_ALIGN_CENTER</property>
+                        <layout>
+                            <property name="column">2</property>
+                        </layout>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkButton" id="delete_button">
+                        <property name="halign">GTK_ALIGN_END</property>
+                        <property name="valign">GTK_ALIGN_CENTER</property>
+                        <property name="label">delete</property>
+                        <property name="hexpand">true</property>
+                        <property name="hexpand-set">true</property>
+                        <layout>
+                            <property name="column">3</property>
+                        </layout>
+                    </object>
+                </child>
             </object>
         </child>
     </template>
diff --git a/src/ui/cards/edit/imp.rs b/src/ui/cards/edit/imp.rs
index 58555f0..25b4024 100644
--- a/src/ui/cards/edit/imp.rs
+++ b/src/ui/cards/edit/imp.rs
@@ -139,7 +139,6 @@ impl MemoryCardsEditScene {
                 let connection = Connection::open(get_db_path()).unwrap();
                 let imagepath = card.imagepath();
                 let imagename = &Path::new(&imagepath).file_name().unwrap().to_str().unwrap();
-                dbg!("removing {}", imagename);
                 fs::remove_file(get_images_store_path() + "/" + &imagename).expect("Could not remove file!");
                 connection.execute("DELETE FROM cards WHERE imagename = ?1", [&imagename]).unwrap();
                 self_binding.imp().query_cards(None);