From 1c2b276912917735c52be04ced4f3cff1bb09795 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Wed, 31 Jul 2019 16:38:50 -0300
Subject: [PATCH] Addint methods to get/set properties on the print operation dialog.

---
 src/dialogs/colorscheme.c       | 47 ++++++++++++++++++++++++++++++-----------------
 src/dialogs/print/convenience.c | 28 ----------------------------
 src/dialogs/print/print.c       | 32 ++++++++++++++++++++++++++++++++
 src/include/internals.h         |  4 ++++
 src/include/v3270/print.h       |  9 ++++++++-
 5 files changed, 74 insertions(+), 46 deletions(-)

diff --git a/src/dialogs/colorscheme.c b/src/dialogs/colorscheme.c
index 2742139..d6baf79 100644
--- a/src/dialogs/colorscheme.c
+++ b/src/dialogs/colorscheme.c
@@ -363,33 +363,40 @@
  gchar * v3270_color_scheme_get_text(GtkWidget *widget)
  {
 	GdkRGBA		* clr		= NULL;
-	GValue		  value	= { 0, };
+	gchar		* rc		= NULL;
+	GValue		  value		= { 0, };
 	GtkTreeIter	  iter;
-	int			  f;
 
 	if(!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget),&iter))
 		return NULL;
 
 	gtk_tree_model_get_value(gtk_combo_box_get_model(GTK_COMBO_BOX(widget)),&iter,1,&value);
 	clr = g_value_get_pointer(&value);
-	GString *str = g_string_new("");
 
 	if(clr)
+		rc = v3270_translate_rgba_to_text(clr);
+
+	g_value_unset(&value);
+
+	return rc;
+
+ }
+
+ gchar * v3270_translate_rgba_to_text(GdkRGBA *clr)
+ {
+ 	int f;
+	GString *str = g_string_new("");
+
+	for(f=0;f<V3270_COLOR_COUNT;f++)
 	{
-		for(f=0;f<V3270_COLOR_COUNT;f++)
-		{
-			if(f)
-				g_string_append_c(str,';');
+		if(f)
+			g_string_append_c(str,';');
 
-			g_autofree gchar * color = gdk_rgba_to_string(clr+f);
-			g_string_append_printf(str,"%s",color);
-		}
+		g_autofree gchar * color = gdk_rgba_to_string(clr+f);
+		g_string_append_printf(str,"%s",color);
 	}
 
-	g_value_unset(&value);
-
 	return g_string_free(str,FALSE);
-
  }
 
  void v3270_color_scheme_set_rgba(GtkWidget *widget, const GdkRGBA *colors)
@@ -416,14 +423,22 @@
 		} while(gtk_tree_model_iter_next(model,&iter));
 	}
 
-	debug("%s: Can't identify color scheme", __FUNCTION__);
+	g_message("Can't find color scheme for %s",colors);
 	gtk_combo_box_set_active(GTK_COMBO_BOX(widget),-1);
 
+	// TODO: Create an entry for this scheme as "custom" and select it.
+
  }
 
  void v3270_color_scheme_set_text(GtkWidget *widget, const gchar *colors)
  {
-	GdkRGBA		  clr[V3270_COLOR_COUNT];
+	GdkRGBA clr[V3270_COLOR_COUNT];
+	v3270_translate_text_to_rgba(colors,clr);
+	v3270_color_scheme_set_rgba(widget,clr);
+ }
+
+ void v3270_translate_text_to_rgba(const gchar *colors, GdkRGBA *clr)
+ {
 	gchar		**str = g_strsplit(colors,";",V3270_COLOR_BASE);
 	size_t 		  f;
 
@@ -456,8 +471,6 @@
 
 	g_strfreev(str);
 
-	v3270_color_scheme_set_rgba(widget,clr);
-
  }
 
  int v3270_color_scheme_get_rgba(GtkWidget *widget, GdkRGBA *colors, size_t num_colors)
diff --git a/src/dialogs/print/convenience.c b/src/dialogs/print/convenience.c
index ac320b6..197afee 100644
--- a/src/dialogs/print/convenience.c
+++ b/src/dialogs/print/convenience.c
@@ -43,34 +43,6 @@
 		return errno = EINVAL;
 	}
 
-	/*
- 	if(!v3270_is_connected(widget))
-	{
-		if(error)
-		{
-			*error = g_error_new(g_quark_from_static_string(PACKAGE_NAME),ENOTCONN,"%s",strerror(ENOTCONN));
-		}
-		else
-		{
-			GtkWidget *popup = gtk_message_dialog_new_with_markup(
-				GTK_WINDOW(gtk_widget_get_toplevel(widget)),
-				GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
-				GTK_MESSAGE_ERROR,GTK_BUTTONS_CLOSE,
-				_("Can't print data")
-			);
-
-			gtk_window_set_title(GTK_WINDOW(popup),_("Operation has failed"));
-
-			gtk_message_dialog_format_secondary_markup(GTK_MESSAGE_DIALOG(popup),"%s",strerror(ENOTCONN));
-
-			gtk_dialog_run(GTK_DIALOG(popup));
-			gtk_widget_destroy(popup);
-		}
-
-		return errno = ENOTCONN;
-	}
-	*/
-
 	lib3270_trace_event(v3270_get_session(widget),"print action activated (type=%d)",(int) mode);
 
 	// Print operation.
