From ad40e52537a4aabc6cea8a3acc5df2524bbb3fe8 Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Wed, 28 Mar 2012 15:02:03 +0000
Subject: [PATCH] Implementando processo de construção da janela principal, ajuste do nome da aplicação no gtk, etc.

---
 src/gtk/common/config.c   | 28 ++++++++++++++--------------
 src/gtk/globals.h         | 29 +++++++++++++++++------------
 src/gtk/main.c            | 31 +++++++++++++++++++------------
 src/gtk/mainwindow.c      |  6 +++++-
 src/gtk/uiparser/parser.c |  8 ++++----
 src/gtk/uiparser/parser.h |  8 ++++----
 src/gtk/v3270/widget.c    |  4 ++--
 7 files changed, 65 insertions(+), 49 deletions(-)

diff --git a/src/gtk/common/config.c b/src/gtk/common/config.c
index e707256..53a5ce8 100644
--- a/src/gtk/common/config.c
+++ b/src/gtk/common/config.c
@@ -43,12 +43,12 @@
 
 #ifdef WIN_REGISTRY_ENABLED
 
- 	static const gchar *registry_path = "SOFTWARE\\"PACKAGE_NAME;
+ 	static const gchar *registry_path = "SOFTWARE\\";
 
 #else
 
 	static GKeyFile		* program_config = NULL;
- 	static const gchar	* mask = "%s" G_DIR_SEPARATOR_S PACKAGE_NAME ".conf";
+ 	static const gchar	* mask = "%s" G_DIR_SEPARATOR_S "%s.conf";
 
 #endif // WIN_REGISTRY_ENABLED
 
@@ -87,7 +87,7 @@ gchar * get_last_error_msg(void)
  {
  	static HKEY	  predefined[] = { HKEY_CURRENT_USER, HKEY_USERS, HKEY_LOCAL_MACHINE };
  	int			  f;
-	gchar		* path = g_strdup_printf("%s\\%s",registry_path,group);
+	gchar		* path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
 
 	for(f=0;f<G_N_ELEMENTS(predefined);f++)
 	{
@@ -119,7 +119,7 @@ gchar * get_last_error_msg(void)
 	const gchar * const *sysconfig;
 
 #ifdef DEBUG
-	filename = g_strdup_printf(mask,".");
+	filename = g_strdup_printf(mask,".",g_get_application_name());
 	trace("Checking for %s",filename);
 	if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
 		return filename;
@@ -128,7 +128,7 @@ gchar * get_last_error_msg(void)
 
  	for(f=0;f<G_N_ELEMENTS(dir);f++)
 	{
-		filename = g_strdup_printf(mask,dir[f]());
+		filename = g_strdup_printf(mask,dir[f](),g_get_application_name());
 		trace("Checking for %s",filename);
 		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
 			return filename;
@@ -138,7 +138,7 @@ gchar * get_last_error_msg(void)
 	sysconfig = g_get_system_config_dirs();
  	for(f=0;sysconfig[f];f++)
 	{
-		filename = g_strdup_printf(mask,sysconfig[f]);
+		filename = g_strdup_printf(mask,sysconfig[f],g_get_application_name());
 		trace("Checking for %s",filename);
 		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
 			return filename;
@@ -148,14 +148,14 @@ gchar * get_last_error_msg(void)
 	sysconfig = g_get_system_data_dirs();
  	for(f=0;sysconfig[f];f++)
 	{
-		filename = g_strdup_printf(mask,sysconfig[f]);
+		filename = g_strdup_printf(mask,sysconfig[f],g_get_application_name());
 		trace("Checking for %s",filename);
 		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
 			return filename;
 		g_free(filename);
 	}
 
- 	return g_strdup_printf(mask,g_get_user_config_dir());
+ 	return g_strdup_printf(mask,g_get_user_config_dir(),g_get_application_name());
  }
 #endif  //  #ifdef WIN_REGISTRY_ENABLED
 
@@ -177,7 +177,7 @@ gchar * get_last_error_msg(void)
 			if(datatype == REG_DWORD)
 				ret = data ? TRUE : FALSE;
 			else
-				g_warning("Unexpected registry data type in %s\\%s\\%s",registry_path,group,key);
+				g_warning("Unexpected registry data type in %s\\%s\\%s\\%s",registry_path,g_get_application_name(),group,key);
 		}
 
 		RegCloseKey(key_handle);
@@ -220,7 +220,7 @@ gchar * get_last_error_msg(void)
 			if(datatype == REG_DWORD)
 				ret = (gint) data;
 			else
-				g_warning("Unexpected registry data type in %s\\%s\\%s",registry_path,group,key);
+				g_warning("Unexpected registry data type in %s\\%s\\%s\\%s",registry_path,g_get_application_name(),group,key);
 		}
 
 		RegCloseKey(key_handle);
@@ -321,7 +321,7 @@ static void set_string(const gchar *group, const gchar *key, const gchar *fmt, v
 
 #ifdef WIN_REGISTRY_ENABLED
 
-	gchar * path = g_strdup_printf("%s\\%s",registry_path,group);
+	gchar * path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
  	HKEY	hKey;
  	DWORD	disp;
 
@@ -356,7 +356,7 @@ void set_boolean_to_config(const gchar *group, const gchar *key, gboolean val)
 
  	HKEY	hKey;
  	DWORD	disp;
-	gchar * path = g_strdup_printf("%s\\%s",registry_path,group);
+	gchar * path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
 
 	trace("Creating key %s",path);
 	if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hKey,&disp) == ERROR_SUCCESS)
