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

Make Document List Panel togglable and shortcutable via View menu 

1. Toggle toolbar item and view menu item for Document List Panel.
2. Added standard, filledFluent, darkmode->toolbar->(fluent and filledfluent) icons for the Document List Panel toggle.
3. Working shortcut for the Document List Panel under shortcut mapper.
4. Removed show document panel from the preference menu, kept the extension option.
5. Rename "Doc Switcher" to "Document list".

Fix #3526, fix #9015, close #10214
This commit is contained in:
Ashfaaq18 2021-07-21 04:00:10 +05:30 committed by Don HO
parent a4cfd2a126
commit 7b1e6546a1
23 changed files with 79 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,6 +260,7 @@ The comments are here for explanation, it's not necessary to translate them.
<Item id="44031" name="Uncollapse Current Level"/>
<Item id="44049" name="Summary..."/>
<Item id="44080" name="Document Map"/>
<Item id="44081" name="Document List"/>
<Item id="44084" name="Function List"/>
<Item id="44085" name="Folder as Workspace"/>
<Item id="44086" name="1st Tab"/>
@ -608,6 +609,7 @@ The comments are here for explanation, it's not necessary to translate them.
<Item id="44083" name="Toggle Project Panel 3"/>
<Item id="44085" name="Toggle Folder as Workspace"/>
<Item id="44080" name="Toggle Document Map"/>
<Item id="44081" name="Toggle Document List"/>
<Item id="44084" name="Toggle Function List"/>
<Item id="50005" name="Toggle macro recording"/>
<Item id="44104" name="Switch to Project Panel 1"/>
@ -826,7 +828,6 @@ The comments are here for explanation, it's not necessary to translate them.
<Item id="6123" name="Localization"/>
<Item id="6125" name="Document List Panel"/>
<Item id="6126" name="Show"/>
<Item id="6127" name="Disable extension column"/>
<Item id="6128" name="Alternate icons"/>
@ -1258,11 +1259,11 @@ You can re-activate this dialog in Preferences dialog later." /> <!-- HowToRepro
<ClipboardHistory>
<PanelTitle name="Clipboard History"/>
</ClipboardHistory>
<DocSwitcher>
<PanelTitle name="Doc Switcher"/>
<DocList>
<PanelTitle name="Document List"/>
<ColumnName name="Name"/>
<ColumnExt name="Ext."/>
</DocSwitcher>
</DocList>
<WindowsDlg>
<ColumnName name="Name"/>
<ColumnPath name="Path"/>

20
PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h
View File

@ -365,14 +365,14 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64 };
// You allocate a buffer of the length of (the number of characters + 1) then call NPPM_GETLANGUAGEDESC function the 2nd time
// by passing allocated buffer as argument langDesc
#define NPPM_SHOWDOCSWITCHER (NPPMSG + 85)
// VOID NPPM_SHOWDOCSWITCHER(0, BOOL toShowOrNot)
// Send this message to show or hide doc switcher.
// if toShowOrNot is TRUE then show doc switcher, otherwise hide it.
#define NPPM_SHOWDOCLIST (NPPMSG + 85)
// VOID NPPM_SHOWDOCLIST(0, BOOL toShowOrNot)
// Send this message to show or hide Document List.
// if toShowOrNot is TRUE then show Document List, otherwise hide it.
#define NPPM_ISDOCSWITCHERSHOWN (NPPMSG + 86)
// BOOL NPPM_ISDOCSWITCHERSHOWN(0, 0)
// Check to see if doc switcher is shown.
#define NPPM_ISDOCLISTSHOWN (NPPMSG + 86)
// BOOL NPPM_ISDOCLISTSHOWN(0, 0)
// Check to see if Document List is shown.
#define NPPM_GETAPPDATAPLUGINSALLOWED (NPPMSG + 87)
// BOOL NPPM_GETAPPDATAPLUGINSALLOWED(0, 0)
@ -382,9 +382,9 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64 };
// INT NPPM_GETCURRENTVIEW(0, 0)
// Return: current edit view of Notepad++. Only 2 possible values: 0 = Main, 1 = Secondary
#define NPPM_DOCSWITCHERDISABLECOLUMN (NPPMSG + 89)
// VOID NPPM_DOCSWITCHERDISABLECOLUMN(0, BOOL disableOrNot)
// Disable or enable extension column of doc switcher
#define NPPM_DOCLISTDISABLECOLUMN (NPPMSG + 89)
// VOID NPPM_DOCLISTDISABLECOLUMN(0, BOOL disableOrNot)
// Disable or enable extension column of Document List
#define NPPM_GETEDITORDEFAULTFOREGROUNDCOLOR (NPPMSG + 90)
// INT NPPM_GETEDITORDEFAULTFOREGROUNDCOLOR(0, 0)

7
PowerEditor/src/Notepad_plus.cpp
View File

@ -102,6 +102,7 @@ ToolBarButtonUnit toolBarIcons[] = {
{IDM_VIEW_INDENT_GUIDE, IDI_VIEW_INDENT_ICON, IDI_VIEW_INDENT_ICON, IDI_VIEW_INDENT_ICON2, IDI_VIEW_INDENT_ICON2, IDI_VIEW_INDENT_ICON_DM, IDI_VIEW_INDENT_ICON_DM, IDI_VIEW_INDENT_ICON_DM2, IDI_VIEW_INDENT_ICON_DM2, IDR_INDENTGUIDE},
{IDM_LANG_USER_DLG, IDI_VIEW_UD_DLG_ICON, IDI_VIEW_UD_DLG_ICON, IDI_VIEW_UD_DLG_ICON2, IDI_VIEW_UD_DLG_ICON2, IDI_VIEW_UD_DLG_ICON_DM, IDI_VIEW_UD_DLG_ICON_DM, IDI_VIEW_UD_DLG_ICON_DM2, IDI_VIEW_UD_DLG_ICON_DM2, IDR_SHOWPANNEL},
{IDM_VIEW_DOC_MAP, IDI_VIEW_DOC_MAP_ICON, IDI_VIEW_DOC_MAP_ICON, IDI_VIEW_DOC_MAP_ICON2, IDI_VIEW_DOC_MAP_ICON2, IDI_VIEW_DOC_MAP_ICON_DM, IDI_VIEW_DOC_MAP_ICON_DM, IDI_VIEW_DOC_MAP_ICON_DM2, IDI_VIEW_DOC_MAP_ICON_DM2, IDR_DOCMAP},
{IDM_VIEW_DOCLIST, IDI_VIEW_DOCLIST_ICON, IDI_VIEW_DOCLIST_ICON, IDI_VIEW_DOCLIST_ICON2, IDI_VIEW_DOCLIST_ICON2, IDI_VIEW_DOCLIST_ICON_DM, IDI_VIEW_DOCLIST_ICON_DM, IDI_VIEW_DOCLIST_ICON_DM2, IDI_VIEW_DOCLIST_ICON_DM2, IDR_DOCLIST},
{IDM_VIEW_FUNC_LIST, IDI_VIEW_FUNCLIST_ICON, IDI_VIEW_FUNCLIST_ICON, IDI_VIEW_FUNCLIST_ICON2, IDI_VIEW_FUNCLIST_ICON2, IDI_VIEW_FUNCLIST_ICON_DM, IDI_VIEW_FUNCLIST_ICON_DM, IDI_VIEW_FUNCLIST_ICON_DM2, IDI_VIEW_FUNCLIST_ICON_DM2, IDR_FUNC_LIST},
{IDM_VIEW_FILEBROWSER, IDI_VIEW_FILEBROWSER_ICON, IDI_VIEW_FILEBROWSER_ICON, IDI_VIEW_FILEBROWSER_ICON2, IDI_VIEW_FILEBROWSER_ICON2, IDI_VIEW_FILEBROWSER_ICON_DM, IDI_VIEW_FILEBROWSER_ICON_DM, IDI_VIEW_FILEBROWSER_ICON_DM2, IDI_VIEW_FILEBROWSER_ICON_DM2, IDR_FILEBROWSER},
{IDM_VIEW_MONITORING, IDI_VIEW_MONITORING_ICON, IDI_VIEW_MONITORING_ICON, IDI_VIEW_MONITORING_ICON2, IDI_VIEW_MONITORING_ICON2, IDI_VIEW_MONITORING_ICON_DM, IDI_VIEW_MONITORING_ICON_DM, IDI_VIEW_MONITORING_ICON_DM2, IDI_VIEW_MONITORING_ICON_DM2, IDR_FILEMONITORING},
@ -6554,15 +6555,15 @@ void Notepad_plus::launchFileSwitcherPanel()
::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, reinterpret_cast<LPARAM>(_pFileSwitcherPanel->getHSelf()));
// define the default docking behaviour
data.uMask = DWS_DF_CONT_LEFT | DWS_ICONTAB;
data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDR_DOCSWITCHER_ICO), IMAGE_ICON, 14, 14, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDR_DOCLIST_ICO), IMAGE_ICON, 14, 14, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
data.pszModuleName = NPP_INTERNAL_FUCTION_STR;
// the dlgDlg should be the index of funcItem where the current function pointer is
// in this case is DOCKABLE_DEMO_INDEX
// In the case of Notepad++ internal function, it'll be the command ID which triggers this dialog
data.dlgID = IDM_VIEW_FILESWITCHER_PANEL;
data.dlgID = IDM_VIEW_DOCLIST;
generic_string title_temp = pNativeSpeaker->getAttrNameStr(FS_PROJECTPANELTITLE, "DocSwitcher", "PanelTitle");
generic_string title_temp = pNativeSpeaker->getAttrNameStr(FS_PROJECTPANELTITLE, "DocList", "PanelTitle");
static TCHAR title[32];
if (title_temp.length() < 32)
{

7
PowerEditor/src/Notepad_plus.rc
View File

@ -102,6 +102,7 @@ IDI_SYNCV_DISABLE_ICON ICON "icons/syncV_dis.ico"
IDI_SYNCH_ICON ICON "icons/syncH_off.ico"
IDI_SYNCH_DISABLE_ICON ICON "icons/syncH_dis.ico"
IDI_VIEW_DOC_MAP_ICON ICON "icons/docMap_off.ico"
IDI_VIEW_DOCLIST_ICON ICON "icons/docList_off.ico"
IDI_VIEW_FUNCLIST_ICON ICON "icons/funcList_off.ico"
IDI_VIEW_FILEBROWSER_ICON ICON "icons/fileBrowser_off.ico"
IDI_VIEW_MONITORING_ICON ICON "icons/monitoring_off.ico"
@ -151,6 +152,7 @@ IDI_SYNCV_DISABLE_ICON2 ICON "icons/filledFluentUI/syncV_dis.ico"
IDI_SYNCH_ICON2 ICON "icons/filledFluentUI/syncH_off.ico"
IDI_SYNCH_DISABLE_ICON2 ICON "icons/filledFluentUI/syncH_dis.ico"
IDI_VIEW_DOC_MAP_ICON2 ICON "icons/filledFluentUI/docMap_off.ico"
IDI_VIEW_DOCLIST_ICON2 ICON "icons/filledFluentUI/docList_off.ico"
IDI_VIEW_FUNCLIST_ICON2 ICON "icons/filledFluentUI/funcList_off.ico"
IDI_VIEW_FILEBROWSER_ICON2 ICON "icons/filledFluentUI/fileBrowser_off.ico"
IDI_VIEW_MONITORING_ICON2 ICON "icons/filledFluentUI/monitoring_off.ico"
@ -200,6 +202,7 @@ IDI_SYNCV_DISABLE_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/sy
IDI_SYNCH_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/syncH_off.ico"
IDI_SYNCH_DISABLE_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/syncH_dis.ico"
IDI_VIEW_DOC_MAP_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/docMap_off.ico"
IDI_VIEW_DOCLIST_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/docList_off.ico"
IDI_VIEW_FUNCLIST_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/funcList_off.ico"
IDI_VIEW_FILEBROWSER_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/fileBrowser_off.ico"
IDI_VIEW_MONITORING_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/monitoring_off.ico"
@ -249,6 +252,7 @@ IDI_SYNCV_DISABLE_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluen
IDI_SYNCH_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/syncH_off.ico"
IDI_SYNCH_DISABLE_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/syncH_dis.ico"
IDI_VIEW_DOC_MAP_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/docMap_off.ico"
IDI_VIEW_DOCLIST_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/docList_off.ico"
IDI_VIEW_FUNCLIST_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/funcList_off.ico"
IDI_VIEW_FILEBROWSER_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/fileBrowser_off.ico"
IDI_VIEW_MONITORING_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/monitoring_off.ico"
@ -313,11 +317,13 @@ IDR_CLOSETAB_INACT_DM BITMAP "icons/darkMode/tabbar/closeTabButton_
IDR_CLOSETAB_HOVER_DM BITMAP "icons/darkMode/tabbar/closeTabButton_hover.bmp"
IDR_CLOSETAB_PUSH_DM BITMAP "icons/darkMode/tabbar/closeTabButton_push.bmp"
IDR_DOCMAP BITMAP "icons/docMap.bmp"
IDR_DOCLIST BITMAP "icons/docList.bmp"
IDR_FUNC_LIST BITMAP "icons/functionList.bmp"
IDR_FILEBROWSER BITMAP "icons/fileBrowser.bmp"
IDR_FILEMONITORING BITMAP "icons/fileMonitoring.bmp"
IDR_DOCMAP_ICO ICON "icons/docMap.ico"
IDR_DOCLIST_ICO ICON "icons/docList.ico"
IDR_FUNC_LIST_ICO ICON "icons/functionList.ico"
IDR_PROJECTPANEL_ICO ICON "icons/projectPanel.ico"
IDR_FILEBROWSER_ICO ICON "icons/fileBrowser.ico"
@ -705,6 +711,7 @@ BEGIN
END
MENUITEM "Folder as Workspace", IDM_VIEW_FILEBROWSER
MENUITEM "Document Map", IDM_VIEW_DOC_MAP
MENUITEM "Document List", IDM_VIEW_DOCLIST
MENUITEM "Function List", IDM_VIEW_FUNC_LIST
MENUITEM SEPARATOR
MENUITEM "Synchronize Vertical Scrolling", IDM_VIEW_SYNSCROLLV

6
PowerEditor/src/NppBigSwitch.cpp
View File

@ -2438,7 +2438,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
return langDesc.length();
}
case NPPM_DOCSWITCHERDISABLECOLUMN:
case NPPM_DOCLISTDISABLECOLUMN:
{
BOOL isOff = static_cast<BOOL>(lParam);
NppGUI & nppGUI = nppParam.getNppGUI();
@ -2460,7 +2460,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
:(NppParameters::getInstance()).getCurrentDefaultBgColor());
}
case NPPM_SHOWDOCSWITCHER:
case NPPM_SHOWDOCLIST:
{
BOOL toShow = static_cast<BOOL>(lParam);
if (toShow)
@ -2476,7 +2476,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
return TRUE;
}
case NPPM_ISDOCSWITCHERSHOWN:
case NPPM_ISDOCLISTSHOWN:
{
if (!_pFileSwitcherPanel)
return FALSE;

20
PowerEditor/src/NppCommands.cpp
View File

@ -737,9 +737,25 @@ void Notepad_plus::command(int id)
}
break;
case IDM_VIEW_FILESWITCHER_PANEL:
case IDM_VIEW_DOCLIST:
{
launchFileSwitcherPanel();
if (_pFileSwitcherPanel && (!_pFileSwitcherPanel->isClosed()))
{
_pFileSwitcherPanel->display(false);
_pFileSwitcherPanel->setClosed(true);
checkMenuItem(IDM_VIEW_DOCLIST, false);
_toolBar.setCheck(IDM_VIEW_DOCLIST, false);
}
else
{
launchFileSwitcherPanel();
if (_pFileSwitcherPanel)
{
checkMenuItem(IDM_VIEW_DOCLIST, true);
_toolBar.setCheck(IDM_VIEW_DOCLIST, true);
_pFileSwitcherPanel->setClosed(false);
}
}
}
break;

1
PowerEditor/src/Parameters.cpp
View File

@ -305,6 +305,7 @@ static const WinMenuKeyDefinition winKeyDefs[] =
{ VK_NULL, IDM_VIEW_PROJECT_PANEL_3, false, false, false, TEXT("Toggle Project Panel 3") },
{ 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_DOCLIST, false, false, false, TEXT("Toggle Document List") },
{ 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") },

7
PowerEditor/src/WinControls/Preference/preference.rc
View File

@ -46,10 +46,9 @@ BEGIN
CONTROL "Filled Fluent UI: small",IDC_RADIO_SMALLICON2,"Button",BS_AUTORADIOBUTTON,64,73,114,10
CONTROL "Filled Fluent UI: large",IDC_RADIO_BIGICON2,"Button",BS_AUTORADIOBUTTON,64,87,109,10
CONTROL "Standard icons: small",IDC_RADIO_STANDARD,"Button",BS_AUTORADIOBUTTON,64,101,119,10
GROUPBOX "Document List Panel",IDC_DOCSWITCH_GB_STATIC,57,125,147,37,BS_CENTER
CONTROL "Show",IDC_CHECK_DOCSWITCH,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,64,133,135,10
CONTROL "Disable extension column",IDC_CHECK_DOCSWITCH_NOEXTCOLUMN,
"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,64,147,124,10
GROUPBOX "Document List Panel",IDC_DOCLIST_GB_STATIC,57,125,147,37,BS_CENTER
CONTROL "Disable extension column",IDC_CHECK_DOCLIST_NOEXTCOLUMN,
"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,64,140,124,10
GROUPBOX "Tab Bar",IDC_TABBAR_GB_STATIC,223,6,176,156,BS_CENTER
CONTROL "Hide",IDC_CHECK_TAB_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,15,108,10
CONTROL "Multi-line",IDC_CHECK_TAB_MULTILINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,29,134,10

17
PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
View File

@ -446,9 +446,7 @@ INT_PTR CALLBACK GeneralSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM)
::SendDlgItemMessage(_hSelf, IDC_CHECK_SHOWSTATUSBAR, BM_SETCHECK, showStatus, 0);
::SendDlgItemMessage(_hSelf, IDC_CHECK_HIDEMENUBAR, BM_SETCHECK, !showMenu, 0);
bool showDocSwitcher = ::SendMessage(::GetParent(_hParent), NPPM_ISDOCSWITCHERSHOWN, 0, 0) == TRUE;
::SendDlgItemMessage(_hSelf, IDC_CHECK_DOCSWITCH, BM_SETCHECK, showDocSwitcher, 0);
::SendDlgItemMessage(_hSelf, IDC_CHECK_DOCSWITCH_NOEXTCOLUMN, BM_SETCHECK, nppGUI._fileSwitcherWithoutExtColumn, 0);
::SendDlgItemMessage(_hSelf, IDC_CHECK_DOCLIST_NOEXTCOLUMN, BM_SETCHECK, nppGUI._fileSwitcherWithoutExtColumn, 0);
LocalizationSwitcher & localizationSwitcher = nppParam.getLocalizationSwitcher();
@ -493,17 +491,10 @@ INT_PTR CALLBACK GeneralSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM)
}
return TRUE;
case IDC_CHECK_DOCSWITCH :
case IDC_CHECK_DOCLIST_NOEXTCOLUMN :
{
bool isChecked = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_DOCSWITCH, BM_GETCHECK, 0, 0));
::SendMessage(::GetParent(_hParent), NPPM_SHOWDOCSWITCHER, 0, isChecked?TRUE:FALSE);
getFocus();
}
return TRUE;
case IDC_CHECK_DOCSWITCH_NOEXTCOLUMN :
{
bool isChecked = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_DOCSWITCH_NOEXTCOLUMN, BM_GETCHECK, 0, 0));
::SendMessage(::GetParent(_hParent), NPPM_DOCSWITCHERDISABLECOLUMN, 0, isChecked?TRUE:FALSE);
bool isChecked = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_DOCLIST_NOEXTCOLUMN, BM_GETCHECK, 0, 0));
::SendMessage(::GetParent(_hParent), NPPM_DOCLISTDISABLECOLUMN, 0, isChecked?TRUE:FALSE);
}
return TRUE;

5
PowerEditor/src/WinControls/Preference/preference_rc.h
View File

@ -51,9 +51,8 @@
#define IDC_CHECK_HIDEMENUBAR (IDD_PREFERENCE_SUB_GENRAL + 22)
#define IDC_LOCALIZATION_GB_STATIC (IDD_PREFERENCE_SUB_GENRAL + 23)
#define IDC_COMBO_LOCALIZATION (IDD_PREFERENCE_SUB_GENRAL + 24)
#define IDC_DOCSWITCH_GB_STATIC (IDD_PREFERENCE_SUB_GENRAL + 25)
#define IDC_CHECK_DOCSWITCH (IDD_PREFERENCE_SUB_GENRAL + 26)
#define IDC_CHECK_DOCSWITCH_NOEXTCOLUMN (IDD_PREFERENCE_SUB_GENRAL + 27)
#define IDC_DOCLIST_GB_STATIC (IDD_PREFERENCE_SUB_GENRAL + 25)
#define IDC_CHECK_DOCLIST_NOEXTCOLUMN (IDD_PREFERENCE_SUB_GENRAL + 27)
#define IDC_CHECK_TAB_ALTICONS (IDD_PREFERENCE_SUB_GENRAL + 28)
#define IDC_RADIO_SMALLICON2 (IDD_PREFERENCE_SUB_GENRAL + 29)
#define IDC_RADIO_BIGICON2 (IDD_PREFERENCE_SUB_GENRAL + 30)

