The proposal to merge lp:~widelands-dev/widelands/economy-target-profiles into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/372447
--
Your team Widelands Develop
Continuous integration builds have changed state:
Travis build 5411. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/582115732.
Appveyor build 5181. State: success. Details:
Fix confirmed :)
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/372447
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/economy-target-profiles.
___
Mailing
Fixed as well now
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/372447
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/economy-target-profiles.
___
Mailing list:
Review: Approve
I can't think of a cleaner solution either at this point, so code LGTM :)
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/372447
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/economy-target-profiles.
The proposal to merge lp:~widelands-dev/widelands/economy-target-profiles into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/371251
--
Your team Widelands Develop
Continuous integration builds have changed state:
Travis build 5320. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/571293137.
Appveyor build 5092. State: success. Details:
Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https
LGTM :)
Do we want to disable the save button too?
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/371251
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands
layer´s targets to disk though as this
does not affect the game.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands.
=== modified file 'src/wui/economy_options_window.cc'
--- src/wui/economy_options_windo
The proposal to merge lp:~widelands-dev/widelands/economy-target-profiles into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/368181
--
Your team Widelands Develop
three inputqueue fails in one build :P
@bunnybot merge force
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/368181
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/economy-target-profiles.
Refusing to merge, since Travis is not green. Use @bunnybot merge force for
merging anyways.
Travis build 5207. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/548539125.
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/368181
Your
Continuous integration builds have changed state:
Travis build 5207. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/548539125.
Appveyor build 4986. State: success. Details:
Review: Approve
Ah, now I get it. I' still not sure that this is what it should do. but the
behavior is as described now, so let's merge this branch. Thanks for fixing!
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/368181
Your team
on as well. Changing all wares
when only some are selected would be an annoying and unexpected behaviour IMHO.
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/368181
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev
/_widelands_dev_widelands_economy_target_profiles-4961.
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/368181
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands
the proposed merge of
lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help
/368181
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
/368223
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/368181
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands
t-profiles/+merge/368181
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : wid
requested to review the proposed merge of
lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~wid
/_widelands_dev_widelands_economy_target_profiles-4884.
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/368181
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands
d.net/~widelands-dev/widelands/economy-target-profiles/+merge/368181
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands.
=== modified file 'src/wui/economy_options_window.cc'
--- src/wui/economy_options_
The proposal to merge lp:~widelands-dev/widelands/economy-target-profiles into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
--
Your team Widelands Develop
Inputqueues again
@bunnybot merge force
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/economy-target-profiles.
___
Refusing to merge, since Travis is not green. Use @bunnybot merge force for
merging anyways.
Travis build 5080. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/538595965.
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
Your
Thanks everyone for the reviews, and thanks for the fixes :)
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/economy-target-profiles.
Review: Approve
I have merged trunk and pushed some changes. Feel free to merge this branch if
you agree with them :)
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
Your team Widelands Developers is subscribed to branch
Okay, my mistake :)
Double-checked my dropdown usage, should all be fine then…
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/economy-target-profiles.
That was the BaseDropdown. The Dropdown template looks like this:
template class Dropdown : public BaseDropdown {
...
/// Add an element to the list
/// \param name the display name of the entry
/// \param valuethe value for the entry
/// \param
> Since Entry is the descname (right?),
Wrong. The dropdown also comes with documentation:
/// Add an element to the list
/// \param name the display name of the entry
/// \param valuethe index of the entry
/// \param pic an image to
Ware stats menu fixed. It is already too large in trunk, but I made it shorter
now.
We still need knowledge of the phase we´re in during the loop so we can know
whether to change the target for all wares or only for the selected. Since
anything_selected may change during the loop, we need two
You can now get rid of the second_phase variable entirely. Just check for
!anything_selected at the end of the loop, then you can also get rid of
if (anything_selected) {
return;
}
Confirmed that the layouting is fixed. The ware
Layouting fixed. Ware statistics now sets a hgap as well
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/economy-target-profiles.
Implemented or replied to the diff comments.
The ASan error is in trunk and can happen everywhere there are dropdowns. For
example, when I´m thrown back to the main menu by an error from a fsmenu screen
that has one I already got this crash. It can appear whenever destroying a
window that
Also:
==6158==ERROR: AddressSanitizer: heap-use-after-free on address 0x6183eda0
at pc 0x55fbbb8f1299 bp 0x7ffc346f2020 sp 0x7ffc346f2010
READ of size 8 at 0x6183eda0 thread T0
#0 0x55fbbb8f1298 in
I have just tested the relayouting when fullscreen switching. It works well for
warehouses and the stock statistics.
In the ware statistics, the bottom slider and text are cut off.
In the economy window, we get wide gaps between the columns and some extra
space on the left and right of the
Review: Needs Fixing
This will break once translations come in.
Diff comments:
>
> === modified file 'src/wui/economy_options_window.cc'
> --- src/wui/economy_options_window.cc 2019-02-23 11:00:49 +
> +++ src/wui/economy_options_window.cc 2019-05-16 17:28:26 +
> @@ -186,35 +281,402 @@
Review: Approve
I think I forgot to approve this :)
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/economy-target-profiles.
Yep, translating the empty string is a bad idea.
Dropdowns, table and listselect entries have 2 data elements - one is the
actual data (Entry value), the other one is a translatable label (const
std::string& name). You need to compare the actual data, not the translatable
label.
void
Continuous integration builds have changed state:
Travis build 5002. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/533445474.
Appveyor build 4783. State: success. Details:
r9110 fixed it. Thanks allot.
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/economy-target-profiles.
___
Mailing list:
crash:
NOCOM: EconomyOptionsWindow::update_profiles_select(Default)
Planning to select »Default«
Did not select it because it is already selected
NOCOM: EconomyOptionsWindow::update_profiles, applicable »«
Desired and actual state of the empty »« profile don´t match
NOCOM:
I am at a loss. I have now pushed a revision that adds lots of logging output.
When I perform these steps:
– Open the options window from a flag
– Change some values
– Click the save button
– Save the profile as "test"
– (now the dropdown shows "test")
– close the options window
– re-open it
Continuous integration builds have changed state:
Travis build 4972. State: failed. Details:
https://travis-ci.org/widelands/widelands/builds/532432343.
Appveyor build 4753. State: success. Details:
Hmm... it seems like the dropdown´s entries and selection are not updated
correctly for some reason which is beyond my understanding. The "Not Selected"
message is only the consequence of an upstream failure which I suspect in
update_profiles(). I have rewritten it, can you try if the problem
Diff comments:
>
> === modified file 'src/wui/economy_options_window.cc'
> --- src/wui/economy_options_window.cc 2019-02-23 11:00:49 +
> +++ src/wui/economy_options_window.cc 2019-05-11 13:37:58 +
> @@ -186,35 +281,399 @@
> const
Updated video:
https://bugs.launchpad.net/widelands/+bug/1827696/+attachment/5263625/+files/vokoscreen-2019-05-14_14-29-18.mkv
I still get a different result by the same steps and have no idea why :(
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
In your video, I don't see you accessing the dropdown in the economy window
after the deletion.
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
Your team Widelands Developers is subscribed to branch
Continuous integration builds have changed state:
Travis build 4940. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/531134022.
Appveyor build 4721. State: success. Details:
Either I´m blind or I don´t see what I am doing wrong…
https://bugs.launchpad.net/widelands/+bug/1827696/+attachment/5263113/+files/vokoscreen-2019-05-11_16-27-25.mkv
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
Your team Widelands Developers is
Maybe I just failed to explain it. Have a look at the video.
https://fosuta.org/pics/profile.mov
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
Your team Widelands Developers is subscribed to branch
I still can´t reproduce, it works fine for me:
https://launchpadlibrarian.net/423268219/wl-economy-profiles.png
(screenshot taken directly after I deleted the profile "Zero")
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
Your team Widelands
Have a look at the picture. I deleted the profile test.
https://fosuta.org/pics/empty_profile.png
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
Your team Widelands Developers is subscribed to branch
The predefined profiles are now undeletable.
But I can´t reproduce this:
> Otherwise, the deleted one is still shown as active and the drop-down list
> has an empty entry.
It works fine for me: When deleting the active profile, the dropdown
immediately switches to "".
--
> Stockpile and Efficiency Profiles should be changeable but not deletable
Okay, I´ll add a "undeletable" tag to these profiles
> when deleting the active profile it should switch back to default. Otherwise,
> the deleted one is still shown as active
I thought we had agreed to not show "Default"
BTW while we're on it. Should we consider presetting all Profiles with sane
values?
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/economy-target-profiles.
Very good so far, two nits though.
Stockpile and Efficiency Profiles should be changeable but not deletable. Also,
when deleting the active profile it should switch back to default. Otherwise,
the deleted one is still shown as active and the drop-down list has an empty
entry.
--
Continuous integration builds have changed state:
Travis build 4930. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/530872873.
Appveyor build 4711. State: failed. Details:
I decided against UniqueWindow after all, it seems a bit overkill. All the
remaining problems should be fixed now.
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
Your team Widelands Developers is subscribed to branch
Have a look at EconomyOptionsWindow::on_economy_note - maybe you will need to
do some changes there too
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
Your team Widelands Developers is subscribed to branch
Thanks for the suggestion, I´ll use UniqueWindow then :)
Currently, I am closing the save dialog from the EconomyOptionsWindow
destructor. In both cases – closing by right-click and closing after economy
destruction – die() is called on the EconomyOptionsWindow, I don´t understand
why it makes
If you want to ensure that there is onyl 1 save dialog, you can make it a
UniqueWindow.
The economy options should control the lifetime of the save window. This is a
bit tricky when you merge 2 economies.
--
Figured it is worse. The game stalls, it is not paused. The game stalls as long
as the save window is open, when closing the windows it fast forwards the time.
e.g. Opening the window at 1.30 and leaving it open for 1 minute, means after
closing it, the time will fast-forward to 2.30.
--
Review: Needs Fixing
One major problem. Pressing the save button pauses the game without actually
showing, that the game is paused. That might tolerable in single player, but in
multiplayer it pauses the game for all participants. This should not happen.
Also get this warning during compiling:
Continuous integration builds have changed state:
Travis build 4911. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/529823274.
Appveyor build 4692. State: success. Details:
Yes, all changes are only ever applied to the active tab. The inactive tab will
never change.
A helpful explanation should be added to the economy tutorial IMHO.
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
Your team Widelands Developers is
Review: Approve testing
Really nice, thanks :-)
It's good that changing a value will show no text in the editbox, so one can
immediately see that there is no profile saved for the chosen value(s).
After playing around with the tabs and switching between wares/workers, i found
that loading a
Implemented the comments from the bug report
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands
/_widelands_dev_widelands_economy_target_profiles-4685.
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366987
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands
nds Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands.
=== added file 'data/images/ui_basic/scrollbar_down_fast.png'
Binary files data/images/ui_basic/scrollbar_down_fast.png 1970-01-01 00:00:00 + and data/images/ui_basic
The proposal to merge lp:~widelands-dev/widelands/economy-target-profiles into
lp:widelands has been updated.
Status: Work in progress => Superseded
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366952
--
Your team Widela
The proposal to merge lp:~widelands-dev/widelands/economy-target-profiles into
lp:widelands has been updated.
Status: Needs review => Work in progress
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366952
--
Your team Widela
/_widelands_dev_widelands_economy_target_profiles-4682.
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366952
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands
like the spinbox buttons?
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366952
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands
with different settings are
selected?
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366952
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands
-profiles/+merge/366952
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev
team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe
ttons_box_;
> + UI::EditBox profile_name_;
> + UI::Button save_;
> + UI::Button cancel_;
> + UI::Button delete_;
> +};
> +
> +void EconomyOptionsWindow::create_target() {
> + std::unique_ptr s (new
> SaveProfileWindow(get_parent(), this));
> + s-
/_widelands_dev_widelands_economy_target_profiles-4667.
--
https://code.launchpad.net/~widelands-dev/widelands/economy-target-profiles/+merge/366952
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/economy-target-profiles into lp:widelands
elect the profile and the wares you wish to change and
click Apply (replaces Reset). Use "Save" to save your current settings as a
profile. The save window also allows you to delete profiles.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/w
82 matches
Mail list logo
