From b7fd5bef05041b4993070d96dd280e815ade89c3 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@users.sourceforge.net>
Date: Sun, 15 Jun 2008 13:24:51 +0200
Subject: Get rid of engine targetting by '#' mark This changes default
 copy/move behaviour - target engine is always set from opposite panel, user
 cannot change to local path anymore.

---
 UMain.pas | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'UMain.pas')

diff --git a/UMain.pas b/UMain.pas
index b57b58d..1484389 100644
--- a/UMain.pas
+++ b/UMain.pas
@@ -2549,9 +2549,9 @@ begin
           end;
         end;
       end else FCopyMove.Entry.Text := '*.*';
-    end else
-      if OppositeEngine is TLocalTreeEngine then FCopyMove.Entry.Text := OppositeEngine.Path
-                                            else FCopyMove.Entry.Text := Format(ConstFullPathFormatStr, [OppositeEngine.GetPrefix, OppositeEngine.Path]);
+    end else FCopyMove.Entry.Text := OppositeEngine.Path;
+{      if OppositeEngine is TLocalTreeEngine then FCopyMove.Entry.Text := OppositeEngine.Path
+                                            else FCopyMove.Entry.Text := Format(ConstFullPathFormatStr, [OppositeEngine.GetPrefix, OppositeEngine.Path]); }
     if not BypassSelAll then FCopyMove.Entry.SelectAll;
     if FCopyMove.Run <> mbOK then Exit;
     NewPathx := FCopyMove.Entry.Text;
@@ -2582,10 +2582,11 @@ begin
     AFProgress.ProgressBar.Value := 0;
     AWorkingThread.ProgressForm := AFProgress;
     if Assigned(ListView.Selected) then AWorkingThread.SelectedItem := ListView.Selected.Data;
-    AWorkingThread.DestEngine := nil;
+    AWorkingThread.DestEngine := OppositeEngine;
     AWorkingThread.SrcEngine := Engine;
     
     //  Determine on which engine the entered path is
+{
     if Pos(ConstPathDelim, NewPath) = 0 then begin
       if OppositeEngine is TLocalTreeEngine then AWorkingThread.DestEngine := OppositeEngine else
       if CurrentEngine is TLocalTreeEngine then AWorkingThread.DestEngine := CurrentEngine
@@ -2602,13 +2603,14 @@ begin
              Exit;
            end;
     end;
+}
     if AWorkingThread = nil then begin    //  Something went terribly wrong
       Application.MessageBox(LANGCannotDetermineDestinationEngine, [mbOK], mbError, mbOK, mbOK);
       Exit;
     end;
 
     //  Strip the engine prefix
-    if Pos(ConstPathDelim, NewPath) > 0 then Delete(NewPath, 1, Pos(ConstPathDelim, NewPath)); 
+//    if Pos(ConstPathDelim, NewPath) > 0 then Delete(NewPath, 1, Pos(ConstPathDelim, NewPath));
 
     AWorkingThread.LeftPanel := LeftPanel;
     AWorkingThread.DataList := DataList;
-- 
cgit v1.2.3