[grisbi-cvs] [git push]Grisbi branch master updated. upstream_version_1_0_0-303-g5e74a82

[Pierre Biava]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Grisbi".

The branch, master has been updated
       via  5e74a828795b83d5ccec3ef4349c9f48a842cc63 (commit)
      from  894e5f58f42e2221751735c4e6fe1a1a969981fd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://grisbi.git.sourceforge.net/git/gitweb.cgi?p=grisbi/code;a=commitdiff;h=

commit 5e74a828795b83d5ccec3ef4349c9f48a842cc63
Author: pbiava <pierre.biava at orange.fr>
Date:   Wed Sep 14 07:53:40 2016 +0200

    fixes bug of display of the scheduled part of form and paned

diff --git a/src/fenetre_principale.c b/src/fenetre_principale.c
index 9e70f93..bf2f5c9 100644
--- a/src/fenetre_principale.c
+++ b/src/fenetre_principale.c
@@ -151,7 +151,7 @@ GtkWidget *gsb_gui_create_general_widgets ( void )
     gtk_paned_add2 ( GTK_PANED ( hpaned_general ), gsb_gui_create_general_notebook ( ) );
     gtk_container_set_border_width ( GTK_CONTAINER ( hpaned_general ), 6 );
 
-    if ( conf.panel_width > 0 )
+    if ( conf.panel_width > 250 )
         gtk_paned_set_position ( GTK_PANED ( hpaned_general ), conf.panel_width );
     else
     {
diff --git a/src/gsb_form.c b/src/gsb_form.c
index 791a1f9..833183e 100644
--- a/src/gsb_form.c
+++ b/src/gsb_form.c
@@ -3774,46 +3774,46 @@ gboolean gsb_form_allocate_size ( GtkWidget *table,
         }
     }
 
-    for ( column = 0 ; column < 6 ; column++ )
-    {
-	gint width_percent = 0;
-
-	widget = gsb_form_scheduler_get_element_widget(column);
-
-	if (widget)
-	{
-	    switch (column)
-	    {
-		case SCHEDULED_FORM_ACCOUNT:
-		    width_percent = 30;
-		    break;
-
-		case SCHEDULED_FORM_AUTO:
-		    width_percent = 16;
-		    break;
-
-		case SCHEDULED_FORM_FREQUENCY_BUTTON:
-		    width_percent = 16;
-		    break;
-
-		case SCHEDULED_FORM_LIMIT_DATE:
-		    width_percent = 12;
-		    break;
-
-		case SCHEDULED_FORM_FREQUENCY_USER_ENTRY:
-		    width_percent = 7;
-		    break;
-
-		case SCHEDULED_FORM_FREQUENCY_USER_BUTTON:
-		    width_percent = 12;
-		    break;
-	    }
-	    if (widget && GTK_IS_WIDGET (widget))
-		gtk_widget_set_size_request ( widget,
-				       width_percent * allocation -> width / 100,
-				       -1 );
-	}
-    }
+    //~ for ( column = 0 ; column < 6 ; column++ )
+    //~ {
+	//~ gint width_percent = 0;
+
+	//~ widget = gsb_form_scheduler_get_element_widget(column);
+
+	//~ if (widget)
+	//~ {
+	    //~ switch (column)
+	    //~ {
+		//~ case SCHEDULED_FORM_ACCOUNT:
+		    //~ width_percent = 30;
+		    //~ break;
+
+		//~ case SCHEDULED_FORM_AUTO:
+		    //~ width_percent = 16;
+		    //~ break;
+
+		//~ case SCHEDULED_FORM_FREQUENCY_BUTTON:
+		    //~ width_percent = 16;
+		    //~ break;
+
+		//~ case SCHEDULED_FORM_LIMIT_DATE:
+		    //~ width_percent = 12;
+		    //~ break;
+
+		//~ case SCHEDULED_FORM_FREQUENCY_USER_ENTRY:
+		    //~ width_percent = 7;
+		    //~ break;
+
+		//~ case SCHEDULED_FORM_FREQUENCY_USER_BUTTON:
+		    //~ width_percent = 12;
+		    //~ break;
+	    //~ }
+	    //~ if (widget && GTK_IS_WIDGET (widget))
+		//~ gtk_widget_set_size_request ( widget,
+				       //~ width_percent * allocation -> width / 100,
+				       //~ -1 );
+	//~ }
+    //~ }
     return FALSE;
 }
 
diff --git a/src/main.c b/src/main.c
index 16844da..b084a03 100644
--- a/src/main.c
+++ b/src/main.c
@@ -575,6 +575,9 @@ GtkWidget *gsb_main_create_main_window ( void )
 {
     GtkWidget *vbox;
     GtkWidget *status_bar;
+    GdkGeometry size_hints = {
+    1200, 600, -10, -1, 1300, 750, 10, 10, 1.5, 1.5, GDK_GRAVITY_NORTH_WEST
+  };
 
     /* create the toplevel window */
     run.window = gtk_window_new ( GTK_WINDOW_TOPLEVEL );
@@ -614,6 +617,14 @@ GtkWidget *gsb_main_create_main_window ( void )
                         "destroy",
                         G_CALLBACK ( gtk_widget_destroyed ),
                         &vbox );
+
+    /* on fixe la taille mini remplacer main_box par plus pertinent.*/
+    gtk_window_set_geometry_hints (GTK_WINDOW (win),
+                                   priv->main_box,
+                                   &size_hints,
+                                   GDK_HINT_RESIZE_INC |
+                                   GDK_HINT_MIN_SIZE |
+                                   GDK_HINT_BASE_SIZE);
     gtk_widget_show ( vbox );
 
     /* We create the statusbar first. */

-----------------------------------------------------------------------

Summary of changes:
 src/fenetre_principale.c |    2 +-
 src/gsb_form.c           |   80 +++++++++++++++++++++++-----------------------
 src/main.c               |   11 ++++++
 3 files changed, 52 insertions(+), 41 deletions(-)


hooks/post-receive
-- 
Grisbi