From e7e908bf4c7c8bec141fe2d3b4a9924ddaea6c04 Mon Sep 17 00:00:00 2001 From: mzn Date: Sat, 7 Jun 2008 12:54:12 +0000 Subject: [PATCH] Fix for bug 0019870(Import/Export should show current directory). --- src/GEOMToolsGUI/GEOMToolsGUI.cxx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.cxx b/src/GEOMToolsGUI/GEOMToolsGUI.cxx index c0f6227b7..2137d9dfd 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI.cxx @@ -95,10 +95,11 @@ static QString getFileName( QWidget* parent, if ( !caption.isEmpty() ) fd->setCaption( caption ); - if ( showCurrentDirInitially && SUIT_FileDlg::getLastVisitedPath().isEmpty() ) - fd->setSelection( QDir::currentDirPath() ); - else if ( !initial.isEmpty() ) + if ( !initial.isEmpty() ) fd->setSelection( initial ); + + if ( showCurrentDirInitially && SUIT_FileDlg::getLastVisitedPath().isEmpty() ) + fd->setDir( QDir::currentDirPath() ); fd->setFilters( filters ); @@ -713,7 +714,7 @@ bool GEOMToolsGUI::Export() QString fileType; QString file = getFileName(app->desktop(), QString( IObject->getName() ), aMap, filters, - tr("GEOM_MEN_EXPORT"), false, fileType); + tr("GEOM_MEN_EXPORT"), false, fileType, true); // User has pressed "Cancel" --> stop the operation if ( file.isEmpty() || fileType.isEmpty() ) -- 2.39.2