Merge branch 'master' into stable

8 files changed, 36 insertions, 24 deletions

diff --git a/src/gui/widgets/tabs/chattab.cpp b/src/gui/widgets/tabs/chattab.cpp
index fe979ae5a..8fe9d707b 100644
--- a/src/gui/widgets/tabs/chattab.cpp
+++ b/src/gui/widgets/tabs/chattab.cpp
@@ -72,8 +72,8 @@ ChatTab::ChatTab(const Widget2 *const widget,
         mTextOutput->setLinkHandler(chatWindow->mItemLinkHandler);
     mTextOutput->setAlwaysUpdate(false);
 
-    mScrollArea->setScrollPolicy(gcn::ScrollArea::SHOW_NEVER,
-                                 gcn::ScrollArea::SHOW_ALWAYS);
+    mScrollArea->setScrollPolicy(ScrollArea::SHOW_NEVER,
+        ScrollArea::SHOW_ALWAYS);
     mScrollArea->setScrollAmount(0, 1);
 
     if (chatWindow)
diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp
index ac6bf2837..eb7e695f4 100644
--- a/src/gui/widgets/tabs/setup_colors.cpp
+++ b/src/gui/widgets/tabs/setup_colors.cpp
@@ -84,19 +84,19 @@ Setup_Colors::Setup_Colors(const Widget2 *const widget) :
     // TRANSLATORS: settings colors tab name
     setName(_("Colors"));
     mColorBox->addSelectionListener(this);
-    mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
     mPreview->setOpaque(false);
 
     // don't do anything with links
     mPreview->setLinkHandler(nullptr);
 
     mPreviewBox->setHeight(20);
-    mPreviewBox->setScrollPolicy(gcn::ScrollArea::SHOW_NEVER,
-                                 gcn::ScrollArea::SHOW_NEVER);
+    mPreviewBox->setScrollPolicy(ScrollArea::SHOW_NEVER,
+        ScrollArea::SHOW_NEVER);
 
     mGradTypeSlider->setWidth(180);
     mGradTypeSlider->setActionEventId("slider_grad");
-    mGradTypeSlider->setValue2(0);
+    mGradTypeSlider->setValue(0);
     mGradTypeSlider->addActionListener(this);
     mGradTypeSlider->setEnabled(false);
 
@@ -128,7 +128,7 @@ Setup_Colors::Setup_Colors(const Widget2 *const widget) :
     mGradDelayText->setEnabled(false);
 
     mGradDelaySlider->setWidth(180);
-    mGradDelaySlider->setValue2(mGradDelayText->getValue());
+    mGradDelaySlider->setValue(mGradDelayText->getValue());
     mGradDelaySlider->setActionEventId("slider_graddelay");
     mGradDelaySlider->addActionListener(this);
     mGradDelaySlider->setEnabled(false);
@@ -139,7 +139,7 @@ Setup_Colors::Setup_Colors(const Widget2 *const widget) :
     mRedText->setEnabled(false);
 
     mRedSlider->setWidth(180);
-    mRedSlider->setValue2(mRedText->getValue());
+    mRedSlider->setValue(mRedText->getValue());
     mRedSlider->setActionEventId("slider_red");
     mRedSlider->addActionListener(this);
     mRedSlider->setEnabled(false);
@@ -150,7 +150,7 @@ Setup_Colors::Setup_Colors(const Widget2 *const widget) :
     mGreenText->setEnabled(false);
 
     mGreenSlider->setWidth(180);
-    mGreenSlider->setValue2(mGreenText->getValue());
+    mGreenSlider->setValue(mGreenText->getValue());
     mGreenSlider->setActionEventId("slider_green");
     mGreenSlider->addActionListener(this);
     mGreenSlider->setEnabled(false);
@@ -161,7 +161,7 @@ Setup_Colors::Setup_Colors(const Widget2 *const widget) :
     mBlueText->setEnabled(false);
 
     mBlueSlider->setWidth(180);
-    mBlueSlider->setValue2(mBlueText->getValue());
+    mBlueSlider->setValue(mBlueText->getValue());
     mBlueSlider->setActionEventId("slider_blue");
     mBlueSlider->addActionListener(this);
     mBlueSlider->setEnabled(false);
@@ -356,7 +356,7 @@ void Setup_Colors::valueChanged(const SelectionEvent &event A_UNUSED)
     setEntry(mGreenSlider, mGreenText, col->g);
     setEntry(mBlueSlider, mBlueText, col->b);
 
-    mGradTypeSlider->setValue2(grad);
+    mGradTypeSlider->setValue(grad);
     updateGradType();
     mGradTypeSlider->setEnabled(true);
 }
