From 0b4ce8c4594c2e70c2e3157c58491757e13558be Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 7 Aug 2011 03:37:30 +0300
Subject: Add option "show beings transparency". Disabled by default.

---
 src/gui/setup_other.cpp |  2 ++
 src/gui/setup_video.cpp | 16 ++++++++--------
 src/gui/setup_video.h   |  4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/setup_other.cpp b/src/gui/setup_other.cpp
index ca70133a2..ac047e34b 100644
--- a/src/gui/setup_other.cpp
+++ b/src/gui/setup_other.cpp
@@ -166,6 +166,8 @@ Setup_Other::Setup_Other()
     new SetupItemCheckBox(_("Hide shield sprite"), "", "hideShield",
         this, "hideShieldEvent");
 
+    new SetupItemCheckBox(_("Show background"), "", "showBackground",
+        this, "showBackgroundEvent");
 
     setDimension(gcn::Rectangle(0, 0, 550, 350));
 }
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index d3ee64f3a..72c2e151b 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -284,7 +284,7 @@ Setup_Video::Setup_Video():
     mAltFps(config.getIntValue("altfpslimit")),
     mAlphaCache(config.getBoolValue("alphaCache")),
     mEnableMapReduce(config.getBoolValue("enableMapReduce")),
-    mShowBackground(config.getBoolValue("showBackground")),
+    mBeingOpacity(config.getBoolValue("beingopacity")),
     mSpeechMode(static_cast<Being::Speech>(
         config.getIntValue("speech"))),
     mModeListModel(new ModeListModel),
@@ -304,8 +304,8 @@ Setup_Video::Setup_Video():
     mAlphaCacheCheckBox(new CheckBox(_("Enable opacity cache"), mAlphaCache)),
     mEnableMapReduceCheckBox(new CheckBox(_("Enable map reduce"),
         mEnableMapReduce)),
-    mShowBackgroundCheckBox(new CheckBox(_("Show background"),
-                            mShowBackground)),
+    mBeingOpacityCheckBox(new CheckBox(_("Show beings transparency"),
+                          mBeingOpacity)),
     mSpeechSlider(new Slider(0, 3)),
     mSpeechLabel(new Label("")),
     mAlphaSlider(new Slider(0.1, 1.0)),
@@ -425,7 +425,7 @@ Setup_Video::Setup_Video():
 
     place(1, 1, mCustomCursorCheckBox, 3);
 
-    place(1, 2, mShowBackgroundCheckBox);
+    place(1, 2, mBeingOpacityCheckBox);
     place(1, 3, mParticleEffectsCheckBox, 2);
 
     place(1, 4, mPickupNotifyLabel, 4);
@@ -552,7 +552,7 @@ void Setup_Video::apply()
 
     config.setValue("alphaCache", mAlphaCacheCheckBox->isSelected());
     config.setValue("enableMapReduce", mEnableMapReduceCheckBox->isSelected());
-    config.setValue("showBackground", mShowBackgroundCheckBox->isSelected());
+    config.setValue("beingopacity", mBeingOpacityCheckBox->isSelected());
 
     // We sync old and new values at apply time
     mFullScreenEnabled = config.getBoolValue("screen");
@@ -560,7 +560,7 @@ void Setup_Video::apply()
     mParticleEffectsEnabled = config.getBoolValue("particleeffects");
     mAlphaCache = config.getBoolValue("alphaCache");
     mEnableMapReduce = config.getBoolValue("enableMapReduce");
-    mShowBackground = config.getBoolValue("showBackground");
+    mBeingOpacity = config.getBoolValue("beingopacity");
 
     mSpeechMode = static_cast<Being::Speech>(
         config.getIntValue("speech"));
@@ -587,7 +587,7 @@ void Setup_Video::cancel()
     mSpeechSlider->setValue(mSpeechMode);
     mAlphaCacheCheckBox->setSelected(mAlphaCache);
     mEnableMapReduceCheckBox->setSelected(mEnableMapReduce);
-    mShowBackgroundCheckBox->setSelected(mShowBackground);
+    mBeingOpacityCheckBox->setSelected(mBeingOpacity);
     mAlphaSlider->setValue(mOpacity);
     mOverlayDetailSlider->setValue(mOverlayDetail);
     mParticleDetailSlider->setValue(mParticleDetail);
@@ -609,7 +609,7 @@ void Setup_Video::cancel()
     config.setValue("speech", static_cast<int>(mSpeechMode));
     config.setValue("alphaCache", mAlphaCache);
     config.setValue("enableMapReduce", mEnableMapReduce);
-    config.setValue("showBackground", mShowBackground);
+    config.setValue("beingopacity", mBeingOpacity);
     config.setValue("guialpha", mOpacity);
     Image::setEnableAlpha(mOpacity != 1.0f);
     config.setValue("opengl", mOpenGLEnabled);
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index 4448b05c8..f5d3208c8 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -65,7 +65,7 @@ class Setup_Video : public SetupTab, public gcn::KeyListener
         int mAltFps;
         bool mAlphaCache;
         bool mEnableMapReduce;
-        bool mShowBackground;
+        bool mBeingOpacity;
         Being::Speech mSpeechMode;
 
         ModeListModel *mModeListModel;
@@ -92,7 +92,7 @@ class Setup_Video : public SetupTab, public gcn::KeyListener
 
         gcn::CheckBox *mAlphaCacheCheckBox;
         gcn::CheckBox *mEnableMapReduceCheckBox;
-        gcn::CheckBox *mShowBackgroundCheckBox;
+        gcn::CheckBox *mBeingOpacityCheckBox;
         gcn::Slider *mSpeechSlider;
         gcn::Label *mSpeechLabel;
         gcn::Slider *mAlphaSlider;
-- 
cgit v1.2.3-60-g2f50