Adding hyprland to available desktops and configs *i also fixed the logout button*

README.md

@@ -36,6 +36,7 @@
 - MATE
 - KDE Plasma
 - Deepin
+- Hyprland (logout no worky so do not make a issue)
 
 ### SaveDesktop can save:
 - your icons, fonts, and themes
@@ -134,7 +135,10 @@ NOTE: It can happen that a backup file will not be created, in that case, just a
   - ~/.config/deepin
   - ~/.local/share/deepin
   ```
-
+  - **Hyprland**
+  ```
+  - ~/.config/hypr
+  ```
 </details>
 
 ## Contributing

src/config.py

@@ -1,15 +1,13 @@
 import os, json, gi, argparse, shutil
 from gi.repository import GLib, Gio
-from localization import _, CACHE, DATA, home, system_dir, flatpak, snap, settings
-
-# add command-line arguments
+from localization import _, CACHE, DATA, system_dir, flatpak, snap, settings, home
+#add command-line arguments
 parser = argparse.ArgumentParser()
 parser.add_argument("-s", "--save", help="Save the current configuration", action="store_true")
 parser.add_argument("-i", "--import_", help="Import saved configuration", action="store_true")
-
 args = parser.parse_args()
 
-# check of the user's current DE
+#check of the user's current DE
 if os.getenv('XDG_CURRENT_DESKTOP') == 'GNOME':
     environment = 'GNOME'
 elif os.getenv('XDG_CURRENT_DESKTOP') == 'zorin:GNOME':
@@ -34,6 +32,8 @@
     environment = 'KDE Plasma'
 elif os.getenv('XDG_CURRENT_DESKTOP') == 'Deepin':
     environment = 'Deepin'
+elif os.getenv('XDG_CURRENT_DESKTOP') == 'Hyprland':
+    environment = 'Hyprland'
 else:
     from tty_environments import *
 
@@ -76,7 +76,7 @@ def __init__(self):
             if settings["save-flatpak-data"] == True:
                 print("saving user data of installed Flatpak apps")
                 self.save_flatpak_data()
-            
+
         print("saving desktop environment configuration files")
         # Save configs on individual desktop environments
         if environment == 'GNOME':
@@ -136,7 +136,9 @@ def __init__(self):
         elif environment == 'Deepin':
             os.system(f"cp -R {home}/.config/deepin ./")
             os.system(f"cp -R {home}/.local/share/deepin ./deepin-data")
-
+        elif environment == 'Hyprland':
+            shutil.copytree(f"{home}/.config/hypr","./hypr",dirs_exist_ok=True)
+
     # save Flatpak apps data
     def save_flatpak_data(self):
         blst = settings["disabled-flatpak-apps-data"]
@@ -248,6 +250,8 @@ def __init__(self):
         elif environment == 'Deepin':
             os.system(f"cp -au ./deepin {home}/.config/")
             os.system(f"cp -au ./deepin-data {home}/.local/share/deepin/")
+        elif environment == 'Hyprland':
+            os.system(f"cp -aur ./hypr {home}/.config/ -v")
         elif environment == None:
             print("→ SKIPPING: SaveDesktop is running in the TTY mode")
 

src/localization.py

@@ -46,6 +46,8 @@
 # Setting home as per the confinement
 home = snap_real_home if 'SNAP' in os.environ else snap_home
 
+# Setting Desktop variable
+desktopenv = os.getenv("XDG_CURRENT_DESKTOP")
 # Load GSettings database
 settings = Gio.Settings.new_with_path("io.github.vikdevelop.SaveDesktop", "/io/github/vikdevelop/SaveDesktop/")
 

src/main_window.py

@@ -6,17 +6,16 @@
 from pathlib import Path
 from threading import Thread
 from gi.repository import Gtk, Adw, Gio, GLib
-from localization import _, home, download_dir
+from localization import _, home, download_dir, desktopenv, flatpak
 from open_wiki import *
 from shortcuts_window import *
-
 # Application window
 class MainWindow(Adw.ApplicationWindow):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.set_title("SaveDesktop")
         self.application = kwargs.get('application')
-        
+
         # header bar and toolbarview
         self.headerbar = Adw.HeaderBar.new()
         self.toolbarview = Adw.ToolbarView.new()
@@ -31,7 +30,23 @@ def __init__(self, *args, **kwargs):
         # set the window size and maximization from the GSettings database
         (width, height) = settings["window-size"]
         self.set_default_size(width, height)
-
+
+        # Check the user's current desktop
+        desktop_map = {
+            'GNOME': 'GNOME',
+            'zorin:GNOME': 'GNOME',
+            'ubuntu:GNOME': 'GNOME',
+            'pop:GNOME': 'COSMIC (Old)',
+            'COSMIC': 'COSMIC (New)',
+            'Pantheon': 'Pantheon',
+            'X-Cinnamon': 'Cinnamon',
+            'Budgie:GNOME': 'Budgie',
+            'XFCE': 'Xfce',
+            'MATE': 'MATE',
+            'KDE': 'KDE Plasma',
+            'Deepin': 'Deepin',
+            'Hyprland': 'Hyprland'}
+
         # if value is TRUE, it enables window maximalization
         if settings["maximized"]:
             self.maximize()
@@ -104,33 +119,16 @@ def __init__(self, *args, **kwargs):
         self.toast = Adw.Toast.new(title='')
         self.toast.set_timeout(0)
 
-        # Check the user's current desktop
-        desktop_env = os.getenv('XDG_CURRENT_DESKTOP')
-        desktop_map = {
-            'GNOME': 'GNOME',
-            'zorin:GNOME': 'GNOME',
-            'ubuntu:GNOME': 'GNOME',
-            'pop:GNOME': 'COSMIC (Old)',
-            'COSMIC': 'COSMIC (New)',
-            'Pantheon': 'Pantheon',
-            'X-Cinnamon': 'Cinnamon',
-            'Budgie:GNOME': 'Budgie',
-            'XFCE': 'Xfce',
-            'MATE': 'MATE',
-            'KDE': 'KDE Plasma',
-            'Deepin': 'Deepin'
-        }
-
-        # If the user has a supported environment, it shows the app window, otherwise, it shows the window with information about an unsupported environment
+	# If the user has a supported environment, it shows the app window, otherwise, it shows the window with information about an unsupported environment
         def setup_environment(env_name):
             self.environment = env_name
             self.save_desktop()
             self.import_desktop()
             self.sync_desktop()
             self.connect("close-request", self.on_close)
 
-        if desktop_env in desktop_map:
-            setup_environment(desktop_map[desktop_env])
+        if desktopenv in desktop_map:
+            setup_environment(desktop_map[desktopenv])
         else:
             # Handle unsupported desktop environments
             self.toolbarview.add_top_bar(self.errHeaderbar)
@@ -1488,7 +1486,7 @@ def back_to_main(w):
         active_window = app.get_active_window()
         if active_window is None or not active_window.is_active():
             app.send_notification(None, self.notification_import)
-        
+
         # stop spinner animation
         self.importwaitSpinner.stop()
         self.importwaitBox.remove(self.importwaitButton)
@@ -1567,7 +1565,8 @@ def __init__(self, **kwargs):
         self.create_action('m_sync_with_key', self.sync_pc, ["<primary>s"] if settings["manually-sync"] else None)
         self.create_action('quit', self.app_quit, ["<primary>q"])
         self.create_action('shortcuts', self.shortcuts, ["<primary>question"])
-        self.create_action('logout', self.logout)
+        if not (flatpak and self.win.environment('Hyprland')):
+             self.create_action('logout', self.logout)
         self.create_action('open_dir', self.open_dir)
         self.connect('activate', self.on_activate)
 
@@ -1612,6 +1611,8 @@ def logout(self, action, param):
                 os.system("dbus-send --print-reply --session --dest=org.kde.LogoutPrompt /LogoutPrompt org.kde.LogoutPrompt.promptLogout")
             elif self.win.environment == 'COSMIC (New)':
                 os.system("dbus-send --print-reply --session --dest=com.system76.CosmicSession --type=method_call /com/system76/CosmicSession com.system76.CosmicSession.Exit")
+            elif (not flatpak) and self.win.environment == 'Hyprland':
+                os.system("hyprctl dispatch exit")
             else:
                 os.system("gdbus call --session --dest org.gnome.SessionManager --object-path /org/gnome/SessionManager --method org.gnome.SessionManager.Logout 1")