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

pyclicker · 2024-10-27T19:24:15Z

Pull request

Description

Please provide a brief description of the changes made in this pull request. Include any relevant context or background information.

Related Issue

If this pull request addresses an issue, please link to it here. For example:

Closes #(issue number)
Fixes #(issue number)

Changes Made

Added new feature: Describe the feature.
Fixed bug: Describe the bug and how it was fixed.
Updated documentation: Describe what was updated.
Other: Describe any other changes made.

Screenshots (if applicable)

If your changes include visual modifications, please include screenshots to demonstrate the changes.

Testing

Select the installation methods on which you tested your changes:

Flatpak
Snap
Native version from this repository

Checklist

I have read the contributing guidelines.
I have performed a self-review of my code.
I have commented my code where necessary.
I have updated the documentation accordingly.
My changes do not introduce any new warnings.

Additional Notes

vikdevelop · 2024-10-27T19:43:24Z

src/config.py

+#    for package in available_packages:
+#        if package in str(name):
+#            packages.append(pathto(package))
+


Since these lines are commented out, remove them.

sure i will

vikdevelop · 2024-10-27T19:43:38Z

Hello, thank you very much for creating this PR. However, I am not satisfied with a number of things:

You want to add (probably accidentally) the .flatpak-builder directory to the repository, but it contains unnecessary files that were created while building the application with Flatpak Builder. So remove this directory.
For some reason, your PR is removing the contents of the native/install_native.sh file, which makes it impossible to install SaveDesktop in the desired directories in the home folder, and thus to install it. So revert its content.
I deal with other changes in separate files.

vikdevelop · 2024-10-27T19:45:40Z

src/config.py

+elif os.getenv('XDG_CURRENT_DESKTOP') == 'Hyprland':
+    environment = 'Hyprland'
+#else:
+#    from tty_environments import *


The tty_environments.py file is used to detect DE if SaveDesktop is running in TTY mode (i.e. pure CLI without graphical environment or tile WM)

i do not know why i deleted that ......

vikdevelop · 2024-10-27T19:48:03Z

src/main_window.py

@@ -1612,6 +1614,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 self.win.environment == 'Hyprland':
+                os.system("hyprctl dispatch exit")


Unfortunately, the hyprctl command doesn't work in Flatpak, so you probably need to use dbus to log out the system, or use other options.

oh thanks for the feedback i will do that one later because i do not know how to kill hyprland or logout hyprland with a systemcall

commented out and wrote "needs to be fixed but i do not know how to make this call on flatpak via python"

vikdevelop · 2024-10-27T20:02:05Z

src/config.py

-
-# add command-line arguments
+from localization import _, CACHE, DATA, system_dir, flatpak, snap, settings
+home = os.getenv('HOME')


The home variable is defined in the src/localization.py file, so it is not necessary to use a new, same variable in this file. This is because Snap requires a custom home directory definition.

i will remove that line thanks for the feedback on that one i did not know the localization.py did that

vikdevelop · 2024-10-27T20:25:06Z

src/config.py

-        elif environment == None:
+        elif environment == 'Hyprland':
+            os.system(f"cp -aur ./hypr {home}/.config/ -v")
+	elif environment == None:


Suggested change

elif environment == None:

elif environment == None:

This row is not aligned correctly, which generates a TabError.

src/config.py

yeah it is i used it then didnt use it to debug and later forgot about it. Co-authored-by: vikdevelop <vikdevelop@proton.me>

…thingy

…less line that runs everytime the logout button is pressed

vikdevelop · 2024-10-28T08:12:26Z

src/main_window.py

            else:
+                print(f'{self.win.environment} is not found in our database it would be of great value if you would leave a issue on our github page: https://github.com/vikdevelop/SaveDesktop')


Suggested change

print(f'{self.win.environment} is not found in our database it would be of great value if you would leave a issue on our github page: https://github.com/vikdevelop/SaveDesktop')

Since most DEs except KDE, Cosmic (Rust version) and Xfce use org.gnome.SessionManager, there is no need to add this message here.

okay i will remove it in my next commit

vikdevelop · 2024-10-28T08:24:08Z

src/main_window.py

@@ -1612,7 +1613,11 @@ 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 self.win.environment == 'Hyprland':
+                os.system("hyprctl dispatch exit") #does logout without prompting the user because i couldn't find a good way to do it


Suggested change

os.system("hyprctl dispatch exit") #does logout without prompting the user because i couldn't find a good way to do it

os.system("hyprctl dispatch exit") if not flatpak else os.system(f'notify-send "{_["err_occured"]}" "It is not possible to log out of the system in the Flatpak environment. Please log out manually."')

Unfortunately I also don't know what D-Bus interface to use for Hyprland, so I've set it up so that if the application is running outside of Flatpak, the command is executed, if it's not, a notification is sent that you need to log out manually.