@@ -398,7 +398,7 @@ void set_integer_to_config(const gchar *group, const gchar *key, gint val)
 
  	HKEY	hKey;
  	DWORD	disp;
-	gchar * path = g_strdup_printf("%s\\%s",registry_path,group);
+	gchar * path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
 
 	trace("Creating key %s",path);
 	if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hKey,&disp) == ERROR_SUCCESS)
@@ -449,7 +449,7 @@ void configuration_deinit(void)
 
 	if(text)
 	{
-		gchar *filename = g_strdup_printf(mask,g_get_user_config_dir());
+		gchar *filename = g_strdup_printf(mask,g_get_user_config_dir(),g_get_application_name());
 
 		trace("Saving configuration in \"%s\"",filename);
 
diff --git a/src/gtk/globals.h b/src/gtk/globals.h
index a46b897..ab6e87b 100644
--- a/src/gtk/globals.h
+++ b/src/gtk/globals.h
@@ -50,20 +50,25 @@
  	ACTION_COUNT
  };
 
- // Configuration
+
+/*--[ Statics ]--------------------------------------------------------------------------------------*/
+
+
+/*--[ Global prototipes ]----------------------------------------------------------------------------*/
+
  #include "common/common.h"
 
- GtkWidget	* create_main_window(void);
- void		  setup_font_list(GtkWidget *widget, GtkWidget *obj);
- void		  load_color_schemes(GtkWidget *widget, gchar *active);
+ G_GNUC_INTERNAL GtkWidget	* create_main_window(void);
+ G_GNUC_INTERNAL void		  setup_font_list(GtkWidget *widget, GtkWidget *obj);
+ G_GNUC_INTERNAL void		  load_color_schemes(GtkWidget *widget, gchar *active);
 
  // actions
- void paste_file_action(GtkAction *action, GtkWidget *widget);
- void hostname_action(GtkAction *action, GtkWidget *widget);
- void save_all_action(GtkAction *action, GtkWidget *widget);
- void save_selected_action(GtkAction *action, GtkWidget *widget);
- void save_copy_action(GtkAction *action, GtkWidget *widget);
- void print_all_action(GtkAction *action, GtkWidget *widget);
- void print_selected_action(GtkAction *action, GtkWidget *widget);
- void print_copy_action(GtkAction *action, GtkWidget *widget);
+ G_GNUC_INTERNAL void paste_file_action(GtkAction *action, GtkWidget *widget);
+ G_GNUC_INTERNAL void hostname_action(GtkAction *action, GtkWidget *widget);
+ G_GNUC_INTERNAL void save_all_action(GtkAction *action, GtkWidget *widget);
+ G_GNUC_INTERNAL void save_selected_action(GtkAction *action, GtkWidget *widget);
+ G_GNUC_INTERNAL void save_copy_action(GtkAction *action, GtkWidget *widget);
+ G_GNUC_INTERNAL void print_all_action(GtkAction *action, GtkWidget *widget);
+ G_GNUC_INTERNAL void print_selected_action(GtkAction *action, GtkWidget *widget);
+ G_GNUC_INTERNAL void print_copy_action(GtkAction *action, GtkWidget *widget);
 
diff --git a/src/gtk/main.c b/src/gtk/main.c
index bd770a9..fbf59f1 100644
--- a/src/gtk/main.c
+++ b/src/gtk/main.c
@@ -105,25 +105,32 @@ static int initialize(void)
 	return 0;
 }
 
-int main (int argc, char *argv[])
+int main(int argc, char *argv[])
 {
+	int rc = 0;
+
+	g_set_application_name(PACKAGE_NAME);
+
 	gtk_init(&argc, &argv);
 
-	if(initialize())
-		return -1;
+	rc = initialize();
+	if(!rc)
+	{
+		configuration_init();
+
+		lib3270_set_popup_handler(popup_handler);
 
-	configuration_init();
-	lib3270_set_popup_handler(popup_handler);
+		toplevel = create_main_window();
 
-	toplevel = create_main_window();
+		if(toplevel)
+		{
+			gtk_window_present(GTK_WINDOW(toplevel));
+			gtk_main();
+		}
 
-	if(toplevel)
-	{
-		gtk_widget_show(toplevel);
-		gtk_main();
+		configuration_deinit();
 	}
 
-	configuration_deinit();
-	return 0;
+	return rc;
 }
 
diff --git a/src/gtk/mainwindow.c b/src/gtk/mainwindow.c
index aacd5d3..e288ffe 100644
--- a/src/gtk/mainwindow.c
+++ b/src/gtk/mainwindow.c
@@ -313,7 +313,11 @@
 	}
 
 	// Create window
