diff options
| author | Michele Calgaro <[email protected]> | 2017-02-05 22:35:15 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2017-02-06 00:16:10 +0900 |
| commit | 4c096c216854dbb383f2ac9571e587fd20b14778 (patch) | |
| tree | 746bab2eef4a8cddf152935237ade5af7e4b093f | |
| parent | 1d036d62d87a685833368360d530436b76150ad2 (diff) | |
| download | tdelibs-4c096c216854dbb383f2ac9571e587fd20b14778.tar.gz tdelibs-4c096c216854dbb383f2ac9571e587fd20b14778.zip | |
Fixed code for tdefiledialog which caused the problem explained in bug
2743. Using the new code, editing the path information in a
tdefiledialog and pressing the "open/save" button will behave exactly in
the same way as if ENTER was pressed after editing the path and before
pressing "open/save".
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 05bcfa76fc9bd5dcf7267f2b5a26436566a9cf82)
| -rw-r--r-- | tdeio/tdefile/tdefiledialog.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp index a004ae177..714d24ab7 100644 --- a/tdeio/tdefile/tdefiledialog.cpp +++ b/tdeio/tdefile/tdefiledialog.cpp @@ -334,6 +334,10 @@ void KFileDialog::slotOk() { kdDebug(tdefile_area) << "slotOK\n"; + if (locationEdit->lineEdit()->edited()) + { + enterURL(d->pathCombo->lineEdit()->text()); + } // 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(); @@ -981,11 +985,13 @@ 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& )), + connect( d->pathCombo, TQT_SIGNAL( returnPressed( const TQString& )), this, TQT_SLOT( enterURL( const TQString& ) )); - + connect( d->pathCombo, TQT_SIGNAL( activated( const TQString& )), + this, TQT_SLOT( enterURL( const TQString& ) )); + TQString whatsThisText; // the Location label/edit |