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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from Jan 1, 2020

Conversation

@spnda
Copy link
Contributor

@spnda spnda commented Apr 29, 2019

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 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 spnda commented Apr 29, 2019

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 glx22 commented Apr 29, 2019

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

@spnda spnda force-pushed the spnda:screenshotgui branch from e72f6ab to c6c71b6 Apr 29, 2019
@glx22
Copy link
Contributor

@glx22 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 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 glx22 commented Apr 29, 2019

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

@spnda spnda force-pushed the spnda:screenshotgui branch from c6c71b6 to 0f9d04c Apr 29, 2019
src/lang/english.txt Outdated Show resolved Hide resolved
src/lang/english.txt Show resolved Hide resolved
@spnda spnda force-pushed the spnda:screenshotgui branch 4 times, most recently from 3fd1257 to 955f52b Apr 29, 2019
@LordAro
Copy link
Member

@LordAro 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

@andythenorth andythenorth commented Oct 22, 2019

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.

Copy link
Contributor

@nielsmh nielsmh left a comment

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

src/screenshot_gui.cpp Outdated Show resolved Hide resolved
@LordAro LordAro force-pushed the spnda:screenshotgui branch from 955f52b to 4efb844 Dec 28, 2019
@LordAro
Copy link
Member

@LordAro LordAro commented Dec 28, 2019

Went ahead and updated this myself. Better?

@LordAro LordAro force-pushed the spnda:screenshotgui branch 2 times, most recently from 7267047 to eda9c35 Dec 28, 2019
@andythenorth
Copy link
Contributor

@andythenorth andythenorth commented Dec 29, 2019

Looks nice to me, thanks :)

@spnda
Copy link
Contributor Author

@spnda 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.

Copy link
Contributor

@glx22 glx22 left a comment

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

@spnda spnda force-pushed the spnda:screenshotgui branch from eda9c35 to aaf6b6a Dec 31, 2019
@LordAro LordAro dismissed glx22鈥檚 stale review Dec 31, 2019

outdated

Copy link
Member

@LordAro LordAro left a comment

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

@LordAro LordAro merged commit e558aa8 into OpenTTD:master Jan 1, 2020
8 checks passed
8 checks passed
OpenTTD CI Build #20191231.7 succeeded
Details
OpenTTD CI (Linux commit-checker) Linux commit-checker succeeded
Details
OpenTTD CI (Linux linux-amd64-clang-3.9) Linux linux-amd64-clang-3.9 succeeded
Details
OpenTTD CI (Linux linux-amd64-gcc-6) Linux linux-amd64-gcc-6 succeeded
Details
OpenTTD CI (Linux linux-i386-gcc-6) Linux linux-i386-gcc-6 succeeded
Details
OpenTTD CI (MacOS) MacOS succeeded
Details
OpenTTD CI (Windows Win32) Windows Win32 succeeded
Details
OpenTTD CI (Windows Win64) Windows Win64 succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can鈥檛 perform that action at this time.