[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1615826-constructionsite-help into lp:widelands
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1615826-constructionsite-help into lp:widelands.
Commit message:
Constructionsites' help button now points to the help for the building being
built.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1615826 in widelands: "Show full encylopedia for buildings under
construction"
https://bugs.launchpad.net/widelands/+bug/1615826
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1615826-constructionsite-help/+merge/342705
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1615826-constructionsite-help into lp:widelands.
=== modified file 'src/wui/buildingwindow.cc'
--- src/wui/buildingwindow.cc 2017-11-30 13:07:13 +
+++ src/wui/buildingwindow.cc 2018-04-05 07:28:01 +
@@ -48,11 +48,13 @@
BuildingWindow::BuildingWindow(InteractiveGameBase& parent,
UI::UniqueWindow::Registry& reg,
Widelands::Building& b,
+ const Widelands::BuildingDescr& descr,
bool avoid_fastclick)
: UI::UniqueWindow(&parent, "building_window", ®, Width, 0, b.descr().descname()),
is_dying_(false),
parent_(&parent),
building_(&b),
+ building_descr_for_help_(descr),
building_position_(b.get_position()),
showing_workarea_(false),
avoid_fastclick_(avoid_fastclick),
@@ -61,6 +63,13 @@
[this](const Widelands::NoteBuilding& note) { on_building_note(note); });
}
+BuildingWindow::BuildingWindow(InteractiveGameBase& parent,
+ UI::UniqueWindow::Registry& reg,
+ Widelands::Building& b,
+ bool avoid_fastclick)
+ : BuildingWindow(parent, reg, b, b.descr(), avoid_fastclick) {
+}
+
BuildingWindow::~BuildingWindow() {
hide_workarea();
}
@@ -340,7 +349,7 @@
if (building_in_lambda == nullptr) {
return;
}
- new UI::BuildingHelpWindow(igbase(), registry, building_in_lambda->descr(),
+ new UI::BuildingHelpWindow(igbase(), registry, building_descr_for_help_,
building_in_lambda->owner().tribe(), &parent_->egbase().lua());
};
=== modified file 'src/wui/buildingwindow.h'
--- src/wui/buildingwindow.h 2017-12-02 08:04:31 +
+++ src/wui/buildingwindow.h 2018-04-05 07:28:01 +
@@ -43,6 +43,16 @@
Width = 4 * 34 // 4 normally sized buttons
};
+protected:
+ // This constructor allows setting a building description for the help button independent of the
+ // base building
+ BuildingWindow(InteractiveGameBase& parent,
+ UI::UniqueWindow::Registry& reg,
+ Widelands::Building&,
+ const Widelands::BuildingDescr&,
+ bool avoid_fastclick);
+
+public:
BuildingWindow(InteractiveGameBase& parent,
UI::UniqueWindow::Registry& reg,
Widelands::Building&,
@@ -93,8 +103,12 @@
InteractiveGameBase* parent_;
+ // The building that this window belongs to
Widelands::OPtr building_;
+ // The building description that will be used for the help button
+ const Widelands::BuildingDescr& building_descr_for_help_;
+
// We require this to unregister overlays when we are closed. Since the
// building might have been destroyed by then we have to keep a copy of its
// position around.
=== modified file 'src/wui/constructionsitewindow.cc'
--- src/wui/constructionsitewindow.cc 2017-12-01 09:17:44 +
+++ src/wui/constructionsitewindow.cc 2018-04-05 07:28:01 +
@@ -31,7 +31,7 @@
UI::UniqueWindow::Registry& reg,
Widelands::ConstructionSite& cs,
bool avoid_fastclick)
- : BuildingWindow(parent, reg, cs, avoid_fastclick), construction_site_(&cs), progress_(nullptr) {
+ : BuildingWindow(parent, reg, cs, cs.building(), avoid_fastclick), construction_site_(&cs), progress_(nullptr) {
init(avoid_fastclick);
}
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisians_string_fixes into lp:widelands
Continuous integration builds have changed state: Travis build 3343. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/362480961. Appveyor build 3149. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_frisians_string_fixes-3149. -- https://code.launchpad.net/~widelands-dev/widelands/frisians_string_fixes/+merge/342702 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/frisians_string_fixes 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 : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_mineable_buildable into lp:widelands
Review: Approve Code looks good too. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/ai_mineable_buildable/+merge/342601 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_mineable_buildable. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_mineable_buildable into lp:widelands
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 3339. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/361802857. -- https://code.launchpad.net/~widelands-dev/widelands/ai_mineable_buildable/+merge/342601 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_mineable_buildable. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisians-tweak into lp:widelands
I implemented your diff comments. data/i18n/locales.lua, data/txts/developers.lua and data/txts/translators_data.lua are now identical to trunk, I don´t understand why they are still shown in the diff? -- https://code.launchpad.net/~widelands-dev/widelands/frisians-tweak/+merge/342599 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/frisians-tweak 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 : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisians_string_fixes into lp:widelands
Looks good to me, one diff comment
Diff comments:
> === modified file 'data/campaigns/fri01.wmf/scripting/texts.lua'
> --- data/campaigns/fri01.wmf/scripting/texts.lua 2018-03-11 15:55:43
> +
> +++ data/campaigns/fri01.wmf/scripting/texts.lua 2018-04-05 06:03:52
> +
> @@ -312,7 +312,7 @@
>_([[We are recruiting soldiers easily enough, but they are fairly
> weak. We must train our soldiers if they are to beat the enemy.]])
> .. paragraphdivider() ..
>-- TRANSLATORS: Reebaud – train soldiers 1
> - _([[Soldiers are trained in basic attack, health and defense by a
> small training camp. They can learn the finer points in a large training
> arena.]])),
> + _([[Soldiers are trained in basic attack, health and defense by a
> training camp. They can learn the finer points in a large training arena.]])),
Better remove the "large" from the training arena as well for consistency
> }
> training_2 = {
> title =_ "Training Soldiers",
--
https://code.launchpad.net/~widelands-dev/widelands/frisians_string_fixes/+merge/342702
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/frisians_string_fixes 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 : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1615826-constructionsite-help into lp:widelands
Continuous integration builds have changed state: Travis build 3344. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/362501908. Appveyor build 3150. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1615826_constructionsite_help-3150. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1615826-constructionsite-help/+merge/342705 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1615826-constructionsite-help 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 : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1615826-constructionsite-help into lp:widelands
I had the very same idea once upon a while. Code Review is fine, no objections herer. will check this with some testplay. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1615826-constructionsite-help/+merge/342705 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1615826-constructionsite-help 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 : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisians-tweak into lp:widelands
Continuous integration builds have changed state: Travis build 3345. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/362599028. Appveyor build 3151. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_frisians_tweak-3151. -- https://code.launchpad.net/~widelands-dev/widelands/frisians-tweak/+merge/342599 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/frisians-tweak 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 : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1615826-constructionsite-help into lp:widelands
Review: Approve review, compile, testplay All fine. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1615826-constructionsite-help/+merge/342705 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1615826-constructionsite-help. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1615826-constructionsite-help into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1615826-constructionsite-help into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1615826-constructionsite-help/+merge/342705 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1615826-constructionsite-help. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisians_string_fixes into lp:widelands
Review: Approve Thanks, I had missed that one. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/frisians_string_fixes/+merge/342702 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/frisians_string_fixes. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisians-tweak into lp:widelands
Review: Approve They still show up because your last commit deleted and added them instead of modifying them - I have no idea how that could have gotten messed up in the same commit, since the file names haven't changed. I have hacked the branch to fix the issue. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/frisians-tweak/+merge/342599 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/frisians-tweak. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
