Răsfoiți Sursa

Bookmark menu works in the other local panel

Source commit: cbcecae9d98d2644963e7d71d687b4115ec491aa
Martin Prikryl 5 ani în urmă
părinte
comite
4990b0dfdf
2 a modificat fișierele cu 7 adăugiri și 5 ștergeri
  1. 6 2
      source/forms/CustomScpExplorer.cpp
  2. 1 3
      source/forms/ScpCommander.cpp

+ 6 - 2
source/forms/CustomScpExplorer.cpp

@@ -4292,7 +4292,8 @@ void __fastcall TCustomScpExplorerForm::OpenDirectory(TOperationSide Side)
 //---------------------------------------------------------------------------
 bool __fastcall TCustomScpExplorerForm::OpenBookmark(TOperationSide Side, TBookmark * Bookmark)
 {
-  UnicodeString Path = Bookmark->GetSideDirectory(Side);
+  TOperationSide BookmarkSide = IsLocalBrowserMode() ? osLocal : Side;
+  UnicodeString Path = Bookmark->GetSideDirectory(BookmarkSide);
 
   bool Result = !Path.IsEmpty();
   if (Result)
@@ -10317,10 +10318,13 @@ void __fastcall TCustomScpExplorerForm::RemoteBookmarkClick(TObject * Sender)
 void __fastcall TCustomScpExplorerForm::CreateOpenDirMenuList(
   TTBCustomItem * Menu, TOperationSide Side, TBookmarkList * BookmarkList)
 {
-  // TODO
   if (BookmarkList != NULL)
   {
     TNotifyEvent OnBookmarkClick = (Side == osLocal) ? &LocalBookmarkClick : &RemoteBookmarkClick;
+    if (IsLocalBrowserMode())
+    {
+      Side = osLocal;
+    }
 
     if (!WinConfiguration->UseLocationProfiles)
     {

+ 1 - 3
source/forms/ScpCommander.cpp

@@ -1602,10 +1602,8 @@ void __fastcall TScpCommanderForm::DoOpenBookmark(UnicodeString Local, UnicodeSt
 //---------------------------------------------------------------------------
 bool __fastcall TScpCommanderForm::OpenBookmark(TOperationSide Side, TBookmark * Bookmark)
 {
-  // TODO_OTHER_LOCAL
-  DebugAssert(!IsLocalBrowserMode());
   bool Result;
-  if (WinConfiguration->UseLocationProfiles)
+  if (WinConfiguration->UseLocationProfiles && !IsLocalBrowserMode())
   {
     DoOpenBookmark(Bookmark->Local, Bookmark->Remote);
     Result = true;