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

Separating and renaming Session commands that are actually Tab commands

Browse Source 
Source commit: 06c28d0bc130e9ccf0b76237a0aa893832a54716
This commit is contained in:
Martin Prikryl
2020-11-12 14:39:28 +00:00
parent 517b1c832b
commit 3067f4df09
11 changed files with 148 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/forms/CustomScpExplorer.cpp
View File

@@ -11079,6 +11079,11 @@ bool __fastcall TCustomScpExplorerForm::IsActiveTerminal(TTerminal * Terminal)
return (Terminal != NULL) && Terminal->Active;
}
//---------------------------------------------------------------------------
bool __fastcall TCustomScpExplorerForm::HasManagedSession()
{
return (ManagedSession != NULL);
}
//---------------------------------------------------------------------------
bool __fastcall TCustomScpExplorerForm::HasActiveTerminal()
{
return IsActiveTerminal(Terminal);

1
source/forms/CustomScpExplorer.h
View File

@@ -752,6 +752,7 @@ public:
void __fastcall SuspendWindowLock();
void __fastcall ResumeWindowLock();
bool __fastcall HasActiveTerminal();
bool __fastcall HasManagedSession();
virtual bool IsLocalBrowserMode();
void __fastcall NewSession(const UnicodeString & SessionUrl = L"");

29
source/forms/NonVisual.cpp
View File

@@ -135,6 +135,7 @@ void __fastcall TNonVisualDataModule::ExplorerActionsUpdate(
}
void * AuxVoidPtr;
int AuxInt;
#define HasManagedSession ScpExplorer->HasManagedSession()
#define HasTerminal ScpExplorer->HasActiveTerminal()
// CURRENT DIRVIEW
#define EnabledSelectedOperation (ScpExplorer->EnableSelectedOperation[osCurrent])
@@ -350,7 +351,7 @@ void __fastcall TNonVisualDataModule::ExplorerActionsUpdate(
UPDEX(SelectiveToolbarTextAction, true,
SelectiveToolbarTextAction->Checked = WinConfiguration->SelectiveToolbarText, )
UPDCOMP(CustomCommandsBand)
UPD(ColorMenuAction, HasTerminal)
UPD(ColorMenuAction2, HasTerminal)
UPD(GoToAddressAction, true)
UPD(CustomizeToolbarAction, IsToolbarCustomizable())
@@ -413,14 +414,14 @@ void __fastcall TNonVisualDataModule::ExplorerActionsUpdate(
// SESSION
UPD(NewSessionAction, true)
UPD(SiteManagerAction, true)
UPD(DuplicateSessionAction, (ScpExplorer->Terminal != NULL))
UPD(RenameSessionAction, (ScpExplorer->Terminal != NULL))
UPD(CloseSessionAction2, (ScpExplorer->Terminal != NULL))
UPD(DuplicateTabAction, HasManagedSession)
UPD(RenameTabAction, HasManagedSession)
UPD(CloseTabAction, HasManagedSession)
UPDEX1(DisconnectSessionAction, HasTerminal, DisconnectSessionAction->Visible = (ScpExplorer->Terminal == NULL) || !ScpExplorer->Terminal->Disconnected)
UPDEX1(ReconnectSessionAction, (ScpExplorer->Terminal != NULL) && ScpExplorer->Terminal->Disconnected, ReconnectSessionAction->Visible = ReconnectSessionAction->Enabled)
UPD(SavedSessionsAction2, true)
UPD(WorkspacesAction, StoredSessions->HasAnyWorkspace())
UPD(OpenedSessionsAction, HasTerminal)
UPD(OpenedTabsAction, HasManagedSession)
UPD(SaveCurrentSessionAction2, HasTerminal)
UPD(SaveWorkspaceAction, HasTerminal)
@@ -685,7 +686,7 @@ void __fastcall TNonVisualDataModule::ExplorerActionsExecute(
EXE(LockToolbarsAction, WinConfiguration->LockToolbars = !WinConfiguration->LockToolbars)
EXE(SelectiveToolbarTextAction, WinConfiguration->SelectiveToolbarText = !WinConfiguration->SelectiveToolbarText)
EXECOMP(CustomCommandsBand)
EXE(ColorMenuAction, CreateSessionColorMenu(ColorMenuAction))
EXE(ColorMenuAction2, CreateSessionColorMenu(ColorMenuAction2))
EXE(GoToAddressAction, ScpExplorer->GoToAddress())
EXE(CustomizeToolbarAction, CreateToolbarButtonsList())
@@ -748,14 +749,14 @@ void __fastcall TNonVisualDataModule::ExplorerActionsExecute(
// SESSION
EXE(NewSessionAction, ScpExplorer->NewSession())
EXE(SiteManagerAction, ScpExplorer->NewSession())
EXE(DuplicateSessionAction, ScpExplorer->DuplicateSession())
EXE(RenameSessionAction, ScpExplorer->RenameSession())
EXE(CloseSessionAction2, ScpExplorer->CloseSession())
EXE(DuplicateTabAction, ScpExplorer->DuplicateSession())
EXE(RenameTabAction, ScpExplorer->RenameSession())
EXE(CloseTabAction, ScpExplorer->CloseSession())
EXE(DisconnectSessionAction, ScpExplorer->DisconnectSession())
EXE(ReconnectSessionAction, ScpExplorer->ReconnectSession())
EXE(SavedSessionsAction2, CreateSessionListMenu(SavedSessionsAction2))
EXE(WorkspacesAction, CreateWorkspacesMenu(WorkspacesAction))
EXE(OpenedSessionsAction, CreateOpenedSessionListMenu(OpenedSessionsAction))
EXE(OpenedTabsAction, CreateOpenedSessionListMenu(OpenedTabsAction))
EXE(SaveCurrentSessionAction2, ScpExplorer->SaveCurrentSession())
EXE(SaveWorkspaceAction, ScpExplorer->SaveWorkspace(false))
@@ -943,14 +944,14 @@ void __fastcall TNonVisualDataModule::CommanderShortcuts()
LocalSortByExtAction2->ShortCut = ExplorerKeyboardShortcuts ? TShortCut(0) : CtrlF4;
RemoteSortByExtAction2->ShortCut = LocalSortByExtAction2->ShortCut;
CurrentSortByExtAction->ShortCut = LocalSortByExtAction2->ShortCut;
int Index = CloseSessionAction2->SecondaryShortCuts->IndexOfShortCut(CtrlF4);
int Index = CloseTabAction->SecondaryShortCuts->IndexOfShortCut(CtrlF4);
if (ExplorerKeyboardShortcuts && (Index < 0))
{
CloseSessionAction2->SecondaryShortCuts->Add(ShortCutToText(CtrlF4));
CloseTabAction->SecondaryShortCuts->Add(ShortCutToText(CtrlF4));
}
else if (!ExplorerKeyboardShortcuts && (Index >= 0))
{
CloseSessionAction2->SecondaryShortCuts->Delete(Index);
CloseTabAction->SecondaryShortCuts->Delete(Index);
}
CloneShortcuts();
@@ -1544,7 +1545,7 @@ void __fastcall TNonVisualDataModule::CreateOpenedSessionListMenu(TAction * Acti
TTBCustomItem * Item = new TTBXItem(OpenedSessionsMenu);
Item->Caption = TerminalList->Strings[Index];
Item->Tag = int(Terminal);
Item->Hint = FMTLOAD(OPENEDSESSION_HINT, (Item->Caption));
Item->Hint = FMTLOAD(OPENED_TAB_HINT, (Item->Caption));
Item->Checked = (Manager->ActiveTerminal == Terminal);
Item->ShortCut = OpenSessionShortCut(Index);
Item->OnClick = OpenedSessionItemClick;

54
source/forms/NonVisual.dfm
View File

@@ -627,12 +627,12 @@ object NonVisualDataModule: TNonVisualDataModule
'Site Manager|Opens site manager (hold down Shift to open site ma' +
'nager in new window)'
end
object CloseSessionAction2: TAction
object CloseTabAction: TAction
Tag = 15
Category = 'Session'
Caption = '&Close Session'
Category = 'Tab'
Caption = '&Close Tab'
HelpKeyword = 'task_connections#closing'
Hint = 'Terminate the current session and close the tab'
Hint = 'Close the current tab'
ImageIndex = 26
SecondaryShortCuts.Strings = (
'Ctrl+W')
@@ -662,7 +662,7 @@ object NonVisualDataModule: TNonVisualDataModule
end
object WorkspacesAction: TAction
Tag = 15
Category = 'Session'
Category = 'Tab'
Caption = '&Workspaces'
HelpKeyword = 'workspace'
Hint = 'Open workspace'
@@ -1376,22 +1376,22 @@ object NonVisualDataModule: TNonVisualDataModule
'Exit application|Close application (any opened sessions are clos' +
'ed)'
end
object OpenedSessionsAction: TAction
object OpenedTabsAction: TAction
Tag = 15
Category = 'Session'
Caption = '&Opened Sessions'
Category = 'Tab'
Caption = '&Opened Tabs'
HelpKeyword = 'task_connections#switch'
Hint = 'Select session|Select opened session to activate'
Hint = 'Select tab|Select tab to activate'
ImageIndex = 62
end
object DuplicateSessionAction: TAction
object DuplicateTabAction: TAction
Tag = 15
Category = 'Session'
Caption = 'Du&plicate Session'
HelpKeyword = 'task_connections'
Category = 'Tab'
Caption = 'Du&plicate Tab'
HelpKeyword = 'ui_sessiontabs'
Hint =
'Duplicate session|Opens the same session again (hold down Shift ' +
'to open session in new window)'
'Duplicate tab|Open new tab with the same folder (hold down Shift' +
' to open the tab in new window)'
ImageIndex = 91
end
object NewLinkAction: TAction
@@ -1778,12 +1778,12 @@ object NonVisualDataModule: TNonVisualDataModule
HelpKeyword = 'ui_toolbars'
Hint = 'Hide/show custom commands toolbar'
end
object ColorMenuAction: TAction
object ColorMenuAction2: TAction
Tag = 15
Category = 'View'
Caption = 'C&olor'
HelpKeyword = 'task_connections#session_color'
Hint = 'Change color of current session'
Hint = 'Change color of the current tab'
end
object AutoReadDirectoryAfterOpAction: TAction
Tag = 15
@@ -1990,7 +1990,7 @@ object NonVisualDataModule: TNonVisualDataModule
end
object SaveWorkspaceAction: TAction
Tag = 15
Category = 'Session'
Category = 'Tab'
Caption = 'Save Wor&kspace...'
HelpKeyword = 'workspace'
Hint = 'Save workspace|Save workspace'
@@ -2255,12 +2255,12 @@ object NonVisualDataModule: TNonVisualDataModule
HelpKeyword = 'ui_toolbars'
Hint = 'Show/hide toolbar buttons'
end
object RenameSessionAction: TAction
object RenameTabAction: TAction
Tag = 15
Category = 'Session'
Caption = '&Rename Session'
HelpKeyword = 'task_connections#renaming'
Hint = 'Rename session|Changes name of the current session'
Category = 'Tab'
Caption = '&Rename Tab'
HelpKeyword = 'ui_sessiontabs'
Hint = 'Rename tab|Changes the name of the current tab'
end
object CurrentCopyToClipboardAction2: TAction
Tag = 15
@@ -3162,7 +3162,7 @@ object NonVisualDataModule: TNonVisualDataModule
Left = 480
Top = 176
object TBXItem124: TTBXItem
Action = CloseSessionAction2
Action = CloseTabAction
end
object TBXItem79: TTBXItem
Action = DisconnectSessionAction
@@ -3171,10 +3171,10 @@ object NonVisualDataModule: TNonVisualDataModule
Action = ReconnectSessionAction
end
object TBXItem219: TTBXItem
Action = DuplicateSessionAction
Action = DuplicateTabAction
end
object TBXItem78: TTBXItem
Action = RenameSessionAction
Action = RenameTabAction
end
object TBXItem125: TTBXItem
Action = SaveCurrentSessionAction2
@@ -3190,7 +3190,7 @@ object NonVisualDataModule: TNonVisualDataModule
object TBXSeparatorItem52: TTBXSeparatorItem
end
object ColorMenuItem: TTBXColorItem
Action = ColorMenuAction
Action = ColorMenuAction2
Color = clNone
end
object TBXSeparatorItem34: TTBXSeparatorItem

10
source/forms/NonVisual.h
View File

@@ -110,7 +110,7 @@ __published: // IDE-managed Components
TTimer *SessionIdleTimer;
TAction *NewSessionAction;
TAction *SiteManagerAction;
TAction *CloseSessionAction2;
TAction *CloseTabAction;
TAction *SavedSessionsAction2;
TAction *WorkspacesAction;
TAction *ExplorerSessionBandAction;
@@ -190,7 +190,7 @@ __published: // IDE-managed Components
TAction *SynchronizeBrowsingAction2;
TAction *CurrentAddEditLinkAction;
TAction *CloseApplicationAction2;
TAction *OpenedSessionsAction;
TAction *OpenedTabsAction;
TAction *CustomCommandsFileAction;
TAction *CustomCommandsCustomizeAction;
TAction *CheckForUpdatesAction;
@@ -448,7 +448,7 @@ __published: // IDE-managed Components
TTBXItem *TBXItem15;
TTBXItem *TBXItem16;
TAction *CustomCommandsBandAction;
TAction *ColorMenuAction;
TAction *ColorMenuAction2;
TAction *AutoReadDirectoryAfterOpAction;
TTBXPopupMenu *RemoteAddressPopup;
TTBXSubmenuItem *TBXSubmenuItem2;
@@ -462,7 +462,7 @@ __published: // IDE-managed Components
TTBXItem *TBXItem22;
TTBXItem *TBXItem24;
TTBXItem *TBXItem25;
TAction *DuplicateSessionAction;
TAction *DuplicateTabAction;
TAction *CustomCommandsLastAction;
TAction *CustomCommandsLastFocusedAction;
TAction *CustomCommandsEnterFocusedAction;
@@ -613,7 +613,7 @@ __published: // IDE-managed Components
TTBXSubmenuItem *TBXSubmenuItem6;
TTBXSubmenuItem *TBXSubmenuItem9;
TAction *PrivateKeyUploadAction;
TAction *RenameSessionAction;
TAction *RenameTabAction;
TTBXItem *TBXItem78;
TAction *CurrentCopyToClipboardAction2;
TAction *FileColorsPreferencesAction;

71
source/forms/ScpCommander.dfm
View File

@@ -406,6 +406,37 @@ inherited ScpCommanderForm: TScpCommanderForm
Action = NonVisualDataModule.CloseApplicationAction2
end
end
object TBXSubmenuItem29: TTBXSubmenuItem
Caption = '&Tab'
HelpKeyword = 'ui_sessiontabs'
Hint = 'Tab commands'
object TBXItem115: TTBXItem
Action = NonVisualDataModule.CloseTabAction
end
object TBXItem218: TTBXItem
Action = NonVisualDataModule.DuplicateTabAction
end
object TBXItem127: TTBXItem
Action = NonVisualDataModule.RenameTabAction
end
object TBXSeparatorItem53: TTBXSeparatorItem
end
object ColorMenuItem: TTBXColorItem
Action = NonVisualDataModule.ColorMenuAction2
Color = clNone
end
object TBXSeparatorItem29: TTBXSeparatorItem
end
object TBXSubmenuItem21: TTBXSubmenuItem
Action = NonVisualDataModule.OpenedTabsAction
end
object TBXSubmenuItem231: TTBXSubmenuItem
Action = NonVisualDataModule.WorkspacesAction
end
object TBXItem230: TTBXItem
Action = NonVisualDataModule.SaveWorkspaceAction
end
end
object TBXSubmenuItem19: TTBXSubmenuItem
Caption = '&Session'
HelpKeyword = 'ui_commander_menu#session'
@@ -413,21 +444,12 @@ inherited ScpCommanderForm: TScpCommanderForm
object TBXItem113: TTBXItem
Action = NonVisualDataModule.NewSessionAction
end
object TBXItem115: TTBXItem
Action = NonVisualDataModule.CloseSessionAction2
end
object TBXItem252: TTBXItem
Action = NonVisualDataModule.DisconnectSessionAction
end
object TBXItem253: TTBXItem
Action = NonVisualDataModule.ReconnectSessionAction
end
object TBXItem218: TTBXItem
Action = NonVisualDataModule.DuplicateSessionAction
end
object TBXItem127: TTBXItem
Action = NonVisualDataModule.RenameSessionAction
end
object TBXItem114: TTBXItem
Action = NonVisualDataModule.SaveCurrentSessionAction2
end
@@ -447,23 +469,6 @@ inherited ScpCommanderForm: TScpCommanderForm
end
object TBXSeparatorItem23: TTBXSeparatorItem
end
object ColorMenuItem: TTBXColorItem
Action = NonVisualDataModule.ColorMenuAction
Color = clNone
end
object TBXSeparatorItem29: TTBXSeparatorItem
end
object TBXSubmenuItem21: TTBXSubmenuItem
Action = NonVisualDataModule.OpenedSessionsAction
end
object TBXSubmenuItem231: TTBXSubmenuItem
Action = NonVisualDataModule.WorkspacesAction
end
object TBXItem230: TTBXItem
Action = NonVisualDataModule.SaveWorkspaceAction
end
object TBXSeparatorItem53: TTBXSeparatorItem
end
object TBXSubmenuItem20: TTBXSubmenuItem
Action = NonVisualDataModule.SavedSessionsAction2
end
@@ -850,15 +855,17 @@ inherited ScpCommanderForm: TScpCommanderForm
Action = NonVisualDataModule.NewSessionAction
DisplayMode = nbdmImageAndText
end
object TBXItem219: TTBXItem
Action = NonVisualDataModule.DuplicateSessionAction
end
object TBXItem124: TTBXItem
Action = NonVisualDataModule.CloseSessionAction2
end
object TBXItem125: TTBXItem
Action = NonVisualDataModule.SaveCurrentSessionAction2
end
object TBXSeparatorItem66: TTBXSeparatorItem
end
object TBXItem219: TTBXItem
Action = NonVisualDataModule.DuplicateTabAction
end
object TBXItem124: TTBXItem
Action = NonVisualDataModule.CloseTabAction
end
object TBXSeparatorItem34: TTBXSeparatorItem
end
object TBXSubmenuItem23: TTBXSubmenuItem

4
source/forms/ScpCommander.h
View File

@@ -350,7 +350,6 @@ __published:
TTBXItem *TBXItem210;
TTBXSubmenuItem *TBXItem228;
TTBXSubmenuItem *TBXItem229;
TTBXSeparatorItem *TBXSeparatorItem53;
TTBXItem *TBXItem230;
TTBXSubmenuItem *TBXSubmenuItem231;
TTBXToolbar *LocalFileToolbar;
@@ -441,6 +440,9 @@ __published:
TDriveView *OtherLocalDriveView;
TDirView *OtherLocalDirView;
TTBXItem *TBXItem257;
TTBXSubmenuItem *TBXSubmenuItem29;
TTBXSeparatorItem *TBXSeparatorItem53;
TTBXSeparatorItem *TBXSeparatorItem66;
void __fastcall SplitterMoved(TObject *Sender);
void __fastcall SplitterCanResize(TObject *Sender, int &NewSize,
bool &Accept);

73
source/forms/ScpExplorer.dfm
View File

@@ -134,7 +134,7 @@ inherited ScpExplorerForm: TScpExplorerForm
object TBXSeparatorItem1: TTBXSeparatorItem
end
object TBXItem1: TTBXItem
Action = NonVisualDataModule.CloseSessionAction2
Action = NonVisualDataModule.CloseTabAction
end
object TBXItem2: TTBXItem
Action = NonVisualDataModule.CloseApplicationAction2
@@ -283,6 +283,37 @@ inherited ScpExplorerForm: TScpExplorerForm
Action = NonVisualDataModule.UnselectSameExtAction
end
end
object TBXSubmenuItem29: TTBXSubmenuItem
Caption = '&Tab'
HelpKeyword = 'ui_sessiontabs'
Hint = 'Tab commands'
object TBXItem166: TTBXItem
Action = NonVisualDataModule.CloseTabAction
end
object TBXItem218: TTBXItem
Action = NonVisualDataModule.DuplicateTabAction
end
object TBXItem167: TTBXItem
Action = NonVisualDataModule.RenameTabAction
end
object TBXSeparatorItem47: TTBXSeparatorItem
end
object ColorMenuItem: TTBXColorItem
Action = NonVisualDataModule.ColorMenuAction2
Color = clNone
end
object TBXSeparatorItem49: TTBXSeparatorItem
end
object TBXSubmenuItem9: TTBXSubmenuItem
Action = NonVisualDataModule.OpenedTabsAction
end
object TBXSubmenuItem10: TTBXSubmenuItem
Action = NonVisualDataModule.WorkspacesAction
end
object TBXItem168: TTBXItem
Action = NonVisualDataModule.SaveWorkspaceAction
end
end
object TBXSubmenuItem19: TTBXSubmenuItem
Caption = '&Session'
HelpKeyword = 'ui_explorer_menu#session'
@@ -290,21 +321,12 @@ inherited ScpExplorerForm: TScpExplorerForm
object TBXItem113: TTBXItem
Action = NonVisualDataModule.NewSessionAction
end
object TBXItem115: TTBXItem
Action = NonVisualDataModule.CloseSessionAction2
end
object TBXItem162: TTBXItem
Action = NonVisualDataModule.DisconnectSessionAction
end
object TBXItem163: TTBXItem
Action = NonVisualDataModule.ReconnectSessionAction
end
object TBXItem90: TTBXItem
Action = NonVisualDataModule.DuplicateSessionAction
end
object TBXItem61: TTBXItem
Action = NonVisualDataModule.RenameSessionAction
end
object TBXItem114: TTBXItem
Action = NonVisualDataModule.SaveCurrentSessionAction2
end
@@ -322,23 +344,6 @@ inherited ScpExplorerForm: TScpExplorerForm
object TBXItem14: TTBXItem
Action = NonVisualDataModule.PrivateKeyUploadAction
end
object TBXSeparatorItem23: TTBXSeparatorItem
end
object ColorMenuItem: TTBXColorItem
Action = NonVisualDataModule.ColorMenuAction
Color = clNone
end
object TBXSeparatorItem29: TTBXSeparatorItem
end
object TBXSubmenuItem21: TTBXSubmenuItem
Action = NonVisualDataModule.OpenedSessionsAction
end
object TBXSubmenuItem231: TTBXSubmenuItem
Action = NonVisualDataModule.WorkspacesAction
end
object TBXItem230: TTBXItem
Action = NonVisualDataModule.SaveWorkspaceAction
end
object TBXSeparatorItem53: TTBXSeparatorItem
end
object TBXSubmenuItem20: TTBXSubmenuItem
@@ -770,15 +775,17 @@ inherited ScpExplorerForm: TScpExplorerForm
Action = NonVisualDataModule.NewSessionAction
DisplayMode = nbdmImageAndText
end
object TBXItem137: TTBXItem
Action = NonVisualDataModule.DuplicateSessionAction
end
object TBXItem124: TTBXItem
Action = NonVisualDataModule.CloseSessionAction2
end
object TBXItem125: TTBXItem
Action = NonVisualDataModule.SaveCurrentSessionAction2
end
object TBXSeparatorItem23: TTBXSeparatorItem
end
object TBXItem137: TTBXItem
Action = NonVisualDataModule.DuplicateTabAction
end
object TBXItem124: TTBXItem
Action = NonVisualDataModule.CloseTabAction
end
object TBXSeparatorItem34: TTBXSeparatorItem
end
object TBXSubmenuItem23: TTBXSubmenuItem

20
source/forms/ScpExplorer.h
View File

@@ -86,10 +86,7 @@ __published:
TTBXSubmenuItem *TBXSubmenuItem19;
TTBXItem *TBXItem113;
TTBXSubmenuItem *TBXSubmenuItem20;
TTBXSeparatorItem *TBXSeparatorItem29;
TTBXSubmenuItem *TBXSubmenuItem21;
TTBXItem *TBXItem114;
TTBXItem *TBXItem115;
TTBXSubmenuItem *TBXSubmenuItem14;
TTBXItem *TBXItem77;
TTBXItem *TBXItem78;
@@ -259,14 +256,11 @@ __published:
TTBXItem *TBXItem4;
TTBXToolbar *CustomCommandsToolbar;
TTBXItem *TBXItem28;
TTBXColorItem *ColorMenuItem;
TTBXSeparatorItem *TBXSeparatorItem23;
TTBXDropDownItem *TransferDropDown;
TTBXStringList *TransferList;
TTBXLabelItem *TransferLabel;
TTBXSeparatorItem *TBXSeparatorItem52;
TTBXItem *TBXItem189;
TTBXItem *TBXItem90;
TTBXItem *TBXItem137;
TTBXComboBoxItem *UnixPathComboBox;
TTBXComboBoxItem *QueueSpeedComboBoxItem;
@@ -278,8 +272,6 @@ __published:
TTBXItem *TBXItem3;
TTBXItem *TBXItem139;
TTBXSeparatorItem *TBXSeparatorItem53;
TTBXItem *TBXItem230;
TTBXSubmenuItem *TBXSubmenuItem231;
TTBXSeparatorItem *TBXSeparatorItem24;
TTBXLabelItem *TransferSettingsLabelItem;
TTBXItem *TBXItem140;
@@ -314,7 +306,6 @@ __published:
TTBXItem *TBXItem244;
TTBXItem *TBXItem246;
TTBXItem *TBXItem14;
TTBXItem *TBXItem61;
TTBXSeparatorItem *TBXSeparatorItem42;
TTBXItem *TBXItem62;
TTBXItem *TBXItem127;
@@ -325,6 +316,17 @@ __published:
TTBXItem *TBXItem164;
TTBXItem *TBXItem165;
TTBXSeparatorItem *TBXSeparatorItem44;
TTBXSubmenuItem *TBXSubmenuItem29;
TTBXItem *TBXItem166;
TTBXItem *TBXItem218;
TTBXItem *TBXItem167;
TTBXSeparatorItem *TBXSeparatorItem47;
TTBXColorItem *ColorMenuItem;
TTBXSeparatorItem *TBXSeparatorItem49;
TTBXSubmenuItem *TBXSubmenuItem9;
TTBXSubmenuItem *TBXSubmenuItem10;
TTBXItem *TBXItem168;
TTBXSeparatorItem *TBXSeparatorItem23;
void __fastcall RemoteDirViewUpdateStatusBar(TObject *Sender,
const TStatusFileInfo &FileInfo);
void __fastcall UnixPathComboBoxBeginEdit(TTBEditItem *Sender,

2
source/resource/TextsWin.h
View File

@@ -349,7 +349,7 @@
#define EDITOR_INVALID_LINE 1672
#define LINK_EDIT_CAPTION 1673
#define LINK_ADD_CAPTION 1674
#define OPENEDSESSION_HINT 1677
#define OPENED_TAB_HINT 1677
#define ADD_BOOKMARK_CAPTION 1678
#define ADD_BOOKMARK_PROMPT 1679
#define MOVE_BOOKMARK_CAPTION 1680

2
source/resource/TextsWin1.rc
View File

@@ -354,7 +354,7 @@ BEGIN
LINK_ADD_CAPTION, "Add link/shortcut"
STATUS_NOT_CONNECTED2, "Not connected"
STATUS_CONNECTING, "Connecting..."
OPENEDSESSION_HINT, "Select session '%s'"
OPENED_TAB_HINT, "Select tab '%s'"
ADD_BOOKMARK_CAPTION, "Add Location Profile"
ADD_BOOKMARK_PROMPT, "Location Profile name:"
MOVE_BOOKMARK_CAPTION, "Move Location Profile"