From a4dea2fc82fd065e281f1caa0a5a4584147553c9 Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Thu, 29 Mar 2012 04:55:10 +0000
Subject: [PATCH] Implementando dialogo de cor

---
 src/gtk/colors.c | 34 +++++++++++++++++++++++++++++++++-
 src/gtk/print.c  | 10 ++++++----
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/src/gtk/colors.c b/src/gtk/colors.c
index bb03132..7f32153 100644
--- a/src/gtk/colors.c
+++ b/src/gtk/colors.c
@@ -32,6 +32,7 @@
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
+/*
  void load_color_schemes(GtkWidget *widget, gchar *active)
  {
 	gchar *filename = build_data_filename("colors.conf",NULL);
@@ -136,6 +137,25 @@
 
 	g_free(filename);
  }
+*/
+
+/**
+ * Create a color scheme dropdown button
+ *
+ * @param clr	Pointer to current color table
+ *
+ */
+ GtkWidget * color_scheme_new(GdkColor *clr)
+ {
+#if GTK_CHECK_VERSION(3,0,0)
+	GtkWidget *widget = gtk_combo_box_text_new();
+#else
+	GtkWidget *widget = gtk_combo_box_new();
+#endif // GTK(3,0,0)
+
+
+	return widget;
+ }
 
  static void color_changed(GtkColorSelection *colorselection, GtkWidget *widget)
  {
@@ -311,10 +331,22 @@
 
 	}
 
-	// Run dialog
 	gtk_widget_show_all(panned);
 	gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),GTK_WIDGET(panned),TRUE,TRUE,2);
 
+	// Color scheme combo
+	{
+		GtkWidget * box		= gtk_hbox_new(FALSE,2);
+		GtkWidget * button	= color_scheme_new(NULL);
+
+		gtk_box_pack_start(GTK_BOX(box),gtk_label_new(_("Color scheme:")),FALSE,FALSE,2);
+		gtk_box_pack_start(GTK_BOX(box),button,TRUE,TRUE,2);
+		gtk_widget_show_all(box);
+		gtk_box_pack_end(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),box,TRUE,TRUE,2);
+	}
+
+	// Run dialog
+
 	if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
 	{
 		// Accepted, save in configuration file
diff --git a/src/gtk/print.c b/src/gtk/print.c
index b280948..13e5af9 100644
--- a/src/gtk/print.c
+++ b/src/gtk/print.c
@@ -179,6 +179,7 @@
 	trace("Font set to \"%s\" with size %d",info->font,info->fontsize);
  }
 
+/*
  static void color_scheme_changed(GtkComboBox *widget,PRINT_INFO *info)
  {
  	gchar *new_colors = NULL;
@@ -211,6 +212,7 @@
 	info->colorname = new_colors;
 
  }
+*/
 
  static void toggle_show_selection(GtkToggleButton *togglebutton,PRINT_INFO *info)
  {
@@ -284,10 +286,10 @@
 	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);
-
-	g_signal_connect(G_OBJECT(widget),"changed",G_CALLBACK(color_scheme_changed),info);
+	gtk_widget_set_sensitive(widget,FALSE);
+//	info->colorname = get_string_from_config("print","colors",def_colors);
+//	load_color_schemes(widget,info->colorname);
+//	g_signal_connect(G_OBJECT(widget),"changed",G_CALLBACK(color_scheme_changed),info);
 
 	gtk_table_attach(GTK_TABLE(container),widget,1,2,1,2,GTK_EXPAND|GTK_FILL,GTK_FILL,5,0);
 
--
libgit2 0.21.2