From 27bec9bc7b2a163f680d1fb03f53b4bcaecd1234 Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Thu, 27 Aug 2015 22:40:04 +0200 Subject: Printing: support in-place editing for templates Edit the templates into the same file, which is more intuitive as Custom.html is a bit confusing. Signed-off-by: Gehad elrobey Signed-off-by: Dirk Hohndel --- printing_templates/Custom.html | 50 ------------------------------------------ qt-ui/templateedit.cpp | 6 +++-- 2 files changed, 4 insertions(+), 52 deletions(-) delete mode 100644 printing_templates/Custom.html diff --git a/printing_templates/Custom.html b/printing_templates/Custom.html deleted file mode 100644 index 52fdb4b49..000000000 --- a/printing_templates/Custom.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - -{% block main_rows %} - {% for dive in dives %} -

This template is empty

- -

- {% endfor %} -{% endblock %} - - diff --git a/qt-ui/templateedit.cpp b/qt-ui/templateedit.cpp index b50338090..7ca84c88a 100644 --- a/qt-ui/templateedit.cpp +++ b/qt-ui/templateedit.cpp @@ -75,6 +75,9 @@ void TemplateEdit::updatePreview() // update critical UI elements ui->colorpalette->setCurrentIndex(newTemplateOptions.color_palette_index); + + // update grantlee template string + grantlee_template = TemplateLayout::readTemplate(printOptions->p_template); } void TemplateEdit::on_fontsize_valueChanged(int font_size) @@ -128,8 +131,7 @@ void TemplateEdit::saveSettings() if (msgBox.exec() == QMessageBox::Save) { memcpy(templateOptions, &newTemplateOptions, sizeof(struct template_options)); if (grantlee_template.compare(ui->plainTextEdit->toPlainText())) { - printOptions->p_template = "Custom.html"; - TemplateLayout::writeTemplate("Custom.html", ui->plainTextEdit->toPlainText()); + TemplateLayout::writeTemplate(printOptions->p_template, ui->plainTextEdit->toPlainText()); } if (templateOptions->color_palette_index == CUSTOM) { custom_colors = templateOptions->color_palette; -- cgit v1.2.3-70-g09d2