widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/chat-focus into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #795457 in widelands: "The chat window should receive focus automatically"
  https://bugs.launchpad.net/widelands/+bug/795457

For more details, see:
https://code.launchpad.net/~hjd/widelands/chat-focus/+merge/64142

Makes the chat window receive focus automatically. The last commit will leave windows opened with Enter open after a message has been sent. The last commit is optional if this is not intended.

For details, see bug 795457.
-- 
https://code.launchpad.net/~hjd/widelands/chat-focus/+merge/64142
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/chat-focus into lp:widelands.

=== modified file 'campaigns/t03.wmf/scripting/texts.lua'
--- campaigns/t03.wmf/scripting/texts.lua	2011-01-04 12:17:44 +0000
+++ campaigns/t03.wmf/scripting/texts.lua	2011-06-10 09:55:15 +0000
@@ -108,7 +108,7 @@
    name = "build_weapon_productions",
    title=_"Build weapon productions",
    body= "<rt><p line-spacing=3 font-size=12>" ..
-_"* Enhance your metalworks to an axefactory or - as soon as the blacksmith reaches his next level (master blacksmith) - even to a war mill and build up another metalworks to ensure the production of tools." ..
+_"* Enhance your metalworks to an axefactory to start producing weapons, and build up another metalworks to ensure the production of tools. When the blacksmith reaches his next level (master blacksmith), you can even enhance your axefactory to a war mill." ..
 "</p></rt>",
 }
 
@@ -333,7 +333,7 @@
 "<br>" ..
 _"* Build a battle arena and a trainings camp to the west of the mountains." ..
 "<br>" ..
-_"* As soon as the blacksmith reaches his next level (master blacksmith) enhance your metalworks to an axefactory or even a war mill and build up another metalworks to ensure the production of tools." ..
+_"* Enhance your metalworks to an axefactory in order to produce weapons and build up another metalworks to ensure the production of tools. When the blacksmith reaches his next level (master blacksmith), you can even enhance it to a war mill which produces additional weapons." ..
 "<br>" ..
 _"* Build a helmsmithy to the west of the mountains to provide your soldiers with better armor." ..
 "</p></rt>",

=== modified file 'src/wui/game_chat_menu.cc'
--- src/wui/game_chat_menu.cc	2010-04-24 20:03:07 +0000
+++ src/wui/game_chat_menu.cc	2011-06-10 09:55:15 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2008 by the Widelands Development Team
+ * Copyright (C) 2002-2004, 2006-2008, 2011 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
@@ -44,6 +44,8 @@
 
 	m_chat.sent.set(this, &GameChatMenu::acknowledge);
 	m_chat.aborted.set(this, &GameChatMenu::acknowledge);
+
+	enter_chat_message(m_close_on_send);
 }
 
 

=== modified file 'src/wui/interactive_base.cc'
--- src/wui/interactive_base.cc	2011-02-03 09:07:00 +0000
+++ src/wui/interactive_base.cc	2011-06-10 09:55:15 +0000
@@ -891,8 +891,6 @@
 			if (get_display_flag(dfDebug)) {
 				new GameChatMenu
 					(this, m_debugconsole, *DebugConsole::getChatProvider());
-				ref_cast<GameChatMenu, UI::UniqueWindow>(*m_debugconsole.window)
-					.enter_chat_message(false);
 			}
 			return true;
 #endif

=== modified file 'src/wui/interactive_player.cc'
--- src/wui/interactive_player.cc	2011-02-20 14:42:24 +0000
+++ src/wui/interactive_player.cc	2011-06-10 09:55:15 +0000
@@ -439,8 +439,6 @@
 			if (!m_chat.window)
 				new GameChatMenu(this, m_chat, *m_chatProvider);
 
-			ref_cast<GameChatMenu, UI::UniqueWindow>(*m_chat.window)
-				.enter_chat_message();
 			return true;
 		default:
 			break;