leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge workspaces_dev

Browse source
This commit is contained in:
Ashley Wulber 2022-07-05 10:31:40 -04:00
commit 74f6c2eca6
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
22 changed files with 1275 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

10
applets/cosmic-panel-button/src/apps_window/mod.rs
View file

@ -34,7 +34,9 @@ impl CosmicPanelAppButtonWindow {
..add_css_class("root_window");
};
if let Some(apps_desktop_info) = DesktopAppInfo::new(&format!("{}.desktop", app_desktop_file_name)) {
if let Some(apps_desktop_info) =
DesktopAppInfo::new(&format!("{}.desktop", app_desktop_file_name))
{
let app_button = cascade! {
Button::new();
..add_css_class("apps");
@ -54,16 +56,16 @@ impl CosmicPanelAppButtonWindow {
container.append(&image);
app_button.set_child(Some(&container));
dbg!(apps_desktop_info.string("Exec").unwrap().as_str());
let app_id = app_desktop_file_name.to_string();
app_button.connect_clicked(move |_| {
let _ = Command::new("xdg-shell-wrapper")
.env_remove("WAYLAND_SOCKET")
.arg(apps_desktop_info.string("Exec").unwrap().as_str())
.arg(&app_id)
.spawn();
});
self_.set_child(Some(&app_button));
} else {
panic!("Requested application is not installed");
panic!("{} is not installed", app_desktop_file_name);
}
self_

9
applets/cosmic-panel-button/src/main.rs
View file

@ -44,7 +44,14 @@ fn main() {
localize();
gio::resources_register_include!("compiled.gresource").unwrap();
let app = gtk4::Application::new(None, ApplicationFlags::default());
app.add_main_option("id", glib::Char::from(b'i'), glib::OptionFlags::NONE, glib::OptionArg::String, "id of the launched application", None);
app.add_main_option(
"id",
glib::Char::from(b'i'),
glib::OptionFlags::NONE,
glib::OptionArg::String,
"id of the launched application",
None,
);
app.connect_handle_local_options(|_app, args| {
if let Ok(Some(id)) = args.lookup::<String>("id") {
ID.set(id).unwrap();