some app library styling tweaks
This commit is contained in:
parent
9d1f2c274b
commit
698b68ebb8
3 changed files with 60 additions and 39 deletions
|
|
@ -1 +1,9 @@
|
||||||
|
|
||||||
|
child:hover {
|
||||||
|
transition: 100ms;
|
||||||
|
background: #a6a6a6;
|
||||||
|
}
|
||||||
|
child {
|
||||||
|
border-radius: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -105,10 +105,16 @@ impl Window {
|
||||||
let group_filter_model =
|
let group_filter_model =
|
||||||
gtk::FilterListModel::new(Some(&search_filter_model), Some(filter).as_ref());
|
gtk::FilterListModel::new(Some(&search_filter_model), Some(filter).as_ref());
|
||||||
let sorted_model = gtk::SortListModel::new(Some(&group_filter_model), Some(&sorter));
|
let sorted_model = gtk::SortListModel::new(Some(&group_filter_model), Some(&sorter));
|
||||||
let selection_model = gtk::SingleSelection::new(Some(&sorted_model));
|
let selection_model = gtk::SingleSelection::builder()
|
||||||
|
.model(&sorted_model)
|
||||||
|
.autoselect(false)
|
||||||
|
.can_unselect(true)
|
||||||
|
.selected(gtk4::INVALID_LIST_POSITION)
|
||||||
|
.build();
|
||||||
|
|
||||||
// Wrap model with selection and pass it to the list view
|
// Wrap model with selection and pass it to the list view
|
||||||
imp.app_grid_view.set_model(Some(&selection_model));
|
imp.app_grid_view.set_model(Some(&selection_model));
|
||||||
|
selection_model.unselect_all();
|
||||||
|
|
||||||
let group_model = gio::ListStore::new(AppGroup::static_type());
|
let group_model = gio::ListStore::new(AppGroup::static_type());
|
||||||
imp.group_model
|
imp.group_model
|
||||||
|
|
@ -171,24 +177,30 @@ impl Window {
|
||||||
let window = self.clone().upcast::<gtk::Window>();
|
let window = self.clone().upcast::<gtk::Window>();
|
||||||
let app_grid_view = &imp.app_grid_view;
|
let app_grid_view = &imp.app_grid_view;
|
||||||
let group_grid_view = &imp.group_grid_view;
|
let group_grid_view = &imp.group_grid_view;
|
||||||
let sorted_model = app_grid_view
|
let app_selection_model = app_grid_view
|
||||||
.model()
|
.model()
|
||||||
.expect("List view missing selection model")
|
.expect("List view missing selection model")
|
||||||
.downcast::<gtk::SingleSelection>()
|
.downcast::<gtk::SingleSelection>()
|
||||||
.expect("could not downcast listview model to single selection model")
|
.expect("could not downcast listview model to single selection model");
|
||||||
|
let app_sorted_model = app_selection_model
|
||||||
.model()
|
.model()
|
||||||
.downcast::<gtk::SortListModel>()
|
.downcast::<gtk::SortListModel>()
|
||||||
.expect("sorted list model could not be downcast");
|
.expect("sorted list model could not be downcast");
|
||||||
let group_filter_model = sorted_model
|
let app_group_filter_model = app_sorted_model
|
||||||
.model()
|
.model()
|
||||||
.expect("missing model for sort list model.")
|
.expect("missing model for sort list model.")
|
||||||
.downcast::<gtk::FilterListModel>()
|
.downcast::<gtk::FilterListModel>()
|
||||||
.expect("could not downcast sort list model to filter list model");
|
.expect("could not downcast sort list model to filter list model");
|
||||||
let app_filter_model = group_filter_model
|
let app_filter_model = app_group_filter_model
|
||||||
.model()
|
.model()
|
||||||
.expect("missing model for sort list model.")
|
.expect("missing model for sort list model.")
|
||||||
.downcast::<gtk::FilterListModel>()
|
.downcast::<gtk::FilterListModel>()
|
||||||
.expect("could not downcast sort list model to filter list model");
|
.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::<gtk::SingleSelection>()
|
||||||
|
.expect("could not downcast listview model to single selection model");
|
||||||
|
|
||||||
let entry = &imp.entry;
|
let entry = &imp.entry;
|
||||||
let scroll_window = &imp.group_scroll_window.get();
|
let scroll_window = &imp.group_scroll_window.get();
|
||||||
|
|
@ -199,35 +211,34 @@ impl Window {
|
||||||
set_group_scroll_policy(&scroll_window, scroll_list_model.n_items());
|
set_group_scroll_policy(&scroll_window, scroll_list_model.n_items());
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
// Launch the application when an item of the list is activated
|
app_selection_model.connect_selected_notify(glib::clone!(@weak window => move |model| {
|
||||||
app_grid_view.connect_activate(move |grid_view, position| {
|
// on activation change the group filter model to use the app names, and category
|
||||||
let model = grid_view.model().unwrap();
|
let position = model.selected();
|
||||||
let app_info = model
|
println!("selected app {}", position);
|
||||||
.item(position)
|
// Launch the application when an item of the list is activated
|
||||||
.unwrap()
|
if let Some(item) = model.item(position) {
|
||||||
.downcast::<gio::DesktopAppInfo>()
|
let app_info = item.downcast::<gio::DesktopAppInfo>().unwrap();
|
||||||
.unwrap();
|
let context = window.display().app_launch_context();
|
||||||
|
if let Err(err) = app_info.launch(&[], Some(&context)) {
|
||||||
|
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(&window)
|
||||||
|
.build()
|
||||||
|
.show();
|
||||||
|
}
|
||||||
|
|
||||||
let context = grid_view.display().app_launch_context();
|
|
||||||
if let Err(err) = app_info.launch(&[], Some(&context)) {
|
|
||||||
let parent_window = grid_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();
|
|
||||||
}
|
}
|
||||||
});
|
}));
|
||||||
|
|
||||||
// on activation change the group filter model to use the app names, and category
|
group_selection_model.connect_selected_notify(glib::clone!(@weak app_filter_model, @weak window => move |group_selection_model| {
|
||||||
group_grid_view.connect_activate(glib::clone!(@weak app_filter_model, @weak window => move |grid_view, position| {
|
// on activation change the group filter model to use the app names, and category
|
||||||
println!("grid view activated.");
|
let position = group_selection_model.selected();
|
||||||
let group_model = grid_view.model().unwrap().downcast::<gtk::SingleSelection>()
|
println!("grid view activated. {}", position);
|
||||||
.expect("could not downcast app group view model to single selection model")
|
// group_grid_view.connect_activate(glib::clone!(@weak app_filter_model, @weak window => move |grid_view, position| {
|
||||||
|
let group_model = group_selection_model
|
||||||
.model()
|
.model()
|
||||||
.downcast::<gio::ListStore>()
|
.downcast::<gio::ListStore>()
|
||||||
.expect("could not downcast app group view selection model to list store model");
|
.expect("could not downcast app group view selection model to list store model");
|
||||||
|
|
@ -270,7 +281,7 @@ impl Window {
|
||||||
]);
|
]);
|
||||||
|
|
||||||
dialog.connect_response(
|
dialog.connect_response(
|
||||||
glib::clone!(@weak dialog_entry, @weak group_model => move |dialog, response_type| {
|
glib::clone!(@weak dialog_entry, @weak group_selection_model, @weak group_model => move |dialog, response_type| {
|
||||||
println!("dialog should be closing...");
|
println!("dialog should be closing...");
|
||||||
let name = dialog_entry.text().to_string();
|
let name = dialog_entry.text().to_string();
|
||||||
if response_type == gtk4::ResponseType::Apply && name != "" {
|
if response_type == gtk4::ResponseType::Apply && name != "" {
|
||||||
|
|
@ -283,6 +294,9 @@ impl Window {
|
||||||
category: "".to_string(),
|
category: "".to_string(),
|
||||||
});
|
});
|
||||||
group_model.insert(group_model.n_items() - 1, &new_app_group);
|
group_model.insert(group_model.n_items() - 1, &new_app_group);
|
||||||
|
group_selection_model.set_selected(position - 1);
|
||||||
|
} else {
|
||||||
|
group_selection_model.set_selected(0);
|
||||||
}
|
}
|
||||||
dialog.emit_close();
|
dialog.emit_close();
|
||||||
}),
|
}),
|
||||||
|
|
@ -305,8 +319,7 @@ impl Window {
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
// update the application filter
|
// update the application filter
|
||||||
let model = grid_view.model().unwrap();
|
let app_info = group_model
|
||||||
let app_info = model
|
|
||||||
.item(position)
|
.item(position)
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.downcast::<AppGroup>()
|
.downcast::<AppGroup>()
|
||||||
|
|
@ -337,11 +350,11 @@ impl Window {
|
||||||
None => false,
|
None => false,
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
group_filter_model.set_filter(Some(new_filter).as_ref());
|
app_group_filter_model.set_filter(Some(new_filter).as_ref());
|
||||||
}));
|
}));
|
||||||
|
|
||||||
entry.connect_changed(
|
entry.connect_changed(
|
||||||
glib::clone!(@weak app_filter_model, @weak sorted_model => move |search: >k::SearchEntry| {
|
glib::clone!(@weak app_filter_model, @weak app_sorted_model => move |search: >k::SearchEntry| {
|
||||||
let search_text = search.text().to_string().to_lowercase();
|
let search_text = search.text().to_string().to_lowercase();
|
||||||
let new_filter: gtk::CustomFilter = gtk::CustomFilter::new(move |obj| {
|
let new_filter: gtk::CustomFilter = gtk::CustomFilter::new(move |obj| {
|
||||||
let search_res = obj.downcast_ref::<gio::DesktopAppInfo>()
|
let search_res = obj.downcast_ref::<gio::DesktopAppInfo>()
|
||||||
|
|
@ -375,7 +388,7 @@ impl Window {
|
||||||
});
|
});
|
||||||
|
|
||||||
app_filter_model.set_filter(Some(new_filter).as_ref());
|
app_filter_model.set_filter(Some(new_filter).as_ref());
|
||||||
sorted_model.set_sorter(Some(new_sorter).as_ref());
|
app_sorted_model.set_sorter(Some(new_sorter).as_ref());
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@
|
||||||
<object class="GtkGridView" id="app_grid_view">
|
<object class="GtkGridView" id="app_grid_view">
|
||||||
<property name="min-columns">7</property>
|
<property name="min-columns">7</property>
|
||||||
<property name="max-columns">7</property>
|
<property name="max-columns">7</property>
|
||||||
<property name="single-click-activate">true</property>
|
<property name="single-click-activate">false</property>
|
||||||
<property name="enable-rubberband">false</property>
|
<property name="enable-rubberband">false</property>
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
|
|
@ -54,7 +54,7 @@
|
||||||
<object class="GtkGridView" id="group_grid_view">
|
<object class="GtkGridView" id="group_grid_view">
|
||||||
<property name="min-columns">8</property>
|
<property name="min-columns">8</property>
|
||||||
<property name="max-columns">8</property>
|
<property name="max-columns">8</property>
|
||||||
<property name="single-click-activate">true</property>
|
<property name="single-click-activate">false</property>
|
||||||
<property name="enable-rubberband">false</property>
|
<property name="enable-rubberband">false</property>
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue