aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issue with translation of tool groups.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2024-01-18 18:16:03 +02:00
parent 27e07d16f2
commit 717225ce03
2 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/libs/vwidgets/vtoolbuttonpopup.cpp
View File

@ -28,19 +28,41 @@
#include "vtoolbuttonpopup.h" #include "vtoolbuttonpopup.h"
#include <QAction> #include <QAction>
#include <QEvent>
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
VToolButtonPopup::VToolButtonPopup(QWidget *parent) VToolButtonPopup::VToolButtonPopup(QWidget *parent)
: QToolButton(parent) : QToolButton(parent)
{ {
setPopupMode(QToolButton::MenuButtonPopup); setPopupMode(QToolButton::MenuButtonPopup);
QObject::connect(this, &QToolButton::triggered, this, QObject::connect(this, &QToolButton::triggered, this, [this](QAction *action) { setDefaultAction(action); });
[this](QAction *action) }
{
setDefaultAction(action); //---------------------------------------------------------------------------------------------------------------------
if (!m_toolGroupTooltip.isEmpty()) void VToolButtonPopup::SetToolGroupTooltip(const QString &toolGroupTooltip)
{ {
setToolTip(m_toolGroupTooltip); m_toolGroupTooltip = toolGroupTooltip;
} CorrectToolTip();
}); }
//---------------------------------------------------------------------------------------------------------------------
auto VToolButtonPopup::event(QEvent *event) -> bool
{
if (event->type() == QEvent::ToolTipChange && !handlingToolTipChange)
{
handlingToolTipChange = true;
CorrectToolTip();
handlingToolTipChange = false;
}
return QToolButton::event(event);
}
//---------------------------------------------------------------------------------------------------------------------
void VToolButtonPopup::CorrectToolTip()
{
if (!m_toolGroupTooltip.isEmpty())
{
setToolTip(QStringLiteral("<b><i>%1</i></b>:<br/>%2").arg(m_toolGroupTooltip, toolTip()));
}
} }

12
src/libs/vwidgets/vtoolbuttonpopup.h
View File

@ -45,10 +45,16 @@ public:
auto GetToolGroupTooltip() const -> QString; auto GetToolGroupTooltip() const -> QString;
void SetToolGroupTooltip(const QString &toolGroupTooltip); void SetToolGroupTooltip(const QString &toolGroupTooltip);
protected:
auto event(QEvent *event) -> bool override;
private: private:
Q_DISABLE_COPY_MOVE(VToolButtonPopup) // NOLINT Q_DISABLE_COPY_MOVE(VToolButtonPopup) // NOLINT
QString m_toolGroupTooltip{}; QString m_toolGroupTooltip{};
bool handlingToolTipChange{false};
void CorrectToolTip();
}; };
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -57,10 +63,4 @@ inline auto VToolButtonPopup::GetToolGroupTooltip() const -> QString
return m_toolGroupTooltip; return m_toolGroupTooltip;
} }
//---------------------------------------------------------------------------------------------------------------------
inline void VToolButtonPopup::SetToolGroupTooltip(const QString &toolGroupTooltip)
{
m_toolGroupTooltip = toolGroupTooltip;
}
#endif // VTOOLBUTTONPOPUP_H #endif // VTOOLBUTTONPOPUP_H