From 1bf5056847c20383f59e14917c869d4a9a6dfee0 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 1 Mar 2012 19:42:07 +0100 Subject: [PATCH] Editor help tool tip options cleanup. Change-Id: I3afa91d95bc92f5bd2879f32ca7ab7ff86b97714 Reviewed-by: Leena Miettinen Reviewed-by: David Schulz Reviewed-by: Eike Ziller --- .../texteditor/behaviorsettingspage.ui | 6 ++ .../texteditor/behaviorsettingswidget.cpp | 26 ++++-- .../texteditor/behaviorsettingswidget.h | 2 + .../texteditor/behaviorsettingswidget.ui | 80 +++++++++++++------ 4 files changed, 84 insertions(+), 30 deletions(-) diff --git a/src/plugins/texteditor/behaviorsettingspage.ui b/src/plugins/texteditor/behaviorsettingspage.ui index d2773135e53..0ff81ee3a0c 100644 --- a/src/plugins/texteditor/behaviorsettingspage.ui +++ b/src/plugins/texteditor/behaviorsettingspage.ui @@ -14,6 +14,12 @@ Form + + 0 + + + 0 + diff --git a/src/plugins/texteditor/behaviorsettingswidget.cpp b/src/plugins/texteditor/behaviorsettingswidget.cpp index 4d954544edf..9bd9b8c4c71 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); } diff --git a/src/plugins/texteditor/behaviorsettingswidget.h b/src/plugins/texteditor/behaviorsettingswidget.h index 486a22b7c67..53c30fd0c22 100644 --- a/src/plugins/texteditor/behaviorsettingswidget.h +++ b/src/plugins/texteditor/behaviorsettingswidget.h @@ -95,6 +95,8 @@ private slots: void slotEncodingBoxChanged(int index); private: + void updateConstrainTooltipsBoxTooltip() const; + BehaviorSettingsWidgetPrivate *d; }; diff --git a/src/plugins/texteditor/behaviorsettingswidget.ui b/src/plugins/texteditor/behaviorsettingswidget.ui index 7cdbc4f39e0..60ea6a35cd8 100644 --- a/src/plugins/texteditor/behaviorsettingswidget.ui +++ b/src/plugins/texteditor/behaviorsettingswidget.ui @@ -7,7 +7,7 @@ 0 0 802 - 441 + 416 @@ -276,13 +276,6 @@ Specifies how backspace interacts with indentation. - - - - UTF-8 BOM: - - - @@ -311,6 +304,13 @@ Specifies how backspace interacts with indentation. + + + + UTF-8 BOM: + + + @@ -334,20 +334,6 @@ Specifies how backspace interacts with indentation. - - - - Enable hover &tooltips only when Shift key is down - - - - - - - Enable &keyboard tooltips when pressing and releasing the Alt key - - - @@ -355,6 +341,54 @@ Specifies how backspace interacts with indentation. + + + + + + Show help tooltips: + + + + + + + + On Mouseover + + + + + On Shift+Mouseover + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Press Alt to display context-sensitive help or type information as tooltips. + + + Using keyboard shortcut (Alt) + + + + + @@ -366,7 +400,7 @@ Specifies how backspace interacts with indentation. 20 - 10 + 40