lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

properties_view: Use GtkFileLauncher for opening directory

Browse source 
GtkFileLauncher handles opening the containing folder for
us, using the portal when appropriate
This commit is contained in:
Christopher Davis 2023-01-15 18:42:41 -05:00
parent 0c86d0d202
commit 9d7dae408b
1 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/widgets/properties_view.rs
View file

@ -26,8 +26,6 @@ use glib::clone;
use gtk::CompositeTemplate; use gtk::CompositeTemplate;
use anyhow::Context; use anyhow::Context;
use ashpd::desktop::open_uri;
use ashpd::WindowIdentifier;
use futures::future::{AbortHandle, Abortable}; use futures::future::{AbortHandle, Abortable};
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use std::cell::RefCell; use std::cell::RefCell;
@ -67,9 +65,13 @@ mod imp {
Self::bind_template(klass); Self::bind_template(klass);
Self::Type::bind_template_callbacks(klass); Self::Type::bind_template_callbacks(klass);
klass.install_action("properties.open-folder", None, move |properties, _, _| { klass.install_action_async(
properties.open_directory(); "properties.open-folder",
}); None,
|properties, _, _| async move {
let _ = properties.open_directory().await;
},
);
klass.install_action("properties.open-location", None, move |properties, _, _| { klass.install_action("properties.open-location", None, move |properties, _, _| {
properties.open_location(); properties.open_location();
@ -339,19 +341,14 @@ impl LpPropertiesView {
self.notify("dimensions"); self.notify("dimensions");
} }
fn open_directory(&self) { async fn open_directory(&self) -> anyhow::Result<()> {
if let Some(directory) = self let launcher = gtk::FileLauncher::new(self.file().as_ref());
.file() let win = self.native().and_downcast::<gtk::Window>();
.and_then(|f| f.peek_path()) if let Err(e) = launcher.open_containing_folder_future(win.as_ref()).await {
.and_then(|p| std::fs::File::open(p).ok())
{
spawn!(clone!(@weak self as view => async move {
let id = WindowIdentifier::from_native(&view.native().expect("No GtkNative for view")).await;
if let Err(e) = open_uri::OpenDirectoryRequest::default().identifier(id).build(&directory).await {
log::error!("Could not open parent directory: {e}"); log::error!("Could not open parent directory: {e}");
}; };
}));
} Ok(())
} }
/// Open GPS location in apps like Maps via `geo:` URI /// Open GPS location in apps like Maps via `geo:` URI