From 7b1e6546a1353023b86c546b2bdc305493d73d15 Mon Sep 17 00:00:00 2001
From: Ashfaaq18 <ashfaaq.riphque@gmail.com>
Date: Wed, 21 Jul 2021 04:00:10 +0530
Subject: [PATCH] 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
---
 PowerEditor/installer/nativeLang/english.xml  |   9 ++++----
 .../MISC/PluginsManager/Notepad_plus_msgs.h   |  20 +++++++++---------
 PowerEditor/src/Notepad_plus.cpp              |   7 +++---
 PowerEditor/src/Notepad_plus.rc               |   7 ++++++
 PowerEditor/src/NppBigSwitch.cpp              |   6 +++---
 PowerEditor/src/NppCommands.cpp               |  20 ++++++++++++++++--
 PowerEditor/src/Parameters.cpp                |   1 +
 .../src/WinControls/Preference/preference.rc  |   7 +++---
 .../WinControls/Preference/preferenceDlg.cpp  |  17 ++++-----------
 .../WinControls/Preference/preference_rc.h    |   5 ++---
 .../VerticalFileSwitcher.cpp                  |   6 ++++++
 .../VerticalFileSwitcher.h                    |   4 ++--
 .../VerticalFileSwitcher.rc                   |   6 +++---
 .../VerticalFileSwitcherListView.cpp          |   2 +-
 .../VerticalFileSwitcher_rc.h                 |   4 ++--
 .../darkMode/toolbar/FluentUI/docList_off.ico | Bin 0 -> 3638 bytes
 .../toolbar/filledFluentUI/docList_off.ico    | Bin 0 -> 3638 bytes
 PowerEditor/src/icons/docList.bmp             | Bin 0 -> 1334 bytes
 PowerEditor/src/icons/docList.ico             | Bin 0 -> 5686 bytes
 PowerEditor/src/icons/docList_off.ico         | Bin 0 -> 3638 bytes
 .../src/icons/filledFluentUI/docList_off.ico  | Bin 0 -> 3638 bytes
 PowerEditor/src/menuCmdID.h                   |   2 +-
 PowerEditor/src/resource.h                    |   8 ++++++-
 23 files changed, 79 insertions(+), 52 deletions(-)
 create mode 100644 PowerEditor/src/icons/darkMode/toolbar/FluentUI/docList_off.ico
 create mode 100644 PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/docList_off.ico
 create mode 100644 PowerEditor/src/icons/docList.bmp
 create mode 100644 PowerEditor/src/icons/docList.ico
 create mode 100644 PowerEditor/src/icons/docList_off.ico
 create mode 100644 PowerEditor/src/icons/filledFluentUI/docList_off.ico

diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml
index 56eb6979d..c7de27081 100644
--- a/PowerEditor/installer/nativeLang/english.xml
+++ b/PowerEditor/installer/nativeLang/english.xml
@@ -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"/>
diff --git a/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h b/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h
index a2261b00f..ba5d801ad 100644
--- a/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h
+++ b/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h
@@ -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)
diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
index 444cfa14a..6dd2a622b 100644
--- a/PowerEditor/src/Notepad_plus.cpp
+++ b/PowerEditor/src/Notepad_plus.cpp
@@ -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)
 		{
diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc
index 0c15a8035..748e73fe4 100644
--- a/PowerEditor/src/Notepad_plus.rc
+++ b/PowerEditor/src/Notepad_plus.rc
@@ -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
diff --git a/PowerEditor/src/NppBigSwitch.cpp b/PowerEditor/src/NppBigSwitch.cpp
index 42c078e80..884d39ea0 100644
--- a/PowerEditor/src/NppBigSwitch.cpp
+++ b/PowerEditor/src/NppBigSwitch.cpp
@@ -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;
diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp
index 9905367dc..bc30abfea 100644
--- a/PowerEditor/src/NppCommands.cpp
+++ b/PowerEditor/src/NppCommands.cpp
@@ -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;
 
diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp
index a8657ace3..c28085102 100644
--- a/PowerEditor/src/Parameters.cpp
+++ b/PowerEditor/src/Parameters.cpp
@@ -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") },
diff --git a/PowerEditor/src/WinControls/Preference/preference.rc b/PowerEditor/src/WinControls/Preference/preference.rc
index fe6094681..f257e1a2a 100644
--- a/PowerEditor/src/WinControls/Preference/preference.rc
+++ b/PowerEditor/src/WinControls/Preference/preference.rc
@@ -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
diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
index 747a45f9c..4986ae4cd 100644
--- a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
+++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
@@ -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;
 
diff --git a/PowerEditor/src/WinControls/Preference/preference_rc.h b/PowerEditor/src/WinControls/Preference/preference_rc.h
index a166f2948..efcccf5ab 100644
--- a/PowerEditor/src/WinControls/Preference/preference_rc.h
+++ b/PowerEditor/src/WinControls/Preference/preference_rc.h
@@ -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)
diff --git a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.cpp b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.cpp
index afa1b416c..a2115f3eb 100644
--- a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.cpp
+++ b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.cpp
@@ -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;
diff --git a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.h b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.h
index 0201d7a4f..4d8dfbab9 100644
--- a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.h
+++ b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.h
@@ -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);
diff --git a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.rc b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.rc
index 205b3375d..c2a39f41d 100644
--- a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.rc
+++ b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.rc
@@ -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
diff --git a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.cpp b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.cpp
index 580804e93..b70eab0c5 100644
--- a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.cpp
+++ b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.cpp
@@ -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"
 