-	window = ui_parse_xml_folder(path,groupname,popupname,terminal,widget_setup);
+	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	gtk_window_set_position(GTK_WINDOW(window),GTK_WIN_POS_CENTER);
+	gtk_window_set_role(GTK_WINDOW(window),"toplevel");
+
+	ui_parse_xml_folder(GTK_WINDOW(window),path,groupname,popupname,terminal,widget_setup);
 	group  = g_object_get_data(G_OBJECT(window),"action_groups");
 	popup  = g_object_get_data(G_OBJECT(window),"popup_menus");
 
diff --git a/src/gtk/uiparser/parser.c b/src/gtk/uiparser/parser.c
index 8473818..bde2c28 100644
--- a/src/gtk/uiparser/parser.c
+++ b/src/gtk/uiparser/parser.c
@@ -217,7 +217,7 @@ static void release_list(GObject **obj)
 	g_free(obj);
 }
 
-GtkWidget * ui_parse_xml_folder(const gchar *path, const gchar ** groupname, const gchar **popupname, GtkWidget *widget, const UI_WIDGET_SETUP *setup)
+int ui_parse_xml_folder(GtkWindow *toplevel, const gchar *path, const gchar ** groupname, const gchar **popupname, GtkWidget *widget, const UI_WIDGET_SETUP *setup)
 {
 	struct parser	  p;
 	GDir 			* dir;
@@ -248,7 +248,7 @@ GtkWidget * ui_parse_xml_folder(const gchar *path, const gchar ** groupname, con
 		gtk_dialog_run(GTK_DIALOG (dialog));
 		gtk_widget_destroy(dialog);
 
-		return NULL;
+		return -1;
 	}
 
 	while( (ptr = (gchar *) g_dir_read_name(dir)) != NULL)
@@ -264,7 +264,7 @@ GtkWidget * ui_parse_xml_folder(const gchar *path, const gchar ** groupname, con
 	g_dir_close(dir);
 
 	parser_init(&p);
-	p.toplevel 		= gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	p.toplevel 		= GTK_WIDGET(toplevel);
 	p.center_widget	= widget;
 	p.group 		= groupname;
 	p.popupname		= popupname;
@@ -303,5 +303,5 @@ GtkWidget * ui_parse_xml_folder(const gchar *path, const gchar ** groupname, con
 
 	parser_destroy(&p);
 
-	return p.toplevel;
+	return 0;
 }
diff --git a/src/gtk/uiparser/parser.h b/src/gtk/uiparser/parser.h
index 6ef694a..1c9a73c 100644
--- a/src/gtk/uiparser/parser.h
+++ b/src/gtk/uiparser/parser.h
@@ -51,9 +51,9 @@
 		void		  (*setup)(GtkWidget *widget, GtkWidget *obj);
 	} UI_WIDGET_SETUP;
 
-	GtkWidget 		* ui_parse_xml_folder(const gchar *path, const gchar ** groupname, const gchar **popupname, GtkWidget *widget, const UI_WIDGET_SETUP *itn);
-	const gchar		* ui_get_attribute(const gchar *key, const gchar **name, const gchar **value);
-	gboolean		  ui_get_bool_attribute(const gchar *key, const gchar **name, const gchar **value, gboolean def);
-	GtkAction		* ui_get_action(GtkWidget *widget, const gchar *name, GHashTable *hash, const gchar **names, const gchar **values, GError **error);
+	int			  ui_parse_xml_folder(GtkWindow *toplevel, const gchar *path, const gchar ** groupname, const gchar **popupname, GtkWidget *widget, const UI_WIDGET_SETUP *itn);
+	const gchar	* ui_get_attribute(const gchar *key, const gchar **name, const gchar **value);
+	gboolean	  ui_get_bool_attribute(const gchar *key, const gchar **name, const gchar **value, gboolean def);
+	GtkAction	* ui_get_action(GtkWidget *widget, const gchar *name, GHashTable *hash, const gchar **names, const gchar **values, GError **error);
 
 #endif // UI_PARSER_H_INCLUDED
diff --git a/src/gtk/v3270/widget.c b/src/gtk/v3270/widget.c
index 4529eba..23b37a2 100644
--- a/src/gtk/v3270/widget.c
+++ b/src/gtk/v3270/widget.c
@@ -171,7 +171,7 @@ void get_preferred_height(GtkWidget *widget, gint *minimum_height, gint *natural
 		*minimum_height = height ? height : 10;
 
 	if(natural_height)
-		*natural_height = height ? height : 200;
+		*natural_height = 400;
 
 }
 
@@ -183,7 +183,7 @@ void get_preferred_width(GtkWidget *widget, gint *minimum_width, gint *natural_w
 		*minimum_width = width ? width : 10;
 
 	if(natural_width)
-		*natural_width = width ? width : 320;
+		*natural_width = 600;
 }
 
 /*
--
libgit2 0.21.2