Merge pull request #25 from youpie/dev

v2024.10.2 fix

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "folder_icon"
-version = "2024.10.1"
+version = "2024.10.2"
 edition = "2021"
 
 [dependencies]

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', ],
 )

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";
 

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()

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!(