tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add keyboard shortcuts for switching to panels 

Close #8719, close #8720
This commit is contained in:
Udo Hoffmann 2020-08-16 11:39:53 +02:00 committed by Don HO
parent b072479bb8
commit 0fe971ca88
6 changed files with 51 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PowerEditor/installer/nativeLang/english.xml
View File

@ -571,6 +571,11 @@
<Item id="44080" name="Toggle Document Map"/>
<Item id="44084" name="Toggle Function List"/>
<Item id="50005" name="Toggle macro recording"/>
<Item id="44104" name="Switch to Project Panel 1"/>
<Item id="44105" name="Switch to Project Panel 2"/>
<Item id="44106" name="Switch to Project Panel 3"/>
<Item id="44107" name="Switch to Folder as Workspace"/>
<Item id="44108" name="Switch to Function List"/>
</MainCommandNames>
</ShortcutMapper>
<ShortcutMapperSubDialg title="Shortcut">

5
PowerEditor/installer/nativeLang/english_customizable.xml
View File

@ -571,6 +571,11 @@
<Item id="44080" name="Toggle Document Map"/>
<Item id="44084" name="Toggle Function List"/>
<Item id="50005" name="Toggle macro recording"/>
<Item id="44104" name="Switch to Project Panel 1"/>
<Item id="44105" name="Switch to Project Panel 2"/>
<Item id="44106" name="Switch to Project Panel 3"/>
<Item id="44107" name="Switch to Folder as Workspace"/>
<Item id="44108" name="Switch to Function List"/>
</MainCommandNames>
</ShortcutMapper>
<ShortcutMapperSubDialg title="Shortcut">

3
PowerEditor/src/Notepad_plus.cpp
View File

@ -6217,9 +6217,6 @@ void Notepad_plus::launchFunctionList()
}
_pFuncList->display();
_pFuncList->reload();
_pEditView->getFocus();
}

32
PowerEditor/src/NppCommands.cpp
View File

@ -719,7 +719,19 @@ void Notepad_plus::command(int id)
}
break;
case IDM_VIEW_SWITCHTO_PROJECT_PANEL_1:
case IDM_VIEW_SWITCHTO_PROJECT_PANEL_2:
case IDM_VIEW_SWITCHTO_PROJECT_PANEL_3:
{
ProjectPanel** pp [] = {&_pProjectPanel_1, &_pProjectPanel_2, &_pProjectPanel_3};
int idx = id - IDM_VIEW_SWITCHTO_PROJECT_PANEL_1;
launchProjectPanel(id - IDM_VIEW_SWITCHTO_PROJECT_PANEL_1 + IDM_VIEW_PROJECT_PANEL_1, pp [idx], idx);
}
break;
case IDM_VIEW_FILEBROWSER:
case IDM_VIEW_SWITCHTO_FILEBROWSER:
{
if (_pFileBrowser == nullptr) // first launch, check in params to open folders
{
@ -734,7 +746,7 @@ void Notepad_plus::command(int id)
}
else
{
if (not _pFileBrowser->isClosed())
if (!_pFileBrowser->isClosed() && (id != IDM_VIEW_SWITCHTO_FILEBROWSER))
{
_pFileBrowser->display(false);
_pFileBrowser->setClosed(true);
@ -776,9 +788,25 @@ void Notepad_plus::command(int id)
}
break;
case IDM_VIEW_SWITCHTO_FUNC_LIST:
{
if (_pFuncList && _pFuncList->isVisible())
{
_pFuncList->getFocus();
}
else
{
checkMenuItem(IDM_VIEW_FUNC_LIST, true);
_toolBar.setCheck(IDM_VIEW_FUNC_LIST, true);
launchFunctionList();
_pFuncList->setClosed(false);
}
}
break;
case IDM_VIEW_FUNC_LIST:
{
if (_pFuncList && (not _pFuncList->isClosed()))
if (_pFuncList && (!_pFuncList->isClosed()))
{
_pFuncList->display(false);
_pFuncList->setClosed(true);

5
PowerEditor/src/Parameters.cpp
View File

@ -302,6 +302,11 @@ static const WinMenuKeyDefinition winKeyDefs[] =
{ VK_NULL, IDM_VIEW_FILEBROWSER, false, false, false, TEXT("Toggle Folder as Workspace") },
{ VK_NULL, IDM_VIEW_DOC_MAP, false, false, false, TEXT("Toggle Document Map") },
{ VK_NULL, IDM_VIEW_FUNC_LIST, false, false, false, TEXT("Toggle Function List") },
{ VK_NULL, IDM_VIEW_SWITCHTO_PROJECT_PANEL_1, false, false, false, TEXT("Switch to Project Panel 1") },
{ VK_NULL, IDM_VIEW_SWITCHTO_PROJECT_PANEL_2, false, false, false, TEXT("Switch to Project Panel 2") },
{ VK_NULL, IDM_VIEW_SWITCHTO_PROJECT_PANEL_3, false, false, false, TEXT("Switch to Project Panel 3") },
{ VK_NULL, IDM_VIEW_SWITCHTO_FILEBROWSER, false, false, false, TEXT("Switch to Folder as Workspace") },
{ VK_NULL, IDM_VIEW_SWITCHTO_FUNC_LIST, false, false, false, TEXT("Switch to Function List") },
{ VK_NULL, IDM_VIEW_SYNSCROLLV, false, false, false, nullptr },
{ VK_NULL, IDM_VIEW_SYNSCROLLH, false, false, false, nullptr },
{ VK_R, IDM_EDIT_RTL, true, true, false, nullptr },

6
PowerEditor/src/menuCmdID.h
View File

@ -357,6 +357,12 @@
#define IDM_VIEW_IN_EDGE (IDM_VIEW + 102)
#define IDM_VIEW_IN_IE (IDM_VIEW + 103)
#define IDM_VIEW_SWITCHTO_PROJECT_PANEL_1 (IDM_VIEW + 104)
#define IDM_VIEW_SWITCHTO_PROJECT_PANEL_2 (IDM_VIEW + 105)
#define IDM_VIEW_SWITCHTO_PROJECT_PANEL_3 (IDM_VIEW + 106)
#define IDM_VIEW_SWITCHTO_FILEBROWSER (IDM_VIEW + 107)
#define IDM_VIEW_SWITCHTO_FUNC_LIST (IDM_VIEW + 108)
#define IDM_VIEW_GOTO_ANOTHER_VIEW 10001
#define IDM_VIEW_CLONE_TO_ANOTHER_VIEW 10002
#define IDM_VIEW_GOTO_NEW_INSTANCE 10003