Merge lp:~widelands-dev/widelands/notifications_buildingwindows into lp:widelands

[GunChleoc]

Building windows are now handled by a new notification 'NoteBuilding', so that Map Objects and the economy no longer depend directly on wui. This also brings some improvements regarding the closing/minimizing of windows:
- Productionsites no longer close their window when the stop/start button is pressed.
- Minimized construction windows no longer get maximized when the construction is finished.
- Window is no longer closed on enhance or dismantle.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1953. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/201687798.
Appveyor build 1788. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_notifications_buildingwindows-1788.

[Notabilis (notabilis27)]

First of all: I like the intended change, the feature-changes as well as separating logic and wui. Unfortunately, there are two bigger problems with this branch.

The diff looks good to me so far. A small nit: The std::map wanted_building_windows_ stores the coordinates as data but they are not used (for now?), so we don't have to store them.

For testing, I tried to merge trunk which gave me to conflicts due to the kAlign changes in trunk. They should be easy to fix.

Well, the building window is no longer maximized when the construction is finished. Now it is simply closed. ;-)
The problem is with the BuildingWindow::is_dying_ variable. When the construction is finished, Building::destroy() is called, sending a NoteBuilding with Action::kDeleted. This sets is_dying_ to true. Only afterwards ConstructionSite::cleanup() is called and sends the Action::kStartWarp message. Since the building is already dying at this point, BuildingWindow::on_building_note() ignores the message and never stores the window for reopening. Moving the check for Action::kStartWarp out of the !is_dying_ check seems to fix the problem.

Minor nit (can be ignored): When the building is finished, the (minimized) window is brought to the front (!= maximized). Not really a problem in my opinion.

The other big problem is a crash on exit. When the game ends (either alt+f4 or per menu) and a headquarters or construction window is open, the game crashes with a std::bad_cast exception.

Two minor points: When upgrading or dismantling buildings the window is closed. That is not a issue of this branch but we might want to change this since the construction window stays open, too.

review: Needs Fixing

[GunChleoc (gunchleoc)]

Thanks for the review!

The coordinates from std::map wanted_building_windows_ are used - I have marked up the line.

I also fixed the window warping for both construction sites and dismantle sites in all cases - having the window stay open is only 2 lines of code, so we might as well do it in this branch.

Now I'll go hunt the segfault.

[GunChleoc (gunchleoc)]

Next try - should be all fixed now.

> Minor nit (can be ignored): When the building is finished, the (minimized) window is brought to the front (!= maximized). Not really a problem in my opinion.

We will probably have to dig into the UI toolkit for that, so let's leave it for later and see if it annoys anybody.

review: Needs Resubmitting

[Notabilis (notabilis27)]

Thanks for fixing, diffs looks good to me and it works as wanted when testing. Thanks for the change regarding upgrades and dismantling.

I don't really understand your fix for the segfault. As far as I can see, your only change is storing the parent pointer now in the BuildingWindow instead of inheriting it. Do you know what is happening there? Wild guess: A strange order of destructing the classes and using the already cleared pointer when destroying BuildingWindow?

Also, I don't believe that you are using the coord-entry (partially because I removed it without any visible complains). There isn't any call to std::get<0>() anywhere and the coords variable which is used in the marked line comes from the handled building. It's not important, though.

As far as I am concerned, the branch can be merged now.

review: Approve

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 2011. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/205918080.
Appveyor build 1847. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_notifications_buildingwindows-1847.

[GunChleoc (gunchleoc)]

Duh, I confused the coords with the pos. I have removed it now.

@bunnybot merge

[GunChleoc (gunchleoc)]

Regarding the segfault, it has to do with the destructor code in UI::Panel - if a panel gets destroyed, it also removes its children and is deleted from its parent's list of children. It seems like the reference from the buildingwindow to its parent was broken before it tried to access it for deleting the workarea overlay.

[Notabilis (notabilis27)]

Makes sense, thanks.

=== modified file 'src/economy/CMakeLists.txt'
--- src/economy/CMakeLists.txt	2017-02-12 09:10:57 +0000
+++ src/economy/CMakeLists.txt	2017-02-28 09:26:14 +0000
@@ -55,6 +55,5 @@
     logic_widelands_geometry
     map_io
     notifications
-    wui
 )
 add_subdirectory(test)

=== modified file 'src/economy/expedition_bootstrap.cc'
--- src/economy/expedition_bootstrap.cc	2017-02-17 21:52:41 +0000
+++ src/economy/expedition_bootstrap.cc	2017-02-28 09:26:14 +0000
@@ -26,12 +26,12 @@
 #include "economy/portdock.h"
 #include "economy/wares_queue.h"
 #include "economy/workers_queue.h"
+#include "io/fileread.h"
 #include "io/filewrite.h"
 #include "logic/map_objects/tribes/warehouse.h"
 #include "logic/player.h"
 #include "map_io/map_object_loader.h"
 #include "map_io/map_object_saver.h"
-#include "wui/interactive_gamebase.h"
 
 namespace Widelands {
 
@@ -87,8 +87,7 @@
 	queues_[buildcost_size]->set_callback(input_callback, this);
 
 	// Update the user interface
-	if (upcast(InteractiveGameBase, igb, warehouse->owner().egbase().get_ibase()))
-		warehouse->refresh_options(*igb);
+	Notifications::publish(NoteBuilding(warehouse->serial(), NoteBuilding::Action::kChanged));
 }
 
 /**
@@ -113,10 +112,7 @@
 	queues_.clear();
 
 	// Update the user interface
-	if (upcast(InteractiveGameBase, igb, warehouse->owner().egbase().get_ibase())) {
-		warehouse->refresh_options(*igb);
-	}
-
+	Notifications::publish(NoteBuilding(warehouse->serial(), NoteBuilding::Action::kChanged));
 	Notifications::publish(NoteExpeditionCanceled(this));
 }
 

=== modified file 'src/economy/portdock.cc'
--- src/economy/portdock.cc	2017-02-12 09:10:57 +0000
+++ src/economy/portdock.cc	2017-02-28 09:26:14 +0000
@@ -38,7 +38,6 @@
 #include "logic/widelands_geometry_io.h"
 #include "map_io/map_object_loader.h"
 #include "map_io/map_object_saver.h"
-#include "wui/interactive_gamebase.h"
 
 namespace Widelands {
 

=== modified file 'src/logic/editor_game_base.h'
--- src/logic/editor_game_base.h	2017-01-25 18:55:59 +0000
+++ src/logic/editor_game_base.h	2017-02-28 09:26:14 +0000
@@ -38,6 +38,7 @@
 }
 struct FullscreenMenuLaunchGame;
 class InteractiveBase;
+class InteractiveGameBase;  // TODO(GunChleoc): Get rid
 
 namespace Widelands {
 

=== modified file 'src/logic/map_objects/immovable.cc'
--- src/logic/map_objects/immovable.cc	2017-01-25 18:55:59 +0000
+++ src/logic/map_objects/immovable.cc	2017-02-28 09:26:14 +0000
@@ -32,6 +32,7 @@
 #include "config.h"
 #include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
+#include "graphic/text_constants.h"
 #include "helper.h"
 #include "io/fileread.h"
 #include "io/filewrite.h"
@@ -53,7 +54,6 @@
 #include "notifications/notifications.h"
 #include "scripting/lua_table.h"
 #include "sound/sound_handler.h"
-#include "wui/interactive_base.h"
 
 namespace Widelands {
 

=== modified file 'src/logic/map_objects/tribes/building.cc'
--- src/logic/map_objects/tribes/building.cc	2017-01-25 18:55:59 +0000
+++ src/logic/map_objects/tribes/building.cc	2017-02-28 09:26:14 +0000
@@ -47,7 +47,6 @@
 #include "logic/map_objects/tribes/worker.h"
 #include "logic/player.h"
 #include "sound/sound_handler.h"
-#include "wui/interactive_player.h"
 
 namespace Widelands {
 
@@ -230,7 +229,6 @@
 
 Building::Building(const BuildingDescr& building_descr)
    : PlayerImmovable(building_descr),
-     optionswindow_(nullptr),
      flag_(nullptr),
      anim_(0),
      animstart_(0),
@@ -239,12 +237,6 @@
      seeing_(false) {
 }
 
-Building::~Building() {
-	if (optionswindow_) {
-		hide_options();
-	}
-}
-
 void Building::load_finish(EditorGameBase& egbase) {
 	auto should_be_deleted = [&egbase, this](const OPtr<Worker>& optr) {
 		Worker& worker = *optr.get(egbase);
@@ -395,9 +387,6 @@
 	}
 
 	PlayerImmovable::cleanup(egbase);
-
-	for (boost::signals2::connection& c : options_window_connections)
-		c.disconnect();
 }
 
 /*
@@ -442,6 +431,7 @@
 ===============
 */
 void Building::destroy(EditorGameBase& egbase) {
+	Notifications::publish(NoteBuilding(serial(), NoteBuilding::Action::kDeleted));
 	const bool fire = burn_on_destroy();
 	const Coords pos = position_;
 	Player* building_owner = get_owner();
@@ -690,14 +680,14 @@
 		}
 	}
 	PlayerImmovable::add_worker(worker);
