diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-08-02 22:03:23 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-08-02 22:03:56 +0300 |
commit | 5b62d57146fb2700473bbee72e94b5ead775deb3 (patch) | |
tree | 934d55816ec24dec2c7bac4a031adeecb56c2a67 | |
parent | ca0032e744ea7244e70714ed356cfdb37dc26be2 (diff) | |
download | manaplus-5b62d57146fb2700473bbee72e94b5ead775deb3.tar.gz manaplus-5b62d57146fb2700473bbee72e94b5ead775deb3.tar.bz2 manaplus-5b62d57146fb2700473bbee72e94b5ead775deb3.tar.xz manaplus-5b62d57146fb2700473bbee72e94b5ead775deb3.zip |
Add option to show/hide background in npc dialog.
-rw-r--r-- | data/themes/mana/CMakeLists.txt | 1 | ||||
-rw-r--r-- | data/themes/mana/Makefile.am | 1 | ||||
-rw-r--r-- | data/themes/mana/npc.xml | 25 | ||||
-rw-r--r-- | src/gui/npcdialog.cpp | 6 |
4 files changed, 31 insertions, 2 deletions
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 @@ +<skinset name="Default" image="window.png"> + <widget type="Window"> + <option name="showlistbackground" value="1" /> + <option name="showtextbackground" value="1" /> + + <!-- Top Row --> + <part type="top-left-corner" xpos="0" ypos="0" width="4" height="4" /> + <part type="top-edge" xpos="4" ypos="0" width="32" height="4" /> + <part type="top-right-corner" xpos="36" ypos="0" width="4" height="4" /> + + <!-- Middle Row --> + <part type="left-edge" xpos="0" ypos="4" width="4" height="216" /> + <part type="bg-quad" xpos="4" ypos="4" width="32" height="216" /> + <part type="right-edge" xpos="36" ypos="4" width="4" height="216" /> + + <!-- Bottom Row --> + <part type="bottom-left-corner" xpos="0" ypos="220" width="4" height="4" /> + <part type="bottom-edge" xpos="4" ypos="220" width="32" height="4" /> + <part type="bottom-right-corner" xpos="36" ypos="220" width="4" height="4" /> + + <part type="closeImage" xpos="130" ypos="0" width="15" height="15" /> + <part type="stickyImageUp" xpos="130" ypos="51" width="15" height="15" /> + <part type="stickyImageDown" xpos="145" ypos="51" width="15" height="15" /> + </widget> +</skinset> 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); |