diff --git a/src/dialogs/print/print.c b/src/dialogs/print/print.c
index 68a78b1..a2db99d 100644
--- a/src/dialogs/print/print.c
+++ b/src/dialogs/print/print.c
@@ -235,3 +235,35 @@ GtkPrintOperation	* v3270_print_operation_new(GtkWidget *widget, LIB3270_CONTENT
 	return GTK_PRINT_OPERATION(operation);
 }
 
+gboolean v3270_print_operation_set_font_family(GtkPrintOperation *operation, const gchar *fontname)
+{
+	g_return_val_if_fail(GTK_IS_V3270_PRINT_OPERATION(operation),FALSE);
+
+	V3270PrintOperation * opr = GTK_V3270_PRINT_OPERATION(operation);
+
+	if(opr->font.name)
+		g_free(opr->font.name);
+
+	opr->font.name = g_strdup(fontname);
+
+	return TRUE;
+
+}
+
+gchar * v3270_print_operation_get_font_family(GtkPrintOperation *operation)
+{
+	g_return_val_if_fail(GTK_IS_V3270_PRINT_OPERATION(operation),NULL);
+	return g_strdup(GTK_V3270_PRINT_OPERATION(operation)->font.name);
+}
+
+void v3270_print_operation_set_color_scheme(GtkPrintOperation *operation, const gchar *colors)
+{
+	g_return_if_fail(GTK_IS_V3270_PRINT_OPERATION(operation));
+	v3270_translate_text_to_rgba(colors,GTK_V3270_PRINT_OPERATION(operation)->settings.colors);
+}
+
+gchar * v3270_print_operation_get_color_scheme(GtkPrintOperation *operation)
+{
+	g_return_val_if_fail(GTK_IS_V3270_PRINT_OPERATION(operation),NULL);
+	return v3270_translate_rgba_to_text(GTK_V3270_PRINT_OPERATION(operation)->settings.colors);
+}
diff --git a/src/include/internals.h b/src/include/internals.h
index 2ee0e95..9cccfb7 100644
--- a/src/include/internals.h
+++ b/src/include/internals.h
@@ -238,6 +238,10 @@
  G_GNUC_INTERNAL GSource	* IO_source_new(H3270 *session, int fd, LIB3270_IO_FLAG flag, void(*call)(H3270 *, int, LIB3270_IO_FLAG, void *), void *userdata);
  G_GNUC_INTERNAL void		  IO_source_set_state(GSource *source, gboolean enable);
 
+ // Tools
+ G_GNUC_INTERNAL void 		  v3270_translate_text_to_rgba(const gchar *colors, GdkRGBA *clr);
+ G_GNUC_INTERNAL gchar		* v3270_translate_rgba_to_text(GdkRGBA *clr);
+
 G_END_DECLS
 
 #endif // V3270_INTERNALS_H_INCLUDED
diff --git a/src/include/v3270/print.h b/src/include/v3270/print.h
index d5b07b5..b59e902 100644
--- a/src/include/v3270/print.h
+++ b/src/include/v3270/print.h
@@ -64,9 +64,16 @@
 
  LIB3270_EXPORT GType				  V3270PrintOperation_get_type(void);
  LIB3270_EXPORT GtkPrintOperation	* v3270_print_operation_new(GtkWidget *widget, LIB3270_CONTENT_OPTION mode);
- LIB3270_EXPORT GtkWidget			* v3270_print_operation_get_terminal(GtkPrintOperation *operation);
  LIB3270_EXPORT void				  v3270_print_operation_apply_settings(GtkPrintOperation *operation, GtkWidget *settings);
 
+ LIB3270_EXPORT GtkWidget			* v3270_print_operation_get_terminal(GtkPrintOperation *operation);
+
+ LIB3270_EXPORT gboolean			  v3270_print_operation_set_font_family(GtkPrintOperation *operation, const gchar *fontname);
+ LIB3270_EXPORT gchar				* v3270_print_operation_get_font_family(GtkPrintOperation *operation);
+
+ LIB3270_EXPORT void				  v3270_print_operation_set_color_scheme(GtkPrintOperation *operation, const gchar *colors);
+ LIB3270_EXPORT gchar 				* v3270_print_operation_get_color_scheme(GtkPrintOperation *operation);
+
  LIB3270_EXPORT GtkTreeModel		* v3270_font_family_model_new(GtkWidget *widget, const gchar *selected, GtkTreeIter * active);
 
  LIB3270_EXPORT GtkWidget			* v3270_font_selection_new(const gchar *fontname);
--
libgit2 0.21.2