From 1ec55792f77eda9d5c031b4788af76173ab132f6 Mon Sep 17 00:00:00 2001 From: Neil Horne Date: Sat, 25 May 2019 18:16:58 +1000 Subject: [PATCH] Add mouseover tool tips to label fields with context menus (#6448) --- companion/src/modeledit/curves.cpp | 1 + companion/src/modeledit/customfunctions.cpp | 1 + companion/src/modeledit/expodialog.cpp | 2 +- companion/src/modeledit/flightmodes.cpp | 1 + companion/src/modeledit/logicalswitches.cpp | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/companion/src/modeledit/curves.cpp b/companion/src/modeledit/curves.cpp index c554fe500..cf3eb9e71 100644 --- a/companion/src/modeledit/curves.cpp +++ b/companion/src/modeledit/curves.cpp @@ -153,6 +153,7 @@ Curves::Curves(QWidget * parent, ModelData & model, GeneralSettings & generalSet edit->setPalette(palette); edit->setText(tr("Curve %1").arg(i+1)); edit->setContextMenuPolicy(Qt::CustomContextMenu); + edit->setToolTip(tr("Popup menu available")); connect(edit, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(ShowContextMenu(const QPoint&))); connect(edit, SIGNAL(clicked()), this, SLOT(editCurve())); if (isetContextMenuPolicy(Qt::CustomContextMenu); + label->setToolTip(tr("Popup menu available")); label->setMouseTracking(true); label->setProperty("index", i); if (model) diff --git a/companion/src/modeledit/expodialog.cpp b/companion/src/modeledit/expodialog.cpp index b82da1028..0745f5c84 100644 --- a/companion/src/modeledit/expodialog.cpp +++ b/companion/src/modeledit/expodialog.cpp @@ -75,7 +75,7 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, G } } else { - ui->label_phases->setToolTip(tr("Click to access popup menu")); + ui->label_phases->setToolTip(tr("Popup menu available")); ui->label_phases->setContextMenuPolicy(Qt::CustomContextMenu); connect(ui->label_phases, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(label_phases_customContextMenuRequested(const QPoint &))); int mask = 1; diff --git a/companion/src/modeledit/flightmodes.cpp b/companion/src/modeledit/flightmodes.cpp index 07d77de41..e1b01c1a9 100644 --- a/companion/src/modeledit/flightmodes.cpp +++ b/companion/src/modeledit/flightmodes.cpp @@ -36,6 +36,7 @@ FlightModePanel::FlightModePanel(QWidget * parent, ModelData & model, int phaseI ui->setupUi(this); ui->labelName->setContextMenuPolicy(Qt::CustomContextMenu); + ui->labelName->setToolTip(tr("Popup menu available")); connect(ui->labelName, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(name_customContextMenuRequested(const QPoint &))); int modesCount = firmware->getCapability(FlightModes); diff --git a/companion/src/modeledit/logicalswitches.cpp b/companion/src/modeledit/logicalswitches.cpp index c9754fbd0..aa2081fd1 100644 --- a/companion/src/modeledit/logicalswitches.cpp +++ b/companion/src/modeledit/logicalswitches.cpp @@ -53,6 +53,7 @@ LogicalSwitchesPanel::LogicalSwitchesPanel(QWidget * parent, ModelData & model, label->setProperty("index", i); label->setText(RawSwitch(SWITCH_TYPE_VIRTUAL, i+1).toString()); label->setContextMenuPolicy(Qt::CustomContextMenu); + label->setToolTip(tr("Popup menu available")); label->setMouseTracking(true); label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum); connect(label, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(csw_customContextMenuRequested(QPoint)));