From 8d17e4e474823e91720f4eaf3b2d3b741ff22d05 Mon Sep 17 00:00:00 2001
From: leca <leca@foxarmy.org>
Date: Fri, 5 Apr 2024 19:44:46 +0300
Subject: [PATCH] changed from image to picture

---
 resources/cards/new/ui.xml | 2 +-
 src/db.rs                  | 2 +-
 src/ui/cards/edit/imp.rs   | 5 +++--
 src/ui/cards/new/imp.rs    | 4 ++--
 src/ui/cards/new/mod.rs    | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/resources/cards/new/ui.xml b/resources/cards/new/ui.xml
index fe87726..b9e0f4f 100644
--- a/resources/cards/new/ui.xml
+++ b/resources/cards/new/ui.xml
@@ -10,7 +10,7 @@
             <property name="halign">GTK_ALIGN_CENTER</property>
             <property name="valign">GTK_ALIGN_CENTER</property>
                 <child>
-                    <object class="GtkImage" id="image">
+                    <object class="GtkPicture" id="image">
                         <property name="halign">GTK_ALIGN_CENTER</property>
                         <property name="valign">GTK_ALIGN_CENTER</property>
                         <property name="file">/home/leca/Downloads/2648 - SoyBooru.png</property>
diff --git a/src/db.rs b/src/db.rs
index bab67f5..632df99 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -35,7 +35,7 @@ pub fn init() {
         image_hash CHAR(64),
         hieroglyph VARCHAR(2),
         translation VARCHAR(128)
-    )",(),).unwrap();
+    )",()).unwrap();
 }
 
 pub fn get_program_home_path() -> &'static RwLock<String> {
diff --git a/src/ui/cards/edit/imp.rs b/src/ui/cards/edit/imp.rs
index 6bd6551..d31b274 100644
--- a/src/ui/cards/edit/imp.rs
+++ b/src/ui/cards/edit/imp.rs
@@ -8,7 +8,7 @@ use glib::subclass::InitializingObject;
 use gtk::glib::object::ObjectExt;
 use gtk::glib::{clone, closure_local};
 use gtk::subclass::prelude::*;
-use gtk::{glib, Button, CompositeTemplate, ScrolledWindow, SearchEntry, Window};
+use gtk::{gio, glib, Button, CompositeTemplate, ScrolledWindow, SearchEntry, Window};
 use gtk::{prelude::*, FileDialog};
 use sha256::try_digest;
 
@@ -71,7 +71,8 @@ async fn file_choose_dialog<W: IsA<gtk::Window>>(window: Rc<W>) {
     let w: &MemoryCardsNewScene = Into::<&Window>::into(window.upcast_ref())
         .downcast_ref()
         .unwrap(); // Weird casting from &Window as passed in func to &MemoryCardsNewScene
-    w.get_image_widget().set_file(Some(path));
+    // w.get_image_widget().set_file(Some(path));
+    w.get_image_widget().set_file(Some(&gio::File::for_path(path)));
     let binding = Path::new(path);
     let hash = try_digest(binding).unwrap();
 
diff --git a/src/ui/cards/new/imp.rs b/src/ui/cards/new/imp.rs
index 5a2f6de..e4926cf 100644
--- a/src/ui/cards/new/imp.rs
+++ b/src/ui/cards/new/imp.rs
@@ -1,12 +1,12 @@
 use glib::subclass::InitializingObject;
 use gtk::subclass::prelude::*;
-use gtk::{glib, Button, CompositeTemplate, Entry, Image};
+use gtk::{glib, Button, CompositeTemplate, Entry, Picture};
 
 #[derive(CompositeTemplate, Default)]
 #[template(resource = "/org/foxarmy/learn-hieroglyph/cards/new/ui.xml")]
 pub struct MemoryCardsNewScene {
     #[template_child]
-    pub image: TemplateChild<Image>,
+    pub image: TemplateChild<Picture>,
     #[template_child]
     pub file_choose_button: TemplateChild<Button>,
     #[template_child]
diff --git a/src/ui/cards/new/mod.rs b/src/ui/cards/new/mod.rs
index ca7f339..6143af4 100644
--- a/src/ui/cards/new/mod.rs
+++ b/src/ui/cards/new/mod.rs
@@ -2,7 +2,7 @@ mod imp;
 
 use glib::Object;
 use gtk::{
-    gio, glib::{self, subclass::types::ObjectSubclassIsExt}, Application, Button, Image, prelude::*
+    gio, glib::{self, subclass::types::ObjectSubclassIsExt}, prelude::*, Application, Button, Picture
 };
 
 glib::wrapper! {
@@ -21,7 +21,7 @@ impl MemoryCardsNewScene {
         self.imp().file_choose_button.as_ref()
     }
 
-    pub fn get_image_widget(&self) -> &Image {
+    pub fn get_image_widget(&self) -> &Picture {
         self.imp().image.as_ref()
     }