diff --git a/limereport/lrreportdesignwidget.cpp b/limereport/lrreportdesignwidget.cpp
index bdaab42..1b590c3 100644
--- a/limereport/lrreportdesignwidget.cpp
+++ b/limereport/lrreportdesignwidget.cpp
@@ -394,11 +394,13 @@ void ReportDesignWidget::editSetting()
setting.setVerticalGridStep(m_verticalGridStep);
setting.setHorizontalGridStep(m_horizontalGridStep);
setting.setDefaultFont(m_defaultFont);
+ setting.setSuppressAbsentFieldsAndVarsWarnings(m_report->suppressFieldAndVarError());
if (setting.exec()){
m_horizontalGridStep = setting.horizontalGridStep();
m_verticalGridStep = setting.verticalGridStep();
m_defaultFont = setting.defaultFont();
+ m_report->setSuppressFieldAndVarError(setting.suppressAbsentFieldsAndVarsWarnings());
applySettings();
}
}
diff --git a/limereport/lrsettingdialog.cpp b/limereport/lrsettingdialog.cpp
index 15a86c5..0b929be 100644
--- a/limereport/lrsettingdialog.cpp
+++ b/limereport/lrsettingdialog.cpp
@@ -32,6 +32,15 @@ QFont SettingDialog::defaultFont()
return result;
}
+bool SettingDialog::suppressAbsentFieldsAndVarsWarnings()
+{
+ return ui->cbSuppressWarnings->isChecked();
+}
+
+void SettingDialog::setSuppressAbsentFieldsAndVarsWarnings(bool value){
+ ui->cbSuppressWarnings->setChecked(value);
+}
+
void SettingDialog::setHorizontalGridStep(int value)
{
ui->horizontalGridStep->setValue(value);
diff --git a/limereport/lrsettingdialog.h b/limereport/lrsettingdialog.h
index 5a2cb48..e9a740d 100644
--- a/limereport/lrsettingdialog.h
+++ b/limereport/lrsettingdialog.h
@@ -19,6 +19,8 @@ public:
int verticalGridStep();
int horizontalGridStep();
QFont defaultFont();
+ bool suppressAbsentFieldsAndVarsWarnings();
+ void setSuppressAbsentFieldsAndVarsWarnings(bool value);
void setHorizontalGridStep(int value);
void setVerticalGridStep(int value);
void setDefaultFont(const QFont& value);
diff --git a/limereport/lrsettingdialog.ui b/limereport/lrsettingdialog.ui
index 6fd8520..d3a143a 100644
--- a/limereport/lrsettingdialog.ui
+++ b/limereport/lrsettingdialog.ui
@@ -7,97 +7,122 @@
0
0
351
- 185
+ 318
Designer setting
-
+
-
-
-
-
-
-
- Default font
-
-
-
- -
-
-
- -
-
-
- 10
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
+
- Grid
+ Designer Setting
-
+
-
-
-
-
-
+
+
-
+
- Vertical grid step
+ Default font
- -
-
+
-
+
+
+ -
+
10
- -
-
-
- Horizontal grid step
+
-
+
+
+ Qt::Horizontal
-
-
- -
-
-
- 10
+
+
+ 40
+ 20
+
-
+
-
-
-
- Qt::Horizontal
+
+
+ Grid
-
-
- 73
- 20
-
+
+
-
+
+
-
+
+
+ Vertical grid step
+
+
+
+ -
+
+
+ 10
+
+
+
+ -
+
+
+ Horizontal grid step
+
+
+
+ -
+
+
+ 10
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 73
+ 20
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+ Report Setting
+
+
+
-
+
+
+ Suppress absent fields and variables warning
-
+
@@ -153,8 +178,8 @@
accept()
- 248
- 254
+ 221
+ 307
157
@@ -169,8 +194,8 @@
reject()
- 316
- 260
+ 221
+ 307
286