Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-07-15 15:32:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added an option to "Use status bar terminal" in the Run configuration.

Browse Source
This commit is contained in:
Martín Lucas Golini
2025-12-24 01:42:52 -03:00
parent 8f2b9d65ba
commit 7004d7c282
6 changed files with 69 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/tools/ecode/projectbuild.cpp
View File

@@ -111,6 +111,8 @@ json ProjectBuild::serialize( const ProjectBuild::Map& builds ) {
step["run_in_terminal"] = run->runInTerminal;
if ( run->reusePreviousTerminal )
step["reuse_previous_terminal"] = run->reusePreviousTerminal;
if ( run->useStatusBarTerminal )
step["use_statusbar_terminal"] = run->useStatusBarTerminal;
jrun.push_back( step );
}
}
@@ -560,6 +562,7 @@ ProjectBuild::Map ProjectBuild::deserialize( const json& j, const std::string& p
rstep->enabled = step.value( "enabled", true );
rstep->runInTerminal = step.value( "run_in_terminal", false );
rstep->reusePreviousTerminal = step.value( "reuse_previous_terminal", false );
rstep->useStatusBarTerminal = step.value( "use_statusbar_terminal", false );
b.mRun.emplace_back( std::move( rstep ) );
}
}
@@ -848,27 +851,37 @@ void ProjectBuildManager::runConfig( StatusAppOutputController* saoc ) {
auto cmd = finalBuild.cmd + ( !finalBuild.args.empty() ? ( " " + finalBuild.args ) : "" );
if ( finalBuild.runInTerminal ) {
bool mustReuseLastUsedTerm = finalBuild.reusePreviousTerminal && mLastUsedTerm &&
mApp->getSplitter()->ownedWidgetExists( mLastUsedTerm );
UITerminal* term = mustReuseLastUsedTerm
? mLastUsedTerm
: mApp->getTerminalManager()->createTerminalInSplitter(
finalBuild.workingDir, "", {}, {}, false );
Log::info( "Running \"%s\" in terminal", cmd );
if ( term == nullptr || term->getTerm() == nullptr ) {
mApp->getTerminalManager()->openInExternalTerminal( cmd, finalBuild.workingDir );
} else {
if ( mustReuseLastUsedTerm ) {
term->restart();
} else {
mLastUsedTermCloseCbId =
term->on( Event::OnClose, [this]( auto ) { mLastUsedTerm = nullptr; } );
}
if ( finalBuild.useStatusBarTerminal && mApp->getStatusTerminalController() ) {
mApp->getStatusTerminalController()->show();
auto term = mApp->getStatusTerminalController()->getUITerminal();
term->restart();
term->executeFile( cmd );
mLastUsedTerm = term;
} else {
bool mustReuseLastUsedTerm =
finalBuild.reusePreviousTerminal && mLastUsedTerm &&
mApp->getSplitter()->ownedWidgetExists( mLastUsedTerm );
UITerminal* term = mustReuseLastUsedTerm
? mLastUsedTerm
: mApp->getTerminalManager()->createTerminalInSplitter(
finalBuild.workingDir, "", {}, {}, false );
Log::info( "Running \"%s\" in terminal", cmd );
if ( term == nullptr || term->getTerm() == nullptr ) {
mApp->getTerminalManager()->openInExternalTerminal( cmd,
finalBuild.workingDir );
} else {
if ( mustReuseLastUsedTerm ) {
term->restart();
} else {
mLastUsedTermCloseCbId =
term->on( Event::OnClose, [this]( auto ) { mLastUsedTerm = nullptr; } );
}
term->executeFile( cmd );
mLastUsedTerm = term;
}
}
} else {
Log::info( "Running \"%s\" in app", cmd );
finalBuild.config = build->getConfig();