diff --git a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher_rc.h b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher_rc.h
index c033dab4e..6c1b4312b 100644
--- a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher_rc.h
+++ b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher_rc.h
@@ -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)
 
 
diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/docList_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/docList_off.ico
new file mode 100644
index 0000000000000000000000000000000000000000..35e4ab92185d067b77c444e34ec604cd16af8929
GIT binary patch
literal 3638
zcmeHJOG?B*5PgY??i}y{1_YVC2gn@9130)1h+EI$F#>J}<_6h_2N+xhM%!0a$#i!T
zXLRApE~xH)?^X4u0yP6<$T6Ei?e+w?=Bg+RKc4|l<mQADB6J3lv_+=VXmHM<X_^tA
zh*W`8f&Wl}d}sFBynnPVD0(cB>_45U@^{!y-tFI=Ox&B^q`Qr(z0l1*(g?%^u;oKO
zK7kGWk-nUA1}$6Qj{WogjS136>D7_-*@AGPl=a!_m|((EpPeX5qEZD?1qKxubTRF+
zVaQ=UjAqXxjB|dg`zy%GBi)D4Gf5xThn3$~ACdRy^4<36B2VZ_+n{?(jG0Ayo$@HZ
zkCj;>hvx^nZWQZE`C)Xvmt<wRGJj_l6KBQ9ZW(hSI;`t6!<2BX7Ym7aZTF730IAI1
ze&@Ex%w1c<yj;2V2fks<EB%H3P_A%6zbe<nYvP)?#!czmI}hW(67vc;t$}m;<rm*(
BZEyep

literal 0
HcmV?d00001

diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/docList_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/docList_off.ico
new file mode 100644
index 0000000000000000000000000000000000000000..bb0576eb91f9029fcd8540f3f4b092e49a090bdf
GIT binary patch
literal 3638
zcmeHJOHRWu5Pc~{>8{;((X0^5N<Bb&9Bx6E2qd@$$H)!1LFf%QK&85G9KU>UB6R_5
z@JLhpy%}ew&()+rh8b2Xczd`7?zk(82EQ+WS914+mSS`UlC*v1m*~Sehq|sKJ`qWQ
zq`<#aU=~bYzQf#c{QMDS`F=g?rorkfVBZe+A+Bh^YL=Zx#?gl}=c4)Zl;1Fx124>d
zS_5w<;6TpK+MF%ud%EWAVNNh&Y0i#_lBlFWQsBoG=w_Y`%-BZafogK&xELF`e(Z_}
z&lgPb@A?cCjr0kZGo_#IZX&Mm;Fa8xwh7liJl|#L*U^t_Z>uuJjorO36B3l)u2KCq
z;y0?G=f`W4AM;|ai?;&lnATxCzl8Yi?-_FbcgT+=@@jXLFPXQYm-NSK=f3El)s}cm
RToRY=qXL%lBe3ZebQcx{UhMz?

literal 0
HcmV?d00001

diff --git a/PowerEditor/src/icons/docList.bmp b/PowerEditor/src/icons/docList.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..138da4a9926a3a5b122af61be39e6ad12f82e81a
GIT binary patch
literal 1334
zcmeH@A#=h&5QUe9G_(X*Xd!JOO$oFlt*T)Li?6AyMMg%(A|sJlWM$;dAUY=_k+I0i
z$n+(FPJcipZ|2?YcW<+q+4<X4r9#sxk%Nj4u28KEaDFvQA0HAKQ4*~v*#xv(`xNJ1
zc_h~XZMR!WK9}?@RwP4@_96rasNX4u1$we9BM~kz1AUQCa=9P@r#nGuA}NhGl<g&E
zEOEzpk0{+IB>fq3uw0W2<|MsWiec%a-h}uE<}6&y`yk=X@a>Ky_@vVYP8;~Y4QPcN
z_r-;5*C~0z2aR)f+!0&mv(-0v{P@)FPS^&UmIYSPI4apZvdtZ~pni{sd2X|wvtbN)
zsDL}*KBf&GO4h*!&}6>P^PGD|?}l&hT4x1!a6(ttTFG@?uQ!^FR=42al)=z3Wo~P=
Ti@&<msFHUmic(co^_;XHO?GW6

literal 0
HcmV?d00001

diff --git a/PowerEditor/src/icons/docList.ico b/PowerEditor/src/icons/docList.ico
new file mode 100644
index 0000000000000000000000000000000000000000..3fcc71aadcd427bdb54486a413ebd0b5a0fd5714
GIT binary patch
literal 5686
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
J4e)=P{tbtE*_{9Y

literal 0
HcmV?d00001

diff --git a/PowerEditor/src/icons/docList_off.ico b/PowerEditor/src/icons/docList_off.ico
new file mode 100644
index 0000000000000000000000000000000000000000..b8a1f31ae1f4e7c5bbffc79a71b3128473ddea73
GIT binary patch
literal 3638
zcmeHJOG?B*5PcaH-8tX^Ob`b59w2iZ58&W7AZ|T}#|XF`m_vvM7+eKL+gDY|baxUn
zx^QI|RCmAks`^ubngKG*FrP#1_5@gPmFI?^&wwX#*Mt%xbOw^NWv0_$aL%D9iUFU9
zRDo21|4@P1-t4ur?$NrS=&?ky|Fovc-(fp>zkho&ac6py_BN_^LOc6NBM=k7jt}|x
z1h(`?`fAJ>v}%Am_Rsq_CP*KpS4Y-obHb%k)@Q3@f)Pu7cBCkYN)<>I=vAQC#k9+Y
zA&2!anmvy&&iSqGuOKUrbRR;`B)wlBR(`5JB2Vb@-6nLAM|7oa(7h$b%%Z(cd63`5
z$}Exn^8;Nsigl&@FgV{!va(#6zcY)8vtneojJXgU*7ccTO1RdGg+#ozd&gXWROWBL
zb30__uBl;Ou3hs3-!kTv{z88!*SMfxl^fy>aZOy~rgZL|hw)#Dc?F!-z&ZW$3uFyx
A0ssI2

literal 0
HcmV?d00001

diff --git a/PowerEditor/src/icons/filledFluentUI/docList_off.ico b/PowerEditor/src/icons/filledFluentUI/docList_off.ico
new file mode 100644
index 0000000000000000000000000000000000000000..b8a1f31ae1f4e7c5bbffc79a71b3128473ddea73
GIT binary patch
literal 3638
zcmeHJOG?B*5PcaH-8tX^Ob`b59w2iZ58&W7AZ|T}#|XF`m_vvM7+eKL+gDY|baxUn
zx^QI|RCmAks`^ubngKG*FrP#1_5@gPmFI?^&wwX#*Mt%xbOw^NWv0_$aL%D9iUFU9
zRDo21|4@P1-t4ur?$NrS=&?ky|Fovc-(fp>zkho&ac6py_BN_^LOc6NBM=k7jt}|x
z1h(`?`fAJ>v}%Am_Rsq_CP*KpS4Y-obHb%k)@Q3@f)Pu7cBCkYN)<>I=vAQC#k9+Y
zA&2!anmvy&&iSqGuOKUrbRR;`B)wlBR(`5JB2Vb@-6nLAM|7oa(7h$b%%Z(cd63`5
z$}Exn^8;Nsigl&@FgV{!va(#6zcY)8vtneojJXgU*7ccTO1RdGg+#ozd&gXWROWBL
zb30__uBl;Ou3hs3-!kTv{z88!*SMfxl^fy>aZOy~rgZL|hw)#Dc?F!-z&ZW$3uFyx
A0ssI2

literal 0
HcmV?d00001

diff --git a/PowerEditor/src/menuCmdID.h b/PowerEditor/src/menuCmdID.h
index 9a762135a..a1eefd58d 100644
--- a/PowerEditor/src/menuCmdID.h
+++ b/PowerEditor/src/menuCmdID.h
@@ -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)
 
diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h
index da83ce17a..a0e21d086 100644
--- a/PowerEditor/src/resource.h
+++ b/PowerEditor/src/resource.h
@@ -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