Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Refresh tree when adding new folder. 

The fileWatcher works on some platforms, but not on others.

Also modifies it so that it just asks for the directory name rather
than starting with the existing path (which provided unnecessary
flexibility at the expense of ease-of-understanding and ease-of-use).
If you want the directory somewhere else, select where you want it
before doing "New Directory...".

Also updates naming conventions and file order.

Fixes https://gitlab.com/kicad/code/kicad/issues/6592
6.0.7
Jeff Young 5 years ago
parent
c0d2ad42ce
commit
d0cba4b096
3 changed files with 89 additions and 99 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 86
      kicad/project_tree_pane.cpp
  2. 62
      kicad/project_tree_pane.h
  3. 40
      kicad/tools/kicad_manager_control.cpp

86
kicad/project_tree_pane.cpp
View File

@ -118,17 +118,17 @@ const wxString GerberFileExtensionWildCard( ".((gbr|gbrjob|(gb|gt)[alops])|pho)"
BEGIN_EVENT_TABLE( PROJECT_TREE_PANE, wxSashLayoutWindow )
EVT_TREE_ITEM_ACTIVATED( ID_PROJECT_TREE, PROJECT_TREE_PANE::OnSelect )
EVT_TREE_ITEM_EXPANDED( ID_PROJECT_TREE, PROJECT_TREE_PANE::OnExpand )
EVT_TREE_ITEM_RIGHT_CLICK( ID_PROJECT_TREE, PROJECT_TREE_PANE::OnRight )
EVT_MENU( ID_PROJECT_TXTEDIT, PROJECT_TREE_PANE::OnOpenSelectedFileWithTextEditor )
EVT_MENU( ID_PROJECT_SWITCH_TO_OTHER, PROJECT_TREE_PANE::OnSwitchToSelectedProject )
EVT_MENU( ID_PROJECT_NEWDIR, PROJECT_TREE_PANE::OnCreateNewDirectory )
EVT_MENU( ID_PROJECT_OPEN_DIR, PROJECT_TREE_PANE::OnOpenDirectory )
EVT_MENU( ID_PROJECT_DELETE, PROJECT_TREE_PANE::OnDeleteFile )
EVT_MENU( ID_PROJECT_PRINT, PROJECT_TREE_PANE::OnPrintFile )
EVT_MENU( ID_PROJECT_RENAME, PROJECT_TREE_PANE::OnRenameFile )
EVT_IDLE( PROJECT_TREE_PANE::OnIdle )
EVT_TREE_ITEM_ACTIVATED( ID_PROJECT_TREE, PROJECT_TREE_PANE::onSelect )
EVT_TREE_ITEM_EXPANDED( ID_PROJECT_TREE, PROJECT_TREE_PANE::onExpand )
EVT_TREE_ITEM_RIGHT_CLICK( ID_PROJECT_TREE, PROJECT_TREE_PANE::onRight )
EVT_MENU( ID_PROJECT_TXTEDIT, PROJECT_TREE_PANE::onOpenSelectedFileWithTextEditor )
EVT_MENU( ID_PROJECT_SWITCH_TO_OTHER, PROJECT_TREE_PANE::onSwitchToSelectedProject )
EVT_MENU( ID_PROJECT_NEWDIR, PROJECT_TREE_PANE::onCreateNewDirectory )
EVT_MENU( ID_PROJECT_OPEN_DIR, PROJECT_TREE_PANE::onOpenDirectory )
EVT_MENU( ID_PROJECT_DELETE, PROJECT_TREE_PANE::onDeleteFile )
EVT_MENU( ID_PROJECT_PRINT, PROJECT_TREE_PANE::onPrintFile )
EVT_MENU( ID_PROJECT_RENAME, PROJECT_TREE_PANE::onRenameFile )
EVT_IDLE( PROJECT_TREE_PANE::onIdle )
END_EVENT_TABLE()
@ -143,7 +143,7 @@ PROJECT_TREE_PANE::PROJECT_TREE_PANE( KICAD_MANAGER_FRAME* parent ) :
m_watcher = NULL;
Connect( wxEVT_FSWATCHER,
wxFileSystemWatcherEventHandler( PROJECT_TREE_PANE::OnFileSystemEvent ) );
wxFileSystemWatcherEventHandler( PROJECT_TREE_PANE::onFileSystemEvent ) );
/*
* Filtering is now inverted: the filters are actually used to _enable_ support
@ -169,7 +169,7 @@ PROJECT_TREE_PANE::~PROJECT_TREE_PANE()
}
void PROJECT_TREE_PANE::OnSwitchToSelectedProject( wxCommandEvent& event )
void PROJECT_TREE_PANE::onSwitchToSelectedProject( wxCommandEvent& event )
{
std::vector<PROJECT_TREE_ITEM*> tree_data = GetSelectedData();
@ -182,7 +182,7 @@ void PROJECT_TREE_PANE::OnSwitchToSelectedProject( wxCommandEvent& event )
}
void PROJECT_TREE_PANE::OnOpenDirectory( wxCommandEvent& event )
void PROJECT_TREE_PANE::onOpenDirectory( wxCommandEvent& event )
{
// Get the root directory name:
std::vector<PROJECT_TREE_ITEM*> tree_data = GetSelectedData();
@ -222,7 +222,7 @@ void PROJECT_TREE_PANE::OnOpenDirectory( wxCommandEvent& event )
}
void PROJECT_TREE_PANE::OnCreateNewDirectory( wxCommandEvent& event )
void PROJECT_TREE_PANE::onCreateNewDirectory( wxCommandEvent& event )
{
// Get the root directory name:
std::vector<PROJECT_TREE_ITEM*> tree_data = GetSelectedData();
@ -234,29 +234,18 @@ void PROJECT_TREE_PANE::OnCreateNewDirectory( wxCommandEvent& event )
// Ask for the new sub directory name
wxString curr_dir = item_data->GetDir();
if( !curr_dir.IsEmpty() ) // A subdir is selected
{
// Make this subdir name relative to the current path.
// It will be more easy to read by the user, in the next dialog
wxFileName fn;
fn.AssignDir( curr_dir );
fn.MakeRelativeTo( prj_dir );
curr_dir = fn.GetPath();
if( !curr_dir.IsEmpty() )
curr_dir += wxFileName::GetPathSeparator();
}
if( curr_dir.IsEmpty() )
curr_dir = prj_dir;
wxString msg = wxString::Format( _( "Current project directory:\n%s" ), prj_dir );
wxString subdir = wxGetTextFromUser( msg, _( "Create New Directory" ), curr_dir );
wxString new_dir = wxGetTextFromUser( _( "Directory name:" ), _( "Create New Directory" ) );
if( subdir.IsEmpty() )
if( new_dir.IsEmpty() )
return;
wxString full_dirname = prj_dir + wxFileName::GetPathSeparator() + subdir;
wxString full_dirname = curr_dir + wxFileName::GetPathSeparator() + new_dir;
// Make the new item and let the file watcher add it to the tree
wxMkdir( full_dirname );
wxMkdir( full_dirname );
addItemToProjectTree( full_dirname, item_data->GetId() );
}
}
@ -293,7 +282,8 @@ wxString PROJECT_TREE_PANE::GetFileExt( TREE_FILE_TYPE type )
}
wxTreeItemId PROJECT_TREE_PANE::AddItemToProjectTree( const wxString& aName, wxTreeItemId& aRoot,
wxTreeItemId PROJECT_TREE_PANE::addItemToProjectTree( const wxString& aName,
const wxTreeItemId& aRoot,
bool aCanResetFileWatcher, bool aRecurse )
{
wxTreeItemId newItemId;
@ -448,7 +438,7 @@ wxTreeItemId PROJECT_TREE_PANE::AddItemToProjectTree( const wxString& aName, wxT
do // Add name in tree, but do not recurse
{
wxString path = aName + wxFileName::GetPathSeparator() + dir_filename;
AddItemToProjectTree( path, newItemId, false, false );
addItemToProjectTree( path, newItemId, false, false );
} while( dir.GetNext( &dir_filename ) );
}
}
@ -528,7 +518,7 @@ void PROJECT_TREE_PANE::ReCreateTreePrj()
if( filename != fn.GetFullName() )
{
wxString name = dir.GetName() + wxFileName::GetPathSeparator() + filename;
AddItemToProjectTree( name, m_root, false );
addItemToProjectTree( name, m_root, false );
}
cont = dir.GetNext( &filename );
@ -547,7 +537,7 @@ void PROJECT_TREE_PANE::ReCreateTreePrj()
}
void PROJECT_TREE_PANE::OnRight( wxTreeEvent& Event )
void PROJECT_TREE_PANE::onRight( wxTreeEvent& Event )
{
wxTreeItemId curr_item = Event.GetItem();
@ -739,7 +729,7 @@ void PROJECT_TREE_PANE::OnRight( wxTreeEvent& Event )
}
void PROJECT_TREE_PANE::OnOpenSelectedFileWithTextEditor( wxCommandEvent& event )
void PROJECT_TREE_PANE::onOpenSelectedFileWithTextEditor( wxCommandEvent& event )
{
wxString editorname = Pgm().GetEditorName();
@ -765,7 +755,7 @@ void PROJECT_TREE_PANE::OnOpenSelectedFileWithTextEditor( wxCommandEvent& event
}
void PROJECT_TREE_PANE::OnDeleteFile( wxCommandEvent& )
void PROJECT_TREE_PANE::onDeleteFile( wxCommandEvent& event )
{
std::vector<PROJECT_TREE_ITEM*> tree_data = GetSelectedData();
wxString msg, caption;
@ -794,7 +784,7 @@ void PROJECT_TREE_PANE::OnDeleteFile( wxCommandEvent& )
}
void PROJECT_TREE_PANE::OnPrintFile( wxCommandEvent& )
void PROJECT_TREE_PANE::onPrintFile( wxCommandEvent& event )
{
std::vector<PROJECT_TREE_ITEM*> tree_data = GetSelectedData();
@ -803,7 +793,7 @@ void PROJECT_TREE_PANE::OnPrintFile( wxCommandEvent& )
}
void PROJECT_TREE_PANE::OnRenameFile( wxCommandEvent& )
void PROJECT_TREE_PANE::onRenameFile( wxCommandEvent& event )
{
wxTreeItemId curr_item = m_TreeProject->GetFocusedItem();
std::vector<PROJECT_TREE_ITEM*> tree_data = GetSelectedData();
@ -832,7 +822,7 @@ void PROJECT_TREE_PANE::OnRenameFile( wxCommandEvent& )
}
void PROJECT_TREE_PANE::OnSelect( wxTreeEvent& Event )
void PROJECT_TREE_PANE::onSelect( wxTreeEvent& Event )
{
std::vector<PROJECT_TREE_ITEM*> tree_data = GetSelectedData();
@ -846,7 +836,7 @@ void PROJECT_TREE_PANE::OnSelect( wxTreeEvent& Event )
}
void PROJECT_TREE_PANE::OnIdle( wxIdleEvent& aEvent )
void PROJECT_TREE_PANE::onIdle( wxIdleEvent& aEvent )
{
// Idle executes once all other events finished processing
// This makes it ideal to launch a new window without starting Focus wars.
@ -862,7 +852,7 @@ void PROJECT_TREE_PANE::OnIdle( wxIdleEvent& aEvent )
}
void PROJECT_TREE_PANE::OnExpand( wxTreeEvent& Event )
void PROJECT_TREE_PANE::onExpand( wxTreeEvent& Event )
{
wxTreeItemId itemId = Event.GetItem();
PROJECT_TREE_ITEM* tree_data = GetItemIdData( itemId );
@ -903,7 +893,7 @@ void PROJECT_TREE_PANE::OnExpand( wxTreeEvent& Event )
do // Add name to tree item, but do not recurse in subdirs:
{
wxString name = fileName + wxFileName::GetPathSeparator() + dir_filename;
AddItemToProjectTree( name, kid, false );
addItemToProjectTree( name, kid, false );
} while( dir.GetNext( &dir_filename ) );
}
@ -1002,7 +992,7 @@ wxTreeItemId PROJECT_TREE_PANE::findSubdirTreeItem( const wxString& aSubDir )
}
void PROJECT_TREE_PANE::OnFileSystemEvent( wxFileSystemWatcherEvent& event )
void PROJECT_TREE_PANE::onFileSystemEvent( wxFileSystemWatcherEvent& event )
{
const wxFileName& pathModified = event.GetPath();
wxString subdir = pathModified.GetPath();
@ -1033,7 +1023,7 @@ void PROJECT_TREE_PANE::OnFileSystemEvent( wxFileSystemWatcherEvent& event )
{
case wxFSW_EVENT_CREATE:
{
wxTreeItemId newitem = AddItemToProjectTree( pathModified.GetFullPath(), root_id );
wxTreeItemId newitem = addItemToProjectTree( pathModified.GetFullPath(), root_id );
// If we are in the process of renaming a file, select the new one
// This is needed for MSW and OSX, since we don't get RENAME events from them, just a
@ -1091,7 +1081,7 @@ void PROJECT_TREE_PANE::OnFileSystemEvent( wxFileSystemWatcherEvent& event )
if( newpath.Exists() && ( newfn != rootData->GetFileName() ) )
{
wxTreeItemId newroot_id = findSubdirTreeItem( newdir );
wxTreeItemId newitem = AddItemToProjectTree( newfn, newroot_id );
wxTreeItemId newitem = addItemToProjectTree( newfn, newroot_id );
// If the item exists, select it
if( newitem.IsOk() )

62
kicad/project_tree_pane.h
View File

@ -49,17 +49,6 @@ class PROJECT_TREE_PANE : public wxSashLayoutWindow
{
friend class PROJECT_TREE_ITEM;
public:
KICAD_MANAGER_FRAME* m_Parent;
PROJECT_TREE* m_TreeProject;
private:
bool m_isRenaming; // Are we in the process of renaming a file
wxTreeItemId m_root;
std::vector<wxString> m_filters;
wxFileSystemWatcher* m_watcher; // file system watcher
PROJECT_TREE_ITEM* m_selectedItem;
public:
PROJECT_TREE_PANE( KICAD_MANAGER_FRAME* parent );
~PROJECT_TREE_PANE();
@ -105,69 +94,69 @@ private:
/**
* Called on a double click on an item
*/
void OnSelect( wxTreeEvent& Event );
void onSelect( wxTreeEvent& Event );
/**
* Called on a click on the + or - button of an item with children
*/
void OnExpand( wxTreeEvent& Event );
void onExpand( wxTreeEvent& Event );
/**
* Called on a right click on an item
*/
void OnRight( wxTreeEvent& Event );
void onRight( wxTreeEvent& Event );
/**
* Function OnOpenSelectedFileWithTextEditor
* Function onOpenSelectedFileWithTextEditor
* Call the text editor to open the selected file in the tree project
*/
void OnOpenSelectedFileWithTextEditor( wxCommandEvent& event );
void onOpenSelectedFileWithTextEditor( wxCommandEvent& event );
/**
* Function OnDeleteFile
* Function onDeleteFile
* Delete the selected file or directory in the tree project
*/
void OnDeleteFile( wxCommandEvent& event );
void onDeleteFile( wxCommandEvent& event );
/**
* Function OnDeleteFile
* Function onDeleteFile
* Print the selected file or directory in the tree project
*/
void OnPrintFile( wxCommandEvent& event );
void onPrintFile( wxCommandEvent& event );
/**
* Function OnRenameFile
* Function onRenameFile
* Rename the selected file or directory in the tree project
*/
void OnRenameFile( wxCommandEvent& event );
void onRenameFile( wxCommandEvent& event );
/**
* Function OnOpenDirectory
* Function onOpenDirectory
* Handles the right-click menu for opening a directory in the current system file browser
*/
void OnOpenDirectory( wxCommandEvent& event );
void onOpenDirectory( wxCommandEvent& event );
/**
* Function OnCreateNewDirectory
* Function onCreateNewDirectory
* Creates a new subdirectory inside the current kicad project directory the user is
* prompted to enter a directory name
*/
void OnCreateNewDirectory( wxCommandEvent& event );
void onCreateNewDirectory( wxCommandEvent& event );
/**
* Switch to a other project selected from the tree project (by selecting an other .pro
* file inside the current project folder)
*/
void OnSwitchToSelectedProject( wxCommandEvent& event );
void onSwitchToSelectedProject( wxCommandEvent& event );
/**
* Idle event handler, used process the selected items at a point in time
* when all other events have been consumed
*/
void OnIdle( wxIdleEvent &aEvent );
void onIdle( wxIdleEvent &aEvent );
/**
* Function AddItemToProjectTree
* Function addItemToProjectTree
* @brief Add the file or directory aName to the project tree
* @param aName = the filename or the directory name to add in tree
* @param aRoot = the wxTreeItemId item where to add sub tree items
@ -176,7 +165,7 @@ private:
* false to stop file add.
* @return the Id for the new tree item
*/
wxTreeItemId AddItemToProjectTree( const wxString& aName, wxTreeItemId& aRoot,
wxTreeItemId addItemToProjectTree( const wxString& aName, const wxTreeItemId& aRoot,
bool aCanResetFileWatcher = true, bool aRecurse = true );
/**
@ -193,7 +182,18 @@ private:
* The tree project is modified when a file or directory is created/deleted/renamed to
* reflect the file change
*/
void OnFileSystemEvent( wxFileSystemWatcherEvent& event );
void onFileSystemEvent( wxFileSystemWatcherEvent& event );
public:
KICAD_MANAGER_FRAME* m_Parent;
PROJECT_TREE* m_TreeProject;
private:
bool m_isRenaming; // Are we in the process of renaming a file
wxTreeItemId m_root;
std::vector<wxString> m_filters;
wxFileSystemWatcher* m_watcher; // file system watcher
PROJECT_TREE_ITEM* m_selectedItem;
DECLARE_EVENT_TABLE()
};

