2004-10-21 [paul] 0.9.12cvs131.2
authorPaul Mangan <paul@claws-mail.org>
Thu, 21 Oct 2004 10:57:09 +0000 (10:57 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 21 Oct 2004 10:57:09 +0000 (10:57 +0000)
* src/compose.c
* src/sourcewindow.c
fix wrapping
fix window shrinking

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/compose.c
src/sourcewindow.c

index 5a6ba1c663e508af0a8de4659397ee637c104a70..ae31815194cd229bc5a0abd86585849d0744679d 100644 (file)
@@ -1,3 +1,10 @@
+2004-10-21 [paul]      0.9.12cvs131.2
+
+       * src/compose.c
+       * src/sourcewindow.c
+               fix wrapping
+               fix window shrinking 
+
 2004-10-21 [colin]     0.9.12cvs131.1
 
        * ChangeLog.claws
index 3bc32de88904da4bd6cf61b43a939d8a0636544a..57e1d9a6714cf7f92b8209e8c1d343107b8b3f8f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.2504.2.24 -r 1.2504.2.25 ChangeLog.claws; cvs diff -u -r 1.382.2.52 -r 1.382.2.53 src/compose.c; cvs diff -u -r 1.36.2.9 -r 1.36.2.10 src/common/utils.c; cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/gtk/menu.c; ) > 0.9.12cvs130.1.patchset
 ( cvs diff -u -r 1.52.2.6 -r 1.52.2.7 src/prefs_folder_item.c; ) > 0.9.12cvs130.2.patchset
 ( cvs diff -u -r 1.2504.2.25 -r 1.2504.2.26 ChangeLog.claws; cvs diff -u -r 1.382.2.53 -r 1.382.2.54 src/compose.c; ) > 0.9.12cvs131.1.patchset
+( cvs diff -u -r 1.382.2.54 -r 1.382.2.55 src/compose.c; cvs diff -u -r 1.9.2.7 -r 1.9.2.8 src/sourcewindow.c; ) > 0.9.12cvs131.2.patchset
index 147642cb3f5fafa2769cbb6c82e02d17bbd068b8..9903659fbc76fb2623a2c2a74308e567b21075b7 100644 (file)
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=131
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.1
+EXTRA_GTK2_VERSION=.2
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
index e9f71d55f55a18b107a1d9c35d927918a4348b6c..fec82b0ec52607892167e141c21578e7398ee159 100644 (file)
@@ -4734,6 +4734,12 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        }
        gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
                                      &geometry, GDK_HINT_MAX_SIZE);
+       if (!geometry.min_width) {
+               geometry.min_width = 600;
+               geometry.min_height = 480;
+       }
+       gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
+                                     &geometry, GDK_HINT_MIN_SIZE);
        gtk_widget_set_uposition(window, prefs_common.compose_x, 
                                 prefs_common.compose_y);
 
@@ -4828,6 +4834,7 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
 
        text = gtk_text_view_new();
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+       gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD_CHAR);
        gtk_text_view_set_editable(GTK_TEXT_VIEW(text), TRUE);
        clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
        gtk_text_buffer_add_selection_clipboard(buffer, clipboard);
index 6e78d386fbd75817302671a1f4edb99d02284a2e..28c0f4bc46767eba1a1e376e347a75c2f65c5c39 100644 (file)
@@ -56,6 +56,8 @@ SourceWindow *source_window_create(void)
        GtkWidget *text;
        static PangoFontDescription *font_desc = NULL;
 
+       static GdkGeometry geometry;
+       
        debug_print("Creating source window...\n");
        sourcewin = g_new0(SourceWindow, 1);
 
@@ -64,6 +66,14 @@ SourceWindow *source_window_create(void)
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
        gtk_widget_set_size_request(window, prefs_common.sourcewin_width,
                                    prefs_common.sourcewin_height);
+       
+       if (!geometry.min_height) {
+               geometry.min_width = 400;
+               geometry.min_height = 320;
+       }
+       gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+                                     GDK_HINT_MIN_SIZE);
+
        g_signal_connect(G_OBJECT(window), "size_allocate",
                         G_CALLBACK(source_window_size_alloc_cb),
                         sourcewin);
@@ -81,6 +91,7 @@ SourceWindow *source_window_create(void)
        gtk_widget_show(scrolledwin);
 
        text = gtk_text_view_new();
+       gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD_CHAR);
        gtk_text_view_set_editable(GTK_TEXT_VIEW(text), FALSE);
        if (!font_desc && prefs_common.textfont)
                font_desc = pango_font_description_from_string