Printing: move template_options to print_options.h

Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>

5 files changed, 13 insertions, 11 deletions

diff --git a/qt-ui/printoptions.cpp b/qt-ui/printoptions.cpp
index 08be76588..f3c6eb14c 100644
--- a/qt-ui/printoptions.cpp
+++ b/qt-ui/printoptions.cpp
@@ -108,6 +108,6 @@ void PrintOptions::on_printTemplate_currentIndexChanged(int index)
 
 void PrintOptions::on_editButton_clicked()
 {
-	TemplateEdit te(this, templateOptions);
+	TemplateEdit te(this, printOptions, templateOptions);
 	te.exec();
 }
diff --git a/qt-ui/printoptions.h b/qt-ui/printoptions.h
index c33addc83..d96b27a53 100644
--- a/qt-ui/printoptions.h
+++ b/qt-ui/printoptions.h
@@ -21,6 +21,13 @@ struct print_options {
 	bool landscape;
 };
 
+struct template_options {
+	int font_index;
+	int color_palette_index;
+	double font_size;
+	double line_spacing;
+};
+
 // should be based on a custom QPrintDialog class
 class PrintOptions : public QWidget {
 	Q_OBJECT
diff --git a/qt-ui/templateedit.cpp b/qt-ui/templateedit.cpp
index a4236d036..aecfdc434 100644
--- a/qt-ui/templateedit.cpp
+++ b/qt-ui/templateedit.cpp
@@ -1,12 +1,14 @@
 #include "templateedit.h"
+#include "printoptions.h"
 #include "ui_templateedit.h"
 
-TemplateEdit::TemplateEdit(QWidget *parent, struct template_options *templateOptions) :
+TemplateEdit::TemplateEdit(QWidget *parent, struct print_options *printOptions, struct template_options *templateOptions) :
 	QDialog(parent),
 	ui(new Ui::TemplateEdit)
 {
 	ui->setupUi(this);
 	this->templateOptions = templateOptions;
+	this->printOptions = printOptions;
 
 	// restore the settings and init the UI
 	ui->fontSelection->setCurrentIndex(templateOptions->font_index);
diff --git a/qt-ui/templateedit.h b/qt-ui/templateedit.h
index 73a5e9fbb..dc38d11fc 100644
--- a/qt-ui/templateedit.h
+++ b/qt-ui/templateedit.h
@@ -3,13 +3,6 @@
 
 #include <QDialog>
 
-struct template_options {
-	int font_index;
-	int color_palette_index;
-	double font_size;
-	double line_spacing;
-};
-
 namespace Ui {
 class TemplateEdit;
 }
@@ -19,7 +12,7 @@ class TemplateEdit : public QDialog
 	Q_OBJECT
 
 public:
-	explicit TemplateEdit(QWidget *parent, struct template_options *templateOptions);
+	explicit TemplateEdit(QWidget *parent, struct print_options *printOptions, struct template_options *templateOptions);
 	~TemplateEdit();
 private slots:
 	void on_fontsize_valueChanged(int font_size);
@@ -33,6 +26,7 @@ private slots:
 private:
 	Ui::TemplateEdit *ui;
 	struct template_options *templateOptions;
+	struct print_options *printOptions;
 };
 
 #endif // TEMPLATEEDIT_H
diff --git a/templatelayout.h b/templatelayout.h
index 3826c6c00..622f7d7a0 100644
--- a/templatelayout.h
+++ b/templatelayout.h
@@ -4,7 +4,6 @@
 #include <grantlee_templates.h>
 #include "mainwindow.h"
 #include "printoptions.h"
-#include "templateedit.h"
 
 int getTotalWork(print_options *printOptions);