From 2f087980729231b9d3c3d866e6b4a1cba1ec1f2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Haris=20Gu=C5=A1i=C4=87?= Date: Sun, 8 Aug 2021 19:58:19 +0200 Subject: [PATCH] Show shortcuts in CaptureToolButton tooltips (#1811) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Show shortcuts in CaptureToolButton tooltips Signed-off-by: Haris Gušić * Change size indicator tooltip to reduce ambiguity --- src/tools/sizeindicator/sizeindicatortool.cpp | 2 +- src/widgets/capture/capturetoolbutton.cpp | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/tools/sizeindicator/sizeindicatortool.cpp b/src/tools/sizeindicator/sizeindicatortool.cpp index 55c852db..1fde4b3d 100644 --- a/src/tools/sizeindicator/sizeindicatortool.cpp +++ b/src/tools/sizeindicator/sizeindicatortool.cpp @@ -30,7 +30,7 @@ ToolType SizeIndicatorTool::type() const QString SizeIndicatorTool::description() const { - return tr("Show the dimensions of the selection (X Y)"); + return tr("Show X and Y dimensions of the selection"); } CaptureTool* SizeIndicatorTool::copy(QObject* parent) diff --git a/src/widgets/capture/capturetoolbutton.cpp b/src/widgets/capture/capturetoolbutton.cpp index c3788e52..8f0782c0 100644 --- a/src/widgets/capture/capturetoolbutton.cpp +++ b/src/widgets/capture/capturetoolbutton.cpp @@ -58,7 +58,14 @@ void CaptureToolButton::initButton() GlobalValues::buttonBaseSize() + 2), QRegion::Ellipse)); - setToolTip(m_tool->description()); + // Set a tooltip showing a shortcut in parentheses (if there is a shortcut) + QString tooltip = m_tool->description(); + QString shortcut = + ConfigHandler().shortcut(QVariant::fromValue(m_buttonType).toString()); + if (!shortcut.isEmpty()) { + tooltip += QString(" (%1)").arg(shortcut); + } + setToolTip(tooltip); m_emergeAnimation = new QPropertyAnimation(this, "size", this); m_emergeAnimation->setEasingCurve(QEasingCurve::InOutQuad);