formatting
This commit is contained in:
parent
65f43a9300
commit
ed4863388f
17 changed files with 56 additions and 56 deletions
|
|
@ -142,7 +142,7 @@ impl ObjectImpl for AppGroup {
|
||||||
.get::<Variant>()
|
.get::<Variant>()
|
||||||
.expect("The icon needs to be a Variant"),
|
.expect("The icon needs to be a Variant"),
|
||||||
)
|
)
|
||||||
.expect("The icon variant needs to be a Vec<String>");
|
.expect("The icon variant needs to be a Vec<String>");
|
||||||
self.data.borrow_mut().app_names = appnames;
|
self.data.borrow_mut().app_names = appnames;
|
||||||
}
|
}
|
||||||
_ => unimplemented!(),
|
_ => unimplemented!(),
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ impl AppGroup {
|
||||||
("icon", &data.icon),
|
("icon", &data.icon),
|
||||||
("category", &data.category),
|
("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()) {
|
if let Err(e) = self_.set_property("appnames", data.app_names.to_variant()) {
|
||||||
println!("failed to set category icon property");
|
println!("failed to set category icon property");
|
||||||
dbg!(e);
|
dbg!(e);
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
use std::cell::Cell;
|
use std::cell::Cell;
|
||||||
|
|
||||||
use gtk4 as gtk;
|
|
||||||
use gtk::CompositeTemplate;
|
|
||||||
use gtk::glib;
|
use gtk::glib;
|
||||||
use gtk::prelude::*;
|
use gtk::prelude::*;
|
||||||
use gtk::subclass::prelude::*;
|
use gtk::subclass::prelude::*;
|
||||||
|
use gtk::CompositeTemplate;
|
||||||
|
use gtk4 as gtk;
|
||||||
|
|
||||||
#[derive(Debug, Default, CompositeTemplate)]
|
#[derive(Debug, Default, CompositeTemplate)]
|
||||||
#[template(file = "grid_item.ui")]
|
#[template(file = "grid_item.ui")]
|
||||||
|
|
|
||||||
|
|
@ -2,13 +2,13 @@ use gdk4::ContentProvider;
|
||||||
use gdk4::Display;
|
use gdk4::Display;
|
||||||
use gio::File;
|
use gio::File;
|
||||||
use gio::Icon;
|
use gio::Icon;
|
||||||
use gtk::{gio, glib};
|
|
||||||
use gtk4 as gtk;
|
|
||||||
use gtk4::DragSource;
|
|
||||||
use gtk4::IconTheme;
|
|
||||||
use gtk4::traits::WidgetExt;
|
|
||||||
use gtk::prelude::*;
|
use gtk::prelude::*;
|
||||||
use gtk::subclass::prelude::*;
|
use gtk::subclass::prelude::*;
|
||||||
|
use gtk::{gio, glib};
|
||||||
|
use gtk4 as gtk;
|
||||||
|
use gtk4::traits::WidgetExt;
|
||||||
|
use gtk4::DragSource;
|
||||||
|
use gtk4::IconTheme;
|
||||||
|
|
||||||
use crate::app_group::AppGroup;
|
use crate::app_group::AppGroup;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
|
use gtk::gdk::Display;
|
||||||
|
use gtk::prelude::*;
|
||||||
use gtk4 as gtk;
|
use gtk4 as gtk;
|
||||||
use gtk4::CssProvider;
|
use gtk4::CssProvider;
|
||||||
use gtk4::StyleContext;
|
use gtk4::StyleContext;
|
||||||
use gtk::gdk::Display;
|
|
||||||
use gtk::prelude::*;
|
|
||||||
use once_cell::sync::OnceCell;
|
use once_cell::sync::OnceCell;
|
||||||
use x11rb::rust_connection::RustConnection;
|
use x11rb::rust_connection::RustConnection;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,12 +2,12 @@ use std::fs::File;
|
||||||
|
|
||||||
use glib::signal::Inhibit;
|
use glib::signal::Inhibit;
|
||||||
use glib::subclass::InitializingObject;
|
use glib::subclass::InitializingObject;
|
||||||
|
use gtk::prelude::*;
|
||||||
|
use gtk::subclass::prelude::*;
|
||||||
use gtk::{gio, glib};
|
use gtk::{gio, glib};
|
||||||
use gtk::{CompositeTemplate, GridView, SearchEntry};
|
use gtk::{CompositeTemplate, GridView, SearchEntry};
|
||||||
use gtk4 as gtk;
|
use gtk4 as gtk;
|
||||||
use gtk4::ScrolledWindow;
|
use gtk4::ScrolledWindow;
|
||||||
use gtk::prelude::*;
|
|
||||||
use gtk::subclass::prelude::*;
|
|
||||||
use once_cell::sync::OnceCell;
|
use once_cell::sync::OnceCell;
|
||||||
|
|
||||||
use crate::app_group::AppGroup;
|
use crate::app_group::AppGroup;
|
||||||
|
|
|
||||||
|
|
@ -6,14 +6,14 @@ use gdk4_x11::X11Surface;
|
||||||
use glib::FromVariant;
|
use glib::FromVariant;
|
||||||
use glib::Object;
|
use glib::Object;
|
||||||
use glib::Variant;
|
use glib::Variant;
|
||||||
|
use gtk::prelude::*;
|
||||||
|
use gtk::subclass::prelude::*;
|
||||||
use gtk::{gio, glib};
|
use gtk::{gio, glib};
|
||||||
use gtk::{Application, SignalListItemFactory};
|
use gtk::{Application, SignalListItemFactory};
|
||||||
use gtk4 as gtk;
|
use gtk4 as gtk;
|
||||||
use gtk4::Dialog;
|
use gtk4::Dialog;
|
||||||
use gtk4::Entry;
|
use gtk4::Entry;
|
||||||
use gtk4::Label;
|
use gtk4::Label;
|
||||||
use gtk::prelude::*;
|
|
||||||
use gtk::subclass::prelude::*;
|
|
||||||
use x11rb::connection::Connection;
|
use x11rb::connection::Connection;
|
||||||
use x11rb::protocol::xproto;
|
use x11rb::protocol::xproto;
|
||||||
use x11rb::protocol::xproto::ConnectionExt;
|
use x11rb::protocol::xproto::ConnectionExt;
|
||||||
|
|
@ -172,10 +172,10 @@ impl Window {
|
||||||
category: "".to_string(),
|
category: "".to_string(),
|
||||||
}),
|
}),
|
||||||
]
|
]
|
||||||
.iter()
|
.iter()
|
||||||
.for_each(|group| {
|
.for_each(|group| {
|
||||||
group_model.append(group);
|
group_model.append(group);
|
||||||
});
|
});
|
||||||
let group_selection = gtk4::SingleSelection::new(Some(&group_model));
|
let group_selection = gtk4::SingleSelection::new(Some(&group_model));
|
||||||
imp.group_grid_view.set_model(Some(&group_selection));
|
imp.group_grid_view.set_model(Some(&group_selection));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
use gtk4 as gtk;
|
|
||||||
use gtk::CompositeTemplate;
|
|
||||||
use gtk::glib;
|
use gtk::glib;
|
||||||
use gtk::prelude::*;
|
use gtk::prelude::*;
|
||||||
use gtk::subclass::prelude::*;
|
use gtk::subclass::prelude::*;
|
||||||
|
use gtk::CompositeTemplate;
|
||||||
|
use gtk4 as gtk;
|
||||||
|
|
||||||
#[derive(Debug, Default, CompositeTemplate)]
|
#[derive(Debug, Default, CompositeTemplate)]
|
||||||
#[template(file = "dock_item.ui")]
|
#[template(file = "dock_item.ui")]
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
use gio::DesktopAppInfo;
|
use gio::DesktopAppInfo;
|
||||||
use gio::Icon;
|
use gio::Icon;
|
||||||
use gtk4 as gtk;
|
|
||||||
use gtk::glib;
|
use gtk::glib;
|
||||||
use gtk::prelude::*;
|
use gtk::prelude::*;
|
||||||
use gtk::subclass::prelude::*;
|
use gtk::subclass::prelude::*;
|
||||||
|
use gtk4 as gtk;
|
||||||
|
|
||||||
use crate::dock_object::DockObject;
|
use crate::dock_object::DockObject;
|
||||||
use crate::utils::BoxedWindowList;
|
use crate::utils::BoxedWindowList;
|
||||||
|
|
|
||||||
|
|
@ -4,13 +4,13 @@ use std::time::Duration;
|
||||||
use futures::executor::block_on;
|
use futures::executor::block_on;
|
||||||
use gdk4::Display;
|
use gdk4::Display;
|
||||||
use gio::DesktopAppInfo;
|
use gio::DesktopAppInfo;
|
||||||
use gtk4 as gtk;
|
|
||||||
use gtk4::CssProvider;
|
|
||||||
use gtk4::StyleContext;
|
|
||||||
use gtk::Application;
|
|
||||||
use gtk::gio;
|
use gtk::gio;
|
||||||
use gtk::glib;
|
use gtk::glib;
|
||||||
use gtk::prelude::*;
|
use gtk::prelude::*;
|
||||||
|
use gtk::Application;
|
||||||
|
use gtk4 as gtk;
|
||||||
|
use gtk4::CssProvider;
|
||||||
|
use gtk4::StyleContext;
|
||||||
use once_cell::sync::OnceCell;
|
use once_cell::sync::OnceCell;
|
||||||
use postage::mpsc::Sender;
|
use postage::mpsc::Sender;
|
||||||
use postage::prelude::*;
|
use postage::prelude::*;
|
||||||
|
|
@ -132,7 +132,7 @@ fn main() {
|
||||||
match event {
|
match event {
|
||||||
Event::Activate(e) => {
|
Event::Activate(e) => {
|
||||||
let _activate_window = zbus_conn
|
let _activate_window = zbus_conn
|
||||||
.call_method(Some(DEST), PATH, Some(DEST), "WindowFocus", &((e, )))
|
.call_method(Some(DEST), PATH, Some(DEST), "WindowFocus", &((e,)))
|
||||||
.await
|
.await
|
||||||
.expect("Failed to focus selected window");
|
.expect("Failed to focus selected window");
|
||||||
}
|
}
|
||||||
|
|
@ -226,16 +226,16 @@ fn main() {
|
||||||
// skip if equal
|
// skip if equal
|
||||||
if cached_results.len() == results.len()
|
if cached_results.len() == results.len()
|
||||||
&& results.iter().zip(cached_results.iter()).fold(
|
&& results.iter().zip(cached_results.iter()).fold(
|
||||||
0,
|
0,
|
||||||
|acc, z: (&Item, &Item)| {
|
|acc, z: (&Item, &Item)| {
|
||||||
let (a, b) = z;
|
let (a, b) = z;
|
||||||
if a.name == b.name {
|
if a.name == b.name {
|
||||||
acc + 1
|
acc + 1
|
||||||
} else {
|
} else {
|
||||||
acc
|
acc
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
) == cached_results.len()
|
) == cached_results.len()
|
||||||
{
|
{
|
||||||
continue; // skip this update
|
continue; // skip this update
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,10 @@
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
|
|
||||||
use glib::SignalHandlerId;
|
|
||||||
use glib::subclass::InitializingObject;
|
use glib::subclass::InitializingObject;
|
||||||
|
use glib::SignalHandlerId;
|
||||||
|
use gtk::prelude::*;
|
||||||
|
use gtk::subclass::prelude::*;
|
||||||
use gtk::{gio, glib};
|
use gtk::{gio, glib};
|
||||||
use gtk::{CompositeTemplate, ListView};
|
use gtk::{CompositeTemplate, ListView};
|
||||||
use gtk4 as gtk;
|
use gtk4 as gtk;
|
||||||
|
|
@ -11,8 +13,6 @@ use gtk4::DragSource;
|
||||||
use gtk4::DropTarget;
|
use gtk4::DropTarget;
|
||||||
use gtk4::EventControllerMotion;
|
use gtk4::EventControllerMotion;
|
||||||
use gtk4::Revealer;
|
use gtk4::Revealer;
|
||||||
use gtk::prelude::*;
|
|
||||||
use gtk::subclass::prelude::*;
|
|
||||||
use once_cell::sync::OnceCell;
|
use once_cell::sync::OnceCell;
|
||||||
|
|
||||||
// Object holding the state
|
// Object holding the state
|
||||||
|
|
|
||||||
|
|
@ -11,16 +11,16 @@ use gio::Icon;
|
||||||
// use crate::application_row::ApplicationRow;
|
// use crate::application_row::ApplicationRow;
|
||||||
use glib::Object;
|
use glib::Object;
|
||||||
use glib::Type;
|
use glib::Type;
|
||||||
|
use gtk::prelude::*;
|
||||||
|
use gtk::subclass::prelude::*;
|
||||||
use gtk::{gio, glib};
|
use gtk::{gio, glib};
|
||||||
use gtk::{Application, SignalListItemFactory};
|
use gtk::{Application, SignalListItemFactory};
|
||||||
use gtk4 as gtk;
|
use gtk4 as gtk;
|
||||||
|
use gtk4::prelude::ListModelExt;
|
||||||
use gtk4::DragSource;
|
use gtk4::DragSource;
|
||||||
use gtk4::DropTarget;
|
use gtk4::DropTarget;
|
||||||
use gtk4::EventControllerMotion;
|
use gtk4::EventControllerMotion;
|
||||||
use gtk4::IconTheme;
|
use gtk4::IconTheme;
|
||||||
use gtk4::prelude::ListModelExt;
|
|
||||||
use gtk::prelude::*;
|
|
||||||
use gtk::subclass::prelude::*;
|
|
||||||
use postage::prelude::Sink;
|
use postage::prelude::Sink;
|
||||||
use x11rb::connection::Connection;
|
use x11rb::connection::Connection;
|
||||||
use x11rb::protocol::xproto;
|
use x11rb::protocol::xproto;
|
||||||
|
|
@ -32,9 +32,9 @@ use crate::BoxedWindowList;
|
||||||
// use crate::ApplicationObject;
|
// use crate::ApplicationObject;
|
||||||
use crate::dock_item::DockItem;
|
use crate::dock_item::DockItem;
|
||||||
use crate::dock_object::DockObject;
|
use crate::dock_object::DockObject;
|
||||||
|
use crate::utils::data_path;
|
||||||
use crate::Event;
|
use crate::Event;
|
||||||
use crate::TX;
|
use crate::TX;
|
||||||
use crate::utils::data_path;
|
|
||||||
use crate::X11_CONN;
|
use crate::X11_CONN;
|
||||||
|
|
||||||
mod imp;
|
mod imp;
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
use gdk4::Display;
|
use gdk4::Display;
|
||||||
use gio::DesktopAppInfo;
|
use gio::DesktopAppInfo;
|
||||||
use gtk4 as gtk;
|
|
||||||
use gtk4::CssProvider;
|
|
||||||
use gtk4::StyleContext;
|
|
||||||
use gtk::Application;
|
|
||||||
use gtk::gio;
|
use gtk::gio;
|
||||||
use gtk::glib;
|
use gtk::glib;
|
||||||
use gtk::prelude::*;
|
use gtk::prelude::*;
|
||||||
|
use gtk::Application;
|
||||||
|
use gtk4 as gtk;
|
||||||
|
use gtk4::CssProvider;
|
||||||
|
use gtk4::StyleContext;
|
||||||
use once_cell::sync::OnceCell;
|
use once_cell::sync::OnceCell;
|
||||||
use pop_launcher_service::IpcClient;
|
use pop_launcher_service::IpcClient;
|
||||||
use postage::mpsc::Sender;
|
use postage::mpsc::Sender;
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
use gtk4 as gtk;
|
|
||||||
use gtk::CompositeTemplate;
|
|
||||||
use gtk::glib;
|
use gtk::glib;
|
||||||
use gtk::prelude::*;
|
use gtk::prelude::*;
|
||||||
use gtk::subclass::prelude::*;
|
use gtk::subclass::prelude::*;
|
||||||
|
use gtk::CompositeTemplate;
|
||||||
|
use gtk4 as gtk;
|
||||||
|
|
||||||
#[derive(Debug, Default, CompositeTemplate)]
|
#[derive(Debug, Default, CompositeTemplate)]
|
||||||
#[template(file = "application_row.ui")]
|
#[template(file = "application_row.ui")]
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
use gtk4 as gtk;
|
|
||||||
use gtk::glib;
|
use gtk::glib;
|
||||||
use gtk::prelude::*;
|
use gtk::prelude::*;
|
||||||
use gtk::subclass::prelude::*;
|
use gtk::subclass::prelude::*;
|
||||||
|
use gtk4 as gtk;
|
||||||
|
|
||||||
use crate::BoxedSearchResult;
|
|
||||||
use crate::icon_source;
|
use crate::icon_source;
|
||||||
|
use crate::BoxedSearchResult;
|
||||||
use crate::SearchResultObject;
|
use crate::SearchResultObject;
|
||||||
|
|
||||||
mod imp;
|
mod imp;
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
use glib::subclass::InitializingObject;
|
use glib::subclass::InitializingObject;
|
||||||
|
use gtk::prelude::*;
|
||||||
|
use gtk::subclass::prelude::*;
|
||||||
use gtk::{gio, glib};
|
use gtk::{gio, glib};
|
||||||
use gtk::{CompositeTemplate, Entry, ListView};
|
use gtk::{CompositeTemplate, Entry, ListView};
|
||||||
use gtk4 as gtk;
|
use gtk4 as gtk;
|
||||||
use gtk::prelude::*;
|
|
||||||
use gtk::subclass::prelude::*;
|
|
||||||
use once_cell::sync::OnceCell;
|
use once_cell::sync::OnceCell;
|
||||||
|
|
||||||
// Object holding the state
|
// Object holding the state
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,11 @@ use gdk4::Rectangle;
|
||||||
use gdk4_x11::X11Display;
|
use gdk4_x11::X11Display;
|
||||||
use gdk4_x11::X11Surface;
|
use gdk4_x11::X11Surface;
|
||||||
use glib::Object;
|
use glib::Object;
|
||||||
|
use gtk::prelude::*;
|
||||||
|
use gtk::subclass::prelude::*;
|
||||||
use gtk::{gio, glib};
|
use gtk::{gio, glib};
|
||||||
use gtk::{Application, SignalListItemFactory};
|
use gtk::{Application, SignalListItemFactory};
|
||||||
use gtk4 as gtk;
|
use gtk4 as gtk;
|
||||||
use gtk::prelude::*;
|
|
||||||
use gtk::subclass::prelude::*;
|
|
||||||
use postage::prelude::Sink;
|
use postage::prelude::Sink;
|
||||||
use x11rb::connection::Connection;
|
use x11rb::connection::Connection;
|
||||||
use x11rb::protocol::xproto;
|
use x11rb::protocol::xproto;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue