2007-10-10 [paul] 3.0.2cvs57

	* src/prefs_template.c
		put the whole thing in a scrolled window
		so that half the page is no longer inaccessible
		on maemo
		make the gtk_text_view smaller on maemo

diff --git a/ChangeLog b/ChangeLog
index 66b433066c5eb19864baa42464fbe5181fce3e0d..84ef4d1d53c4eef9bf3a542eea8d25e8ac01c4a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-10 [paul]      3.0.2cvs57
+
+       * src/prefs_template.c
+               put the whole thing in a scrolled window
+               so that half the page is no longer inaccessible
+               on maemo
+               make the gtk_text_view smaller on maemo
+

 2007-10-10 [colin]     3.0.2cvs56
 
        * src/compose.c
 2007-10-10 [colin]     3.0.2cvs56
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 73ab8a47e9db0212b198229bb6c5dae7a15be91f..477039566967aa3cf96dee5bd6c6df44ba804358 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2969,3 +2969,4 @@
 ( cvs diff -u -r 1.1.4.40 -r 1.1.4.41 src/prefs_filtering_action.c;  cvs diff -u -r 1.5.2.23 -r 1.5.2.24 src/gtk/description_window.c;  cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/gtk/foldersort.c;  cvs diff -u -r 1.1.2.79 -r 1.1.2.80 src/gtk/quicksearch.c;  ) > 3.0.2cvs54.patchset
 ( cvs diff -u -r 1.14.2.36 -r 1.14.2.37 src/editaddress.c;  ) > 3.0.2cvs55.patchset
 ( cvs diff -u -r 1.382.2.415 -r 1.382.2.416 src/compose.c;  ) > 3.0.2cvs56.patchset
 ( cvs diff -u -r 1.1.4.40 -r 1.1.4.41 src/prefs_filtering_action.c;  cvs diff -u -r 1.5.2.23 -r 1.5.2.24 src/gtk/description_window.c;  cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/gtk/foldersort.c;  cvs diff -u -r 1.1.2.79 -r 1.1.2.80 src/gtk/quicksearch.c;  ) > 3.0.2cvs54.patchset
 ( cvs diff -u -r 1.14.2.36 -r 1.14.2.37 src/editaddress.c;  ) > 3.0.2cvs55.patchset
 ( cvs diff -u -r 1.382.2.415 -r 1.382.2.416 src/compose.c;  ) > 3.0.2cvs56.patchset

+( cvs diff -u -r 1.12.2.49 -r 1.12.2.50 src/prefs_template.c;  ) > 3.0.2cvs57.patchset

diff --git a/configure.ac b/configure.ac
index 98c888a2d0db0f078d7c8bcba057271f74d4200f..ae1904db993a5287b9ea1d8dbd4d8f9b1a5dd6a8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=56
+EXTRA_VERSION=57

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_template.c b/src/prefs_template.c
index b062bee6e1e97087904a095b14b5c12ecb7e7eb5..bc258cb074bf210cbc09f13b1efdb13d2960ebf3 100644 (file)
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -129,6 +129,8 @@ static void prefs_template_window_create(void)
 {
        /* window structure ;) */
        GtkWidget *window;
 {
        /* window structure ;) */
        GtkWidget *window;

+       GtkWidget *vbox;
+       GtkWidget *scrolled_window;

        GtkWidget   *vpaned;
        GtkWidget     *vbox1;
        GtkWidget       *table; /* including : entry_[name|to|cc|bcc|subject] */
        GtkWidget   *vpaned;
        GtkWidget     *vbox1;
        GtkWidget       *table; /* including : entry_[name|to|cc|bcc|subject] */


@@ -167,10 +169,22 @@ static void prefs_template_window_create(void)
        gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
 
        gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
 

+       vbox = gtk_vbox_new(FALSE, 8);
+       gtk_widget_show(vbox);
+       gtk_container_add(GTK_CONTAINER(window), vbox);
+       gtk_container_set_border_width(GTK_CONTAINER(vbox), 4);
+
+       scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+       gtk_widget_show(scrolled_window);
+       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+                                        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+       gtk_container_add(GTK_CONTAINER(vbox), scrolled_window);
+

        /* vpaned to separate template settings from templates list */
        vpaned = gtk_vpaned_new();
        gtk_widget_show(vpaned);
        /* vpaned to separate template settings from templates list */
        vpaned = gtk_vpaned_new();
        gtk_widget_show(vpaned);

-       gtk_container_add(GTK_CONTAINER(window), vpaned);
+       gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
+                                             vpaned);

 
        /* vbox to handle template name and content */
        vbox1 = gtk_vbox_new(FALSE, 6);
 
        /* vbox to handle template name and content */
        vbox1 = gtk_vbox_new(FALSE, 6);


@@ -247,7 +261,11 @@ static void prefs_template_window_create(void)
                }
        }
        gtk_widget_show(text_value);
                }
        }
        gtk_widget_show(text_value);

+#ifndef MAEMO

        gtk_widget_set_size_request(text_value, -1, 120);
        gtk_widget_set_size_request(text_value, -1, 120);

+#else
+       gtk_widget_set_size_request(text_value, -1, 60);
+#endif

        gtk_container_add(GTK_CONTAINER(scroll2), text_value);
        gtk_text_view_set_editable(GTK_TEXT_VIEW(text_value), TRUE);
        gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text_value), GTK_WRAP_WORD);
        gtk_container_add(GTK_CONTAINER(scroll2), text_value);
        gtk_text_view_set_editable(GTK_TEXT_VIEW(text_value), TRUE);
        gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text_value), GTK_WRAP_WORD);


@@ -356,7 +374,7 @@ static void prefs_template_window_create(void)
                        &ok_btn, GTK_STOCK_OK,
                        NULL, NULL);
        gtk_widget_show(confirm_area);
                        &ok_btn, GTK_STOCK_OK,
                        NULL, NULL);
        gtk_widget_show(confirm_area);

-       gtk_box_pack_end(GTK_BOX(vbox2), confirm_area, FALSE, FALSE, 0);
+       gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);

        gtk_widget_grab_default(ok_btn);
 
        gtk_window_set_title(GTK_WINDOW(window), _("Template configuration"));
        gtk_widget_grab_default(ok_btn);
 
        gtk_window_set_title(GTK_WINDOW(window), _("Template configuration"));