Mercurial > hg > easaier-soundaccess
changeset 66:429cfea499ad
layers for all panes, are ok.
| author | benoitrigolleau |
|---|---|
| date | Tue, 12 Jun 2007 16:21:30 +0000 |
| parents | 78abce641ddf |
| children | 2c011280ca0b |
| files | sv/main/MainWindow.cpp sv/main/MainWindow.h view/PaneStack.cpp view/PaneStack.h widgets/PropertyStack.cpp widgets/svwidgets.vcproj |
| diffstat | 6 files changed, 77 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/sv/main/MainWindow.cpp Tue Jun 12 09:20:47 2007 +0000 +++ b/sv/main/MainWindow.cpp Tue Jun 12 16:21:30 2007 +0000 @@ -357,6 +357,7 @@ statusBar(); newSession(); + } MainWindow::~MainWindow() @@ -1891,6 +1892,7 @@ { updateMenuStates(); updateVisibleRangeDisplay(p); + emit newCurrentPane(p); } void @@ -2700,6 +2702,7 @@ closeSession(); createDocument(); + createMultiPaneLayerContainer(); Pane *pane = m_paneStack->addPane(); @@ -2725,9 +2728,9 @@ documentRestored(); updateMenuStates(); - m_properties = new PropertyStack(0, m_paneStack->getCurrentPane()); - connect(m_properties, SIGNAL(removeSelectedItem()), this, SLOT(deleteCurrentLayer())); - m_toolBox->insertItem(0,"Layers", m_properties); + //m_properties = new PropertyStack(0, m_paneStack->getCurrentPane()); + //connect(m_properties, SIGNAL(removeSelectedItem()), this, SLOT(deleteCurrentLayer())); + //m_toolBox->insertItem(0,"Layers", m_properties); } void @@ -2811,7 +2814,7 @@ m_EasaierManager->closeSession(); m_toolBox->removeItem(0); - m_properties = 0; + m_multiPaneLayerContainer = 0; } void @@ -3020,7 +3023,7 @@ QString error; closeSession(); createDocument(); - + createMultiPaneLayerContainer(); PaneCallback callback(this); m_viewManager->clearSelections(); @@ -3063,9 +3066,10 @@ 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); + //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; } @@ -5033,7 +5037,7 @@ closeSession(); createDocument(); - + createMultiPaneLayerContainer(); Pane *pane = m_paneStack->addPane(); if (!m_timeRulerLayer) { @@ -5055,9 +5059,10 @@ documentRestored(); updateMenuStates(); - m_properties = new PropertyStack(0, m_paneStack->getCurrentPane() ); - connect(m_properties, SIGNAL(removeSelectedItem()), this, SLOT(deleteCurrentLayer())); - m_toolBox->insertItem(0,"Layers", m_properties); + //m_properties = new PropertyStack(0, m_paneStack->getCurrentPane() ); + //connect(m_properties, SIGNAL(removeSelectedItem()), this, SLOT(deleteCurrentLayer())); + //m_toolBox->insertItem(0,"Layers", m_properties); + } void MainWindow::openEasaierSession() @@ -5100,7 +5105,7 @@ QString error; closeSession(); createDocument(); - + createMultiPaneLayerContainer(); PaneCallback callback(this); m_viewManager->clearSelections(); @@ -5131,10 +5136,9 @@ 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); - + //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; } @@ -5299,4 +5303,13 @@ m_EasaierManager->queryDatabase(themeName); m_qtabwidget->setCurrentIndex(Result); -} \ No newline at end of file +} + +void MainWindow::createMultiPaneLayerContainer(){ + m_multiPaneLayerContainer = new MultiPaneLayerContainer; + connect(m_paneStack, SIGNAL(newPaneAdded(Pane*)),m_multiPaneLayerContainer,SLOT(paneAdded(Pane*))); + connect(m_paneStack, SIGNAL(paneDeleted(Pane*)),m_multiPaneLayerContainer,SLOT(paneRemoved(Pane*))); + connect(m_multiPaneLayerContainer, SIGNAL(removeSelectedItem()), this, SLOT(deleteCurrentLayer())); + connect(this, SIGNAL(newCurrentPane(Pane*)), m_multiPaneLayerContainer, SLOT(currentPaneChanged(Pane*))); + m_toolBox->insertItem(0,"Layers", m_multiPaneLayerContainer); +} \ No newline at end of file
--- a/sv/main/MainWindow.h Tue Jun 12 09:20:47 2007 +0000 +++ b/sv/main/MainWindow.h Tue Jun 12 16:21:30 2007 +0000 @@ -35,6 +35,7 @@ #include "data/fileio/HttpClient.h" #include "widgets/WidgetGallery.h" #include "document/ESFileReader.h" +#include "widgets/MultiPaneLayerContainer.h" #include <map> @@ -135,6 +136,7 @@ void canRewind(bool); void canPlaySelection(bool); void canSave(bool); + void newCurrentPane(Pane *pane); public slots: void preferenceChanged(PropertyContainer::PropertyName); @@ -467,7 +469,11 @@ EasaierSessionManager *m_EasaierManager; - QWidget *m_properties; + MultiPaneLayerContainer *m_multiPaneLayerContainer; + +private: + void createMultiPaneLayerContainer(); + };
--- a/view/PaneStack.cpp Tue Jun 12 09:20:47 2007 +0000 +++ b/view/PaneStack.cpp Tue Jun 12 16:21:30 2007 +0000 @@ -98,7 +98,7 @@ if (!m_currentPane) { setCurrentPane(pane); } - + emit newPaneAdded(pane); return pane; } @@ -197,6 +197,7 @@ setCurrentPane(0); } } + emit paneDeleted(pane); } int
--- a/view/PaneStack.h Tue Jun 12 09:20:47 2007 +0000 +++ b/view/PaneStack.h Tue Jun 12 16:21:30 2007 +0000 @@ -71,6 +71,8 @@ void rightButtonMenuRequested(Pane *pane, QPoint position); void propertyStacksResized(); void contextHelpChanged(const QString &); + void newPaneAdded(Pane *pane); + void paneDeleted(Pane *pane); public slots: void propertyContainerAdded(PropertyContainer *);
--- a/widgets/PropertyStack.cpp Tue Jun 12 09:20:47 2007 +0000 +++ b/widgets/PropertyStack.cpp Tue Jun 12 16:21:30 2007 +0000 @@ -280,17 +280,5 @@ } void PropertyStack::removeSelectedItemRequested(){ - - /*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/svwidgets.vcproj Tue Jun 12 09:20:47 2007 +0000 +++ b/widgets/svwidgets.vcproj Tue Jun 12 16:21:30 2007 +0000 @@ -238,6 +238,10 @@ > </File> <File + RelativePath=".\MultiPaneLayerContainer.cpp" + > + </File> + <File RelativePath="NotifyingCheckBox.cpp" > </File> @@ -430,7 +434,7 @@ <Tool Name="VCCustomBuildTool" Description="MOC $(InputFileName)" - CommandLine="$(QTDIR)\bin\moc.exe -DBUILD_DEBUG -DUSE_VC -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DHAVE_BZ2 -DHAVE_PORTAUDIO -DHAVE_PORTAUDIO_V18 -DHAVE_OGGZ -DHAVE_FISHSOUND -DHAVE_FFTW3F -DHAVE_VAMP -DHAVE_VAMP_HOSTSDK -DHAVE_SNDFILE -DHAVE_SAMPLERATE -DQT_THREAD_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include" -I "." -I ".." -I "$(QTDIR)\include\ActiveQt" -I "tmp_moc" -I "." -I"$(QTDIR)\mkspecs\win32-msvc2005" $(InputPath) -o tmp_moc\moc_$(InputName).cpp" + CommandLine="$(QTDIR)\bin\moc.exe -DBUILD_DEBUG -DUSE_VC -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DHAVE_BZ2 -DHAVE_PORTAUDIO -DHAVE_PORTAUDIO_V18 -DHAVE_OGGZ -DHAVE_FISHSOUND -DHAVE_FFTW3F -DHAVE_VAMP -DHAVE_VAMP_HOSTSDK -DHAVE_SNDFILE -DHAVE_SAMPLERATE -DQT_THREAD_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include" -I "." -I ".." -I "$(QTDIR)\include\ActiveQt" -I "tmp_moc" -I "." -I"$(QTDIR)\mkspecs\win32-msvc2005" $(InputPath) -o tmp_moc\moc_$(InputName).cpp
" AdditionalDependencies="$(QTDIR)\bin\moc.exe" Outputs="tmp_moc\moc_$(InputName).cpp" /> @@ -679,6 +683,32 @@ </FileConfiguration> </File> <File + RelativePath=".\MultiPaneLayerContainer.h" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="MOC $(InputFileName)" + CommandLine="$(QTDIR)\bin\moc.exe -DNDEBUG -DBUILD_RELEASE -DUSE_VC -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DHAVE_BZ2 -DHAVE_PORTAUDIO -DHAVE_PORTAUDIO_V18 -DHAVE_OGGZ -DHAVE_FISHSOUND -DHAVE_FFTW3F -DHAVE_VAMP -DHAVE_VAMP_HOSTSDK -DHAVE_SNDFILE -DHAVE_SAMPLERATE -DQT_THREAD_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include" -I "." -I ".." -I "$(QTDIR)\include\ActiveQt" -I "tmp_moc" -I "." -I"$(QTDIR)\mkspecs\win32-msvc2005" $(InputPath) -o tmp_moc\moc_$(InputName).cpp" + AdditionalDependencies="$(QTDIR)\bin\moc.exe" + Outputs="tmp_moc\moc_$(InputName).cpp" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="MOC $(InputFileName)" + CommandLine="$(QTDIR)\bin\moc.exe -DBUILD_DEBUG -DUSE_VC -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DHAVE_BZ2 -DHAVE_PORTAUDIO -DHAVE_PORTAUDIO_V18 -DHAVE_OGGZ -DHAVE_FISHSOUND -DHAVE_FFTW3F -DHAVE_VAMP -DHAVE_VAMP_HOSTSDK -DHAVE_SNDFILE -DHAVE_SAMPLERATE -DQT_THREAD_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include" -I "." -I ".." -I "$(QTDIR)\include\ActiveQt" -I "tmp_moc" -I "." -I"$(QTDIR)\mkspecs\win32-msvc2005" $(InputPath) -o tmp_moc\moc_$(InputName).cpp" + AdditionalDependencies="$(QTDIR)\bin\moc.exe" + Outputs="tmp_moc\moc_$(InputName).cpp" + /> + </FileConfiguration> + </File> + <File RelativePath="NotifyingCheckBox.h" > <FileConfiguration @@ -1217,6 +1247,10 @@ > </File> <File + RelativePath=".\tmp_moc\moc_MultiPaneLayerContainer.cpp" + > + </File> + <File RelativePath="tmp_moc\moc_NotifyingCheckBox.cpp" > </File>