@@ -365,7 +365,7 @@ void Setup_Colors::setEntry(Slider *const s, TextField *const t,
                             const int value)
 {
     if (s)
-        s->setValue2(value);
+        s->setValue(value);
     if (t)
         t->setText(toString(value));
 }
@@ -384,7 +384,7 @@ void Setup_Colors::cancel()
     userPalette->rollback();
     const int type = userPalette->getColorTypeAt(mSelected);
     const Color *const col = &userPalette->getColor(type);
-    mGradTypeSlider->setValue2(userPalette->getGradientType(type));
+    mGradTypeSlider->setValue(userPalette->getGradientType(type));
     const int delay = userPalette->getGradientDelay(type);
     setEntry(mGradDelaySlider, mGradDelayText, delay);
     setEntry(mRedSlider, mRedText, col->r);
diff --git a/src/gui/widgets/tabs/setup_players.cpp b/src/gui/widgets/tabs/setup_players.cpp
index 01bb60f53..b04a25e22 100644
--- a/src/gui/widgets/tabs/setup_players.cpp
+++ b/src/gui/widgets/tabs/setup_players.cpp
@@ -100,5 +100,10 @@ Setup_Players::Setup_Players(const Widget2 *const widget) :
     new SetupItemCheckBox(_("Use special diagonal speed in players moving"),
         "", "useDiagonalSpeed", this, "useDiagonalSpeedEvent");
 
+    // TRANSLATORS: settings option
+    new SetupItemCheckBox(_("Emulate right mouse button by long mouse click"
+        " (usefull for touch interfaces)"),
+        "", "longmouseclick", this, "longmouseclickEvent");
+
     setDimension(Rect(0, 0, 550, 350));
 }
diff --git a/src/gui/widgets/tabs/setup_relations.cpp b/src/gui/widgets/tabs/setup_relations.cpp
index 1458ecd25..ca060477f 100644
--- a/src/gui/widgets/tabs/setup_relations.cpp
+++ b/src/gui/widgets/tabs/setup_relations.cpp
@@ -221,7 +221,7 @@ Setup_Relations::Setup_Relations(const Widget2 *const widget) :
 
     mPlayerTitleTable->setLinewiseSelection(true);
 
-    mPlayerScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mPlayerScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
     mPlayerTable->setActionEventId(ACTION_TABLE);
     mPlayerTable->setLinewiseSelection(true);
     mPlayerTable->addActionListener(this);
diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index f55dceaa4..416ae8c3c 100644
--- a/src/gui/widgets/tabs/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -227,7 +227,7 @@ Setup_Video::Setup_Video(const Widget2 *const widget) :
     ScrollArea *const scrollArea = new ScrollArea(this, mModeList,
         true, "setup_video_background.xml");
     scrollArea->setWidth(150);
-    scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    scrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
 
     mOpenGLDropDown->setSelected(renderToIndex[mOpenGLEnabled]);
 
@@ -241,9 +241,9 @@ Setup_Video::Setup_Video(const Widget2 *const widget) :
                              ? toString(mAltFps) : _("None")));
     mAltFpsLabel->setWidth(150);
     mFpsSlider->setEnabled(mFps > 0);
-    mFpsSlider->setValue2(mFps);
+    mFpsSlider->setValue(mFps);
     mAltFpsSlider->setEnabled(mAltFps > 0);
