summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-17 15:08:45 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-17 15:08:45 +0300
commit974eff0d1607d9f2648ecd9fbb3abfd53aa6bec4 (patch)
treedfa587db88f559b404f509ac474dd633ef45449d /src
parent294f449c2f2819971ce9528c9557fc3be8cd4ed1 (diff)
downloadplus-974eff0d1607d9f2648ecd9fbb3abfd53aa6bec4.tar.gz
plus-974eff0d1607d9f2648ecd9fbb3abfd53aa6bec4.tar.bz2
plus-974eff0d1607d9f2648ecd9fbb3abfd53aa6bec4.tar.xz
plus-974eff0d1607d9f2648ecd9fbb3abfd53aa6bec4.zip
Create public variable for itempopup.
Diffstat (limited to 'src')
-rw-r--r--src/gui/popups/itempopup.cpp2
-rw-r--r--src/gui/popups/itempopup.h2
-rw-r--r--src/gui/windowmanager.cpp4
3 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp
index 36f971849..797520c7b 100644
--- a/src/gui/popups/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -45,6 +45,8 @@
extern int serverVersion;
+ItemPopup *itemPopup = nullptr;
+
ItemPopup::ItemPopup() :
Popup("ItemPopup", "itempopup.xml"),
mItemName(new Label(this)),
diff --git a/src/gui/popups/itempopup.h b/src/gui/popups/itempopup.h
index aa40181f4..05b024c57 100644
--- a/src/gui/popups/itempopup.h
+++ b/src/gui/popups/itempopup.h
@@ -78,4 +78,6 @@ class ItemPopup final : public Popup
void setLabelColor(Label *label, const ItemType::Type type) const;
};
+extern ItemPopup *itemPopup;
+
#endif // GUI_POPUPS_ITEMPOPUP_H
diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp
index d96d632f0..9b359f12a 100644
--- a/src/gui/windowmanager.cpp
+++ b/src/gui/windowmanager.cpp
@@ -33,6 +33,7 @@
#include "gui/userpalette.h"
#include "gui/popups/beingpopup.h"
+#include "gui/popups/itempopup.h"
#include "gui/popups/popupmenu.h"
#include "gui/popups/textpopup.h"
@@ -103,12 +104,15 @@ void WindowManager::createWindows()
beingPopup->postInit();
textPopup = new TextPopup;
textPopup->postInit();
+ itemPopup = new ItemPopup;
+ itemPopup->postInit();
}
void WindowManager::deleteWindows()
{
delete2(textPopup);
delete2(beingPopup);
+ delete2(itemPopup);
delete2(popupMenu);
delete2(commandHandler);
delete2(didYouKnowWindow);