Skip to content

Commit

Permalink
Merge pull request #206 from pop-os/hybridgpu_jammy
Browse files Browse the repository at this point in the history
Add multi gpu applet support (app-list/battery)
  • Loading branch information
Drakulix authored Feb 6, 2024
2 parents 19eb20b + 4b253ad commit c71420c
Show file tree
Hide file tree
Showing 17 changed files with 1,184 additions and 418 deletions.
137 changes: 110 additions & 27 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = fa
"applet-token",
"tokio",
"wayland",
"process",
"desktop",
"dbus-config"
] }
zbus = { version = "3.14", default-features = false, features = ["tokio"] }
Expand Down
5 changes: 2 additions & 3 deletions cosmic-app-list/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ edition = "2021"
cctk.workspace = true
cosmic-protocols.workspace = true
libcosmic.workspace = true
zbus.workspace = true
# libcosmic = { path = "../../libcosmic", default-features = false, features = ["wayland", "tokio", "applet"] }
ron = "0.8"
futures = "0.3"
Expand All @@ -18,17 +19,15 @@ tracing-subscriber.workspace = true
tracing-log.workspace = true
tracing.workspace = true
nix = "0.26"
shlex = "1.3.0"
anyhow = "1.0"
serde = { version = "1.0", features = ["derive"] }
log = "0.4"
tokio = { version = "1.17.0", features = ["sync", "rt", "rt-multi-thread", "macros", "process"] }
itertools = "*"
freedesktop-desktop-entry = "0.5.0"
freedesktop-icons = "0.2.4"
i18n-embed = { version = "0.13", features = ["fluent-system", "desktop-requester"] }
i18n-embed-fl = "0.6"
rust-embed = "6.3"
url = "2.3.1"
rust-embed-utils = "7.5.0"
rand = "0.8.5"
switcheroo-control = { git = "https://github.com/pop-os/dbus-settings-bindings" }
5 changes: 4 additions & 1 deletion cosmic-app-list/i18n/de/cosmic_app_list.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@ favorite = Favorisieren
unfavorite = Entfavorisieren
quit = Beenden
quit-all = Alle beenden
new-window = Neues Fenster
new-window = Neues Fenster
run = Ausführen
run-on = Ausführen auf {$gpu}
run-on-default = (Standard)
5 changes: 4 additions & 1 deletion cosmic-app-list/i18n/en/cosmic_app_list.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@ favorite = Favorite
unfavorite = Un-Favorite
quit = Quit
quit-all = Quit All
new-window = New Window
new-window = New Window
run = Run
run-on = Run on {$gpu}
run-on-default = (Default)
Loading

0 comments on commit c71420c

Please sign in to comment.