From cc965406e7903e890fc0c797c2684efc5c4624a6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 24 Jul 2014 00:27:10 +0300 Subject: Add missing windows into reset to default size list. --- src/gui/windows/botcheckerwindow.cpp | 5 +++++ src/gui/windows/buydialog.cpp | 4 ++++ src/gui/windows/buyselldialog.cpp | 5 +++++ src/gui/windows/emotewindow.cpp | 5 +++++ src/gui/windows/killstats.cpp | 5 +++++ src/gui/windows/npcpostdialog.cpp | 5 +++++ src/gui/windows/outfitwindow.cpp | 5 +++++ src/gui/windows/questswindow.cpp | 5 +++++ src/gui/windows/selldialog.cpp | 4 ++++ src/gui/windows/shopwindow.cpp | 4 ++++ src/gui/windows/whoisonline.cpp | 4 ++++ 11 files changed, 51 insertions(+) diff --git a/src/gui/windows/botcheckerwindow.cpp b/src/gui/windows/botcheckerwindow.cpp index 7f8ffe14c..e4ab62b1a 100644 --- a/src/gui/windows/botcheckerwindow.cpp +++ b/src/gui/windows/botcheckerwindow.cpp @@ -22,6 +22,8 @@ #include "gui/windows/botcheckerwindow.h" +#include "gui/windows/setupwindow.h" + #include "gui/widgets/button.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/label.h" @@ -59,6 +61,9 @@ BotCheckerWindow::BotCheckerWindow() : setSaveVisible(true); + if (setupWindow) + setupWindow->registerWindowForReset(this); + mTable->setOpaque(false); mTable->setLinewiseSelection(true); mTable->setWrappingEnabled(true); diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp index 5d6774a51..02c9b5f2e 100644 --- a/src/gui/windows/buydialog.cpp +++ b/src/gui/windows/buydialog.cpp @@ -26,6 +26,7 @@ #include "shopitem.h" #include "units.h" +#include "gui/windows/setupwindow.h" #include "gui/windows/tradewindow.h" #include "gui/models/shopitems.h" @@ -221,6 +222,9 @@ void BuyDialog::init() setMinHeight(220); setDefaultSize(260, 230, ImageRect::CENTER); + if (setupWindow) + setupWindow->registerWindowForReset(this); + mShopItems = new ShopItems; mShopItemList = new ShopListBox(this, mShopItems, mShopItems); diff --git a/src/gui/windows/buyselldialog.cpp b/src/gui/windows/buyselldialog.cpp index 92f6503bb..238389ce9 100644 --- a/src/gui/windows/buyselldialog.cpp +++ b/src/gui/windows/buyselldialog.cpp @@ -26,6 +26,8 @@ #include "net/net.h" #include "net/npchandler.h" +#include "gui/windows/setupwindow.h" + #include "gui/widgets/button.h" #include "utils/gettext.h" @@ -61,6 +63,9 @@ void BuySellDialog::init() setWindowName("BuySell"); setCloseButton(true); + if (setupWindow) + setupWindow->registerWindowForReset(this); + static const char *buttonNames[] = { // TRANSLATORS: shop window button diff --git a/src/gui/windows/emotewindow.cpp b/src/gui/windows/emotewindow.cpp index d9e303012..db666d2a8 100644 --- a/src/gui/windows/emotewindow.cpp +++ b/src/gui/windows/emotewindow.cpp @@ -23,6 +23,8 @@ #include "gui/models/colormodel.h" #include "gui/models/namesmodel.h" +#include "gui/windows/setupwindow.h" + #include "gui/widgets/colorpage.h" #include "gui/widgets/emotepage.h" #include "gui/widgets/scrollarea.h" @@ -66,6 +68,9 @@ EmoteWindow::EmoteWindow() : setShowTitle(false); setResizable(true); + if (setupWindow) + setupWindow->registerWindowForReset(this); + addMouseListener(this); } diff --git a/src/gui/windows/killstats.cpp b/src/gui/windows/killstats.cpp index c266683f3..b5189b455 100644 --- a/src/gui/windows/killstats.cpp +++ b/src/gui/windows/killstats.cpp @@ -26,6 +26,8 @@ #include "gui/widgets/label.h" #include "gui/widgets/layoutcell.h" +#include "gui/windows/setupwindow.h" + #include "actormanager.h" #include "client.h" #include "game.h" @@ -114,6 +116,9 @@ KillStats::KillStats() : setStickyButtonLock(true); setDefaultSize(250, 250, 350, 300); + if (setupWindow) + setupWindow->registerWindowForReset(this); + const int xp(PlayerInfo::getAttribute(Attributes::EXP)); int xpNextLevel(PlayerInfo::getAttribute(Attributes::EXP_NEEDED)); diff --git a/src/gui/windows/npcpostdialog.cpp b/src/gui/windows/npcpostdialog.cpp index 327fcbf3f..7bca90500 100644 --- a/src/gui/windows/npcpostdialog.cpp +++ b/src/gui/windows/npcpostdialog.cpp @@ -22,6 +22,8 @@ #include "gui/windows/npcpostdialog.h" +#include "gui/windows/setupwindow.h" + #include "gui/widgets/button.h" #include "gui/widgets/label.h" #include "gui/widgets/textbox.h" @@ -52,6 +54,9 @@ NpcPostDialog::NpcPostDialog(const int npcId) : void NpcPostDialog::postInit() { + if (setupWindow) + setupWindow->registerWindowForReset(this); + // create text field for receiver // TRANSLATORS: label in npc post dialog Label *const senderText = new Label(this, _("To:")); diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp index b2b62192a..85522ade1 100644 --- a/src/gui/windows/outfitwindow.cpp +++ b/src/gui/windows/outfitwindow.cpp @@ -35,6 +35,8 @@ #include "gui/viewport.h" +#include "gui/windows/setupwindow.h" + #include "gui/widgets/button.h" #include "gui/widgets/checkbox.h" #include "gui/widgets/label.h" @@ -94,6 +96,9 @@ OutfitWindow::OutfitWindow() : setMinWidth(145); setMinHeight(220); + if (setupWindow) + setupWindow->registerWindowForReset(this); + mCurrentLabel->setAlignment(Graphics::CENTER); mKeyLabel->setAlignment(Graphics::CENTER); diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp index 3985c3129..69c890c4e 100644 --- a/src/gui/windows/questswindow.cpp +++ b/src/gui/windows/questswindow.cpp @@ -32,6 +32,8 @@ #include "gui/models/questsmodel.h" +#include "gui/windows/setupwindow.h" + #include "gui/widgets/browserbox.h" #include "gui/widgets/button.h" #include "gui/widgets/containerplacer.h" @@ -97,6 +99,9 @@ QuestsWindow::QuestsWindow() : setMinWidth(310); setMinHeight(220); + if (setupWindow) + setupWindow->registerWindowForReset(this); + mQuestsListBox->setActionEventId("select"); mQuestsListBox->addActionListener(this); diff --git a/src/gui/windows/selldialog.cpp b/src/gui/windows/selldialog.cpp index 18d993c91..70d790733 100644 --- a/src/gui/windows/selldialog.cpp +++ b/src/gui/windows/selldialog.cpp @@ -28,6 +28,7 @@ #include "being/playerinfo.h" #include "gui/windows/confirmdialog.h" +#include "gui/windows/setupwindow.h" #include "gui/windows/tradewindow.h" #include "gui/models/shopitems.h" @@ -92,6 +93,9 @@ void SellDialog::init() setMinHeight(220); setDefaultSize(260, 230, ImageRect::CENTER); + if (setupWindow) + setupWindow->registerWindowForReset(this); + // Create a ShopItems instance, that is aware of duplicate entries. mShopItems = new ShopItems(true); diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index 1a0174566..eac966fa8 100644 --- a/src/gui/windows/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -29,6 +29,7 @@ #include "gui/windows/confirmdialog.h" #include "gui/windows/itemamountwindow.h" #include "gui/windows/selldialog.h" +#include "gui/windows/setupwindow.h" #include "gui/windows/tradewindow.h" #include "gui/models/shopitems.h" @@ -136,6 +137,9 @@ ShopWindow::ShopWindow() : else setDefaultSize(380, 300, ImageRect::CENTER); + if (setupWindow) + setupWindow->registerWindowForReset(this); + mAnnounceCounter[BUY] = 0; mAnnounceCounter[SELL] = 0; diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index ff2f15427..00187a31d 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -33,6 +33,7 @@ #include "gui/viewport.h" #include "gui/windows/chatwindow.h" +#include "gui/windows/setupwindow.h" #include "gui/windows/socialwindow.h" #include "gui/widgets/button.h" @@ -126,6 +127,9 @@ void WhoIsOnline::postInit() setStickyButtonLock(true); setSaveVisible(true); + if (setupWindow) + setupWindow->registerWindowForReset(this); + mUpdateButton->setEnabled(false); mUpdateButton->setDimension(Rect(5, 5, w - 10, 20 + 5)); -- cgit v1.2.3-60-g2f50