r19308 by craig - #11938: Tidy up. Potentially more to do but good for now.

[scribus-commit]

Author: craig
Date: Wed Jul  2 19:14:08 2014
New Revision: 19308

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19308
Log:
#11938: Tidy up. Potentially more to do but good for now.

Modified:
    trunk/Scribus/scribus/canvasmode_edittable.cpp
    trunk/Scribus/scribus/pageitem_table.cpp
    trunk/Scribus/scribus/scribusview.h
    trunk/Scribus/scribus/ui/contextmenu.cpp

Modified: trunk/Scribus/scribus/canvasmode_edittable.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19308&path=/trunk/Scribus/scribus/canvasmode_edittable.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edittable.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_edittable.cpp Wed Jul  2 19:14:08 2014
@@ -249,7 +249,7 @@
 	{
 		// Show the table popup menu.
 		//m_view->m_ScMW->scrMenuMgr->runMenuAtPos("ItemTable", event->globalPos());
-		const FPoint mousePointDoc = m_canvas->globalToCanvas(event->globalPos());
+		const FPoint mousePointDoc(m_canvas->globalToCanvas(event->globalPos()));
 		createContextMenu(m_table, mousePointDoc.x(), mousePointDoc.y());
 	}
 }
@@ -385,14 +385,13 @@
 {
 	ContextMenu* cmen=NULL;
 	m_view->setCursor(QCursor(Qt::ArrowCursor));
-//	Mxp = mx;
-//	Myp = my;
+	m_view->setObjectUndoMode();
 	if(currItem!=NULL)
 		cmen = new ContextMenu(*(m_doc->m_Selection), m_ScMW, m_doc);
 	else
 		cmen = new ContextMenu(m_ScMW, m_doc, mx, my);
 	if (cmen)
 		cmen->exec(QCursor::pos());
-//	m_view->setGlobalUndoMode();
+	m_view->setGlobalUndoMode();
 	delete cmen;
 }

Modified: trunk/Scribus/scribus/pageitem_table.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19308&path=/trunk/Scribus/scribus/pageitem_table.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_table.cpp (original)
+++ trunk/Scribus/scribus/pageitem_table.cpp Wed Jul  2 19:14:08 2014
@@ -898,13 +898,6 @@
 		actionList << "tableDistributeColumnsEvenly";
 	actionList << "tableAdjustFrameToTable";
 	actionList << "tableAdjustTableToFrame";
-
-	if (tableEdit)
-	{
-		actionList << "editClearContents";
-		actionList << "editCopyContents";
-		actionList << "editPasteContents";
-	}
 }
 
 void PageItem_Table::DrawObj_Item(ScPainter *p, QRectF /*e*/)

Modified: trunk/Scribus/scribus/scribusview.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19308&path=/trunk/Scribus/scribus/scribusview.h
==============================================================================
--- trunk/Scribus/scribus/scribusview.h (original)
+++ trunk/Scribus/scribus/scribusview.h Wed Jul  2 19:14:08 2014
@@ -97,6 +97,7 @@
 	friend class CanvasMode_EditGradient;
 	friend class CanvasMode_EditMeshGradient;
 	friend class CanvasMode_EditMeshPatch;
+	friend class CanvasMode_EditTable;
 	friend class CanvasMode_EditWeldPoint;
 	friend class CanvasMode_EditPolygon;
 	friend class CanvasMode_EditArc;

Modified: trunk/Scribus/scribus/ui/contextmenu.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19308&path=/trunk/Scribus/scribus/ui/contextmenu.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/contextmenu.cpp (original)
+++ trunk/Scribus/scribus/ui/contextmenu.cpp Wed Jul  2 19:14:08 2014
@@ -498,7 +498,7 @@
 		menuEdit->addAction(m_ScMW->scrActions["editCopy"]);
 	if (((m_doc->appMode == modeEdit && currItem->itemType() == PageItem::TextFrame) || (m_doc->appMode == modeEditTable && currItem->itemType() == PageItem::Table)) && (ScMimeData::clipboardHasScribusText()||ScMimeData::clipboardHasPlainText()) )
 		menuEdit->addAction(m_ScMW->scrActions["editPaste"]);
-	if (!currItem->locked() && (m_doc->appMode != modeEdit) && (!(currItem->isSingleSel)))
+	if (!currItem->locked() && (m_doc->appMode != modeEdit)  && (m_doc->appMode != modeEditTable) && (!(currItem->isSingleSel)))
 		menuEdit->addAction(m_ScMW->scrActions["itemDelete"]);
 	//-->
 	//<-- Add undo