Skip to content

Qtfred event msecs checkbox #7388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MjnMixael wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Qtfred event msecs checkbox #7388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions qtfred/src/mission/dialogs/MissionEventsDialogModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,6 +843,28 @@ void MissionEventsDialogModel::setChainDelay(int delay)
modify(event.chain_delay, delay);
}

bool MissionEventsDialogModel::getUseMsecs() const
{
if (!SCP_vector_inbounds(m_events, m_cur_event)) {
return false;
}
return (m_events[m_cur_event].flags & MEF_USE_MSECS) != 0;
}

void MissionEventsDialogModel::setUseMsecs(bool useMsecs)
{
if (!SCP_vector_inbounds(m_events, m_cur_event)) {
return;
}
auto& event = m_events[m_cur_event];
if (useMsecs) {
event.flags |= MEF_USE_MSECS;
} else {
event.flags &= ~MEF_USE_MSECS;
}
set_modified();
}

int MissionEventsDialogModel::getEventScore() const
{
if (!SCP_vector_inbounds(m_events, m_cur_event)) {
Expand Down
2 changes: 2 additions & 0 deletions qtfred/src/mission/dialogs/MissionEventsDialogModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ class MissionEventsDialogModel : public AbstractDialogModel {
void setChained(bool chained);
int getChainDelay() const;
void setChainDelay(int delay);
bool getUseMsecs() const;
void setUseMsecs(bool useMsecs);
int getEventScore() const;
void setEventScore(int score);
int getEventTeam() const;
Expand Down
9 changes: 9 additions & 0 deletions qtfred/src/ui/dialogs/MissionEventsDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,8 @@ void MissionEventsDialog::updateEventUi() {
ui->triggerCountBox->setEnabled(false);
ui->intervalTimeBox->setEnabled(false);
ui->chainDelayBox->setEnabled(false);
ui->useMsecsCheckBox->setChecked(false);
ui->useMsecsCheckBox->setEnabled(false);
ui->teamCombo->setEnabled(false);
ui->editDirectiveText->setEnabled(false);
ui->editDirectiveKeypressText->setEnabled(false);
Expand All @@ -419,6 +421,7 @@ void MissionEventsDialog::updateEventUi() {
ui->chainDelayBox->setValue(0);
ui->chainDelayBox->setEnabled(false);
}
ui->useMsecsCheckBox->setChecked(_model->getUseMsecs());

ui->editDirectiveText->setText(QString::fromStdString(_model->getEventDirectiveText()));
ui->editDirectiveKeypressText->setText(QString::fromStdString(_model->getEventDirectiveKeyText()));
Expand All @@ -436,6 +439,7 @@ void MissionEventsDialog::updateEventUi() {

ui->scoreBox->setEnabled(true);
ui->chainedCheckBox->setEnabled(true);
ui->useMsecsCheckBox->setEnabled(true);
ui->editDirectiveText->setEnabled(true);
ui->editDirectiveKeypressText->setEnabled(true);
ui->teamCombo->setEnabled(_model->getMissionIsMultiTeam());
Expand Down Expand Up @@ -719,6 +723,11 @@ void MissionEventsDialog::on_chainedDelayBox_valueChanged(int value)
_model->setChainDelay(value);
}

void MissionEventsDialog::on_useMsecsCheckBox_stateChanged(int state)
{
_model->setUseMsecs(state == Qt::Checked);
}

void MissionEventsDialog::on_scoreBox_valueChanged(int value)
{
_model->setEventScore(value);
Expand Down
1 change: 1 addition & 0 deletions qtfred/src/ui/dialogs/MissionEventsDialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ private slots:
void on_intervalTimeBox_valueChanged(int value);
void on_chainedCheckBox_stateChanged(int state);
void on_chainedDelayBox_valueChanged(int value);
void on_useMsecsCheckBox_stateChanged(int state);
void on_scoreBox_valueChanged(int value);
void on_teamCombo_currentIndexChanged(int index);

Expand Down
Loading
Loading