-	workers_changed();
+	Notifications::publish(NoteBuilding(serial(), NoteBuilding::Action::kWorkersChanged));
 }
 
 void Building::remove_worker(Worker& worker) {
 	PlayerImmovable::remove_worker(worker);
 	if (!get_workers().size())
 		set_seeing(false);
-	workers_changed();
+	Notifications::publish(NoteBuilding(serial(), NoteBuilding::Action::kWorkersChanged));
 }
 
 /**

=== modified file 'src/logic/map_objects/tribes/building.h'
--- src/logic/map_objects/tribes/building.h	2017-01-25 18:55:59 +0000
+++ src/logic/map_objects/tribes/building.h	2017-02-28 09:26:14 +0000
@@ -35,13 +35,10 @@
 #include "logic/map_objects/tribes/workarea_info.h"
 #include "logic/message.h"
 #include "logic/widelands.h"
+#include "notifications/notifications.h"
 #include "scripting/lua_table.h"
 
-namespace UI {
-class Window;
-}
 struct BuildingHints;
-class InteractiveGameBase;
 class Image;
 
 namespace Widelands {
@@ -191,6 +188,19 @@
 	DISALLOW_COPY_AND_ASSIGN(BuildingDescr);
 };
 
+struct NoteBuilding {
+	CAN_BE_SENT_AS_NOTE(NoteId::Building)
+
+	Serial serial;
+
+	enum class Action { kChanged, kDeleted, kStartWarp, kFinishWarp, kWorkersChanged };
+	const Action action;
+
+	NoteBuilding(Serial init_serial, const Action& init_action)
+	   : serial(init_serial), action(init_action) {
+	}
+};
+
 class Building : public PlayerImmovable {
 	friend class BuildingDescr;
 	friend class MapBuildingdataPacket;
@@ -211,7 +221,6 @@
 	enum class InfoStringFormat { kCensus, kStatistics, kTooltip };
 
 	Building(const BuildingDescr&);
-	virtual ~Building();
 
 	void load_finish(EditorGameBase&) override;
 
@@ -241,12 +250,6 @@
 	virtual bool burn_on_destroy();
 	void destroy(EditorGameBase&) override;
 
-	void show_options(InteractiveGameBase&,
-	                  bool avoid_fastclick = false,
-	                  Vector2i pos = Vector2i(-1, -1));
-	void hide_options();
-	void refresh_options(InteractiveGameBase&);
-
 	virtual bool fetch_from_flag(Game&);
 	virtual bool get_building_work(Game&, Worker&, bool success);
 
@@ -289,7 +292,6 @@
 
 	void add_worker(Worker&) override;
 	void remove_worker(Worker&) override;
-	mutable boost::signals2::signal<void()> workers_changed;
 
 	void send_message(Game& game,
 	                  const Message::Type msgtype,
@@ -321,11 +323,8 @@
 	void
 	draw_info(TextToDraw draw_text, const Vector2f& point_on_dst, float scale, RenderTarget* dst);
 
-	virtual void create_options_window(InteractiveGameBase&, UI::Window*& registry) = 0;
-
 	void set_seeing(bool see);
 
-	UI::Window* optionswindow_;
 	Coords position_;
 	Flag* flag_;
 
@@ -346,9 +345,6 @@
 	/// Whether we see our vision_range area based on workers in the building
 	bool seeing_;
 
-	// Signals connected for the option window
-	std::vector<boost::signals2::connection> options_window_connections;
-
 	// The former buildings names, with the current one in last position.
 	FormerBuildings old_buildings_;
 

=== modified file 'src/logic/map_objects/tribes/constructionsite.cc'
--- src/logic/map_objects/tribes/constructionsite.cc	2017-01-28 14:53:28 +0000
+++ src/logic/map_objects/tribes/constructionsite.cc	2017-02-28 09:26:14 +0000
@@ -37,7 +37,6 @@
 #include "logic/map_objects/tribes/worker.h"
 #include "sound/sound_handler.h"
 #include "ui_basic/window.h"
-#include "wui/interactive_gamebase.h"
 
 namespace Widelands {
 
@@ -150,6 +149,8 @@
 ===============
 */
 void ConstructionSite::cleanup(EditorGameBase& egbase) {
+	// Register whether the window was open
+	Notifications::publish(NoteBuilding(serial(), NoteBuilding::Action::kStartWarp));
 	PartiallyFinishedBuilding::cleanup(egbase);
 
 	if (work_steps_ <= work_completed_) {
@@ -162,12 +163,7 @@
 			builder->set_location(&b);
 		}
 		// Open the new building window if needed
-		if (optionswindow_) {
-			Vector2i window_position = optionswindow_->get_pos();
-			hide_options();
-			InteractiveGameBase& igbase = dynamic_cast<InteractiveGameBase&>(*egbase.get_ibase());
-			b.show_options(igbase, false, window_position);
-		}
+		Notifications::publish(NoteBuilding(b.serial(), NoteBuilding::Action::kFinishWarp));
 	}
 }
 

=== modified file 'src/logic/map_objects/tribes/constructionsite.h'
--- src/logic/map_objects/tribes/constructionsite.h	2017-01-25 18:55:59 +0000
+++ src/logic/map_objects/tribes/constructionsite.h	2017-02-28 09:26:14 +0000
@@ -110,7 +110,6 @@
 	uint32_t build_step_time() const override {
 		return CONSTRUCTIONSITE_STEP_TIME;
 	}
-	void create_options_window(InteractiveGameBase&, UI::Window*& registry) override;
 
 	static void wares_queue_callback(Game&, InputQueue*, DescriptionIndex, Worker*, void* data);
 

=== modified file 'src/logic/map_objects/tribes/dismantlesite.h'
--- src/logic/map_objects/tribes/dismantlesite.h	2017-01-25 18:55:59 +0000
+++ src/logic/map_objects/tribes/dismantlesite.h	2017-02-28 09:26:14 +0000
@@ -87,8 +87,6 @@
 		return DISMANTLESITE_STEP_TIME;
 	}
 
-	void create_options_window(InteractiveGameBase&, UI::Window*& registry) override;
-
 	void draw(uint32_t gametime,
 	          TextToDraw draw_text,
 	          const Vector2f& point_on_dst,

=== modified file 'src/logic/map_objects/tribes/militarysite.h'
--- src/logic/map_objects/tribes/militarysite.h	2017-01-25 18:55:59 +0000
+++ src/logic/map_objects/tribes/militarysite.h	2017-02-28 09:26:14 +0000
@@ -134,8 +134,6 @@
 protected:
 	void conquer_area(EditorGameBase&);
 
-	void create_options_window(InteractiveGameBase&, UI::Window*& registry) override;
-
 private:
 	void update_statistics_string(std::string*) override;
 

=== modified file 'src/logic/map_objects/tribes/productionsite.cc'
--- src/logic/map_objects/tribes/productionsite.cc	2017-02-15 19:35:43 +0000
+++ src/logic/map_objects/tribes/productionsite.cc	2017-02-28 09:26:14 +0000
@@ -643,7 +643,7 @@
 	// the last one we need to start working.
 	w->start_task_idle(game, 0, -1);
 	psite.try_start_working(game);
-	psite.workers_changed();
+	Notifications::publish(NoteBuilding(psite.serial(), NoteBuilding::Action::kWorkersChanged));
 }
 
 /**
@@ -723,6 +723,7 @@
 void ProductionSite::set_stopped(bool const stopped) {
 	is_stopped_ = stopped;
 	get_economy()->rebalance_supply();
+	Notifications::publish(NoteBuilding(serial(), NoteBuilding::Action::kChanged));
 }
 
 /**
@@ -925,7 +926,7 @@
 void ProductionSite::train_workers(Game& game) {
 	for (uint32_t i = descr().nr_working_positions(); i;)
 		working_positions_[--i].worker->gain_experience(game);
-	Building::workers_changed();
+	Notifications::publish(NoteBuilding(serial(), NoteBuilding::Action::kWorkersChanged));
 }
 
 void ProductionSite::notify_player(Game& game, uint8_t minutes, FailNotificationType type) {

=== modified file 'src/logic/map_objects/tribes/productionsite.h'
--- src/logic/map_objects/tribes/productionsite.h	2017-02-14 20:22:29 +0000
+++ src/logic/map_objects/tribes/productionsite.h	2017-02-28 09:26:14 +0000
@@ -237,8 +237,6 @@
 protected:
 	void update_statistics_string(std::string* statistics) override;
 
-	void create_options_window(InteractiveGameBase&, UI::Window*& registry) override;
-
 	void load_finish(EditorGameBase& egbase) override;
 
 protected:

=== modified file 'src/logic/map_objects/tribes/ship.cc'
--- src/logic/map_objects/tribes/ship.cc	2017-02-21 20:38:33 +0000
+++ src/logic/map_objects/tribes/ship.cc	2017-02-28 09:26:14 +0000
@@ -32,6 +32,7 @@
 #include "economy/wares_queue.h"
 #include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
+#include "graphic/text_constants.h"
 #include "io/fileread.h"
 #include "io/filewrite.h"
 #include "logic/findbob.h"
@@ -48,7 +49,6 @@
 #include "logic/widelands_geometry_io.h"
 #include "map_io/map_object_loader.h"
 #include "map_io/map_object_saver.h"
-#include "wui/interactive_gamebase.h"
 
 namespace Widelands {
 

=== modified file 'src/logic/map_objects/tribes/trainingsite.h'
--- src/logic/map_objects/tribes/trainingsite.h	2017-01-25 18:55:59 +0000
+++ src/logic/map_objects/tribes/trainingsite.h	2017-02-28 09:26:14 +0000
@@ -209,7 +209,6 @@
 	void training_done();
 
 protected:
-	void create_options_window(InteractiveGameBase&, UI::Window*& registry) override;
 	void program_end(Game&, ProgramResult) override;
 
 private:

=== modified file 'src/logic/map_objects/tribes/warehouse.h'
--- src/logic/map_objects/tribes/warehouse.h	2017-02-18 23:30:16 +0000
+++ src/logic/map_objects/tribes/warehouse.h	2017-02-28 09:26:14 +0000
@@ -253,8 +253,6 @@
 protected:
 	/// Initializes the container sizes for the owner's tribe.
 	void init_containers(Player& owner);
-	/// Create the warehouse information window.
-	void create_options_window(InteractiveGameBase&, UI::Window*& registry) override;
 
 private:
 	void init_portdock(EditorGameBase& egbase);

=== modified file 'src/logic/player.cc'
--- src/logic/player.cc	2017-02-18 14:03:02 +0000
+++ src/logic/player.cc	2017-02-28 09:26:14 +0000
@@ -693,6 +693,8 @@
 			workers = building->get_workers();
 		}
 
+		// Register whether the window was open
+		Notifications::publish(NoteBuilding(building->serial(), NoteBuilding::Action::kStartWarp));
 		building->remove(egbase());  //  no fire or stuff
 		//  Hereafter the old building does not exist and building is a dangling
 		//  pointer.
@@ -701,6 +703,10 @@
 			   position, player_number_, index_of_new_building, false, former_buildings);
 		else
 			building = &egbase().warp_dismantlesite(position, player_number_, false, former_buildings);
+
+		// Open the new building window if needed
+		Notifications::publish(NoteBuilding(building->serial(), NoteBuilding::Action::kFinishWarp));
+
 		//  Hereafter building points to the new building.
 
 		// Reassign the workers and soldiers.

=== modified file 'src/notifications/note_ids.h'
--- src/notifications/note_ids.h	2017-02-12 09:10:57 +0000
+++ src/notifications/note_ids.h	2017-02-28 09:26:14 +0000
@@ -36,6 +36,7 @@
 	TrainingSiteSoldierTrained,
 	ShipMessage,
 	ShipWindow,
+	Building,
 	Economy,
 	GraphicResolutionChanged,
 	NoteExpeditionCanceled

=== modified file 'src/wui/CMakeLists.txt'
--- src/wui/CMakeLists.txt	2017-02-12 09:10:57 +0000
+++ src/wui/CMakeLists.txt	2017-02-28 09:26:14 +0000
@@ -145,13 +145,14 @@
     attack_box.h
     building_statistics_menu.cc
     building_statistics_menu.h
-    building_ui.cc
     buildingwindow.cc
     buildingwindow.h
     constructionsitewindow.cc
+    constructionsitewindow.h
     debugconsole.cc
     debugconsole.h
     dismantlesitewindow.cc
+    dismantlesitewindow.h
     encyclopedia_window.cc
     encyclopedia_window.h
     fieldaction.cc
@@ -194,6 +195,7 @@
     login_box.h
     logmessage.h
     militarysitewindow.cc
+    militarysitewindow.h
     minimap.cc
     minimap.h
     multiplayersetupgroup.cc
@@ -217,6 +219,7 @@
     story_message_box.cc
     story_message_box.h
     trainingsitewindow.cc
+    trainingsitewindow.h
     transport_draw.cc
     tribal_encyclopedia.cc
     tribal_encyclopedia.h
@@ -225,6 +228,7 @@
     ware_statistics_menu.cc
     ware_statistics_menu.h
     warehousewindow.cc
+    warehousewindow.h
     watchwindow.cc
     watchwindow.h
   USES_SDL2

=== removed file 'src/wui/building_ui.cc'
--- src/wui/building_ui.cc	2017-02-17 18:16:35 +0000
+++ src/wui/building_ui.cc	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2002-2017 by the Widelands Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- */
-
-#include "wui/buildingwindow.h"
-
-#include <boost/lexical_cast.hpp>
-
-#include "base/macros.h"
-#include "logic/map_objects/tribes/building.h"
-#include "ui_basic/window.h"
-
-using Widelands::Building;
-
-/**
- * Create the building's options window if necessary and bring it to
- * the top to be seen by the player.
- */
-void Building::show_options(InteractiveGameBase& igbase, bool avoid_fastclick, Vector2i pos) {
-	if (optionswindow_) {
-		if (optionswindow_->is_minimal())
-			optionswindow_->restore();
-		optionswindow_->move_to_top();
-	} else {
-		create_options_window(igbase, optionswindow_);
-		if (upcast(BuildingWindow, bw, optionswindow_)) {
-			bw->set_avoid_fastclick(avoid_fastclick);
-		}
-		// Run a first think here so that certain things like caps buttons
-		// get properly initialized
-		optionswindow_->think();
-	}
-	if (pos.x >= 0 && pos.y >= 0) {
-		optionswindow_->set_pos(pos);
-	}
-}
-
-/**
- * Remove the building's options window.
- */
-void Building::hide_options() {
-	for (boost::signals2::connection& c : options_window_connections)
-		c.disconnect();
-	delete optionswindow_;
-	optionswindow_ = nullptr;
-}
-
-/**
- * refreshs the option window of a building - useful if some ui elements have to be removed or added
- */
-void Building::refresh_options(InteractiveGameBase& igb) {
-	// Only do something if there is actually a window
-	if (optionswindow_) {
-		Vector2i window_position = optionswindow_->get_pos();
-		hide_options();
-		show_options(igb, true);
-		optionswindow_->set_pos(window_position);
-	}
-}

