Gmoccapy: Move offsetpage buttons to table frame, add toggle button for calculator use#3690
Conversation
11d5f44 to
6d77f68
Compare
|
I am fine with this. Very handy :) |
|
And you have been a bit too quick. Now with Gmoccapy 3.5.1 in master, you have some conflicts to solve :/. |
|
|
Now I'm confused. With which branch are you getting that error? |
|
Seems I have rebased it on gmoccapy-3-5-2 which wasn't my intention. I'll have to sync my repo and fix this tomorrow. |
Your branch, Sigma1912:Gmoccapy_Add_buttons_to_offsetpage_frame
That's correct, I have targeted your branch to that. But it's the same as master right now. The glade file should only contain this change: |
|
Yes, that is the only change to the glade file. Looks like I made a mistake there while resolving the conflict. |
e17a4e9 to
73fc220
Compare
…or calculator use - calculator_use state (on/off) can be changed in tooltable and offsetpage but applies to both those tables - calculator_use state is retained in the preferences file (initial state is OFF)
73fc220 to
a3fe384
Compare
|
Should be fixed now. |
|
Got Norbert's Ok :) |
|
I am sure, this has to be reopened! That change need to be changed also in the documentation! Am I right, or are the changes in an other push? Norbert |
|
Thanks. |
I also thought about leaving the first button empty to keep the old positions. The screenshots in the documentation I usually update when I release the version.
Currently it's in a feature branch linuxcnc/gmoccapy-3-5-2 |
|
The bug I introduced is that the 'back' button (ie the last one) in the offsetpage is now connected to 'gmoccapy.h-button.button-8' instead of ..button-9.
So, should I only update the table entries for the halpin functions here? |
Yes, please |
|
see #3728 |





Resolves #3513