-    mAltFpsSlider->setValue2(mAltFps);
+    mAltFpsSlider->setValue(mAltFps);
     mFpsCheckBox->setSelected(mFps > 0);
 
     // Pre-select the current video mode.
@@ -419,9 +419,9 @@ void Setup_Video::cancel()
     mOpenGLDropDown->setSelected(renderToIndex[mOpenGLEnabled]);
     mCustomCursorCheckBox->setSelected(mCustomCursorEnabled);
     mFpsSlider->setEnabled(mFps > 0);
-    mFpsSlider->setValue2(mFps);
+    mFpsSlider->setValue(mFps);
     mAltFpsSlider->setEnabled(mAltFps > 0);
-    mAltFpsSlider->setValue2(mAltFps);
+    mAltFpsSlider->setValue(mAltFps);
     mFpsLabel->setCaption(mFpsCheckBox->isSelected()
     // TRANSLATORS: video settings label
                           ? toString(mFps) : _("None"));
@@ -542,7 +542,7 @@ void Setup_Video::action(const ActionEvent &event)
 
         mFpsLabel->setCaption(text);
         mFpsSlider->setEnabled(mFps > 0);
-        mFpsSlider->setValue2(mFps);
+        mFpsSlider->setValue(mFps);
     }
     else if (id == "altfpslimitslider")
     {
@@ -556,7 +556,7 @@ void Setup_Video::action(const ActionEvent &event)
         // TRANSLATORS: video settings label
         mAltFpsLabel->setCaption(_("Alt FPS limit: ") + text);
         mAltFpsSlider->setEnabled(mAltFps > 0);
-        mAltFpsSlider->setValue2(mAltFps);
+        mAltFpsSlider->setValue(mAltFps);
     }
     else if (id == "enableresize")
     {
diff --git a/src/gui/widgets/tabs/setup_visual.cpp b/src/gui/widgets/tabs/setup_visual.cpp
index 9666b224a..860b1d516 100644
--- a/src/gui/widgets/tabs/setup_visual.cpp
+++ b/src/gui/widgets/tabs/setup_visual.cpp
@@ -203,6 +203,13 @@ Setup_Visual::Setup_Visual(const Widget2 *const widget) :
     new SetupItemCheckBox(_("Allow screensaver to run"),
         "", "allowscreensaver", this, "allowscreensaverEvent");
 
+
+    // TRANSLATORS: settings group
+    new SetupItemLabel(_("Screenshots"), "", this);
+
+    new SetupItemCheckBox(_("Add water mark into screenshots"),
+        "", "addwatermark", this, "addwatermarkEvent");
+
     setDimension(Rect(0, 0, 550, 350));
 }
 
diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp
index 96ae76787..ede69619e 100644
--- a/src/gui/widgets/tabs/tab.cpp
+++ b/src/gui/widgets/tabs/tab.cpp
@@ -91,7 +91,7 @@ static std::string const data[Tab::TAB_COUNT] =
 Skin *Tab::tabImg[Tab::TAB_COUNT];
 
 Tab::Tab(const Widget2 *const widget) :
-    gcn::BasicContainer(widget),
+    BasicContainer(widget),
     MouseListener(),
     WidgetListener(),
     mLabel(new Label(this)),
diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h
index 1f52cde88..246d90650 100644
--- a/src/gui/widgets/tabs/tab.h
+++ b/src/gui/widgets/tabs/tab.h
@@ -66,7 +66,7 @@
 #ifndef GUI_WIDGETS_TABS_TAB_H
 #define GUI_WIDGETS_TABS_TAB_H
 
-#include "gui/base/basiccontainer.hpp"
+#include "gui/widgets/basiccontainer.h"
 
 #include "listeners/mouselistener.h"
 #include "listeners/widgetlistener.h"
@@ -81,7 +81,7 @@ class TabbedArea;
 /**
  * A tab, the same as the Guichan tab in 0.8, but extended
  */
-class Tab : public gcn::BasicContainer,
+class Tab : public BasicContainer,
             public MouseListener,
             public WidgetListener
 {