0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move widget defintion base to its own file.

Browse source
This commit is contained in:
Mark de Wever 2009-09-11 19:15:56 +00:00
parent 0368ad25df
commit 2e01fe76f3
8 changed files with 187 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
po/wesnoth-lib/POTFILES.in
View file

@ -6,6 +6,7 @@ src/game_preferences.cpp
src/game_preferences_display.cpp
src/gui/auxiliary/canvas.cpp
src/gui/auxiliary/log.cpp
src/gui/auxiliary/widget_definition.cpp
src/gui/auxiliary/window_builder/button.cpp
src/gui/auxiliary/window_builder/control.cpp
src/gui/auxiliary/window_builder.cpp

1
src/CMakeLists.txt
View file

@ -220,6 +220,7 @@ set(wesnoth-main_SRC
generic_event.cpp
gui/auxiliary/canvas.cpp
gui/auxiliary/log.cpp
gui/auxiliary/widget_definition.cpp
gui/auxiliary/window_builder/button.cpp
gui/auxiliary/window_builder/control.cpp
gui/auxiliary/window_builder/helper.cpp

1
src/Makefile.am
View file

@ -100,6 +100,7 @@ wesnoth_source = \
generic_event.cpp \
gui/auxiliary/canvas.cpp \
gui/auxiliary/log.cpp \
gui/auxiliary/widget_definition.cpp \
gui/auxiliary/window_builder/button.cpp \
gui/auxiliary/window_builder/control.cpp \
gui/auxiliary/window_builder/helper.cpp \

1
src/SConscript
View file

@ -260,6 +260,7 @@ wesnoth_sources = Split("""
widgets/scrollpane.cpp
gui/auxiliary/canvas.cpp
gui/auxiliary/log.cpp
gui/auxiliary/widget_definition.cpp
gui/auxiliary/window_builder/button.cpp
gui/auxiliary/window_builder/control.cpp
gui/auxiliary/window_builder/helper.cpp

100
src/gui/auxiliary/widget_definition.cpp Normal file
View file

@ -0,0 +1,100 @@
/* $Id$ */
/*
Copyright (C) 2007 - 2009 by Mark de Wever <koraq@xs4all.nl>
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/widget_definition.hpp"
#include "config.hpp"
#include "gui/auxiliary/log.hpp"
#include "gui/widgets/helper.hpp"
namespace gui2 {
tresolution_definition_::tresolution_definition_(const config& cfg) :
window_width(lexical_cast_default<unsigned>(cfg["window_width"])),
window_height(lexical_cast_default<unsigned>(cfg["window_height"])),
min_width(lexical_cast_default<unsigned>(cfg["min_width"])),
min_height(lexical_cast_default<unsigned>(cfg["min_height"])),
default_width(lexical_cast_default<unsigned>(cfg["default_width"])),
default_height(lexical_cast_default<unsigned>(cfg["default_height"])),
max_width(lexical_cast_default<unsigned>(cfg["max_width"])),
max_height(lexical_cast_default<unsigned>(cfg["max_height"])),
text_extra_width(lexical_cast_default<unsigned>(cfg["text_extra_width"])),
text_extra_height(lexical_cast_default<unsigned>(cfg["text_extra_height"])),
text_font_size(lexical_cast_default<unsigned>(cfg["text_font_size"])),
text_font_style(decode_font_style(cfg["text_font_style"])),
state()
{
/*WIKI
* @page = GUIToolkitWML
* @order = 1_widget
*
* == Resolution ==
*
* Depending on the resolution a widget can look different. Resolutions are
* evaluated in order of appearance. The ''window_width'' and ''window_height''
* are the upper limit this resolution is valid for. When one of the sizes
* gets above the limit, the next resolution is selected. There's one special
* case where both values are ''0''. This resolution always matches. (Resolution
* definitions behind that one will never be picked.) This resolution can be
* used as upper limit or if there's only one resolution.
*
* The default (and also minimum) size of a button is determined by two items,
* the wanted default size and the size needed for the text. The size of the
* text differs per used widget so needs to be determined per button.
*
* Container widgets like panels and windows have other rules for their sizes.
* Their sizes are based on the size of their children (and the border they need
* themselves). It's wise to set all sizes to 0 for these kind of widgets.
*
* @start_table = config
* window_width (unsigned = 0) Width of the application window.
* window_height (unsigned = 0)
* Height of the application window.
* min_width (unsigned = 0) The minimum width of the widget.
* min_height (unsigned = 0) The minimum height of the widget.
*
* default_width (unsigned = 0) The default width of the widget.
* default_height (unsigned = 0) The default height of the widget.
*
* max_width (unsigned = 0) The maximum width of the widget.
* max_height (unsigned = 0) The maximum height of the widget.
*
* text_extra_width (unsigned = 0)
* The extra width needed to determine the
* minimal size for the text.
* text_extra_height (unsigned = 0)
* The extra height needed to determine the
* minimal size for the text.
* text_font_size (unsigned = 0) The font size, which needs to be used to
* determine the minimal size for the text.
* text_font_style (font_style = "")
* The font style, which needs to be used to
* determine the minimal size for the text.
*
* state (section) Every widget has one or more state
* sections.
* Note they aren't called state but state_xxx
* the exact names are listed per widget.
* @end_table
*
*/
DBG_GUI_P << "Parsing resolution "
<< window_width << ", " << window_height << '\n';
}
} // namespace gui2

82
src/gui/auxiliary/widget_definition.hpp Normal file
View file

@ -0,0 +1,82 @@
/* $Id$ */
/*
Copyright (C) 2007 - 2009 by Mark de Wever <koraq@xs4all.nl>
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_WIDGET_DEFINITION_HPP_INCLUDED
#define GUI_AUXILIARY_WIDGET_DEFINITION_HPP_INCLUDED
#include "gui/auxiliary/canvas.hpp"
class config;
namespace gui2 {
/**
* Contains the state info for a resolution.
*
* At the moment all states are the same so there is no need to use
* inheritance. If that is needed at some point the containers should contain
* pointers and we should inherit from reference_counted_object.
*/
struct tstate_definition
{
private:
tstate_definition();
public:
tstate_definition(const config &cfg);
tcanvas canvas;
};
/** Base class of a resolution, contains the common keys for a resolution. */
struct tresolution_definition_ : public reference_counted_object
{
private:
tresolution_definition_();
public:
tresolution_definition_(const config& cfg);
unsigned window_width;
unsigned window_height;
unsigned min_width;
unsigned min_height;
unsigned default_width;
unsigned default_height;
unsigned max_width;
unsigned max_height;
unsigned text_extra_width;
unsigned text_extra_height;
unsigned text_font_size;
int text_font_style;
std::vector<tstate_definition> state;
};
typedef
boost::intrusive_ptr<tresolution_definition_>
tresolution_definition_ptr;
typedef
boost::intrusive_ptr<const tresolution_definition_>
tresolution_definition_const_ptr;
} // namespace gui2
#endif

72
src/gui/widgets/settings.cpp
View file

@ -437,78 +437,6 @@ tcontrol_definition::tcontrol_definition(const config& cfg) :
}
tresolution_definition_::tresolution_definition_(const config& cfg) :
window_width(lexical_cast_default<unsigned>(cfg["window_width"])),
window_height(lexical_cast_default<unsigned>(cfg["window_height"])),
min_width(lexical_cast_default<unsigned>(cfg["min_width"])),
min_height(lexical_cast_default<unsigned>(cfg["min_height"])),
default_width(lexical_cast_default<unsigned>(cfg["default_width"])),
default_height(lexical_cast_default<unsigned>(cfg["default_height"])),
max_width(lexical_cast_default<unsigned>(cfg["max_width"])),
max_height(lexical_cast_default<unsigned>(cfg["max_height"])),
text_extra_width(lexical_cast_default<unsigned>(cfg["text_extra_width"])),
text_extra_height(lexical_cast_default<unsigned>(cfg["text_extra_height"])),
text_font_size(lexical_cast_default<unsigned>(cfg["text_font_size"])),
text_font_style(decode_font_style(cfg["text_font_style"])),
state()
{
/*WIKI
* @page = GUIToolkitWML
* @order = 1_widget
*
* == Resolution ==
*
* Depending on the resolution a widget can look different. Resolutions are
* evaluated in order of appearance. The ''window_width'' and ''window_height''
* are the upper limit this resolution is valid for. When one of the sizes
* gets above the limit, the next resolution is selected. There's one special
* case where both values are ''0''. This resolution always matches. (Resolution
* definitions behind that one will never be picked.) This resolution can be
* used as upper limit or if there's only one resolution.
*
* The default (and also minimum) size of a button is determined by two items,
* the wanted default size and the size needed for the text. The size of the
* text differs per used widget so needs to be determined per button.
*
* Container widgets like panels and windows have other rules for their sizes.
* Their sizes are based on the size of their children (and the border they need
* themselves). It's wise to set all sizes to 0 for these kind of widgets.
*
* @start_table = config
* window_width (unsigned = 0) Width of the application window.
* window_height (unsigned = 0)
* Height of the application window.
* min_width (unsigned = 0) The minimum width of the widget.
* min_height (unsigned = 0) The minimum height of the widget.
*
* default_width (unsigned = 0) The default width of the widget.
* default_height (unsigned = 0) The default height of the widget.
*
* max_width (unsigned = 0) The maximum width of the widget.
* max_height (unsigned = 0) The maximum height of the widget.
*
* text_extra_width (unsigned = 0)
* The extra width needed to determine the
* minimal size for the text.
* text_extra_height (unsigned = 0)
* The extra height needed to determine the
* minimal size for the text.
* text_font_size (unsigned = 0) The font size, which needs to be used to
* determine the minimal size for the text.
* text_font_style (font_style = "")
* The font style, which needs to be used to
* determine the minimal size for the text.
*
* state (section) Every widget has one or more state sections.
* Note they aren't called state but state_xxx
* the exact names are listed per widget.
* @end_table
*
*/
DBG_GUI_P << "Parsing resolution "
<< window_width << ", " << window_height << '\n';
}
template<class T>
void tcontrol_definition::load_resolutions(const config &cfg)

56
src/gui/widgets/settings.hpp
View file

@ -20,8 +20,8 @@
#ifndef GUI_WIDGETS_SETTING_HPP_INCLUDED
#define GUI_WIDGETS_SETTING_HPP_INCLUDED
#include "gui/auxiliary/canvas.hpp"
#include "gui/auxiliary/formula.hpp"
#include "gui/auxiliary/widget_definition.hpp"
#include "gui/auxiliary/window_builder.hpp"
#include "tstring.hpp"
@ -85,60 +85,6 @@ enum twindow_type {
const std::string& get_id(const twindow_type window_type);
/**
* Contains the state info for a resolution.
*
* At the moment all states are the same so there is no need to use
* inheritance. If that is needed at some point the containers should contain
* pointers and we should inherit from reference_counted_object.
*/
struct tstate_definition
{
private:
tstate_definition();
public:
tstate_definition(const config &cfg);
tcanvas canvas;
};
/** Base class of a resolution, contains the common keys for a resolution. */
struct tresolution_definition_ : public reference_counted_object
{
private:
tresolution_definition_();
public:
tresolution_definition_(const config& cfg);
unsigned window_width;
unsigned window_height;
unsigned min_width;
unsigned min_height;
unsigned default_width;
unsigned default_height;
unsigned max_width;
unsigned max_height;
unsigned text_extra_width;
unsigned text_extra_height;
unsigned text_font_size;
int text_font_style;
std::vector<tstate_definition> state;
};
typedef
boost::intrusive_ptr<tresolution_definition_>
tresolution_definition_ptr;
typedef
boost::intrusive_ptr<const tresolution_definition_>
tresolution_definition_const_ptr;
struct tcontrol_definition : public reference_counted_object
{