From 549acdcf100650952a9a3926dc8c34da752adfa9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 7 May 2015 01:16:49 +0300 Subject: Remove npcpostdialog. --- src/CMakeLists.txt | 2 - src/Makefile.am | 2 - src/being/playerinfo.cpp | 4 +- src/gui/windows/npcpostdialog.cpp | 143 -------------------------------------- src/gui/windows/npcpostdialog.h | 75 -------------------- src/input/inputmanager.cpp | 4 +- 6 files changed, 2 insertions(+), 228 deletions(-) delete mode 100644 src/gui/windows/npcpostdialog.cpp delete mode 100644 src/gui/windows/npcpostdialog.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 12517b841..d51f6897f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -390,8 +390,6 @@ SET(SRCS gui/windows/ministatuswindow.h gui/windows/npcdialog.cpp gui/windows/npcdialog.h - gui/windows/npcpostdialog.cpp - gui/windows/npcpostdialog.h gui/windows/npcselldialog.cpp gui/windows/npcselldialog.h gui/windows/okdialog.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 6752b3b7f..e585eab28 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -528,8 +528,6 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/windows/ministatuswindow.h \ gui/windows/npcdialog.cpp \ gui/windows/npcdialog.h \ - gui/windows/npcpostdialog.cpp \ - gui/windows/npcpostdialog.h \ gui/windows/npcselldialog.cpp \ gui/windows/npcselldialog.h \ gui/windows/okdialog.cpp \ diff --git a/src/being/playerinfo.cpp b/src/being/playerinfo.cpp index 8ed30492f..576d6575d 100644 --- a/src/being/playerinfo.cpp +++ b/src/being/playerinfo.cpp @@ -37,7 +37,6 @@ #include "gui/windows/inventorywindow.h" #include "gui/windows/npcdialog.h" -#include "gui/windows/npcpostdialog.h" #include "net/homunculushandler.h" #include "net/inventoryhandler.h" @@ -418,8 +417,7 @@ void clear() bool isTalking() { - return NpcDialog::isActive() || NpcPostDialog::isActive() - || InventoryWindow::isStorageActive(); + return NpcDialog::isActive() || InventoryWindow::isStorageActive(); } void gameDestroyed() diff --git a/src/gui/windows/npcpostdialog.cpp b/src/gui/windows/npcpostdialog.cpp deleted file mode 100644 index 5f0606bd8..000000000 --- a/src/gui/windows/npcpostdialog.cpp +++ /dev/null @@ -1,143 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2008-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2015 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * 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, see . - */ - -#include "gui/windows/npcpostdialog.h" - -#include "gui/windows/setupwindow.h" - -#include "gui/widgets/button.h" -#include "gui/widgets/label.h" -#include "gui/widgets/textbox.h" -#include "gui/widgets/textfield.h" -#include "gui/widgets/scrollarea.h" - -#include "gui/widgets/tabs/chat/chattab.h" - -#include "utils/gettext.h" - -#include "debug.h" - -NpcPostDialog::DialogList NpcPostDialog::instances; - -NpcPostDialog::NpcPostDialog(const int npcId A_UNUSED) : - // TRANSLATORS: npc post dialog caption - Window(_("NPC"), Modal_false, nullptr, "npcpost.xml"), - ActionListener(), - mText(new TextBox(this)), - mSender(new TextField(this)) -// mNpcId(npcId) -{ - setContentSize(400, 180); -} - -void NpcPostDialog::postInit() -{ - if (setupWindow) - setupWindow->registerWindowForReset(this); - - // create text field for receiver - // TRANSLATORS: label in npc post dialog - Label *const senderText = new Label(this, _("To:")); - senderText->setPosition(5, 5); - mSender->setPosition(senderText->getWidth() + 5, 5); - mSender->setWidth(65); - - // create button for sending - // TRANSLATORS: button in npc post dialog - Button *const sendButton = new Button(this, _("Send"), "send", this); - sendButton->setPosition(400 - sendButton->getWidth(), - 170 - sendButton->getHeight()); - // TRANSLATORS: button in npc post dialog - Button *const cancelButton = new Button(this, _("Cancel"), "cancel", this); - cancelButton->setPosition(sendButton->getX() - - (cancelButton->getWidth() + 2), sendButton->getY()); - - // create textfield for letter - mText->setHeight(400 - (mSender->getHeight() + sendButton->getHeight())); - mText->setEditable(true); - - // create scroll box for letter text - ScrollArea *const scrollArea = new ScrollArea(this, mText); - scrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER); - scrollArea->setDimension(Rect( - 5, mSender->getHeight() + 5, - 380, 140 - (mSender->getHeight() + sendButton->getHeight()))); - - add(senderText); - add(mSender); - add(scrollArea); - add(sendButton); - add(cancelButton); - - setLocationRelativeTo(getParent()); - - instances.push_back(this); - setVisible(true); - enableVisibleSound(true); -} - -NpcPostDialog::~NpcPostDialog() -{ - instances.remove(this); -} - -void NpcPostDialog::action(const ActionEvent &event) -{ - const std::string &eventId = event.getId(); - if (eventId == "send") - { - if (mSender->getText().empty() || mText->getText().empty()) - { - if (localChatTab) - { - // TRANSLATORS: npc post message error - localChatTab->chatLog(_("Failed to send as sender or letter " - "invalid.")); - } - } - else - { -// npcHandler->sendLetter(mNpcId, -// mSender->getText(), -// mText->getText()); - } - setVisible(false); - } - else if (eventId == "cancel") - { - setVisible(false); - } -} - -void NpcPostDialog::setVisible(bool visible) -{ - Window::setVisible(visible); - - if (!visible) - scheduleDelete(); -} - -void NpcPostDialog::closeAll() -{ - FOR_EACH (DialogList::const_iterator, it, instances) - (*it)->close(); -} diff --git a/src/gui/windows/npcpostdialog.h b/src/gui/windows/npcpostdialog.h deleted file mode 100644 index 511d48625..000000000 --- a/src/gui/windows/npcpostdialog.h +++ /dev/null @@ -1,75 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2008-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2015 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * 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, see . - */ - -#ifndef GUI_WINDOWS_NPCPOSTDIALOG_H -#define GUI_WINDOWS_NPCPOSTDIALOG_H - -#include "gui/widgets/window.h" - -#include "listeners/actionlistener.h" - -class TextBox; -class TextField; - -class NpcPostDialog final : public Window, - public ActionListener -{ - public: - /** - * Constructor - */ - explicit NpcPostDialog(const int npcId); - - A_DELETE_COPY(NpcPostDialog) - - ~NpcPostDialog(); - - void postInit() override final; - - /** - * Called when receiving actions from the widgets. - */ - void action(const ActionEvent &event) override final; - - void setVisible(bool visible) override final; - - /** - * Returns true if any instances exist. - */ - static bool isActive() A_WARN_UNUSED - { return !instances.empty(); } - - /** - * Closes all instances. - */ - static void closeAll(); - - private: - typedef std::list DialogList; - static DialogList instances; - - TextBox *mText; - TextField *mSender; -// int mNpcId; -}; - -#endif // GUI_WINDOWS_NPCPOSTDIALOG_H diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp index 677b008c1..35272f6e8 100644 --- a/src/input/inputmanager.cpp +++ b/src/input/inputmanager.cpp @@ -48,7 +48,6 @@ #include "gui/windows/chatwindow.h" #include "gui/windows/inventorywindow.h" #include "gui/windows/npcdialog.h" -#include "gui/windows/npcpostdialog.h" #include "gui/windows/setupwindow.h" #include "gui/windows/textdialog.h" #include "gui/windows/tradewindow.h" @@ -548,8 +547,7 @@ bool InputManager::handleEvent(const SDL_Event &event) keyboard.handleActicateKey(event); // send straight to gui for certain windows - if (quitDialog || TextDialog::isActive() || - NpcPostDialog::isActive()) + if (quitDialog || TextDialog::isActive()) { if (guiInput) guiInput->pushInput(event); -- cgit v1.2.3-60-g2f50