Add option to filter out folders in file view (#87)

Author: funap

src/Explorer/Explorer.cpp

@@ -82,6 +82,7 @@ constexpr WCHAR FontHeight[]        = L"FontHeight";
 constexpr WCHAR FontWeight[]        = L"FontWeight";
 constexpr WCHAR FontItalic[]        = L"FontItalic";
 constexpr WCHAR FontFaceName[]      = L"FontFaceName";
+constexpr WCHAR HideFolders[]       = L"HideFolders";
 
 
 /* global values */
@@ -418,6 +419,7 @@ void loadSettings()
     exProp.bAutoUpdate              = ::GetPrivateProfileInt(Explorer, AutoUpdate, TRUE, iniFilePath);
     exProp.bAutoNavigate            = ::GetPrivateProfileInt(Explorer, AutoNavigate, FALSE, iniFilePath);
     exProp.useFullTree              = ::GetPrivateProfileInt(Explorer, UseFullTree, FALSE, iniFilePath);
+    exProp.bHideFoldersInFileList   = ::GetPrivateProfileInt(Explorer, HideFolders, FALSE, iniFilePath);
     exProp.fmtSize                  = (SizeFmt)::GetPrivateProfileInt(Explorer, SizeFormat, SizeFmt::SFMT_KBYTE, iniFilePath);
     exProp.fmtDate                  = (DateFmt)::GetPrivateProfileInt(Explorer, DateFormat, DFMT_ENG, iniFilePath);
     exProp.uTimeout                 = ::GetPrivateProfileInt(Explorer, TimeOut, 1000, iniFilePath);

src/Explorer/Explorer.h

@@ -127,6 +127,7 @@ struct ExProp{
     BOOL                        bAddExtToName           = false;
     BOOL                        bAutoUpdate             = false;
     BOOL                        bAutoNavigate           = false;
+    bool                        bHideFoldersInFileList{ true };
     SizeFmt                     fmtSize                 = SizeFmt::SFMT_BYTES;
     DateFmt                     fmtDate                 = DateFmt::DFMT_ENG;
     std::vector<std::wstring>   vStrFilterHistory       {};

src/Explorer/ExplorerDialog.rc

@@ -96,14 +96,15 @@ CAPTION "Explorer Options"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX        "File List",IDC_STATIC_FILELIST,6,6,137,120
-    CONTROL         "&Folder With Braces",IDC_CHECK_BRACES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,19,126,10
+    CONTROL         "&Folder With Braces",IDC_CHECK_BRACES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,18,126,10
     CONTROL         "Separate &Extensions",IDC_CHECK_SEPEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,31,126,10
-    GROUPBOX        "",IDC_STATIC_LONG,8,47,133,54
-    CONTROL         "&View 'Long' List",IDC_CHECK_LONG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,48,63,10
-    LTEXT           "Size:",IDC_STATIC_SIZE,13,64,32,12,SS_CENTERIMAGE
-    LTEXT           "Date:",IDC_STATIC_DATE,13,80,32,12,SS_CENTERIMAGE
-    COMBOBOX        IDC_COMBO_SIZE_FORMAT,47,64,90,59,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_COMBO_DATE_FORMAT,47,80,90,51,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Hide Folders",IDC_CHECK_HIDE_FOLDERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,44,126,10
+    GROUPBOX        "",IDC_STATIC_LONG,7,68,133,54
+    CONTROL         "&View 'Long' List",IDC_CHECK_LONG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,68,63,10
+    LTEXT           "Size:",IDC_STATIC_SIZE,13,86,32,12,SS_CENTERIMAGE
+    LTEXT           "Date:",IDC_STATIC_DATE,13,102,32,12,SS_CENTERIMAGE
+    COMBOBOX        IDC_COMBO_SIZE_FORMAT,47,86,90,59,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_COMBO_DATE_FORMAT,47,102,90,51,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "General Options",IDC_STATIC_GENOPT,144,6,140,120
     CONTROL         "Automatic &Update on Focus",IDC_CHECK_AUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,18,124,8
     CONTROL         "Show &Hidden Files",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,30,124,8
@@ -210,6 +211,7 @@ BEGIN
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 340
+        VERTGUIDE, 14
         TOPMARGIN, 7
         BOTTOMMARGIN, 171
     END

src/Explorer/ExplorerResource.h

@@ -134,7 +134,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 	#define IDC_EDIT_HISTORYSIZE			(IDD_OPTION_DLG + 26)
 	#define IDC_STATIC_HISTORY				(IDD_OPTION_DLG + 27)
     #define IDC_CHECK_USEFULLTREE           (IDD_OPTION_DLG + 28)
-
+    #define IDC_CHECK_HIDE_FOLDERS          (IDD_OPTION_DLG + 29)
+ 
 #define    IDD_HELP_DLG	     30700
     #define IDC_EMAIL_LINK                  (IDD_HELP_DLG + 1)
 	#define IDC_NPP_PLUGINS_URL				(IDD_HELP_DLG + 2)

src/Explorer/FileList.cpp

@@ -695,6 +695,10 @@ void FileList::viewPath(const std::wstring& currentDir, BOOL redraw)
         /* get current filters */
         FileListData tempData;
         do {
+            if (_pExProp->bHideFoldersInFileList && (Find.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
+                continue; // Skip directories if hideFoldersInContentView is true
+            }
+
             if (IsValidFolder(Find) == TRUE) {
                 /* get data in order of list elements */
                 tempData.isParent       = FALSE;
@@ -783,7 +787,7 @@ void FileList::viewPath(const std::wstring& currentDir, BOOL redraw)
     _vFileList.clear();
 
     /* set temporal list as global */
-    for (const auto &folder : vFoldersTemp) {
+    for (const auto& folder : vFoldersTemp) {
         _vFileList.push_back(folder);
     }
     for (const auto &file : vFilesTemp) {

src/Explorer/OptionDialog.cpp

@@ -244,6 +244,8 @@ void OptionDlg::SetParams()
     ::SendDlgItemMessage(_hSelf, IDC_CHECK_USEICON,     BM_SETCHECK, _pProp->bUseSystemIcons? BST_CHECKED : BST_UNCHECKED, 0);
     ::SendDlgItemMessage(_hSelf, IDC_CHECK_AUTONAV,     BM_SETCHECK, _pProp->bAutoNavigate  ? BST_CHECKED : BST_UNCHECKED, 0);
     ::SendDlgItemMessage(_hSelf, IDC_CHECK_USEFULLTREE, BM_SETCHECK, _pProp->useFullTree    ? BST_CHECKED : BST_UNCHECKED, 0);
+    ::SendDlgItemMessage(_hSelf, IDC_CHECK_HIDE_FOLDERS, BM_SETCHECK, _pProp->bHideFoldersInFileList ? BST_CHECKED : BST_UNCHECKED, 0);
+
 
     ::SetDlgItemText(_hSelf, IDC_EDIT_EXECNAME,     _pProp->nppExecProp.szAppName);
     ::SetDlgItemText(_hSelf, IDC_EDIT_SCRIPTPATH,   _pProp->nppExecProp.szScriptPath);
@@ -270,6 +272,7 @@ BOOL OptionDlg::GetParams()
     _pProp->bAutoNavigate   = (::SendDlgItemMessage(_hSelf, IDC_CHECK_AUTONAV, BM_GETCHECK, 0, 0) == BST_CHECKED)       ? TRUE : FALSE;
     _pProp->bUseSystemIcons = (::SendDlgItemMessage(_hSelf, IDC_CHECK_USEICON, BM_GETCHECK, 0, 0) == BST_CHECKED)       ? TRUE : FALSE;
     _pProp->useFullTree     = (::SendDlgItemMessage(_hSelf, IDC_CHECK_USEFULLTREE, BM_GETCHECK, 0, 0) == BST_CHECKED)   ? TRUE : FALSE;
+    _pProp->bHideFoldersInFileList = (::SendDlgItemMessage(_hSelf, IDC_CHECK_HIDE_FOLDERS, BM_GETCHECK, 0, 0) == BST_CHECKED) ? TRUE : FALSE;
 
     WCHAR TEMP[MAX_PATH];
     ::GetDlgItemText(_hSelf, IDC_EDIT_TIMEOUT, TEMP, 6);