Workspace folders are now using a distinct grey folder icon

Implemented "New workspace folder" and "Delete workspace folder" context menu entries
lssssj · Oct 27, 2016 · 9b05687 · 9b05687
1 parent 9e86b75
commit 9b05687
Show file tree

Hide file tree

Showing 10 changed files with 622 additions and 73 deletions.
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
@@ -108,7 +108,7 @@
       <Project Name="AutoSave" ConfigName="Win_x64_Debug"/>
       <Project Name="Tail" ConfigName="Win_x64_Debug"/>
     </WorkspaceConfiguration>
-    <WorkspaceConfiguration Name="CMake_Release" Selected="no">
+    <WorkspaceConfiguration Name="CMake_Release" Selected="yes">
       <Environment/>
       <Project Name="ZoomNavigator" ConfigName="DebugUnicode"/>
       <Project Name="wxsqlite3" ConfigName="Win_x86_Release"/>
@@ -308,7 +308,7 @@
       <Project Name="AutoSave" ConfigName="Win_x64_Debug"/>
       <Project Name="Tail" ConfigName="Win_x64_Debug"/>
     </WorkspaceConfiguration>
-    <WorkspaceConfiguration Name="Win_x64_Release" Selected="yes">
+    <WorkspaceConfiguration Name="Win_x64_Release" Selected="no">
       <Environment>WXWIN=D:\src\wxWidgets
 WXCFG=gcc_dll\mswu</Environment>
       <Project Name="abbreviation" ConfigName="Win_x64_Release"/>

diff --git a/LiteEditor/fileview.cpp b/LiteEditor/fileview.cpp
diff --git a/Plugin/CodeBlocksImporter.cpp b/Plugin/CodeBlocksImporter.cpp
@@ -2,6 +2,7 @@
 #include <wx/xml/xml.h>
 #include <wx/filefn.h>
 #include <wx/tokenzr.h>
+#include "macros.h"
 
 bool CodeBlocksImporter::OpenWordspace(const wxString& filename, const wxString& defaultCompiler)
 {
@@ -21,8 +22,9 @@ bool CodeBlocksImporter::isSupportedWorkspace()
     wxXmlDocument codeBlocksProject;
     if(codeBlocksProject.Load(wsInfo.GetFullPath())) {
         wxXmlNode* root = codeBlocksProject.GetRoot();
+        CHECK_PTR_RET_FALSE(root);
         wxString nodeName = root->GetName();
-        if(root && (nodeName == wxT("CodeBlocks_workspace_file") || nodeName == wxT("CodeBlocks_project_file")))
+        if((nodeName == wxT("CodeBlocks_workspace_file") || nodeName == wxT("CodeBlocks_project_file")))
             return true;
     }
     return false;

diff --git a/Runtime/codelite-bitmaps.zip b/Runtime/codelite-bitmaps.zip
diff --git a/Runtime/rc/menu.xrc b/Runtime/rc/menu.xrc
@@ -938,7 +938,7 @@
     </object>
     <!-- Workspace -->
     <object class="wxMenu" name="workspace_popup_menu">
-        <object class="wxMenu" name="wxID_ANY">
+        <object class="wxMenu" name="workspace_popup_menu_new_submenu">
             <label>New</label>
             <object class="wxMenuItem" name="new_project">
                 <label>New Project</label>

diff --git a/bitmaps/16-workspace-folder-yellow.png b/bitmaps/16-workspace-folder-yellow.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/bitmaps/24-workspace-folder-yellow.png b/bitmaps/24-workspace-folder-yellow.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/svgs/workspace-folder-yellow.svg b/svgs/workspace-folder-yellow.svg