From a973511351bd2ba3b5d7e511bf4d8a5ffd5cf054 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 20 Aug 2012 11:02:27 +0200 Subject: [PATCH] Have tooltips on the profileconfigwidgets Task-number: QTCREATORBUG-7571 Change-Id: I881c90ebffd33811893db39937a49a3614384d31 Reviewed-by: hjk Reviewed-by: Leena Miettinen --- src/plugins/debugger/debuggerprofileconfigwidget.cpp | 2 ++ .../profileinformationconfigwidget.cpp | 8 ++++++++ .../projectexplorer/profilemanagerconfigwidget.cpp | 11 +++++++++-- .../projectexplorer/profilemanagerconfigwidget.h | 2 +- .../qt4projectmanager/qmakeprofileconfigwidget.cpp | 2 ++ .../qt4projectmanager/qmakeprofileconfigwidget.h | 2 +- src/plugins/qtsupport/qtprofileconfigwidget.cpp | 2 ++ src/plugins/qtsupport/qtprofileconfigwidget.h | 2 +- 8 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/plugins/debugger/debuggerprofileconfigwidget.cpp b/src/plugins/debugger/debuggerprofileconfigwidget.cpp index 2c6a903766b..cc8fa70ee42 100644 --- a/src/plugins/debugger/debuggerprofileconfigwidget.cpp +++ b/src/plugins/debugger/debuggerprofileconfigwidget.cpp @@ -67,6 +67,8 @@ DebuggerProfileConfigWidget::DebuggerProfileConfigWidget(ProjectExplorer::Profil m_info(pi), m_chooser(new Utils::PathChooser) { + setToolTip(tr("The debugger to use for this target.")); + QVBoxLayout *layout = new QVBoxLayout(this); layout->setMargin(0); diff --git a/src/plugins/projectexplorer/profileinformationconfigwidget.cpp b/src/plugins/projectexplorer/profileinformationconfigwidget.cpp index 90ef43b0afd..c354b6f8866 100644 --- a/src/plugins/projectexplorer/profileinformationconfigwidget.cpp +++ b/src/plugins/projectexplorer/profileinformationconfigwidget.cpp @@ -59,6 +59,8 @@ SysRootInformationConfigWidget::SysRootInformationConfigWidget(Profile *p, QWidg ProfileConfigWidget(parent), m_profile(p) { + setToolTip(tr("The root directory of the system image to use.
" + "Leave empty when building for the desktop.")); QHBoxLayout *layout = new QHBoxLayout(this); layout->setMargin(0); m_chooser = new Utils::PathChooser; @@ -110,6 +112,9 @@ ToolChainInformationConfigWidget::ToolChainInformationConfigWidget(Profile *p, Q m_isReadOnly(false), m_profile(p), m_comboBox(new QComboBox), m_manageButton(new QPushButton(this)) { + setToolTip(tr("The tool chain to use for building.
" + "Make sure the tool chains will produce binaries compatible with the target device, " + "Qt version and other libraries used.")); ToolChainManager *tcm = ToolChainManager::instance(); QHBoxLayout *layout = new QHBoxLayout(this); @@ -235,6 +240,7 @@ DeviceTypeInformationConfigWidget::DeviceTypeInformationConfigWidget(Profile *p, m_isReadOnly(false), m_profile(p), m_comboBox(new QComboBox) { + setToolTip(tr("The type of device to run applications on.")); QHBoxLayout *layout = new QHBoxLayout(this); layout->setMargin(0); m_comboBox->setContentsMargins(0, 0, 0, 0); @@ -302,6 +308,8 @@ DeviceInformationConfigWidget::DeviceInformationConfigWidget(Profile *p, QWidget m_comboBox(new QComboBox), m_manageButton(new QPushButton(this)), m_model(new DeviceManagerModel(DeviceManager::instance())) { + setToolTip(tr("The device to run the applications on.")); + QHBoxLayout *layout = new QHBoxLayout(this); layout->setMargin(0); m_comboBox->setContentsMargins(0, 0, 0, 0); diff --git a/src/plugins/projectexplorer/profilemanagerconfigwidget.cpp b/src/plugins/projectexplorer/profilemanagerconfigwidget.cpp index 72d7693b983..5fe8c0d46c3 100644 --- a/src/plugins/projectexplorer/profilemanagerconfigwidget.cpp +++ b/src/plugins/projectexplorer/profilemanagerconfigwidget.cpp @@ -126,11 +126,18 @@ void ProfileManagerConfigWidget::addConfigWidget(ProjectExplorer::ProfileConfigW connect(widget, SIGNAL(dirty()), this, SIGNAL(dirty())); int row = m_layout->rowCount(); - m_layout->addWidget(new QLabel(widget->displayName()), row, 0, + QLabel *label = new QLabel(widget->displayName()); + label->setToolTip(widget->toolTip()); + m_layout->addWidget(label, row, 0, Qt::Alignment(style()->styleHint(QStyle::SH_FormLayoutLabelAlignment))); m_layout->addWidget(widget, row, 1); - if (widget->buttonWidget()) + QWidget *buttonWidget = widget->buttonWidget(); + if (buttonWidget) { + if (buttonWidget->toolTip().isEmpty()) + buttonWidget->setToolTip(widget->toolTip()); m_layout->addWidget(widget->buttonWidget(), row, 2); + } + m_widgets.append(widget); } diff --git a/src/plugins/projectexplorer/profilemanagerconfigwidget.h b/src/plugins/projectexplorer/profilemanagerconfigwidget.h index 36ed444ae7b..62bacb26f5e 100644 --- a/src/plugins/projectexplorer/profilemanagerconfigwidget.h +++ b/src/plugins/projectexplorer/profilemanagerconfigwidget.h @@ -49,7 +49,7 @@ class ProfileManagerConfigWidget : public ProjectExplorer::ProfileConfigWidget Q_OBJECT public: - ProfileManagerConfigWidget(Profile *p, QWidget *parent = 0); + explicit ProfileManagerConfigWidget(Profile *p, QWidget *parent = 0); QString displayName() const; diff --git a/src/plugins/qt4projectmanager/qmakeprofileconfigwidget.cpp b/src/plugins/qt4projectmanager/qmakeprofileconfigwidget.cpp index 40bd08a648d..64adc6ef2d9 100644 --- a/src/plugins/qt4projectmanager/qmakeprofileconfigwidget.cpp +++ b/src/plugins/qt4projectmanager/qmakeprofileconfigwidget.cpp @@ -48,6 +48,8 @@ QmakeProfileConfigWidget::QmakeProfileConfigWidget(ProjectExplorer::Profile *p, m_profile(p), m_lineEdit(new QLineEdit) { + setToolTip(tr("The mkspec to use when building the project with qmake.
" + "This setting is ignored when using other build systems.")); QHBoxLayout *layout = new QHBoxLayout(this); layout->setMargin(0); diff --git a/src/plugins/qt4projectmanager/qmakeprofileconfigwidget.h b/src/plugins/qt4projectmanager/qmakeprofileconfigwidget.h index 4ff400bb77d..32c3ad429c8 100644 --- a/src/plugins/qt4projectmanager/qmakeprofileconfigwidget.h +++ b/src/plugins/qt4projectmanager/qmakeprofileconfigwidget.h @@ -47,7 +47,7 @@ class QmakeProfileConfigWidget : public ProjectExplorer::ProfileConfigWidget Q_OBJECT public: - QmakeProfileConfigWidget(ProjectExplorer::Profile *p, QWidget *parent = 0); + explicit QmakeProfileConfigWidget(ProjectExplorer::Profile *p, QWidget *parent = 0); QString displayName() const; diff --git a/src/plugins/qtsupport/qtprofileconfigwidget.cpp b/src/plugins/qtsupport/qtprofileconfigwidget.cpp index d610b5775f5..d488bb31e0f 100644 --- a/src/plugins/qtsupport/qtprofileconfigwidget.cpp +++ b/src/plugins/qtsupport/qtprofileconfigwidget.cpp @@ -53,6 +53,8 @@ QtProfileConfigWidget::QtProfileConfigWidget(ProjectExplorer::Profile *p, m_combo(new QComboBox), m_manageButton(new QPushButton(this)) { + setToolTip(tr("The Qt library to use for all projects using this profile.
" + "A Qt version is required for qmake-based projects and optional when using other build systems.")); QHBoxLayout *layout = new QHBoxLayout(this); layout->setMargin(0); diff --git a/src/plugins/qtsupport/qtprofileconfigwidget.h b/src/plugins/qtsupport/qtprofileconfigwidget.h index ee3c1e50593..2a0becdafe5 100644 --- a/src/plugins/qtsupport/qtprofileconfigwidget.h +++ b/src/plugins/qtsupport/qtprofileconfigwidget.h @@ -48,7 +48,7 @@ class QtProfileConfigWidget : public ProjectExplorer::ProfileConfigWidget Q_OBJECT public: - QtProfileConfigWidget(ProjectExplorer::Profile *p, QWidget *parent = 0); + explicit QtProfileConfigWidget(ProjectExplorer::Profile *p, QWidget *parent = 0); QString displayName() const;