[grisbi-cvs] grisbi/src accueil.c, 1.186, 1.187 gsb_assistant_reconcile_config.c, 1.21, 1.22 gsb_transactions_list.c, 1.141, 1.142 import.c, 1.245, 1.246

[Martin Stromberger]

Update of /cvsroot/grisbi/grisbi/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23354/src

Modified Files:
	accueil.c gsb_assistant_reconcile_config.c 
	gsb_transactions_list.c import.c 
Log Message:
some layout changes

Index: gsb_transactions_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_transactions_list.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- gsb_transactions_list.c	2 Nov 2008 16:55:37 -0000	1.141
+++ gsb_transactions_list.c	12 Nov 2008 22:30:22 -0000	1.142
@@ -1676,8 +1676,8 @@
     dialog = gtk_dialog_new_with_buttons ( _("Selection of a reconciliation"),
 					   GTK_WINDOW (window),
 					   GTK_DIALOG_MODAL,
-					   GTK_STOCK_OK, GTK_RESPONSE_OK,
 					   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                       GTK_STOCK_OK, GTK_RESPONSE_OK,
 					   NULL );
     /* need to set a size, else the list will be small */
     gtk_window_set_default_size (GTK_WINDOW (dialog), 770, 412 );

Index: import.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/import.c,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -d -r1.245 -r1.246
--- import.c	10 Nov 2008 21:09:55 -0000	1.245
+++ import.c	12 Nov 2008 22:30:22 -0000	1.246
@@ -1927,6 +1927,7 @@
     GtkWidget *hbox;
     GtkWidget *scrolled_window;
     GtkWidget *label;
+    GtkWidget *frame;
     gint action_derniere_ventilation;
 
 
@@ -1938,21 +1939,32 @@
 					   NULL );
     gtk_window_set_default_size (GTK_WINDOW (dialog), 770, 412 );
     gtk_window_set_position ( GTK_WINDOW (dialog), GTK_WIN_POS_CENTER );
+    gtk_container_set_border_width ( GTK_CONTAINER(dialog), 12 );
 
     label = gtk_label_new ( _("Some imported transactions seem to be already saved. Please select the transactions to import." ));
+    gtk_misc_set_alignment ( GTK_MISC ( label ), 0.0, 0.0 );
     gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( dialog )-> vbox ),
 			 label,
 			 FALSE,
 			 FALSE,
-			 0 );
+			 10 );
     gtk_widget_show ( label );
 
+    /* set the decoration */
+    frame = gtk_frame_new (NULL);
+    gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( dialog )-> vbox ), frame, TRUE, TRUE, 0 );
+    gtk_widget_show ( frame );
+
+    vbox = gtk_vbox_new ( FALSE, 0 );
+    gtk_container_add ( GTK_CONTAINER ( frame ), vbox);
+    gtk_widget_show ( vbox );
+
     scrolled_window = gtk_scrolled_window_new ( FALSE,
 						FALSE );
     gtk_scrolled_window_set_policy ( GTK_SCROLLED_WINDOW ( scrolled_window ),
 				     GTK_POLICY_AUTOMATIC,
 				     GTK_POLICY_AUTOMATIC );
-    gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( dialog )-> vbox ),
+    gtk_box_pack_start ( GTK_BOX ( vbox),
 			 scrolled_window,
 			 TRUE,
 			 TRUE,
@@ -2655,13 +2667,15 @@
 					       NULL );
     gtk_window_set_default_size (GTK_WINDOW (dialog), 770, 412 );
     gtk_window_set_position ( GTK_WINDOW (dialog), GTK_WIN_POS_CENTER );
+    gtk_container_set_border_width ( GTK_CONTAINER(dialog), 12 );
 
 	label = gtk_label_new ( _("Mark transactions you want to add to the list and click the add button"));
+    gtk_misc_set_alignment ( GTK_MISC ( label ), 0.0, 0.0 );
 	gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( dialog ) -> vbox ),
 			     label,
 			     FALSE,
 			     FALSE,
-			     0 );
+			     10 );
 	gtk_widget_show ( label );
 
 	store = gtk_list_store_new ( 4,
@@ -2714,6 +2728,7 @@
 					 GTK_POLICY_AUTOMATIC );
 	gtk_scrolled_window_add_with_viewport ( GTK_SCROLLED_WINDOW ( scrolled_window ),
 						liste_ope_celibataires );
+    gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (liste_ope_celibataires), TRUE);
 	gtk_widget_show_all ( scrolled_window );
 
 	/* on affiche les colonnes */
@@ -3332,7 +3347,7 @@
     if (gsb_data_import_rule_get_last_file_name (rule))
     {
 	gtk_entry_set_text ( GTK_ENTRY (entry),
-               g_path_get_basename(gsb_data_import_rule_get_last_file_name (rule)));
+               gsb_data_import_rule_get_last_file_name (rule));
     }
 
     button = gtk_button_new_with_label ("...");

Index: gsb_assistant_reconcile_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_assistant_reconcile_config.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- gsb_assistant_reconcile_config.c	2 Nov 2008 16:55:37 -0000	1.21
+++ gsb_assistant_reconcile_config.c	12 Nov 2008 22:30:22 -0000	1.22
@@ -1197,8 +1197,8 @@
     dialog = gtk_dialog_new_with_buttons ( _("Selection of a reconciliation"),
 					   GTK_WINDOW (assistant),
 					   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-					   GTK_STOCK_OK, GTK_RESPONSE_OK,
 					   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                       GTK_STOCK_OK, GTK_RESPONSE_OK,
 					   NULL );
 
     gtk_window_set_default_size (GTK_WINDOW (dialog), 770, 412 );

Index: accueil.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/accueil.c,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- accueil.c	27 Oct 2008 17:30:57 -0000	1.186
+++ accueil.c	12 Nov 2008 22:30:21 -0000	1.187
@@ -309,11 +309,11 @@
 					   GTK_STOCK_OK, GTK_RESPONSE_OK,
 					   NULL );
     gtk_window_set_position ( GTK_WINDOW ( dialog ), GTK_WIN_POS_CENTER );
-    gtk_dialog_set_default_response ( GTK_DIALOG (dialog),
-				      GTK_RESPONSE_OK );
+    gtk_dialog_set_default_response ( GTK_DIALOG (dialog), GTK_RESPONSE_OK );
 
     /* first we reparent the form in the dialog */
     gtk_widget_reparent ( form_transaction_part, GTK_DIALOG ( dialog ) -> vbox );
+    gtk_container_set_border_width ( GTK_CONTAINER (form_transaction_part), 12 );
 
     /* next we fill the form,
      * don't use gsb_form_show because we are neither on transactions list, neither scheduled list */