From e149243eb20a1bb74657914122bcabc01de2ae36 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 14 May 2014 22:34:39 +0300 Subject: Move enum from layout into separate file. --- src/gui/windows/buydialog.cpp | 3 ++- src/gui/windows/didyouknowwindow.cpp | 3 ++- src/gui/windows/helpwindow.cpp | 3 ++- src/gui/windows/inventorywindow.cpp | 3 ++- src/gui/windows/npcdialog.cpp | 3 ++- src/gui/windows/outfitwindow.cpp | 3 ++- src/gui/windows/questswindow.cpp | 3 ++- src/gui/windows/selldialog.cpp | 3 ++- src/gui/windows/shopwindow.cpp | 3 ++- src/gui/windows/shortcutwindow.cpp | 5 +++-- src/gui/windows/statuswindow.cpp | 3 ++- src/gui/windows/tradewindow.cpp | 9 +++++---- src/gui/windows/updaterwindow.cpp | 3 ++- 13 files changed, 30 insertions(+), 17 deletions(-) (limited to 'src/gui/windows') diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp index 0d2349143..a672ba338 100644 --- a/src/gui/windows/buydialog.cpp +++ b/src/gui/windows/buydialog.cpp @@ -37,6 +37,7 @@ #include "gui/widgets/inttextfield.h" #include "gui/widgets/label.h" #include "gui/widgets/layout.h" +#include "gui/widgets/layouttype.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/shoplistbox.h" #include "gui/widgets/slider.h" @@ -289,7 +290,7 @@ void BuyDialog::init() placer(8, 8, mQuitButton); Layout &layout = getLayout(); - layout.setRowHeight(0, Layout::AUTO_SET); + layout.setRowHeight(0, LayoutType::SET); center(); loadWindowState(); diff --git a/src/gui/windows/didyouknowwindow.cpp b/src/gui/windows/didyouknowwindow.cpp index 79ad4c208..09051e9c0 100644 --- a/src/gui/windows/didyouknowwindow.cpp +++ b/src/gui/windows/didyouknowwindow.cpp @@ -32,6 +32,7 @@ #include "gui/widgets/browserbox.h" #include "gui/widgets/checkbox.h" #include "gui/widgets/layout.h" +#include "gui/widgets/layouttype.h" #include "gui/widgets/scrollarea.h" #include "utils/gettext.h" @@ -92,7 +93,7 @@ DidYouKnowWindow::DidYouKnowWindow() : place(4, 4, okButton); Layout &layout = getLayout(); - layout.setRowHeight(0, Layout::AUTO_SET); + layout.setRowHeight(0, LayoutType::SET); loadWindowState(); enableVisibleSound(true); diff --git a/src/gui/windows/helpwindow.cpp b/src/gui/windows/helpwindow.cpp index fa9963217..934e01359 100644 --- a/src/gui/windows/helpwindow.cpp +++ b/src/gui/windows/helpwindow.cpp @@ -32,6 +32,7 @@ #include "gui/widgets/button.h" #include "gui/widgets/browserbox.h" #include "gui/widgets/layout.h" +#include "gui/widgets/layouttype.h" #include "gui/widgets/scrollarea.h" #include "resources/resourcemanager.h" @@ -84,7 +85,7 @@ HelpWindow::HelpWindow() : place(0, 0, mScrollArea, 5, 3).setPadding(3); Layout &layout = getLayout(); - layout.setRowHeight(0, Layout::AUTO_SET); + layout.setRowHeight(0, LayoutType::SET); loadWindowState(); loadTags(); diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index cf48e4fd1..90ce6eca4 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -52,6 +52,7 @@ #include "gui/widgets/dropdown.h" #include "gui/widgets/itemcontainer.h" #include "gui/widgets/layout.h" +#include "gui/widgets/layouttype.h" #include "gui/widgets/progressbar.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/tabstrip.h" @@ -238,7 +239,7 @@ InventoryWindow::InventoryWindow(Inventory *const inventory): } Layout &layout = getLayout(); - layout.setRowHeight(2, Layout::AUTO_SET); + layout.setRowHeight(2, LayoutType::SET); mInventory->addInventoyListener(this); diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index e8bc1763e..5de307963 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -44,6 +44,7 @@ #include "gui/widgets/itemcontainer.h" #include "gui/widgets/itemlinkhandler.h" #include "gui/widgets/layout.h" +#include "gui/widgets/layouttype.h" #include "gui/widgets/extendedlistbox.h" #include "gui/widgets/playerbox.h" #include "gui/widgets/scrollarea.h" @@ -811,7 +812,7 @@ void NpcDialog::buildLayout() } Layout &layout = getLayout(); - layout.setRowHeight(1, Layout::AUTO_SET); + layout.setRowHeight(1, LayoutType::SET); redraw(); mScrollArea->setVerticalScrollAmount(mScrollArea->getVerticalMaxScroll()); } diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp index eb46022ba..7748ae256 100644 --- a/src/gui/windows/outfitwindow.cpp +++ b/src/gui/windows/outfitwindow.cpp @@ -39,6 +39,7 @@ #include "gui/widgets/checkbox.h" #include "gui/widgets/label.h" #include "gui/widgets/layout.h" +#include "gui/widgets/layouttype.h" #include "resources/image.h" @@ -109,7 +110,7 @@ OutfitWindow::OutfitWindow(): place(0, 7, mAwayOutfitCheck, 4); Layout &layout = getLayout(); - layout.setRowHeight(0, Layout::AUTO_SET); + layout.setRowHeight(0, LayoutType::SET); layout.setColWidth(4, Layout::CENTER); loadWindowState(); diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp index 3b4191178..c32d8e928 100644 --- a/src/gui/windows/questswindow.cpp +++ b/src/gui/windows/questswindow.cpp @@ -35,6 +35,7 @@ #include "gui/widgets/button.h" #include "gui/widgets/containerplacer.h" #include "gui/widgets/layout.h" +#include "gui/widgets/layouttype.h" #include "gui/widgets/extendedlistbox.h" #include "gui/widgets/itemlinkhandler.h" #include "gui/widgets/scrollarea.h" @@ -171,7 +172,7 @@ QuestsWindow::QuestsWindow() : placer(7, 3, mCloseButton); Layout &layout = getLayout(); - layout.setRowHeight(0, Layout::AUTO_SET); + layout.setRowHeight(0, LayoutType::SET); loadWindowState(); enableVisibleSound(true); diff --git a/src/gui/windows/selldialog.cpp b/src/gui/windows/selldialog.cpp index b317d6f54..691624e06 100644 --- a/src/gui/windows/selldialog.cpp +++ b/src/gui/windows/selldialog.cpp @@ -36,6 +36,7 @@ #include "gui/widgets/containerplacer.h" #include "gui/widgets/label.h" #include "gui/widgets/layout.h" +#include "gui/widgets/layouttype.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/shoplistbox.h" #include "gui/widgets/slider.h" @@ -152,7 +153,7 @@ void SellDialog::init() placer(7, 7, mQuitButton); Layout &layout = getLayout(); - layout.setRowHeight(0, Layout::AUTO_SET); + layout.setRowHeight(0, LayoutType::SET); center(); loadWindowState(); diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index 1c2afe9e8..01fb7b033 100644 --- a/src/gui/windows/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -34,6 +34,7 @@ #include "gui/widgets/containerplacer.h" #include "gui/widgets/label.h" #include "gui/widgets/layout.h" +#include "gui/widgets/layouttype.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/shoplistbox.h" @@ -181,7 +182,7 @@ ShopWindow::ShopWindow(): } Layout &layout = getLayout(); - layout.setRowHeight(0, Layout::AUTO_SET); + layout.setRowHeight(0, LayoutType::SET); center(); loadWindowState(); diff --git a/src/gui/windows/shortcutwindow.cpp b/src/gui/windows/shortcutwindow.cpp index 8387d7e91..8b0e51472 100644 --- a/src/gui/windows/shortcutwindow.cpp +++ b/src/gui/windows/shortcutwindow.cpp @@ -26,6 +26,7 @@ #include "gui/widgets/tabbedarea.h" #include "gui/widgets/layout.h" +#include "gui/widgets/layouttype.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/shortcutcontainer.h" #include "gui/widgets/tabs/tab.h" @@ -104,7 +105,7 @@ ShortcutWindow::ShortcutWindow(const std::string &restrict title, place(0, 0, mScrollArea, 5, 5).setPadding(0); Layout &layout = getLayout(); - layout.setRowHeight(0, Layout::AUTO_SET); + layout.setRowHeight(0, LayoutType::SET); layout.setMargin(0); loadWindowState(); @@ -143,7 +144,7 @@ ShortcutWindow::ShortcutWindow(const std::string &restrict title, place(0, 0, mTabs, 5, 5); Layout &layout = getLayout(); - layout.setRowHeight(0, Layout::AUTO_SET); + layout.setRowHeight(0, LayoutType::SET); layout.setMargin(0); loadWindowState(); diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index fa0fd3378..99ed112eb 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -43,6 +43,7 @@ #include "gui/widgets/containerplacer.h" #include "gui/widgets/label.h" #include "gui/widgets/layouthelper.h" +#include "gui/widgets/layouttype.h" #include "gui/widgets/progressbar.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/vertcontainer.h" @@ -292,7 +293,7 @@ StatusWindow::StatusWindow() : mDAttrScroll->setVerticalScrollPolicy(ScrollArea::SHOW_AUTO); place(6, 3, mDAttrScroll, 5, 3); - getLayout().setRowHeight(3, Layout::AUTO_SET); + getLayout().setRowHeight(3, LayoutType::SET); place(0, 6, mCharacterPointsLabel, 5); place(0, 5, mCopyButton); diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp index 60ef9255b..305106af8 100644 --- a/src/gui/windows/tradewindow.cpp +++ b/src/gui/windows/tradewindow.cpp @@ -43,9 +43,10 @@ #include "gui/widgets/containerplacer.h" #include "gui/widgets/itemcontainer.h" #include "gui/widgets/label.h" +#include "gui/widgets/layout.h" +#include "gui/widgets/layouttype.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/textfield.h" -#include "gui/widgets/layout.h" #include "gui/widgets/tabs/chattab.h" @@ -141,10 +142,10 @@ TradeWindow::TradeWindow(): placer(1, 0, mOkButton); Layout &layout = getLayout(); layout.extend(0, 2, 2, 1); - layout.setRowHeight(1, Layout::AUTO_SET); + layout.setRowHeight(1, LayoutType::SET); layout.setRowHeight(2, 0); - layout.setColWidth(0, Layout::AUTO_SET); - layout.setColWidth(1, Layout::AUTO_SET); + layout.setColWidth(0, LayoutType::SET); + layout.setColWidth(1, LayoutType::SET); loadWindowState(); enableVisibleSound(true); diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 0884f5f7a..1f7b8f18d 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -34,6 +34,7 @@ #include "gui/widgets/containerplacer.h" #include "gui/widgets/label.h" #include "gui/widgets/layout.h" +#include "gui/widgets/layouttype.h" #include "gui/widgets/progressbar.h" #include "gui/widgets/scrollarea.h" @@ -220,7 +221,7 @@ UpdaterWindow::UpdaterWindow(const std::string &restrict updateHost, placer(4, 5, mPlayButton); Layout &layout = getLayout(); - layout.setRowHeight(0, Layout::AUTO_SET); + layout.setRowHeight(0, LayoutType::SET); addKeyListener(this); -- cgit v1.2.3-70-g09d2