Mercurial > hg > easaier-soundaccess

changeset 65:78abce641ddf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix the deleteCurrentLayer bug, in PropertyStack file.
author benoitrigolleau
date Tue, 12 Jun 2007 09:20:47 +0000
parents b8be8b0e0c4b
children 429cfea499ad
files sv/main/MainWindow.cpp widgets/PropertyStack.cpp widgets/PropertyStack.h
diffstat 3 files changed, 19 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/sv/main/MainWindow.cpp	Fri Jun 08 13:02:59 2007 +0000
+++ b/sv/main/MainWindow.cpp	Tue Jun 12 09:20:47 2007 +0000
@@ -2725,7 +2725,8 @@
     documentRestored();
     updateMenuStates();
 
-	m_properties = new PropertyStack(0, m_paneStack->getCurrentPane() );
+	m_properties = new PropertyStack(0, m_paneStack->getCurrentPane());
+	connect(m_properties, SIGNAL(removeSelectedItem()), this, SLOT(deleteCurrentLayer())); 
 	m_toolBox->insertItem(0,"Layers", m_properties);
 }
 
@@ -3063,6 +3064,7 @@
 	m_EasaierManager->newSession();
 
 	m_properties = new PropertyStack(0, m_paneStack->getCurrentPane() );
+	connect(m_properties, SIGNAL(removeSelectedItem()), this, SLOT(deleteCurrentLayer())); 
 	m_toolBox->insertItem(0,"Layers", m_properties);
 
 	return ok ? FileOpenSucceeded : FileOpenFailed;
@@ -5054,6 +5056,7 @@
     updateMenuStates();
 
 	m_properties = new PropertyStack(0, m_paneStack->getCurrentPane() );
+	connect(m_properties, SIGNAL(removeSelectedItem()), this, SLOT(deleteCurrentLayer())); 
 	m_toolBox->insertItem(0,"Layers", m_properties);
 }
 
@@ -5129,6 +5132,7 @@
 	m_EasaierManager->openSession(m_document);
 
 	m_properties = new PropertyStack(0, m_paneStack->getCurrentPane() );
+	connect(m_properties, SIGNAL(removeSelectedItem()), this, SLOT(deleteCurrentLayer())); 
 	m_toolBox->insertItem(0,"Layers", m_properties);
 
     return ok;
--- a/widgets/PropertyStack.cpp	Fri Jun 08 13:02:59 2007 +0000
+++ b/widgets/PropertyStack.cpp	Tue Jun 12 09:20:47 2007 +0000
@@ -280,5 +280,17 @@
 }
 
 void PropertyStack::removeSelectedItemRequested(){
-	m_client->removeLayer(m_client->getSelectedLayer());
+	
+	/*if (m_client && m_client->getSelectedLayer()) {
+
+		//MultiSelection::SelectionList selections = m_viewManager->getSelections();
+
+		for (MultiSelection::SelectionList::iterator i = selections.begin();
+			i != selections.end(); ++i) {
+			m_client->getSelectedLayer()->deleteSelection(*i);
+		}
+    }*/
+	emit removeSelectedItem(); 
+
+	//m_client->removeLayer(m_client->getSelectedLayer());
 }
\ No newline at end of file
--- a/widgets/PropertyStack.h	Fri Jun 08 13:02:59 2007 +0000
+++ b/widgets/PropertyStack.h	Tue Jun 12 09:20:47 2007 +0000
@@ -43,6 +43,7 @@
     void viewSelected(View *client);
     void propertyContainerSelected(View *client, PropertyContainer *container);
     void contextHelpChanged(const QString &);
+	void removeSelectedItem();
 
 public slots:
     void propertyContainerAdded(PropertyContainer *);