From e48f501b0dcaeac1084eda8a82d5167ee6679f54 Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Thu, 30 Dec 2021 16:54:35 -0500 Subject: [PATCH] cleanup --- examples/app_library/app_group/imp.rs | 2 +- examples/app_library/app_group/mod.rs | 2 +- examples/app_library/grid_item/imp.rs | 15 +++--- examples/app_library/grid_item/mod.rs | 13 +++-- examples/app_library/main.rs | 11 ++-- examples/app_library/window/imp.rs | 11 ++-- examples/app_library/window/mod.rs | 61 +++++++++++----------- examples/dock/dock_item/imp.rs | 15 +++--- examples/dock/dock_item/mod.rs | 9 ++-- examples/dock/main.rs | 35 ++++++------- examples/dock/utils.rs | 2 +- examples/dock/window/imp.rs | 11 ++-- examples/dock/window/mod.rs | 45 ++++++++-------- examples/launcher/main.rs | 15 +++--- examples/launcher/search_result_row/imp.rs | 21 ++++---- examples/launcher/search_result_row/mod.rs | 11 ++-- examples/launcher/window/imp.rs | 11 ++-- examples/launcher/window/mod.rs | 27 +++++----- 18 files changed, 151 insertions(+), 166 deletions(-) diff --git a/examples/app_library/app_group/imp.rs b/examples/app_library/app_group/imp.rs index 68a5ee7e..734e1b77 100644 --- a/examples/app_library/app_group/imp.rs +++ b/examples/app_library/app_group/imp.rs @@ -142,7 +142,7 @@ impl ObjectImpl for AppGroup { .get::() .expect("The icon needs to be a Variant"), ) - .expect("The icon variant needs to be a Vec"); + .expect("The icon variant needs to be a Vec"); self.data.borrow_mut().app_names = appnames; } _ => unimplemented!(), diff --git a/examples/app_library/app_group/mod.rs b/examples/app_library/app_group/mod.rs index 2e674ba9..8b3622dd 100644 --- a/examples/app_library/app_group/mod.rs +++ b/examples/app_library/app_group/mod.rs @@ -20,7 +20,7 @@ impl AppGroup { ("icon", &data.icon), ("category", &data.category), ]) - .expect("Failed to create `ApplicationObject`."); + .expect("Failed to create `ApplicationObject`."); if let Err(e) = self_.set_property("appnames", data.app_names.to_variant()) { println!("failed to set category icon property"); dbg!(e); diff --git a/examples/app_library/grid_item/imp.rs b/examples/app_library/grid_item/imp.rs index 2043f4e8..22db023d 100644 --- a/examples/app_library/grid_item/imp.rs +++ b/examples/app_library/grid_item/imp.rs @@ -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, + pub name: TemplateChild, #[template_child] - pub image: TemplateChild, + pub image: TemplateChild, pub index: Cell, } @@ -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); diff --git a/examples/app_library/grid_item/mod.rs b/examples/app_library/grid_item/mod.rs index 2eed2748..8bb8cbad 100644 --- a/examples/app_library/grid_item/mod.rs +++ b/examples/app_library/grid_item/mod.rs @@ -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) - @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 { diff --git a/examples/app_library/main.rs b/examples/app_library/main.rs index 527b1d21..e424360d 100644 --- a/examples/app_library/main.rs +++ b/examples/app_library/main.rs @@ -1,7 +1,6 @@ -use gtk::gdk::Display; -use gtk::prelude::*; -use gtk4 as gtk; use gtk4::CssProvider; +use gtk4::gdk::Display; +use gtk4::prelude::*; use gtk4::StyleContext; use once_cell::sync::OnceCell; use x11rb::rust_connection::RustConnection; @@ -16,7 +15,7 @@ mod window; static X11_CONN: OnceCell = OnceCell::new(); fn main() { - let app = gtk::Application::new(Some("com.cosmic.app_library"), Default::default()); + let app = gtk4::Application::new(Some("com.cosmic.app_library"), Default::default()); app.connect_startup(|app| { load_css(); build_ui(&app); @@ -38,11 +37,11 @@ fn load_css() { StyleContext::add_provider_for_display( &Display::default().expect("Error initializing GTK CSS provider."), &provider, - gtk::STYLE_PROVIDER_PRIORITY_APPLICATION, + gtk4::STYLE_PROVIDER_PRIORITY_APPLICATION, ); } -fn build_ui(app: >k::Application) { +fn build_ui(app: >k4::Application) { // Create a new custom window and show it let window = Window::new(app); let (conn, _screen_num) = x11rb::connect(None).expect("Failed to connect to X"); diff --git a/examples/app_library/window/imp.rs b/examples/app_library/window/imp.rs index a60c8cdc..b36e647c 100644 --- a/examples/app_library/window/imp.rs +++ b/examples/app_library/window/imp.rs @@ -2,12 +2,11 @@ use std::fs::File; use glib::signal::Inhibit; use glib::subclass::InitializingObject; -use gtk::prelude::*; -use gtk::subclass::prelude::*; -use gtk::{gio, glib}; -use gtk::{CompositeTemplate, GridView, SearchEntry}; -use gtk4 as gtk; +use gtk4::prelude::*; +use gtk4::subclass::prelude::*; use gtk4::ScrolledWindow; +use gtk4::{gio, glib}; +use gtk4::{CompositeTemplate, GridView, SearchEntry}; use once_cell::sync::OnceCell; use crate::app_group::AppGroup; @@ -35,7 +34,7 @@ impl ObjectSubclass for Window { // `NAME` needs to match `class` attribute of template const NAME: &'static str = "LauncherWindow"; type Type = super::Window; - type ParentType = gtk::ApplicationWindow; + type ParentType = gtk4::ApplicationWindow; fn class_init(klass: &mut Self::Class) { Self::bind_template(klass); diff --git a/examples/app_library/window/mod.rs b/examples/app_library/window/mod.rs index 955e5ad9..f600f2bc 100644 --- a/examples/app_library/window/mod.rs +++ b/examples/app_library/window/mod.rs @@ -6,14 +6,13 @@ use gdk4_x11::X11Surface; use glib::FromVariant; use glib::Object; use glib::Variant; -use gtk::prelude::*; -use gtk::subclass::prelude::*; -use gtk::{gio, glib}; -use gtk::{Application, SignalListItemFactory}; -use gtk4 as gtk; +use gtk4::{gio, glib}; +use gtk4::{Application, SignalListItemFactory}; use gtk4::Dialog; use gtk4::Entry; use gtk4::Label; +use gtk4::prelude::*; +use gtk4::subclass::prelude::*; use x11rb::connection::Connection; use x11rb::protocol::xproto; use x11rb::protocol::xproto::ConnectionExt; @@ -31,9 +30,9 @@ mod imp; glib::wrapper! { pub struct Window(ObjectSubclass) - @extends gtk::ApplicationWindow, gtk::Window, gtk::Widget, - @implements gio::ActionGroup, gio::ActionMap, gtk::Accessible, gtk::Buildable, - gtk::ConstraintTarget, gtk::Native, gtk::Root, gtk::ShortcutManager; + @extends gtk4::ApplicationWindow, gtk4::Window, gtk4::Widget, + @implements gio::ActionGroup, gio::ActionMap, gtk4::Accessible, gtk4::Buildable, + gtk4::ConstraintTarget, gtk4::Native, gtk4::Root, gtk4::ShortcutManager; } impl Window { @@ -97,7 +96,7 @@ impl Window { .set(app_model.clone()) .expect("Could not set model"); - let sorter = gtk::CustomSorter::new(move |obj1, obj2| { + let sorter = gtk4::CustomSorter::new(move |obj1, obj2| { let app_info1 = obj1.downcast_ref::().unwrap(); let app_info2 = obj2.downcast_ref::().unwrap(); @@ -107,14 +106,14 @@ impl Window { .cmp(&app_info2.name().to_lowercase()) .into() }); - let filter = gtk::CustomFilter::new(|_obj| true); + let filter = gtk4::CustomFilter::new(|_obj| true); let search_filter_model = - gtk::FilterListModel::new(Some(&app_model), Some(filter).as_ref()); - let filter = gtk::CustomFilter::new(|_obj| true); + gtk4::FilterListModel::new(Some(&app_model), Some(filter).as_ref()); + let filter = gtk4::CustomFilter::new(|_obj| true); let group_filter_model = - gtk::FilterListModel::new(Some(&search_filter_model), Some(filter).as_ref()); - let sorted_model = gtk::SortListModel::new(Some(&group_filter_model), Some(&sorter)); - let selection_model = gtk::SingleSelection::builder() + gtk4::FilterListModel::new(Some(&search_filter_model), Some(filter).as_ref()); + let sorted_model = gtk4::SortListModel::new(Some(&group_filter_model), Some(&sorter)); + let selection_model = gtk4::SingleSelection::builder() .model(&sorted_model) .autoselect(false) .can_unselect(true) @@ -172,10 +171,10 @@ impl Window { category: "".to_string(), }), ] - .iter() - .for_each(|group| { - group_model.append(group); - }); + .iter() + .for_each(|group| { + group_model.append(group); + }); let group_selection = gtk4::SingleSelection::new(Some(&group_model)); imp.group_grid_view.set_model(Some(&group_selection)); } @@ -183,32 +182,32 @@ impl Window { fn setup_callbacks(&self) { // Get state let imp = imp::Window::from_instance(self); - let window = self.clone().upcast::(); + let window = self.clone().upcast::(); let app_grid_view = &imp.app_grid_view; let group_grid_view = &imp.group_grid_view; let app_selection_model = app_grid_view .model() .expect("List view missing selection model") - .downcast::() + .downcast::() .expect("could not downcast listview model to single selection model"); let app_sorted_model = app_selection_model .model() - .downcast::() + .downcast::() .expect("sorted list model could not be downcast"); let app_group_filter_model = app_sorted_model .model() .expect("missing model for sort list model.") - .downcast::() + .downcast::() .expect("could not downcast sort list model to filter list model"); let app_filter_model = app_group_filter_model .model() .expect("missing model for sort list model.") - .downcast::() + .downcast::() .expect("could not downcast sort list model to filter list model"); let group_selection_model = group_grid_view .model() .expect("List view missing selection model") - .downcast::() + .downcast::() .expect("could not downcast listview model to single selection model"); let entry = &imp.entry; @@ -229,10 +228,10 @@ impl Window { let app_info = item.downcast::().unwrap(); let context = window.display().app_launch_context(); if let Err(err) = app_info.launch(&[], Some(&context)) { - gtk::MessageDialog::builder() + gtk4::MessageDialog::builder() .text(&format!("Failed to start {}", app_info.name())) .secondary_text(&err.to_string()) - .message_type(gtk::MessageType::Error) + .message_type(gtk4::MessageType::Error) .modal(true) .transient_for(&window) .build() @@ -347,7 +346,7 @@ impl Window { vec![] }; dbg!(&app_names); - let new_filter: gtk::CustomFilter = gtk::CustomFilter::new(move |obj| { + let new_filter: gtk4::CustomFilter = gtk4::CustomFilter::new(move |obj| { let app = obj .downcast_ref::() .expect("The Object needs to be of type AppInfo"); @@ -363,15 +362,15 @@ impl Window { })); entry.connect_changed( - glib::clone!(@weak app_filter_model, @weak app_sorted_model => move |search: >k::SearchEntry| { + glib::clone!(@weak app_filter_model, @weak app_sorted_model => move |search: >k4::SearchEntry| { let search_text = search.text().to_string().to_lowercase(); - let new_filter: gtk::CustomFilter = gtk::CustomFilter::new(move |obj| { + let new_filter: gtk4::CustomFilter = gtk4::CustomFilter::new(move |obj| { let search_res = obj.downcast_ref::() .expect("The Object needs to be of type AppInfo"); search_res.name().to_string().to_lowercase().contains(&search_text) }); let search_text = search.text().to_string().to_lowercase(); - let new_sorter: gtk::CustomSorter = gtk::CustomSorter::new(move |obj1, obj2| { + let new_sorter: gtk4::CustomSorter = gtk4::CustomSorter::new(move |obj1, obj2| { let app_info1 = obj1.downcast_ref::().unwrap(); let app_info2 = obj2.downcast_ref::().unwrap(); if search_text == "" { diff --git a/examples/dock/dock_item/imp.rs b/examples/dock/dock_item/imp.rs index a35252c0..e78c9816 100644 --- a/examples/dock/dock_item/imp.rs +++ b/examples/dock/dock_item/imp.rs @@ -1,23 +1,22 @@ -use gtk::glib; -use gtk::prelude::*; -use gtk::subclass::prelude::*; -use gtk::CompositeTemplate; -use gtk4 as gtk; +use gtk4::glib; +use gtk4::prelude::*; +use gtk4::subclass::prelude::*; +use gtk4::CompositeTemplate; #[derive(Debug, Default, CompositeTemplate)] #[template(file = "dock_item.ui")] pub struct DockItem { #[template_child] - pub image: TemplateChild, + pub image: TemplateChild, #[template_child] - pub dots: TemplateChild, + pub dots: TemplateChild, } #[glib::object_subclass] impl ObjectSubclass for DockItem { const NAME: &'static str = "DockItem"; type Type = super::DockItem; - type ParentType = gtk::Box; + type ParentType = gtk4::Box; fn class_init(klass: &mut Self::Class) { Self::bind_template(klass); diff --git a/examples/dock/dock_item/mod.rs b/examples/dock/dock_item/mod.rs index 6fb2960b..d13290e5 100644 --- a/examples/dock/dock_item/mod.rs +++ b/examples/dock/dock_item/mod.rs @@ -1,9 +1,8 @@ use gio::DesktopAppInfo; use gio::Icon; -use gtk::glib; -use gtk::prelude::*; -use gtk::subclass::prelude::*; -use gtk4 as gtk; +use gtk4::glib; +use gtk4::prelude::*; +use gtk4::subclass::prelude::*; use crate::dock_object::DockObject; use crate::utils::BoxedWindowList; @@ -12,7 +11,7 @@ mod imp; glib::wrapper! { pub struct DockItem(ObjectSubclass) - @extends gtk::Widget, gtk::Box; + @extends gtk4::Widget, gtk4::Box; } impl Default for DockItem { diff --git a/examples/dock/main.rs b/examples/dock/main.rs index b128f9fd..87e96208 100644 --- a/examples/dock/main.rs +++ b/examples/dock/main.rs @@ -4,12 +4,11 @@ use std::time::Duration; use futures::executor::block_on; use gdk4::Display; use gio::DesktopAppInfo; -use gtk::gio; -use gtk::glib; -use gtk::prelude::*; -use gtk::Application; -use gtk4 as gtk; +use gtk4::Application; use gtk4::CssProvider; +use gtk4::gio; +use gtk4::glib; +use gtk4::prelude::*; use gtk4::StyleContext; use once_cell::sync::OnceCell; use postage::mpsc::Sender; @@ -90,13 +89,13 @@ fn load_css() { StyleContext::add_provider_for_display( &Display::default().expect("Error initializing GTK CSS provider."), &provider, - gtk::STYLE_PROVIDER_PRIORITY_APPLICATION, + gtk4::STYLE_PROVIDER_PRIORITY_APPLICATION, ); } fn main() { assert!(utils::BoxedWindowList::static_type().is_valid()); - let app = gtk::Application::builder() + let app = gtk4::Application::builder() .application_id("com.system76.dock") .build(); @@ -132,7 +131,7 @@ fn main() { match event { Event::Activate(e) => { let _activate_window = zbus_conn - .call_method(Some(DEST), PATH, Some(DEST), "WindowFocus", &((e,))) + .call_method(Some(DEST), PATH, Some(DEST), "WindowFocus", &((e, ))) .await .expect("Failed to focus selected window"); } @@ -226,16 +225,16 @@ fn main() { // skip if equal if cached_results.len() == results.len() && results.iter().zip(cached_results.iter()).fold( - 0, - |acc, z: (&Item, &Item)| { - let (a, b) = z; - if a.name == b.name { - acc + 1 - } else { - acc - } - }, - ) == cached_results.len() + 0, + |acc, z: (&Item, &Item)| { + let (a, b) = z; + if a.name == b.name { + acc + 1 + } else { + acc + } + }, + ) == cached_results.len() { continue; // skip this update } diff --git a/examples/dock/utils.rs b/examples/dock/utils.rs index e432005d..4c95bd63 100644 --- a/examples/dock/utils.rs +++ b/examples/dock/utils.rs @@ -1,6 +1,6 @@ use std::path::PathBuf; -use gtk4::glib; +use glib; use crate::DockObject; use crate::Item; diff --git a/examples/dock/window/imp.rs b/examples/dock/window/imp.rs index 892f1f59..866a5030 100644 --- a/examples/dock/window/imp.rs +++ b/examples/dock/window/imp.rs @@ -3,16 +3,15 @@ use std::rc::Rc; use glib::subclass::InitializingObject; use glib::SignalHandlerId; -use gtk::prelude::*; -use gtk::subclass::prelude::*; -use gtk::{gio, glib}; -use gtk::{CompositeTemplate, ListView}; -use gtk4 as gtk; +use gtk4::prelude::*; +use gtk4::subclass::prelude::*; use gtk4::DragSource; use gtk4::DropTarget; use gtk4::EventControllerMotion; use gtk4::Revealer; +use gtk4::{gio, glib}; use gtk4::{Box, GestureClick}; +use gtk4::{CompositeTemplate, ListView}; use once_cell::sync::OnceCell; // Object holding the state @@ -48,7 +47,7 @@ impl ObjectSubclass for Window { // `NAME` needs to match `class` attribute of template const NAME: &'static str = "LauncherWindow"; type Type = super::Window; - type ParentType = gtk::ApplicationWindow; + type ParentType = gtk4::ApplicationWindow; fn class_init(klass: &mut Self::Class) { Self::bind_template(klass); diff --git a/examples/dock/window/mod.rs b/examples/dock/window/mod.rs index ca531ec0..bde86692 100644 --- a/examples/dock/window/mod.rs +++ b/examples/dock/window/mod.rs @@ -1,4 +1,3 @@ -use crate::Item; use std::fs::File; use std::path::Path; @@ -13,16 +12,15 @@ use gio::Icon; // use crate::application_row::ApplicationRow; use glib::Object; use glib::Type; -use gtk::prelude::*; -use gtk::subclass::prelude::*; -use gtk::{gio, glib}; -use gtk::{Application, SignalListItemFactory}; -use gtk4 as gtk; -use gtk4::prelude::ListModelExt; +use gtk4::{gio, glib}; +use gtk4::{Application, SignalListItemFactory}; +use gtk4::{DragSource, GestureClick}; use gtk4::DropTarget; use gtk4::EventControllerMotion; use gtk4::IconTheme; -use gtk4::{DragSource, GestureClick}; +use gtk4::prelude::*; +use gtk4::prelude::ListModelExt; +use gtk4::subclass::prelude::*; use postage::prelude::Sink; use x11rb::connection::Connection; use x11rb::protocol::xproto; @@ -34,18 +32,19 @@ use crate::BoxedWindowList; // use crate::ApplicationObject; use crate::dock_item::DockItem; use crate::dock_object::DockObject; -use crate::utils::data_path; use crate::Event; +use crate::Item; use crate::TX; +use crate::utils::data_path; use crate::X11_CONN; mod imp; glib::wrapper! { pub struct Window(ObjectSubclass) - @extends gtk::ApplicationWindow, gtk::Window, gtk::Widget, - @implements gio::ActionGroup, gio::ActionMap, gtk::Accessible, gtk::Buildable, - gtk::ConstraintTarget, gtk::Native, gtk::Root, gtk::ShortcutManager; + @extends gtk4::ApplicationWindow, gtk4::Window, gtk4::Widget, + @implements gio::ActionGroup, gio::ActionMap, gtk4::Accessible, gtk4::Buildable, + gtk4::ConstraintTarget, gtk4::Native, gtk4::Root, gtk4::ShortcutManager; } impl Window { @@ -76,7 +75,7 @@ impl Window { let imp = imp::Window::from_instance(self); let saved_app_model = gio::ListStore::new(DockObject::static_type()); - let saved_selection_model = gtk::NoSelection::new(Some(&saved_app_model)); + let saved_selection_model = gtk4::NoSelection::new(Some(&saved_app_model)); imp.saved_app_model .set(saved_app_model) @@ -86,7 +85,7 @@ impl Window { .set_model(Some(&saved_selection_model)); let active_app_model = gio::ListStore::new(DockObject::static_type()); - let active_selection_model = gtk::NoSelection::new(Some(&active_app_model)); + let active_selection_model = gtk4::NoSelection::new(Some(&active_app_model)); imp.active_app_model .set(active_app_model) @@ -99,7 +98,7 @@ impl Window { fn setup_callbacks(&self) { // Get state let imp = imp::Window::from_instance(self); - let window = self.clone().upcast::(); + let window = self.clone().upcast::(); let saved_app_list_view = &imp.saved_app_list_view; let saved_app_model = &imp .saved_app_model @@ -109,16 +108,16 @@ impl Window { let saved_app_selection_model = saved_app_list_view .model() .expect("List view missing selection model") - .downcast::() + .downcast::() .expect("could not downcast listview model to single selection model"); let active_app_selection_model = imp .active_app_list_view .model() .expect("List view missing selection model") - .downcast::() + .downcast::() .expect("could not downcast listview model to single selection model"); - // let selected_handler = glib::clone!(@weak window => move |model: >k::NoSelection| { + // let selected_handler = glib::clone!(@weak window => move |model: >k4::NoSelection| { // let position = model.selected(); // println!("selected app {}", position); // // Launch the application when an item of the list is activated @@ -137,10 +136,10 @@ impl Window { // else if let Ok(Some(app_info)) = dockobject.property("appinfo").expect("DockObject must have appinfo property").get::>() { // let context = window.display().app_launch_context(); // if let Err(err) = app_info.launch(&[], Some(&context)) { - // gtk::MessageDialog::builder() + // gtk4::MessageDialog::builder() // .text(&format!("Failed to start {}", app_info.name())) // .secondary_text(&err.to_string()) - // .message_type(gtk::MessageType::Error) + // .message_type(gtk4::MessageType::Error) // .modal(true) // .transient_for(&window) // .build() @@ -411,7 +410,7 @@ impl Window { fn setup_click_callbacks(&self) { let imp = imp::Window::from_instance(self); - let window = self.clone().upcast::(); + let window = self.clone().upcast::(); let saved_click_controller = imp .saved_click_controller .get() @@ -455,10 +454,10 @@ impl Window { (click, _, _, Some(app_info)) | (click, _, None, Some(app_info)) if click != 3 => { let context = window.display().app_launch_context(); if let Err(err) = app_info.launch(&[], Some(&context)) { - gtk::MessageDialog::builder() + gtk4::MessageDialog::builder() .text(&format!("Failed to start {}", app_info.name())) .secondary_text(&err.to_string()) - .message_type(gtk::MessageType::Error) + .message_type(gtk4::MessageType::Error) .modal(true) .transient_for(&window) .build() diff --git a/examples/launcher/main.rs b/examples/launcher/main.rs index d9f033d0..38ce05b8 100644 --- a/examples/launcher/main.rs +++ b/examples/launcher/main.rs @@ -1,11 +1,10 @@ use gdk4::Display; use gio::DesktopAppInfo; -use gtk::gio; -use gtk::glib; -use gtk::prelude::*; -use gtk::Application; -use gtk4 as gtk; +use gtk4::Application; use gtk4::CssProvider; +use gtk4::gio; +use gtk4::glib; +use gtk4::prelude::*; use gtk4::StyleContext; use once_cell::sync::OnceCell; use pop_launcher_service::IpcClient; @@ -27,7 +26,7 @@ const NUM_LAUNCHER_ITEMS: u8 = 10; static TX: OnceCell> = OnceCell::new(); static X11_CONN: OnceCell = OnceCell::new(); -fn icon_source(icon: >k::Image, source: &Option) { +fn icon_source(icon: >k4::Image, source: &Option) { match source { Some(pop_launcher::IconSource::Name(name)) => { icon.set_from_icon_name(Some(name)); @@ -80,12 +79,12 @@ fn load_css() { StyleContext::add_provider_for_display( &Display::default().expect("Error initializing GTK CSS provider."), &provider, - gtk::STYLE_PROVIDER_PRIORITY_APPLICATION, + gtk4::STYLE_PROVIDER_PRIORITY_APPLICATION, ); } fn main() { - let app = gtk::Application::builder() + let app = gtk4::Application::builder() .application_id("com.cosmic.Launcher") .build(); diff --git a/examples/launcher/search_result_row/imp.rs b/examples/launcher/search_result_row/imp.rs index eacf66c0..cc46589c 100644 --- a/examples/launcher/search_result_row/imp.rs +++ b/examples/launcher/search_result_row/imp.rs @@ -1,29 +1,28 @@ -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 = "application_row.ui")] pub struct SearchResultRow { #[template_child] - pub name: TemplateChild, + pub name: TemplateChild, #[template_child] - pub description: TemplateChild, + pub description: TemplateChild, #[template_child] - pub shortcut: TemplateChild, + pub shortcut: TemplateChild, #[template_child] - pub image: TemplateChild, + pub image: TemplateChild, #[template_child] - pub categoryimage: TemplateChild, + pub categoryimage: TemplateChild, } #[glib::object_subclass] impl ObjectSubclass for SearchResultRow { const NAME: &'static str = "SearchResultRow"; type Type = super::SearchResultRow; - type ParentType = gtk::Box; + type ParentType = gtk4::Box; fn class_init(klass: &mut Self::Class) { Self::bind_template(klass); diff --git a/examples/launcher/search_result_row/mod.rs b/examples/launcher/search_result_row/mod.rs index 8bf1238b..93f74b8a 100644 --- a/examples/launcher/search_result_row/mod.rs +++ b/examples/launcher/search_result_row/mod.rs @@ -1,17 +1,16 @@ -use gtk::glib; -use gtk::prelude::*; -use gtk::subclass::prelude::*; -use gtk4 as gtk; +use gtk4::glib; +use gtk4::prelude::*; +use gtk4::subclass::prelude::*; -use crate::icon_source; use crate::BoxedSearchResult; +use crate::icon_source; use crate::SearchResultObject; mod imp; glib::wrapper! { pub struct SearchResultRow(ObjectSubclass) - @extends gtk::Widget, gtk::Box; + @extends gtk4::Widget, gtk4::Box; } impl Default for SearchResultRow { diff --git a/examples/launcher/window/imp.rs b/examples/launcher/window/imp.rs index 7cec1b26..cf1dc83f 100644 --- a/examples/launcher/window/imp.rs +++ b/examples/launcher/window/imp.rs @@ -1,9 +1,8 @@ use glib::subclass::InitializingObject; -use gtk::prelude::*; -use gtk::subclass::prelude::*; -use gtk::{gio, glib}; -use gtk::{CompositeTemplate, Entry, ListView}; -use gtk4 as gtk; +use gtk4::{gio, glib}; +use gtk4::{CompositeTemplate, Entry, ListView}; +use gtk4::prelude::*; +use gtk4::subclass::prelude::*; use once_cell::sync::OnceCell; // Object holding the state @@ -23,7 +22,7 @@ impl ObjectSubclass for Window { // `NAME` needs to match `class` attribute of template const NAME: &'static str = "LauncherWindow"; type Type = super::Window; - type ParentType = gtk::ApplicationWindow; + type ParentType = gtk4::ApplicationWindow; fn class_init(klass: &mut Self::Class) { Self::bind_template(klass); diff --git a/examples/launcher/window/mod.rs b/examples/launcher/window/mod.rs index ab9e10f8..3e600ff3 100644 --- a/examples/launcher/window/mod.rs +++ b/examples/launcher/window/mod.rs @@ -2,11 +2,10 @@ use gdk4::Rectangle; use gdk4_x11::X11Display; use gdk4_x11::X11Surface; use glib::Object; -use gtk::prelude::*; -use gtk::subclass::prelude::*; -use gtk::{gio, glib}; -use gtk::{Application, SignalListItemFactory}; -use gtk4 as gtk; +use gtk4::{gio, glib}; +use gtk4::{Application, SignalListItemFactory}; +use gtk4::prelude::*; +use gtk4::subclass::prelude::*; use postage::prelude::Sink; use x11rb::connection::Connection; use x11rb::protocol::xproto; @@ -23,9 +22,9 @@ mod imp; glib::wrapper! { pub struct Window(ObjectSubclass) - @extends gtk::ApplicationWindow, gtk::Window, gtk::Widget, - @implements gio::ActionGroup, gio::ActionMap, gtk::Accessible, gtk::Buildable, - gtk::ConstraintTarget, gtk::Native, gtk::Root, gtk::ShortcutManager; + @extends gtk4::ApplicationWindow, gtk4::Window, gtk4::Widget, + @implements gio::ActionGroup, gio::ActionMap, gtk4::Accessible, gtk4::Buildable, + gtk4::ConstraintTarget, gtk4::Native, gtk4::Root, gtk4::ShortcutManager; } const NUM_LAUNCHER_ITEMS: u8 = 9; @@ -47,8 +46,8 @@ impl Window { let imp = imp::Window::from_instance(self); let model = gio::ListStore::new(SearchResultObject::static_type()); - let slice_model = gtk::SliceListModel::new(Some(&model), 0, NUM_LAUNCHER_ITEMS.into()); - let selection_model = gtk::SingleSelection::builder() + let slice_model = gtk4::SliceListModel::new(Some(&model), 0, NUM_LAUNCHER_ITEMS.into()); + let selection_model = gtk4::SingleSelection::builder() .model(&slice_model) .autoselect(false) .can_unselect(true) @@ -63,7 +62,7 @@ impl Window { fn setup_callbacks(&self) { // Get state let imp = imp::Window::from_instance(self); - let window = self.clone().upcast::(); + let window = self.clone().upcast::(); let list_view = &imp.list_view; let entry = &imp.entry; let lv = list_view.get(); @@ -94,7 +93,7 @@ impl Window { let app_selection_model = list_view .model() .expect("List view missing selection model") - .downcast::() + .downcast::() .expect("could not downcast listview model to single selection model"); app_selection_model.connect_selected_notify(glib::clone!(@weak window => move |model| { @@ -117,7 +116,7 @@ impl Window { } })); - entry.connect_changed(glib::clone!(@weak lv => move |search: >k::Entry| { + entry.connect_changed(glib::clone!(@weak lv => move |search: >k4::Entry| { let search = search.text().to_string(); glib::MainContext::default().spawn_local(async move { @@ -128,7 +127,7 @@ impl Window { }); })); - entry.connect_realize(glib::clone!(@weak lv => move |search: >k::Entry| { + entry.connect_realize(glib::clone!(@weak lv => move |search: >k4::Entry| { let search = search.text().to_string(); glib::MainContext::default().spawn_local(async move {