diff --git a/Cargo.lock b/Cargo.lock index aa92478..c975da6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -736,7 +736,7 @@ dependencies = [ [[package]] name = "folder_icon" -version = "2024.10.1" +version = "2024.10.2" dependencies = [ "ashpd", "async-channel", diff --git a/Cargo.toml b/Cargo.toml index 3b0eb08..341819c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "folder_icon" -version = "2024.10.1" +version = "2024.10.2" edition = "2021" [dependencies] diff --git a/meson.build b/meson.build index e795519..89cf9e6 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('folder_icon', 'rust', - version: '2024.10.1', + version: '2024.10.2', meson_version: '>= 0.62.0', default_options: [ 'warning_level=2', 'werror=false', ], ) diff --git a/src/config.rs b/src/config.rs index 6bcb137..7acc411 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,8 +1,8 @@ -pub static APP_ID: &str = "nl.emphisia.icon"; -pub static VERSION: &str = "2024.10.1"; +pub static APP_ID: &str = "nl.emphisia.icon.Devel"; +pub static VERSION: &str = "2024.10.2-cdde776"; pub static GETTEXT_PACKAGE: &str = "folder_icon"; pub static LOCALEDIR: &str = "/app/share/locale"; pub static PKGDATADIR: &str = "/app/share/folder_icon"; -pub static PROFILE: &str = ""; -pub static APP_ICON: &str = "nl.emphisia.icon"; +pub static PROFILE: &str = "Devel"; +pub static APP_ICON: &str = "nl.emphisia.icon.Devel"; diff --git a/src/window.rs b/src/window.rs index 8040309..d830b39 100644 --- a/src/window.rs +++ b/src/window.rs @@ -802,7 +802,7 @@ impl GtkTestWindow { pub fn drag_and_drop_information_dialog(&self) { let imp = self.imp(); if imp.settings.boolean("drag-and-drop-popup-shown") { - () + return (); } const RESPONSE_OK: &str = "OK"; let dialog = adw::AlertDialog::builder() diff --git a/src/windows/file_handling.rs b/src/windows/file_handling.rs index c582068..13df975 100644 --- a/src/windows/file_handling.rs +++ b/src/windows/file_handling.rs @@ -28,16 +28,17 @@ impl GtkTestWindow { win.reset_colors(); } } + info!("Loading path: {:?}", &path); win.load_folder_icon(&path.into_os_string().into_string().unwrap()); } )); } pub async fn load_built_in_bottom_icon(&self) -> PathBuf { - let style_manager = adw::StyleManager::default(); - let current_accent_color = self.get_accent_color_and_dialog(); - let folder_color_name = match current_accent_color.as_str() { - "None" => format!("{:?}", style_manager.accent_color()), + let imp = self.imp(); + let current_set_accent_color = imp.settings.string("selected-accent-color"); + let folder_color_name = match current_set_accent_color.as_str() { + "None" => self.get_accent_color_and_dialog(), x => x.to_string(), }; let folder_path = PathBuf::from(format!(