From 5b62d57146fb2700473bbee72e94b5ead775deb3 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 2 Aug 2012 22:03:23 +0300 Subject: Add option to show/hide background in npc dialog. --- data/themes/mana/CMakeLists.txt | 1 + data/themes/mana/Makefile.am | 1 + data/themes/mana/npc.xml | 25 +++++++++++++++++++++++++ src/gui/npcdialog.cpp | 6 ++++-- 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 data/themes/mana/npc.xml diff --git a/data/themes/mana/CMakeLists.txt b/data/themes/mana/CMakeLists.txt index 45fcf55d8..7fa4fe1ad 100644 --- a/data/themes/mana/CMakeLists.txt +++ b/data/themes/mana/CMakeLists.txt @@ -1,5 +1,6 @@ SET (FILES colors.xml + npc.xml social.xml ) diff --git a/data/themes/mana/Makefile.am b/data/themes/mana/Makefile.am index dc2fed230..4972febad 100644 --- a/data/themes/mana/Makefile.am +++ b/data/themes/mana/Makefile.am @@ -3,6 +3,7 @@ guidir = $(pkgdatadir)/data/themes/mana gui_DATA = \ colors.xml \ + npc.xml \ social.xml EXTRA_DIST = \ diff --git a/data/themes/mana/npc.xml b/data/themes/mana/npc.xml new file mode 100644 index 000000000..04664d19d --- /dev/null +++ b/data/themes/mana/npc.xml @@ -0,0 +1,25 @@ + + + + diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp index 567fcda06..240b53890 100644 --- a/src/gui/npcdialog.cpp +++ b/src/gui/npcdialog.cpp @@ -100,7 +100,8 @@ NpcDialog::NpcDialog(int npcId) : mTextBox->setLinkHandler(mItemLinkHandler); mTextBox->setFont(gui->getNpcFont()); - mScrollArea = new ScrollArea(mTextBox); + mScrollArea = new ScrollArea(mTextBox, + getOptionBool("showtextbackground")); mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); mScrollArea->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS); @@ -118,7 +119,8 @@ NpcDialog::NpcDialog(int npcId) : setContentSize(260, 175); - mListScrollArea = new ScrollArea(mItemList); + mListScrollArea = new ScrollArea(mItemList, + getOptionBool("showlistbackground")); mListScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); mItemList->setVisible(true); -- cgit v1.2.3-70-g09d2