From aa7119314e1a33d908b98906d30be94eb116d02d Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 9 Mar 2018 02:22:21 +0300
Subject: Add skin parameter to all button constructors.

---
 src/gui/widgets/tabs/setup_input.cpp     | 12 ++++++++----
 src/gui/widgets/tabs/setup_joystick.cpp  |  6 ++++--
 src/gui/widgets/tabs/setup_relations.cpp |  3 ++-
 src/gui/widgets/tabs/setup_theme.cpp     |  2 +-
 src/gui/widgets/tabs/setup_video.cpp     |  3 ++-
 5 files changed, 17 insertions(+), 9 deletions(-)

(limited to 'src/gui/widgets/tabs')

diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp
index c2e451aed..adf9245bf 100644
--- a/src/gui/widgets/tabs/setup_input.cpp
+++ b/src/gui/widgets/tabs/setup_input.cpp
@@ -62,13 +62,17 @@ Setup_Input::Setup_Input(const Widget2 *const widget) :
     mKeyListModel(new KeyListModel),
     mKeyList(CREATEWIDGETR(ListBox, this, mKeyListModel, "")),
     // TRANSLATORS: button in input settings tab
-    mAssignKeyButton(new Button(this, _("Assign"), "assign", this)),
+    mAssignKeyButton(new Button(this, _("Assign"), "assign",
+        BUTTON_SKIN, this)),
     // TRANSLATORS: button in input settings tab
-    mUnassignKeyButton(new Button(this, _("Unassign"), "unassign", this)),
+    mUnassignKeyButton(new Button(this, _("Unassign"), "unassign",
+        BUTTON_SKIN, this)),
     // TRANSLATORS: button in input settings tab
-    mDefaultButton(new Button(this, _("Default"), "default", this)),
+    mDefaultButton(new Button(this, _("Default"), "default",
+        BUTTON_SKIN, this)),
     // TRANSLATORS: button in input settings tab
-    mResetKeysButton(new Button(this, _("Reset all keys"), "resetkeys", this)),
+    mResetKeysButton(new Button(this, _("Reset all keys"), "resetkeys",
+        BUTTON_SKIN, this)),
     mTabs(new TabStrip(this, config.getIntValue("fontSize") + 10, 0)),
     mScrollArea(new ScrollArea(this, mKeyList,
         Opaque_true, "setup_input_background.xml")),
diff --git a/src/gui/widgets/tabs/setup_joystick.cpp b/src/gui/widgets/tabs/setup_joystick.cpp
index a856f552e..e3dd95caf 100644
--- a/src/gui/widgets/tabs/setup_joystick.cpp
+++ b/src/gui/widgets/tabs/setup_joystick.cpp
@@ -46,9 +46,11 @@ Setup_Joystick::Setup_Joystick(const Widget2 *const widget) :
         // TRANSLATORS: joystick settings tab label
         _("Press the button to start calibration"))),
     // TRANSLATORS: joystick settings tab button
-    mCalibrateButton(new Button(this, _("Calibrate"), "calibrate", this)),
+    mCalibrateButton(new Button(this, _("Calibrate"), "calibrate",
+        BUTTON_SKIN, this)),
     // TRANSLATORS: joystick settings tab button
-    mDetectButton(new Button(this, _("Detect joysticks"), "detect", this)),
+    mDetectButton(new Button(this, _("Detect joysticks"), "detect",
+        BUTTON_SKIN, this)),
     // TRANSLATORS: joystick settings tab checkbox
     mJoystickEnabled(new CheckBox(this, _("Enable joystick"),
         false, nullptr, std::string())),
diff --git a/src/gui/widgets/tabs/setup_relations.cpp b/src/gui/widgets/tabs/setup_relations.cpp
index 55a53e482..85a861109 100644
--- a/src/gui/widgets/tabs/setup_relations.cpp
+++ b/src/gui/widgets/tabs/setup_relations.cpp
@@ -78,7 +78,8 @@ Setup_Relations::Setup_Relations(const Widget2 *const widget) :
         (playerRelations.getDefault() & PlayerRelation::WHISPER) != 0u,
         nullptr, std::string())),
     // TRANSLATORS: relation dialog button
-    mDeleteButton(new Button(this, _("Delete"), ACTION_DELETE, this)),
+    mDeleteButton(new Button(this, _("Delete"), ACTION_DELETE,
+        BUTTON_SKIN, this)),
     mIgnoreActionChoicesModel(new IgnoreChoicesListModel),
     mIgnoreActionChoicesBox(new DropDown(widget, mIgnoreActionChoicesModel,
         false, Modal_false, nullptr, std::string()))
diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp
index 218536469..080573c3c 100644
--- a/src/gui/widgets/tabs/setup_theme.cpp
+++ b/src/gui/widgets/tabs/setup_theme.cpp
@@ -126,7 +126,7 @@ Setup_Theme::Setup_Theme(const Widget2 *const widget) :
     mNpcFontSizeDropDown(new DropDown(this, mNpcFontSizeListModel,
         false, Modal_false, nullptr, std::string())),
     // TRANSLATORS: button name with information about selected theme
-    mInfoButton(new Button(this, _("i"), ACTION_INFO, this)),
+    mInfoButton(new Button(this, _("i"), ACTION_INFO, BUTTON_SKIN, this)),
     mThemeInfo()
 {
     // TRANSLATORS: theme settings tab name
diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index 561685dc2..557cdffce 100644
--- a/src/gui/widgets/tabs/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -86,7 +86,8 @@ Setup_Video::Setup_Video(const Widget2 *const widget) :
     mAltFpsLabel(new Label(this, _("Alt FPS limit: "))),
 #if !defined(ANDROID) && !defined(__APPLE__) && !defined(__native_client__)
     // TRANSLATORS: video settings button
-    mDetectButton(new Button(this, _("Detect best mode"), "detect", this)),
+    mDetectButton(new Button(this, _("Detect best mode"), "detect",
+        BUTTON_SKIN, this)),
 #endif  // !defined(ANDROID) && !defined(__APPLE__) &&
         // !defined(__native_client__)
     mDialog(nullptr),
-- 
cgit v1.2.3-60-g2f50