diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-10-09 12:43:50 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-10-09 12:43:50 +0300 |
| commit | d189d362ba4b1b7c7963e925638eb5f12baba882 (patch) | |
| tree | 140f7e1092a532bc89abace4d7fb659510055b29 /src/gui/widgets | |
| parent | e153ea49f7442a82651e4e35f2be59c459ad32cb (diff) | |
| download | mv-d189d362ba4b1b7c7963e925638eb5f12baba882.tar.gz mv-d189d362ba4b1b7c7963e925638eb5f12baba882.tar.bz2 mv-d189d362ba4b1b7c7963e925638eb5f12baba882.tar.xz mv-d189d362ba4b1b7c7963e925638eb5f12baba882.zip | |
allow set different skin for browserboxes.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/browserbox.cpp | 8 | ||||
| -rw-r--r-- | src/gui/widgets/browserbox.h | 3 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/chattab.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/setup_colors.cpp | 3 |
4 files changed, 11 insertions, 6 deletions
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index c8edf757b..df0fd5705 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -47,8 +47,10 @@ ImageSet *BrowserBox::mEmotes = nullptr; int BrowserBox::mInstances = 0; -BrowserBox::BrowserBox(const Widget2 *const widget, const unsigned int mode, - const bool opaque) : +BrowserBox::BrowserBox(const Widget2 *const widget, + const unsigned int mode, + const bool opaque, + const std::string &skin) : gcn::Widget(), Widget2(widget), gcn::MouseListener(), @@ -86,7 +88,7 @@ BrowserBox::BrowserBox(const Widget2 *const widget, const unsigned int mode, Theme *const theme = Theme::instance(); if (theme) - mSkin = theme->load("browserbox.xml", ""); + mSkin = theme->load(skin, "browserbox.xml"); if (mInstances == 0) { mEmotes = ResourceManager::getInstance()->getImageSet( diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h index f57519700..87ed57382 100644 --- a/src/gui/widgets/browserbox.h +++ b/src/gui/widgets/browserbox.h @@ -112,7 +112,8 @@ class BrowserBox final : public gcn::Widget, */ BrowserBox(const Widget2 *const widget, const unsigned int mode, - const bool opaque); + const bool opaque, + const std::string &skin); A_DELETE_COPY(BrowserBox) diff --git a/src/gui/widgets/tabs/chattab.cpp b/src/gui/widgets/tabs/chattab.cpp index 7ad6e303d..b4a8cb158 100644 --- a/src/gui/widgets/tabs/chattab.cpp +++ b/src/gui/widgets/tabs/chattab.cpp @@ -53,7 +53,8 @@ static const unsigned int MAX_WORD_SIZE = 50; ChatTab::ChatTab(const Widget2 *const widget, const std::string &name, const std::string &channel) : Tab(widget), - mTextOutput(new BrowserBox(this, BrowserBox::AUTO_WRAP, true)), + mTextOutput(new BrowserBox(this, BrowserBox::AUTO_WRAP, true, + "browserbox.xml")), mScrollArea(new ScrollArea(mTextOutput, false)), mChannelName(channel), mAllowHightlight(true), diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp index 28b6d39f6..13303bd88 100644 --- a/src/gui/widgets/tabs/setup_colors.cpp +++ b/src/gui/widgets/tabs/setup_colors.cpp @@ -50,7 +50,8 @@ Setup_Colors::Setup_Colors(const Widget2 *const widget) : gcn::SelectionListener(), mColorBox(new ListBox(this, userPalette, "")), mScroll(new ScrollArea(mColorBox, true, "setup_colors_background.xml")), - mPreview(new BrowserBox(this, BrowserBox::AUTO_WRAP, true)), + mPreview(new BrowserBox(this, BrowserBox::AUTO_WRAP, true, + "browserbox.xml")), mTextPreview(new TextPreview(this, gettext(rawmsg))), mPreviewBox(new ScrollArea(mPreview, true, "setup_colors_preview_background.xml")), |