i found a way to bypass the dbus and just kill the process but will need to test if it works it is with psutil os and signal

what i get is this {1: 'bwrap', 2: 'savedesktop'} is there a way to not sandbox the processes and find them via the program?

unfortunately i can not kill or send a dbus req to hyprland since it doesn't expose a port/bus so i think ill just look into how to remove that button when the wm is not found

Instead of importing the psutil and signal modules, you can use this command, which should hopefully work on all DEs (I tried it on GNOME, and it works):

dbus-send --system --print-reply --dest=org.freedesktop.login1 /org/freedesktop/login1 'org.freedesktop.login1.Manager.TerminateSession' string:$(dbus-send --system --print-reply --dest=org.freedesktop.login1 /org/freedesktop/login1 'org.freedesktop.login1.Manager.ListSessions' | awk -F 'string "' '/string "/ {print $2; exit}' | awk -F '"' '{print $1}')

however, it is necessary to add permissions to the Flatpak manifest in the finish-args section: --system-talk-name=org.freedesktop.login1.

…unsupported DE/WM

pyclicker · 2024-10-28T10:16:43Z

everything you mentioned is done

vikdevelop · 2024-10-28T10:55:16Z

everything you mentioned is done

After all, I suggested using the command given here: #336 (comment), which is a universal command that should work everywhere. So there's no reason to make it difficult to disable the Log Out button, just enable the --system-talk-name=org.freedesktop.login1 permission in the manifest. It's also possible to enable it in the Flatseal app.

pyclicker · 2024-10-28T11:02:29Z

everything you mentioned is done

After all, I suggested using the command given here: #336 (comment), which is a universal command that should work everywhere. So there's no reason to make it difficult to disable the Log Out button, just enable the --system-talk-name=org.freedesktop.login1 permission in the manifest. It's also possible to enable it in the Flatseal app.

unfortunately that does not work for me in a plain shell and it returns
method return time=1730113271.934049 sender=:1.15 -> destination=:1.1505 serial=3341 reply_serial=2

…g so i figured that it works but doesnt close hyprland and only closes the portal or smh

src/main_window.py

vikdevelop · 2024-10-28T11:14:24Z

src/main_window.py

@@ -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


Suggested change

# Check the user's current desktop

# Check the user's current desktop

desktopenv = os.getenv('XDG_CURRENT_DESKTOP')

vikdevelop · 2024-10-28T11:15:02Z

src/main_window.py

 gi.require_version('Gtk', '4.0')
 gi.require_version('Adw', '1')
 from datetime import date
 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


Suggested change

from localization import _, home, download_dir, desktopenv

from localization import _, home, download_dir

src/main_window.py

sure thanks for the suggestion Co-authored-by: vikdevelop <vikdevelop@proton.me>

Co-authored-by: vikdevelop <vikdevelop@proton.me>

vikdevelop · 2024-10-28T15:09:31Z

Thank you for your contribution! However, I have another branch called release_3.5 that contains significant changes, so I can't merge this PR into the main branch because then I wouldn't be able to merge the release_3.5 branch. Instead, I'll copy your changes manually into the release_3.5 branch and close this PR.

The changes you have contributed will be included in the stable version 3.5, but that will be released a bit later. In the meantime, you can participate in the beta testing, where the next beta version will be released in a few days, which will already include your changes.

... and improve the sentence about unsupported option to log out of the Hyprland WM This and two previous commits are related to the #336 PR

pyclicker and others added 12 commits October 26, 2024 09:30

Update config.py added hyprland start

4084f59

Update config.py

3e9865b

Update config.py

a3b174a

second commit

2945011

final commit?

3856bae

final?

24511a2

last bugfix (fixed variable name)

3675dd6

still not stable and bugfixing

a725806

changed the os command to shutil.copytree

c93eb37

FINAL COMMIT FOR HYPRLAND UPDATE

b48bd09

Merge branch 'vikdevelop:main' into master

2ae7d59

Update README.md

4b8f020

vikdevelop reviewed Oct 27, 2024

View reviewed changes

deleted ".flatpak-builder" folder

3b30e77

vikdevelop reviewed Oct 27, 2024

View reviewed changes

removed commented out lines

f5b8860

vikdevelop reviewed Oct 27, 2024

View reviewed changes

src/config.py Outdated Show resolved Hide resolved

pyclicker and others added 9 commits October 28, 2024 08:30

Update src/config.py

147cc36

yeah it is i used it then didnt use it to debug and later forgot about it. Co-authored-by: vikdevelop <vikdevelop@proton.me>

i do not know what i changed but it changed

c053578

resolved the tab error

5ac2477

removed the lambda function for the config folder

3cb3c9a

Merge remote-tracking branch 'refs/remotes/origin/master'

caf50a8

i think install_native.sh will work now

efeb82d

readded src/config.py

12377fc

edits to src/config.py mainly removing a usely comment reindenting a …

