From 76300051f12d135192a14b6e2ebef828ffb0a2a0 Mon Sep 17 00:00:00 2001
From: Mark de Wever <koraq@xs4all.nl>
Date: Thu, 25 Dec 2008 11:16:11 +0000
Subject: [PATCH] Enable the new dialogs and update changelogs.

---
 RELEASE_NOTES       | 14 ++++++++++++++
 changelog           |  1 +
 players_changelog   |  1 +
 src/game_events.cpp |  2 +-
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index a469e524dfa..770262902a7 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -24,3 +24,17 @@ Compressed start of scenario saves are recognized
 again by the load-game dialog.
 
 ***
+
+The drawing engine for the new widgets is rewritten, the engine does show
+scrollbars too often, which will be fixed later.
+
+***
+
+The game now has two ingame dialogs, the old one and a new one. The new one
+shows a transparent portait which will be scaled to fit nicely on the screen.
+This might need some tuning. This means all portraits made by Kitty and the new
+portraits of LordBob can now be shown in their full glory.
+(Note the WML part of it is not documented since the API is not stable yet,
+this will be done before 1.6.)
+
+***
diff --git a/changelog b/changelog
index a5337f7bd4e..7aafe71396c 100644
--- a/changelog
+++ b/changelog
@@ -77,6 +77,7 @@ Version 1.5.6+svn:
      * ~BL(radius): blur an image by the given radius.
    * Added the transparent version of Kitty's portraits.
    * Rewrote the drawing engine for the new widgets.
+   * Enabled the new dialogs when a new portrait is available.
  * Language and i18n:
    * Renamed the --dummylocales parameter to --dummy-locales.
    * Fixed the po extraction tool to also include the id field.
diff --git a/players_changelog b/players_changelog
index 9cd39b179fc..5a0686cd9e2 100644
--- a/players_changelog
+++ b/players_changelog
@@ -56,6 +56,7 @@ Version 1.5.6+svn:
       Revenant, Naga Warrior.
     * New tile variations for Oasis.
     * New portraits for Peasant, Swordsman, Spearman.
+    * The game now shows an transparent image in the new dialog when available.
 
   * Language and translations
     * updated translations: Chinese /Simplified), Czech, Danish, Dutch, Finnish,
diff --git a/src/game_events.cpp b/src/game_events.cpp
index e733c052665..4b48de5ebc5 100644
--- a/src/game_events.cpp
+++ b/src/game_events.cpp
@@ -2928,7 +2928,7 @@ namespace {
 			if (side_for_show && !get_replay_source().is_skipping())
 			{
 				// We whether we can show the new dialog.
-				if(gui2::new_widgets && options.empty() && speaker != units->end()) {
+				if(options.empty() && speaker != units->end()) {
 					// Get the portrait and if found proceed to use the new dialog.
 
 					const tportrait* portrait =