From cce80668b0c21c021e950d45beb6b0cd577907fa 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 12:54:13 +0000
Subject: [PATCH] Implementando cores para relatorios

---
 colors.conf            | 28 ++++++++++++++++++++++++++++
 src/gtk/Makefile.in    |  2 +-
 src/gtk/colors.c       | 10 +++++-----
 src/gtk/globals.h      |  2 +-
 src/gtk/print.c        |  2 +-
 src/gtk/pw3270-GTK.cbp |  3 +++
 6 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/colors.conf b/colors.conf
index 1ba64d9..fb65096 100644
--- a/colors.conf
+++ b/colors.conf
@@ -40,3 +40,31 @@ BaseAttributes=green,green,green,green
 SelectedText=dimGrey,green,dimGrey
 Cursor=green,green
 OIA=black,green,green,green,green
+
+[BW]
+Label=Black & White
+Label[pt_BR]=Branco e preto
+Terminal=black,white,white,white,white,white,white,white,white,white,white,white,white,white,white,white
+BaseAttributes=white,white,white,white
+SelectedText=dimGrey,white,dimGrey
+Cursor=white,white
+OIA=black,green,white,white
+
+[WB]
+Label=White on Black
+Label[pt_BR]=Branco com fundo preto
+Terminal=black,white,white,white,white,white,white,white,white,white,white,white,white,white,white,white
+BaseAttributes=white,white,white,white
+SelectedText=white,black,white
+Cursor=white,white
+OIA=black,white,white,white,white
+
+[BW]
+Label=Black on White
+Label[pt_BR]=Preto com fundo branco
+Terminal=white,black,black,black,black,black,black,black,black,black,black,black,black,black,black,black
+BaseAttributes=black,black,black,black
+SelectedText=black,white,black
+Cursor=black,black
+OIA=white,black,black,black,black
+
diff --git a/src/gtk/Makefile.in b/src/gtk/Makefile.in
index 77729e6..d6cba8f 100644
--- a/src/gtk/Makefile.in
+++ b/src/gtk/Makefile.in
@@ -50,7 +50,7 @@ include uiparser/sources.mak
 
 #---[ Targets ]----------------------------------------------------------------
 
-SOURCES=main.c mainwindow.c actions.c fonts.c dialog.c print.c \
+SOURCES=main.c mainwindow.c actions.c fonts.c dialog.c print.c colors.c \
 		$(foreach SRC, $(V3270_SRC), v3270/$(SRC)) \
 		$(foreach SRC, $(COMMON_SRC), common/$(SRC)) \
 		$(foreach SRC, $(UI_PARSER_SRC), uiparser/$(SRC))
diff --git a/src/gtk/colors.c b/src/gtk/colors.c
index b3cdd46..3b32476 100644
--- a/src/gtk/colors.c
+++ b/src/gtk/colors.c
@@ -32,7 +32,7 @@
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
- void load_color_schemes(GtkWidget *widget, gchar **target)
+ void load_color_schemes(GtkWidget *widget, gchar *active)
  {
 	gchar *filename = build_data_filename("colors.conf",NULL);
 
@@ -88,7 +88,7 @@
 												1, str,
 												-1);
 
-			if(*target && !g_strcasecmp(*target,str))
+			if(active && !g_strcasecmp(active,str))
 			{
 				found = TRUE;
 				gtk_combo_box_set_active_iter(GTK_COMBO_BOX(widget),&iter);
@@ -102,13 +102,13 @@
 		g_strfreev(group);
 		g_key_file_free(conf);
 
-		if(!found)
+		if(active && !found)
 		{
 #if GTK_CHECK_VERSION(3,0,0)
 
 			gtk_combo_box_text_insert(		GTK_COMBO_BOX_TEXT(widget),
 											0,
-											*target,
+											active,
 											_( "Custom colors") );
 
 #else
@@ -116,7 +116,7 @@
 			gtk_list_store_append((GtkListStore *) model,&iter);
 			gtk_list_store_set((GtkListStore *) model, &iter,
 												0, _( "Custom colors" ),
-												1, *target,
+												1, active,
 												-1);
 
 			gtk_combo_box_set_active_iter(GTK_COMBO_BOX(widget),&iter);
diff --git a/src/gtk/globals.h b/src/gtk/globals.h
index 303908f..a46b897 100644
--- a/src/gtk/globals.h
+++ b/src/gtk/globals.h
@@ -55,7 +55,7 @@
 
  GtkWidget	* create_main_window(void);
  void		  setup_font_list(GtkWidget *widget, GtkWidget *obj);
- void		  load_color_schemes(GtkWidget *widget, gchar **target);
+ void		  load_color_schemes(GtkWidget *widget, gchar *active);
 
  // actions
  void paste_file_action(GtkAction *action, GtkWidget *widget);
diff --git a/src/gtk/print.c b/src/gtk/print.c
index b4f6e54..2b5d1b7 100644
--- a/src/gtk/print.c
+++ b/src/gtk/print.c
@@ -147,7 +147,7 @@
 	widget = gtk_combo_box_new();
 #endif // GTK(3,0,0)
 
-	load_color_schemes(widget,&info->colorname);
+	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);
 
 	// Show and return
diff --git a/src/gtk/pw3270-GTK.cbp b/src/gtk/pw3270-GTK.cbp
index bdc7d1c..a308a05 100644
--- a/src/gtk/pw3270-GTK.cbp
+++ b/src/gtk/pw3270-GTK.cbp
@@ -41,6 +41,9 @@
 		<Unit filename="actions.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="colors.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="common/common.h" />
 		<Unit filename="common/config.c">
 			<Option compilerVar="CC" />
--
libgit2 0.21.2