From e9fcb0068c5e398b42ff0931130ec9bc96600429 Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Mon, 26 Mar 2012 13:12:12 +0000
Subject: [PATCH] Implementando cores default para impressão

---
 pw3270.cbp      | 297 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------
 src/gtk/print.c |  34 +++++++++++++++++++++++++++++++++-
 2 files changed, 182 insertions(+), 149 deletions(-)

diff --git a/pw3270.cbp b/pw3270.cbp
index ea4057a..a9ae9e2 100644
--- a/pw3270.cbp
+++ b/pw3270.cbp
@@ -8,8 +8,8 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output=".bin\Debug\pw3270" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".obj\Debug\" />
+				<Option output=".bin/Debug/pw3270" prefix_auto="1" extension_auto="1" />
+				<Option object_output=".obj/Debug/" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -18,8 +18,8 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output=".bin\Release\pw3270" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".obj\Release\" />
+				<Option output=".bin/Release/pw3270" prefix_auto="1" extension_auto="1" />
+				<Option object_output=".obj/Release/" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -33,287 +33,288 @@
 		<Compiler>
 			<Add option="-Wall" />
 			<Add option="`pkg-config gtk+-3.0 lib3270 --cflags`" />
-			<Add directory="src\include" />
+			<Add directory="src/include" />
 		</Compiler>
 		<Linker>
 			<Add option="`pkg-config gtk+-3.0 lib3270 --libs`" />
 		</Linker>
 		<Unit filename="Makefile.in" />
+		<Unit filename="colors.conf" />
 		<Unit filename="configure.ac" />
 		<Unit filename="pw3270.spec.in" />
