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

fix: use the correct version of app list config

Browse source
This commit is contained in:
Ashley Wulber 2024-01-18 21:19:18 -05:00 • committed by Ashley Wulber
parent d4e0dd8fb8
commit 94a3c35e22
3 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cosmic-app-list/src/app.rs
View file

@ -398,7 +398,7 @@ impl cosmic::Application for CosmicAppList {
core: cosmic::app::Core, core: cosmic::app::Core,
_flags: Self::Flags, _flags: Self::Flags,
) -> (Self, iced::Command<cosmic::app::Message<Self::Message>>) { ) -> (Self, iced::Command<cosmic::app::Message<Self::Message>>) {
let config = Config::new(APP_ID, 1) let config = Config::new(APP_ID, AppListConfig::VERSION)
.ok() .ok()
.and_then(|c| AppListConfig::get_entry(&c).ok()) .and_then(|c| AppListConfig::get_entry(&c).ok())
.unwrap_or_default(); .unwrap_or_default();
@ -485,14 +485,16 @@ impl cosmic::Application for CosmicAppList {
} }
self.config self.config
.add_favorite(id, &Config::new(APP_ID, 1).unwrap()); .add_favorite(id, &Config::new(APP_ID, AppListConfig::VERSION).unwrap());
if let Some((popup_id, _toplevel)) = self.popup.take() { if let Some((popup_id, _toplevel)) = self.popup.take() {
return destroy_popup(popup_id); return destroy_popup(popup_id);
} }
} }
Message::UnFavorite(id) => { Message::UnFavorite(id) => {
self.config self.config.remove_favorite(
.remove_favorite(id.clone(), &Config::new(APP_ID, 1).unwrap()); id.clone(),
&Config::new(APP_ID, AppListConfig::VERSION).unwrap(),
);
if let Some(i) = self if let Some(i) = self
.favorite_list .favorite_list
.iter() .iter()
@ -555,7 +557,7 @@ impl cosmic::Application for CosmicAppList {
let t = self.favorite_list.remove(pos); let t = self.favorite_list.remove(pos);
self.config.remove_favorite( self.config.remove_favorite(
t.desktop_info.id.clone(), t.desktop_info.id.clone(),
&Config::new(APP_ID, 1).unwrap(), &Config::new(APP_ID, AppListConfig::VERSION).unwrap(),
); );
Some((true, t)) Some((true, t))
} else { } else {
@ -706,7 +708,7 @@ impl cosmic::Application for CosmicAppList {
.iter() .iter()
.map(|dock_item| dock_item.desktop_info.id.clone()) .map(|dock_item| dock_item.desktop_info.id.clone())
.collect(), .collect(),
&Config::new(APP_ID, 1).unwrap(), &Config::new(APP_ID, AppListConfig::VERSION).unwrap(),
); );
} }
return finish_dnd(); return finish_dnd();

2
cosmic-app-list/src/config.rs
View file

@ -3,7 +3,6 @@ use cosmic::cosmic_config::{self, Config, CosmicConfigEntry};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::fmt::Debug; use std::fmt::Debug;
pub const APP_ID: &str = "com.system76.CosmicAppList"; pub const APP_ID: &str = "com.system76.CosmicAppList";
pub const VERSION: &str = "0.1.0";
#[derive(Debug, Clone, Deserialize, Serialize, Default, PartialEq, Eq)] #[derive(Debug, Clone, Deserialize, Serialize, Default, PartialEq, Eq)]
pub enum TopLevelFilter { pub enum TopLevelFilter {
@ -13,6 +12,7 @@ pub enum TopLevelFilter {
} }
#[derive(Debug, Clone, Default, Deserialize, Serialize, PartialEq, Eq, CosmicConfigEntry)] #[derive(Debug, Clone, Default, Deserialize, Serialize, PartialEq, Eq, CosmicConfigEntry)]
#[version = 1]
pub struct AppListConfig { pub struct AppListConfig {
pub filter_top_levels: Option<TopLevelFilter>, pub filter_top_levels: Option<TopLevelFilter>,
pub favorites: Vec<String>, pub favorites: Vec<String>,

5
cosmic-app-list/src/main.rs
View file

@ -10,14 +10,13 @@ use log::info;
use localize::localize; use localize::localize;
use crate::config::{APP_ID, VERSION}; pub const VERSION: &str = env!("CARGO_PKG_VERSION");
fn main() -> cosmic::iced::Result { fn main() -> cosmic::iced::Result {
// Initialize logger // Initialize logger
tracing_subscriber::fmt::init(); tracing_subscriber::fmt::init();
let _ = tracing_log::LogTracer::init(); let _ = tracing_log::LogTracer::init();
info!("Iced Workspaces Applet ({})", APP_ID); info!("Iced Workspaces Applet ({VERSION})");
info!("Version: {}", VERSION);
// Prepare i18n // Prepare i18n
localize(); localize();