r19081 by jghali - #12235: "Close this Bezier Curves " should be clickable when a Bezier Curve has 3+ nodes
scribus-commit
scribus-commit at lists.scribus.net
Wed Apr 23 06:24:08 UTC 2014
Author: jghali
Date: Wed Apr 23 06:24:07 2014
New Revision: 19081
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19081
Log:
#12235: "Close this Bezier Curves " should be clickable when a Bezier Curve has 3+ nodes
Modified:
branches/Version14x/Scribus/scribus/canvasmode_nodeedit.cpp
branches/Version14x/Scribus/scribus/scribus.cpp
branches/Version14x/Scribus/scribus/scribusview.h
Modified: branches/Version14x/Scribus/scribus/canvasmode_nodeedit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19081&path=/branches/Version14x/Scribus/scribus/canvasmode_nodeedit.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/canvasmode_nodeedit.cpp (original)
+++ branches/Version14x/Scribus/scribus/canvasmode_nodeedit.cpp Wed Apr 23 06:24:07 2014
@@ -847,6 +847,7 @@
currItem->FrameType = 3;
m_doc->AdjustItemSize(currItem);
currItem->update();
+ emit m_view->PolyStatus(currItem->itemType(), currItem->PoLine.size());
}
if ((m_doc->nodeEdit.SelNode.count() != 0) || ((m_doc->nodeEdit.SegP1 != -1) && (m_doc->nodeEdit.SegP2 != -1)) || (m_doc->nodeEdit.hasNodeSelected() && (!m_doc->nodeEdit.EdPoints)))
{
Modified: branches/Version14x/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19081&path=/branches/Version14x/Scribus/scribus/scribus.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scribus.cpp (original)
+++ branches/Version14x/Scribus/scribus/scribus.cpp Wed Apr 23 06:24:07 2014
@@ -6329,6 +6329,7 @@
nodePalette->show();
// qDebug() << "nodepalette show:" << nodePalette->geometry();
connect(view, SIGNAL(HavePoint(bool, bool)), nodePalette, SLOT(HaveNode(bool, bool)));
+ connect(view, SIGNAL(PolyStatus(int, uint)), nodePalette, SLOT(PolyStatus(int, uint)));
doc->nodeEdit.reset();
//done elsewhere now doc->appMode = modeEditClip;
scrActions["toolsSelect"]->setEnabled(false);
@@ -6404,6 +6405,7 @@
void ScribusMainWindow::NoFrameEdit()
{
disconnect(view, SIGNAL(HavePoint(bool, bool)), nodePalette, SLOT(HaveNode(bool, bool)));
+ disconnect(view, SIGNAL(PolyStatus(int, uint)), nodePalette, SLOT(PolyStatus(int, uint)));
actionManager->disconnectModeActions();
nodePalette->setDoc(0,0);
nodePalette->hide();
Modified: branches/Version14x/Scribus/scribus/scribusview.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19081&path=/branches/Version14x/Scribus/scribus/scribusview.h
==============================================================================
--- branches/Version14x/Scribus/scribus/scribusview.h (original)
+++ branches/Version14x/Scribus/scribus/scribusview.h Wed Apr 23 06:24:07 2014
@@ -453,6 +453,7 @@
void LevelChanged(uint);
void HavePoint(bool, bool);
void ClipPo(double, double);
+ void PolyStatus(int, uint);
void AnnotProps();
void EndNodeEdit();
void Hrule(int);
More information about the scribus-commit
mailing list