diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-09-17 19:07:25 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-09-17 19:07:25 +0300 |
commit | e9fb9da5bf17d3402781eb5205be7d2f794887ee (patch) | |
tree | 729a7932fab668bcc2de180ebfe287e811f8e136 /src/gui/widgets/tabs | |
parent | 00ec60c1c0c3db8e3602e85dd152106f59f0c0e2 (diff) | |
download | manaplus-e9fb9da5bf17d3402781eb5205be7d2f794887ee.tar.gz manaplus-e9fb9da5bf17d3402781eb5205be7d2f794887ee.tar.bz2 manaplus-e9fb9da5bf17d3402781eb5205be7d2f794887ee.tar.xz manaplus-e9fb9da5bf17d3402781eb5205be7d2f794887ee.zip |
Add strong typed bool Opaque.
Diffstat (limited to 'src/gui/widgets/tabs')
-rw-r--r-- | src/gui/widgets/tabs/chat/chattab.cpp | 6 | ||||
-rw-r--r-- | src/gui/widgets/tabs/setup_colors.cpp | 14 | ||||
-rw-r--r-- | src/gui/widgets/tabs/setup_input.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/setup_relations.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/setup_video.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/setuptab.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/setuptabscroll.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/socialattacktab.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/socialfriendstab.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/socialguildtab.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/socialguildtab2.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/socialnavigationtab.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/socialpartytab.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/socialpickuptab.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/socialplayerstab.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/socialtab.h | 2 |
16 files changed, 24 insertions, 24 deletions
diff --git a/src/gui/widgets/tabs/chat/chattab.cpp b/src/gui/widgets/tabs/chat/chattab.cpp index 67b97dd99..fad52cfb4 100644 --- a/src/gui/widgets/tabs/chat/chattab.cpp +++ b/src/gui/widgets/tabs/chat/chattab.cpp @@ -69,9 +69,9 @@ ChatTab::ChatTab(const Widget2 *const widget, const std::string &logName, const ChatTabTypeT &type) : Tab(widget), - mTextOutput(new BrowserBox(this, BrowserBox::AUTO_WRAP, true, + mTextOutput(new BrowserBox(this, BrowserBox::AUTO_WRAP, Opaque_true, "browserbox.xml")), - mScrollArea(new ScrollArea(this, mTextOutput, false)), + mScrollArea(new ScrollArea(this, mTextOutput, Opaque_false)), mChannelName(channel), mLogName(logName), mType(type), @@ -82,7 +82,7 @@ ChatTab::ChatTab(const Widget2 *const widget, { setCaption(name); - mTextOutput->setOpaque(false); + mTextOutput->setOpaque(Opaque_false); mTextOutput->setMaxRow(config.getIntValue("ChatLogLength")); if (chatWindow) mTextOutput->setLinkHandler(chatWindow->mItemLinkHandler); diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp index 9036356ba..f7aed22fb 100644 --- a/src/gui/widgets/tabs/setup_colors.cpp +++ b/src/gui/widgets/tabs/setup_colors.cpp @@ -54,11 +54,11 @@ Setup_Colors::Setup_Colors(const Widget2 *const widget) : SelectionListener(), mColorBox(CREATEWIDGETR(ListBox, this, userPalette, "")), mScroll(new ScrollArea(this, mColorBox, - true, "setup_colors_background.xml")), - mPreview(new BrowserBox(this, BrowserBox::AUTO_WRAP, true, + Opaque_true, "setup_colors_background.xml")), + mPreview(new BrowserBox(this, BrowserBox::AUTO_WRAP, Opaque_true, "browserbox.xml")), mTextPreview(new TextPreview(this, gettext(rawmsg))), - mPreviewBox(new ScrollArea(this, mPreview, true, + mPreviewBox(new ScrollArea(this, mPreview, Opaque_true, "setup_colors_preview_background.xml")), mSelected(-1), // TRANSLATORS: colors tab. label. @@ -86,7 +86,7 @@ Setup_Colors::Setup_Colors(const Widget2 *const widget) : setName(_("Colors")); mColorBox->addSelectionListener(this); mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER); - mPreview->setOpaque(false); + mPreview->setOpaque(Opaque_false); // don't do anything with links mPreview->setLinkHandler(nullptr); @@ -170,7 +170,7 @@ Setup_Colors::Setup_Colors(const Widget2 *const widget) : mBlueSlider->addActionListener(this); mBlueSlider->setEnabled(false); - setOpaque(false); + setOpaque(Opaque_false); // Do the layout LayoutHelper h(this); @@ -281,7 +281,7 @@ void Setup_Colors::valueChanged(const SelectionEvent &event A_UNUSED) mTextPreview->setFont(boldFont); mTextPreview->setTextColor(col); mTextPreview->setTextBGColor(nullptr); - mTextPreview->setOpaque(false); + mTextPreview->setOpaque(Opaque_false); mTextPreview->setShadow(true); mTextPreview->setOutline(true); mTextPreview->useTextAlpha(false); @@ -302,7 +302,7 @@ void Setup_Colors::valueChanged(const SelectionEvent &event A_UNUSED) case UserColorId::ROAD_POINT: case UserColorId::NET: mTextPreview->setBGColor(col); - mTextPreview->setOpaque(true); + mTextPreview->setOpaque(Opaque_true); mTextPreview->setOutline(false); mTextPreview->setShadow(false); break; diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp index 545952e2d..408bd0e83 100644 --- a/src/gui/widgets/tabs/setup_input.cpp +++ b/src/gui/widgets/tabs/setup_input.cpp @@ -71,7 +71,7 @@ Setup_Input::Setup_Input(const Widget2 *const widget) : mResetKeysButton(new Button(this, _("Reset all keys"), "resetkeys", this)), mTabs(new TabStrip(this, config.getIntValue("fontSize") + 10)), mScrollArea(new ScrollArea(this, mKeyList, - true, "setup_input_background.xml")), + Opaque_true, "setup_input_background.xml")), mKeySetting(false), mActionDataSize(new int [SETUP_PAGES]) { diff --git a/src/gui/widgets/tabs/setup_relations.cpp b/src/gui/widgets/tabs/setup_relations.cpp index 844532278..bccea1d86 100644 --- a/src/gui/widgets/tabs/setup_relations.cpp +++ b/src/gui/widgets/tabs/setup_relations.cpp @@ -82,7 +82,7 @@ Setup_Relations::Setup_Relations(const Widget2 *const widget) : // TRANSLATORS: relation dialog name setName(_("Relations")); - mPlayerTable->setOpaque(false); + mPlayerTable->setOpaque(Opaque_false); mPlayerTableTitleModel->fixColumnWidth(NAME_COLUMN, NAME_COLUMN_WIDTH); mPlayerTableTitleModel->fixColumnWidth(RELATION_CHOICE_COLUMN, diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp index a6abf6b3b..3797884a3 100644 --- a/src/gui/widgets/tabs/setup_video.cpp +++ b/src/gui/widgets/tabs/setup_video.cpp @@ -110,7 +110,7 @@ Setup_Video::Setup_Video(const Widget2 *const widget) : setName(_("Video")); ScrollArea *const scrollArea = new ScrollArea(this, mModeList, - true, "setup_video_background.xml"); + Opaque_true, "setup_video_background.xml"); scrollArea->setWidth(150); scrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER); diff --git a/src/gui/widgets/tabs/setuptab.cpp b/src/gui/widgets/tabs/setuptab.cpp index 5c8e7c3a1..6ece24f46 100644 --- a/src/gui/widgets/tabs/setuptab.cpp +++ b/src/gui/widgets/tabs/setuptab.cpp @@ -30,7 +30,7 @@ SetupTab::SetupTab(const Widget2 *const widget) : WidgetListener(), mName() { - setOpaque(false); + setOpaque(Opaque_false); addWidgetListener(this); } diff --git a/src/gui/widgets/tabs/setuptabscroll.cpp b/src/gui/widgets/tabs/setuptabscroll.cpp index 7a3c68cd5..277009182 100644 --- a/src/gui/widgets/tabs/setuptabscroll.cpp +++ b/src/gui/widgets/tabs/setuptabscroll.cpp @@ -31,7 +31,7 @@ SetupTabScroll::SetupTabScroll(const Widget2 *const widget) : SetupTab(widget), mContainer(new VertContainer(this, 25, false, 8)), - mScroll(new ScrollArea(this, mContainer, false)), + mScroll(new ScrollArea(this, mContainer, Opaque_false)), mItems(), mAllItems(), mPreferredFirstItemSize(200) diff --git a/src/gui/widgets/tabs/socialattacktab.h b/src/gui/widgets/tabs/socialattacktab.h index d83df7d14..b543cf8d5 100644 --- a/src/gui/widgets/tabs/socialattacktab.h +++ b/src/gui/widgets/tabs/socialattacktab.h @@ -38,7 +38,7 @@ class SocialAttackTab final : public SocialTab { public: SocialAttackTab(const Widget2 *const widget, - const bool showBackground) : + const Opaque showBackground) : SocialTab(widget), mBeings(new BeingsListModel) { diff --git a/src/gui/widgets/tabs/socialfriendstab.h b/src/gui/widgets/tabs/socialfriendstab.h index 12ea761d3..abfe4eadc 100644 --- a/src/gui/widgets/tabs/socialfriendstab.h +++ b/src/gui/widgets/tabs/socialfriendstab.h @@ -43,7 +43,7 @@ class SocialFriendsTab final : public SocialTab public: SocialFriendsTab(const Widget2 *const widget, std::string name, - const bool showBackground) : + const Opaque showBackground) : SocialTab(widget), mBeings(new BeingsListModel), mFriendSorter() diff --git a/src/gui/widgets/tabs/socialguildtab.h b/src/gui/widgets/tabs/socialguildtab.h index 3ea77d529..41e83f670 100644 --- a/src/gui/widgets/tabs/socialguildtab.h +++ b/src/gui/widgets/tabs/socialguildtab.h @@ -40,7 +40,7 @@ class SocialGuildTab final : public SocialTab, public: SocialGuildTab(const Widget2 *const widget, Guild *const guild, - const bool showBackground) : + const Opaque showBackground) : SocialTab(widget), ActionListener(), mGuild(guild) diff --git a/src/gui/widgets/tabs/socialguildtab2.h b/src/gui/widgets/tabs/socialguildtab2.h index cc887cd32..6a2aae990 100644 --- a/src/gui/widgets/tabs/socialguildtab2.h +++ b/src/gui/widgets/tabs/socialguildtab2.h @@ -40,7 +40,7 @@ class SocialGuildTab2 final : public SocialTab, public: SocialGuildTab2(const Widget2 *const widget, Guild *const guild, - const bool showBackground) : + const Opaque showBackground) : SocialTab(widget), ActionListener() { diff --git a/src/gui/widgets/tabs/socialnavigationtab.h b/src/gui/widgets/tabs/socialnavigationtab.h index 839e2cc3e..569d501d7 100644 --- a/src/gui/widgets/tabs/socialnavigationtab.h +++ b/src/gui/widgets/tabs/socialnavigationtab.h @@ -49,7 +49,7 @@ class SocialNavigationTab final : public SocialTab { public: SocialNavigationTab(const Widget2 *const widget, - const bool showBackground) : + const Opaque showBackground) : SocialTab(widget), mBeings(new BeingsListModel) { diff --git a/src/gui/widgets/tabs/socialpartytab.h b/src/gui/widgets/tabs/socialpartytab.h index 00a66a9b9..1fe36a414 100644 --- a/src/gui/widgets/tabs/socialpartytab.h +++ b/src/gui/widgets/tabs/socialpartytab.h @@ -42,7 +42,7 @@ class SocialPartyTab final : public SocialTab, public: SocialPartyTab(const Widget2 *const widget, Party *const party, - const bool showBackground) : + const Opaque showBackground) : SocialTab(widget), ActionListener(), mParty(party) diff --git a/src/gui/widgets/tabs/socialpickuptab.h b/src/gui/widgets/tabs/socialpickuptab.h index fab754ec8..dae786470 100644 --- a/src/gui/widgets/tabs/socialpickuptab.h +++ b/src/gui/widgets/tabs/socialpickuptab.h @@ -38,7 +38,7 @@ class SocialPickupTab final : public SocialTab { public: SocialPickupTab(const Widget2 *const widget, - const bool showBackground) : + const Opaque showBackground) : SocialTab(widget), mBeings(new BeingsListModel) { diff --git a/src/gui/widgets/tabs/socialplayerstab.h b/src/gui/widgets/tabs/socialplayerstab.h index fcd01b6a3..d7d467ba8 100644 --- a/src/gui/widgets/tabs/socialplayerstab.h +++ b/src/gui/widgets/tabs/socialplayerstab.h @@ -44,7 +44,7 @@ class SocialPlayersTab final : public SocialTab public: SocialPlayersTab(const Widget2 *const widget, std::string name, - const bool showBackground) : + const Opaque showBackground) : SocialTab(widget), mBeings(new BeingsListModel) { diff --git a/src/gui/widgets/tabs/socialtab.h b/src/gui/widgets/tabs/socialtab.h index 9d8469321..38b393e07 100644 --- a/src/gui/widgets/tabs/socialtab.h +++ b/src/gui/widgets/tabs/socialtab.h @@ -104,7 +104,7 @@ class SocialTab notfinal : public Tab } void createControls(AvatarListModel *const listModel, - const bool showBackground) + const Opaque showBackground) { CREATEWIDGETV(mList, AvatarListBox, this, listModel); mScroll = new ScrollArea(this, mList, showBackground, |