Merge lp:~widelands-dev/widelands/bug-1339861 into lp:widelands

[GunChleoc]

Deleted MilitaryBox from wui

[SirVer (sirver)]

Oversight on my part. Thanks for catching this.

review: Approve

=== modified file 'src/wui/CMakeLists.txt'
--- src/wui/CMakeLists.txt	2014-07-05 14:39:48 +0000
+++ src/wui/CMakeLists.txt	2014-07-12 10:37:22 +0000
@@ -70,8 +70,6 @@
     mapviewpixelconstants.h
     mapviewpixelfunctions.cc
     mapviewpixelfunctions.h
-    military_box.cc
-    military_box.h
     militarysitewindow.cc
     minimap.cc
     minimap.h

=== modified file 'src/wui/fieldaction.cc'
--- src/wui/fieldaction.cc	2014-07-05 14:22:44 +0000
+++ src/wui/fieldaction.cc	2014-07-12 10:37:22 +0000
@@ -29,7 +29,6 @@
 #include "logic/attackable.h"
 #include "logic/cmd_queue.h"
 #include "logic/maphollowregion.h"
-#include "logic/militarysite.h"
 #include "logic/player.h"
 #include "logic/soldier.h"
 #include "logic/tribe.h"
@@ -44,7 +43,6 @@
 #include "wui/attack_box.h"
 #include "wui/game_debug_ui.h"
 #include "wui/interactive_player.h"
-#include "wui/military_box.h"
 #include "wui/overlay_manager.h"
 #include "wui/waresdisplay.h"
 #include "wui/watchwindow.h"
@@ -241,7 +239,6 @@
 
 static const char * const pic_tab_buildroad  = "pics/menu_tab_buildroad.png";
 static const char * const pic_tab_watch      = "pics/menu_tab_watch.png";
-static const char * const pic_tab_military   = "pics/menu_tab_military.png";
 static const char * const pic_tab_buildhouse[] = {
 	"pics/menu_tab_buildsmall.png",
 	"pics/menu_tab_buildmedium.png",
@@ -458,25 +455,12 @@
 			 &FieldActionWindow::act_debug,
 			 _("Debug window"));
 
-	MilitaryBox * militarybox =
-		m_plr ? new MilitaryBox(&m_tabpanel, m_plr, 0, 0) : nullptr;
-
 	// Add tabs
 	if (buildbox && buildbox->get_nritems())
 		add_tab("roads", pic_tab_buildroad, buildbox, _("Build road"));
 
 	add_tab("watch", pic_tab_watch, &watchbox, _("Watch"));
 
-	if (militarybox)
-	{
-		if (militarybox->allowed_change())
-		{
-			add_tab
-				("military", pic_tab_military,
-				 militarybox, _("Military settings"));
-		} else
-			delete militarybox;
-	}
 }
 
 void FieldActionWindow::add_buttons_attack ()

=== removed file 'src/wui/military_box.cc'
--- src/wui/military_box.cc	2014-07-05 14:22:44 +0000
+++ src/wui/military_box.cc	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2002-2004, 2006-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
- * 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/military_box.h"
-
-#include "base/macros.h"
-#include "graphic/graphic.h"
-#include "logic/editor_game_base.h"
-#include "logic/game.h"
-#include "logic/playercommand.h"
-#include "wui/text_constants.h"
-
-using Widelands::Editor_Game_Base;
-using Widelands::Game;
-
-MilitaryBox::MilitaryBox
-	(UI::Panel              * parent,
-	 Widelands::Player      * player,
-	 uint32_t  const              x,
-	 uint32_t  const              y)
-:
-	UI::Box
-		(parent, x, y, UI::Box::Vertical),
-	m_pl(player),
-	m_map(&m_pl->egbase().map())
-{
-	init();
-}
-
-MilitaryBox::~MilitaryBox() {
-}
-
-UI::Slider & MilitaryBox::add_slider
-	(UI::Box         & parent,
-	 uint32_t          width,
-	 uint32_t          height,
-	 uint32_t          min, uint32_t max, uint32_t initial,
-	 char      const * picname,
-	 char      const * hint)
-{
-	UI::HorizontalSlider & result =
-		*new UI::HorizontalSlider
-			(&parent,
-			 0, 0,
-			 width, height,
-			 min, max, initial,
-			 g_gr->images().get(picname),
-			 hint);
-	parent.add(&result, UI::Box::AlignTop);
-	return result;
-}
-
-UI::Textarea & MilitaryBox::add_text
-	(UI::Box           & parent,
-	 std::string   str,
-	 uint32_t      alignment,
-	 const std::string & fontname,
-	 uint32_t      fontsize)
-{
-	UI::Textarea & result = *new UI::Textarea(&parent, 0, 0, str.c_str());
-	result.set_textstyle(UI::TextStyle::makebold(UI::Font::get(fontname, fontsize), UI_FONT_CLR_FG));
-	parent.add(&result, alignment);
-	return result;
-}
-
-UI::Button & MilitaryBox::add_button
-	(UI::Box           & parent,
-	 char        const * const name,
-	 char        const * const text,
-	 void         (MilitaryBox::*fn)(),
-	 const std::string & tooltip_text)
-{
-	UI::Button * button =
-		new UI::Button
-			(&parent, name,
-			 8, 8, 26, 26,
-			 g_gr->images().get("pics/but2.png"),
-			 text,
-			 tooltip_text);
-	button->sigclicked.connect(boost::bind(fn, boost::ref(*this)));
-	parent.add(button, Box::AlignTop);
-	return *button;
-}
-
-void MilitaryBox::update() {
-}
-
-void MilitaryBox::init() {
-}

=== removed file 'src/wui/military_box.h'
--- src/wui/military_box.h	2014-07-05 16:41:51 +0000
+++ src/wui/military_box.h	1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2002-2004, 2006-2010 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_MILITARY_BOX_H
-#define WL_WUI_MILITARY_BOX_H
-
-#include <list>
-
-#include "logic/attackable.h"
-#include "logic/player.h"
-#include "ui_basic/box.h"
-#include "ui_basic/button.h"
-#include "ui_basic/slider.h"
-#include "ui_basic/textarea.h"
-#include "wui/text_constants.h"
-
-/**
- * Military settings tab that is part of the \ref FieldActionWindow
- *
- * Used to configure the player's global military settings.
- */
-struct MilitaryBox : public UI::Box {
-	MilitaryBox
-		(UI::Panel              * parent,
-		 Widelands::Player      * player,
-		 uint32_t  const              x,
-		 uint32_t  const              y);
-	~MilitaryBox();
-
-	void init();
-	bool allowed_change() const {return m_allowed_change;}
-
-	private:
-		UI::Slider & add_slider
-			(UI::Box    & parent,
-			 uint32_t      width,
-			 uint32_t      height,
-			 uint32_t      min, uint32_t max, uint32_t initial,
-			 char const  * picname,
-			 char const  * hint);
-		UI::Textarea & add_text
-			(UI::Box           & parent,
-			 std::string         str,
-			 uint32_t            alignment = UI::Box::AlignTop,
-			 const std::string & fontname = UI_FONT_NAME,
-			 uint32_t            fontsize = UI_FONT_SIZE_SMALL);
-		UI::Button & add_button
-			(UI::Box           & parent,
-			 char const *,
-			 char const *,
-			 void (MilitaryBox::*fn)(),
-			 const std::string & tooltip_text);
-
-		void update();
-
-	private:
-		Widelands::Player     * m_pl;
-		Widelands::Map        * m_map;
-
-		bool                    m_allowed_change;
-};
-
-#endif  // end of include guard: WL_WUI_MILITARY_BOX_H