From b88499dc66118b0943e39fe70ef9b753a2aa735d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9drik=20Fuoco?= Date: Thu, 20 Nov 2025 10:30:07 -0500 Subject: [PATCH] remove some comments and add missing handling of toolbar-set-disabled-prefix in RV Top toolbar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cédrik Fuoco --- src/lib/app/RvCommon/RvBottomViewToolBar.cpp | 1 - .../app/RvCommon/RvCommon/RvTopViewToolBar.h | 1 + src/lib/app/RvCommon/RvDocument.cpp | 2 -- src/lib/app/RvCommon/RvTopViewToolBar.cpp | 19 ++++++++++++++++--- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/lib/app/RvCommon/RvBottomViewToolBar.cpp b/src/lib/app/RvCommon/RvBottomViewToolBar.cpp index 68ff55c2e..71fbc8c5f 100644 --- a/src/lib/app/RvCommon/RvBottomViewToolBar.cpp +++ b/src/lib/app/RvCommon/RvBottomViewToolBar.cpp @@ -467,7 +467,6 @@ namespace Rv } else if (name == "event-category-state-changed") { - // Update action availability when presenter changes or session mode changes updateActionAvailability(); } else if (name == "toolbar-set-cannot-use-tooltip") diff --git a/src/lib/app/RvCommon/RvCommon/RvTopViewToolBar.h b/src/lib/app/RvCommon/RvCommon/RvTopViewToolBar.h index f0400eab3..2aa8932f5 100644 --- a/src/lib/app/RvCommon/RvCommon/RvTopViewToolBar.h +++ b/src/lib/app/RvCommon/RvCommon/RvTopViewToolBar.h @@ -145,6 +145,7 @@ namespace Rv private: IPCore::Session* m_session; + QString m_customDisabledPrefix; QAction* m_viewBackAction; QAction* m_viewForwardAction; QComboBox* m_viewCombo; diff --git a/src/lib/app/RvCommon/RvDocument.cpp b/src/lib/app/RvCommon/RvDocument.cpp index a3b6fbd1b..eba1a1dc7 100644 --- a/src/lib/app/RvCommon/RvDocument.cpp +++ b/src/lib/app/RvCommon/RvDocument.cpp @@ -282,8 +282,6 @@ namespace Rv // // Create UI blocking overlay - transparent widget that captures all input - // Used during presenter transitions in Live Review to prevent interaction - // without closing panels // m_blockingOverlay = new QWidget(this); m_blockingOverlay->setObjectName("UIBlockingOverlay"); diff --git a/src/lib/app/RvCommon/RvTopViewToolBar.cpp b/src/lib/app/RvCommon/RvTopViewToolBar.cpp index 20e26d8dd..58083dbe5 100644 --- a/src/lib/app/RvCommon/RvTopViewToolBar.cpp +++ b/src/lib/app/RvCommon/RvTopViewToolBar.cpp @@ -515,7 +515,11 @@ namespace Rv } else if (name == "event-category-state-changed") { - // Update action availability when presenter changes or session mode changes + updateActionAvailability(); + } + else if (name == "toolbar-set-disabled-prefix") + { + m_customDisabledPrefix = QString::fromUtf8(contents.c_str()); updateActionAvailability(); } } @@ -1391,8 +1395,17 @@ namespace Rv bool categoryEnabled = m_session->isEventCategoryEnabled(mapping.category); mapping.action->setEnabled(categoryEnabled); - mapping.action->setToolTip(categoryEnabled ? mapping.defaultTooltip - : QString("You must be presenter to use ") + mapping.defaultTooltip); + if (categoryEnabled) + { + mapping.action->setToolTip(mapping.defaultTooltip); + } + else + { + QString tooltip = m_customDisabledPrefix.isEmpty() + ? mapping.defaultTooltip + : m_customDisabledPrefix + mapping.defaultTooltip; + mapping.action->setToolTip(tooltip); + } } } }