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

Fixed spelling of 'focused'

Browse source
This commit is contained in:
Charles Dang 2015-12-04 18:35:00 +11:00
parent 12716fb27f
commit 692ba74df9
22 changed files with 57 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gui/auxiliary/widget_definition/button.cpp
View file

@ -41,7 +41,7 @@ tbutton_definition::tbutton_definition(const config& cfg)
* * state_enabled, the button is enabled.
* * state_disabled, the button is disabled.
* * state_pressed, the left mouse button is down.
* * state_focussed, the mouse is over the button.
* * state_focused, the mouse is over the button.
* @begin{parent}{name="gui/"}
* @begin{tag}{name="button_definition"}{min=0}{max=-1}{super="generic/widget_definition"}
* @begin{tag}{name="resolution"}{min=0}{max=-1}{super="generic/widget_definition/resolution"}
@ -51,8 +51,8 @@ tbutton_definition::tbutton_definition(const config& cfg)
* @end{tag}{name="state_disabled"}
* @begin{tag}{name="state_pressed"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_pressed"}
* @begin{tag}{name="state_focussed"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_focussed"}
* @begin{tag}{name="state_focused"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_focused"}
* @end{tag}{name="resolution"}
* @end{tag}{name="button_definition"}
* @end{parent}{name="gui/"}
@ -64,7 +64,7 @@ tbutton_definition::tresolution::tresolution(const config& cfg)
state.push_back(tstate_definition(cfg.child("state_enabled")));
state.push_back(tstate_definition(cfg.child("state_disabled")));
state.push_back(tstate_definition(cfg.child("state_pressed")));
state.push_back(tstate_definition(cfg.child("state_focussed")));
state.push_back(tstate_definition(cfg.child("state_focused")));
}
} // namespace gui2

8
src/gui/auxiliary/widget_definition/horizontal_scrollbar.cpp
View file

@ -65,7 +65,7 @@ thorizontal_scrollbar_definition::thorizontal_scrollbar_definition(
* * state_disabled, the horizontal scrollbar is disabled.
* * state_pressed, the left mouse button is down on the positioner of the
* horizontal scrollbar.
* * state_focussed, the mouse is over the positioner of the horizontal
* * state_focused, the mouse is over the positioner of the horizontal
* scrollbar.
* @begin{tag}{name="state_enabled"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_enabled"}
@ -73,8 +73,8 @@ thorizontal_scrollbar_definition::thorizontal_scrollbar_definition(
* @end{tag}{name="state_disabled"}
* @begin{tag}{name="state_pressed"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_pressed"}
* @begin{tag}{name="state_focussed"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_focussed"}
* @begin{tag}{name="state_focused"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_focused"}
* @end{tag}{name="resolution"}
* @end{tag}{name="horizontal_scrollbar_definition"}
* @end{parent}{name="gui/"}
@ -94,7 +94,7 @@ thorizontal_scrollbar_definition::tresolution::tresolution(const config& cfg)
state.push_back(tstate_definition(cfg.child("state_enabled")));
state.push_back(tstate_definition(cfg.child("state_disabled")));
state.push_back(tstate_definition(cfg.child("state_pressed")));
state.push_back(tstate_definition(cfg.child("state_focussed")));
state.push_back(tstate_definition(cfg.child("state_focused")));
}
} // namespace gui2

8
src/gui/auxiliary/widget_definition/repeating_button.cpp
View file

@ -41,7 +41,7 @@ trepeating_button_definition::trepeating_button_definition(const config& cfg)
* * state_enabled, the repeating_button is enabled.
* * state_disabled, the repeating_button is disabled.
* * state_pressed, the left mouse repeating_button is down.
* * state_focussed, the mouse is over the repeating_button.
* * state_focused, the mouse is over the repeating_button.
* @begin{parent}{name="gui/"}
* @begin{tag}{name="repeating_button_definition"}{min=0}{max=-1}{super="generic/widget_definition"}
* @begin{tag}{name="resolution"}{min=0}{max=-1}{super="generic/widget_definition/resolution"}
@ -51,8 +51,8 @@ trepeating_button_definition::trepeating_button_definition(const config& cfg)
* @end{tag}{name="state_disabled"}
* @begin{tag}{name="state_pressed"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_pressed"}
* @begin{tag}{name="state_focussed"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_focussed"}
* @begin{tag}{name="state_focused"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_focused"}
* @end{tag}{name="resolution"}
* @end{tag}{name="repeating_button_definition"}
* @end{parent}{name="gui/"}
@ -65,7 +65,7 @@ trepeating_button_definition::tresolution::tresolution(const config& cfg)
state.push_back(tstate_definition(cfg.child("state_enabled")));
state.push_back(tstate_definition(cfg.child("state_disabled")));
state.push_back(tstate_definition(cfg.child("state_pressed")));
state.push_back(tstate_definition(cfg.child("state_focussed")));
state.push_back(tstate_definition(cfg.child("state_focused")));
}
} // namespace gui2

8
src/gui/auxiliary/widget_definition/slider.cpp
View file

@ -64,15 +64,15 @@ tslider_definition::tslider_definition(const config& cfg)
* * state_disabled, the slider is disabled.
* * state_pressed, the left mouse button is down on the positioner of the
* slider.
* * state_focussed, the mouse is over the positioner of the slider.
* * state_focused, the mouse is over the positioner of the slider.
* @begin{tag}{name="state_enabled"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_enabled"}
* @begin{tag}{name="state_disabled"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_disabled"}
* @begin{tag}{name="state_pressed"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_pressed"}
* @begin{tag}{name="state_focussed"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_focussed"}
* @begin{tag}{name="state_focused"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_focused"}
* @end{tag}{name="resolution"}
* @end{tag}{name="slider_definition"}
* @end{parent}{name="gui/"}
@ -92,7 +92,7 @@ tslider_definition::tresolution::tresolution(const config& cfg)
state.push_back(tstate_definition(cfg.child("state_enabled")));
state.push_back(tstate_definition(cfg.child("state_disabled")));
state.push_back(tstate_definition(cfg.child("state_pressed")));
state.push_back(tstate_definition(cfg.child("state_focussed")));
state.push_back(tstate_definition(cfg.child("state_focused")));
}
} // namespace gui2

8
src/gui/auxiliary/widget_definition/text_box.cpp
View file

@ -54,13 +54,13 @@ ttext_box_definition::ttext_box_definition(const config& cfg)
* The following states exist:
* * state_enabled, the text box is enabled.
* * state_disabled, the text box is disabled.
* * state_focussed, the text box has the focus of the keyboard.
* * state_focused, the text box has the focus of the keyboard.
* @begin{tag}{name="state_enabled"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_enabled"}
* @begin{tag}{name="state_disabled"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_disabled"}
* @begin{tag}{name="state_focussed"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_focussed"}
* @begin{tag}{name="state_focused"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_focused"}
* @end{tag}{name="resolution"}
* @end{tag}{name="text_box_definition"}
* @end{parent}{name="gui/"}
@ -73,7 +73,7 @@ ttext_box_definition::tresolution::tresolution(const config& cfg)
// Note the order should be the same as the enum tstate in text_box.hpp.
state.push_back(tstate_definition(cfg.child("state_enabled")));
state.push_back(tstate_definition(cfg.child("state_disabled")));
state.push_back(tstate_definition(cfg.child("state_focussed")));
state.push_back(tstate_definition(cfg.child("state_focused")));
}
} // namespace gui2

14
src/gui/auxiliary/widget_definition/toggle_button.cpp
View file

@ -40,11 +40,11 @@ ttoggle_button_definition::ttoggle_button_definition(const config& cfg)
* The following states exist:
* * state_enabled, the button is enabled and not selected.
* * state_disabled, the button is disabled and not selected.
* * state_focussed, the mouse is over the button and not selected.
* * state_focused, the mouse is over the button and not selected.
*
* * state_enabled_selected, the button is enabled and selected.
* * state_disabled_selected, the button is disabled and selected.
* * state_focussed_selected, the mouse is over the button and selected.
* * state_focused_selected, the mouse is over the button and selected.
* @begin{parent}{name="gui/"}
* @begin{tag}{name="toggle_button_definition"}{min=0}{max=-1}{super="generic/widget_definition"}
* @begin{tag}{name="resolution"}{min=0}{max=-1}{super="generic/widget_definition/resolution"}
@ -52,14 +52,14 @@ ttoggle_button_definition::ttoggle_button_definition(const config& cfg)
* @end{tag}{name="state_enabled"}
* @begin{tag}{name="state_disabled"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_disabled"}
* @begin{tag}{name="state_focussed"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_focussed"}
* @begin{tag}{name="state_focused"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_focused"}
* @begin{tag}{name="state_enabled_selected"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_enabled_selected"}
* @begin{tag}{name="state_disabled_selected"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_disabled_selected"}
* @begin{tag}{name="state_focussed_selected"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_focussed_selected"}
* @begin{tag}{name="state_focused_selected"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_focused_selected"}
* @end{tag}{name="resolution"}
* @end{tag}{name="toggle_button_definition"}
* @end{parent}{name="gui/"}
@ -73,7 +73,7 @@ ttoggle_button_definition::tresolution::tresolution(const config& cfg)
{
state.push_back(tstate_definition(c.child("enabled")));
state.push_back(tstate_definition(c.child("disabled")));
state.push_back(tstate_definition(c.child("focussed")));
state.push_back(tstate_definition(c.child("focused")));
}
}

14
src/gui/auxiliary/widget_definition/toggle_panel.cpp
View file

@ -57,23 +57,23 @@ ttoggle_panel_definition::ttoggle_panel_definition(const config& cfg)
* The following states exist:
* * state_enabled, the panel is enabled and not selected.
* * state_disabled, the panel is disabled and not selected.
* * state_focussed, the mouse is over the panel and not selected.
* * state_focused, the mouse is over the panel and not selected.
*
* * state_enabled_selected, the panel is enabled and selected.
* * state_disabled_selected, the panel is disabled and selected.
* * state_focussed_selected, the mouse is over the panel and selected.
* * state_focused_selected, the mouse is over the panel and selected.
* @begin{tag}{name="state_enabled"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_enabled"}
* @begin{tag}{name="state_disabled"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_disabled"}
* @begin{tag}{name="state_focussed"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_focussed"}
* @begin{tag}{name="state_focused"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_focused"}
* @begin{tag}{name="state_enabled_selected"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_enabled_selected"}
* @begin{tag}{name="state_disabled_selected"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_disabled_selected"}
* @begin{tag}{name="state_focussed_selected"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_focussed_selected"}
* @begin{tag}{name="state_focused_selected"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_focused_selected"}
* @end{tag}{name="resolution"}
* @end{tag}{name="toggle_panel_definition"}
* @end{parent}{name="gui/"}
@ -90,7 +90,7 @@ ttoggle_panel_definition::tresolution::tresolution(const config& cfg)
{
state.push_back(tstate_definition(c.child("enabled")));
state.push_back(tstate_definition(c.child("disabled")));
state.push_back(tstate_definition(c.child("focussed")));
state.push_back(tstate_definition(c.child("focused")));
}
}

8
src/gui/auxiliary/widget_definition/vertical_scrollbar.cpp
View file

@ -66,15 +66,15 @@ tvertical_scrollbar_definition::tvertical_scrollbar_definition(
* * state_disabled, the vertical scrollbar is disabled.
* * state_pressed, the left mouse button is down on the positioner of the
* vertical scrollbar.
* * state_focussed, the mouse is over the positioner of the vertical scrollbar.
* * state_focused, the mouse is over the positioner of the vertical scrollbar.
* @begin{tag}{name="state_enabled"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_enabled"}
* @begin{tag}{name="state_disabled"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_disabled"}
* @begin{tag}{name="state_pressed"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_pressed"}
* @begin{tag}{name="state_focussed"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_focussed"}
* @begin{tag}{name="state_focused"}{min=0}{max=1}{super="generic/state"}
* @end{tag}{name="state_focused"}
* @end{tag}{name="resolution"}
* @end{tag}{name="vertical_scrollbar_definition"}
* @end{parent}{name="gui/"}
@ -94,7 +94,7 @@ tvertical_scrollbar_definition::tresolution::tresolution(const config& cfg)
state.push_back(tstate_definition(cfg.child("state_enabled")));
state.push_back(tstate_definition(cfg.child("state_disabled")));
state.push_back(tstate_definition(cfg.child("state_pressed")));
state.push_back(tstate_definition(cfg.child("state_focussed")));
state.push_back(tstate_definition(cfg.child("state_focused")));
}
} // namespace gui2

4
src/gui/widgets/button.cpp
View file

@ -85,7 +85,7 @@ void tbutton::signal_handler_mouse_enter(const event::tevent event,
{
DBG_GUI_E << LOG_HEADER << ' ' << event << ".\n";
set_state(FOCUSSED);
set_state(FOCUSED);
handled = true;
}
@ -117,7 +117,7 @@ void tbutton::signal_handler_left_button_up(const event::tevent event,
{
DBG_GUI_E << LOG_HEADER << ' ' << event << ".\n";
set_state(FOCUSSED);
set_state(FOCUSED);
handled = true;
}

2
src/gui/widgets/button.hpp
View file

@ -69,7 +69,7 @@ private:
ENABLED,
DISABLED,
PRESSED,
FOCUSSED,
FOCUSED,
COUNT
};

4
src/gui/widgets/repeating_button.cpp
View file

@ -109,7 +109,7 @@ void trepeating_button::signal_handler_mouse_enter(const event::tevent event,
{
DBG_GUI_E << LOG_HEADER << ' ' << event << ".\n";
set_state(FOCUSSED);
set_state(FOCUSED);
handled = true;
}
@ -163,7 +163,7 @@ void trepeating_button::signal_handler_left_button_up(const event::tevent event,
}
if(get_active()) {
set_state(FOCUSSED);
set_state(FOCUSED);
}
handled = true;
}

2
src/gui/widgets/repeating_button.hpp
View file

@ -79,7 +79,7 @@ private:
ENABLED,
DISABLED,
PRESSED,
FOCUSSED,
FOCUSED,
COUNT
};

8
src/gui/widgets/scrollbar.cpp
View file

@ -336,7 +336,7 @@ void tscrollbar_::signal_handler_mouse_motion(const event::tevent event,
switch(state_) {
case ENABLED:
if(on_positioner(mouse)) {
set_state(FOCUSSED);
set_state(FOCUSED);
}
break;
@ -347,7 +347,7 @@ void tscrollbar_::signal_handler_mouse_motion(const event::tevent event,
move_positioner(distance);
} break;
case FOCUSSED:
case FOCUSED:
if(!on_positioner(mouse)) {
set_state(ENABLED);
}
@ -370,7 +370,7 @@ void tscrollbar_::signal_handler_mouse_leave(const event::tevent event,
{
DBG_GUI_E << LOG_HEADER << ' ' << event << ".\n";
if(state_ == FOCUSSED) {
if(state_ == FOCUSED) {
set_state(ENABLED);
}
handled = true;
@ -427,7 +427,7 @@ void tscrollbar_::signal_handler_left_button_up(const event::tevent event,
get_window()->mouse_capture(false);
if(on_positioner(mouse)) {
set_state(FOCUSSED);
set_state(FOCUSED);
} else {
set_state(ENABLED);
}

2
src/gui/widgets/scrollbar.hpp
View file

@ -192,7 +192,7 @@ private:
ENABLED,
DISABLED,
PRESSED,
FOCUSSED,
FOCUSED,
COUNT
};

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

@ -537,7 +537,7 @@ void load_settings()
* @begin{parent}{name="generic/"}
* @begin{tag}{name="state"}{min=0}{max=1}
* Definition of a state. A state contains the info what to do in a state.
* Atm this is rather focussed on the drawing part, might change later.
* Atm this is rather focused on the drawing part, might change later.
* Keys:
* @begin{table}{config}
* draw & section & & Section with drawing directions for a

2
src/gui/widgets/text.cpp
View file

@ -433,7 +433,7 @@ void ttext_::signal_handler_receive_keyboard_focus(const event::tevent event)
{
DBG_GUI_E << LOG_HEADER << ' ' << event << ".\n";
set_state(FOCUSSED);
set_state(FOCUSED);
}
void ttext_::signal_handler_lose_keyboard_focus(const event::tevent event)

2
src/gui/widgets/text.hpp
View file

@ -234,7 +234,7 @@ private:
enum tstate {
ENABLED,
DISABLED,
FOCUSSED,
FOCUSED,
COUNT
};

2
src/gui/widgets/toggle_button.cpp
View file

@ -148,7 +148,7 @@ void ttoggle_button::signal_handler_mouse_enter(const event::tevent event,
bool& handled)
{
DBG_GUI_E << LOG_HEADER << ' ' << event << ".\n";
set_state(FOCUSSED);
set_state(FOCUSED);
handled = true;
}

2
src/gui/widgets/toggle_button.hpp
View file

@ -91,7 +91,7 @@ private:
enum tstate {
ENABLED,
DISABLED,
FOCUSSED,
FOCUSED,
COUNT
};

2
src/gui/widgets/toggle_panel.cpp
View file

@ -236,7 +236,7 @@ void ttoggle_panel::signal_handler_mouse_enter(const event::tevent event,
{
DBG_GUI_E << LOG_HEADER << ' ' << event << ".\n";
set_state(FOCUSSED);
set_state(FOCUSED);
handled = true;
}

2
src/gui/widgets/toggle_panel.hpp
View file

@ -123,7 +123,7 @@ private:
enum tstate {
ENABLED,
DISABLED,
FOCUSSED,
FOCUSED,
COUNT
};

2
src/gui/widgets/window.cpp
View file

@ -182,7 +182,7 @@ static void delay_event(const SDL_Event& event, const Uint32 delay)
/**
* Adds a SHOW_HELPTIP event to the SDL event queue.
*
* The event is used to show the helptip for the currently focussed widget.
* The event is used to show the helptip for the currently focused widget.
*/
static bool helptip()
{