Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
1718 files changed
+126739
-18495
No files matched your search
+8
-6
@@ -1,6 +1,7 @@
|
||||
|
||||
|
||||
#include "exm_dialog.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include "CustomViews/exm_exercise.h"
|
||||
#include "exm_dialog_model.h"
|
||||
@@ -21,6 +22,7 @@ ExerciseManagementDialog::ExerciseManagementDialog(const QString& menuGroup, QWi
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_model(nullptr),
|
||||
m_ui(new Ui::ExerciseManagementDialog), m_session(nullptr), m_ftc(nullptr), m_menuGroup(menuGroup),
|
||||
m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
setOnlineHelpFilename(QStringLiteral("Administrator-Exercises"));
|
||||
@@ -105,7 +107,7 @@ void ExerciseManagementDialog::enaDisa()
|
||||
const int cntSelectedRows = selectedRows.size();
|
||||
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Edit, cntSelectedRows == 1);
|
||||
const QModelIndex curIdx = m_ui->widget->currentIndex();
|
||||
const ExerciseManagement::ExerciseState state = m_model->getRowData(curIdx.row()).state();
|
||||
const ExerciseManagement::ExerciseState state = m_model->getRowData(curIdx.row()).state;
|
||||
const bool isRemovable =
|
||||
(state == ExerciseManagement::ExerciseState::Unknown || state == ExerciseManagement::ExerciseState::Created ||
|
||||
state == ExerciseManagement::ExerciseState::Stopped || state == ExerciseManagement::ExerciseState::Terminated);
|
||||
@@ -125,7 +127,7 @@ void ExerciseManagementDialog::onRemoveExercise()
|
||||
const QModelIndex curIdx = m_ui->widget->currentIndex();
|
||||
if (!curIdx.isValid())
|
||||
return;
|
||||
const int exId = m_model->getRowData(curIdx.row()).id();
|
||||
const int exId = m_model->getRowData(curIdx.row()).id;
|
||||
const int folderId = m_flmDtc->getExerciseFolderId(exId);
|
||||
|
||||
if (folderId > 0)
|
||||
@@ -146,14 +148,14 @@ void ExerciseManagementDialog::onEditExercise()
|
||||
const QModelIndex idx = m_ui->widget->currentIndex();
|
||||
const Exercise ex = m_model->getRowData(idx.row());
|
||||
|
||||
if (ex.id() <= 0)
|
||||
if (ex.id <= 0)
|
||||
return;
|
||||
DEBUG_LOG(m_logger) << "current EXId: " << ex.id();
|
||||
DEBUG_LOG(m_logger) << "current EXId: " << ex.id;
|
||||
|
||||
ExerciseManagementEditDialog* dialog = new ExerciseManagementEditDialog(this);
|
||||
|
||||
dialog->init(m_session, m_menuGroup, ex.id());
|
||||
const QString identifier = QStringLiteral("EditExercise%1").arg(ex.id());
|
||||
dialog->init(m_session, m_menuGroup, ex.id);
|
||||
const QString identifier = QStringLiteral("EditExercise%1").arg(ex.id);
|
||||
|
||||
addDialog(dialog, m_menuGroup, identifier);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user