From 184deb51126798ecdfc0671ba05c55c67d91a953 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Sat, 26 Dec 2009 18:48:42 +0000 Subject: [PATCH] Use the KDE 4.4 way to ask for the "exists, overwite?" confirmation dialog. This allows to: a) get rid of our prompts done in two places b) really make sure it is being asked in any saving context (eg for .okular files) BUG: 191928 svn path=/trunk/KDE/kdegraphics/okular/; revision=1066333 --- part.cpp | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/part.cpp b/part.cpp index 39d883c9f..57cf92278 100644 --- a/part.cpp +++ b/part.cpp @@ -1484,16 +1484,12 @@ void Part::slotSaveFileAs() if ( m_embedMode == PrintPreviewMode ) return; - KUrl saveUrl = KFileDialog::getSaveUrl( KUrl("kfiledialog:///okular/" + url().fileName()), QString(), widget() ); + KUrl saveUrl = KFileDialog::getSaveUrl( KUrl("kfiledialog:///okular/" + url().fileName()), + QString(), widget(), QString(), + KFileDialog::ConfirmOverwrite ); if ( !saveUrl.isValid() || saveUrl.isEmpty() ) return; - if ( KIO::NetAccess::exists( saveUrl, KIO::NetAccess::DestinationSide, widget() ) ) - { - if (KMessageBox::warningContinueCancel( widget(), i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?", saveUrl.fileName()), QString(), KGuiItem(i18n("Overwrite"))) != KMessageBox::Continue) - return; - } - KTemporaryFile tf; QString fileName; if ( !tf.open() ) @@ -1529,15 +1525,11 @@ void Part::slotSaveCopyAs() if ( m_embedMode == PrintPreviewMode ) return; - KUrl saveUrl = KFileDialog::getSaveUrl( KUrl("kfiledialog:///okular/" + url().fileName()), QString(), widget() ); + KUrl saveUrl = KFileDialog::getSaveUrl( KUrl("kfiledialog:///okular/" + url().fileName()), + QString(), widget(), QString(), + KFileDialog::ConfirmOverwrite ); if ( saveUrl.isValid() && !saveUrl.isEmpty() ) { - if ( KIO::NetAccess::exists( saveUrl, KIO::NetAccess::DestinationSide, widget() ) ) - { - if (KMessageBox::warningContinueCancel( widget(), i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?", saveUrl.fileName()), QString(), KGuiItem(i18n("Overwrite"))) != KMessageBox::Continue) - return; - } - // make use of the already downloaded (in case of remote URLs) file, // no point in downloading that again KUrl srcUrl = KUrl::fromPath( localFilePath() ); @@ -1873,7 +1865,9 @@ void Part::slotExportAs(QAction * act) filter = m_exportFormats.at( id - 2 ).mimeType()->name(); break; } - QString fileName = KFileDialog::getSaveFileName( url().isLocalFile() ? url().directory() : QString(), filter, widget() ); + QString fileName = KFileDialog::getSaveFileName( url().isLocalFile() ? url().directory() : QString(), + filter, widget(), QString(), + KFileDialog::ConfirmOverwrite ); if ( !fileName.isEmpty() ) { bool saved = false;