Skip to content

Master gtk3 - #1164

Merged
rene-dev merged 182 commits into
masterfrom
master-gtk3
Jul 31, 2021
Merged

rene-dev merged 182 commits into
masterfrom
master-gtk3

Conversation

@rene-dev

@rene-dev rene-dev commented May 23, 2021 •

Copy link
Copy Markdown
Member

supersedes #943

This branch does the following:

port gladevcp,touchy and gmoccapy to Gtk3
Not compatible with python2 or gtk2 anymore.
change default python to python3
fix dependencies and packaging for gtk3 and python3 on focal, mint20 and buster
anything older than focal/buster doesn't fully work due to bugs in Gtk, and incompatibility of older glade with python3.
Currently mostly working:

Gmoccapy
Touchy
I'm keeping track of bugs/TODOs using the gtk3 label:
https://github.com/LinuxCNC/linuxcnc/issues?q=is%3Aissue+is%3Aopen+label%3Agtk3

I'm encouraging everybody to test this, and report any bugs.

rene-dev and others added 30 commits May 23, 2021 00:51
As the things being warned about appear to be put of our control.

Signed-off-by: andypugh <andy@bodgesoc.org>
Signed-off-by: andypugh <andy@bodgesoc.org>
Remove them

Signed-off-by: andypugh <andy@bodgesoc.org>
Signed-off-by: andypugh <andy@bodgesoc.org>
Signed-off-by: andypugh <andy@bodgesoc.org>
Signed-off-by: Norbert Schechner <nieson@web.de>
Signed-off-by: Norbert Schechner <nieson@web.de>
- iconview
- gmoccapy
- notification

Signed-off-by: Norbert Schechner <nieson@web.de>
@ghost

ghost commented Jun 8, 2021

Copy link
Copy Markdown

It was intended that after the changover to python3/Gtk3 that the PlasmaC config would be removed and users would move to QtPlasmaC. This has also been notified on the forum. Would it be best if I did that work on this branch or should I wait until it has been merged into master.

@gmoccapy

gmoccapy commented Jun 8, 2021

Copy link
Copy Markdown
Collaborator

IMHO you should do the changes on this branch, as after merging it to master, we will for sure brake some user configs, so also the plasma stuff will cause then unconvinience, but at the same time.

Norbert

@andypugh

andypugh commented Jun 8, 2021

Copy link
Copy Markdown
Collaborator

Is it as simple as changing DISPLAY = in the INI?

If it is, then an extra increment could be added to the update_ini script to swap the interface.
If there are further changes added, then those could be put in too if they are regex-able.

@ghost

ghost commented Jun 8, 2021 •

Copy link
Copy Markdown

Is it as simple as changing DISPLAY = in the INI?

No, there are more changes necessary:

If it is, then an extra increment could be added to the update_ini script to swap the interface.
If there are further changes added, then those could be put in too if they are regex-able.

There is an included python script that can do the job:

@rene-dev

rene-dev commented Jun 8, 2021

Copy link
Copy Markdown
Member Author

If PlasmaC doesnt work with python3, is unmaintained, and there is already a replacement it should be removed in this branch.
Currently I see good progress, Norbert and I decided to merge this end of July. Are there any objections?
I already talked to the qtpycvp developers, and they cant wait for this to get merged.

@andypugh

andypugh commented Jun 8, 2021

Copy link
Copy Markdown
Collaborator

There is an included python script that can do the job:

Putting that same script in the update_ini script will run automatically and only once, if set up as a new INI file version.
Which might be prepared.

@ghost

ghost commented Jun 9, 2021

Copy link
Copy Markdown

There is an included python script that can do the job:

Putting that same script in the update_ini script will run automatically and only once, if set up as a new INI file version.
Which might be prepared.

Thanks, I will have a look to see if we can utilize this method.

@ghost

ghost commented Jun 17, 2021

Copy link
Copy Markdown

Putting that same script in the update_ini script will run automatically and only once, if set up as a new INI file version.
Which might be prepared.

I totally confused myself trying to add it into the existing update_ini script. I did manage to get a working setup by adding a stanza into /scripts/linuxcnc.in after the check for V1.1 but I am not sure if it is appropriate to have it in this file.

linuxcnc.in stanza

@andypugh

Copy link
Copy Markdown
Collaborator

I did manage to get a working setup by adding a stanza into /scripts/linuxcnc.in after the check for V1.1 but I am not sure if it is appropriate to have it in this file.

I have no problem with it being there, if it works. But does the user see the message if they start LinuxCNC from the GUI menu or a desktop shortcut?

@ghost

ghost commented Jun 17, 2021

Copy link
Copy Markdown

I have no problem with it being there, if it works. But does the user see the message if they start LinuxCNC from the GUI menu or a desktop shortcut?

The messge is probably unnecessary, the migration GUI will appear and the user can either continue with the migration or cancel.

@andypugh

Copy link
Copy Markdown
Collaborator

Sounds good to me.

@rene-dev
rene-dev marked this pull request as ready for review July 31, 2021 22:08
@rene-dev
rene-dev merged commit a2f1fdd into master Jul 31, 2021
@ghost

ghost commented Aug 1, 2021

Copy link
Copy Markdown

@rene-dev thanks for your work on this.

@c-morley

c-morley commented Aug 1, 2021

Copy link
Copy Markdown
Collaborator

This has broken qtvcp on gtk2 systems.
I don't remember a warning about this.
That's super annoying.
And we should probably discuss merge strategies from 2.8 to 2.9

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants