Skip to content
Permalink
Browse files
Include a workaround for bug in KDE Qt5 plugin on Linux
Bug was keeping plugins from being launched from the menu because ampersands were being injected into the text returned from action->text(). Use toolTip() in those rare cases.
  • Loading branch information
dougmassay committed Nov 8, 2016
1 parent e9e00bf commit 0fb7ebfb61eee4832c14f1de98aa4187871aed61
Showing with 12 additions and 0 deletions.
  1. +2 −0 ChangeLog.txt
  2. +10 −0 src/MainUI/MainWindow.cpp
@@ -3,6 +3,8 @@ preSigil-0.9.8
- Make sure when new empty epub3's are created that the toc does not use a doctype (Issue # 250)
- Make GetUniqueFilenameVersion work even on Case-Insensitive filesystems (Issue #247)
- Properly urlencode/decode all hrefs in plugin's ResultXML in launcher/PluginRunner to prevent parse errors
- Add proper detection for minimum service pack requirements in Windows installer
- Include workaround for bug in KDE Qt5 plugin on Linux that keep plugins from launching from menu

Sigil-0.9.7
Bug Fixes
@@ -322,6 +322,16 @@ void MainWindow::unloadPluginsMenu()
void MainWindow::runPlugin(QAction *action)
{
QString pname = action->text();
#if !defined(Q_OS_WIN32) && !defined(Q_OS_MAC)
// Workaround for a bug in the KDE Qt5 plugin that injects accelerator shortcuts
// into QAction->text(). So return the toolTip() text in those cases where it
// differs from text(). Everybody else uses text().
// https://bugs.kde.org/show_bug.cgi?format=multiple&id=345023
QString altname = action->toolTip();
if (pname != altname && !altname.isEmpty()) {
pname = altname;
}
#endif
PluginRunner prunner(m_TabManager, this);
prunner.exec(pname);
}

0 comments on commit 0fb7ebf

Please sign in to comment.