Skip to content

Commit 212d6be

Browse files
committed
Update Tree Menu Separator Handling
Refine the tree control context menu so separator items are no longer disabled along with the corresponding folder actions Fixes: #3830 * Plugin * Workspace **Generated by CodeLite** Signed-off-by: Eran Ifrah <eran@codelite.org>
1 parent 877d8e5 commit 212d6be

File tree

2 files changed

+38
-20
lines changed

2 files changed

+38
-20
lines changed

CodeLiteIDE-MSW.workspace

Lines changed: 38 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,40 @@
11
{
2-
"workspace_type": "File System Workspace",
3-
"name": "CodeLiteIDE-MSW",
4-
"configs": [{
5-
"name": "Debug",
6-
"targets": [["build", "cd $(WorkspacePath)/.build-debug && mingw32-make -j32 install"], ["clean", "cd $(WorkspacePath)/.build-debug && mingw32-make -j32 clean"]],
7-
"file_extensions": "*.cpp;*.c;*.txt;*.json;*.hpp;*.cc;*.cxx;*.xml;*.h;*.wxcp;*.py;*.php;*.rb;*.html;*.js;*.ts;*.rs;*.iss;*.md;*.bat",
8-
"excludeFilesPattern": "*.o;*.pyc;*.obj;*.workspace;*.o.d;*.exe;*.dll;*.project",
9-
"excludePaths": ".build-release;.build-debug",
10-
"debugger": "lldb-dap"
11-
}, {
12-
"name": "Release",
13-
"targets": [["build", "cd $(WorkspacePath)/.build-release && mingw32-make -j24 install"], ["clean", "cd $(WorkspacePath)/.build-release && mingw32-make -j24 clean && rm -fr install"]],
14-
"file_extensions": "*.cpp;*.c;*.txt;*.json;*.hpp;*.cc;*.cxx;*.xml;*.h;*.wxcp;*.py;*.php;*.rb;*.html;*.js;*.ts;*.rs;*.iss;*.md;*.bat;*.sh;*.xrc;*.cmake;*.rc;*.plist;*.in",
15-
"excludeFilesPattern": "*.o;*.pyc;*.obj;*.workspace;*.o.d;*.exe;*.dll;*.project",
16-
"excludePaths": ".build-release;.build-debug",
17-
"debugger": ""
18-
}]
2+
"workspace_type": "File System Workspace",
3+
"name": "CodeLiteIDE-MSW",
4+
"configs": [
5+
{
6+
"name": "Debug",
7+
"targets": [
8+
[
9+
"build",
10+
"cd $(WorkspacePath)/.build-debug && mingw32-make -j32 install"
11+
],
12+
[
13+
"clean",
14+
"cd $(WorkspacePath)/.build-debug && mingw32-make -j32 clean"
15+
]
16+
],
17+
"file_extensions": "*.cpp;*.c;*.txt;*.json;*.hpp;*.cc;*.cxx;*.xml;*.h;*.wxcp;*.py;*.php;*.rb;*.html;*.js;*.ts;*.rs;*.iss;*.md;*.bat",
18+
"excludeFilesPattern": "*.o;*.pyc;*.obj;*.workspace;*.o.d;*.exe;*.dll;*.project",
19+
"excludePaths": ".build-release;.build-debug",
20+
"debugger": "lldb-dap"
21+
},
22+
{
23+
"name": "Release",
24+
"targets": [
25+
[
26+
"build",
27+
"cd $(WorkspacePath)/.build-release && mingw32-make -j24 install"
28+
],
29+
[
30+
"clean",
31+
"cd $(WorkspacePath)/.build-release && mingw32-make -j24 clean && rm -fr install"
32+
]
33+
],
34+
"file_extensions": "*.cpp;*.c;*.txt;*.json;*.hpp;*.cc;*.cxx;*.xml;*.h;*.wxcp;*.py;*.php;*.rb;*.html;*.js;*.ts;*.rs;*.iss;*.md;*.bat;*.sh;*.xrc;*.cmake;*.rc;*.plist;*.in",
35+
"excludeFilesPattern": "*.o;*.pyc;*.obj;*.workspace;*.o.d;*.exe;*.dll;*.project",
36+
"excludePaths": ".build-release;.build-debug",
37+
"debugger": ""
38+
}
39+
]
1940
}

Plugin/clTreeCtrlPanel.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,10 @@ void clTreeCtrlPanel::OnContextMenu(wxTreeEvent& event)
124124
if (IsTopLevelFolder(item)) {
125125
// Disable items for top-level folders
126126
menu->Enable(XRCID("tree_ctrl_delete_folder"), false);
127-
menu->Enable(XRCID("separator_delete"), false);
128127
menu->Enable(XRCID("tree_ctrl_rename_folder"), false);
129-
menu->Enable(XRCID("separator_rename"), false);
130128
} else {
131129
// Disable items for non top-level folders
132130
menu->Enable(XRCID("tree_ctrl_close_folder"), false);
133-
menu->Enable(XRCID("separator_close"), false);
134131
}
135132

136133
menu->Bind(

0 commit comments

Comments
 (0)