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

refactor: use rework configs

Browse source
This commit is contained in:
Ashley Wulber 2022-07-06 12:07:26 -04:00
parent 74f6c2eca6
commit 1d8fe85775
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
22 changed files with 212 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

2
applets/cosmic-app-list/Cargo.toml
View file

@ -5,7 +5,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
cosmic-panel-config = { git = "https://github.com/pop-os/cosmic-panel/", features = ["gtk4"] }
cosmic-panel-config = {git = "https://github.com/pop-os/cosmic-panel", features = ["gtk4"], branch = "rework_0.30"}
cascade = "1.0.0"
gtk4 = { git = "https://github.com/gtk-rs/gtk4-rs", features = ["v4_4"] }
gio = { git = "https://github.com/gtk-rs/gtk-rs-core" }

3
applets/cosmic-app-list/src/apps_container/mod.rs
View file

@ -5,8 +5,7 @@ use crate::dock_list::DockList;
use crate::dock_list::DockListType;
use crate::utils::Event;
use cascade::cascade;
use cosmic_panel_config::config::PanelAnchor;
use cosmic_panel_config::config::CosmicPanelConfig;
use cosmic_panel_config::{PanelAnchor, CosmicPanelConfig};
use gtk4::prelude::*;
use gtk4::subclass::prelude::*;
use gtk4::Orientation;

2
applets/cosmic-app-list/src/dock_item/mod.rs
View file

@ -5,7 +5,7 @@ use crate::dock_popover::DockPopover;
use crate::utils::BoxedWindowList;
use crate::utils::Event;
use cascade::cascade;
use cosmic_panel_config::config::PanelAnchor;
use cosmic_panel_config::PanelAnchor;
use gtk4::glib;
use gtk4::prelude::*;
use gtk4::subclass::prelude::*;

2
applets/cosmic-app-list/src/dock_list/imp.rs
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: MPL-2.0-only
use cosmic_panel_config::config::{PanelAnchor, CosmicPanelConfig};
use cosmic_panel_config::{PanelAnchor, CosmicPanelConfig};
use glib::SignalHandlerId;
use gtk4::subclass::prelude::*;
use gtk4::{gio, glib};

2
applets/cosmic-app-list/src/dock_list/mod.rs
View file

@ -5,7 +5,6 @@ use crate::dock_object::DockObject;
use crate::utils::data_path;
use crate::utils::{BoxedWindowList, Event, Item};
use cascade::cascade;
use cosmic_panel_config::config::{CosmicPanelConfig, PanelAnchor};
use gio::DesktopAppInfo;
use gio::Icon;
use glib::Object;
@ -26,6 +25,7 @@ use gtk4::SignalListItemFactory;
use gtk4::{DragSource, GestureClick};
use std::fs::File;
use std::path::Path;
use cosmic_panel_config::{CosmicPanelConfig, PanelAnchor};
use tokio::sync::mpsc::Sender;
mod imp;

2
applets/cosmic-applet-graphics/Cargo.toml
View file

@ -11,4 +11,4 @@ once_cell = "1.9.0"
relm4-macros = { git = "https://github.com/Relm4/Relm4.git", branch = "next" }
tokio = { version = "1.16.1", features = ["full"] }
zbus = "2.1.1"
cosmic-panel-config = {git = "https://github.com/pop-os/cosmic-panel", features = ["gtk4"]}
cosmic-panel-config = {git = "https://github.com/pop-os/cosmic-panel", features = ["gtk4"], branch = "rework_0.30"}

2
applets/cosmic-applet-graphics/src/main.rs
View file

@ -20,7 +20,7 @@ use gtk4::{
};
use once_cell::sync::Lazy;
use tokio::runtime::Runtime;
use cosmic_panel_config::config::CosmicPanelConfig;
use cosmic_panel_config::CosmicPanelConfig;
static RT: Lazy<Runtime> = Lazy::new(|| Runtime::new().expect("failed to build tokio runtime"));

2
applets/cosmic-applet-network/Cargo.toml
View file

@ -15,4 +15,4 @@ slotmap = "1.0.6"
tokio = { version = "1.15.0", features = ["full"] }
zbus = "2.0.1"
libcosmic-widgets = { git = "https://github.com/pop-os/libcosmic", branch = "relm4-next" }
cosmic-panel-config = {git = "https://github.com/pop-os/cosmic-panel", features = ["gtk4"]}
cosmic-panel-config = {git = "https://github.com/pop-os/cosmic-panel", features = ["gtk4"], branch = "rework_0.30"}

2
applets/cosmic-applet-network/src/main.rs
View file

@ -7,7 +7,7 @@ pub mod task;
pub mod ui;
pub mod widgets;
use cosmic_panel_config::config::CosmicPanelConfig;
use cosmic_panel_config::CosmicPanelConfig;
use gtk4::{gio::ApplicationFlags, glib, prelude::*, Orientation, Separator};
use once_cell::sync::Lazy;
use tokio::runtime::Runtime;

2
applets/cosmic-applet-notifications/Cargo.toml
View file

