gtk3ui and macos fixes #273

Lord-Kamina · 2019-12-22T16:11:51Z

This fixes some standing issues with accelerators on macOS, as well as makes it easier to produce a working app bundle using macports (I made my changes in a new script and bundle-file, in case people prefer jhbuild still; it shouldn't be too hard to mimic what I did for macports to be used with jhbuild)

Of note, it appears in the future it would be desirable to drop GtkosxApplication altogether and use Gtk.Application instead but I'm not sure I am familiar enough with either python nor GTK3 to make those changes myself.

P.S. You can take my .app for a spin here: https://www.dropbox.com/s/zy0y4u41bvp6huk/Deluge.app.zip?dl=1

instead of hardcoded accelerators. This also fixes accelerator remapping for macOS in Deluge 2.x Also, use a better syntax for Gdk and Gtk imports. Nothing is gained from importing individual functions or classes (this is even explicitly discouraged for C/C++ programs) and it makes code harder to read.

Set the environment up properly and dump settings under ~/Library instead of ~/.config; while trying to import them from the previous location. This is more idiomatic for mac and also in theory could allow Deluge 1.3.15 and 2.0.x to coexist.

Also, fix a missing comma.

Boelensman1 · 2020-06-26T16:53:39Z

Heey Lord-Kamina thanks for your work, hope the deluge team finds some time to look at this soon.

I'm using the .app you provided atm and was wondering if you could also upload the newer build with the deluge-bin fix.

Lord-Kamina · 2020-06-27T06:39:26Z

Heey Lord-Kamina thanks for your work, hope the deluge team finds some time to look at this soon.

I'm using the .app you provided atm and was wondering if you could also upload the newer build with the deluge-bin fix.

Will get to it sometime this weekend.

The new build I upload will support handling of magnets (only on macOS 10.13+ though)

This is dependent on a patch to gtk-mac-integration/GTKOSXApplication (MR already sent upstream)

Lord-Kamina · 2020-07-01T03:56:31Z

@Boelensman1 sorry, I got absorbed doing other shit on the weekend. Here you go,

https://www.dropbox.com/s/c51t7y5kh7za2kl/Deluge.app.7z?dl=1

Note, if you're on macOS 10.13+, this should open magnets natively, without relying on the Magnet Handler app. (That functionality cannot be replicated for now though because it depends on an as-yet unmerged PR over at the gtk-mac-integration repo)

Boelensman1 · 2020-07-03T09:01:25Z

Thanks so much @Lord-Kamina! It works brilliantly

rnsc · 2021-09-22T21:44:22Z

@Lord-Kamina thank you for the updated code, quick question, how can I build it myself on my computer? Is there a documentation I can refer to?

Lord-Kamina · 2021-09-23T11:59:26Z

If you're using macports, you should install all dependencies and then run the make-macports-app.sh (actual name might be slightly different) and then just wait.

rnsc · 2021-09-23T13:27:35Z

@Lord-Kamina thanks, FYI, it doesn't build on Big Sur, some library lookup failing during the setup.py.
More info here: https://www.reddit.com/r/MacOSBeta/comments/hfknpa/is_corefoundation_missing_for_everyone_on_big_sur/

Commenting line 88 and 89 of MacOGraph.py resolves the above issue

#if not os.path.exists(pathname):
  #  raise ValueError("%r does not exist" % (pathname,))

Lord-Kamina · 2022-01-10T12:56:30Z

I've recently updated to Big Sur myself. I haven't tried building it (I have to rebuild dependencies and my dev environment probably) but it's still running at least.

Will take a crack at rebasing master and seeing what the issue is with the build.

cas--

@Lord-Kamina I did cherry-pick some changes and left comments on a few other items

cas-- · 2022-01-10T12:58:42Z

setup.py

@@ -534,14 +534,15 @@ def run(self):
 ]
 _package_data['deluge.ui.gtk3'] = ['glade/*.ui']

-setup_requires = ['setuptools', 'wheel']
+setup_requires = ['setuptools', 'wheel', 'py2app']


