r18477 by fschmid - Additional fixes for Bug #11730: copying from first page wasn't correct

[scribus-commit]

Author: fschmid
Date: Sat Sep 14 07:28:08 2013
New Revision: 18477

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18477
Log:
Additional fixes for Bug #11730: copying from first page wasn't correct

Modified:
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribusXml.cpp
    trunk/Scribus/scribus/ui/contextmenu.cpp

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18477&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp Sat Sep 14 07:28:08 2013
@@ -184,8 +184,8 @@
 	LayerToPaste = toLayer;
 	Xp = Xp_in;
 	Yp = Yp_in;
-//	GrX = 0.0;
-//	GrY = 0.0;
+	GrX = 0.0;
+	GrY = 0.0;
 
 	QMap<int,PageItem*> TableID;
 	QMap<int,PageItem*> TableIDM;

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18477&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sat Sep 14 07:28:08 2013
@@ -3600,7 +3600,7 @@
 			if ((view->dragX == 0) && (view->dragY == 0))
 				slotElemRead(data, doc->currentPage()->xOffset(), doc->currentPage()->yOffset(), true, true, doc, view);
 			else
-				slotElemRead(data, view->dragX, view->dragY, true, true, doc, view);
+				slotElemRead(data, view->dragX, view->dragY, true, false, doc, view);
 			doc->SnapGrid = savedAlignGrid;
 			doc->SnapGuides = savedAlignGuides;
 			doc->SnapElement = savedAlignElement;

Modified: trunk/Scribus/scribus/scribusXml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18477&path=/trunk/Scribus/scribus/scribusXml.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusXml.cpp (original)
+++ trunk/Scribus/scribus/scribusXml.cpp Sat Sep 14 07:28:08 2013
@@ -209,7 +209,7 @@
 		painter->restore();
 	}
 	int pg = doc->OnPage(xp + wp / 2.0, yp + hp / 2.0);
-	if (pg > 0)
+	if (pg > -1)
 	{
 		xp = xp - doc->getXOffsetForPage(pg);
 		yp = yp - doc->getYOffsetForPage(pg);

Modified: trunk/Scribus/scribus/ui/contextmenu.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18477&path=/trunk/Scribus/scribus/ui/contextmenu.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/contextmenu.cpp (original)
+++ trunk/Scribus/scribus/ui/contextmenu.cpp Sat Sep 14 07:28:08 2013
@@ -517,7 +517,7 @@
 	{
 		m_doc->view()->dragX = mx;
 		m_doc->view()->dragY = my;
-		addAction( ScribusView::tr("&Paste") , m_doc->view(), SLOT(PasteToPage()));
+		addAction( ScribusView::tr("&Paste Here") , m_doc->view(), SLOT(PasteToPage()));
 	}
 	if (m_ScMW->scrRecentPasteActions.count()>0)
 	{