Revision: 337
http://ktutorial.svn.sourceforge.net/ktutorial/?rev=337&view=rev
Author: danxuliu
Date: 2011-09-23 13:02:59 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
Fix wrong behavior when cancelling the open and save dialogs.
Modified Paths:
--------------
trunk/ktutorial/ktutorial-test-app/TestApp.cpp
Modified: trunk/ktutorial/ktutorial-test-app/TestApp.cpp
===================================================================
--- trunk/ktutorial/ktutorial-test-app/TestApp.cpp 2011-07-11 13:12:27 UTC (rev 336)
+++ trunk/ktutorial/ktutorial-test-app/TestApp.cpp 2011-09-23 13:02:59 UTC (rev 337)
@@ -114,7 +114,13 @@
}
void MainWindow::saveFileAs() {
- saveFileAs(KFileDialog::getSaveFileName());
+ QString fileNameFromDialog = KFileDialog::getSaveFileName();
+
+ if (fileNameFromDialog.isEmpty()) {
+ return;
+ }
+
+ saveFileAs(fileNameFromDialog);
}
void MainWindow::saveFile() {
@@ -128,6 +134,10 @@
void MainWindow::openFile() {
QString fileNameFromDialog = KFileDialog::getOpenFileName();
+ if (fileNameFromDialog.isEmpty()) {
+ return;
+ }
+
QString tmpFile;
if(KIO::NetAccess::download(fileNameFromDialog, tmpFile, this)) {
QFile file(tmpFile);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
