Editor help tool tip options cleanup.

Change-Id: I3afa91d95bc92f5bd2879f32ca7ab7ff86b97714
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: David Schulz <david.schulz@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

1 files changed, 19 insertions, 7 deletions

diff --git a/src/plugins/texteditor/behaviorsettingswidget.cpp b/src/plugins/texteditor/behaviorsettingswidget.cpp
index 4d954544ed..9bd9b8c4c7 100644
--- a/src/plugins/texteditor/behaviorsettingswidget.cpp
+++ b/src/plugins/texteditor/behaviorsettingswidget.cpp
@@ -97,16 +97,16 @@ BehaviorSettingsWidget::BehaviorSettingsWidget(QWidget *parent)
             this, SLOT(slotBehaviorSettingsChanged()));
     connect(d->m_ui.scrollWheelZooming, SIGNAL(clicked(bool)),
             this, SLOT(slotBehaviorSettingsChanged()));
-    connect(d->m_ui.constrainTooltips, SIGNAL(clicked()),
-            this, SLOT(slotBehaviorSettingsChanged()));
     connect(d->m_ui.camelCaseNavigation, SIGNAL(clicked()),
             this, SLOT(slotBehaviorSettingsChanged()));
-    connect(d->m_ui.keyboardTooltips, SIGNAL(clicked()),
-            this, SLOT(slotBehaviorSettingsChanged()));
     connect(d->m_ui.utf8BomBox, SIGNAL(currentIndexChanged(int)),
             this, SLOT(slotExtraEncodingChanged()));
     connect(d->m_ui.encodingBox, SIGNAL(currentIndexChanged(int)),
             this, SLOT(slotEncodingBoxChanged(int)));
+    connect(d->m_ui.constrainTooltipsBox, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(slotBehaviorSettingsChanged()));
+    connect(d->m_ui.keyboardTooltips, SIGNAL(clicked()),
+            this, SLOT(slotBehaviorSettingsChanged()));
 }
 
 BehaviorSettingsWidget::~BehaviorSettingsWidget()
@@ -175,20 +175,29 @@ void BehaviorSettingsWidget::assignedStorageSettings(StorageSettings *storageSet
     storageSettings->m_addFinalNewLine = d->m_ui.addFinalNewLine->isChecked();
 }
 
+void BehaviorSettingsWidget::updateConstrainTooltipsBoxTooltip() const
+{
+    if (d->m_ui.constrainTooltipsBox->currentIndex() == 0)
+        d->m_ui.constrainTooltipsBox->setToolTip("Display context-sensitive help or type information on mouseover.");
+    else
+        d->m_ui.constrainTooltipsBox->setToolTip("Display context-sensitive help or type information on Shift+Mouseover.");
+}
+
 void BehaviorSettingsWidget::setAssignedBehaviorSettings(const BehaviorSettings &behaviorSettings)
 {
     d->m_ui.mouseNavigation->setChecked(behaviorSettings.m_mouseNavigation);
     d->m_ui.scrollWheelZooming->setChecked(behaviorSettings.m_scrollWheelZooming);
-    d->m_ui.constrainTooltips->setChecked(behaviorSettings.m_constrainHoverTooltips);
+    d->m_ui.constrainTooltipsBox->setCurrentIndex(behaviorSettings.m_constrainHoverTooltips ? 1 : 0);
     d->m_ui.camelCaseNavigation->setChecked(behaviorSettings.m_camelCaseNavigation);
     d->m_ui.keyboardTooltips->setChecked(behaviorSettings.m_keyboardTooltips);
+    updateConstrainTooltipsBoxTooltip();
 }
 
 void BehaviorSettingsWidget::assignedBehaviorSettings(BehaviorSettings *behaviorSettings) const
 {
     behaviorSettings->m_mouseNavigation = d->m_ui.mouseNavigation->isChecked();
     behaviorSettings->m_scrollWheelZooming = d->m_ui.scrollWheelZooming->isChecked();
-    behaviorSettings->m_constrainHoverTooltips = d->m_ui.constrainTooltips->isChecked();
+    behaviorSettings->m_constrainHoverTooltips = (d->m_ui.constrainTooltipsBox->currentIndex() == 1);
     behaviorSettings->m_camelCaseNavigation = d->m_ui.camelCaseNavigation->isChecked();
     behaviorSettings->m_keyboardTooltips = d->m_ui.keyboardTooltips->isChecked();
 }
@@ -223,7 +232,9 @@ QString BehaviorSettingsWidget::collectUiKeywords() const
         << sep << d->m_ui.utf8BomLabel->text()
         << sep << d->m_ui.mouseNavigation->text()
         << sep << d->m_ui.scrollWheelZooming->text()
-        << sep << d->m_ui.constrainTooltips->text()
+        << sep << d->m_ui.helpTooltipsLabel->text()
+        << sep << d->m_ui.constrainTooltipsBox->itemText(0)
+        << sep << d->m_ui.constrainTooltipsBox->itemText(1)
         << sep << d->m_ui.camelCaseNavigation->text()
         << sep << d->m_ui.keyboardTooltips->text()
         << sep << d->m_ui.groupBoxStorageSettings->title()
@@ -251,6 +262,7 @@ void BehaviorSettingsWidget::slotBehaviorSettingsChanged()
 {
     BehaviorSettings settings;
     assignedBehaviorSettings(&settings);
+    updateConstrainTooltipsBoxTooltip();
     emit behaviorSettingsChanged(settings);
 }