From b7848fe5475f622f06681e73db66d525271cb47a Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 19 Oct 2014 13:53:55 +0300
Subject: Remove tooltips from setup items containers.

And use simple controls for this.
---
 src/gui/widgets/setupbuttonitem.cpp |  1 -
 src/gui/widgets/setupitem.cpp       | 12 ++++++------
 src/gui/widgets/setuptouchitem.cpp  |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/gui/widgets')

diff --git a/src/gui/widgets/setupbuttonitem.cpp b/src/gui/widgets/setupbuttonitem.cpp
index 4875355ff..cdfd2295a 100644
--- a/src/gui/widgets/setupbuttonitem.cpp
+++ b/src/gui/widgets/setupbuttonitem.cpp
@@ -69,7 +69,6 @@ void SetupButtonItem::rereadValue()
 void SetupButtonItem::createControls()
 {
     mHorizont = new HorizontContainer(this, 32, 2);
-    mHorizont->setToolTip(mDescription);
 
     // TRANSLATORS: setup item button
     mHorizont->add(mWidget);
diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp
index a8bded351..04f818451 100644
--- a/src/gui/widgets/setupitem.cpp
+++ b/src/gui/widgets/setupitem.cpp
@@ -360,9 +360,9 @@ void SetupItemTextField::createControls()
     if (mUseBase64)
         mValue = decodeBase64String(mValue);
     mHorizont = new HorizontContainer(this, 32, 2);
-    mHorizont->setToolTip(mDescription);
 
     mLabel = new Label(this, mText);
+    mLabel->setToolTip(mDescription);
     mTextField = new TextField(this, mValue, true, mParent, mEventName);
     // TRANSLATORS: setup item button
     mButton = new Button(this, _("Edit"), mEventName + "_EDIT", mParent);
@@ -493,9 +493,9 @@ void SetupItemIntTextField::createControls()
 {
     load();
     mHorizont = new HorizontContainer(this, 32, 2);
-    mHorizont->setToolTip(mDescription);
 
     mLabel = new Label(this, mText);
+    mLabel->setToolTip(mDescription);
     mTextField = new IntTextField(this, atoi(mValue.c_str()),
         mMin, mMax, true, 30);
     mTextField->setActionEventId(mEventName);
@@ -677,9 +677,9 @@ void SetupItemDropDown::createControls()
 {
     load();
     mHorizont = new HorizontContainer(this, 32, 2);
-    mHorizont->setToolTip(mDescription);
 
     mLabel = new Label(this, mText);
+    mLabel->setToolTip(mDescription);
     mDropDown = new DropDown(this, mModel);
     mDropDown->setActionEventId(mEventName);
     mDropDown->addActionListener(mParent);
@@ -777,9 +777,9 @@ void SetupItemSlider::createControls()
 {
     load();
     mHorizont = new HorizontContainer(this, 32, 2);
-    mHorizont->setToolTip(mDescription);
 
     mLabel = new Label(this, mText);
+    mLabel->setToolTip(mDescription);
     mSlider = new Slider(this, mMin, mMax, mStep);
     mSlider->setActionEventId(mEventName);
     mSlider->addActionListener(mParent);
@@ -905,11 +905,11 @@ void SetupItemSlider2::createControls()
 {
     load();
     mHorizont = new HorizontContainer(this, 32, 2);
-    mHorizont->setToolTip(mDescription);
 
     const int width = getMaxWidth();
 
     mLabel = new Label(this, mText);
+    mLabel->setToolTip(mDescription);
     mLabel2 = new Label(this, "");
     mLabel2->setWidth(width);
     mSlider = new Slider(this, mMin, mMax, mStep);
@@ -1074,9 +1074,9 @@ void SetupItemSliderList::createControls()
 {
     load();
     mHorizont = new HorizontContainer(this, 32, 2);
-    mHorizont->setToolTip(mDescription);
 
     mLabel = new Label(this, mText);
+    mLabel->setToolTip(mDescription);
     mSlider = new SliderList(this, mModel);
     mSlider->postInit(mParent, mEventName);
     mSlider->setSelectedString(mValue);
diff --git a/src/gui/widgets/setuptouchitem.cpp b/src/gui/widgets/setuptouchitem.cpp
index 73228bad6..832d7316f 100644
--- a/src/gui/widgets/setuptouchitem.cpp
+++ b/src/gui/widgets/setuptouchitem.cpp
@@ -92,9 +92,9 @@ void SetupActionDropDown::createControls()
 
     load();
     mHorizont = new HorizontContainer(this, 32, 2);
-    mHorizont->setToolTip(mDescription);
 
     mLabel = new Label(this, mText);
+    mLabel->setToolTip(mDescription);
     mDropDown = new DropDown(this, mModel);
     mDropDown->setActionEventId(mEventName);
     mDropDown->addActionListener(mParent);
-- 
cgit v1.2.3-60-g2f50