Author: mordante
Date: Wed Jun 24 21:42:03 2009
New Revision: 36392
URL: http://svn.gna.org/viewcvs/wesnoth?rev=36392&view=rev
Log:
Move gui2::tbuilder_panel to its own file.
Added:
trunk/src/gui/auxiliary/window_builder/panel.cpp (with props)
trunk/src/gui/auxiliary/window_builder/panel.hpp (with props)
Modified:
trunk/po/wesnoth-lib/POTFILES.in
trunk/src/CMakeLists.txt
trunk/src/Makefile.am
trunk/src/SConscript
trunk/src/gui/auxiliary/window_builder.cpp
trunk/src/gui/auxiliary/window_builder_private.hpp
Modified: trunk/po/wesnoth-lib/POTFILES.in
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/po/wesnoth-lib/POTFILES.in?rev=36392&r1=36391&r2=36392&view=diff
==============================================================================
--- trunk/po/wesnoth-lib/POTFILES.in (original)
+++ trunk/po/wesnoth-lib/POTFILES.in Wed Jun 24 21:42:03 2009
@@ -14,6 +14,7 @@
src/gui/auxiliary/window_builder/menubar.cpp
src/gui/auxiliary/window_builder/spacer.cpp
src/gui/auxiliary/window_builder/text_box.cpp
+src/gui/auxiliary/window_builder/panel.cpp
src/gui/auxiliary/window_builder/password_box.cpp
src/gui/auxiliary/window_builder.cpp
src/gui/dialogs/addon_connect.cpp
Modified: trunk/src/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/CMakeLists.txt?rev=36392&r1=36391&r2=36392&view=diff
==============================================================================
--- trunk/src/CMakeLists.txt (original)
+++ trunk/src/CMakeLists.txt Wed Jun 24 21:42:03 2009
@@ -271,6 +271,7 @@
gui/auxiliary/window_builder/menubar.cpp
gui/auxiliary/window_builder/spacer.cpp
gui/auxiliary/window_builder/text_box.cpp
+ gui/auxiliary/window_builder/panel.cpp
gui/auxiliary/window_builder/password_box.cpp
gui/auxiliary/window_builder.cpp
gui/dialogs/addon_connect.cpp
Modified: trunk/src/Makefile.am
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/Makefile.am?rev=36392&r1=36391&r2=36392&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Wed Jun 24 21:42:03 2009
@@ -96,6 +96,7 @@
gui/auxiliary/window_builder/menubar.cpp \
gui/auxiliary/window_builder/spacer.cpp \
gui/auxiliary/window_builder/text_box.cpp \
+ gui/auxiliary/window_builder/panel.cpp \
gui/auxiliary/window_builder/password_box.cpp \
gui/auxiliary/window_builder.cpp \
gui/dialogs/addon_connect.cpp \
Modified: trunk/src/SConscript
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/SConscript?rev=36392&r1=36391&r2=36392&view=diff
==============================================================================
--- trunk/src/SConscript (original)
+++ trunk/src/SConscript Wed Jun 24 21:42:03 2009
@@ -252,6 +252,7 @@
gui/auxiliary/window_builder/menubar.cpp
gui/auxiliary/window_builder/spacer.cpp
gui/auxiliary/window_builder/text_box.cpp
+ gui/auxiliary/window_builder/panel.cpp
gui/auxiliary/window_builder/password_box.cpp
gui/auxiliary/window_builder.cpp
gui/dialogs/addon_connect.cpp
Modified: trunk/src/gui/auxiliary/window_builder.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/auxiliary/window_builder.cpp?rev=36392&r1=36391&r2=36392&view=diff
==============================================================================
--- trunk/src/gui/auxiliary/window_builder.cpp (original)
+++ trunk/src/gui/auxiliary/window_builder.cpp Wed Jun 24 21:42:03 2009
@@ -27,6 +27,7 @@
#include "gui/auxiliary/window_builder/menubar.hpp"
#include "gui/auxiliary/window_builder/spacer.hpp"
#include "gui/auxiliary/window_builder/text_box.hpp"
+#include "gui/auxiliary/window_builder/panel.hpp"
#include "gui/auxiliary/window_builder/password_box.hpp"
#include "gui/widgets/button.hpp"
#include "gui/widgets/horizontal_scrollbar.hpp"
@@ -747,47 +748,6 @@
return multi_page;
}
-tbuilder_panel::tbuilder_panel(const config& cfg) :
- implementation::tbuilder_control(cfg),
- grid(0)
-{
-/*WIKI
- * @page = GUIWidgetInstanceWML
- * @order = 2_panel
- *
- * == Panel ==
- *
- * A panel is an item which can hold other items. The difference between a grid
- * and a panel is that it's possible to define how a panel looks. A grid in an
- * invisible container to just hold the items.
- *
- * @start_table = config
- * grid (grid) Defines the grid with the widgets to
- * place on the panel.
- * @end_table
- *
- */
-
- const config &c = cfg.child("grid");
-
- VALIDATE(c, _("No grid defined."));
-
- grid = new tbuilder_grid(c);
-}
-
-twidget* tbuilder_panel::build() const
-{
- tpanel* panel = new tpanel();
-
- init_control(panel);
-
- DBG_GUI_G << "Window builder: placed panel '" << id << "' with
defintion '"
- << definition << "'.\n";
-
- panel->init_grid(grid);
- return panel;
-}
-
twidget* tbuilder_scroll_label::build() const
{
tscroll_label* widget = new tscroll_label();
Added: trunk/src/gui/auxiliary/window_builder/panel.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/auxiliary/window_builder/panel.cpp?rev=36392&view=auto
==============================================================================
--- trunk/src/gui/auxiliary/window_builder/panel.cpp (added)
+++ trunk/src/gui/auxiliary/window_builder/panel.cpp Wed Jun 24 21:42:03 2009
@@ -1,0 +1,74 @@
+/* $Id$ */
+/*
+ Copyright (C) 2008 - 2009 by Mark de Wever <[email protected]>
+ Part of the Battle for Wesnoth Project http://www.wesnoth.org/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2
+ or at your option any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
+#define GETTEXT_DOMAIN "wesnoth-lib"
+
+#include "gui/auxiliary/window_builder/panel.hpp"
+
+#include "config.hpp"
+#include "gettext.hpp"
+#include "gui/auxiliary/log.hpp"
+#include "gui/widgets/panel.hpp"
+#include "wml_exception.hpp"
+
+namespace gui2 {
+
+namespace implementation {
+
+tbuilder_panel::tbuilder_panel(const config& cfg)
+ : tbuilder_control(cfg)
+ , grid(NULL)
+{
+ const config &c = cfg.child("grid");
+
+ VALIDATE(c, _("No grid defined."));
+
+ grid = new tbuilder_grid(c);
+}
+
+twidget* tbuilder_panel::build() const
+{
+ tpanel* widget = new tpanel();
+
+ init_control(widget);
+
+ DBG_GUI_G << "Window builder: placed panel '"
+ << id << "' with defintion '"
+ << definition << "'.\n";
+
+ widget->init_grid(grid);
+ return widget;
+}
+
+} // namespace implementation
+
+} // namespace gui2
+
+/*WIKI
+ * @page = GUIWidgetInstanceWML
+ * @order = 2_panel
+ *
+ * == Panel ==
+ *
+ * A panel is an item which can hold other items. The difference between a
+ * grid and a panel is that it's possible to define how a panel looks. A grid
+ * in an invisible container to just hold the items.
+ *
+ * @start_table = config
+ * grid (grid) Defines the grid with the widgets to
+ * place on the panel.
+ * @end_table
+ *
+ */
+
Propchange: trunk/src/gui/auxiliary/window_builder/panel.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/src/gui/auxiliary/window_builder/panel.cpp
------------------------------------------------------------------------------
svn:keywords = 'Author Date Id Revision'
Added: trunk/src/gui/auxiliary/window_builder/panel.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/auxiliary/window_builder/panel.hpp?rev=36392&view=auto
==============================================================================
--- trunk/src/gui/auxiliary/window_builder/panel.hpp (added)
+++ trunk/src/gui/auxiliary/window_builder/panel.hpp Wed Jun 24 21:42:03 2009
@@ -1,0 +1,39 @@
+/* $Id$ */
+/*
+ Copyright (C) 2008 - 2009 by Mark de Wever <[email protected]>
+ Part of the Battle for Wesnoth Project http://www.wesnoth.org/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2
+ or at your option any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY.
+
+ See the COPYING file for more details.
+*/
+
+#ifndef GUI_AUXILIARY_WINDOW_BUILDER_PANEL_HPP_INCLUDED
+#define GUI_AUXILIARY_WINDOW_BUILDER_PANEL_HPP_INCLUDED
+
+#include "gui/auxiliary/window_builder/control.hpp"
+
+namespace gui2 {
+
+namespace implementation {
+
+struct tbuilder_panel
+ : public tbuilder_control
+{
+ tbuilder_panel(const config& cfg);
+
+ twidget* build () const;
+
+ tbuilder_grid_ptr grid;
+};
+
+} // namespace implementation
+
+} // namespace gui2
+
+#endif
+
Propchange: trunk/src/gui/auxiliary/window_builder/panel.hpp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/src/gui/auxiliary/window_builder/panel.hpp
------------------------------------------------------------------------------
svn:keywords = 'Author Date Id Revision'
Modified: trunk/src/gui/auxiliary/window_builder_private.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/auxiliary/window_builder_private.hpp?rev=36392&r1=36391&r2=36392&view=diff
==============================================================================
--- trunk/src/gui/auxiliary/window_builder_private.hpp (original)
+++ trunk/src/gui/auxiliary/window_builder_private.hpp Wed Jun 24 21:42:03 2009
@@ -125,19 +125,6 @@
std::vector<string_map> data;
};
-struct tbuilder_panel : public implementation::tbuilder_control
-{
-
-private:
- tbuilder_panel();
-public:
- tbuilder_panel(const config& cfg);
-
- twidget* build () const;
-
- tbuilder_grid_ptr grid;
-};
-
struct tbuilder_slider : public implementation::tbuilder_control
{
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
