Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-enabled "close window" option on modal dialogs #2690

Merged
merged 4 commits into from
Jan 2, 2024

Conversation

rozyczko
Copy link
Member

Description

Option WindowContextHelpButtonHint seems to have disabled the "close window" cross icon in PySide6.
The original reason for it was, as the name suggests, the removal of the question mark icon, which by default was set.

Fixes #2688

How Has This Been Tested?

GH Windows installer on Win10 and Win11.

Review Checklist (please remove items if they don't apply):

  • Code has been reviewed
  • Functionality has been tested
  • Windows installer (GH artifact) has been tested (installed and worked)
  • MacOSX installer (GH artifact) has been tested (installed and worked)

@wpotrzebowski wpotrzebowski self-requested a review December 16, 2023 21:30
@wpotrzebowski
Copy link
Contributor

I got en error when I tried to "Add Constraints" without any model being selected:
20:27:46 - ERROR: Traceback (most recent call last): File "sas/qtgui/Perspectives/Fitting/ConstraintWidget.py", line 1144, in showMultiConstraint File "sas/qtgui/Perspectives/Fitting/ComplexConstraint.py", line 46, in __init__ File "sas/qtgui/Perspectives/Fitting/ComplexConstraint.py", line 85, in setupWidgets File "sas/qtgui/Perspectives/Fitting/ComplexConstraint.py", line 111, in setupParamWidgets IndexError: list index out of range
but it is probably a separate issue

Copy link
Contributor

@wpotrzebowski wpotrzebowski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes in the code look ok. I'tested on Mac and it works fine but it also worked before. Probably someone else with Windows machine should take a look at it.

@gonzalezma gonzalezma self-requested a review December 19, 2023 14:12
Copy link
Contributor

@gonzalezma gonzalezma left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Functionality checked. Close button is now active in all the windows where previously was not.

@wpotrzebowski
Copy link
Contributor

It seems that this can be merged?

@wpotrzebowski wpotrzebowski merged commit 327fdd2 into release_6.0.0 Jan 2, 2024
@wpotrzebowski wpotrzebowski deleted the 2688-inoperable-close-window-action branch January 2, 2024 07:43
@butlerpd butlerpd mentioned this pull request Feb 22, 2024
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants