Author: jghali
Date: Sat Nov 16 03:25:38 2019
New Revision: 23366
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23366
Log:
#15953: Wrong error message when linking already linked text
Modified:
trunk/Scribus/scribus/canvasmode_framelinks.cpp
Modified: trunk/Scribus/scribus/canvasmode_framelinks.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23366&path=/trunk/Scribus/scribus/canvasmode_framelinks.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_framelinks.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_framelinks.cpp Sat Nov 16 03:25:38 2019
@@ -275,6 +275,13 @@
ScMessageBox::warning(m_view,
tr("Linking Text Frames"),
"<qt>" + tr("You are trying to link a frame to itself.") + "</qt>");
}
+ else if (currItem->nextInChain() != nullptr)
+ {
+ //CB Mouse is released when this
messagebox takes focus
+
m_canvas->m_viewMode.m_MouseButtonPressed = false;
+ ScMessageBox::warning(m_view,
tr("Linking Text Frames"),
+
"<qt>" + tr("Frame is already linked. Unlink it before linking it to another
frame.") + "</qt>");
+ }
else
{
//CB Mouse is released when this
messagebox takes focus
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
