[Widelands-dev] [Merge] lp:~widelands-dev/widelands/toggle_resources into lp:widelands

2017-08-15 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/toggle_resources into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/toggle_resources/+merge/328958 -- Your team Widelands Developers is subscribed to

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/toggle_resources into lp:widelands

2017-08-15 Thread GunChleoc
OK, let's leave this as it is then. -- https://code.launchpad.net/~widelands-dev/widelands/toggle_resources/+merge/328958 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/buildhelp_overlay. ___ Mailing list: https://la

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/toggle_resources into lp:widelands

2017-08-15 Thread SirVer
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/toggle_resources/+merge/328958 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/buildhelp_overlay. ___ Mailing list: https://launchpad.net/~widela

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/toggle_resources into lp:widelands

2017-08-15 Thread SirVer
> Regarding the overlay on/off thing, how about switching it on when the tool > gets activated? I do not like this sort of covenience magic. It has the ability to annoy users just as much as help them. If we design the hotkeys correctly it will be cheap to toggle the overlays on and off, so thi

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/toggle_resources into lp:widelands

2017-08-15 Thread GunChleoc
Testing works. I'll leave it up to you if you want to real with the auto-switchon in this merge request or in the follow-up branch. -- https://code.launchpad.net/~widelands-dev/widelands/toggle_resources/+merge/328958 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widel

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/toggle_resources into lp:widelands

2017-08-15 Thread GunChleoc
Review: Approve > OverlayLevel is part of the public API of this class and kLevelForBuildHelp > should never be used when 'register_overlay' is called. I therefore opted to > not make it part of the enum class to make misuse harder. This has convinced me, plus that we really don't want to use m

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/toggle_resources into lp:widelands

2017-08-14 Thread SirVer
> Are you going to work on the second view filter as well? This should switch > all objects of the "Immovable" class/tool. This and independent toggling of animals/bobs is done in https://code.launchpad.net/~widelands-dev/widelands/toggle_immovables/+merge/328977. > And independent thereof:

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/toggle_resources into lp:widelands

2017-08-14 Thread toptopple
Ok, I don't think I have any personal problem here! ;) Are you going to work on the second view filter as well? This should switch all objects of the "Immovable" class/tool. And independent thereof: can you implement or make a suggestion for the Immovable View switch button? -- https://code.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/toggle_resources into lp:widelands

2017-08-14 Thread SirVer
At #12: I think we just disagree here. I prefer a simple mental model, you prefer a tool that always shows what is currently changing. I would then argue: what happens for undo-redo, would this toggle resources on and off? Also, tools like Gimp or photoshop also support my position [1]: If you m

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/toggle_resources into lp:widelands

2017-08-14 Thread SirVer
>>> from Gun I think we could further simplify FieldOverlayManager::get_overlays by making kLevelForBuildHelp part of the OverlayLevel enum class, something like this: auto it = overlays_.lower_bound(c); while (it != overlays_.end() && it->first == c) { if (buildhelp_ && it->second.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/toggle_resources into lp:widelands

2017-08-14 Thread toptopple
I assume people, including me, can live with such arrangement as you propose. I find it not so convincing, however. While I see your point, I don't quite agree that the current state of the Buildhelp view and related tools has to remain as is. If I had to decide I probably would prefer the WYS

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/toggle_resources into lp:widelands

2017-08-14 Thread SirVer
> the 'q' key is targeted as a shortcut for the resource view button done. > issue: the resource editing tool has to be deactivated while the RESOURCE > VIEW is switched OFF. Deactivated means it must not be possible to create or > remove any resources on the map. I disagree with this design f

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/toggle_resources into lp:widelands

2017-08-14 Thread toptopple
Thanks for taking this up, SirVer! Looks good to me on first sight (not extensively tested) with one exception: -- issue: the resource editing tool has to be deactivated while the RESOURCE VIEW is switched OFF. Deactivated means it must not be possible to create or remove any resources on the

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/toggle_resources into lp:widelands

2017-08-13 Thread bunnybot
Continuous integration builds have changed state: Travis build 2534. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/264163602. Appveyor build 2358. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_toggle_res

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/toggle_resources into lp:widelands

2017-08-13 Thread SirVer
Oh, and this is diffbased on https://code.launchpad.net/~widelands-dev/widelands/buildhelp_overlay which must be merged first. -- https://code.launchpad.net/~widelands-dev/widelands/toggle_resources/+merge/328958 Your team Widelands Developers is requested to review the proposed merge of lp:~wi

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/toggle_resources into lp:widelands

2017-08-13 Thread SirVer
Might also fix bug 1696064, at least I could not repro it with this branch. Bug 1649958 contains more discussion about this feature, for example I did not add a hotkey yet (which should be simple to do), because I am unsure about the current consensus. Not drawing map objects is not part of thi

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/toggle_resources into lp:widelands

2017-08-13 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/toggle_resources into lp:widelands with lp:~widelands-dev/widelands/buildhelp_overlay as a prerequisite. Commit message: Make resources toggable in the editor. - Changes drawing of resources to use a callback instead of a vector of objects