Skip to content

Commit

Permalink
Use mime_app from libcosmic
Browse files Browse the repository at this point in the history
  • Loading branch information
jpttrssn committed Nov 26, 2024
1 parent 62d26c6 commit 2725707
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 363 deletions.
80 changes: 20 additions & 60 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,9 @@ filetime = { git = "https://github.com/jackpot51/filetime" }
# [patch.'https://github.com/pop-os/cosmic-text']
# cosmic-text = { path = "../cosmic-text" }

# [patch.'https://github.com/pop-os/libcosmic']
[patch.'https://github.com/pop-os/libcosmic']
# libcosmic = { path = "../libcosmic" }
libcosmic = { git = "https://github.com/jpttrssn/libcosmic", branch = "launch-app-in-term"}
# cosmic-config = { path = "../libcosmic/cosmic-config" }
# cosmic-theme = { path = "../libcosmic/cosmic-theme" }

Expand Down
6 changes: 4 additions & 2 deletions src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use cosmic::{
Alignment, Event, Length, Size, Subscription,
},
iced_runtime::clipboard,
style, theme,
mime_app, style, theme,
widget::{
self,
dnd_destination::DragId,
Expand Down Expand Up @@ -61,7 +61,7 @@ use crate::{
fl, home_dir,
key_bind::key_binds,
localize::LANGUAGE_SORTER,
menu, mime_app, mime_icon,
menu, mime_icon,
mounter::{MounterAuth, MounterItem, MounterItems, MounterKey, MounterMessage, MOUNTERS},
operation::{Controller, Operation, OperationSelection, ReplaceResult},
spawn_detached::spawn_detached,
Expand Down Expand Up @@ -1476,6 +1476,8 @@ impl Application for App {
tab_drag_id: DragId::new(),
};

mime_app::reload(Some(&LANGUAGE_SORTER));

let mut commands = vec![app.update_config()];

for location in flags.locations {
Expand Down
1 change: 0 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ pub mod dialog;
mod key_bind;
mod localize;
mod menu;
mod mime_app;
pub mod mime_icon;
mod mounter;
mod mouse_area;
Expand Down
Loading

0 comments on commit 2725707

Please sign in to comment.