r19329 by jghali - comment out some code now useless since main window HaveNewSel() is now triggered by doc selection changes

scribus-commit scribus-commit at lists.scribus.net
Mon Jul 7 21:25:17 UTC 2014


Author: jghali
Date: Mon Jul  7 21:25:17 2014
New Revision: 19329

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19329
Log:
comment out some code now useless since main window HaveNewSel() is now triggered by doc selection changes

Modified:
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19329&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Mon Jul  7 21:25:17 2014
@@ -5315,22 +5315,20 @@
 					doc->m_Selection->addItem(currItem);
 				}
 				doc->m_Selection->delaySignalsOff();
-				int docSelectionCount=doc->m_Selection->count();
-				if (docSelectionCount > 0)
+				int docSelectionCount = doc->m_Selection->count();
+				// Already done by selection delaySignalsOff()
+				/*if (docSelectionCount > 0)
 				{
 					doc->m_Selection->itemAt(0)->connectToGUI();
 					doc->m_Selection->itemAt(0)->emitAllToGUI();
-				}
+				}*/
 				if (docSelectionCount > 1)
 				{
 					doc->m_Selection->setGroupRect();
-					//double x, y, w, h; //CHECKME
-					//doc->m_Selection->getGroupRect(&x, &y, &w, &h);
-					//propertiesPalette->setXY(x, y);
-					//propertiesPalette->setBH(w, h);
 				}
-				if (docSelectionCount > 0)
-					HaveNewSel();
+				// Done via Selection selectionChanged() signal
+				/*if (docSelectionCount > 0)
+					HaveNewSel();*/
 			}
 			view->DrawNew();
 		}
@@ -5410,22 +5408,17 @@
 		}
 		doc->m_Selection->delaySignalsOff();
 		int docSelectionCount = doc->m_Selection->count();
-		if (docSelectionCount > 0)
+		// Already done by selection delaySignalsOff()
+		/*if (docSelectionCount > 0)
 		{
 			doc->m_Selection->itemAt(0)->connectToGUI();
 			doc->m_Selection->itemAt(0)->emitAllToGUI();
-		}
+		}*/
 		if (docSelectionCount > 1)
-		{
-			double x, y, w, h;
 			doc->m_Selection->setGroupRect();
-			doc->m_Selection->getGroupRect(&x, &y, &w, &h);
-			//Now unuseful as PropertiesPalette_XYZ::setCurrentItem() handles multiple selection
-			//propertiesPalette->setXY(x, y);
-			//propertiesPalette->setBH(w, h);
-		}
-		if (docSelectionCount > 0)
-			HaveNewSel();
+		// Done via Selection selectionChanged() signal
+		/*if (docSelectionCount > 0)
+			HaveNewSel();*/
 		view->DrawNew();
 	}
 	delete dia;
@@ -5477,22 +5470,17 @@
 		}
 		doc->m_Selection->delaySignalsOff();
 		int docSelectionCount=doc->m_Selection->count();
-		if (docSelectionCount > 0)
+		// Already done by selection delaySignalsOff()
+		/*if (docSelectionCount > 0)
 		{
 			doc->m_Selection->itemAt(0)->connectToGUI();
 			doc->m_Selection->itemAt(0)->emitAllToGUI();
-		}
+		}*/
 		if (docSelectionCount > 1)
-		{
-			//double x, y, w, h; //CHECKME
 			doc->m_Selection->setGroupRect();
-			//doc->m_Selection->getGroupRect(&x, &y, &w, &h);
-			//Now unuseful as PropertiesPalette_XYZ::setCurrentItem() handles multiple selection
-			//propertiesPalette->setXY(x, y);
-			//propertiesPalette->setBH(w, h);
-		}
-		if (docSelectionCount > 0)
-			HaveNewSel();
+		// Done via Selection selectionChanged() signal
+		/* if (docSelectionCount > 0)
+			HaveNewSel();*/
 	}
 	view->DrawNew();
 }




More information about the scribus-commit mailing list