Browse Source

Reverted commit 53e36f6d (master), c8ff908d (r14.0.x)

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/1/head
Michele Calgaro 2 years ago
parent
commit
00051ff7dd
2 changed files with 3 additions and 19 deletions
  1. 1
    1
      cmake
  2. 2
    18
      tdeio/tdefile/tdefiledialog.cpp

+ 1
- 1
cmake

@@ -1 +1 @@
1
-Subproject commit 6455cb89f3f39b76326df5fc2558d42b6088a0e5
1
+Subproject commit 9150bd170f31408d6b4f02a2de8627a338ad6276

+ 2
- 18
tdeio/tdefile/tdefiledialog.cpp View File

@@ -334,20 +334,6 @@ void KFileDialog::slotOk()
334 334
 {
335 335
     kdDebug(tdefile_area) << "slotOK\n";
336 336
 
337
-    // If the user typed in the path field without confirming it with ENTER,
338
-    // "ops" will most likely point do a different folder. Make sure the folder exists,
339
-    // then update "ops" accordingly and only if necessary
340
-    TQDir savedir = TQDir(d->pathCombo->lineEdit()->text());
341
-    if (!savedir.exists())
342
-    {
343
-			KMessageBox::information(this, i18n("The selected folder does not exists. Please select an existing one."));
344
-			return;
345
-    }
346
-    if (ops->url().path(1) != KURL(savedir.absPath()).path(1)) 
347
-    {
348
-    	setURL(savedir.absPath());
349
-    }
350
-    
351 337
     // a list of all selected files/directories (if any)
352 338
     // can only be used if the user didn't type any filenames/urls himself
353 339
     const KFileItemList *items = ops->selectedItems();
@@ -995,11 +981,9 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
995 981
     d->pathCombo->setCompletionObject( pathCompletionObj );
996 982
     d->pathCombo->setAutoDeleteCompletionObject( true );
997 983
 
998
-    connect( d->pathCombo, TQT_SIGNAL( urlActivated( const KURL& )),
984
+    connect( d->pathCombo, TQT_SIGNAL( urlActivated( const KURL&  )),
999 985
              this,  TQT_SLOT( enterURL( const KURL& ) ));
1000
-    connect( d->pathCombo, TQT_SIGNAL( returnPressed( const TQString& )),
1001
-             this,  TQT_SLOT( enterURL( const TQString& ) ));
1002
-    connect( d->pathCombo, TQT_SIGNAL( activated( const TQString& )),
986
+    connect( d->pathCombo, TQT_SIGNAL( returnPressed( const TQString&  )),
1003 987
              this,  TQT_SLOT( enterURL( const TQString& ) ));
1004 988
 
1005 989
     TQString whatsThisText;

Loading…
Cancel
Save