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

[macOS] Fix instance update dialog #1913

Merged
merged 1 commit into from Jan 18, 2024
Merged

Conversation

Trial97
Copy link
Member

@Trial97 Trial97 commented Dec 3, 2023

hopefully fixes #1910(partially)
I hope I fixed the button texts by replacing the deprecated function (setButtonText).
I could not find anywhere why the dialogs look so different between distros(but I suspect it is a mac thing), so I resolved myself by just updating the buttons' text.
This needs to be tested on mac.

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
@Trial97 Trial97 added bug Something isn't working simple change needs-testing PRs that should be tested a bit more before being merged changelog:fixed A PR that appears under "Fixed" in the changelog labels Dec 3, 2023
Copy link
Member

@TheKodeToad TheKodeToad left a comment

Choose a reason for hiding this comment

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

Test first

@DioEgizio
Copy link
Member

haven't tested this yet but

I could not find anywhere why the dialogs look so different between distros(but I suspect it is a mac thing), so I resolved myself by just updating the buttons' text.

note that the way QMessageBox is displayed was changed in Qt 6.5 to use the system dialog, so it's probably related to that

@DioEgizio DioEgizio added this to the 8.1 milestone Jan 18, 2024
@DioEgizio
Copy link
Member

Tested it and it works

@Trial97 Trial97 removed the needs-testing PRs that should be tested a bit more before being merged label Jan 18, 2024
@Trial97 Trial97 merged commit 4cda042 into PrismLauncher:develop Jan 18, 2024
35 checks passed
@Trial97 Trial97 deleted the dialog branch January 18, 2024 20:02
@Trial97 Trial97 added the backport release-8.x Backport PR automatically label Jan 18, 2024
@Trial97 Trial97 restored the dialog branch January 18, 2024 20:03
Copy link
Contributor

Successfully created backport PR for release-8.x:

@Scrumplex Scrumplex changed the title Fixed askIfShouldUpdate dialog on mac [macOS] Fix Prism Launcher update dialog Mar 3, 2024
@Scrumplex Scrumplex changed the title [macOS] Fix Prism Launcher update dialog [macOS] Fix instance update dialog Mar 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-8.x Backport PR automatically bug Something isn't working changelog:fixed A PR that appears under "Fixed" in the changelog simple change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bug in the merge instance popup
3 participants