sysutils/winscp
1
0
Fork 0
mirror of https://github.com/winscp/winscp.git synced 2026-10-24 02:28:55 +03:00
Code Activity

Explore Directory for the other local panel

Browse Source 
Source commit: a42ab508d24fdb4d1d0cd12e7a75ea4c1fa13bff
This commit is contained in:
Martin Prikryl
2020-09-03 13:10:58 +00:00
parent c2ee18a33c
commit 461d097e76
8 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/forms/CustomScpExplorer.cpp
View File

@@ -6054,7 +6054,7 @@ void __fastcall TCustomScpExplorerForm::StandaloneEdit(const UnicodeString & Fil
}
}
//---------------------------------------------------------------------------
void __fastcall TCustomScpExplorerForm::ExploreLocalDirectory()
void __fastcall TCustomScpExplorerForm::ExploreLocalDirectory(TOperationSide)
{
DebugFail();
}

2
source/forms/CustomScpExplorer.h
View File

@@ -770,7 +770,7 @@ public:
virtual void __fastcall UpdateTerminal(TManagedTerminal * Terminal);
virtual void __fastcall SynchronizeDirectories();
virtual void __fastcall FullSynchronizeDirectories() = 0;
virtual void __fastcall ExploreLocalDirectory();
virtual void __fastcall ExploreLocalDirectory(TOperationSide Side);
virtual void __fastcall GoToCommandLine();
virtual void __fastcall GoToTree();
void __fastcall PanelExport(TOperationSide Side, TPanelExport Export,

8
source/forms/NonVisual.cpp
View File

@@ -286,11 +286,11 @@ void __fastcall TNonVisualDataModule::ExplorerActionsUpdate(
UPD(SIDE ## ChangePathAction2, DirViewEnabled(os ## SIDE)) \
UPD(SIDE ## AddBookmarkAction2, DirViewEnabled(os ## SIDE)) \
UPD(SIDE ## PathToClipboardAction2, DirViewEnabled(os ## SIDE)) \
UPDEX1(SIDE ## FilterAction, DirViewEnabled(os ## SIDE), Action->Checked = !DirView(os ## SIDE)->Mask.IsEmpty())
UPDEX1(SIDE ## FilterAction, DirViewEnabled(os ## SIDE), Action->Checked = !DirView(os ## SIDE)->Mask.IsEmpty()) \
UPD(SIDE ## ExploreDirectoryAction, ScpExplorer->IsSideLocalBrowser(os ## SIDE))
PANEL_ACTIONS(Local)
PANEL_ACTIONS(Remote)
#undef PANEL_ACTIONS
UPD(LocalExploreDirectoryAction2, true)
// HELP
UPD(AboutAction, true)
@@ -622,11 +622,11 @@ void __fastcall TNonVisualDataModule::ExplorerActionsExecute(
EXE(SIDE ## ChangePathAction2, ScpExplorer->ChangePath(os ## SIDE)) \
EXE(SIDE ## AddBookmarkAction2, ScpExplorer->AddBookmark(os ## SIDE)) \
EXE(SIDE ## PathToClipboardAction2, ScpExplorer->PanelExport(os ## SIDE, pePath, pedClipboard)) \
EXE(SIDE ## FilterAction, ScpExplorer->Filter(os ## SIDE))
EXE(SIDE ## FilterAction, ScpExplorer->Filter(os ## SIDE)) \
EXE(SIDE ## ExploreDirectoryAction, ScpExplorer->ExploreLocalDirectory(os ## SIDE))
PANEL_ACTIONS(Local)
PANEL_ACTIONS(Remote)
#undef PANEL_ACTIONS
EXE(LocalExploreDirectoryAction2, ScpExplorer->ExploreLocalDirectory())
//HELP
EXE(AboutAction, DoAboutDialog(Configuration))

24
source/forms/NonVisual.dfm
View File

@@ -1322,11 +1322,11 @@ object NonVisualDataModule: TNonVisualDataModule
ImageIndex = 64
ShortCut = 16464
end
object LocalExploreDirectoryAction2: TAction
Tag = 15
object LocalExploreDirectoryAction: TAction
Tag = 9
Category = 'Local Directory'
Caption = '&Explore Directory'
Hint = 'Opens Windows File Explorer with the current directory'
Hint = 'Opens Windows File Explorer with the current local directory'
ImageIndex = 56
ShortCut = 49221
end
@@ -2298,6 +2298,14 @@ object NonVisualDataModule: TNonVisualDataModule
HelpKeyword = 'ui_file_panel'
Hint = 'Change right panel layout'
end
object RemoteExploreDirectoryAction: TAction
Tag = 14
Category = 'Remote Directory'
Caption = '&Explore Directory'
Hint = 'Opens Windows File Explorer with the current local directory'
ImageIndex = 56
ShortCut = 49221
end
end
object ExplorerBarPopup: TTBXPopupMenu
Images = GlyphsModule.ExplorerImages
@@ -2535,6 +2543,9 @@ object NonVisualDataModule: TNonVisualDataModule
object TBXItem86: TTBXItem
Action = RemoteOpenDirAction
end
object TBXItem99: TTBXItem
Action = RemoteExploreDirectoryAction
end
object TBXSeparatorItem13: TTBXSeparatorItem
end
object TBXItem87: TTBXItem
@@ -2614,7 +2625,7 @@ object NonVisualDataModule: TNonVisualDataModule
Action = LocalOpenDirAction
end
object TBXItem93: TTBXItem
Action = LocalExploreDirectoryAction2
Action = LocalExploreDirectoryAction
end
object TBXSeparatorItem15: TTBXSeparatorItem
end
@@ -2935,6 +2946,9 @@ object NonVisualDataModule: TNonVisualDataModule
object OpenDirectoryBookmark3: TTBXItem
Action = RemoteOpenDirAction
end
object TBXItem100: TTBXItem
Action = RemoteExploreDirectoryAction
end
object N81: TTBXSeparatorItem
end
object ParentDirectory4: TTBXItem
@@ -3004,7 +3018,7 @@ object NonVisualDataModule: TNonVisualDataModule
Action = LocalOpenDirAction
end
object ExploreDirectory2: TTBXItem
Action = LocalExploreDirectoryAction2
Action = LocalExploreDirectoryAction
end
object N84: TTBXSeparatorItem
end

5
source/forms/NonVisual.h
View File

@@ -185,7 +185,7 @@ __published: // IDE-managed Components
TAction *LocalAddBookmarkAction2;
TAction *RemoteAddBookmarkAction2;
TAction *ConsoleAction;
TAction *LocalExploreDirectoryAction2;
TAction *LocalExploreDirectoryAction;
TAction *CurrentEditAction;
TAction *CurrentOpenAction;
TAction *SynchronizeBrowsingAction2;
@@ -653,6 +653,9 @@ __published: // IDE-managed Components
TTBXSeparatorItem *TBXSeparatorItem16;
TTBXItem *TBXItem97;
TTBXItem *TBXItem98;
TAction *RemoteExploreDirectoryAction;
TTBXItem *TBXItem99;
TTBXItem *TBXItem100;
void __fastcall ExplorerActionsUpdate(TBasicAction *Action, bool &Handled);
void __fastcall ExplorerActionsExecute(TBasicAction *Action, bool &Handled);
void __fastcall SessionIdleTimerTimer(TObject *Sender);

5
source/forms/ScpCommander.cpp
View File

@@ -1140,9 +1140,10 @@ void __fastcall TScpCommanderForm::FullSynchronizeDirectories()
}
}
//---------------------------------------------------------------------------
void __fastcall TScpCommanderForm::ExploreLocalDirectory()
void __fastcall TScpCommanderForm::ExploreLocalDirectory(TOperationSide Side)
{
OpenFolderInExplorer(GetCurrentLocalBrowser()->Path);
DebugAssert(IsSideLocalBrowser(Side));
OpenFolderInExplorer(DirView(Side)->Path);
}
//---------------------------------------------------------------------------
void __fastcall TScpCommanderForm::LocalDirViewExecFile(TObject *Sender,

5
source/forms/ScpCommander.dfm
View File

@@ -57,7 +57,7 @@ inherited ScpCommanderForm: TScpCommanderForm
Action = NonVisualDataModule.LocalOpenDirAction
end
object TBXItem3: TTBXItem
Action = NonVisualDataModule.LocalExploreDirectoryAction2
Action = NonVisualDataModule.LocalExploreDirectoryAction
end
object TBXSeparatorItem2: TTBXSeparatorItem
end
@@ -642,6 +642,9 @@ inherited ScpCommanderForm: TScpCommanderForm
object TBXItem84: TTBXItem
Action = NonVisualDataModule.RemoteOpenDirAction
end
object TBXItem257: TTBXItem
Action = NonVisualDataModule.RemoteExploreDirectoryAction
end
object TBXSeparatorItem25: TTBXSeparatorItem
end
object TBXItem85: TTBXItem

3
source/forms/ScpCommander.h
View File

@@ -440,6 +440,7 @@ __published:
TTBXItem *TBXItem256;
TDriveView *OtherLocalDriveView;
TDirView *OtherLocalDirView;
TTBXItem *TBXItem257;
void __fastcall SplitterMoved(TObject *Sender);
void __fastcall SplitterCanResize(TObject *Sender, int &NewSize,
bool &Accept);
@@ -633,7 +634,7 @@ public:
virtual void __fastcall SynchronizeDirectories();
virtual void __fastcall FullSynchronizeDirectories();
virtual void __fastcall StoreParams();
virtual void __fastcall ExploreLocalDirectory();
virtual void __fastcall ExploreLocalDirectory(TOperationSide Side);
virtual void __fastcall GoToCommandLine();
virtual void __fastcall GoToTree();
virtual void __fastcall OpenConsole(UnicodeString Command = L"");