Merge branch 'feature/script-manager' into feature/script-live

# Conflicts:
#	cmake/qet_compilation_vars.cmake
#	sources/qetdiagrameditor.cpp
#	sources/ui/configpage/generalconfigurationpage.cpp
This commit is contained in:
ispyisail
2026-10-02 12:58:54 +13:00
7 changed files with 212 additions and 1 deletions
@@ -17,6 +17,7 @@
*/
#include "generalconfigurationpage.h"
#include "../../scripting/liveserver.h"
#include "../../scripting/assistantinfo.h"
#include "../../qetapp.h"
#include "../../qeticons.h"
@@ -320,6 +321,8 @@ void GeneralConfigurationPage::applyConf()
if (!ui->m_live_assistant->isChecked()) LiveServer::instance().stop();
#endif
}
//What an assistant reads about this QElectroTech follows the change
AssistantInfo::write();
//GENERIC PANEL
settings.setValue("genericpanel/folio",ui->m_use_folio_label->isChecked());