diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-05-04 23:26:22 +0200 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-05-04 23:41:45 +0200 |
commit | 6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d (patch) | |
tree | a4ae355fe26eda518a5fd82c15347b6cfcf6b7f6 /src/gui/emotewindow.cpp | |
parent | 1b06ec9f12e3fbfe6fbf6579fb64bb895464badb (diff) | |
download | mana-client-6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d.tar.gz mana-client-6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d.tar.bz2 mana-client-6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d.tar.xz mana-client-6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d.zip |
Replaced emote window with a new emote popup
The popup is meant to be temporary, showing the emote instantly when you
click on it. It adapts nicely to show any number of emotes.
I still need to add a better way of assigning emote shortcuts, since
currently you can only change which emote is assigned to which shortcut
by actually using it.
Diffstat (limited to 'src/gui/emotewindow.cpp')
-rw-r--r-- | src/gui/emotewindow.cpp | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/src/gui/emotewindow.cpp b/src/gui/emotewindow.cpp deleted file mode 100644 index 69282f8f..00000000 --- a/src/gui/emotewindow.cpp +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Extended support for activating emotes - * Copyright (C) 2009 Aethyra Development Team - * - * This file is part of The Mana World. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "gui/emotewindow.h" - -#include "gui/gui.h" -#include "gui/emotecontainer.h" - -#include "gui/widgets/button.h" -#include "gui/widgets/layout.h" -#include "gui/widgets/scrollarea.h" - -#include "localplayer.h" - -#include "utils/gettext.h" -#include "utils/stringutils.h" - -EmoteWindow::EmoteWindow(): - Window(_("Emote")) -{ - setWindowName("Emote"); - setResizable(true); - setCloseButton(true); - setSaveVisible(true); - setMinWidth(80); - setMinHeight(130); - setDefaultSize(322, 200, ImageRect::CENTER); - - mUseButton = new Button(_("Use"), "use", this); - - mEmotes = new EmoteContainer; - mEmotes->addSelectionListener(this); - - mEmoteScroll = new ScrollArea(mEmotes); - mEmoteScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); - - place(0, 0, mEmoteScroll, 5, 4); - place(4, 4, mUseButton); - - Layout &layout = getLayout(); - layout.setRowHeight(0, Layout::AUTO_SET); - - mUseButton->setSize(60, mUseButton->getHeight()); - - loadWindowState(); -} - -void EmoteWindow::action(const gcn::ActionEvent &event) -{ - int emote = mEmotes->getSelectedEmote(); - - if (!emote) - return; - - player_node->emote(emote); -} - -int EmoteWindow::getSelectedEmote() const -{ - return mEmotes->getSelectedEmote(); -} |