leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

15
examples/dock/dock_item/imp.rs
View file

@ -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<gtk::Image>,
pub image: TemplateChild<gtk4::Image>,
#[template_child]
pub dots: TemplateChild<gtk::Label>,
pub dots: TemplateChild<gtk4::Label>,
}
#[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);

9
examples/dock/dock_item/mod.rs
View file

@ -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<imp::DockItem>)
@extends gtk::Widget, gtk::Box;
@extends gtk4::Widget, gtk4::Box;
}
impl Default for DockItem {

35
examples/dock/main.rs
View file

@ -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
}

2
examples/dock/utils.rs
View file

@ -1,6 +1,6 @@
use std::path::PathBuf;
use gtk4::glib;
use glib;
use crate::DockObject;
use crate::Item;

11
examples/dock/window/imp.rs
View file

@ -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);

45
examples/dock/window/mod.rs
View file

@ -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<imp::Window>)
@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::<gtk::Window>();
let window = self.clone().upcast::<gtk4::Window>();
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::<gtk::NoSelection>()
.downcast::<gtk4::NoSelection>()
.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::<gtk::NoSelection>()
.downcast::<gtk4::NoSelection>()
.expect("could not downcast listview model to single selection model");
// let selected_handler = glib::clone!(@weak window => move |model: &gtk::NoSelection| {
// let selected_handler = glib::clone!(@weak window => move |model: &gtk4::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::<Option<DesktopAppInfo>>() {
// 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::<gtk::Window>();
let window = self.clone().upcast::<gtk4::Window>();
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()