mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Printing: Remove braces around single lines in if/then

Browse source 
Remove useless braces around single line if/then.

Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Gehad elrobey 2015-09-16 22:09:05 -03:00 • committed by Dirk Hohndel
parent bdedc97036
commit f800c602d6
1 changed files with 19 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
qt-ui/templateedit.cpp
View file

@ -22,11 +22,10 @@ TemplateEdit::TemplateEdit(QWidget *parent, struct print_options *printOptions,
ui->linespacing->setValue(templateOptions->line_spacing); ui->linespacing->setValue(templateOptions->line_spacing);
grantlee_template = TemplateLayout::readTemplate(printOptions->p_template); grantlee_template = TemplateLayout::readTemplate(printOptions->p_template);
if (printOptions->type == print_options::DIVELIST) { if (printOptions->type == print_options::DIVELIST)
grantlee_template = TemplateLayout::readTemplate(printOptions->p_template); grantlee_template = TemplateLayout::readTemplate(printOptions->p_template);
} else if (printOptions->type == print_options::STATISTICS) { else if (printOptions->type == print_options::STATISTICS)
grantlee_template = TemplateLayout::readTemplate(QString::fromUtf8("statistics") + QDir::separator() + printOptions->p_template); grantlee_template = TemplateLayout::readTemplate(QString::fromUtf8("statistics") + QDir::separator() + printOptions->p_template);
}
// gui // gui
btnGroup = new QButtonGroup; btnGroup = new QButtonGroup;
@ -80,11 +79,10 @@ void TemplateEdit::updatePreview()
// update grantlee template string // update grantlee template string
grantlee_template = TemplateLayout::readTemplate(printOptions->p_template); grantlee_template = TemplateLayout::readTemplate(printOptions->p_template);
if (printOptions->type == print_options::DIVELIST) { if (printOptions->type == print_options::DIVELIST)
grantlee_template = TemplateLayout::readTemplate(printOptions->p_template); grantlee_template = TemplateLayout::readTemplate(printOptions->p_template);
} else if (printOptions->type == print_options::STATISTICS) { else if (printOptions->type == print_options::STATISTICS)
grantlee_template = TemplateLayout::readTemplate(QString::fromUtf8("statistics") + QDir::separator() + printOptions->p_template); grantlee_template = TemplateLayout::readTemplate(QString::fromUtf8("statistics") + QDir::separator() + printOptions->p_template);
}
} }
void TemplateEdit::on_fontsize_valueChanged(int font_size) void TemplateEdit::on_fontsize_valueChanged(int font_size)
@ -137,9 +135,8 @@ void TemplateEdit::saveSettings()
QString message = "Do you want to save your changes?"; QString message = "Do you want to save your changes?";
bool templateChanged = false; bool templateChanged = false;
if (grantlee_template.compare(ui->plainTextEdit->toPlainText())) { if (grantlee_template.compare(ui->plainTextEdit->toPlainText())) {
if (bundledTemplates.contains(printOptions->p_template) || (printOptions->p_template == "Default.html" && printOptions->type == print_options::STATISTICS)) { if (bundledTemplates.contains(printOptions->p_template) || (printOptions->p_template == "Default.html" && printOptions->type == print_options::STATISTICS))
message = "You are about to modify a template bundled with Subsurface. Do you want to save your changes?"; message = "You are about to modify a template bundled with Subsurface. Do you want to save your changes?";
}
templateChanged = true; templateChanged = true;
} }
msgBox.setText(message); msgBox.setText(message);
@ -149,15 +146,13 @@ void TemplateEdit::saveSettings()
memcpy(templateOptions, &newTemplateOptions, sizeof(struct template_options)); memcpy(templateOptions, &newTemplateOptions, sizeof(struct template_options));
if (templateChanged) { if (templateChanged) {
TemplateLayout::writeTemplate(printOptions->p_template, ui->plainTextEdit->toPlainText()); TemplateLayout::writeTemplate(printOptions->p_template, ui->plainTextEdit->toPlainText());
if (printOptions->type == print_options::DIVELIST) { if (printOptions->type == print_options::DIVELIST)
TemplateLayout::writeTemplate(printOptions->p_template, ui->plainTextEdit->toPlainText()); TemplateLayout::writeTemplate(printOptions->p_template, ui->plainTextEdit->toPlainText());
} else if (printOptions->type == print_options::STATISTICS) { else if (printOptions->type == print_options::STATISTICS)
TemplateLayout::writeTemplate(QString::fromUtf8("statistics") + QDir::separator() + printOptions->p_template, ui->plainTextEdit->toPlainText()); TemplateLayout::writeTemplate(QString::fromUtf8("statistics") + QDir::separator() + printOptions->p_template, ui->plainTextEdit->toPlainText());
}
} }
if (templateOptions->color_palette_index == CUSTOM) { if (templateOptions->color_palette_index == CUSTOM)
custom_colors = templateOptions->color_palette; custom_colors = templateOptions->color_palette;
}
} }
} }
} }
@ -203,35 +198,34 @@ void TemplateEdit::colorSelect(QAbstractButton *button)
switch (btnGroup->id(button)) { switch (btnGroup->id(button)) {
case 1: case 1:
color = QColorDialog::getColor(newTemplateOptions.color_palette.color1, this); color = QColorDialog::getColor(newTemplateOptions.color_palette.color1, this);
if (color.isValid()) { if (color.isValid())
newTemplateOptions.color_palette.color1 = color; newTemplateOptions.color_palette.color1 = color;
}
break; break;
case 2: case 2:
color = QColorDialog::getColor(newTemplateOptions.color_palette.color2, this); color = QColorDialog::getColor(newTemplateOptions.color_palette.color2, this);
if (color.isValid()) { if (color.isValid())
newTemplateOptions.color_palette.color2 = color; newTemplateOptions.color_palette.color2 = color;
} break; break;
case 3: case 3:
color = QColorDialog::getColor(newTemplateOptions.color_palette.color3, this); color = QColorDialog::getColor(newTemplateOptions.color_palette.color3, this);
if (color.isValid()) { if (color.isValid())
newTemplateOptions.color_palette.color3 = color; newTemplateOptions.color_palette.color3 = color;
} break; break;
case 4: case 4:
color = QColorDialog::getColor(newTemplateOptions.color_palette.color4, this); color = QColorDialog::getColor(newTemplateOptions.color_palette.color4, this);
if (color.isValid()) { if (color.isValid())
newTemplateOptions.color_palette.color4 = color; newTemplateOptions.color_palette.color4 = color;
} break; break;
case 5: case 5:
color = QColorDialog::getColor(newTemplateOptions.color_palette.color5, this); color = QColorDialog::getColor(newTemplateOptions.color_palette.color5, this);
if (color.isValid()) { if (color.isValid())
newTemplateOptions.color_palette.color5 = color; newTemplateOptions.color_palette.color5 = color;
} break; break;
case 6: case 6:
color = QColorDialog::getColor(newTemplateOptions.color_palette.color6, this); color = QColorDialog::getColor(newTemplateOptions.color_palette.color6, this);
if (color.isValid()) { if (color.isValid())
newTemplateOptions.color_palette.color6 = color; newTemplateOptions.color_palette.color6 = color;
} break; break;
} }
newTemplateOptions.color_palette_index = CUSTOM; newTemplateOptions.color_palette_index = CUSTOM;
updatePreview(); updatePreview();