Mercurial > hg > easaier-soundaccess
changeset 133:894b45c9b787
kill all windows when the program is closed
popups are always on top
| author | benoitrigolleau |
|---|---|
| date | Thu, 08 Nov 2007 16:26:40 +0000 |
| parents | e236ce53a2e7 |
| children | 71d46ee71f25 |
| files | sv/main/MainWindow.cpp sv/main/MainWindow.h widgets/GenericItemList.cpp widgets/GenericItemList.h widgets/ItemAudioFilterList.cpp widgets/ItemAudioFilterList.h widgets/ItemLayerList.cpp widgets/ItemLayerList.h |
| diffstat | 8 files changed, 35 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/sv/main/MainWindow.cpp Thu Nov 08 14:42:12 2007 +0000 +++ b/sv/main/MainWindow.cpp Thu Nov 08 16:26:40 2007 +0000 @@ -3168,6 +3168,7 @@ void MainWindow::closeEvent(QCloseEvent *e) { + /* // std::cerr << "MainWindow::closeEvent" << std::endl; if (m_openingAudioFile) { @@ -3189,7 +3190,10 @@ settings.endGroup(); e->accept(); + exit(); return; + */ + exit(); } bool @@ -5135,6 +5139,7 @@ close(); } + QueryResultsWidget * MainWindow::getQueryResultsWidget() { return m_resultsWidget; @@ -5463,4 +5468,5 @@ { if (m_document) m_document->removeFilter(name); -} \ No newline at end of file +} +
--- a/sv/main/MainWindow.h Thu Nov 08 14:42:12 2007 +0000 +++ b/sv/main/MainWindow.h Thu Nov 08 16:26:40 2007 +0000 @@ -305,8 +305,6 @@ void exit(); - - protected: QWidget *m_videoWidget; QString m_sessionFile; @@ -514,7 +512,6 @@ private: void createMultiPaneLayerContainer(); - };
--- a/widgets/GenericItemList.cpp Thu Nov 08 14:42:12 2007 +0000 +++ b/widgets/GenericItemList.cpp Thu Nov 08 16:26:40 2007 +0000 @@ -31,6 +31,10 @@ //this->setFocusPolicy(Qt::ClickFocus); } +GenericItemList::~GenericItemList(){ + +} + void GenericItemList::setData(QVariant &data){}
--- a/widgets/GenericItemList.h Thu Nov 08 14:42:12 2007 +0000 +++ b/widgets/GenericItemList.h Thu Nov 08 16:26:40 2007 +0000 @@ -24,6 +24,7 @@ public: GenericItemList(QWidget *parent=0); + ~GenericItemList(); void setData(QVariant &data); void setIndex(int index); virtual void configAction();
--- a/widgets/ItemAudioFilterList.cpp Thu Nov 08 14:42:12 2007 +0000 +++ b/widgets/ItemAudioFilterList.cpp Thu Nov 08 16:26:40 2007 +0000 @@ -64,6 +64,14 @@ connect(this, SIGNAL(doubleClicked()), this, SLOT(openPropertyBox())); } +ItemAudioFilterList::~ItemAudioFilterList(){ + if(m_propertyBox){ + m_propertyBox->close(); + delete m_propertyBox; + } + +} + void ItemAudioFilterList::setIcon(QString &icon){ m_labelIcon->setPixmap(QIcon(icon).pixmap(25)); } @@ -89,7 +97,8 @@ void ItemAudioFilterList::configAction(){ if(m_propertyBox!=0){ - m_propertyBox->close(); + //m_propertyBox->close(); + m_propertyBox->setWindowFlags(m_propertyBox->windowFlags() | Qt::WindowStaysOnTopHint); m_propertyBox->show(); } }
--- a/widgets/ItemAudioFilterList.h Thu Nov 08 14:42:12 2007 +0000 +++ b/widgets/ItemAudioFilterList.h Thu Nov 08 16:26:40 2007 +0000 @@ -32,6 +32,7 @@ public: ItemAudioFilterList(QWidget *parent=0); + ~ItemAudioFilterList(); void setIcon(QString &icon); void setName(QString &name); inline QString getName(){return m_labelName->text();}
--- a/widgets/ItemLayerList.cpp Thu Nov 08 14:42:12 2007 +0000 +++ b/widgets/ItemLayerList.cpp Thu Nov 08 16:26:40 2007 +0000 @@ -34,6 +34,7 @@ m_checkBoxShow = new QCheckBox; m_checkBoxPlay = new QCheckBox; m_layoutMain = new QHBoxLayout; + /* set the correct widget parameters*/ m_labelIcon->setMaximumSize(25,25); @@ -72,6 +73,13 @@ connect(this, SIGNAL(doubleClicked()), this, SLOT(openPropertyBox())); } +ItemLayerList::~ItemLayerList(){ + /*if(m_propertyBox){ + m_propertyBox->close(); + delete m_propertyBox; + }*/ +} + void ItemLayerList::setIcon(QString &icon){ m_labelIcon->setPixmap(QIcon(icon).pixmap(25)); } @@ -112,8 +120,10 @@ void ItemLayerList::configAction(){ if(m_propertyBox!=0){ - m_propertyBox->close(); + //m_propertyBox->close(); + m_propertyBox->setWindowFlags(m_propertyBox->windowFlags() | Qt::WindowStaysOnTopHint); m_propertyBox->show(); + } }
--- a/widgets/ItemLayerList.h Thu Nov 08 14:42:12 2007 +0000 +++ b/widgets/ItemLayerList.h Thu Nov 08 16:26:40 2007 +0000 @@ -29,6 +29,7 @@ public: ItemLayerList(QWidget *parent=0); + ~ItemLayerList(); void setIcon(QString &icon); void setName(QString &name); inline QString getName(){return m_labelName->text();}