From b7258f41b38b1fd1d8c6fec6984aa931f847e718 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 29 Apr 2015 14:46:05 +0300 Subject: Rename mailview into mailviewwindow. --- src/CMakeLists.txt | 4 +- src/Makefile.am | 4 +- src/gui/windows/mailview.cpp | 146 ------------------------------------- src/gui/windows/mailview.h | 65 ----------------- src/gui/windows/mailviewwindow.cpp | 146 +++++++++++++++++++++++++++++++++++++ src/gui/windows/mailviewwindow.h | 65 +++++++++++++++++ src/gui/windows/mailwindow.cpp | 4 +- 7 files changed, 217 insertions(+), 217 deletions(-) delete mode 100644 src/gui/windows/mailview.cpp delete mode 100644 src/gui/windows/mailview.h create mode 100644 src/gui/windows/mailviewwindow.cpp create mode 100644 src/gui/windows/mailviewwindow.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1fe043dda..82d269c5d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -386,8 +386,8 @@ SET(SRCS gui/windows/logindialog.h gui/windows/maileditwindow.cpp gui/windows/maileditwindow.h - gui/windows/mailview.cpp - gui/windows/mailview.h + gui/windows/mailviewwindow.cpp + gui/windows/mailviewwindow.h gui/windows/mailwindow.cpp gui/windows/mailwindow.h gui/windows/minimap.cpp diff --git a/src/Makefile.am b/src/Makefile.am index edbeb454a..d11fd78cf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -524,8 +524,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/windows/logindialog.h \ gui/windows/maileditwindow.cpp \ gui/windows/maileditwindow.h \ - gui/windows/mailview.cpp \ - gui/windows/mailview.h \ + gui/windows/mailviewwindow.cpp \ + gui/windows/mailviewwindow.h \ gui/windows/mailwindow.cpp \ gui/windows/mailwindow.h \ gui/windows/minimap.cpp \ diff --git a/src/gui/windows/mailview.cpp b/src/gui/windows/mailview.cpp deleted file mode 100644 index 32a207acf..000000000 --- a/src/gui/windows/mailview.cpp +++ /dev/null @@ -1,146 +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/mailview.h" - -#include "configuration.h" - -#include "net/mailhandler.h" - -#include "gui/mailmessage.h" - -#include "gui/windows/setupwindow.h" - -#include "gui/widgets/button.h" -#include "gui/widgets/containerplacer.h" -#include "gui/widgets/icon.h" -#include "gui/widgets/label.h" -#include "gui/widgets/layout.h" -#include "gui/widgets/layouttype.h" -#include "gui/widgets/textfield.h" - -#include "utils/delete2.h" -#include "utils/gettext.h" -#include "utils/stringutils.h" - -#include "resources/image.h" -#include "resources/iteminfo.h" -#include "resources/resourcemanager.h" - -#include "resources/db/itemdb.h" - -#include "debug.h" - -MailView *mailViewWindow = nullptr; - -MailView::MailView(const MailMessage *const message) : - // TRANSLATORS: mail view window name - Window(_("View mail"), false, nullptr, "mailview.xml"), - ActionListener(), - mMessage(message), - // TRANSLATORS: mail view window button - mGetAttachButton(new Button(this, _("Get attach"), "attach", this)), - // TRANSLATORS: mail view window button - mCloseButton(new Button(this, _("Close"), "close", this)), - // TRANSLATORS: mail view window label - mTimeLabel(new Label(this, strprintf("%s %s", _("Time:"), - message->strTime.c_str()))), - mMoneyLabel(nullptr), - // TRANSLATORS: mail view window label - mFromLabel(new Label(this, strprintf("%s %s", _("From:"), - message->sender.c_str()))), - // TRANSLATORS: mail view window label - mSubjectLabel(new Label(this, strprintf("%s %s", _("Subject:"), - message->title.c_str()))), - // TRANSLATORS: mail view window label - mMessageLabel(new Label(this, strprintf("%s %s", _("Message:"), - message->text.c_str()))), - // TRANSLATORS: mail view window label - mItemLabel(nullptr), - mIcon(nullptr) -{ - setWindowName("MailView"); - setCloseButton(true); - setResizable(true); - setSaveVisible(false); - setStickyButtonLock(true); - setVisible(true); - - setDefaultSize(380, 150, ImageRect::CENTER); - setMinWidth(200); - setMinHeight(100); - center(); - - ContainerPlacer placer; - placer = getPlacer(0, 0); - - int n = 0; - placer(0, n++, mTimeLabel); - placer(0, n++, mFromLabel); - placer(0, n++, mSubjectLabel); - if (message->money) - { - // TRANSLATORS: mail view window label - mMoneyLabel = new Label(this, strprintf("%s %d", _("Money:"), - message->money)); - placer(0, n++, mMoneyLabel); - } - placer(0, n++, mMessageLabel); - if (message->itemId) - { - ResourceManager *const resman = ResourceManager::getInstance(); - const ItemInfo &item = ItemDB::get(message->itemId); - Image *const image = resman->getImage(combineDye2( - paths.getStringValue("itemIcons").append( - item.getDisplay().image), item.getDyeColorsString(1))); - - mIcon = new Icon(this, image); - mItemLabel = new Label(this, std::string(_("Item:")).append(" ")); - placer(0, n, mItemLabel); - placer(1, n++, mIcon); - } - - placer(0, n, mGetAttachButton); - placer(2, n, mCloseButton); - - loadWindowState(); - enableVisibleSound(true); -} - -MailView::~MailView() -{ - if (mIcon) - { - Image *const image = mIcon->getImage(); - if (image) - image->decRef(); - } - delete2(mMessage); - mailViewWindow = nullptr; -} - -void MailView::action(const ActionEvent &event) -{ - const std::string &eventId = event.getId(); - if (eventId == "close") - { - scheduleDelete(); - } -} diff --git a/src/gui/windows/mailview.h b/src/gui/windows/mailview.h deleted file mode 100644 index 8d1ddde78..000000000 --- a/src/gui/windows/mailview.h +++ /dev/null @@ -1,65 +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_MAILVIEW_H -#define GUI_WINDOWS_MAILVIEW_H - -#ifdef EATHENA_SUPPORT - -#include "gui/widgets/window.h" - -#include "listeners/actionlistener.h" - -class Button; -class Icon; -class Label; -class TextField; - -struct MailMessage; - -class MailView final : public Window, - public ActionListener -{ - public: - MailView(const MailMessage *const message); - - A_DELETE_COPY(MailView) - - ~MailView(); - - void action(const ActionEvent &event) override final; - - private: - const MailMessage *mMessage; - Button *mGetAttachButton; - Button *mCloseButton; - Label *mTimeLabel; - Label *mMoneyLabel; - Label *mFromLabel; - Label *mSubjectLabel; - Label *mMessageLabel; - Label *mItemLabel; - Icon *mIcon; -}; - -extern MailView *mailViewWindow; - -#endif // EATHENA_SUPPORT -#endif // GUI_WINDOWS_MAILVIEW_H diff --git a/src/gui/windows/mailviewwindow.cpp b/src/gui/windows/mailviewwindow.cpp new file mode 100644 index 000000000..baafc0d93 --- /dev/null +++ b/src/gui/windows/mailviewwindow.cpp @@ -0,0 +1,146 @@ +/* + * 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/mailviewwindow.h" + +#include "configuration.h" + +#include "net/mailhandler.h" + +#include "gui/mailmessage.h" + +#include "gui/windows/setupwindow.h" + +#include "gui/widgets/button.h" +#include "gui/widgets/containerplacer.h" +#include "gui/widgets/icon.h" +#include "gui/widgets/label.h" +#include "gui/widgets/layout.h" +#include "gui/widgets/layouttype.h" +#include "gui/widgets/textfield.h" + +#include "utils/delete2.h" +#include "utils/gettext.h" +#include "utils/stringutils.h" + +#include "resources/image.h" +#include "resources/iteminfo.h" +#include "resources/resourcemanager.h" + +#include "resources/db/itemdb.h" + +#include "debug.h" + +MailViewWindow *mailViewWindow = nullptr; + +MailViewWindow::MailViewWindow(const MailMessage *const message) : + // TRANSLATORS: mail view window name + Window(_("View mail"), false, nullptr, "mailview.xml"), + ActionListener(), + mMessage(message), + // TRANSLATORS: mail view window button + mGetAttachButton(new Button(this, _("Get attach"), "attach", this)), + // TRANSLATORS: mail view window button + mCloseButton(new Button(this, _("Close"), "close", this)), + // TRANSLATORS: mail view window label + mTimeLabel(new Label(this, strprintf("%s %s", _("Time:"), + message->strTime.c_str()))), + mMoneyLabel(nullptr), + // TRANSLATORS: mail view window label + mFromLabel(new Label(this, strprintf("%s %s", _("From:"), + message->sender.c_str()))), + // TRANSLATORS: mail view window label + mSubjectLabel(new Label(this, strprintf("%s %s", _("Subject:"), + message->title.c_str()))), + // TRANSLATORS: mail view window label + mMessageLabel(new Label(this, strprintf("%s %s", _("Message:"), + message->text.c_str()))), + // TRANSLATORS: mail view window label + mItemLabel(nullptr), + mIcon(nullptr) +{ + setWindowName("MailView"); + setCloseButton(true); + setResizable(true); + setSaveVisible(false); + setStickyButtonLock(true); + setVisible(true); + + setDefaultSize(380, 150, ImageRect::CENTER); + setMinWidth(200); + setMinHeight(100); + center(); + + ContainerPlacer placer; + placer = getPlacer(0, 0); + + int n = 0; + placer(0, n++, mTimeLabel); + placer(0, n++, mFromLabel); + placer(0, n++, mSubjectLabel); + if (message->money) + { + // TRANSLATORS: mail view window label + mMoneyLabel = new Label(this, strprintf("%s %d", _("Money:"), + message->money)); + placer(0, n++, mMoneyLabel); + } + placer(0, n++, mMessageLabel); + if (message->itemId) + { + ResourceManager *const resman = ResourceManager::getInstance(); + const ItemInfo &item = ItemDB::get(message->itemId); + Image *const image = resman->getImage(combineDye2( + paths.getStringValue("itemIcons").append( + item.getDisplay().image), item.getDyeColorsString(1))); + + mIcon = new Icon(this, image); + mItemLabel = new Label(this, std::string(_("Item:")).append(" ")); + placer(0, n, mItemLabel); + placer(1, n++, mIcon); + } + + placer(0, n, mGetAttachButton); + placer(2, n, mCloseButton); + + loadWindowState(); + enableVisibleSound(true); +} + +MailViewWindow::~MailViewWindow() +{ + if (mIcon) + { + Image *const image = mIcon->getImage(); + if (image) + image->decRef(); + } + delete2(mMessage); + mailViewWindow = nullptr; +} + +void MailViewWindow::action(const ActionEvent &event) +{ + const std::string &eventId = event.getId(); + if (eventId == "close") + { + scheduleDelete(); + } +} diff --git a/src/gui/windows/mailviewwindow.h b/src/gui/windows/mailviewwindow.h new file mode 100644 index 000000000..155449bcf --- /dev/null +++ b/src/gui/windows/mailviewwindow.h @@ -0,0 +1,65 @@ +/* + * 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_MAILVIEWWINDOW_H +#define GUI_WINDOWS_MAILVIEWWINDOW_H + +#ifdef EATHENA_SUPPORT + +#include "gui/widgets/window.h" + +#include "listeners/actionlistener.h" + +class Button; +class Icon; +class Label; +class TextField; + +struct MailMessage; + +class MailViewWindow final : public Window, + public ActionListener +{ + public: + MailViewWindow(const MailMessage *const message); + + A_DELETE_COPY(MailViewWindow) + + ~MailViewWindow(); + + void action(const ActionEvent &event) override final; + + private: + const MailMessage *mMessage; + Button *mGetAttachButton; + Button *mCloseButton; + Label *mTimeLabel; + Label *mMoneyLabel; + Label *mFromLabel; + Label *mSubjectLabel; + Label *mMessageLabel; + Label *mItemLabel; + Icon *mIcon; +}; + +extern MailViewWindow *mailViewWindow; + +#endif // EATHENA_SUPPORT +#endif // GUI_WINDOWS_MAILVIEWWINDOW_H diff --git a/src/gui/windows/mailwindow.cpp b/src/gui/windows/mailwindow.cpp index 959ae6a2c..61cd80917 100644 --- a/src/gui/windows/mailwindow.cpp +++ b/src/gui/windows/mailwindow.cpp @@ -27,7 +27,7 @@ #include "gui/mailmessage.h" #include "gui/windows/maileditwindow.h" -#include "gui/windows/mailview.h" +#include "gui/windows/mailviewwindow.h" #include "gui/windows/setupwindow.h" #include "gui/widgets/button.h" @@ -158,5 +158,5 @@ void MailWindow::showMessage(MailMessage *const mail) mail->strTime = mail2->strTime; } delete mailViewWindow; - mailViewWindow = new MailView(mail); + mailViewWindow = new MailViewWindow(mail); } -- cgit v1.2.3-70-g09d2