This commit is contained in:
Ashley Wulber 2021-12-30 16:54:35 -05:00
parent e6ef9a5357
commit e48f501b0d
18 changed files with 151 additions and 166 deletions

View file

@ -1,18 +1,17 @@
use std::cell::Cell;
use gtk::glib;
use gtk::prelude::*;
use gtk::subclass::prelude::*;
use gtk::CompositeTemplate;
use gtk4 as gtk;
use gtk4::CompositeTemplate;
use gtk4::glib;
use gtk4::prelude::*;
use gtk4::subclass::prelude::*;
#[derive(Debug, Default, CompositeTemplate)]
#[template(file = "grid_item.ui")]
pub struct GridItem {
#[template_child]
pub name: TemplateChild<gtk::Label>,
pub name: TemplateChild<gtk4::Label>,
#[template_child]
pub image: TemplateChild<gtk::Image>,
pub image: TemplateChild<gtk4::Image>,
pub index: Cell<u32>,
}
@ -20,7 +19,7 @@ pub struct GridItem {
impl ObjectSubclass for GridItem {
const NAME: &'static str = "GridItem";
type Type = super::GridItem;
type ParentType = gtk::Box;
type ParentType = gtk4::Box;
fn class_init(klass: &mut Self::Class) {
Self::bind_template(klass);

View file

@ -2,13 +2,12 @@ use gdk4::ContentProvider;
use gdk4::Display;
use gio::File;
use gio::Icon;
use gtk::prelude::*;
use gtk::subclass::prelude::*;
use gtk::{gio, glib};
use gtk4 as gtk;
use gtk4::traits::WidgetExt;
use gtk4::{gio, glib};
use gtk4::DragSource;
use gtk4::IconTheme;
use gtk4::prelude::*;
use gtk4::subclass::prelude::*;
use gtk4::traits::WidgetExt;
use crate::app_group::AppGroup;
@ -16,8 +15,8 @@ mod imp;
glib::wrapper! {
pub struct GridItem(ObjectSubclass<imp::GridItem>)
@extends gtk::Widget, gtk::Box,
@implements gtk::Accessible, gtk::Actionable, gtk::Buildable, gtk::ConstraintTarget;
@extends gtk4::Widget, gtk4::Box,
@implements gtk4::Accessible, gtk4::Actionable, gtk4::Buildable, gtk4::ConstraintTarget;
}
impl Default for GridItem {