Mercurial > hg > easaier-soundaccess

changeset 52:51fd00eae624

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
correct bug in OpenSessionFile with PropertyStack
author lbajardsilogic
date Wed, 16 May 2007 11:35:32 +0000
parents 8e5f9a9aa43f
children 4eb9c7e4acf6
files sv/main/MainWindow.cpp sv/main/MainWindow.h
diffstat 2 files changed, 19 insertions(+), 43 deletions(-) [+]
line wrap: on
line diff
--- a/sv/main/MainWindow.cpp	Wed May 16 11:34:30 2007 +0000
+++ b/sv/main/MainWindow.cpp	Wed May 16 11:35:32 2007 +0000
@@ -2704,18 +2704,9 @@
     CommandHistory::getInstance()->documentSaved();
     documentRestored();
     updateMenuStates();
-
-	QWidget *properties = 0;
 
-	properties = new PropertyStack(0, m_paneStack->getCurrentPane() );
-	//properties->show();
-	m_toolBox->removeItem(0);
-	m_toolBox->insertItem(0,"Layers", properties);
-
-	/*connect(properties, SIGNAL(propertyContainerSelected(View *, PropertyContainer *)),
-		this, SLOT(propertyContainerSelected(View *, PropertyContainer *)));
-	properties->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum);
-	*/
+	m_properties = new PropertyStack(0, m_paneStack->getCurrentPane() );
+	m_toolBox->insertItem(0,"Layers", m_properties);
 }
 
 void
@@ -2797,6 +2788,9 @@
     documentRestored();
 
 	m_EasaierManager->closeSession();
+
+	m_toolBox->removeItem(0);
+	m_properties = 0;
 }
 
 void
@@ -3008,7 +3002,7 @@
 
     PaneCallback callback(this);
     m_viewManager->clearSelections();
-
+	
     SVFileReader reader(m_document, callback, location);
     QXmlInputSource inputSource(&bzFile);
     reader.parse(inputSource);
@@ -3045,8 +3039,13 @@
     } else {
 	setWindowTitle(tr("Sound Access"));
     }
-
-    return ok ? FileOpenSucceeded : FileOpenFailed;
+
+	m_EasaierManager->newSession();
+
+	m_properties = new PropertyStack(0, m_paneStack->getCurrentPane() );
+	m_toolBox->insertItem(0,"Layers", m_properties);
+
+	return ok ? FileOpenSucceeded : FileOpenFailed;
 }
 
 void
@@ -5034,20 +5033,8 @@
     documentRestored();
     updateMenuStates();
 
-		/**************************************************/
-	QWidget *properties = 0;
-
-	properties = new PropertyStack(0, m_paneStack->getCurrentPane() );
-	//properties->show();
-	m_toolBox->removeItem(0);
-	m_toolBox->insertItem(0,"Layers", properties);
-
-	/*connect(properties, SIGNAL(propertyContainerSelected(View *, PropertyContainer *)),
-		this, SLOT(propertyContainerSelected(View *, PropertyContainer *)));
-	properties->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum);
-	*/
-
-	/*************************************************/
+	m_properties = new PropertyStack(0, m_paneStack->getCurrentPane() );
+	m_toolBox->insertItem(0,"Layers", m_properties);
 }
 
 void MainWindow::openEasaierSession()
@@ -5121,21 +5108,8 @@
 
 	m_EasaierManager->openSession(m_document);
 
-		/**************************************************/
-	QWidget *properties = 0;
-
-	properties = new PropertyStack(0, m_paneStack->getCurrentPane() );
-	//properties->show();
-	m_toolBox->removeItem(0);
-	m_toolBox->insertItem(0,"Layers", properties);
-
-	/*connect(properties, SIGNAL(propertyContainerSelected(View *, PropertyContainer *)),
-		this, SLOT(propertyContainerSelected(View *, PropertyContainer *)));
-	properties->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum);
-	*/
-
-	/*************************************************/
-
+	m_properties = new PropertyStack(0, m_paneStack->getCurrentPane() );
+	m_toolBox->insertItem(0,"Layers", m_properties);
 
     return ok;
 }
--- a/sv/main/MainWindow.h	Wed May 16 11:34:30 2007 +0000
+++ b/sv/main/MainWindow.h	Wed May 16 11:35:32 2007 +0000
@@ -467,6 +467,8 @@
 
 	EasaierSessionManager	*m_EasaierManager;
 
+	QWidget					*m_properties;
+
 };