Skip to content

SG-40349 - Use tooltip from toolbar-set-disabled-prefix event in RvTopViewToolBar.cpp #995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

SG-40349 - Use tooltip from toolbar-set-disabled-prefix event in RvTopViewToolBar.cpp #995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/lib/app/RvCommon/RvBottomViewToolBar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 1 addition & 0 deletions src/lib/app/RvCommon/RvCommon/RvTopViewToolBar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ namespace Rv

private:
IPCore::Session* m_session;
QString m_customDisabledPrefix;
QAction* m_viewBackAction;
QAction* m_viewForwardAction;
QComboBox* m_viewCombo;
Expand Down
2 changes: 0 additions & 2 deletions src/lib/app/RvCommon/RvDocument.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
19 changes: 16 additions & 3 deletions src/lib/app/RvCommon/RvTopViewToolBar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Expand Down Expand Up @@ -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);
}
}
}
}
Expand Down
Loading