6
PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.cpp
View File

@ -82,6 +82,12 @@ INT_PTR CALLBACK VerticalFileSwitcher::run_dlgProc(UINT message, WPARAM wParam,
{
switch (reinterpret_cast<LPNMHDR>(lParam)->code)
{
case DMN_CLOSE:
{
::SendMessage(_hParent, WM_COMMAND, IDM_VIEW_DOCLIST, 0);
return TRUE;
}
case NM_DBLCLK:
{
LPNMITEMACTIVATE lpnmitem = (LPNMITEMACTIVATE) lParam;

4
PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.h
View File

@ -21,7 +21,7 @@
#include "VerticalFileSwitcher_rc.h"
#include "VerticalFileSwitcherListView.h"
#define FS_PROJECTPANELTITLE TEXT("Doc Switcher")
#define FS_PROJECTPANELTITLE TEXT("Document List")
struct sortCompareData {
HWND hListView;
@ -31,7 +31,7 @@ struct sortCompareData {
class VerticalFileSwitcher : public DockingDlgInterface {
public:
VerticalFileSwitcher(): DockingDlgInterface(IDD_FILESWITCHER_PANEL) {};
VerticalFileSwitcher(): DockingDlgInterface(IDD_DOCLIST) {};
void init(HINSTANCE hInst, HWND hPere, HIMAGELIST hImaLst) {
DockingDlgInterface::init(hInst, hPere);

6
PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.rc
View File

@ -17,11 +17,11 @@
#include <windows.h>
#include "VerticalFileSwitcher_rc.h"
IDD_FILESWITCHER_PANEL DIALOGEX 26, 41, 142, 324
IDD_DOCLIST DIALOGEX 26, 41, 142, 324
STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE
CAPTION "Doc Switcher"
CAPTION "Document List"
FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
//LISTBOX IDC_LIST_FILESWITCHER,50,44,78,120,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
//LISTBOX IDC_LIST_DOCLIST,50,44,78,120,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
END

2
PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.cpp
View File

@ -20,7 +20,7 @@
#include "Buffer.h"
#include "localization.h"
#define FS_ROOTNODE "DocSwitcher"
#define FS_ROOTNODE "DocList"
#define FS_CLMNNAME "ColumnName"
#define FS_CLMNEXT "ColumnExt"

4
PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher_rc.h
View File

@ -17,7 +17,7 @@
#pragma once
#define IDD_FILESWITCHER_PANEL 3000
#define IDC_LIST_FILESWITCHER (IDD_FILESWITCHER_PANEL + 1)
#define IDD_DOCLIST 3000
#define IDC_LIST_DOCLIST (IDD_DOCLIST + 1)

BIN
PowerEditor/src/icons/darkMode/toolbar/FluentUI/docList_off.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/docList_off.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
PowerEditor/src/icons/docList.bmp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
PowerEditor/src/icons/docList.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
PowerEditor/src/icons/docList_off.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
PowerEditor/src/icons/filledFluentUI/docList_off.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

2
PowerEditor/src/menuCmdID.h
View File

@ -319,7 +319,7 @@
#define IDM_VIEW_UNFOLD_7 (IDM_VIEW_UNFOLD + 7)
#define IDM_VIEW_UNFOLD_8 (IDM_VIEW_UNFOLD + 8)
#define IDM_VIEW_FILESWITCHER_PANEL (IDM_VIEW + 70)
#define IDM_VIEW_DOCLIST (IDM_VIEW + 70)
#define IDM_VIEW_SWITCHTO_OTHER_VIEW (IDM_VIEW + 72)
#define IDM_EXPORT_FUNC_LIST_AND_QUIT (IDM_VIEW + 73)

8
PowerEditor/src/resource.h
View File

@ -89,6 +89,7 @@
#define IDI_VIEW_FILEBROWSER_ICON 243
#define IDI_VIEW_FUNCLIST_ICON 244
#define IDI_VIEW_MONITORING_ICON 245
#define IDI_VIEW_DOCLIST_ICON 392 //continuing from IDI_VIEW_DOCLIST_ICON_DM2's ID
//
// TOOLBAR ICO - set 1, Dark Mode
@ -138,6 +139,7 @@
#define IDI_VIEW_FILEBROWSER_ICON_DM 288
#define IDI_VIEW_FUNCLIST_ICON_DM 289
#define IDI_VIEW_MONITORING_ICON_DM 290
#define IDI_VIEW_DOCLIST_ICON_DM 393 //continuing from IDI_VIEW_DOCLIST_ICON's ID
//
// TOOLBAR ICO - set 2
@ -187,6 +189,7 @@
#define IDI_VIEW_FILEBROWSER_ICON2 343
#define IDI_VIEW_FUNCLIST_ICON2 344
#define IDI_VIEW_MONITORING_ICON2 345
#define IDI_VIEW_DOCLIST_ICON2 394 //continuing from IDI_VIEW_DOCLIST_ICON_DM's ID
//
// TOOLBAR ICO - set 2, Dark Mode
@ -236,6 +239,7 @@
#define IDI_VIEW_FILEBROWSER_ICON_DM2 388
#define IDI_VIEW_FUNCLIST_ICON_DM2 389
#define IDI_VIEW_MONITORING_ICON_DM2 390
#define IDI_VIEW_DOCLIST_ICON_DM2 391
@ -337,6 +341,8 @@
#define IDR_CLOSETAB_INACT_DM 1543
#define IDR_CLOSETAB_HOVER_DM 1544
#define IDR_CLOSETAB_PUSH_DM 1545
#define IDR_DOCLIST 1546
#define IDR_DOCLIST_ICO 1547
#define ID_MACRO 20000
#define ID_MACRO_LIMIT 20200
@ -478,7 +484,7 @@
//#define IDD_FINDCHARACTERS 2900
//See VerticalFileSwitcher_rc.h
//#define IDD_FILESWITCHER_PANEL 3000
//#define IDD_DOCLIST 3000
//See ProjectPanel_rc.h
//#define IDD_PROJECTPANEL 3100