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

Regenerate .ui files #21411

Merged
merged 32 commits into from
Oct 5, 2024
Merged

Regenerate .ui files #21411

merged 32 commits into from
Oct 5, 2024

Conversation

thalieht
Copy link
Contributor

@thalieht thalieht commented Sep 28, 2024

Changes made by Designer automatically.

Closes #15658.

@Chocobo1 Chocobo1 added the Code cleanup Clean up the code while preserving the same outcome label Sep 29, 2024
@Chocobo1 Chocobo1 added this to the 5.1 milestone Sep 29, 2024
@@ -199,7 +199,7 @@
</action>
<action name="actionResumeSession">
<property name="text">
<string>&amp;Resume Session</string>
<string>R&amp;esume Session</string>
Copy link
Member

Choose a reason for hiding this comment

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

Just double checking, is this change intended?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Designer added ampersands to most (all?) such actions in this file but i reverted them all except for this one and "Shut down". This one conflicts with "Remove" action and "Shut down" conflicts with "Hibernate". With Qt 6.7.2, even in 4.6.7 (for shut down). it seems that these changes are applied automatically in runtime.

Copy link
Member

Choose a reason for hiding this comment

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

#15658 is relevant to this I believe

@Chocobo1
Copy link
Member

The PR title could change to something like: "Regenerate .ui files"

@thalieht thalieht changed the title Update all .ui files Regenerate .ui files Sep 29, 2024
@Chocobo1 Chocobo1 requested a review from glassez October 4, 2024 14:40
@Chocobo1 Chocobo1 merged commit 7f38216 into qbittorrent:master Oct 5, 2024
14 checks passed
@Chocobo1
Copy link
Member

Chocobo1 commented Oct 5, 2024

@thalieht
Thank you!

Merging this a bit early to unblock PR #21395.

@thalieht thalieht deleted the uifiles branch October 5, 2024 09:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code cleanup Clean up the code while preserving the same outcome
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"S&hutdown System" menu item shares the same keyboard shortcut with "&Hibernate System"
4 participants