40
kicad/tools/kicad_manager_control.cpp
View File

@ -763,25 +763,25 @@ int KICAD_MANAGER_CONTROL::Execute( const TOOL_EVENT& aEvent )
void KICAD_MANAGER_CONTROL::setTransitions()
{
Go( &KICAD_MANAGER_CONTROL::NewProject, KICAD_MANAGER_ACTIONS::newProject.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::NewProject, KICAD_MANAGER_ACTIONS::newProject.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::NewFromTemplate, KICAD_MANAGER_ACTIONS::newFromTemplate.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::OpenProject, KICAD_MANAGER_ACTIONS::openProject.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::CloseProject, KICAD_MANAGER_ACTIONS::closeProject.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::SaveProjectAs, ACTIONS::saveAs.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::Refresh, ACTIONS::zoomRedraw.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::UpdateMenu, ACTIONS::updateMenu.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::ShowPlayer, KICAD_MANAGER_ACTIONS::editSchematic.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::ShowPlayer, KICAD_MANAGER_ACTIONS::editSymbols.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::ShowPlayer, KICAD_MANAGER_ACTIONS::editPCB.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::ShowPlayer, KICAD_MANAGER_ACTIONS::editFootprints.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::Execute, KICAD_MANAGER_ACTIONS::viewGerbers.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::Execute, KICAD_MANAGER_ACTIONS::convertImage.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::Execute, KICAD_MANAGER_ACTIONS::showCalculator.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::Execute, KICAD_MANAGER_ACTIONS::editWorksheet.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::Execute, KICAD_MANAGER_ACTIONS::openTextEditor.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::Execute, KICAD_MANAGER_ACTIONS::editOtherSch.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::Execute, KICAD_MANAGER_ACTIONS::editOtherPCB.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::OpenProject, KICAD_MANAGER_ACTIONS::openProject.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::CloseProject, KICAD_MANAGER_ACTIONS::closeProject.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::SaveProjectAs, ACTIONS::saveAs.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::Refresh, ACTIONS::zoomRedraw.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::UpdateMenu, ACTIONS::updateMenu.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::ShowPlayer, KICAD_MANAGER_ACTIONS::editSchematic.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::ShowPlayer, KICAD_MANAGER_ACTIONS::editSymbols.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::ShowPlayer, KICAD_MANAGER_ACTIONS::editPCB.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::ShowPlayer, KICAD_MANAGER_ACTIONS::editFootprints.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::Execute, KICAD_MANAGER_ACTIONS::viewGerbers.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::Execute, KICAD_MANAGER_ACTIONS::convertImage.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::Execute, KICAD_MANAGER_ACTIONS::showCalculator.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::Execute, KICAD_MANAGER_ACTIONS::editWorksheet.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::Execute, KICAD_MANAGER_ACTIONS::openTextEditor.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::Execute, KICAD_MANAGER_ACTIONS::editOtherSch.MakeEvent() );
Go( &KICAD_MANAGER_CONTROL::Execute, KICAD_MANAGER_ACTIONS::editOtherPCB.MakeEvent() );
}
Write Preview
Loading…
Cancel
Save