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.

Sign up for GitHub

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

Jump to bottom

Include display server type in "Copy System Info" #79396

Merged
merged 1 commit into from
Jul 21, 2023
Merged

Include display server type in "Copy System Info" #79396

merged 1 commit into from
Jul 21, 2023

Conversation

Sauermann
Copy link
Contributor

Add info about X11 or Wayland to System Information on LinuxBSD.

@Calinou Calinou added this to the 4.2 milestone Jul 12, 2023
@Calinou Calinou added the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Jul 12, 2023
Calinou
Calinou requested changes Jul 12, 2023
View reviewed changes
editor/editor_node.cpp Outdated Show resolved Hide resolved
@Sauermann Sauermann force-pushed the fix-systeminfo-displayserver branch from 5de8cfd to ed3c646 Compare July 12, 2023 22:43
@Calinou
Copy link
Member

Calinou commented Jul 12, 2023 •
edited
Loading

Tested locally (rebased on top of master 60f3b79), it works as expected.

Godot v4.2.dev (38c6a02a8) - Fedora Linux 38 (KDE Plasma) - X 11 - Vulkan (Forward+) - dedicated NVIDIA GeForce RTX 4090 (nvidia; 535.54.03) - 13th Gen Intel(R) Core(TM) i9-13900K (32 Threads)

However, capitalize() makes it write "X 11" instead of "X11". This could be fixed using .capitalize().replace(" ", "").

@Sauermann Sauermann force-pushed the fix-systeminfo-displayserver branch from ed3c646 to 9189b3f Compare July 12, 2023 22:48
@Sauermann
Copy link
Contributor Author

Yes, that addition fixed it.

Riteo
Riteo requested changes Jul 15, 2023
View reviewed changes
Copy link
Contributor

@Riteo Riteo left a comment

Choose a reason for hiding this comment

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

I've found one tiny flaw in the logic but other than that and a nitpick this looks great!

editor/editor_node.cpp Outdated Show resolved Hide resolved
@Sauermann Sauermann force-pushed the fix-systeminfo-displayserver branch from 9189b3f to 8948af4 Compare July 16, 2023 08:30
@Sauermann
Include Display Server Type in Copy System Info
1712b78 
Add info about X11 or Wayland to System Information on LinuxBSD.
@Sauermann Sauermann force-pushed the fix-systeminfo-displayserver branch from 8948af4 to 1712b78 Compare July 16, 2023 08:33
@Sauermann Sauermann requested a review from Riteo July 17, 2023 18:40
Riteo
Riteo approved these changes Jul 17, 2023
View reviewed changes
Copy link
Contributor

@Riteo Riteo left a comment

Choose a reason for hiding this comment

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

Fantastic! This will avoid us so many headaches :)

@YuriSizov YuriSizov changed the title Include Display Server Type in Copy System Info Include display server type in "Copy System Info" Jul 21, 2023
@YuriSizov YuriSizov merged commit 547f88a into godotengine:master Jul 21, 2023
13 checks passed
@YuriSizov
Copy link
Contributor

Thanks!

@Sauermann Sauermann deleted the fix-systeminfo-displayserver branch July 22, 2023 15:59
@adamscott adamscott mentioned this pull request Jul 29, 2023
Closed
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.1.2.

@YuriSizov YuriSizov removed the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Aug 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Calinou Calinou Calinou approved these changes

@Riteo Riteo Riteo approved these changes

Assignees
No one assigned
Labels
enhancement platform:linuxbsd topic:editor
Projects
None yet
Milestone
4.2
Development

Successfully merging this pull request may close these issues.
4 participants
@Sauermann @Calinou @YuriSizov @Riteo