-		<Unit filename="src\gtk\Makefile.in" />
-		<Unit filename="src\gtk\actions.c">
+		<Unit filename="src/gtk/Makefile.in" />
+		<Unit filename="src/gtk/actions.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\common\common.h" />
-		<Unit filename="src\gtk\common\config.c">
+		<Unit filename="src/gtk/common/common.h" />
+		<Unit filename="src/gtk/common/config.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\dialog.c">
+		<Unit filename="src/gtk/dialog.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\fonts.c">
+		<Unit filename="src/gtk/fonts.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\globals.h" />
-		<Unit filename="src\gtk\main.c">
+		<Unit filename="src/gtk/globals.h" />
+		<Unit filename="src/gtk/main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\mainwindow.c">
+		<Unit filename="src/gtk/mainwindow.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\print.c">
+		<Unit filename="src/gtk/print.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\uiparser\Makefile.in" />
-		<Unit filename="src\gtk\uiparser\accelerator.c">
+		<Unit filename="src/gtk/uiparser/Makefile.in" />
+		<Unit filename="src/gtk/uiparser/accelerator.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\uiparser\action.c">
+		<Unit filename="src/gtk/uiparser/action.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\uiparser\menu.c">
+		<Unit filename="src/gtk/uiparser/menu.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\uiparser\menubar.c">
+		<Unit filename="src/gtk/uiparser/menubar.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\uiparser\menuitem.c">
+		<Unit filename="src/gtk/uiparser/menuitem.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\uiparser\parsefile.c">
+		<Unit filename="src/gtk/uiparser/parsefile.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\uiparser\parser.c">
+		<Unit filename="src/gtk/uiparser/parser.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\uiparser\parser.h" />
-		<Unit filename="src\gtk\uiparser\popup.c">
+		<Unit filename="src/gtk/uiparser/parser.h" />
+		<Unit filename="src/gtk/uiparser/popup.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\uiparser\private.h" />
-		<Unit filename="src\gtk\uiparser\script.c">
+		<Unit filename="src/gtk/uiparser/private.h" />
+		<Unit filename="src/gtk/uiparser/script.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\uiparser\separator.c">
+		<Unit filename="src/gtk/uiparser/separator.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\uiparser\sources.mak" />
-		<Unit filename="src\gtk\uiparser\toolbar.c">
+		<Unit filename="src/gtk/uiparser/sources.mak" />
+		<Unit filename="src/gtk/uiparser/toolbar.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\uiparser\toolitem.c">
+		<Unit filename="src/gtk/uiparser/toolitem.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\v3270\clipboard.c">
+		<Unit filename="src/gtk/v3270/clipboard.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\v3270\draw.c">
+		<Unit filename="src/gtk/v3270/draw.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\v3270\genmarshal" />
-		<Unit filename="src\gtk\v3270\iocallback.c">
+		<Unit filename="src/gtk/v3270/genmarshal" />
+		<Unit filename="src/gtk/v3270/iocallback.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\v3270\keyboard.c">
+		<Unit filename="src/gtk/v3270/keyboard.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\v3270\mouse.c">
+		<Unit filename="src/gtk/v3270/mouse.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\v3270\oia.c">
+		<Unit filename="src/gtk/v3270/oia.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\v3270\private.h" />
-		<Unit filename="src\gtk\v3270\sources.mak" />
-		<Unit filename="src\gtk\v3270\v3270.h" />
-		<Unit filename="src\gtk\v3270\widget.c">
+		<Unit filename="src/gtk/v3270/private.h" />
+		<Unit filename="src/gtk/v3270/sources.mak" />
+		<Unit filename="src/gtk/v3270/v3270.h" />
+		<Unit filename="src/gtk/v3270/widget.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\include\lib3270.h" />
-		<Unit filename="src\include\lib3270\action_table.h" />
-		<Unit filename="src\include\lib3270\actions.h" />
-		<Unit filename="src\include\lib3270\config.h.in" />
-		<Unit filename="src\include\lib3270\log.h" />
-		<Unit filename="src\include\lib3270\popup.h" />
-		<Unit filename="src\include\lib3270\selection.h" />
-		<Unit filename="src\include\lib3270\session.h" />
-		<Unit filename="src\include\pw3270.h" />
-		<Unit filename="src\include\rules.mak.in" />
-		<Unit filename="src\lib3270\3270ds.h" />
-		<Unit filename="src\lib3270\Makefile.in" />
-		<Unit filename="src\lib3270\X11keysym.h" />
-		<Unit filename="src\lib3270\XtGlue.c">
+		<Unit filename="src/include/lib3270.h" />
+		<Unit filename="src/include/lib3270/action_table.h" />
+		<Unit filename="src/include/lib3270/actions.h" />
+		<Unit filename="src/include/lib3270/config.h.in" />
+		<Unit filename="src/include/lib3270/log.h" />
+		<Unit filename="src/include/lib3270/popup.h" />
+		<Unit filename="src/include/lib3270/selection.h" />
+		<Unit filename="src/include/lib3270/session.h" />
+		<Unit filename="src/include/pw3270.h" />
+		<Unit filename="src/include/rules.mak.in" />
+		<Unit filename="src/lib3270/3270ds.h" />
+		<Unit filename="src/lib3270/Makefile.in" />
+		<Unit filename="src/lib3270/X11keysym.h" />
+		<Unit filename="src/lib3270/XtGlue.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\actions.c">
+		<Unit filename="src/lib3270/actions.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\actionsc.h" />
-		<Unit filename="src\lib3270\ansi.c">
+		<Unit filename="src/lib3270/actionsc.h" />
+		<Unit filename="src/lib3270/ansi.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\ansic.h" />
-		<Unit filename="src\lib3270\api.h" />
-		<Unit filename="src\lib3270\apl.c">
+		<Unit filename="src/lib3270/ansic.h" />
+		<Unit filename="src/lib3270/api.h" />
+		<Unit filename="src/lib3270/apl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\aplc.h" />
-		<Unit filename="src\lib3270\appres.h" />
-		<Unit filename="src\lib3270\arpa_telnet.h" />
-		<Unit filename="src\lib3270\cg.h" />
-		<Unit filename="src\lib3270\charset.c">
+		<Unit filename="src/lib3270/aplc.h" />
+		<Unit filename="src/lib3270/appres.h" />
+		<Unit filename="src/lib3270/arpa_telnet.h" />
+		<Unit filename="src/lib3270/cg.h" />
+		<Unit filename="src/lib3270/charset.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\charsetc.h" />
-		<Unit filename="src\lib3270\childc.h" />
-		<Unit filename="src\lib3270\ctlr.c">
+		<Unit filename="src/lib3270/charsetc.h" />
+		<Unit filename="src/lib3270/childc.h" />
+		<Unit filename="src/lib3270/ctlr.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\ctlr.h" />
-		<Unit filename="src\lib3270\ctlrc.h" />
-		<Unit filename="src\lib3270\dialogc.h" />
-		<Unit filename="src\lib3270\fallbacks.c">
+		<Unit filename="src/lib3270/ctlr.h" />
+		<Unit filename="src/lib3270/ctlrc.h" />
+		<Unit filename="src/lib3270/dialogc.h" />
+		<Unit filename="src/lib3270/fallbacks.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\ft.c">
+		<Unit filename="src/lib3270/ft.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\ft_cut.c">
+		<Unit filename="src/lib3270/ft_cut.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\ft_cut_ds.h" />
-		<Unit filename="src\lib3270\ft_cutc.h" />
-		<Unit filename="src\lib3270\ft_dft.c">
+		<Unit filename="src/lib3270/ft_cut_ds.h" />
+		<Unit filename="src/lib3270/ft_cutc.h" />
+		<Unit filename="src/lib3270/ft_dft.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\ft_dft_ds.h" />
-		<Unit filename="src\lib3270\ft_dftc.h" />
-		<Unit filename="src\lib3270\ftc.h" />
-		<Unit filename="src\lib3270\globals.h" />
-		<Unit filename="src\lib3270\glue.c">
+		<Unit filename="src/lib3270/ft_dft_ds.h" />
+		<Unit filename="src/lib3270/ft_dftc.h" />
+		<Unit filename="src/lib3270/ftc.h" />
+		<Unit filename="src/lib3270/globals.h" />
+		<Unit filename="src/lib3270/glue.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\gluec.h" />
-		<Unit filename="src\lib3270\host.c">
+		<Unit filename="src/lib3270/gluec.h" />
+		<Unit filename="src/lib3270/host.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\hostc.h" />
-		<Unit filename="src\lib3270\icmdc.h" />
-		<Unit filename="src\lib3270\init.c">
+		<Unit filename="src/lib3270/hostc.h" />
+		<Unit filename="src/lib3270/icmdc.h" />
+		<Unit filename="src/lib3270/init.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\keypadc.h" />
-		<Unit filename="src\lib3270\kybd.c">
+		<Unit filename="src/lib3270/keypadc.h" />
+		<Unit filename="src/lib3270/kybd.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\kybdc.h" />
-		<Unit filename="src\lib3270\localdefs.h" />
-		<Unit filename="src\lib3270\log.c">
+		<Unit filename="src/lib3270/kybdc.h" />
+		<Unit filename="src/lib3270/localdefs.h" />
+		<Unit filename="src/lib3270/log.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\macros.c">
+		<Unit filename="src/lib3270/macros.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\mkfb.c">
+		<Unit filename="src/lib3270/mkfb.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\objects.h" />
-		<Unit filename="src\lib3270\paste.c">
+		<Unit filename="src/lib3270/objects.h" />
+		<Unit filename="src/lib3270/paste.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\popupsc.h" />
-		<Unit filename="src\lib3270\print.c">
+		<Unit filename="src/lib3270/popupsc.h" />
+		<Unit filename="src/lib3270/print.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\printc.h" />
-		<Unit filename="src\lib3270\printer.c">
+		<Unit filename="src/lib3270/printc.h" />
+		<Unit filename="src/lib3270/printer.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\printerc.h" />
-		<Unit filename="src\lib3270\proxy.c">
+		<Unit filename="src/lib3270/printerc.h" />
+		<Unit filename="src/lib3270/proxy.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\proxyc.h" />
-		<Unit filename="src\lib3270\resolver.c">
+		<Unit filename="src/lib3270/proxyc.h" />
+		<Unit filename="src/lib3270/resolver.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\resolverc.h" />
-		<Unit filename="src\lib3270\resources.c">
+		<Unit filename="src/lib3270/resolverc.h" />
+		<Unit filename="src/lib3270/resources.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\resources.h" />
-		<Unit filename="src\lib3270\rpq.c">
+		<Unit filename="src/lib3270/resources.h" />
+		<Unit filename="src/lib3270/rpq.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\savec.h" />
-		<Unit filename="src\lib3270\screen.c">
+		<Unit filename="src/lib3270/savec.h" />
+		<Unit filename="src/lib3270/screen.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\screen.h" />
-		<Unit filename="src\lib3270\screenc.h" />
-		<Unit filename="src\lib3270\scrollc.h" />
-		<Unit filename="src\lib3270\see.c">
+		<Unit filename="src/lib3270/screen.h" />
+		<Unit filename="src/lib3270/screenc.h" />
+		<Unit filename="src/lib3270/scrollc.h" />
+		<Unit filename="src/lib3270/see.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\seec.h" />
-		<Unit filename="src\lib3270\selection.c">
+		<Unit filename="src/lib3270/seec.h" />
+		<Unit filename="src/lib3270/selection.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\sf.c">
+		<Unit filename="src/lib3270/sf.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\sfc.h" />
-		<Unit filename="src\lib3270\shlobj_missing.h" />
-		<Unit filename="src\lib3270\statusc.h" />
-		<Unit filename="src\lib3270\tables.c">
+		<Unit filename="src/lib3270/sfc.h" />
+		<Unit filename="src/lib3270/shlobj_missing.h" />
+		<Unit filename="src/lib3270/statusc.h" />
+		<Unit filename="src/lib3270/tables.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\tablesc.h" />
-		<Unit filename="src\lib3270\telnet.c">
+		<Unit filename="src/lib3270/tablesc.h" />
+		<Unit filename="src/lib3270/telnet.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\telnetc.h" />
-		<Unit filename="src\lib3270\testprogram.c">
+		<Unit filename="src/lib3270/telnetc.h" />
+		<Unit filename="src/lib3270/testprogram.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\tn3270e.h" />
-		<Unit filename="src\lib3270\toggle.h" />
-		<Unit filename="src\lib3270\toggles.c">
+		<Unit filename="src/lib3270/tn3270e.h" />
+		<Unit filename="src/lib3270/toggle.h" />
+		<Unit filename="src/lib3270/toggles.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\togglesc.h" />
-		<Unit filename="src\lib3270\trace_ds.c">
+		<Unit filename="src/lib3270/togglesc.h" />
+		<Unit filename="src/lib3270/trace_ds.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\trace_dsc.h" />
-		<Unit filename="src\lib3270\utf8.c">
+		<Unit filename="src/lib3270/trace_dsc.h" />
+		<Unit filename="src/lib3270/utf8.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\utf8c.h" />
-		<Unit filename="src\lib3270\util.c">
+		<Unit filename="src/lib3270/utf8c.h" />
+		<Unit filename="src/lib3270/util.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\utilc.h" />
-		<Unit filename="src\lib3270\version.c">
+		<Unit filename="src/lib3270/utilc.h" />
+		<Unit filename="src/lib3270/version.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\w3misc.c">
+		<Unit filename="src/lib3270/w3misc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\w3miscc.h" />
-		<Unit filename="src\lib3270\widec.h" />
-		<Unit filename="src\lib3270\winvers.c">
+		<Unit filename="src/lib3270/w3miscc.h" />
+		<Unit filename="src/lib3270/widec.h" />
+		<Unit filename="src/lib3270/winvers.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\winversc.h" />
-		<Unit filename="src\lib3270\xio.c">
+		<Unit filename="src/lib3270/winversc.h" />
+		<Unit filename="src/lib3270/xio.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\xioc.h" />
-		<Unit filename="src\lib3270\xl.h" />
-		<Unit filename="ui\00default.xml" />
-		<Unit filename="ui\99debug.xml" />
+		<Unit filename="src/lib3270/xioc.h" />
+		<Unit filename="src/lib3270/xl.h" />
+		<Unit filename="ui/00default.xml" />
+		<Unit filename="ui/99debug.xml" />
 		<Extensions>
 			<code_completion />
 			<debugger />
