Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-05-29 17:46:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Sys added Sys::epochToString.

Browse Source 
ecode: Update file system tree view on changes.
Added a couple of linters.
Allow to select global results in UITreeViewGlobalSearch (not used but implemented, it will be used for global search & replace).
This commit is contained in:
Martín Lucas Golini
2020-12-27 02:37:58 -03:00
parent 652867c202
commit 4bc9b7a644
29 changed files with 455 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/tools/codeeditor/codeeditor.cpp
View File

@@ -823,7 +823,8 @@ void App::initGlobalSearchBar() {
} );
addClickListener( searchButton, "search-in-files" );
addClickListener( searchBarClose, "close-global-searchbar" );
mGlobalSearchTree = UITreeViewGlobalSearch::New( mEditorSplitter->getCurrentColorScheme() );
mGlobalSearchTree =
UITreeViewGlobalSearch::New( mEditorSplitter->getCurrentColorScheme(), false );
mGlobalSearchTree->setId( "search_tree" );
mGlobalSearchTree->setParent( mUISceneNode->getRoot() );
mGlobalSearchTree->setExpanderIconSize( PixelDensity::dpToPx( 20 ) );
@@ -1971,8 +1972,10 @@ bool App::setAutoComplete( bool enable ) {
bool App::setLinter( bool enable ) {
mConfig.editor.linter = enable;
if ( enable && !mLinterModule ) {
mLinterModule =
eeNew( LinterModule, ( mResPath + "assets/linters/linters.json", mThreadPool ) );
std::string path( mResPath + "assets/linters/linters.json" );
if ( FileSystem::fileExists( mConfigPath + "linters.json" ) )
path = mConfigPath + "linters.json";
mLinterModule = eeNew( LinterModule, ( path, mThreadPool ) );
mEditorSplitter->forEachEditor(
[&]( UICodeEditor* editor ) { editor->registerModule( mLinterModule ); } );
return true;
@@ -2234,9 +2237,14 @@ void App::initProjectTreeView( const std::string& path ) {
} else {
std::string rpath( FileSystem::getRealPath( path ) );
mProjectTreeView->setModel( FileSystemModel::New(
FileSystem::fileRemoveFileName( rpath ), FileSystemModel::Mode::FilesAndDirectories,
{ true, true, true } ) );
mFileSystemModel = FileSystemModel::New( FileSystem::fileRemoveFileName( rpath ),
FileSystemModel::Mode::FilesAndDirectories,
{ true, true, true } );
mProjectTreeView->setModel( mFileSystemModel );
if ( mFileSystemListener )
mFileSystemListener->setFileSystemModel( mFileSystemModel );
mEditorSplitter->loadFileFromPath( rpath );
}
@@ -2257,8 +2265,13 @@ void App::loadFolder( const std::string& path ) {
mConfig.loadProject( rpath, mEditorSplitter, mConfigPath );
mProjectTreeView->setModel( FileSystemModel::New(
rpath, FileSystemModel::Mode::FilesAndDirectories, { true, true, true } ) );
mFileSystemModel = FileSystemModel::New( rpath, FileSystemModel::Mode::FilesAndDirectories,
{ true, true, true } );
mProjectTreeView->setModel( mFileSystemModel );
if ( mFileSystemListener )
mFileSystemListener->setFileSystemModel( mFileSystemModel );
auto found = std::find( mRecentFolders.begin(), mRecentFolders.end(), rpath );
if ( found != mRecentFolders.end() )
@@ -2592,7 +2605,7 @@ void App::init( const std::string& file, const Float& pidelDensity ) {
#if EE_PLATFORM != EE_PLATFORM_EMSCRIPTEN
mFileWatcher = new efsw::FileWatcher();
mFileSystemListener = new FileSystemListener( mEditorSplitter );
mFileSystemListener = new FileSystemListener( mEditorSplitter, mFileSystemModel );
mFileWatcher->watch();
#endif