Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion gui/include/TemplatesConfigDlg.h
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ private slots:
QComboBox *m_cmbFltColumn;
QLineEdit *m_edtFltPattern;
SearchParamControl *m_fltSearchCtrl;
QCheckBox *m_chkApplyonLoad;
QCheckBox *m_chkApplyOnLoad;
// Dialog buttons
QPushButton *m_btnApply;
QPushButton *m_btnSave;
Expand Down
1 change: 1 addition & 0 deletions gui/src/MainWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)

m_tabViews = new QTabWidget(this);
m_tabViews->setTabsClosable(true);
m_tabViews->setMovable(true);
setCentralWidget(m_tabViews);

m_updateTimer = new QTimer(this);
Expand Down
12 changes: 6 additions & 6 deletions gui/src/TemplatesConfigDlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@ void TemplatesConfigDlg::setCurrentFilter(int index)
m_cmbFltColumn->setEnabled(enable);
m_edtFltPattern->setEnabled(enable);
m_fltSearchCtrl->setEnabled(enable);
m_chkApplyonLoad->setEnabled(enable);
m_chkApplyOnLoad->setEnabled(enable);

if (!enable)
{
Expand All @@ -844,7 +844,7 @@ void TemplatesConfigDlg::setCurrentFilter(int index)
const auto &flt = conf->getFilterParams().at(index);
m_edtFltName->setText(utl::toQStr(flt.name));
m_fltSearchCtrl->setSearchParam(flt.searchParam);
m_chkApplyonLoad->setChecked(flt.applyOnLoad);
m_chkApplyOnLoad->setChecked(flt.applyOnLoad);
enableFltFormFunc(true);
}
else
Expand All @@ -867,7 +867,7 @@ void TemplatesConfigDlg::updateTemplateFilter()
auto &flt = conf->getFilterParams().at(fltIdx);
flt.name = utl::toStr(m_edtFltName->text());
flt.searchParam = m_fltSearchCtrl->getSearchParam();
flt.applyOnLoad = m_chkApplyonLoad->isChecked();
flt.applyOnLoad = m_chkApplyOnLoad->isChecked();

auto item = m_lstFilters->item(fltIdx);
if (item != nullptr)
Expand Down Expand Up @@ -1018,7 +1018,7 @@ void TemplatesConfigDlg::createConnections()
&TemplatesConfigDlg::setCurrentFilter);
connect(m_edtFltName, &QLineEdit::editingFinished, this, &TemplatesConfigDlg::updateTemplateFilter);
connect(m_fltSearchCtrl, &SearchParamControl::paramChanged, this, &TemplatesConfigDlg::updateTemplateFilter);
connect(m_chkApplyonLoad, &QCheckBox::stateChanged, this, &TemplatesConfigDlg::updateTemplateFilter);
connect(m_chkApplyOnLoad, &QCheckBox::stateChanged, this, &TemplatesConfigDlg::updateTemplateFilter);
connect(m_actAddFilter, &QAction::triggered, this, [this]() { addFilter(); });
connect(m_actRmFilter, &QAction::triggered, this, &TemplatesConfigDlg::rmFilter);
connect(m_actMoveFilterUp, &QAction::triggered, this, &TemplatesConfigDlg::moveFilterUp);
Expand Down Expand Up @@ -1294,8 +1294,8 @@ void TemplatesConfigDlg::buildLayout()
m_fltSearchCtrl = new SearchParamControl(m_cmbFltColumn, m_edtFltPattern, m_tabFilters);
frmFilter->addRow(tr("Options"), m_fltSearchCtrl);

m_chkApplyonLoad = new QCheckBox(tr("Apply on load"), m_tabFilters);
frmFilter->addRow(m_chkApplyonLoad);
m_chkApplyOnLoad = new QCheckBox(tr("Apply on load"), m_tabFilters);
frmFilter->addRow(m_chkApplyOnLoad);

hFiltersTab->addLayout(frmFilter);
// Filters edit form -------------------------------------------- (End)
Expand Down
Loading