From c9db5bbbb20d22690583f6ae8d1d4f1bf1588181 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 29 Apr 2015 14:31:27 +0300 Subject: Rename mailedit into maileditwindow. --- src/CMakeLists.txt | 4 +- src/Makefile.am | 4 +- src/gui/windows/itemamountwindow.cpp | 2 +- src/gui/windows/mailedit.cpp | 181 ----------------------------------- src/gui/windows/mailedit.h | 74 -------------- src/gui/windows/maileditwindow.cpp | 181 +++++++++++++++++++++++++++++++++++ src/gui/windows/maileditwindow.h | 74 ++++++++++++++ src/gui/windows/mailwindow.cpp | 4 +- 8 files changed, 262 insertions(+), 262 deletions(-) delete mode 100644 src/gui/windows/mailedit.cpp delete mode 100644 src/gui/windows/mailedit.h create mode 100644 src/gui/windows/maileditwindow.cpp create mode 100644 src/gui/windows/maileditwindow.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2d860988d..1fe043dda 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -384,8 +384,8 @@ SET(SRCS gui/windows/killstats.h gui/windows/logindialog.cpp gui/windows/logindialog.h - gui/windows/mailedit.cpp - gui/windows/mailedit.h + gui/windows/maileditwindow.cpp + gui/windows/maileditwindow.h gui/windows/mailview.cpp gui/windows/mailview.h gui/windows/mailwindow.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 4f92a9c93..edbeb454a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -522,8 +522,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/windows/killstats.h \ gui/windows/logindialog.cpp \ gui/windows/logindialog.h \ - gui/windows/mailedit.cpp \ - gui/windows/mailedit.h \ + gui/windows/maileditwindow.cpp \ + gui/windows/maileditwindow.h \ gui/windows/mailview.cpp \ gui/windows/mailview.h \ gui/windows/mailwindow.cpp \ diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp index d1cf9138c..870d91265 100644 --- a/src/gui/windows/itemamountwindow.cpp +++ b/src/gui/windows/itemamountwindow.cpp @@ -35,7 +35,7 @@ #include "gui/popups/itempopup.h" -#include "gui/windows/mailedit.h" +#include "gui/windows/maileditwindow.h" #include "gui/windows/shopwindow.h" #include "gui/windows/tradewindow.h" diff --git a/src/gui/windows/mailedit.cpp b/src/gui/windows/mailedit.cpp deleted file mode 100644 index 5bb669b72..000000000 --- a/src/gui/windows/mailedit.cpp +++ /dev/null @@ -1,181 +0,0 @@ -/* - * The ManaPlus Client - * 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/mailedit.h" - -#include "inventory.h" -#include "item.h" - -#include "being/playerinfo.h" -#include "net/mailhandler.h" - -#include "gui/windows/inventorywindow.h" -#include "gui/windows/itemamountwindow.h" -#include "gui/windows/setupwindow.h" - -#include "gui/widgets/button.h" -#include "gui/widgets/containerplacer.h" -#include "gui/widgets/inttextfield.h" -#include "gui/widgets/itemcontainer.h" -#include "gui/widgets/label.h" -#include "gui/widgets/layout.h" -#include "gui/widgets/layouttype.h" -#include "gui/widgets/scrollarea.h" -#include "gui/widgets/textfield.h" - -#include "utils/delete2.h" -#include "utils/gettext.h" -#include "utils/stringutils.h" - -#include "debug.h" - -MailEdit *mailEditWindow = nullptr; - -MailEdit::MailEdit() : - // TRANSLATORS: mail edit window name - Window(_("Edit mail"), false, nullptr, "mailedit.xml"), - ActionListener(), - // TRANSLATORS: mail edit window button - mSendButton(new Button(this, _("Send"), "send", this)), - // TRANSLATORS: mail edit window button - mCloseButton(new Button(this, _("Close"), "close", this)), - // TRANSLATORS: mail edit window button - mAddButton(new Button(this, _("Add"), "add", this)), - // TRANSLATORS: mail edit window label - mToLabel(new Label(this, _("To:"))), - // TRANSLATORS: mail edit window label - mSubjectLabel(new Label(this, _("Subject:"))), - // TRANSLATORS: mail edit window label - mMoneyLabel(new Label(this, _("Money:"))), - // TRANSLATORS: mail edit window label - mItemLabel(new Label(this, _("Item:"))), - // TRANSLATORS: mail edit window label - mMessageLabel(new Label(this, _("Message:"))), - mToField(new TextField(this)), - mSubjectField(new TextField(this)), - mMoneyField(new IntTextField(this, 0, 0, 10000000)), - mMessageField(new TextField(this)), - mInventory(new Inventory(InventoryType::MAIL, 1)), - mItemContainer(new ItemContainer(this, mInventory)), - mItemScrollArea(new ScrollArea(this, mItemContainer, - getOptionBool("showitemsbackground"), "mailedit_listbackground.xml")) -{ - setWindowName("MailEdit"); - setCloseButton(true); - setResizable(true); - setCloseButton(true); - setSaveVisible(false); - setStickyButtonLock(true); - setVisible(true); - - setDefaultSize(380, 150, ImageRect::CENTER); - setMinWidth(200); - setMinHeight(100); - center(); - - ContainerPlacer placer; - placer = getPlacer(0, 0); - - mToField->setWidth(100); - mSubjectField->setWidth(100); - mMessageField->setWidth(100); - mItemScrollArea->setHeight(70); - - mItemScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER); - mItemScrollArea->setVerticalScrollPolicy(ScrollArea::SHOW_NEVER); - - placer(0, 0, mToLabel); - placer(1, 0, mToField, 3); - placer(0, 1, mSubjectLabel); - placer(1, 1, mSubjectField, 3); - placer(0, 2, mMoneyLabel); - placer(1, 2, mMoneyField, 3); - placer(0, 3, mItemLabel); - placer(1, 3, mItemScrollArea, 2, 2); - placer(3, 4, mAddButton, 1); - - placer(0, 5, mMessageLabel); - placer(1, 5, mMessageField, 3); - placer(0, 6, mSendButton); - placer(3, 6, mCloseButton); - - loadWindowState(); - enableVisibleSound(true); -} - -MailEdit::~MailEdit() -{ - mailEditWindow = nullptr; - delete2(mInventory); -} - -void MailEdit::action(const ActionEvent &event) -{ - const std::string &eventId = event.getId(); - if (eventId == "close") - { - scheduleDelete(); - } - else if (eventId == "send") - { - const int money = mMoneyField->getValue(); - if (money) - mailHandler->setAttachMoney(money); - const Item *const tempItem = mInventory->getItem(0); - if (tempItem) - { - const Inventory *const inv = PlayerInfo::getInventory(); - const Item *const item = inv->findItem(tempItem->getId(), 1); - if (item) - { - mailHandler->setAttach(item->getInvIndex(), - tempItem->getQuantity()); - } - } - - mailHandler->send(mToField->getText(), - mSubjectField->getText(), - mMessageField->getText()); - } - else if (eventId == "add") - { - Item *const item = inventoryWindow->getSelectedItem(); - - if (!item) - return; - - ItemAmountWindow::showWindow(ItemAmountWindow::MailAdd, - this, item); - } -} - -void MailEdit::addItem(const Item *const item, const int amount) -{ - mInventory->addItem(item->getId(), - item->getType(), - amount, - item->getRefine(), - item->getColor(), - item->getIdentified(), - item->getDamaged(), - item->getFavorite(), - Equipm_false, - Equipped_false); -} diff --git a/src/gui/windows/mailedit.h b/src/gui/windows/mailedit.h deleted file mode 100644 index 57ae40828..000000000 --- a/src/gui/windows/mailedit.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - * The ManaPlus Client - * 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_MAILEDIT_H -#define GUI_WINDOWS_MAILEDIT_H - -#ifdef EATHENA_SUPPORT - -#include "gui/widgets/window.h" - -#include "listeners/actionlistener.h" - -class Button; -class IntTextField; -class Inventory; -class Item; -class ItemContainer; -class Label; -class ScrollArea; -class TextField; - -class MailEdit final : public Window, - public ActionListener -{ - public: - MailEdit(); - - A_DELETE_COPY(MailEdit) - - ~MailEdit(); - - void action(const ActionEvent &event) override final; - - void addItem(const Item *const item, const int amount); - - private: - Button *mSendButton; - Button *mCloseButton; - Button *mAddButton; - Label *mToLabel; - Label *mSubjectLabel; - Label *mMoneyLabel; - Label *mItemLabel; - Label *mMessageLabel; - TextField *mToField; - TextField *mSubjectField; - IntTextField *mMoneyField; - TextField *mMessageField; - Inventory *mInventory; - ItemContainer *mItemContainer; - ScrollArea *mItemScrollArea; -}; - -extern MailEdit *mailEditWindow; - -#endif // EATHENA_SUPPORT -#endif // GUI_WINDOWS_MAILEDIT_H diff --git a/src/gui/windows/maileditwindow.cpp b/src/gui/windows/maileditwindow.cpp new file mode 100644 index 000000000..d6f91e394 --- /dev/null +++ b/src/gui/windows/maileditwindow.cpp @@ -0,0 +1,181 @@ +/* + * The ManaPlus Client + * 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/maileditwindow.h" + +#include "inventory.h" +#include "item.h" + +#include "being/playerinfo.h" +#include "net/mailhandler.h" + +#include "gui/windows/inventorywindow.h" +#include "gui/windows/itemamountwindow.h" +#include "gui/windows/setupwindow.h" + +#include "gui/widgets/button.h" +#include "gui/widgets/containerplacer.h" +#include "gui/widgets/inttextfield.h" +#include "gui/widgets/itemcontainer.h" +#include "gui/widgets/label.h" +#include "gui/widgets/layout.h" +#include "gui/widgets/layouttype.h" +#include "gui/widgets/scrollarea.h" +#include "gui/widgets/textfield.h" + +#include "utils/delete2.h" +#include "utils/gettext.h" +#include "utils/stringutils.h" + +#include "debug.h" + +MailEditWindow *mailEditWindow = nullptr; + +MailEditWindow::MailEditWindow() : + // TRANSLATORS: mail edit window name + Window(_("Edit mail"), false, nullptr, "mailedit.xml"), + ActionListener(), + // TRANSLATORS: mail edit window button + mSendButton(new Button(this, _("Send"), "send", this)), + // TRANSLATORS: mail edit window button + mCloseButton(new Button(this, _("Close"), "close", this)), + // TRANSLATORS: mail edit window button + mAddButton(new Button(this, _("Add"), "add", this)), + // TRANSLATORS: mail edit window label + mToLabel(new Label(this, _("To:"))), + // TRANSLATORS: mail edit window label + mSubjectLabel(new Label(this, _("Subject:"))), + // TRANSLATORS: mail edit window label + mMoneyLabel(new Label(this, _("Money:"))), + // TRANSLATORS: mail edit window label + mItemLabel(new Label(this, _("Item:"))), + // TRANSLATORS: mail edit window label + mMessageLabel(new Label(this, _("Message:"))), + mToField(new TextField(this)), + mSubjectField(new TextField(this)), + mMoneyField(new IntTextField(this, 0, 0, 10000000)), + mMessageField(new TextField(this)), + mInventory(new Inventory(InventoryType::MAIL, 1)), + mItemContainer(new ItemContainer(this, mInventory)), + mItemScrollArea(new ScrollArea(this, mItemContainer, + getOptionBool("showitemsbackground"), "mailedit_listbackground.xml")) +{ + setWindowName("MailEdit"); + setCloseButton(true); + setResizable(true); + setCloseButton(true); + setSaveVisible(false); + setStickyButtonLock(true); + setVisible(true); + + setDefaultSize(380, 150, ImageRect::CENTER); + setMinWidth(200); + setMinHeight(100); + center(); + + ContainerPlacer placer; + placer = getPlacer(0, 0); + + mToField->setWidth(100); + mSubjectField->setWidth(100); + mMessageField->setWidth(100); + mItemScrollArea->setHeight(70); + + mItemScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER); + mItemScrollArea->setVerticalScrollPolicy(ScrollArea::SHOW_NEVER); + + placer(0, 0, mToLabel); + placer(1, 0, mToField, 3); + placer(0, 1, mSubjectLabel); + placer(1, 1, mSubjectField, 3); + placer(0, 2, mMoneyLabel); + placer(1, 2, mMoneyField, 3); + placer(0, 3, mItemLabel); + placer(1, 3, mItemScrollArea, 2, 2); + placer(3, 4, mAddButton, 1); + + placer(0, 5, mMessageLabel); + placer(1, 5, mMessageField, 3); + placer(0, 6, mSendButton); + placer(3, 6, mCloseButton); + + loadWindowState(); + enableVisibleSound(true); +} + +MailEditWindow::~MailEditWindow() +{ + mailEditWindow = nullptr; + delete2(mInventory); +} + +void MailEditWindow::action(const ActionEvent &event) +{ + const std::string &eventId = event.getId(); + if (eventId == "close") + { + scheduleDelete(); + } + else if (eventId == "send") + { + const int money = mMoneyField->getValue(); + if (money) + mailHandler->setAttachMoney(money); + const Item *const tempItem = mInventory->getItem(0); + if (tempItem) + { + const Inventory *const inv = PlayerInfo::getInventory(); + const Item *const item = inv->findItem(tempItem->getId(), 1); + if (item) + { + mailHandler->setAttach(item->getInvIndex(), + tempItem->getQuantity()); + } + } + + mailHandler->send(mToField->getText(), + mSubjectField->getText(), + mMessageField->getText()); + } + else if (eventId == "add") + { + Item *const item = inventoryWindow->getSelectedItem(); + + if (!item) + return; + + ItemAmountWindow::showWindow(ItemAmountWindow::MailAdd, + this, item); + } +} + +void MailEditWindow::addItem(const Item *const item, const int amount) +{ + mInventory->addItem(item->getId(), + item->getType(), + amount, + item->getRefine(), + item->getColor(), + item->getIdentified(), + item->getDamaged(), + item->getFavorite(), + Equipm_false, + Equipped_false); +} diff --git a/src/gui/windows/maileditwindow.h b/src/gui/windows/maileditwindow.h new file mode 100644 index 000000000..b1838817c --- /dev/null +++ b/src/gui/windows/maileditwindow.h @@ -0,0 +1,74 @@ +/* + * The ManaPlus Client + * 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_MAILEDITWINDOW_H +#define GUI_WINDOWS_MAILEDITWINDOW_H + +#ifdef EATHENA_SUPPORT + +#include "gui/widgets/window.h" + +#include "listeners/actionlistener.h" + +class Button; +class IntTextField; +class Inventory; +class Item; +class ItemContainer; +class Label; +class ScrollArea; +class TextField; + +class MailEditWindow final : public Window, + public ActionListener +{ + public: + MailEditWindow(); + + A_DELETE_COPY(MailEditWindow) + + ~MailEditWindow(); + + void action(const ActionEvent &event) override final; + + void addItem(const Item *const item, const int amount); + + private: + Button *mSendButton; + Button *mCloseButton; + Button *mAddButton; + Label *mToLabel; + Label *mSubjectLabel; + Label *mMoneyLabel; + Label *mItemLabel; + Label *mMessageLabel; + TextField *mToField; + TextField *mSubjectField; + IntTextField *mMoneyField; + TextField *mMessageField; + Inventory *mInventory; + ItemContainer *mItemContainer; + ScrollArea *mItemScrollArea; +}; + +extern MailEditWindow *mailEditWindow; + +#endif // EATHENA_SUPPORT +#endif // GUI_WINDOWS_MAILEDITWINDOW_H diff --git a/src/gui/windows/mailwindow.cpp b/src/gui/windows/mailwindow.cpp index 1d0bbca62..959ae6a2c 100644 --- a/src/gui/windows/mailwindow.cpp +++ b/src/gui/windows/mailwindow.cpp @@ -26,7 +26,7 @@ #include "gui/mailmessage.h" -#include "gui/windows/mailedit.h" +#include "gui/windows/maileditwindow.h" #include "gui/windows/mailview.h" #include "gui/windows/setupwindow.h" @@ -113,7 +113,7 @@ void MailWindow::action(const ActionEvent &event) else if (eventId == "new") { if (!mailEditWindow) - mailEditWindow = new MailEdit(); + mailEditWindow = new MailEditWindow(); } else if (eventId == "open") { -- cgit v1.2.3-70-g09d2