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

Add: Screenshot window (& simplify the about/help DropDown) #7550

Merged
merged 1 commit into from
Jan 1, 2020
Merged

Add: Screenshot window (& simplify the about/help DropDown) #7550

merged 1 commit into from
Jan 1, 2020
+273 −207

Conversation

spnda
Copy link
Contributor

@spnda spnda commented Apr 29, 2019 •
edited
Loading

Is the heightmap screenshot option allowed/supposed to be here? I remember it being for saving the heightmap of the loaded savegame in the scenario editor.
Though this is more for purposes for a better overview. Before the options were cramed together with "Toggle console", "AI/Game script debug"... options. Now they are split up into their own window.

Any code improvements are welcome as this is my first real code in C++ 😄.

Ideas:
Make the window close itself when a screenshot is taken? (Not really needed due to zoomed in and defaultzoom screenshots not showing the GUI anyway.)
Make the above an option?

Screenshots:
The new window:
image

The new version of the about/help DropDown:
image

@glx22
Copy link
Contributor

glx22 commented Apr 29, 2019

Don't modify project files by hand, just add the files in source.list and run projects/generate[.vbs] (there's also a generate project in the solution for MSVC).

@spnda
Copy link
Contributor Author

spnda commented Apr 29, 2019 •
edited
Loading

I did not modify the project files by hand. Those were auto-generated by my editor (VS2017), reason for it only being new for vs141.
But I did just add the files to source.list and I am currently running generate.vbs, it's taking quite a while.
Do I amend the commit afterwards with the updated files?

@glx22
Copy link
Contributor

glx22 commented Apr 29, 2019

Yes, and there's also a TAB issue in toolbar_gui.cpp:1146

@glx22
Copy link
Contributor

glx22 commented Apr 29, 2019

Hmm it seems you have an issue with core.autocrlf git option, as most of your updated projects are just changing eol.

@spnda
Copy link
Contributor Author

spnda commented Apr 29, 2019

Would you say setting the autocrlf option to false fixes that issue?
Is this related to all .vcxproj being completely changed?

@glx22
Copy link
Contributor

glx22 commented Apr 29, 2019

autocrlf should be set to true on windows. And yes it's related to all .vcxproj being completely changed.

LordAro
LordAro reviewed Apr 29, 2019
View reviewed changes
@LordAro
Copy link
Member

LordAro commented Aug 17, 2019

Needs a rebase.

Looking at the window itself, I think I'd prefer more spacing between the buttons - it's very cramped as is

@andythenorth
Copy link
Contributor

I do think it would be worth getting this one through. Currently the screenshots bloat the about/help dropdown, and it's hard to reliably choose the intended screenshot type.

nielsmh
nielsmh requested changes Oct 22, 2019
View reviewed changes
Copy link
Contributor

@nielsmh nielsmh left a comment

Choose a reason for hiding this comment

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

As per above, also needs rebase to fix merge of translation files.

@LordAro
Copy link
Member

LordAro commented Dec 28, 2019

Went ahead and updated this myself. Better?

@andythenorth
Copy link
Contributor

Looks nice to me, thanks :)

@spnda
Copy link
Contributor Author

spnda commented Dec 29, 2019

Sorry for being inactive, completely forgot about this PR. Thanks to LordAro for cleaning things up and that looks much better than before with the bigger buttons.
The changes @nielsmh requested seem to be resolved now.

nielsmh
nielsmh previously approved these changes Dec 29, 2019
View reviewed changes
glx22
glx22 previously requested changes Dec 29, 2019
View reviewed changes
Copy link
Contributor

@glx22 glx22 left a comment

Choose a reason for hiding this comment

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

I think only generate_widget was ran, running squirrel_export is needed after generate_widget

@spnda
Feature: Screenshot window

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
Learn about vigilant mode
aaf6b6a
LordAro
LordAro approved these changes Dec 31, 2019
View reviewed changes
Copy link
Member

@LordAro LordAro left a comment

Choose a reason for hiding this comment

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

Shame about everything being squashed into a single commit, but no huge loss

@LordAro LordAro merged commit e558aa8 into OpenTTD:master Jan 1, 2020
@telk5093 telk5093 mentioned this pull request Jan 4, 2020
Merged
@frosch123 frosch123 mentioned this pull request Feb 8, 2020
Merged
@spnda spnda deleted the screenshotgui branch February 22, 2021 22:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LordAro LordAro

@nielsmh nielsmh

@glx22 glx22

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@spnda @glx22 @LordAro @andythenorth @nielsmh