refactor: use template for window
This commit is contained in:
parent
22f4384707
commit
fba59c5290
4 changed files with 150 additions and 322 deletions
|
|
@ -1,5 +1,8 @@
|
|||
mod imp;
|
||||
use crate::ApplicationObject;
|
||||
use crate::TX;
|
||||
use gtk4 as gtk;
|
||||
use postage::prelude::Sink;
|
||||
|
||||
use crate::application_row::ApplicationRow;
|
||||
use glib::Object;
|
||||
|
|
@ -17,51 +20,29 @@ glib::wrapper! {
|
|||
gtk::ConstraintTarget, gtk::Native, gtk::Root, gtk::ShortcutManager;
|
||||
}
|
||||
|
||||
const NUM_LAUNCHER_ITEMS: u8 = 9;
|
||||
|
||||
impl Window {
|
||||
pub fn new(app: &Application) -> Self {
|
||||
//quit shortcut
|
||||
app.set_accels_for_action("win.quit", &["<primary>W", "Escape"]);
|
||||
//launch shortcuts
|
||||
for i in 1..10 {
|
||||
app.set_accels_for_action(&format!("win.launch{}", i), &[&format!("<primary>{}", i)]);
|
||||
}
|
||||
Object::new(&[("application", app)]).expect("Failed to create `Window`.")
|
||||
let self_: Self = Object::new(&[("application", app)]).expect("Failed to create `Window`.");
|
||||
self_
|
||||
}
|
||||
|
||||
fn model(&self) -> &gio::ListStore {
|
||||
pub fn model(&self) -> &gio::ListStore {
|
||||
// Get state
|
||||
let imp = imp::Window::from_instance(self);
|
||||
imp.model.get().expect("Could not get model")
|
||||
}
|
||||
|
||||
fn setup_model(&self) {
|
||||
// Create new model
|
||||
let model = gio::ListStore::new(gio::AppInfo::static_type());
|
||||
gio::AppInfo::all().iter().for_each(|app_info| {
|
||||
model.append(app_info);
|
||||
});
|
||||
|
||||
// Get state and set model
|
||||
let imp = imp::Window::from_instance(self);
|
||||
imp.model.set(model.clone()).expect("Could not set model");
|
||||
let model = gio::ListStore::new(ApplicationObject::static_type());
|
||||
|
||||
// A sorter used to sort AppInfo in the model by their name
|
||||
let sorter = gtk::CustomSorter::new(move |obj1, obj2| {
|
||||
let app_info1 = obj1.downcast_ref::<gio::AppInfo>().unwrap();
|
||||
let app_info2 = obj2.downcast_ref::<gio::AppInfo>().unwrap();
|
||||
|
||||
app_info1
|
||||
.name()
|
||||
.to_lowercase()
|
||||
.cmp(&app_info2.name().to_lowercase())
|
||||
.into()
|
||||
});
|
||||
let filter = gtk::CustomFilter::new(|_obj| true);
|
||||
let filter_model = gtk::FilterListModel::new(Some(&model), Some(filter).as_ref());
|
||||
let sorted_model = gtk::SortListModel::new(Some(&filter_model), Some(&sorter));
|
||||
let slice_model = gtk::SliceListModel::new(Some(&sorted_model), 0, 9);
|
||||
let slice_model = gtk::SliceListModel::new(Some(&model), 0, NUM_LAUNCHER_ITEMS.into());
|
||||
let selection_model = gtk::SingleSelection::new(Some(&slice_model));
|
||||
|
||||
imp.model.set(model).expect("Could not set model");
|
||||
// Wrap model with selection and pass it to the list view
|
||||
imp.list_view.set_model(Some(&selection_model));
|
||||
}
|
||||
|
|
@ -71,118 +52,75 @@ impl Window {
|
|||
let imp = imp::Window::from_instance(self);
|
||||
let window = self.clone().upcast::<gtk::Window>();
|
||||
let list_view = &imp.list_view;
|
||||
let sorted_model = list_view
|
||||
.model()
|
||||
.expect("List view missing selection model")
|
||||
.downcast::<gtk::SingleSelection>()
|
||||
.expect("could not downcast listview model to single selection model")
|
||||
.model()
|
||||
.downcast::<gtk::SliceListModel>()
|
||||
.expect("could not downcast single selection model to slice list model.")
|
||||
.model()
|
||||
.expect("sorted list model is missing from slice list model")
|
||||
.downcast::<gtk::SortListModel>()
|
||||
.expect("sorted list model could not be downcast");
|
||||
let filter_model = sorted_model
|
||||
.model()
|
||||
.expect("missing model for sort list model.")
|
||||
.downcast::<gtk::FilterListModel>()
|
||||
.expect("could not downcast sort list model to filter list model");
|
||||
|
||||
let entry = &imp.entry;
|
||||
let lv = list_view.get();
|
||||
for i in 1..10 {
|
||||
let action_launchi = gio::SimpleAction::new(&format!("launch{}", i), None);
|
||||
self.add_action(&action_launchi);
|
||||
let context = list_view.display().app_launch_context().clone();
|
||||
let parent_window = list_view.root().unwrap().downcast::<gtk::Window>().unwrap();
|
||||
action_launchi.connect_activate(glib::clone!(@weak lv => move |_action, _parameter| {
|
||||
println!("acitvating... {}", i);
|
||||
let model = lv.model().unwrap();
|
||||
let app_info = model.item(i - 1);
|
||||
if app_info.is_none() {
|
||||
println!("oops no app for this row...");
|
||||
return;
|
||||
}
|
||||
let app_info = app_info.unwrap().downcast::<gio::AppInfo>().unwrap();
|
||||
if let Err(err) = app_info.launch(&[], Some(&context)) {
|
||||
if let Ok(id)= app_info.unwrap().property("id") {
|
||||
let id = id.get::<u32>().expect("App ID must be u32");
|
||||
|
||||
gtk::MessageDialog::builder()
|
||||
.text(&format!("Failed to start {}", app_info.name()))
|
||||
.secondary_text(&err.to_string())
|
||||
.message_type(gtk::MessageType::Error)
|
||||
.modal(true)
|
||||
.transient_for(&parent_window)
|
||||
.build()
|
||||
.show();
|
||||
|
||||
println!("oops launch failed")
|
||||
glib::MainContext::default().spawn_local(async move {
|
||||
if let Ok(tx) = TX.lock() {
|
||||
if let Some(tx) = &*tx {
|
||||
let _ = tx.clone().send(crate::Event::Activate(id)).await;
|
||||
}}
|
||||
});
|
||||
}
|
||||
println!("{}", i-1);
|
||||
}));
|
||||
}
|
||||
|
||||
// Launch the application when an item of the list is activated
|
||||
list_view.connect_activate(move |list_view, position| {
|
||||
list_view.connect_activate(move |list_view, i| {
|
||||
println!("acitvating... {}", i + 1);
|
||||
let model = list_view.model().unwrap();
|
||||
let app_info = model
|
||||
.item(position)
|
||||
.unwrap()
|
||||
.downcast::<gio::AppInfo>()
|
||||
.unwrap();
|
||||
let app_info = model.item(i);
|
||||
if app_info.is_none() {
|
||||
println!("oops no app for this row...");
|
||||
return;
|
||||
}
|
||||
if let Ok(id) = app_info.unwrap().property("id") {
|
||||
let id = id.get::<u32>().expect("App ID must be u32");
|
||||
|
||||
let context = list_view.display().app_launch_context();
|
||||
if let Err(err) = app_info.launch(&[], Some(&context)) {
|
||||
let parent_window = list_view.root().unwrap().downcast::<gtk::Window>().unwrap();
|
||||
|
||||
gtk::MessageDialog::builder()
|
||||
.text(&format!("Failed to start {}", app_info.name()))
|
||||
.secondary_text(&err.to_string())
|
||||
.message_type(gtk::MessageType::Error)
|
||||
.modal(true)
|
||||
.transient_for(&parent_window)
|
||||
.build()
|
||||
.show();
|
||||
glib::MainContext::default().spawn_local(async move {
|
||||
if let Ok(tx) = TX.lock() {
|
||||
if let Some(tx) = &*tx {
|
||||
let _ = tx.clone().send(crate::Event::Activate(id)).await;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
entry.connect_changed(
|
||||
glib::clone!(@weak filter_model, @weak sorted_model => move |search: >k::Entry| {
|
||||
let search_text = search.text().to_string().to_lowercase();
|
||||
let new_filter: gtk::CustomFilter = gtk::CustomFilter::new(move |obj| {
|
||||
let search_res = obj.downcast_ref::<gio::AppInfo>()
|
||||
.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 app_info1 = obj1.downcast_ref::<gio::AppInfo>().unwrap();
|
||||
let app_info2 = obj2.downcast_ref::<gio::AppInfo>().unwrap();
|
||||
if search_text == "" {
|
||||
return app_info1
|
||||
.name()
|
||||
.to_lowercase()
|
||||
.cmp(&app_info2.name().to_lowercase())
|
||||
.into();
|
||||
}
|
||||
entry.connect_changed(move |search: >k::Entry| {
|
||||
let search = search.text().to_string();
|
||||
|
||||
let i_1 = app_info1.name().to_lowercase().find(&search_text);
|
||||
let i_2 = app_info2.name().to_lowercase().find(&search_text);
|
||||
match (i_1, i_2) {
|
||||
(Some(i_1), Some(i_2)) => i_1.cmp(&i_2).into(),
|
||||
(Some(_), None) => std::cmp::Ordering::Less.into(),
|
||||
(None, Some(_)) => std::cmp::Ordering::Greater.into(),
|
||||
_ => app_info1
|
||||
.name()
|
||||
.to_lowercase()
|
||||
.cmp(&app_info2.name().to_lowercase())
|
||||
.into()
|
||||
glib::MainContext::default().spawn_local(async move {
|
||||
if let Ok(tx) = TX.lock() {
|
||||
if let Some(tx) = &*tx {
|
||||
let _ = tx.clone().send(crate::Event::Search(search)).await;
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
filter_model.set_filter(Some(new_filter).as_ref());
|
||||
sorted_model.set_sorter(Some(new_sorter).as_ref());
|
||||
}),
|
||||
);
|
||||
entry.connect_realize(move |search: >k::Entry| {
|
||||
let search = search.text().to_string();
|
||||
|
||||
glib::MainContext::default().spawn_local(async move {
|
||||
if let Ok(tx) = TX.lock() {
|
||||
if let Some(tx) = &*tx {
|
||||
let _ = tx.clone().send(crate::Event::Search(search)).await;
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
window.connect_realize(move |window| {
|
||||
if let Some((display, surface)) = x::get_window_x11(window) {
|
||||
|
|
@ -215,28 +153,26 @@ impl Window {
|
|||
|
||||
fn setup_factory(&self) {
|
||||
let factory = SignalListItemFactory::new();
|
||||
factory.connect_setup(move |_factory, item| {
|
||||
factory.connect_setup(move |_, list_item| {
|
||||
let row = ApplicationRow::new();
|
||||
item.set_child(Some(&row));
|
||||
list_item.set_child(Some(&row))
|
||||
});
|
||||
|
||||
// the bind stage is used for "binding" the data to the created widgets on the "setup" stage
|
||||
factory.connect_bind(move |_factory, list_item| {
|
||||
let app_info = list_item
|
||||
factory.connect_bind(move |_, list_item| {
|
||||
let application_object = list_item
|
||||
.item()
|
||||
.unwrap()
|
||||
.downcast::<gio::AppInfo>()
|
||||
.unwrap();
|
||||
|
||||
let child = list_item
|
||||
.expect("The item has to exist.")
|
||||
.downcast::<ApplicationObject>()
|
||||
.expect("The item has to be an `ApplicationObject`");
|
||||
let row = list_item
|
||||
.child()
|
||||
.unwrap()
|
||||
.expect("The list item child needs to exist.")
|
||||
.downcast::<ApplicationRow>()
|
||||
.unwrap();
|
||||
child.set_app_info(&app_info);
|
||||
.expect("The list item type needs to be `ApplicationRow`");
|
||||
if list_item.position() < 9 {
|
||||
child.set_shortcut(list_item.position() + 1);
|
||||
row.set_shortcut(list_item.position() + 1);
|
||||
}
|
||||
|
||||
row.set_app_info(application_object);
|
||||
});
|
||||
// Set the factory of the list view
|
||||
let imp = imp::Window::from_instance(self);
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
<property name="width-request">600</property>
|
||||
<property name="title">Gtk Pop Launcher</property>
|
||||
<property name="decorated">false</property>
|
||||
<property name="resizable">false</property>
|
||||
<child>
|
||||
<object class="GtkBox">
|
||||
<property name="orientation">vertical</property>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue