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

Revert 2009-10-14T21:36:49Z!koraq@xs4all.nl.

Browse source 
Don't try to switch branches when git svn dcommit is still running...
This commit is contained in:
Mark de Wever 2009-10-14 21:47:24 +00:00
parent 625cd7be9f
commit 0ddb237dc6
4 changed files with 20 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
data/gui/default/window/lobby_main.cfg
View file

@ -187,16 +187,16 @@
[/row]
[/grid]
{VERTICAL_END}
{HORIZONTAL_SEP}
horizontal_alignment = "right"
[grid]
[row]
{GAMELISTBOX_BODY_BUTTON "join" "Join"}
[/row]
[row]
{GAMELISTBOX_BODY_BUTTON "observe" "Observe"}
[/row]
[/grid]
# {HORIZONTAL_SEP}
# horizontal_alignment = "right"
# [grid]
# [row]
# {GAMELISTBOX_BODY_BUTTON "join" "Join"}
# [/row]
# [row]
# {GAMELISTBOX_BODY_BUTTON "observe" "Observe"}
# [/row]
# [/grid]
{HORIZONTAL_END}
[/toggle_panel]
[/column]

12
src/gui/dialogs/lobby_main.cpp
View file

@ -451,15 +451,15 @@ void tlobby_main::update_gamelist()
tbutton* join_button = dynamic_cast<tbutton*>(grid->find("join", false));
if (join_button) {
// join_button->set_callback_mouse_left_click(
// dialog_callback<tlobby_main, &tlobby_main::join_button_callback>);
// join_button->set_active(game.can_join());
join_button->set_callback_mouse_left_click(
dialog_callback<tlobby_main, &tlobby_main::join_button_callback>);
join_button->set_active(game.can_join());
}
tbutton* observe_button = dynamic_cast<tbutton*>(grid->find("observe", false));
if (observe_button) {
// observe_button->set_callback_mouse_left_click(
// dialog_callback<tlobby_main, &tlobby_main::observe_button_callback>);
// observe_button->set_active(game.can_observe());
observe_button->set_callback_mouse_left_click(
dialog_callback<tlobby_main, &tlobby_main::observe_button_callback>);
observe_button->set_active(game.can_observe());
}
tminimap* minimap = dynamic_cast<tminimap*>(grid->find("minimap", false));
if (minimap) {

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

@ -31,28 +31,17 @@ ttoggle_panel::ttoggle_panel()
, retval_(0)
, callback_state_change_(0)
, callback_mouse_left_double_click_()
#ifdef DISTRIBUTOR
, event_distributor_(*this, event::tdispatcher::front_pre_child)
#endif
{
set_wants_mouse_left_double_click();
connect_signal<event::LEFT_BUTTON_CLICK>(boost::bind(
&ttoggle_panel::signal_handler_left_button_click
, this, _2, _3));
connect_signal<event::LEFT_BUTTON_CLICK>(boost::bind(
&ttoggle_panel::signal_handler_left_button_click
, this, _2, _3)
, event::tdispatcher::back_post_child);
connect_signal<event::LEFT_BUTTON_DOUBLE_CLICK>(boost::bind(
&ttoggle_panel::signal_handler_left_button_double_click
, this, _2, _3));
#ifndef DISTRIBUTOR
connect_signal<event::MOUSE_ENTER>(boost::bind(
&ttoggle_panel::signal_handler_mouse_enter, this, _2, _3));
connect_signal<event::MOUSE_LEAVE>(boost::bind(
&ttoggle_panel::signal_handler_mouse_leave, this, _2, _3));
connect_signal<event::LEFT_BUTTON_CLICK>(boost::bind(
&ttoggle_panel::signal_handler_left_button_click
, this, _2, _3));
connect_signal<event::LEFT_BUTTON_CLICK>(boost::bind(
&ttoggle_panel::signal_handler_left_button_click
, this, _2, _3)
@ -64,7 +53,6 @@ ttoggle_panel::ttoggle_panel()
&ttoggle_panel::signal_handler_left_button_double_click
, this, _2, _3)
, event::tdispatcher::back_post_child);
#endif
}
void ttoggle_panel::set_child_members(const std::map<std::string /* widget id */, string_map>& data)

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

@ -15,7 +15,6 @@
#ifndef GUI_WIDGETS_TOGGLE_PANEL_HPP_INCLUDED
#define GUI_WIDGETS_TOGGLE_PANEL_HPP_INCLUDED
#include "gui/auxiliary/event/distributor.hpp"
#include "gui/widgets/panel.hpp"
#include "gui/widgets/selectable.hpp"
@ -172,12 +171,7 @@ private:
/** Mouse left double click callback */
boost::function<void (twidget*)> callback_mouse_left_double_click_;
// define if want to use the new event distributor
//#define DISTRIBUTOR
#ifdef DISTRIBUTOR
/** The event distributor for us. */
event::tdistributor event_distributor_;
#endif
/** Inherited from tpanel. */
void impl_draw_background(surface& frame_buffer)
{