=== modified file 'src/wui/buildingwindow.cc'
--- src/wui/buildingwindow.cc	2017-02-25 13:27:40 +0000
+++ src/wui/buildingwindow.cc	2017-02-28 09:26:14 +0000
@@ -46,58 +46,76 @@
 static const char* pic_debug = "images/wui/fieldaction/menu_debug.png";
 
 BuildingWindow::BuildingWindow(InteractiveGameBase& parent,
+                               UI::UniqueWindow::Registry& reg,
                                Widelands::Building& b,
-                               UI::Window*& registry)
-   : UI::Window(&parent, "building_window", 0, 0, Width, 0, b.descr().descname()),
-     registry_(registry),
+                               bool avoid_fastclick)
+   : UI::UniqueWindow(&parent, "building_window", &reg, Width, 0, b.descr().descname()),
+     is_dying_(false),
+     parent_(&parent),
      building_(b),
      workarea_overlay_id_(0),
-     avoid_fastclick_(false),
+     avoid_fastclick_(avoid_fastclick),
      expeditionbtn_(nullptr) {
-	delete registry_;
-	registry_ = this;
-
+	buildingnotes_subscriber_ = Notifications::subscribe<Widelands::NoteBuilding>(
+	   [this](const Widelands::NoteBuilding& note) { on_building_note(note); });
+}
+
+BuildingWindow::~BuildingWindow() {
+	if (workarea_overlay_id_) {
+		igbase()->mutable_field_overlay_manager()->remove_overlay(workarea_overlay_id_);
+	}
+}
+
+void BuildingWindow::on_building_note(const Widelands::NoteBuilding& note) {
+	if (note.serial == building_.serial()) {
+		switch (note.action) {
+		// The building's state has changed
+		case Widelands::NoteBuilding::Action::kChanged:
+			if (!is_dying_) {
+				init(true);
+			}
+			break;
+		// The building is no more
+		case Widelands::NoteBuilding::Action::kStartWarp:
+			igbase()->add_wanted_building_window(building().get_position(), get_pos(), is_minimal());
+		// Fallthrough intended
+		case Widelands::NoteBuilding::Action::kDeleted:
+			// Stop everybody from thinking to avoid segfaults
+			is_dying_ = true;
+			set_thinks(false);
+			vbox_.reset(nullptr);
+			die();
+			break;
+		default:
+			break;
+		}
+	}
+}
+
+void BuildingWindow::init(bool avoid_fastclick) {
 	capscache_player_number_ = 0;
 	capsbuttons_ = nullptr;
 	capscache_ = 0;
 	caps_setup_ = false;
 	toggle_workarea_ = nullptr;
-
-	UI::Box* vbox = new UI::Box(this, 0, 0, UI::Box::Vertical);
-
-	tabs_ = new UI::TabPanel(vbox, 0, 0, nullptr);
-	vbox->add(tabs_, UI::Box::Resizing::kFullSize);
-
-	capsbuttons_ = new UI::Box(vbox, 0, 0, UI::Box::Horizontal);
-	vbox->add(capsbuttons_, UI::Box::Resizing::kFullSize);
+	avoid_fastclick_ = avoid_fastclick,
+
+	vbox_.reset(new UI::Box(this, 0, 0, UI::Box::Vertical));
+
+	tabs_ = new UI::TabPanel(vbox_.get(), 0, 0, nullptr);
+	vbox_->add(tabs_, UI::Box::Resizing::kFullSize);
+
+	capsbuttons_ = new UI::Box(vbox_.get(), 0, 0, UI::Box::Horizontal);
+	vbox_->add(capsbuttons_, UI::Box::Resizing::kFullSize);
+
 	// actually create buttons on the first call to think(),
 	// so that overriding create_capsbuttons() works
 
-	set_center_panel(vbox);
+	set_center_panel(vbox_.get());
 	set_thinks(true);
 	set_fastclick_panel(this);
-
 	show_workarea();
-
-	// Title for construction site
-	if (upcast(Widelands::ConstructionSite, csite, &building_)) {
-		// Show name in parenthesis as it may take all width already
-		const std::string title = (boost::format("(%s)") % csite->building().descname()).str();
-		set_title(title);
-	}
-}
-
-BuildingWindow::~BuildingWindow() {
-	if (workarea_overlay_id_) {
-		igbase().mutable_field_overlay_manager()->remove_overlay(workarea_overlay_id_);
-	}
-	registry_ = nullptr;
-}
-
-namespace Widelands {
-class BuildingDescr;
-}
-using Widelands::Building;
+}
 
 /*
 ===============
@@ -122,16 +140,17 @@
 ===============
 */
 void BuildingWindow::think() {
-	if (!igbase().can_see(building().owner().player_number()))
+	if (!igbase()->can_see(building().owner().player_number()))
 		die();
 
-	if (!caps_setup_ || capscache_player_number_ != igbase().player_number() ||
+	if (!caps_setup_ || capscache_player_number_ != igbase()->player_number() ||
 	    building().get_playercaps() != capscache_) {
 		capsbuttons_->free_children();
 		create_capsbuttons(capsbuttons_);
-		move_out_of_the_way();
-		if (!avoid_fastclick_)
+		if (!avoid_fastclick_) {
+			move_out_of_the_way();
 			warp_mouse_to_fastclick_panel();
+		}
 		caps_setup_ = true;
 	}
 
@@ -147,12 +166,12 @@
  */
 void BuildingWindow::create_capsbuttons(UI::Box* capsbuttons) {
 	capscache_ = building().get_playercaps();
-	capscache_player_number_ = igbase().player_number();
+	capscache_player_number_ = igbase()->player_number();
 
 	const Widelands::Player& owner = building().owner();
 	const Widelands::PlayerNumber owner_number = owner.player_number();
-	const bool can_see = igbase().can_see(owner_number);
-	const bool can_act = igbase().can_act(owner_number);
+	const bool can_see = igbase()->can_see(owner_number);
+	const bool can_act = igbase()->can_act(owner_number);
 
 	bool requires_destruction_separator = false;
 	if (can_act) {
@@ -280,7 +299,7 @@
 			set_fastclick_panel(toggle_workarea_);
 		}
 
-		if (igbase().get_display_flag(InteractiveBase::dfDebug)) {
+		if (igbase()->get_display_flag(InteractiveBase::dfDebug)) {
 			UI::Button* debugbtn = new UI::Button(
 			   capsbuttons, "debug", 0, 0, 34, 34, g_gr->images().get("images/ui_basic/but4.png"),
 			   g_gr->images().get(pic_debug), _("Show Debug Window"));
@@ -305,10 +324,10 @@
 		   g_gr->images().get("images/ui_basic/menu_help.png"), _("Help"));
 
 		UI::UniqueWindow::Registry& registry =
-		   igbase().unique_windows().get_registry(building_.descr().name() + "_help");
+		   igbase()->unique_windows().get_registry(building_.descr().name() + "_help");
 		registry.open_window = [this, &registry] {
-			new UI::BuildingHelpWindow(&igbase(), registry, building_.descr(),
-			                           building_.owner().tribe(), &igbase().egbase().lua());
+			new UI::BuildingHelpWindow(igbase(), registry, building_.descr(),
+			                           building_.owner().tribe(), &igbase()->egbase().lua());
 		};
 
 		helpbtn->sigclicked.connect(
@@ -325,9 +344,9 @@
 void BuildingWindow::act_bulldoze() {
 	if (SDL_GetModState() & KMOD_CTRL) {
 		if (building_.get_playercaps() & Widelands::Building::PCap_Bulldoze)
-			igbase().game().send_player_bulldoze(building_);
+			igbase()->game().send_player_bulldoze(building_);
 	} else {
-		show_bulldoze_confirm(dynamic_cast<InteractivePlayer&>(igbase()), building_);
+		show_bulldoze_confirm(dynamic_cast<InteractivePlayer&>(*igbase()), building_);
 	}
 }
 
@@ -339,9 +358,9 @@
 void BuildingWindow::act_dismantle() {
 	if (SDL_GetModState() & KMOD_CTRL) {
 		if (building_.get_playercaps() & Widelands::Building::PCap_Dismantle)
-			igbase().game().send_player_dismantle(building_);
+			igbase()->game().send_player_dismantle(building_);
 	} else {
-		show_dismantle_confirm(dynamic_cast<InteractivePlayer&>(igbase()), building_);
+		show_dismantle_confirm(dynamic_cast<InteractivePlayer&>(*igbase()), building_);
 	}
 }
 
@@ -351,10 +370,9 @@
 ===============
 */
 void BuildingWindow::act_start_stop() {
-	if (dynamic_cast<const Widelands::ProductionSite*>(&building_))
-		igbase().game().send_player_start_stop_building(building_);
-
-	die();
+	if (dynamic_cast<const Widelands::ProductionSite*>(&building_)) {
+		igbase()->game().send_player_start_stop_building(building_);
+	}
 }
 
 /**
@@ -366,7 +384,7 @@
 	if (upcast(Widelands::Warehouse const, warehouse, &building_)) {
 		if (warehouse->get_portdock()) {
 			expeditionbtn_->set_enabled(false);
-			igbase().game().send_player_start_or_cancel_expedition(building_);
+			igbase()->game().send_player_start_or_cancel_expedition(building_);
 		}
 		get_tabs()->activate("expedition_wares_queue");
 	}
@@ -383,9 +401,9 @@
 void BuildingWindow::act_enhance(Widelands::DescriptionIndex id) {
 	if (SDL_GetModState() & KMOD_CTRL) {
 		if (building_.get_playercaps() & Widelands::Building::PCap_Enhancable)
-			igbase().game().send_player_enhance_building(building_, id);
+			igbase()->game().send_player_enhance_building(building_, id);
 	} else {
-		show_enhance_confirm(dynamic_cast<InteractivePlayer&>(igbase()), building_, id);
+		show_enhance_confirm(dynamic_cast<InteractivePlayer&>(*igbase()), building_, id);
 	}
 }
 
@@ -395,7 +413,7 @@
 ===============
 */
 void BuildingWindow::act_debug() {
-	show_field_debug(igbase(), igbase().game().map().get_fcoords(building_.get_position()));
+	show_field_debug(*igbase(), igbase()->game().map().get_fcoords(building_.get_position()));
 }
 
 /**
@@ -414,7 +432,7 @@
 	if (workarea_info.empty()) {
 		return;
 	}
-	workarea_overlay_id_ = igbase().show_work_area(workarea_info, building_.get_position());
+	workarea_overlay_id_ = igbase()->show_work_area(workarea_info, building_.get_position());
 
 	configure_workarea_button();
 }
@@ -424,7 +442,7 @@
  */
 void BuildingWindow::hide_workarea() {
 	if (workarea_overlay_id_) {
-		igbase().hide_work_area(workarea_overlay_id_);
+		igbase()->hide_work_area(workarea_overlay_id_);
 		workarea_overlay_id_ = 0;
 
 		configure_workarea_button();
@@ -459,7 +477,7 @@
                                               Widelands::InputQueue* const iq,
                                               bool show_only) {
 	// The *max* width should be larger than the default width
-	box->add(new InputQueueDisplay(box, 0, 0, igbase(), b, iq, show_only));
+	box->add(new InputQueueDisplay(box, 0, 0, *igbase(), b, iq, show_only));
 }
 
 /**
@@ -467,7 +485,7 @@
  * for the corresponding button.
  */
 void BuildingWindow::clicked_goto() {
-	igbase().scroll_to_field(building().get_position(), MapView::Transition::Smooth);
+	igbase()->scroll_to_field(building().get_position(), MapView::Transition::Smooth);
 }
 
 void BuildingWindow::update_expedition_button(bool expedition_was_canceled) {

=== modified file 'src/wui/buildingwindow.h'
--- src/wui/buildingwindow.h	2017-01-25 18:55:59 +0000
+++ src/wui/buildingwindow.h	2017-02-28 09:26:14 +0000
@@ -24,8 +24,10 @@
 #include <memory>
 
 #include "economy/expedition_bootstrap.h"
+#include "logic/map_objects/tribes/building.h"
+#include "notifications/notifications.h"
 #include "ui_basic/button.h"
-#include "ui_basic/window.h"
+#include "ui_basic/unique_window.h"
 #include "wui/field_overlay_manager.h"
 #include "wui/interactive_gamebase.h"
 #include "wui/waresdisplay.h"
@@ -35,14 +37,17 @@
  *
  * This class is sub-classed for all building types to provide something useful.
  */
-struct BuildingWindow : public UI::Window {
+struct BuildingWindow : public UI::UniqueWindow {
 	friend struct TrainingSiteWindow;
 	friend struct MilitarySiteWindow;
 	enum {
 		Width = 4 * 34  //  4 normally sized buttons
 	};
 
-	BuildingWindow(InteractiveGameBase& parent, Widelands::Building&, UI::Window*& registry);
+	BuildingWindow(InteractiveGameBase& parent,
+	               UI::UniqueWindow::Registry& reg,
+	               Widelands::Building&,
+	               bool avoid_fastclick);
 
 	virtual ~BuildingWindow();
 
@@ -50,17 +55,16 @@
 		return building_;
 	}
 
-	InteractiveGameBase& igbase() const {
-		return dynamic_cast<InteractiveGameBase&>(*get_parent());
+	InteractiveGameBase* igbase() const {
+		return parent_;
 	}
 
 	void draw(RenderTarget&) override;
 	void think() override;
-	void set_avoid_fastclick(bool afc) {
-		avoid_fastclick_ = afc;
-	}
 
 protected:
+	virtual void init(bool avoid_fastclick);
+
 	UI::TabPanel* get_tabs() {
 		return tabs_;
 	}
@@ -82,11 +86,16 @@
 
 	virtual void create_capsbuttons(UI::Box* buttons);
 
-	UI::Window*& registry_;
+	bool is_dying_;
 
 private:
+	InteractiveGameBase* parent_;
+	/// Actions performed when a NoteBuilding is received.
+	void on_building_note(const Widelands::NoteBuilding& note);
 	Widelands::Building& building_;
 
+	std::unique_ptr<UI::Box> vbox_;
+
 	UI::TabPanel* tabs_;
 
 	UI::Box* capsbuttons_;  ///< \ref UI::Box that contains capabilities buttons
@@ -106,6 +115,8 @@
 	UI::Button* expeditionbtn_;
 	std::unique_ptr<Notifications::Subscriber<Widelands::NoteExpeditionCanceled>>
 	   expedition_canceled_subscriber_;
+	std::unique_ptr<Notifications::Subscriber<Widelands::NoteBuilding>> buildingnotes_subscriber_;
+	DISALLOW_COPY_AND_ASSIGN(BuildingWindow);
 };
 
 #endif  // end of include guard: WL_WUI_BUILDINGWINDOW_H

=== modified file 'src/wui/constructionsitewindow.cc'
--- src/wui/constructionsitewindow.cc	2017-02-26 11:00:07 +0000
+++ src/wui/constructionsitewindow.cc	2017-02-28 09:26:14 +0000
@@ -17,35 +17,27 @@
  *
  */
 
-#include "wui/buildingwindow.h"
+#include "wui/constructionsitewindow.h"
 
-#include "wui/inputqueuedisplay.h"
+#include <boost/format.hpp>
 
 #include "graphic/graphic.h"
-#include "logic/map_objects/tribes/constructionsite.h"
-#include "ui_basic/progressbar.h"
 #include "ui_basic/tabpanel.h"
+#include "wui/inputqueuedisplay.h"
 
 static const char pic_tab_wares[] = "images/wui/buildings/menu_tab_wares.png";
 
-/**
- * Status window for construction sites.
- */
-struct ConstructionSiteWindow : public BuildingWindow {
-	ConstructionSiteWindow(InteractiveGameBase& parent,
-	                       Widelands::ConstructionSite&,
-	                       UI::Window*& registry);
-
-	void think() override;
-
-private:
-	UI::ProgressBar* progress_;
-};
-
 ConstructionSiteWindow::ConstructionSiteWindow(InteractiveGameBase& parent,
+                                               UI::UniqueWindow::Registry& reg,
                                                Widelands::ConstructionSite& cs,
-                                               UI::Window*& registry)
-   : BuildingWindow(parent, cs, registry) {
+                                               bool avoid_fastclick)
+   : BuildingWindow(parent, reg, cs, avoid_fastclick) {
+	init(avoid_fastclick);
+}
+
+void ConstructionSiteWindow::init(bool avoid_fastclick) {
+	BuildingWindow::init(avoid_fastclick);
+	Widelands::ConstructionSite& cs = dynamic_cast<Widelands::ConstructionSite&>(building());
 	UI::Box& box = *new UI::Box(get_tabs(), 0, 0, UI::Box::Vertical);
 
 	// Add the progress bar
@@ -58,9 +50,12 @@
 
 	// Add the wares queue
 	for (uint32_t i = 0; i < cs.get_nrwaresqueues(); ++i)
-		box.add(new InputQueueDisplay(&box, 0, 0, igbase(), cs, cs.get_waresqueue(i)));
+		box.add(new InputQueueDisplay(&box, 0, 0, *igbase(), cs, cs.get_waresqueue(i)));
 
 	get_tabs()->add("wares", g_gr->images().get(pic_tab_wares), &box, _("Building materials"));
+
+	set_title((boost::format("(%s)") % cs.building().descname()).str());
+	think();
 }
 
 /*
@@ -75,13 +70,3 @@
 
 	progress_->set_state(cs.get_built_per64k());
 }
-
-/*
-===============
-Create the status window describing the construction site.
-===============
-*/
-void Widelands::ConstructionSite::create_options_window(InteractiveGameBase& parent,
-                                                        UI::Window*& registry) {
-	new ConstructionSiteWindow(parent, *this, registry);
-}

=== added file 'src/wui/constructionsitewindow.h'
--- src/wui/constructionsitewindow.h	1970-01-01 00:00:00 +0000
+++ src/wui/constructionsitewindow.h	2017-02-28 09:26:14 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2002-2016 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ */
+
+#ifndef WL_WUI_CONSTRUCTIONSITEWINDOW_H
+#define WL_WUI_CONSTRUCTIONSITEWINDOW_H
+
+#include "logic/map_objects/tribes/constructionsite.h"
+#include "ui_basic/progressbar.h"
+#include "wui/buildingwindow.h"
+
+/**
+ * Status window for construction sites.
+ */
+struct ConstructionSiteWindow : public BuildingWindow {
+	ConstructionSiteWindow(InteractiveGameBase& parent,
+	                       UI::UniqueWindow::Registry& reg,
+	                       Widelands::ConstructionSite&,
+	                       bool avoid_fastclick);
+
+	void think() override;
+
+protected:
+	void init(bool avoid_fastclick) override;
+
+private:
+	UI::ProgressBar* progress_;
+	DISALLOW_COPY_AND_ASSIGN(ConstructionSiteWindow);
+};
+
+#endif  // end of include guard: WL_WUI_CONSTRUCTIONSITEWINDOW_H

=== modified file 'src/wui/dismantlesitewindow.cc'
--- src/wui/dismantlesitewindow.cc	2017-02-25 13:27:40 +0000
+++ src/wui/dismantlesitewindow.cc	2017-02-28 09:26:14 +0000
@@ -17,33 +17,24 @@
  *
  */
 
-#include "logic/map_objects/tribes/dismantlesite.h"
+#include "wui/dismantlesitewindow.h"
 
 #include "graphic/graphic.h"
-#include "ui_basic/progressbar.h"
 #include "ui_basic/tabpanel.h"
-#include "wui/buildingwindow.h"
 
 static const char pic_tab_wares[] = "images/wui/buildings/menu_tab_wares.png";
 
-/**
- * Status window for dismantle sites.
- */
-struct DismantleSiteWindow : public BuildingWindow {
-	DismantleSiteWindow(InteractiveGameBase& parent,
-	                    Widelands::DismantleSite&,
-	                    UI::Window*& registry);
-
-	void think() override;
-
-private:
-	UI::ProgressBar* progress_;
-};
-
 DismantleSiteWindow::DismantleSiteWindow(InteractiveGameBase& parent,
-                                         Widelands::DismantleSite& cs,
-                                         UI::Window*& registry)
-   : BuildingWindow(parent, cs, registry) {
+                                         UI::UniqueWindow::Registry& reg,
+                                         Widelands::DismantleSite& ds,
+                                         bool avoid_fastclick)
+   : BuildingWindow(parent, reg, ds, avoid_fastclick) {
+	init(avoid_fastclick);
+}
+
+void DismantleSiteWindow::init(bool avoid_fastclick) {
+	BuildingWindow::init(avoid_fastclick);
+	Widelands::DismantleSite& ds = dynamic_cast<Widelands::DismantleSite&>(building());
 	UI::Box& box = *new UI::Box(get_tabs(), 0, 0, UI::Box::Vertical);
 
 	// Add the progress bar
@@ -55,10 +46,11 @@
 	box.add_space(8);
 
 	// Add the wares queue
-	for (uint32_t i = 0; i < cs.get_nrwaresqueues(); ++i)
-		BuildingWindow::create_input_queue_panel(&box, cs, cs.get_waresqueue(i), true);
+	for (uint32_t i = 0; i < ds.get_nrwaresqueues(); ++i)
+		BuildingWindow::create_input_queue_panel(&box, ds, ds.get_waresqueue(i), true);
 
 	get_tabs()->add("wares", g_gr->images().get(pic_tab_wares), &box, _("Building materials"));
+	think();
 }
 
 /*
@@ -73,13 +65,3 @@
 
 	progress_->set_state(ds.get_built_per64k());
 }
-
-/*
-===============
-Create the status window describing the site.
-===============
-*/
-void Widelands::DismantleSite::create_options_window(InteractiveGameBase& parent,
-                                                     UI::Window*& registry) {
-	new DismantleSiteWindow(parent, *this, registry);
-}

=== added file 'src/wui/dismantlesitewindow.h'
--- src/wui/dismantlesitewindow.h	1970-01-01 00:00:00 +0000
+++ src/wui/dismantlesitewindow.h	2017-02-28 09:26:14 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2002-2016 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ */
+
+#ifndef WL_WUI_DISMANTLESITEWINDOW_H
+#define WL_WUI_DISMANTLESITEWINDOW_H
+
+#include "logic/map_objects/tribes/dismantlesite.h"
+#include "ui_basic/progressbar.h"
+#include "wui/buildingwindow.h"
+
+/**
+ * Status window for dismantle sites.
+ */
+struct DismantleSiteWindow : public BuildingWindow {
+	DismantleSiteWindow(InteractiveGameBase& parent,
+	                    UI::UniqueWindow::Registry& reg,
+	                    Widelands::DismantleSite&,
+	                    bool avoid_fastclick);
+
+	void think() override;
+
+protected:
+	void init(bool avoid_fastclick) override;
+
+private:
+	UI::ProgressBar* progress_;
+	DISALLOW_COPY_AND_ASSIGN(DismantleSiteWindow);
+};
+
+#endif  // end of include guard: WL_WUI_DISMANTLESITEWINDOW_H

=== modified file 'src/wui/interactive_gamebase.cc'
--- src/wui/interactive_gamebase.cc	2017-02-24 08:07:50 +0000
+++ src/wui/interactive_gamebase.cc	2017-02-28 09:26:14 +0000
@@ -33,9 +33,15 @@
 #include "logic/map_objects/tribes/ship.h"
 #include "logic/player.h"
 #include "profile/profile.h"
+#include "wui/constructionsitewindow.h"
+#include "wui/dismantlesitewindow.h"
 #include "wui/game_summary.h"
+#include "wui/militarysitewindow.h"
+#include "wui/productionsitewindow.h"
 #include "wui/shipwindow.h"
+#include "wui/trainingsitewindow.h"
 #include "wui/unique_window_handler.h"
+#include "wui/warehousewindow.h"
 
 namespace {
 
@@ -56,6 +62,28 @@
      chat_provider_(nullptr),
      multiplayer_(multiplayer),
      playertype_(pt) {
+	buildingnotes_subscriber_ = Notifications::subscribe<Widelands::NoteBuilding>(
+	   [this](const Widelands::NoteBuilding& note) {
+		   switch (note.action) {
+		   case Widelands::NoteBuilding::Action::kFinishWarp: {
+			   if (upcast(
+			          Widelands::Building const, building, game().objects().get_object(note.serial))) {
+				   const Widelands::Coords coords = building->get_position();
+				   // Check whether the window is wanted
+				   if (wanted_building_windows_.count(coords.hash()) == 1) {
+					   UI::UniqueWindow* building_window = show_building_window(coords, true);
+					   building_window->set_pos(wanted_building_windows_.at(coords.hash()).first);
+					   if (wanted_building_windows_.at(coords.hash()).second) {
+						   building_window->minimize();
+					   }
+					   wanted_building_windows_.erase(coords.hash());
+				   }
+			   }
+		   } break;
+		   default:
+			   break;
+		   }
+		});
 }
 
 /// \return a pointer to the running \ref Game instance.
@@ -129,6 +157,68 @@
 	toggle_buildhelp_->set_perm_pressed(value);
 }
 
+void InteractiveGameBase::add_wanted_building_window(const Widelands::Coords& coords,
+                                                     const Vector2i point,
+                                                     bool was_minimal) {
+	wanted_building_windows_.insert(
+		std::make_pair(coords.hash(), std::make_pair(point, was_minimal)));
+}
+
+UI::UniqueWindow* InteractiveGameBase::show_building_window(const Widelands::Coords& coord,
+                                                            bool avoid_fastclick) {
+	Widelands::BaseImmovable* immovable = game().map().get_immovable(coord);
+	upcast(Widelands::Building, building, immovable);
+	assert(building);
+	UI::UniqueWindow::Registry& registry =
+	   unique_windows().get_registry((boost::format("building_%d") % building->serial()).str());
+
+	switch (building->descr().type()) {
+	case Widelands::MapObjectType::CONSTRUCTIONSITE:
+		registry.open_window = [this, &registry, building, avoid_fastclick] {
+			new ConstructionSiteWindow(*this, registry,
+			                           *dynamic_cast<Widelands::ConstructionSite*>(building),
+			                           avoid_fastclick);
+		};
+		break;
+	case Widelands::MapObjectType::DISMANTLESITE:
+		registry.open_window = [this, &registry, building, avoid_fastclick] {
+			new DismantleSiteWindow(
+			   *this, registry, *dynamic_cast<Widelands::DismantleSite*>(building), avoid_fastclick);
+		};
+		break;
+	case Widelands::MapObjectType::MILITARYSITE:
+		registry.open_window = [this, &registry, building, avoid_fastclick] {
+			new MilitarySiteWindow(
+			   *this, registry, *dynamic_cast<Widelands::MilitarySite*>(building), avoid_fastclick);
+		};
+		break;
+	case Widelands::MapObjectType::PRODUCTIONSITE:
+		registry.open_window = [this, &registry, building, avoid_fastclick] {
+			new ProductionSiteWindow(
+			   *this, registry, *dynamic_cast<Widelands::ProductionSite*>(building), avoid_fastclick);
+		};
+		break;
+	case Widelands::MapObjectType::TRAININGSITE:
+		registry.open_window = [this, &registry, building, avoid_fastclick] {
+			new TrainingSiteWindow(
+			   *this, registry, *dynamic_cast<Widelands::TrainingSite*>(building), avoid_fastclick);
+		};
+		break;
+	case Widelands::MapObjectType::WAREHOUSE:
+		registry.open_window = [this, &registry, building, avoid_fastclick] {
+			new WarehouseWindow(
+			   *this, registry, *dynamic_cast<Widelands::Warehouse*>(building), avoid_fastclick);
+		};
+		break;
+	default:
+		log("Unable to show window for building '%s', type '%s'.\n", building->descr().name().c_str(),
+		    to_string(building->descr().type()).c_str());
+		NEVER_HERE();
+	}
+	registry.create();
+	return registry.window;
+}
+
 /**
  * See if we can reasonably open a ship window at the current selection position.
  * If so, do it and return true; otherwise, return false.

=== modified file 'src/wui/interactive_gamebase.h'
--- src/wui/interactive_gamebase.h	2017-01-25 18:55:59 +0000
+++ src/wui/interactive_gamebase.h	2017-02-28 09:26:14 +0000
@@ -20,8 +20,12 @@
 #ifndef WL_WUI_INTERACTIVE_GAMEBASE_H
 #define WL_WUI_INTERACTIVE_GAMEBASE_H
 
+#include <map>
+#include <memory>
+
 #include "logic/game.h"
 #include "profile/profile.h"
+#include "ui_basic/unique_window.h"
 #include "wui/general_statistics_menu.h"
 #include "wui/interactive_base.h"
 
@@ -69,6 +73,10 @@
 		playertype_ = pt;
 	}
 
+	void add_wanted_building_window(const Widelands::Coords& coords,
+	                                const Vector2i point,
+	                                bool was_minimal);
+	UI::UniqueWindow* show_building_window(const Widelands::Coords& coords, bool avoid_fastclick);
 	bool try_show_ship_window();
 	bool is_multiplayer() {
 		return multiplayer_;
@@ -94,6 +102,10 @@
 
 private:
 	void on_buildhelp_changed(const bool value) override;
+	// Building coordinates, window position, whether the window was minimized
+	std::map<uint32_t, std::pair<const Vector2i, bool>>
+	   wanted_building_windows_;
+	std::unique_ptr<Notifications::Subscriber<Widelands::NoteBuilding>> buildingnotes_subscriber_;
 };
 
 #endif  // end of include guard: WL_WUI_INTERACTIVE_GAMEBASE_H

=== modified file 'src/wui/interactive_player.cc'
--- src/wui/interactive_player.cc	2017-02-12 09:10:57 +0000
+++ src/wui/interactive_player.cc	2017-02-28 09:26:14 +0000
@@ -195,8 +195,10 @@
 	if (1 < player().vision(Map::get_index(get_sel_pos().node, map.get_width()))) {
 		// Special case for buildings
 		if (upcast(Building, building, map.get_immovable(get_sel_pos().node)))
-			if (can_see(building->owner().player_number()))
-				return building->show_options(*this);
+			if (can_see(building->owner().player_number())) {
+				show_building_window(get_sel_pos().node, false);
+				return;
+			}
 
 		if (!is_building_road()) {
 			if (try_show_ship_window())

=== modified file 'src/wui/interactive_spectator.cc'
--- src/wui/interactive_spectator.cc	2017-01-25 18:55:59 +0000
+++ src/wui/interactive_spectator.cc	2017-02-28 09:26:14 +0000
@@ -142,12 +142,15 @@
  * Observer has clicked on the given node; bring up the context menu.
  */
 void InteractiveSpectator::node_action() {
-	if  //  special case for buildings
-	   (upcast(Widelands::Building, building, egbase().map().get_immovable(get_sel_pos().node)))
-		return building->show_options(*this);
+	// Special case for buildings
+	if (is_a(Widelands::Building, egbase().map().get_immovable(get_sel_pos().node))) {
+		show_building_window(get_sel_pos().node, false);
+		return;
+	}
 
-	if (try_show_ship_window())
+	if (try_show_ship_window()) {
 		return;
+	}
 
 	//  everything else can bring up the temporary dialog
 	show_field_action(this, nullptr, &fieldaction_);

=== modified file 'src/wui/militarysitewindow.cc'
--- src/wui/militarysitewindow.cc	2017-01-25 18:55:59 +0000
+++ src/wui/militarysitewindow.cc	2017-02-28 09:26:14 +0000
@@ -17,47 +17,30 @@
  *
  */
 
-#include "logic/map_objects/tribes/militarysite.h"
+#include "wui/militarysitewindow.h"
 
 #include "graphic/graphic.h"
 #include "ui_basic/tabpanel.h"
-#include "wui/buildingwindow.h"
 #include "wui/soldiercapacitycontrol.h"
 #include "wui/soldierlist.h"
 
-using Widelands::MilitarySite;
-
 static char const* pic_tab_military = "images/wui/buildings/menu_tab_military.png";
 
-/**
- * Status window for \ref MilitarySite
- */
-struct MilitarySiteWindow : public BuildingWindow {
-	MilitarySiteWindow(InteractiveGameBase& parent, MilitarySite&, UI::Window*& registry);
-
-	MilitarySite& militarysite() {
-		return dynamic_cast<MilitarySite&>(building());
-	}
-
-protected:
-	void create_capsbuttons(UI::Box* buttons) override;
-};
-
 MilitarySiteWindow::MilitarySiteWindow(InteractiveGameBase& parent,
-                                       MilitarySite& ms,
-                                       UI::Window*& registry)
-   : BuildingWindow(parent, ms, registry) {
-	get_tabs()->add("soldiers", g_gr->images().get(pic_tab_military),
-	                create_soldier_list(*get_tabs(), parent, militarysite()), _("Soldiers"));
+                                       UI::UniqueWindow::Registry& reg,
+                                       Widelands::MilitarySite& ms,
+                                       bool avoid_fastclick)
+   : BuildingWindow(parent, reg, ms, avoid_fastclick) {
+	init(avoid_fastclick);
 }
 
 void MilitarySiteWindow::create_capsbuttons(UI::Box* buttons) {
 	BuildingWindow::create_capsbuttons(buttons);
 }
 
-/**
- * Create the  military site information window.
- */
-void MilitarySite::create_options_window(InteractiveGameBase& plr, UI::Window*& registry) {
-	new MilitarySiteWindow(plr, *this, registry);
+void MilitarySiteWindow::init(bool avoid_fastclick) {
+	BuildingWindow::init(avoid_fastclick);
+	get_tabs()->add("soldiers", g_gr->images().get(pic_tab_military),
+	                create_soldier_list(*get_tabs(), *igbase(), militarysite()), _("Soldiers"));
+	think();
 }

=== added file 'src/wui/militarysitewindow.h'
--- src/wui/militarysitewindow.h	1970-01-01 00:00:00 +0000
+++ src/wui/militarysitewindow.h	2017-02-28 09:26:14 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2002-2016 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ */
+
+#ifndef WL_WUI_MILITARYSITEWINDOW_H
+#define WL_WUI_MILITARYSITEWINDOW_H
+
+#include "logic/map_objects/tribes/militarysite.h"
+#include "wui/buildingwindow.h"
+
+/**
+ * Status window for \ref MilitarySite
+ */
+struct MilitarySiteWindow : public BuildingWindow {
+	MilitarySiteWindow(InteractiveGameBase& parent,
+	                   UI::UniqueWindow::Registry& reg,
+	                   Widelands::MilitarySite&,
+	                   bool avoid_fastclick);
+
+	Widelands::MilitarySite& militarysite() {
+		return dynamic_cast<Widelands::MilitarySite&>(building());
+	}
+
+protected:
+	void init(bool avoid_fastclick) override;
+	void create_capsbuttons(UI::Box* buttons) override;
+
+private:
+	DISALLOW_COPY_AND_ASSIGN(MilitarySiteWindow);
+};
+
+#endif  // end of include guard: WL_WUI_MILITARYSITEWINDOW_H

=== modified file 'src/wui/productionsitewindow.cc'
--- src/wui/productionsitewindow.cc	2017-02-25 13:27:40 +0000
+++ src/wui/productionsitewindow.cc	2017-02-28 09:26:14 +0000
@@ -24,17 +24,12 @@
 #include "economy/input_queue.h"
 #include "economy/request.h"
 #include "graphic/graphic.h"
-#include "logic/map_objects/tribes/constructionsite.h"
-#include "logic/map_objects/tribes/militarysite.h"
-#include "logic/map_objects/tribes/trainingsite.h"
 #include "logic/map_objects/tribes/tribe_descr.h"
 #include "logic/map_objects/tribes/worker.h"
 #include "ui_basic/tabpanel.h"
 #include "ui_basic/textarea.h"
 #include "wui/inputqueuedisplay.h"
 
-using Widelands::ProductionSite;
-
 static char const* pic_tab_wares = "images/wui/buildings/menu_tab_wares.png";
 static char const* pic_tab_workers = "images/wui/buildings/menu_list_workers.png";
 
@@ -44,10 +39,28 @@
 ===============
 */
 ProductionSiteWindow::ProductionSiteWindow(InteractiveGameBase& parent,
-                                           ProductionSite& ps,
-                                           UI::Window*& registry)
-   : BuildingWindow(parent, ps, registry) {
-	const std::vector<Widelands::InputQueue*>& inputqueues = ps.inputqueues();
+                                           UI::UniqueWindow::Registry& reg,
+                                           Widelands::ProductionSite& ps,
+                                           bool avoid_fastclick)
+   : BuildingWindow(parent, reg, ps, avoid_fastclick) {
+	productionsitenotes_subscriber_ = Notifications::subscribe<Widelands::NoteBuilding>(
+	   [this](const Widelands::NoteBuilding& note) {
+		   if (note.serial == building().serial() && !is_dying_) {
+			   switch (note.action) {
+			   case Widelands::NoteBuilding::Action::kWorkersChanged:
+				   update_worker_table();
+				   break;
+			   default:
+				   break;
+			   }
+		   }
+		});
+	init(avoid_fastclick);
+}
+
+void ProductionSiteWindow::init(bool avoid_fastclick) {
+	BuildingWindow::init(avoid_fastclick);
+	const std::vector<Widelands::InputQueue*>& inputqueues = productionsite().inputqueues();
 
 	if (inputqueues.size()) {
 		// Add the wares tab
@@ -55,7 +68,8 @@
 		   get_tabs(), 0, 0, UI::Box::Vertical, g_gr->get_xres() - 80, g_gr->get_yres() - 80);
 
 		for (uint32_t i = 0; i < inputqueues.size(); ++i) {
-			prod_box->add(new InputQueueDisplay(prod_box, 0, 0, igbase(), ps, inputqueues[i]));
+			prod_box->add(
+			   new InputQueueDisplay(prod_box, 0, 0, *igbase(), productionsite(), inputqueues[i]));
 		}
 
 		get_tabs()->add("wares", g_gr->images().get(pic_tab_wares), prod_box, _("Wares"));
@@ -79,7 +93,7 @@
 		}
 		worker_table_->fit_height();
 
-		if (igbase().can_act(building().owner().player_number())) {
+		if (igbase()->can_act(building().owner().player_number())) {
 			worker_caps_->add_inf_space();
 			UI::Button* evict_button = new UI::Button(
 			   worker_caps_, "evict", 0, 0, 34, 34, g_gr->images().get("images/ui_basic/but4.png"),
@@ -98,6 +112,7 @@
 		   (ngettext("Worker", "Workers", productionsite().descr().nr_working_positions())));
 		update_worker_table();
 	}
+	think();
 }
 
 void ProductionSiteWindow::think() {
@@ -113,17 +128,6 @@
 	}
 }
 
-/*
-===============
-Create the production site information window.
-===============
-*/
-void ProductionSite::create_options_window(InteractiveGameBase& parent, UI::Window*& registry) {
-	ProductionSiteWindow* win = new ProductionSiteWindow(parent, *this, registry);
-	Building::options_window_connections.push_back(Building::workers_changed.connect(
-	   boost::bind(&ProductionSiteWindow::update_worker_table, boost::ref(*win))));
-}
-
 void ProductionSiteWindow::update_worker_table() {
 	if (worker_table_ == nullptr) {
 		return;
@@ -175,7 +179,7 @@
 		Widelands::Worker* worker =
 		   productionsite().working_positions()[worker_table_->get_selected()].worker;
 		if (worker) {
-			igbase().game().send_player_evict_worker(*worker);
+			igbase()->game().send_player_evict_worker(*worker);
 		}
 	}
 }

=== modified file 'src/wui/productionsitewindow.h'
--- src/wui/productionsitewindow.h	2017-01-25 18:55:59 +0000
+++ src/wui/productionsitewindow.h	2017-02-28 09:26:14 +0000
@@ -20,14 +20,17 @@
 #ifndef WL_WUI_PRODUCTIONSITEWINDOW_H
 #define WL_WUI_PRODUCTIONSITEWINDOW_H
 
+#include <memory>
+
 #include "logic/map_objects/tribes/productionsite.h"
 #include "ui_basic/table.h"
 #include "wui/buildingwindow.h"
 
 struct ProductionSiteWindow : public BuildingWindow {
 	ProductionSiteWindow(InteractiveGameBase& parent,
+	                     UI::UniqueWindow::Registry& reg,
 	                     Widelands::ProductionSite&,
-	                     UI::Window*& registry);
+	                     bool avoid_fastclick);
 
 	Widelands::ProductionSite& productionsite() {
 		return dynamic_cast<Widelands::ProductionSite&>(building());
@@ -35,12 +38,16 @@
 	void update_worker_table();
 
 protected:
+	void init(bool avoid_fastclick) override;
 	void think() override;
 	void evict_worker();
 
 private:
 	UI::Table<uintptr_t>* worker_table_;
 	UI::Box* worker_caps_;
+	std::unique_ptr<Notifications::Subscriber<Widelands::NoteBuilding>>
+	   productionsitenotes_subscriber_;
+	DISALLOW_COPY_AND_ASSIGN(ProductionSiteWindow);
 };
 
 #endif  // end of include guard: WL_WUI_PRODUCTIONSITEWINDOW_H

=== modified file 'src/wui/trainingsitewindow.cc'
--- src/wui/trainingsitewindow.cc	2017-01-25 18:55:59 +0000
+++ src/wui/trainingsitewindow.cc	2017-02-28 09:26:14 +0000
@@ -17,56 +17,34 @@
  *
  */
 
-#include "logic/map_objects/tribes/trainingsite.h"
+#include "wui/trainingsitewindow.h"
 
 #include "graphic/graphic.h"
 #include "ui_basic/tabpanel.h"
-#include "wui/productionsitewindow.h"
 #include "wui/soldiercapacitycontrol.h"
 #include "wui/soldierlist.h"
 
-using Widelands::TrainingSite;
-
 static char const* pic_tab_military = "images/wui/buildings/menu_tab_military.png";
 
 /**
- * Status window for \ref TrainingSite
- */
-struct TrainingSiteWindow : public ProductionSiteWindow {
-	TrainingSiteWindow(InteractiveGameBase& parent, TrainingSite&, UI::Window*& registry);
-
-	TrainingSite& trainingsite() {
-		return dynamic_cast<TrainingSite&>(building());
-	}
-
-protected:
-	void create_capsbuttons(UI::Box* buttons) override;
-};
-
-/**
  * Create the \ref TrainingSite specific soldier list tab.
  */
 TrainingSiteWindow::TrainingSiteWindow(InteractiveGameBase& parent,
-                                       TrainingSite& ts,
-                                       UI::Window*& registry)
-   : ProductionSiteWindow(parent, ts, registry) {
+                                       UI::UniqueWindow::Registry& reg,
+                                       Widelands::TrainingSite& ts,
+                                       bool avoid_fastclick)
+   : ProductionSiteWindow(parent, reg, ts, avoid_fastclick) {
+	init(avoid_fastclick);
+}
+
+void TrainingSiteWindow::init(bool avoid_fastclick) {
+	ProductionSiteWindow::init(avoid_fastclick);
 	get_tabs()->add("soldiers", g_gr->images().get(pic_tab_military),
-	                create_soldier_list(*get_tabs(), parent, trainingsite()),
+	                create_soldier_list(*get_tabs(), *igbase(), trainingsite()),
 	                _("Soldiers in training"));
+	think();
 }
 
 void TrainingSiteWindow::create_capsbuttons(UI::Box* buttons) {
 	ProductionSiteWindow::create_capsbuttons(buttons);
 }
-
-/*
-===============
-Create the training site information window.
-===============
-*/
-void TrainingSite::create_options_window(InteractiveGameBase& plr, UI::Window*& registry) {
-	ProductionSiteWindow* win =
-	   dynamic_cast<ProductionSiteWindow*>(new TrainingSiteWindow(plr, *this, registry));
-	Building::options_window_connections.push_back(Building::workers_changed.connect(
-	   boost::bind(&ProductionSiteWindow::update_worker_table, boost::ref(*win))));
-}

=== added file 'src/wui/trainingsitewindow.h'
--- src/wui/trainingsitewindow.h	1970-01-01 00:00:00 +0000
+++ src/wui/trainingsitewindow.h	2017-02-28 09:26:14 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2002-2016 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ */
+
+#ifndef WL_WUI_TRAININGSITEWINDOW_H
+#define WL_WUI_TRAININGSITEWINDOW_H
+
+#include "logic/map_objects/tribes/trainingsite.h"
+#include "ui_basic/button.h"
+#include "wui/productionsitewindow.h"
+
+/**
+ * Status window for \ref TrainingSite
+ */
+struct TrainingSiteWindow : public ProductionSiteWindow {
+	TrainingSiteWindow(InteractiveGameBase& parent,
+	                   UI::UniqueWindow::Registry& reg,
+	                   Widelands::TrainingSite&,
+	                   bool avoid_fastclick);
+
+	Widelands::TrainingSite& trainingsite() {
+		return dynamic_cast<Widelands::TrainingSite&>(building());
+	}
+
+protected:
+	void init(bool avoid_fastclick) override;
+	void create_capsbuttons(UI::Box* buttons) override;
+
+private:
+	DISALLOW_COPY_AND_ASSIGN(TrainingSiteWindow);
+};
+
+#endif  // end of include guard: WL_WUI_TRAININGSITEWINDOW_H

=== modified file 'src/wui/warehousewindow.cc'
--- src/wui/warehousewindow.cc	2017-02-25 13:27:40 +0000
+++ src/wui/warehousewindow.cc	2017-02-28 09:26:14 +0000
@@ -17,7 +17,7 @@
  *
  */
 
-#include "logic/map_objects/tribes/warehouse.h"
+#include "wui/warehousewindow.h"
 
 #include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
@@ -28,8 +28,6 @@
 #include "wui/portdockwaresdisplay.h"
 #include "wui/waresdisplay.h"
 
-using Widelands::Warehouse;
-
 static const char pic_tab_wares[] = "images/wui/buildings/menu_tab_wares.png";
 static const char pic_tab_workers[] = "images/wui/buildings/menu_tab_workers.png";
 static const char pic_tab_dock_wares[] = "images/wui/buildings/menu_tab_wares_dock.png";
@@ -47,7 +45,7 @@
 public:
 	WarehouseWaresDisplay(UI::Panel* parent,
 	                      uint32_t width,
-	                      Warehouse& wh,
+	                      Widelands::Warehouse& wh,
 	                      Widelands::WareWorker type,
 	                      bool selectable);
 
@@ -55,11 +53,14 @@
 	void draw_ware(RenderTarget& dst, Widelands::DescriptionIndex ware) override;
 
 private:
-	Warehouse& warehouse_;
+	Widelands::Warehouse& warehouse_;
 };
 
-WarehouseWaresDisplay::WarehouseWaresDisplay(
-   UI::Panel* parent, uint32_t width, Warehouse& wh, Widelands::WareWorker type, bool selectable)
+WarehouseWaresDisplay::WarehouseWaresDisplay(UI::Panel* parent,
+                                             uint32_t width,
+                                             Widelands::Warehouse& wh,
+                                             Widelands::WareWorker type,
+                                             bool selectable)
    : WaresDisplay(parent, 0, 0, wh.owner().tribe(), type, selectable), warehouse_(wh) {
 	set_inner_size(width, 0);
 	add_warelist(type == Widelands::wwWORKER ? warehouse_.get_workers() : warehouse_.get_wares());
@@ -75,19 +76,19 @@
 void WarehouseWaresDisplay::draw_ware(RenderTarget& dst, Widelands::DescriptionIndex ware) {
 	WaresDisplay::draw_ware(dst, ware);
 
-	Warehouse::StockPolicy policy = warehouse_.get_stock_policy(get_type(), ware);
+	Widelands::Warehouse::StockPolicy policy = warehouse_.get_stock_policy(get_type(), ware);
 	const Image* pic = nullptr;
 	switch (policy) {
-	case Warehouse::StockPolicy::kPrefer:
+	case Widelands::Warehouse::StockPolicy::kPrefer:
 		pic = g_gr->images().get(pic_policy_prefer);
 		break;
-	case Warehouse::StockPolicy::kDontStock:
+	case Widelands::Warehouse::StockPolicy::kDontStock:
 		pic = g_gr->images().get(pic_policy_dontstock);
 		break;
-	case Warehouse::StockPolicy::kRemove:
+	case Widelands::Warehouse::StockPolicy::kRemove:
 		pic = g_gr->images().get(pic_policy_remove);
 		break;
-	case Warehouse::StockPolicy::kNormal:
+	case Widelands::Warehouse::StockPolicy::kNormal:
 		// don't draw anything for the normal policy
 		return;
 	}
@@ -103,14 +104,14 @@
 	WarehouseWaresPanel(UI::Panel* parent,
 	                    uint32_t width,
 	                    InteractiveGameBase&,
-	                    Warehouse&,
+	                    Widelands::Warehouse&,
 	                    Widelands::WareWorker type);
 
-	void set_policy(Warehouse::StockPolicy);
+	void set_policy(Widelands::Warehouse::StockPolicy);
 
 private:
 	InteractiveGameBase& gb_;
-	Warehouse& wh_;
+	Widelands::Warehouse& wh_;
 	bool can_act_;
 	Widelands::WareWorker type_;
 	WarehouseWaresDisplay display_;
@@ -119,7 +120,7 @@
 WarehouseWaresPanel::WarehouseWaresPanel(UI::Panel* parent,
                                          uint32_t width,
                                          InteractiveGameBase& gb,
-                                         Warehouse& wh,
+                                         Widelands::Warehouse& wh,
                                          Widelands::WareWorker type)
    : UI::Box(parent, 0, 0, UI::Box::Vertical),
      gb_(gb),
@@ -138,8 +139,8 @@
 	b = new UI::Button(                                                                             \
 	   buttons, #policy, 0, 0, 34, 34, g_gr->images().get("images/ui_basic/but4.png"),              \
 	   g_gr->images().get("images/wui/buildings/stock_policy_button_" #policy ".png"), tooltip),    \
-	b->sigclicked.connect(                                                                          \
-	   boost::bind(&WarehouseWaresPanel::set_policy, this, Warehouse::StockPolicy::k##policyname)), \
+	b->sigclicked.connect(boost::bind(                                                              \
+	   &WarehouseWaresPanel::set_policy, this, Widelands::Warehouse::StockPolicy::k##policyname)),  \
 	buttons->add(b);
 
 		ADD_POLICY_BUTTON(normal, Normal, _("Normal policy"))
@@ -152,7 +153,7 @@
 /**
  * Add Buttons policy buttons
  */
-void WarehouseWaresPanel::set_policy(Warehouse::StockPolicy newpolicy) {
+void WarehouseWaresPanel::set_policy(Widelands::Warehouse::StockPolicy newpolicy) {
 	if (gb_.can_act(wh_.owner().player_number())) {
 		bool is_workers = type_ == Widelands::wwWORKER;
 		const std::set<Widelands::DescriptionIndex> indices =
@@ -169,31 +170,28 @@
 }
 
 /**
- * Status window for warehouses
- */
-struct WarehouseWindow : public BuildingWindow {
-	WarehouseWindow(InteractiveGameBase& parent, Warehouse&, UI::Window*& registry);
-
-	Warehouse& warehouse() {
-		return dynamic_cast<Warehouse&>(building());
-	}
-};
-
-/**
  * Create the tabs of a warehouse window.
  */
-WarehouseWindow::WarehouseWindow(InteractiveGameBase& parent, Warehouse& wh, UI::Window*& registry)
-   : BuildingWindow(parent, wh, registry) {
+WarehouseWindow::WarehouseWindow(InteractiveGameBase& parent,
+                                 UI::UniqueWindow::Registry& reg,
+                                 Widelands::Warehouse& wh,
+                                 bool avoid_fastclick)
+   : BuildingWindow(parent, reg, wh, avoid_fastclick) {
+	init(avoid_fastclick);
+}
+
+void WarehouseWindow::init(bool avoid_fastclick) {
+	BuildingWindow::init(avoid_fastclick);
 	get_tabs()->add(
 	   "wares", g_gr->images().get(pic_tab_wares),
-	   new WarehouseWaresPanel(get_tabs(), Width, igbase(), warehouse(), Widelands::wwWARE),
+	   new WarehouseWaresPanel(get_tabs(), Width, *igbase(), warehouse(), Widelands::wwWARE),
 	   _("Wares"));
 	get_tabs()->add(
 	   "workers", g_gr->images().get(pic_tab_workers),
-	   new WarehouseWaresPanel(get_tabs(), Width, igbase(), warehouse(), Widelands::wwWORKER),
+	   new WarehouseWaresPanel(get_tabs(), Width, *igbase(), warehouse(), Widelands::wwWORKER),
 	   _("Workers"));
 
-	if (Widelands::PortDock* pd = wh.get_portdock()) {
+	if (Widelands::PortDock* pd = warehouse().get_portdock()) {
 		get_tabs()->add("dock_wares", g_gr->images().get(pic_tab_dock_wares),
 		                create_portdock_wares_display(get_tabs(), Width, *pd, Widelands::wwWARE),
 		                _("Wares waiting to be shipped"));
@@ -202,16 +200,9 @@
 		                _("Workers waiting to embark"));
 		if (pd->expedition_started()) {
 			get_tabs()->add("expedition_wares_queue", g_gr->images().get(pic_tab_expedition),
-			                create_portdock_expedition_display(get_tabs(), warehouse(), igbase()),
+			                create_portdock_expedition_display(get_tabs(), warehouse(), *igbase()),
 			                _("Expedition"));
 		}
 	}
-}
-
-/**
- * Create the status window describing the warehouse.
- */
-void Widelands::Warehouse::create_options_window(InteractiveGameBase& parent,
-                                                 UI::Window*& registry) {
-	new WarehouseWindow(parent, *this, registry);
+	think();
 }

=== added file 'src/wui/warehousewindow.h'
--- src/wui/warehousewindow.h	1970-01-01 00:00:00 +0000
+++ src/wui/warehousewindow.h	2017-02-28 09:26:14 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2002-2016 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ */
+
+#ifndef WL_WUI_WAREHOUSEWINDOW_H
+#define WL_WUI_WAREHOUSEWINDOW_H
+
+#include "logic/map_objects/tribes/warehouse.h"
+#include "wui/buildingwindow.h"
+
+/**
+ * Status window for warehouses
+ */
+struct WarehouseWindow : public BuildingWindow {
+	WarehouseWindow(InteractiveGameBase& parent,
+	                UI::UniqueWindow::Registry& reg,
+	                Widelands::Warehouse&,
+	                bool avoid_fastclick);
+
+	Widelands::Warehouse& warehouse() {
+		return dynamic_cast<Widelands::Warehouse&>(building());
+	}
+
+protected:
+	void init(bool avoid_fastclick) override;
+
+private:
+	DISALLOW_COPY_AND_ASSIGN(WarehouseWindow);
+};
+
+#endif  // end of include guard: WL_WUI_WAREHOUSEWINDOW_H