sync with 0.7.4cvs32
authorPaul Mangan <paul@claws-mail.org>
Sun, 7 Apr 2002 10:43:54 +0000 (10:43 +0000)
committerPaul Mangan <paul@claws-mail.org>
Sun, 7 Apr 2002 10:43:54 +0000 (10:43 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.in
src/compose.c
src/mainwindow.c

index e4923bc..6503f24 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-04-06
+
+       * src/compose.c: made template able to be inserted into the current
+         cursor position.
+       * src/mainwindow.c: moved some menu items under the submenu
+         '/View/Show or hide'.
+
 2002-04-05
 
        * src/filter.c
index 494775c..63813a6 100644 (file)
@@ -1,3 +1,11 @@
+2002-04-07 [paul]      0.7.4claws68
+
+       * sync with 0.7.4cvs32
+               see ChangeLog entry 2002-04-06
+
+       * tools/filter_conv.pl
+               more bug fixes
+
 2002-04-06 [paul]      0.7.4claws67
 
        * tools/filter_conv.pl
index d376e1f..7678a71 100644 (file)
@@ -1,3 +1,10 @@
+2002-04-06
+
+       * src/compose.c: ¥Æ¥ó¥×¥ì¡¼¥È¤ò¸½ºß¤Î¥«¡¼¥½¥ë°ÌÃÖ¤ËÁÞÆþ¤Ç¤­¤ë¤è¤¦¤Ë
+         ¤·¤¿¡£
+       * src/mainwindow.c: ¤¤¤¯¤Ä¤«¤Î¥á¥Ë¥å¡¼¤ò¥µ¥Ö¥á¥Ë¥å¡¼
+         '/ɽ¼¨/ɽ¼¨¡¦Èóɽ¼¨' ¤Î²¼¤Ë°ÜÆ°¡£
+
 2002-04-05
 
        * src/filter.c
index 492e0ba..abcb556 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws67
+EXTRA_VERSION=claws68
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 9571602..8a28aaa 100644 (file)
@@ -159,7 +159,8 @@ static GtkWidget *compose_account_option_menu_create
                                                (Compose        *compose);
 static void compose_set_template_menu          (Compose        *compose);
 static void compose_template_apply             (Compose        *compose,
-                                                Template       *tmpl);
+                                                Template       *tmpl,
+                                                gboolean        replace);
 static void compose_destroy                    (Compose        *compose);
 
 static void compose_entries_set                        (Compose        *compose,
@@ -4933,8 +4934,8 @@ void compose_reflect_prefs_pixmap_theme(void)
        }
 }
 
-
-static void compose_template_apply(Compose *compose, Template *tmpl)
+static void compose_template_apply(Compose *compose, Template *tmpl,
+                                  gboolean replace)
 {
        gchar *qmark;
        gchar *parsed_str;
@@ -4949,7 +4950,8 @@ static void compose_template_apply(Compose *compose, Template *tmpl)
        if (tmpl->to && *tmpl->to != '\0')
                compose_entry_append(compose, tmpl->to, COMPOSE_TO);
 
-       gtk_stext_clear(GTK_STEXT(compose->text));
+       if (replace)
+               gtk_stext_clear(GTK_STEXT(compose->text));
 
        if (compose->replyinfo == NULL) {
                MsgInfo dummyinfo;
@@ -4967,9 +4969,17 @@ static void compose_template_apply(Compose *compose, Template *tmpl)
                                               tmpl->value, qmark, NULL);
        }
 
-       if (parsed_str && prefs_common.auto_sig)
+       if (replace && parsed_str && prefs_common.auto_sig)
                compose_insert_sig(compose);
 
+       if (replace && parsed_str) {
+               gtk_editable_set_position(GTK_EDITABLE(compose->text), 0);
+               gtk_stext_set_point(GTK_STEXT(compose->text), 0);
+       }
+
+       if (parsed_str)
+               compose_changed_cb(NULL, compose);
+
        gtk_stext_thaw(GTK_STEXT(compose->text));
 }
 
