← Back to branch summary

~qcumber-some/widelands/spice-up-cmake

« back to all changes in this revision

Viewing changes to src/wui/interactive_dedicated_server.cc

  • Committer: Jens Beyer (Qcumber-some)
  • Date: 2010-05-28 14:51:37 UTC
  • mfrom: (5149.1.226 trunk)
  • Revision ID: qcumber-some@buerotiger.de-20100528145137-0pyil9qw7szyztsw
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/wui/interactive_dedicated_server.cc
43
43
        :
44
44
        Interactive_GameBase(_game, global_s, NONE, true),
45
45
 
46
 
#define INIT_BTN(picture, callback, tooltip)                                  \
47
 
 TOOLBAR_BUTTON_COMMON_PARAMETERS,                                            \
 
46
#define INIT_BTN(picture, name, callback, tooltip)                            \
 
47
 TOOLBAR_BUTTON_COMMON_PARAMETERS(name),                                      \
48
48
 g_gr->get_picture(PicMod_Game, "pics/" picture ".png"),                      \
49
49
 &Interactive_DServer::callback, *this,                                       \
50
50
 tooltip                                                                      \
51
51
 
52
52
        m_toggle_chat
53
 
                (INIT_BTN("menu_chat",           toggle_chat,         _("Chat"))),
 
53
                (INIT_BTN("menu_chat", "chat", toggle_chat, _("Chat"))),
54
54
        m_toggle_options_menu
55
 
                (INIT_BTN("menu_options_menu",   toggle_options_menu, _("Options"))),
 
55
                (INIT_BTN("menu_options_menu", "options_menu", toggle_options_menu,
 
56
                        _("Options"))
 
57
        ),
56
58
        m_toggle_statistics
57
 
                (INIT_BTN("menu_general_stats",  toggle_statistics,   _("Statistics")))
 
59
                (INIT_BTN("menu_general_stats", "general_stats", toggle_statistics,
 
60
                        _("Statistics"))
 
61
        )
58
62
{
 
63
        m_toolbar.set_layout_toplevel(true);
59
64
        m_toolbar.add(&m_toggle_chat,            UI::Box::AlignLeft);
60
65
        m_toolbar.add(&m_toggle_options_menu,    UI::Box::AlignLeft);
61
66
        m_toolbar.add(&m_toggle_statistics,      UI::Box::AlignLeft);
63
68
        m_chatDisplay =
64
69
                new ChatDisplay(this, 10, 25, get_w() - 10, get_h() - 25);
65
70
 
66
 
        m_toolbar.layout();
67
71
        adjust_toolbar_position();
68
72
}
69
73