r19391 by craig - #12577: Remove annoying one click dialog, code remains with #12577 comments

[scribus-commit]

Author: craig
Date: Thu Jul 31 20:01:13 2014
New Revision: 19391

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19391
Log:
#12577: Remove annoying one click dialog, code remains with #12577 comments

Modified:
    trunk/Scribus/scribus/canvasmode_create.cpp
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/canvasmode_create.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19391&path=/trunk/Scribus/scribus/canvasmode_create.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_create.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_create.cpp Thu Jul 31 20:01:13 2014
@@ -879,17 +879,16 @@
 		ySize = sizes->getDouble("defAngle", 0.0);
 		originPoint = sizes->getInt("OriginL", 0);
 	}
-
-//	qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
-	OneClick *dia = new OneClick(m_view, ScribusView::tr("Enter Object Size"), m_doc->unitIndex(), xSize, ySize, doRemember, originPoint, lmode);
-	if (dia->exec())
-	{
-		doRemember = dia->checkRemember->isChecked();
+	//#12577 Remove one click dialog
+	//#12577 OneClick *dia = new OneClick(m_view, ScribusView::tr("Enter Object Size"), m_doc->unitIndex(), xSize, ySize, doRemember, originPoint, lmode);
+	//#12577 if (dia->exec())
+	{
+		//#12577 doRemember = dia->checkRemember->isChecked();
 		if (lmode == 0)
 		{
-			xSize = dia->spinWidth->value() / unitGetRatioFromIndex(m_doc->unitIndex());
-			ySize = dia->spinHeight->value() / unitGetRatioFromIndex(m_doc->unitIndex());
-			originPoint = dia->RotationGroup->checkedId();
+			//#12577 xSize = dia->spinWidth->value() / unitGetRatioFromIndex(m_doc->unitIndex());
+			//#12577 ySize = dia->spinHeight->value() / unitGetRatioFromIndex(m_doc->unitIndex());
+			//#12577 originPoint = dia->RotationGroup->checkedId();
 			if (doRemember)
 			{
 				sizes->set("defWidth", xSize);
@@ -922,9 +921,9 @@
 		else
 		{
 			FPoint oldStart = startPoint;
-			xSize = dia->spinWidth->value() / unitGetRatioFromIndex(m_doc->unitIndex());
-			ySize = dia->spinHeight->value();
-			originPoint = dia->RotationGroup->checkedId();
+			//#12577 xSize = dia->spinWidth->value() / unitGetRatioFromIndex(m_doc->unitIndex());
+			//#12577 ySize = dia->spinHeight->value();
+			//#12577 originPoint = dia->RotationGroup->checkedId();
 			if (doRemember)
 			{
 				sizes->set("defLength", xSize);
@@ -950,7 +949,7 @@
 		sizes->set("Remember", doRemember);
 		doCreate = true;
 	}
-	delete dia;
+	//delete dia;
 	return doCreate;
 }
 

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19391&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Thu Jul 31 20:01:13 2014
@@ -2642,19 +2642,15 @@
 
 void ScribusMainWindow::HaveNewSel()
 {
+	if (doc == NULL)
+		return;
 	int SelectedType = -1;
 	PageItem *currItem = NULL;
-	if (doc == NULL)
-		return;
 	const uint docSelectionCount = doc->m_Selection->count();
 	if (docSelectionCount > 0)
 	{
 		currItem = doc->m_Selection->itemAt(0);
 		SelectedType = currItem->itemType();
-	}
-	else
-	{
-		SelectedType = -1;
 	}
 	assert (docSelectionCount == 0 || currItem != NULL); // help coverity analysis