summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2017-02-05 13:35:15 (GMT)
committer Michele Calgaro <michele.calgaro@yahoo.it>2017-02-05 15:06:24 (GMT)
commit05bcfa76fc9bd5dcf7267f2b5a26436566a9cf82 (patch)
treec75ea021addd4a097dbe2fb6c62cad1c7ac71349
parent00051ff7ddd81c62b76503f36792e495984114ef (diff)
downloadtdelibs-05bcfa76.zip
tdelibs-05bcfa76.tar.gz
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 <michele.calgaro@yahoo.it>
-rw-r--r--tdeio/tdefile/tdefiledialog.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp
index a004ae1..714d24a 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