summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-08-18 17:27:52 +0300
committerAndrei Karas <akaras@inbox.ru>2016-08-18 17:27:52 +0300
commitc8b1e6e5455dd0c9c51b6b212478ed1e5aa1af4c (patch)
treed55c787b60a1eeac7d664f3a07cd615d4525e360
parentc1dc5cd3ee07f3a7045f849d8e3557a3dbf16e64 (diff)
downloadmanaplus-c8b1e6e5455dd0c9c51b6b212478ed1e5aa1af4c.tar.gz
manaplus-c8b1e6e5455dd0c9c51b6b212478ed1e5aa1af4c.tar.bz2
manaplus-c8b1e6e5455dd0c9c51b6b212478ed1e5aa1af4c.tar.xz
manaplus-c8b1e6e5455dd0c9c51b6b212478ed1e5aa1af4c.zip
Remove createpartypopup class.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/gui/popups/createpartypopup.h98
-rw-r--r--src/gui/windows/socialwindow.cpp4
-rw-r--r--src/gui/windows/socialwindow.h3
5 files changed, 0 insertions, 107 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 81176024e..a5ddd9766 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -336,7 +336,6 @@ SET(SRCS
gui/widgets/windowcontainer.h
gui/popups/beingpopup.cpp
gui/popups/beingpopup.h
- gui/popups/createpartypopup.h
gui/windows/buydialog.cpp
gui/windows/buydialog.h
gui/windows/buyselldialog.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 0c002e12e..957ac0b57 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -942,7 +942,6 @@ manaplus_SOURCES += main.cpp \
gui/popups/speechbubble.h \
gui/popups/beingpopup.cpp \
gui/popups/beingpopup.h \
- gui/popups/createpartypopup.h \
gui/widgets/itemcontainer.cpp \
gui/widgets/itemcontainer.h \
gui/widgets/tabs/chat/battletab.cpp \
diff --git a/src/gui/popups/createpartypopup.h b/src/gui/popups/createpartypopup.h
deleted file mode 100644
index dba59f142..000000000
--- a/src/gui/popups/createpartypopup.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2016 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 <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GUI_POPUPS_CREATEPARTYPOPUP_H
-#define GUI_POPUPS_CREATEPARTYPOPUP_H
-
-#include "gui/widgets/browserbox.h"
-#include "gui/widgets/linkhandler.h"
-#include "gui/widgets/popup.h"
-#include "gui/windows/socialwindow.h"
-
-#include "utils/gettext.h"
-#include "utils/stringutils.h"
-
-#include "localconsts.h"
-
-class CreatePartyPopup final : public Popup,
- public LinkHandler
-{
- public:
- CreatePartyPopup() :
- Popup("SocialCreatePartyPopup"),
- LinkHandler(),
- mBrowserBox(new BrowserBox(this, BrowserBox::AUTO_SIZE, true,
- "popupbrowserbox.xml"))
- {
- mBrowserBox->setPosition(4, 4);
- mBrowserBox->setOpaque(false);
- mBrowserBox->setLinkHandler(this);
-
- // TRANSLATORS: party popup item
- mBrowserBox->addRow(strprintf("@@party|%s@@", _("Create Party")));
- mBrowserBox->addRow("##3---");
- // TRANSLATORS: party popup item
- mBrowserBox->addRow(strprintf("@@cancel|%s@@", _("Cancel")));
- }
-
- void postInit() override final
- {
- Popup::postInit();
- add(mBrowserBox);
- setContentSize(mBrowserBox->getWidth() + 8,
- mBrowserBox->getHeight() + 8);
- }
-
- A_DELETE_COPY(CreatePartyPopup)
-
- void handleLink(const std::string &link,
- MouseEvent *event A_UNUSED) override final
- {
- if (link == "guild" && socialWindow)
- {
- socialWindow->showGuildCreate();
- }
- else if (link == "party" && socialWindow)
- {
- socialWindow->showPartyCreate();
- }
-
- setVisible(Visible_false);
- }
-
- void show(Widget *parent)
- {
- if (!parent)
- return;
-
- int x, y;
- parent->getAbsolutePosition(x, y);
- y += parent->getHeight();
- setPosition(x, y);
- setVisible(Visible_true);
- requestMoveToTop();
- }
-
- private:
- BrowserBox* mBrowserBox;
-};
-
-#endif // GUI_POPUPS_CREATEPARTYPOPUP_H
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index 647fceb23..ad9c34e8c 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -37,8 +37,6 @@
#include "gui/widgets/tabs/socialpickuptab.h"
#include "gui/widgets/tabs/socialplayerstab.h"
-#include "gui/popups/createpartypopup.h"
-
#include "net/serverfeatures.h"
#ifdef TMWA_SUPPORT
@@ -72,7 +70,6 @@ SocialWindow::SocialWindow() :
// TRANSLATORS: here F is title for friends tab in social window
mFriends(new SocialFriendsTab(this, _("F"),
getOptionBool("showtabbackground"))),
- mCreatePopup(CREATEWIDGETR0(CreatePartyPopup)),
// TRANSLATORS: social window button
mCreateButton(new Button(this, _("Create"), "create", this)),
mCountLabel(new Label(this, "1000 / 1000")),
@@ -167,7 +164,6 @@ SocialWindow::~SocialWindow()
mPartyInviter.clear();
}
- delete2(mCreatePopup);
delete2(mPlayers);
delete2(mNavigation);
delete2(mAttackFilter);
diff --git a/src/gui/windows/socialwindow.h b/src/gui/windows/socialwindow.h
index 676ede11d..89cf673da 100644
--- a/src/gui/windows/socialwindow.h
+++ b/src/gui/windows/socialwindow.h
@@ -29,7 +29,6 @@
class Button;
class ConfirmDialog;
-class CreatePartyPopup;
class Guild;
class Label;
class Map;
@@ -157,8 +156,6 @@ class SocialWindow final : public Window,
SocialTab *mNavigation A_NONNULLPOINTER;
SocialTab *mFriends A_NONNULLPOINTER;
- CreatePartyPopup *mCreatePopup A_NONNULLPOINTER;
-
Button *mCreateButton A_NONNULLPOINTER;
Label *mCountLabel A_NONNULLPOINTER;
TabbedArea *mTabs A_NONNULLPOINTER;