From 6d89721d09c73d56b2b62ea1b73be65aaf0fe769 Mon Sep 17 00:00:00 2001 From: ouv Date: Wed, 26 Mar 2008 09:44:21 +0000 Subject: [PATCH] Bug IPAL19371 : Qt4 porting: impossible to start record in gauss viewer --- src/VVTK/VVTK_RecorderDlg.cxx | 16 ++++++++++------ src/VVTK/VVTK_RecorderDlg.h | 4 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/VVTK/VVTK_RecorderDlg.cxx b/src/VVTK/VVTK_RecorderDlg.cxx index 93f7bd41..9a884492 100644 --- a/src/VVTK/VVTK_RecorderDlg.cxx +++ b/src/VVTK/VVTK_RecorderDlg.cxx @@ -145,12 +145,6 @@ VVTK_RecorderDlg::~VVTK_RecorderDlg() { } -void VVTK_RecorderDlg::show() -{ - if( onBrowseFile() ) - QWidget::show(); -} - void VVTK_RecorderDlg::onStart() { if( myFileName.isNull() ) @@ -211,6 +205,16 @@ bool VVTK_RecorderDlg::onBrowseFile() return true; } +int VVTK_RecorderDlg::exec() +{ + if( !onBrowseFile() ) + { + reject(); + return 0; + } + return QDialog::exec(); +} + void VVTK_RecorderDlg::keyPressEvent( QKeyEvent* e ) { QDialog::keyPressEvent( e ); diff --git a/src/VVTK/VVTK_RecorderDlg.h b/src/VVTK/VVTK_RecorderDlg.h index 34a19d37..9a4c9b3b 100644 --- a/src/VVTK/VVTK_RecorderDlg.h +++ b/src/VVTK/VVTK_RecorderDlg.h @@ -54,12 +54,12 @@ public: VVTK_RecorderDlg( QWidget*, VVTK_Recorder* ); ~VVTK_RecorderDlg(); - virtual void show(); + int exec(); QString fileName() const { return myFileName; } private: - void keyPressEvent( QKeyEvent* e ); + virtual void keyPressEvent( QKeyEvent* ); protected slots: void onStart(); -- 2.39.2