py2app should not be requirement as that is macos specific

cas-- · 2022-01-10T13:04:12Z

setup.py

 install_requires = [
    'twisted[tls]>=17.1',
    # Add pyasn1 for setuptools workaround:
    #   https://github.com/pypa/setuptools/issues/1510
    'pyasn1',
    'rencode',
    'pyopenssl',
+    'pygobject',


This is not a requirement for minimal running since this does not apply to deluged.

This does raise the question that do potentially other ui-specific requirements need scrutiny e.g. mako

It could however be included under extra_requires if needed

I'm not terribly familiar with python setuptools. What would be the preferred way to have this "just work®", adding it under extra_requires as you say? I worked on this quite a long time ago, but if I added this it's most likely because I got an error without it along the way.

Yes, mako is included into install_requires but is WebUI-specific only.

cas-- · 2022-01-10T13:06:32Z

deluge/ui/gtk3/glade/main_window.ui

                        <signal name="activate" handler="on_menuitem_preferences_activate" swapped="no"/>
-                        <accelerator key="P" signal="activate" modifiers="GDK_CONTROL_MASK"/>


I would prefer if these accelerator keys were not removed from the glade files and instead we found an alternative way to do this.

I don't think it's possible to implement portable shortcuts without removing them from the glade files.

endercypher · 2023-09-30T18:37:07Z

Hey, know this is an old issue. Is there a possibility of the app being updated to work on macOS Sonoma? There seems to be an issue with the python executable & the python path not being set after updating. Thanks in advance

matthieuki · 2023-10-04T07:49:04Z

Hi @Lord-Kamina, Do you think is it possible to do an update for Sonoma ? Thank you 😊

endercypher · 2023-10-04T16:08:57Z

Hi @Lord-Kamina, Do you think is it possible to do an update for Sonoma ? Thank you 😊

id compile it myself but I'm running into this issue.

Traceback (most recent call last):
File "/Users/Ender/Documents/Deluge-builds/delugenew/setup.py", line 564, in
setup(
File "/opt/homebrew/lib/python3.11/site-packages/setuptools/init.py", line 107, in setup
return distutils.core.setup(**attrs)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/opt/homebrew/lib/python3.11/site-packages/setuptools/_distutils/core.py", line 185, in setup
return run_commands(dist)
^^^^^^^^^^^^^^^^^^
File "/opt/homebrew/lib/python3.11/site-packages/setuptools/_distutils/core.py", line 201, in run_commands
dist.run_commands()
File "/opt/homebrew/lib/python3.11/site-packages/setuptools/_distutils/dist.py", line 969, in run_commands
self.run_command(cmd)
File "/opt/homebrew/lib/python3.11/site-packages/setuptools/dist.py", line 1233, in run_command
super().run_command(command)
File "/opt/homebrew/lib/python3.11/site-packages/setuptools/_distutils/dist.py", line 988, in run_command
cmd_obj.run()
File "/opt/homebrew/lib/python3.11/site-packages/py2app/build_app.py", line 984, in run
self._run()
File "/opt/homebrew/lib/python3.11/site-packages/py2app/build_app.py", line 1214, in _run
self.run_normal()
File "/opt/homebrew/lib/python3.11/site-packages/py2app/build_app.py", line 1327, in run_normal
self.create_binaries(py_files, pkgdirs, extensions, loader_files)
File "/opt/homebrew/lib/python3.11/site-packages/py2app/build_app.py", line 1774, in create_binaries
mm.mm.run_file(fmwk)
File "/opt/homebrew/lib/python3.11/site-packages/macholib/MachOGraph.py", line 89, in run_file
raise ValueError("%r does not exist" % (pathname,))
ValueError: '/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation' does not exist

Lord-Kamina added 7 commits December 22, 2019 13:07

i18n: fix libintl soname

01a248f

gtk3ui: Close New Torrent dialog on Escape.

24aae8d

gtk3ui/macOS: fix GtkosxApplication import

db608ce

gtk3ui/macOS: Some fixes for a smoother app bundle

f014daa

macOS launcher: Several fixes

8f18fae

Set the environment up properly and dump settings under ~/Library instead of ~/.config; while trying to import them from the previous location. This is more idiomatic for mac and also in theory could allow Deluge 1.3.15 and 2.0.x to coexist.

Packaging: Try to produce an app from macports.

f436852

Lord-Kamina force-pushed the macos-app branch from cad454e to d25717c Compare April 15, 2020 02:30

Lord-Kamina added 3 commits May 20, 2020 01:27

macOS launcher: remove debug stuff, better theme.

9ffce02

Fix Deluge-bin showing as queued torrent on launch

e23fd13

Fix setuptools > 45 hidden-import

37adbe5

Also, fix a missing comma.

Lord-Kamina force-pushed the macos-app branch from d25717c to 84dfc36 Compare May 21, 2020 14:56

Lord-Kamina added 2 commits June 30, 2020 23:43

Handle magnet URLs in macOS

93f4d15

This is dependent on a patch to gtk-mac-integration/GTKOSXApplication (MR already sent upstream)

Use a better theme.

d061814

Lord-Kamina force-pushed the macos-app branch from 84dfc36 to d061814 Compare July 1, 2020 03:46

Merge branch 'develop' into macos-app

2f8c179

cas-- mentioned this pull request Jan 9, 2022

Update Mac Packaging #335

Closed

cas-- reviewed Jan 10, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

gtk3ui and macos fixes #273

gtk3ui and macos fixes #273

Lord-Kamina commented Dec 22, 2019

Boelensman1 commented Jun 26, 2020

Lord-Kamina commented Jun 27, 2020 •

edited

Lord-Kamina commented Jul 1, 2020 •

edited

Boelensman1 commented Jul 3, 2020

rnsc commented Sep 22, 2021

Lord-Kamina commented Sep 23, 2021

rnsc commented Sep 23, 2021 •

edited

Lord-Kamina commented Jan 10, 2022

cas-- left a comment

cas-- Jan 10, 2022

cas-- Jan 10, 2022

Lord-Kamina Mar 18, 2022

kuraga Jul 29, 2022

cas-- Jan 10, 2022

Lord-Kamina Mar 18, 2022

endercypher commented Sep 30, 2023

matthieuki commented Oct 4, 2023

endercypher commented Oct 4, 2023

		<signal name="activate" handler="on_menuitem_preferences_activate" swapped="no"/>
		<accelerator key="P" signal="activate" modifiers="GDK_CONTROL_MASK"/>

gtk3ui and macos fixes #273

Are you sure you want to change the base?

gtk3ui and macos fixes #273

Conversation

Lord-Kamina commented Dec 22, 2019

Boelensman1 commented Jun 26, 2020

Lord-Kamina commented Jun 27, 2020 • edited

Lord-Kamina commented Jul 1, 2020 • edited

Boelensman1 commented Jul 3, 2020

rnsc commented Sep 22, 2021

Lord-Kamina commented Sep 23, 2021

rnsc commented Sep 23, 2021 • edited

Lord-Kamina commented Jan 10, 2022

cas-- left a comment

Choose a reason for hiding this comment

cas-- Jan 10, 2022

Choose a reason for hiding this comment

cas-- Jan 10, 2022

Choose a reason for hiding this comment

Lord-Kamina Mar 18, 2022

Choose a reason for hiding this comment

kuraga Jul 29, 2022

Choose a reason for hiding this comment

cas-- Jan 10, 2022

Choose a reason for hiding this comment

Lord-Kamina Mar 18, 2022

Choose a reason for hiding this comment

endercypher commented Sep 30, 2023

matthieuki commented Oct 4, 2023

endercypher commented Oct 4, 2023

Lord-Kamina commented Jun 27, 2020 •

edited

Lord-Kamina commented Jul 1, 2020 •

edited

rnsc commented Sep 23, 2021 •

edited