@@ -6092,11 +6102,22 @@ static void compose_template_activate_cb(GtkWidget *widget, gpointer data)
 {
        Compose *compose = (Compose *)data;
        Template *tmpl;
+       gchar *msg;
+       AlertValue val;
 
        tmpl = gtk_object_get_data(GTK_OBJECT(widget), "template");
        g_return_if_fail(tmpl != NULL);
 
-       compose_template_apply(compose, tmpl);
+       msg = g_strdup_printf(_("Do you want to apply the template `%s' ?"),
+                             tmpl->name);
+       val = alertpanel(_("Apply template"), msg,
+                        _("Replace"), _("Insert"), _("Cancel"));
+       g_free(msg);
+
+       if (val == G_ALERTDEFAULT)
+               compose_template_apply(compose, tmpl, TRUE);
+       else if (val == G_ALERTALTERNATE)
+               compose_template_apply(compose, tmpl, FALSE);
 }
 
 static void compose_ext_editor_cb(gpointer data, guint action,
index fd65409..d5fc813 100644 (file)
@@ -492,16 +492,24 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                "<control>F", search_cb, 0, NULL},
        {N_("/_Edit/_Search folder..."),        "<shift><control>F", search_cb, 1, NULL},
        {N_("/_View"),                          NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Show or hi_de"),            NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Show or hi_de/_Toolbar"),
+                                               NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Show or hi_de/_Toolbar/Icon _and text"),
+                                               NULL, toggle_toolbar_cb, TOOLBAR_BOTH, "<RadioItem>"},
+       {N_("/_View/Show or hi_de/_Toolbar/_Icon"),
+                                               NULL, toggle_toolbar_cb, TOOLBAR_ICON, "/View/Show or hide/Toolbar/Icon and text"},
+       {N_("/_View/Show or hi_de/_Toolbar/_Text"),
+                                               NULL, toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Show or hide/Toolbar/Icon and text"},
+       {N_("/_View/Show or hi_de/_Toolbar/_None"),
+                                               NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Show or hide/Toolbar/Icon and text"},
+       {N_("/_View/Show or hi_de/Status _bar"),
+                                               NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
+       {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/Separate _Folder Tree"),    NULL, NULL, SEPARATE_ACTION + SEPARATE_FOLDER,  "<ToggleItem>"},
        {N_("/_View/Separate _Message View"),   NULL, NULL, SEPARATE_ACTION + SEPARATE_MESSAGE, "<ToggleItem>"},
        {N_("/_View/E_xpand Summary View"),     "V", toggle_expand_summaryview_cb, 0, "<ToggleItem>"},
        {N_("/_View/Ex_pand Message View"),     "<shift>V", toggle_expand_messageview_cb, 0, "<ToggleItem>"},
-       {N_("/_View/_Toolbar"),                 NULL, NULL, 0, "<Branch>"},
-       {N_("/_View/_Toolbar/Icon _and text"),  NULL, toggle_toolbar_cb, TOOLBAR_BOTH, "<RadioItem>"},
-       {N_("/_View/_Toolbar/_Icon"),           NULL, toggle_toolbar_cb, TOOLBAR_ICON, "/View/Toolbar/Icon and text"},
-       {N_("/_View/_Toolbar/_Text"),           NULL, toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Toolbar/Icon and text"},
-       {N_("/_View/_Toolbar/_None"),           NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Toolbar/Icon and text"},
-       {N_("/_View/Status _bar"),              NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Sort"),                    NULL, NULL, 0, "<Branch>"},
        {N_("/_View/_Sort/Sort by _number"),    NULL, sort_summary_cb, SORT_BY_NUMBER, NULL},
@@ -957,24 +965,25 @@ MainWindow *main_window_create(SeparateType type)
        switch (prefs_common.toolbar_style) {
        case TOOLBAR_NONE:
                menuitem = gtk_item_factory_get_item
-                       (ifactory, "/View/Toolbar/None");
+                       (ifactory, "/View/Show or hide/Toolbar/None");
                break;
        case TOOLBAR_ICON:
                menuitem = gtk_item_factory_get_item
-                       (ifactory, "/View/Toolbar/Icon");
+                       (ifactory, "/View/Show or hide/Toolbar/Icon");
                break;
        case TOOLBAR_TEXT:
                menuitem = gtk_item_factory_get_item
-                       (ifactory, "/View/Toolbar/Text");
+                       (ifactory, "/View/Show or hide/Toolbar/Text");
                break;
        case TOOLBAR_BOTH:
                menuitem = gtk_item_factory_get_item
-                       (ifactory, "/View/Toolbar/Icon and text");
+                       (ifactory, "/View/Show or hide/Toolbar/Icon and text");
        }
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
 
        gtk_widget_hide(mainwin->hbox_stat);
-       menuitem = gtk_item_factory_get_item(ifactory, "/View/Status bar");
+       menuitem = gtk_item_factory_get_item
+               (ifactory, "/View/Show or hide/Status bar");
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
                                       prefs_common.show_statusbar);
 #if 0 /* FIXED SEPARATE WINDOWS */