summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2017-02-05 13:32:47 (GMT)
committer Michele Calgaro <michele.calgaro@yahoo.it>2017-02-05 15:06:24 (GMT)
commit00051ff7ddd81c62b76503f36792e495984114ef (patch)
tree620382a511e5b55f90fa10497ce45703de8af58d
parentdf203a23f4d96fae5fbc61bb180c4db8f63e63ae (diff)
downloadtdelibs-00051ff7.zip
tdelibs-00051ff7.tar.gz
Reverted commit 53e36f6d (master), c8ff908d (r14.0.x)
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
m---------cmake0
-rw-r--r--tdeio/tdefile/tdefiledialog.cpp20
2 files changed, 2 insertions, 18 deletions
diff --git a/cmake b/cmake
-Subproject 6455cb89f3f39b76326df5fc2558d42b6088a0e
+Subproject 9150bd170f31408d6b4f02a2de8627a338ad627
diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp
index 24d9f8e..a004ae1 100644
--- a/tdeio/tdefile/tdefiledialog.cpp
+++ b/tdeio/tdefile/tdefiledialog.cpp
@@ -334,20 +334,6 @@ void KFileDialog::slotOk()
{
kdDebug(tdefile_area) << "slotOK\n";
- // If the user typed in the path field without confirming it with ENTER,
- // "ops" will most likely point do a different folder. Make sure the folder exists,
- // then update "ops" accordingly and only if necessary
- TQDir savedir = TQDir(d->pathCombo->lineEdit()->text());
- if (!savedir.exists())
- {
- KMessageBox::information(this, i18n("The selected folder does not exists. Please select an existing one."));
- return;
- }
- if (ops->url().path(1) != KURL(savedir.absPath()).path(1))
- {
- setURL(savedir.absPath());
- }
-
// a list of all selected files/directories (if any)
// can only be used if the user didn't type any filenames/urls himself
const KFileItemList *items = ops->selectedItems();
@@ -995,11 +981,9 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
d->pathCombo->setCompletionObject( pathCompletionObj );
d->pathCombo->setAutoDeleteCompletionObject( true );
- connect( d->pathCombo, TQT_SIGNAL( urlActivated( const KURL& )),
+ connect( d->pathCombo, TQT_SIGNAL( urlActivated( const KURL& )),
this, TQT_SLOT( enterURL( const KURL& ) ));
- connect( d->pathCombo, TQT_SIGNAL( returnPressed( const TQString& )),
- this, TQT_SLOT( enterURL( const TQString& ) ));
- connect( d->pathCombo, TQT_SIGNAL( activated( const TQString& )),
+ connect( d->pathCombo, TQT_SIGNAL( returnPressed( const TQString& )),
this, TQT_SLOT( enterURL( const TQString& ) ));
TQString whatsThisText;