diff --git a/resources/cards/edit/ui.xml b/resources/cards/edit/ui.xml index 0483b1e..691c80b 100644 --- a/resources/cards/edit/ui.xml +++ b/resources/cards/edit/ui.xml @@ -37,7 +37,7 @@ GTK_ALIGN_FILL true - + GTK_ALIGN_FILL GTK_ALIGN_FILL diff --git a/src/card/mod.rs b/src/card/mod.rs index 9360083..9b6c991 100644 --- a/src/card/mod.rs +++ b/src/card/mod.rs @@ -1,3 +1,4 @@ +#[derive(Debug)] pub struct Card { image_path: Option, hieroglyph: Option, diff --git a/src/main.rs b/src/main.rs index b342c03..360d412 100644 --- a/src/main.rs +++ b/src/main.rs @@ -9,6 +9,7 @@ mod ui; mod widgets; mod dictionary; mod card; +// mod card_object; use crate::ui::menu::MenuScene; diff --git a/src/ui/cards/edit/imp.rs b/src/ui/cards/edit/imp.rs index ffb8f26..0f7bee2 100644 --- a/src/ui/cards/edit/imp.rs +++ b/src/ui/cards/edit/imp.rs @@ -9,13 +9,19 @@ use crate::db::*; use crate::ui::cards::new::*; use crate::widgets::card_entry::CardEntry; use glib::subclass::InitializingObject; +use gtk::gio::ListStore; +// use gtk::glib::ffi::GString; +use gtk::glib::GString; use gtk::glib::object::ObjectExt; use gtk::glib::{clone, closure_local}; use gtk::prelude::WidgetExt; use gtk::subclass::prelude::*; -use gtk::ListBox; -use gtk::{gio, glib, Button, CompositeTemplate, ScrolledWindow, SearchEntry, Window}; +use gtk::{ + gio, glib, Button, CompositeTemplate, ListView, NoSelection, ScrolledWindow, SearchEntry, + Window, +}; use gtk::{prelude::*, FileDialog}; +use gtk::{ListBox, ListItem, SignalListItemFactory}; use rusqlite::Connection; use sha256::try_digest; @@ -27,7 +33,7 @@ pub struct MemoryCardsEditScene { #[template_child] pub add_button: TemplateChild