From bd96450423276272e1cddf8be91cc63f860eb125 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 21 May 2015 21:27:20 +0300 Subject: Call Window::postInit from all windows with overrided postInit method. --- src/gui/windows/charselectdialog.cpp | 1 + src/gui/windows/chatwindow.cpp | 1 + src/gui/windows/confirmdialog.cpp | 1 + src/gui/windows/connectiondialog.cpp | 1 + src/gui/windows/debugwindow.cpp | 1 + src/gui/windows/didyouknowwindow.cpp | 1 + src/gui/windows/editdialog.cpp | 1 + src/gui/windows/editserverdialog.cpp | 1 + src/gui/windows/emotewindow.cpp | 1 + src/gui/windows/equipmentwindow.cpp | 1 + src/gui/windows/inventorywindow.cpp | 1 + src/gui/windows/itemamountwindow.cpp | 1 + src/gui/windows/logindialog.cpp | 1 + src/gui/windows/npcdialog.cpp | 1 + src/gui/windows/quitdialog.cpp | 1 + src/gui/windows/registerdialog.cpp | 1 + src/gui/windows/serverdialog.cpp | 1 + src/gui/windows/setupwindow.cpp | 1 + src/gui/windows/shopwindow.cpp | 1 + src/gui/windows/skilldialog.cpp | 1 + src/gui/windows/socialwindow.cpp | 1 + src/gui/windows/textcommandeditor.cpp | 1 + src/gui/windows/textdialog.cpp | 1 + src/gui/windows/unregisterdialog.cpp | 1 + src/gui/windows/updaterwindow.cpp | 1 + src/gui/windows/whoisonline.cpp | 1 + src/gui/windows/worldselectdialog.cpp | 1 + 27 files changed, 27 insertions(+) diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp index 4dc0440aa..9b03528ec 100644 --- a/src/gui/windows/charselectdialog.cpp +++ b/src/gui/windows/charselectdialog.cpp @@ -187,6 +187,7 @@ CharSelectDialog::~CharSelectDialog() void CharSelectDialog::postInit() { + Window::postInit(); setVisible(true); requestFocus(); #ifdef EATHENA_SUPPORT diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 06e9da844..ba882b985 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -209,6 +209,7 @@ ChatWindow::~ChatWindow() void ChatWindow::postInit() { + Window::postInit(); add(mChatTabs); add(mChatInput); add(mColorPicker); diff --git a/src/gui/windows/confirmdialog.cpp b/src/gui/windows/confirmdialog.cpp index 83a5a669c..4298598d2 100644 --- a/src/gui/windows/confirmdialog.cpp +++ b/src/gui/windows/confirmdialog.cpp @@ -52,6 +52,7 @@ ConfirmDialog::ConfirmDialog(const std::string &restrict title, void ConfirmDialog::postInit() { + Window::postInit(); // TRANSLATORS: confirm dialog button Button *const yesButton = new Button(this, _("Yes"), "yes", this); // TRANSLATORS: confirm dialog button diff --git a/src/gui/windows/connectiondialog.cpp b/src/gui/windows/connectiondialog.cpp index 769b47d2f..bdbd6af69 100644 --- a/src/gui/windows/connectiondialog.cpp +++ b/src/gui/windows/connectiondialog.cpp @@ -63,6 +63,7 @@ ConnectionDialog::ConnectionDialog(const std::string &text, void ConnectionDialog::postInit() { + Window::postInit(); setVisible(true); } diff --git a/src/gui/windows/debugwindow.cpp b/src/gui/windows/debugwindow.cpp index c0081ea37..e0d73249b 100644 --- a/src/gui/windows/debugwindow.cpp +++ b/src/gui/windows/debugwindow.cpp @@ -84,6 +84,7 @@ DebugWindow::~DebugWindow() void DebugWindow::postInit() { + Window::postInit(); add(mTabs); } diff --git a/src/gui/windows/didyouknowwindow.cpp b/src/gui/windows/didyouknowwindow.cpp index cc7acf09b..2916ad90c 100644 --- a/src/gui/windows/didyouknowwindow.cpp +++ b/src/gui/windows/didyouknowwindow.cpp @@ -103,6 +103,7 @@ DidYouKnowWindow::DidYouKnowWindow() : void DidYouKnowWindow::postInit() { + Window::postInit(); widgetResized(Event(nullptr)); } diff --git a/src/gui/windows/editdialog.cpp b/src/gui/windows/editdialog.cpp index f69876cf7..81710f06b 100644 --- a/src/gui/windows/editdialog.cpp +++ b/src/gui/windows/editdialog.cpp @@ -45,6 +45,7 @@ EditDialog::EditDialog(const std::string &restrict title, void EditDialog::postInit() { + Window::postInit(); // TRANSLATORS: edit dialog label Button *const okButton = new Button(this, _("OK"), mEventOk, this); diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp index b7101e1fe..5444f2107 100644 --- a/src/gui/windows/editserverdialog.cpp +++ b/src/gui/windows/editserverdialog.cpp @@ -189,6 +189,7 @@ EditServerDialog::~EditServerDialog() void EditServerDialog::postInit() { + Window::postInit(); setVisible(true); mNameField->requestFocus(); } diff --git a/src/gui/windows/emotewindow.cpp b/src/gui/windows/emotewindow.cpp index 4a5b69088..2ab84819a 100644 --- a/src/gui/windows/emotewindow.cpp +++ b/src/gui/windows/emotewindow.cpp @@ -76,6 +76,7 @@ EmoteWindow::EmoteWindow() : void EmoteWindow::postInit() { + Window::postInit(); const int pad2 = mPadding * 2; const int width = 200; const int height = 150; diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp index 80d8f8fbe..8843976e1 100644 --- a/src/gui/windows/equipmentwindow.cpp +++ b/src/gui/windows/equipmentwindow.cpp @@ -131,6 +131,7 @@ EquipmentWindow::EquipmentWindow(Equipment *const equipment, void EquipmentWindow::postInit() { + Window::postInit(); const Rect &area = getChildrenArea(); mUnequip->setPosition(area.width - mUnequip->getWidth() - mButtonPadding, area.height - mUnequip->getHeight() - mButtonPadding); diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index 9a99937d5..11ca2e359 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -342,6 +342,7 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) : void InventoryWindow::postInit() { + Window::postInit(); slotsChanged(mInventory); mItems->setSortType(mSortDropDown->getSelected()); diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp index c3eb60b89..6b547c46b 100644 --- a/src/gui/windows/itemamountwindow.cpp +++ b/src/gui/windows/itemamountwindow.cpp @@ -284,6 +284,7 @@ ItemAmountWindow::ItemAmountWindow(const Usage usage, Window *const parent, void ItemAmountWindow::postInit() { + Window::postInit(); setVisible(mItem); } diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp index b0aa2d335..47b2ae447 100644 --- a/src/gui/windows/logindialog.cpp +++ b/src/gui/windows/logindialog.cpp @@ -169,6 +169,7 @@ LoginDialog::LoginDialog(LoginData *const data, void LoginDialog::postInit() { + Window::postInit(); setVisible(true); const int h = 200; diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 04d66114a..83a6e42b1 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -193,6 +193,7 @@ NpcDialog::NpcDialog(const int npcId) : void NpcDialog::postInit() { + Window::postInit(); setVisible(true); requestFocus(); enableVisibleSound(true); diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp index 9a08951c7..8af4db969 100644 --- a/src/gui/windows/quitdialog.cpp +++ b/src/gui/windows/quitdialog.cpp @@ -120,6 +120,7 @@ QuitDialog::QuitDialog(QuitDialog **const pointerToMe) : void QuitDialog::postInit() { + Window::postInit(); setLocationRelativeTo(getParent()); setVisible(true); soundManager.playGuiSound(SOUND_SHOW_WINDOW); diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp index 70537bd95..e7d9425e1 100644 --- a/src/gui/windows/registerdialog.cpp +++ b/src/gui/windows/registerdialog.cpp @@ -147,6 +147,7 @@ RegisterDialog::RegisterDialog(LoginData *const data) : void RegisterDialog::postInit() { + Window::postInit(); setVisible(true); mUserField->requestFocus(); mUserField->setCaretPosition(static_cast( diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index e82bcc806..30b1f312d 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -192,6 +192,7 @@ ServerDialog::ServerDialog(ServerInfo *const serverInfo, void ServerDialog::postInit() { + Window::postInit(); setVisible(true); mConnectButton->requestFocus(); diff --git a/src/gui/windows/setupwindow.cpp b/src/gui/windows/setupwindow.cpp index be76b478f..f5832320f 100644 --- a/src/gui/windows/setupwindow.cpp +++ b/src/gui/windows/setupwindow.cpp @@ -79,6 +79,7 @@ SetupWindow::SetupWindow() : void SetupWindow::postInit() { + Window::postInit(); int width = 620; const int height = 450; diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index ca82c03c1..d9e182757 100644 --- a/src/gui/windows/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -223,6 +223,7 @@ ShopWindow::ShopWindow() : void ShopWindow::postInit() { + Window::postInit(); setVisible(false); enableVisibleSound(true); updateSelection(); diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index 20cafc2c6..22f673a13 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -102,6 +102,7 @@ SkillDialog::SkillDialog() : void SkillDialog::postInit() { + Window::postInit(); setLocationRelativeTo(getParent()); loadWindowState(); enableVisibleSound(true); diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index f8197466b..4a32e75a9 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -95,6 +95,7 @@ SocialWindow::SocialWindow() : void SocialWindow::postInit() { + Window::postInit(); setWindowName("Social"); setVisible(false); setSaveVisible(true); diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp index a8a7eccfc..3051d4cc6 100644 --- a/src/gui/windows/textcommandeditor.cpp +++ b/src/gui/windows/textcommandeditor.cpp @@ -186,6 +186,7 @@ TextCommandEditor::TextCommandEditor(TextCommand *const command) : void TextCommandEditor::postInit() { + Window::postInit(); enableVisibleSound(true); setVisible(true); } diff --git a/src/gui/windows/textdialog.cpp b/src/gui/windows/textdialog.cpp index 51e6768e8..a3e9bcc4b 100644 --- a/src/gui/windows/textdialog.cpp +++ b/src/gui/windows/textdialog.cpp @@ -84,6 +84,7 @@ TextDialog::TextDialog(const std::string &restrict title, void TextDialog::postInit() { + Window::postInit(); if (getParent()) { setLocationRelativeTo(getParent()); diff --git a/src/gui/windows/unregisterdialog.cpp b/src/gui/windows/unregisterdialog.cpp index 32b2e9555..91975510b 100644 --- a/src/gui/windows/unregisterdialog.cpp +++ b/src/gui/windows/unregisterdialog.cpp @@ -58,6 +58,7 @@ UnRegisterDialog::UnRegisterDialog(LoginData *const data) : void UnRegisterDialog::postInit() { + Window::postInit(); // TRANSLATORS: unregister dialog. label. Label *const userLabel = new Label(this, strprintf(_("Name: %s"), mLoginData->username.c_str())); diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index ab6295ab5..ffa2aa123 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -249,6 +249,7 @@ UpdaterWindow::UpdaterWindow(const std::string &restrict updateHost, void UpdaterWindow::postInit() { + Window::postInit(); setVisible(true); mCancelButton->requestFocus(); removeProtocol(mUpdateServerPath); diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index dacb28385..fe455c4fd 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -125,6 +125,7 @@ WhoIsOnline::WhoIsOnline() : void WhoIsOnline::postInit() { + Window::postInit(); const int h = 350; const int w = 200; setDefaultSize(w, h, ImageRect::CENTER); diff --git a/src/gui/windows/worldselectdialog.cpp b/src/gui/windows/worldselectdialog.cpp index 81b8e3c7e..a592f24ef 100644 --- a/src/gui/windows/worldselectdialog.cpp +++ b/src/gui/windows/worldselectdialog.cpp @@ -88,6 +88,7 @@ WorldSelectDialog::WorldSelectDialog(Worlds worlds) : void WorldSelectDialog::postInit() { + Window::postInit(); setVisible(true); mChooseWorld->requestFocus(); } -- cgit v1.2.3-60-g2f50