480c171

…thingy

removed home = os.getenv('HOME')

f5af0c7

Tygo added 3 commits October 28, 2024 08:58

i forgot i removed the home import so i readded it

cdfc16d

plugged the github to issue a request for a feature and removed a use…

acc313e

…less line that runs everytime the logout button is pressed

uncommented a line and rewrote a comment because it was very informal

b475151

vikdevelop reviewed Oct 28, 2024

View reviewed changes

Tygo added 5 commits October 28, 2024 09:39

added psutil

a235dc6

fix for hyprctl dispatch exit?

1c7048d

removed the plug

4bcd124

not working but it can read processes although not the host processes

f40b173

did not remove the logout button but made it not pressable when on a …

40832aa

…unsupported DE/WM

Tygo added 2 commits October 28, 2024 11:45

removed the psutil dependency

673dbdc

added a comment about hyprland

4460041

removed a few useless lines

e084d80

pyclicker requested a review from vikdevelop October 28, 2024 11:06

Tygo added 2 commits October 28, 2024 12:08

i am unsure if the added line does anything but my obs stopped workin…

307d410

…g so i figured that it works but doesnt close hyprland and only closes the portal or smh

thought it was stable but forgot to remove dep

7fdf1ef

vikdevelop reviewed Oct 28, 2024

View reviewed changes

src/main_window.py Outdated Show resolved Hide resolved

vikdevelop reviewed Oct 28, 2024

View reviewed changes

src/main_window.py Outdated Show resolved Hide resolved

pyclicker and others added 3 commits October 28, 2024 11:16

Update src/main_window.py

37c5018

sure thanks for the suggestion Co-authored-by: vikdevelop <vikdevelop@proton.me>

Update src/main_window.py

5417792

Co-authored-by: vikdevelop <vikdevelop@proton.me>

logic to check if flatpak is active when running hyprland

ce8c4f4

pyclicker requested a review from vikdevelop October 28, 2024 14:01

vikdevelop closed this Oct 28, 2024

vikdevelop added a commit that referenced this pull request Oct 28, 2024

Add Hyprland to available DEs (thanks to @pyclicker)

16966e3

... and improve the sentence about unsupported option to log out of the Hyprland WM This and two previous commits are related to the #336 PR

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

pyclicker commented Oct 27, 2024 •

edited

Loading

vikdevelop Oct 27, 2024

pyclicker Oct 27, 2024

vikdevelop commented Oct 27, 2024

vikdevelop Oct 27, 2024

pyclicker Oct 27, 2024

pyclicker Oct 28, 2024

vikdevelop Oct 27, 2024

pyclicker Oct 27, 2024

pyclicker Oct 28, 2024

vikdevelop Oct 27, 2024

pyclicker Oct 27, 2024

pyclicker Oct 28, 2024

vikdevelop Oct 27, 2024 •

edited

Loading

pyclicker Oct 28, 2024

vikdevelop Oct 28, 2024

pyclicker Oct 28, 2024

pyclicker Oct 28, 2024

vikdevelop Oct 28, 2024

pyclicker Oct 28, 2024

pyclicker Oct 28, 2024

pyclicker Oct 28, 2024 •

edited

Loading

vikdevelop Oct 28, 2024

pyclicker commented Oct 28, 2024

vikdevelop commented Oct 28, 2024

pyclicker commented Oct 28, 2024

vikdevelop Oct 28, 2024

vikdevelop Oct 28, 2024

vikdevelop commented Oct 28, 2024

		else:
		print(f'{self.win.environment} is not found in our database it would be of great value if you would leave a issue on our github page: https://github.com/vikdevelop/SaveDesktop')

	os.system("hyprctl dispatch exit") #does logout without prompting the user because i couldn't find a good way to do it
	os.system("hyprctl dispatch exit") if not flatpak else os.system(f'notify-send "{_["err_occured"]}" "It is not possible to log out of the system in the Flatpak environment. Please log out manually."')

	# Check the user's current desktop
	# Check the user's current desktop
	desktopenv = os.getenv('XDG_CURRENT_DESKTOP')

	from localization import _, home, download_dir, desktopenv
	from localization import _, home, download_dir

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

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

Conversation

pyclicker commented Oct 27, 2024 • edited Loading

Pull request

Description

Related Issue

Changes Made

Screenshots (if applicable)

Testing

Checklist

Additional Notes

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vikdevelop commented Oct 27, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vikdevelop Oct 27, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pyclicker Oct 28, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pyclicker commented Oct 28, 2024

vikdevelop commented Oct 28, 2024

pyclicker commented Oct 28, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vikdevelop commented Oct 28, 2024

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

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

pyclicker commented Oct 27, 2024 •

edited

Loading

vikdevelop Oct 27, 2024 •

edited

Loading

pyclicker Oct 28, 2024 •

edited

Loading