Page MenuHome GnuPG
Files F23020830

No OneTemporary
Actions

View Options

diff --git a/utils/filedialog.cpp b/utils/filedialog.cpp
index 4ff7b161d..000f142d3 100644
--- a/utils/filedialog.cpp
+++ b/utils/filedialog.cpp
@@ -1,83 +1,89 @@
/* -*- mode: c++; c-basic-offset:4 -*-
utils/filedialog.cpp
This file is part of Kleopatra, the KDE keymanager
Copyright (c) 2009 Klarälvdalens Datakonsult AB
Kleopatra is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
Kleopatra is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
the Qt library by Trolltech AS, Norway (or with modified versions
of Qt that use the same license as Qt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
Qt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
*/
#include <config-kleopatra.h>
#include "filedialog.h"
#include <QMap>
using namespace Kleo;
namespace {
typedef QMap<QString,QString> Map;
Q_GLOBAL_STATIC( Map, dir_id_2_dir_map )
}
static QString dir( const QString & id ) {
const QString dir = (*dir_id_2_dir_map())[id];
if ( dir.isEmpty() )
return QDir::homePath();
else
return dir;
}
static void update( const QString & fname, const QString & id ) {
if ( !fname.isEmpty() )
- (*dir_id_2_dir_map())[ id ] = QFileInfo( fname ).absoluteFilePath();
+ (*dir_id_2_dir_map())[ id ] = QFileInfo( fname ).absolutePath();
}
QString FileDialog::getExistingDirectory( QWidget * parent, const QString & caption, const QString & dirID, QFileDialog::Options options ) {
const QString fname = QFileDialog::getExistingDirectory( parent, caption, dir( dirID ), options );
update( fname, dirID );
return fname;
}
QString FileDialog::getOpenFileName( QWidget * parent, const QString & caption, const QString & dirID, const QString & filter, QString * selectedFilter, QFileDialog::Options options ) {
const QString fname = QFileDialog::getOpenFileName( parent, caption, dir( dirID ), filter, selectedFilter, options );
update( fname, dirID );
return fname;
}
QStringList FileDialog::getOpenFileNames( QWidget * parent, const QString & caption, const QString & dirID, const QString & filter, QString * selectedFilter, QFileDialog::Options options ) {
const QStringList files = QFileDialog::getOpenFileNames( parent, caption, dir( dirID ), filter, selectedFilter, options );
if ( !files.empty() )
update( files.front(), dirID );
return files;
}
QString FileDialog::getSaveFileName( QWidget * parent, const QString & caption, const QString & dirID, const QString & filter, QString * selectedFilter, QFileDialog::Options options ) {
const QString fname = QFileDialog::getSaveFileName( parent, caption, dir( dirID ), filter, selectedFilter, options );
update( fname, dirID );
return fname;
}
+
+QString FileDialog::getSaveFileNameEx( QWidget * parent, const QString & caption, const QString & dirID, const QString & proposedFileName, const QString & filter, QString * selectedFilter, QFileDialog::Options options ) {
+ const QString fname = QFileDialog::getSaveFileName( parent, caption, QDir( dir( dirID ) ).filePath( proposedFileName ), filter, selectedFilter, options );
+ update( fname, dirID );
+ return fname;
+}
diff --git a/utils/filedialog.h b/utils/filedialog.h
index 8da7e6bed..f6a09c040 100644
--- a/utils/filedialog.h
+++ b/utils/filedialog.h
@@ -1,50 +1,51 @@
/* -*- mode: c++; c-basic-offset:4 -*-
utils/filedialog.h
This file is part of Kleopatra, the KDE keymanager
Copyright (c) 2009 Klarälvdalens Datakonsult AB
Kleopatra is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
Kleopatra is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
the Qt library by Trolltech AS, Norway (or with modified versions
of Qt that use the same license as Qt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
Qt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
*/
#ifndef __KLEOPATRA_UTILS_FILEDIALOG_H__
#define __KLEOPATRA_UTILS_FILEDIALOG_H__
#include <QFileDialog>
namespace Kleo {
namespace FileDialog {
QString getExistingDirectory( QWidget * parent=0, const QString & caption=QString(), const QString & dirID=QString(), QFileDialog::Options options = QFileDialog::ShowDirsOnly );
QString getOpenFileName( QWidget * parent=0, const QString & caption=QString(), const QString & dirID=QString(), const QString & filter=QString(), QString * selectedFilter=0, QFileDialog::Options options=0 );
QStringList getOpenFileNames( QWidget * parent=0, const QString & caption=QString(), const QString & dirID=QString(), const QString & filter=QString(), QString * selectedFilter=0, QFileDialog::Options options=0 );
QString getSaveFileName( QWidget * parent=0, const QString & caption=QString(), const QString & dirID=QString(), const QString & filter=QString(), QString * selectedFilter=0, QFileDialog::Options options=0 );
+ QString getSaveFileNameEx( QWidget * parent=0, const QString & caption=QString(), const QString & dirID=QString(), const QString & proposedFileName=QString(), const QString & filter=QString(), QString * selectedFilter=0, QFileDialog::Options options=0 );
}
}
#endif // __KLEOPATRA_UTILS_FILEDIALOG_H__

File Metadata

Mime Type
text/x-diff
Expires
Mon, May 12, 6:43 PM (1 d, 18 h)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
b3/47/bc56d7794b3183e842dac91e16eb

Event Timeline