diff --git a/src/gtk/print.c b/src/gtk/print.c
index 2b5d1b7..fd3b4e7 100644
--- a/src/gtk/print.c
+++ b/src/gtk/print.c
@@ -117,7 +117,38 @@
 
  static GObject * create_custom_widget(GtkPrintOperation *prt, PRINT_INFO *info)
  {
- 	static const gchar	* label[]	= { N_( "Font:" ), N_( "Colors:" ) };
+	static const gchar *def_colors =	"white,"
+										"black,"
+										"black,"
+										"black,"
+										"black,"
+										"black,"
+										"black,"
+										"black,"
+										"black,"
+										"black,"
+										"black,"
+										"black,"
+										"black,"
+										"black,"
+										"black,"
+										"black,"
+										"black,"
+										"black,"
+										"black,"
+										"black,"
+										"black,"
+										"white,"
+										"black,"
+										"black,"
+										"black,"
+										"white,"
+										"black,"
+										"black,"
+										"black,"
+										"black";
+
+ 	static const gchar	* label[]	= { N_( "Font:" ), N_( "Color scheme:" ) };
 	GtkWidget			* container = gtk_table_new(2,2,FALSE);
 	GtkWidget			* widget;
 	int					  f;
@@ -147,6 +178,7 @@
 	widget = gtk_combo_box_new();
 #endif // GTK(3,0,0)
 
+	info->colorname = get_string_from_config("print","colors",def_colors);
 	load_color_schemes(widget,info->colorname);
 	gtk_table_attach(GTK_TABLE(container),widget,1,2,1,2,GTK_EXPAND|GTK_FILL,GTK_FILL,5,0);
 
--
libgit2 0.21.2