@ -14,4 +14,4 @@ serde = "1"
zbus = "2.0.1"
zbus_names = "2"
zvariant = "3"
cosmic-panel-config = {git = "https://github.com/pop-os/cosmic-panel", features = ["gtk4"]}
cosmic-panel-config = {git = "https://github.com/pop-os/cosmic-panel", features = ["gtk4"], branch = "rework_0.30"}

2
applets/cosmic-applet-status-area/Cargo.toml
View file

@ -13,4 +13,4 @@ serde = "1"
zbus = "2.0.1"
zbus_names = "2"
zvariant = "3"
cosmic-panel-config = {git = "https://github.com/pop-os/cosmic-panel", features = ["gtk4"]}
cosmic-panel-config = {git = "https://github.com/pop-os/cosmic-panel", features = ["gtk4"], branch = "rework_0.30"}

2
applets/cosmic-applet-time/Cargo.toml
View file

@ -14,4 +14,4 @@ serde = "1"
zbus = "2.0.1"
zbus_names = "2"
zvariant = "3"
cosmic-panel-config = {git = "https://github.com/pop-os/cosmic-panel", features = ["gtk4"]}
cosmic-panel-config = {git = "https://github.com/pop-os/cosmic-panel", features = ["gtk4"], branch = "rework_0.30"}

8
applets/cosmic-applet-workspaces/Cargo.toml
View file

@ -7,7 +7,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
cosmic-panel-config = { git="https://github.com/pop-os/cosmic-panel/", features = ["gtk4"] }
cosmic-panel-config = {git = "https://github.com/pop-os/cosmic-panel", features = ["gtk4"], branch = "rework_0.30"}
cascade = "1.0.0"
gtk4 = { git = "https://github.com/gtk-rs/gtk4-rs", features = ["v4_4"] }
once_cell = "1.9.0"
@ -18,9 +18,9 @@ i18n-embed-fl = "0.6.4"
rust-embed = "6.3.0"
tokio = { version = "1.16.1", features = ["sync"] }
wayland-commons = "0.29.4"
wayland-scanner = { git = "https://github.com/smithay/wayland-rs.git", version = "0.30.0-beta.4"}
wayland-backend = { version = "0.1.0-beta.4", git = "https://github.com/smithay/wayland-rs.git" }
wayland-client = { version = "0.30.0-beta.4", git = "https://github.com/smithay/wayland-rs.git" }
wayland-backend = { version = "=0.1.0-beta.5" }
wayland-scanner = { version = "=0.30.0-beta.5" }
wayland-client = { version = "0.30.0-beta.5" }
calloop = "*"
nix = "*"
log = "0.4"

2
applets/cosmic-applet-workspaces/src/wayland.rs
View file

@ -3,7 +3,7 @@ use crate::{
wayland::generated::client::zext_workspace_manager_v1::ZextWorkspaceManagerV1,
wayland_source::WaylandSource,
};
use cosmic_panel_config::config::CosmicPanelConfig;
use cosmic_panel_config::CosmicPanelConfig;
use gtk4::glib;
use std::{
collections::HashMap, env, hash::Hash, mem, os::unix::net::UnixStream, path::PathBuf,

2
applets/cosmic-applet-workspaces/src/window/mod.rs
View file

@ -2,7 +2,7 @@
use crate::{fl, utils::Activate, wayland::State, workspace_list::WorkspaceList};
use cascade::cascade;
use cosmic_panel_config::config::CosmicPanelConfig;
use cosmic_panel_config::CosmicPanelConfig;
use gtk4::{
gio,
glib::{self, Object},

2
applets/cosmic-applet-workspaces/src/workspace_list/imp.rs
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: MPL-2.0-only
use cosmic_panel_config::config::CosmicPanelConfig;
use cosmic_panel_config::CosmicPanelConfig;
use gtk4::subclass::prelude::*;
use gtk4::{gio, glib, EventControllerScroll};
use gtk4::{Box, ListView};

2
applets/cosmic-applet-workspaces/src/workspace_list/mod.rs
View file

@ -7,7 +7,7 @@ use crate::workspace_button::WorkspaceButton;
use crate::workspace_object::WorkspaceObject;
use crate::TX;
use cascade::cascade;
use cosmic_panel_config::config::CosmicPanelConfig;
use cosmic_panel_config::CosmicPanelConfig;
use gtk4::builders::EventControllerScrollBuilder;
use gtk4::EventControllerScrollFlags;
use gtk4::Inhibit;

2
applets/cosmic-panel-button/Cargo.toml
View file

@ -5,7 +5,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
cosmic-panel-config = { git="https://github.com/pop-os/cosmic-panel/", features = ["gtk4"] }
cosmic-panel-config = {git = "https://github.com/pop-os/cosmic-panel", features = ["gtk4"], branch = "rework_0.30"}
cascade = "1.0.0"
gtk4 = { git = "https://github.com/gtk-rs/gtk4-rs", features = ["v4_4"] }
once_cell = "1.9.0"

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

@ -2,7 +2,7 @@
use crate::fl;
use cascade::cascade;
use cosmic_panel_config::config::CosmicPanelConfig;
use cosmic_panel_config::CosmicPanelConfig;
use gtk4::{
gio::{self, DesktopAppInfo, Icon},
glib::{self, Object},