* src/prefs_account.c
* src/prefs_folder_item.c
* src/prefs_quote.c
* src/quote_fmt.c
* src/quote_fmt.h
remove unnecessary frame from Templates options
and improve the English of the check button label
+2007-09-23 [paul] 3.0.1cvs25
+
+ * src/prefs_account.c
+ * src/prefs_folder_item.c
+ * src/prefs_quote.c
+ * src/quote_fmt.c
+ * src/quote_fmt.h
+ remove unnecessary frame from Templates options
+ and improve the English of the check button label
+
2007-09-22 [colin] 3.0.1cvs24
* src/gtk/quicksearch.c
2007-09-22 [colin] 3.0.1cvs24
* src/gtk/quicksearch.c
( cvs diff -u -r 1.213.2.161 -r 1.213.2.162 src/folder.c; cvs diff -u -r 1.87.2.47 -r 1.87.2.48 src/folder.h; cvs diff -u -r 1.52.2.49 -r 1.52.2.50 src/prefs_folder_item.c; ) > 3.0.1cvs22.patchset
( cvs diff -u -r 1.179.2.187 -r 1.179.2.188 src/imap.c; cvs diff -u -r 1.60.2.47 -r 1.60.2.48 src/procmsg.h; cvs diff -u -r 1.36.2.113 -r 1.36.2.114 src/common/utils.c; cvs diff -u -r 1.20.2.50 -r 1.20.2.51 src/common/utils.h; cvs diff -u -r 1.1.4.84 -r 1.1.4.85 src/etpan/imap-thread.c; ) > 3.0.1cvs23.patchset
( cvs diff -u -r 1.1.2.76 -r 1.1.2.77 src/gtk/quicksearch.c; ) > 3.0.1cvs24.patchset
( cvs diff -u -r 1.213.2.161 -r 1.213.2.162 src/folder.c; cvs diff -u -r 1.87.2.47 -r 1.87.2.48 src/folder.h; cvs diff -u -r 1.52.2.49 -r 1.52.2.50 src/prefs_folder_item.c; ) > 3.0.1cvs22.patchset
( cvs diff -u -r 1.179.2.187 -r 1.179.2.188 src/imap.c; cvs diff -u -r 1.60.2.47 -r 1.60.2.48 src/procmsg.h; cvs diff -u -r 1.36.2.113 -r 1.36.2.114 src/common/utils.c; cvs diff -u -r 1.20.2.50 -r 1.20.2.51 src/common/utils.h; cvs diff -u -r 1.1.4.84 -r 1.1.4.85 src/etpan/imap-thread.c; ) > 3.0.1cvs23.patchset
( cvs diff -u -r 1.1.2.76 -r 1.1.2.77 src/gtk/quicksearch.c; ) > 3.0.1cvs24.patchset
+( cvs diff -u -r 1.105.2.111 -r 1.105.2.112 src/prefs_account.c; cvs diff -u -r 1.52.2.50 -r 1.52.2.51 src/prefs_folder_item.c; cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/prefs_quote.c; cvs diff -u -r 1.8.2.24 -r 1.8.2.25 src/quote_fmt.c; cvs diff -u -r 1.5.12.11 -r 1.5.12.12 src/quote_fmt.h; ) > 3.0.1cvs25.patchset
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
window,
vbox2,
&page->checkbtn_compose_with_format,
window,
vbox2,
&page->checkbtn_compose_with_format,
- _("Use a specific format for new messages"),
&page->compose_subject_format,
&page->compose_body_format,
FALSE);
&page->compose_subject_format,
&page->compose_body_format,
FALSE);
window,
vbox2,
&page->checkbtn_reply_with_format,
window,
vbox2,
&page->checkbtn_reply_with_format,
- _("Use a specific reply quote format"),
&page->reply_quotemark,
&page->reply_body_format,
FALSE);
&page->reply_quotemark,
&page->reply_body_format,
FALSE);
window,
vbox2,
&page->checkbtn_forward_with_format,
window,
vbox2,
&page->checkbtn_forward_with_format,
- _("Use a specific forward quote format"),
&page->forward_quotemark,
&page->forward_body_format,
FALSE);
&page->forward_quotemark,
&page->forward_body_format,
FALSE);
window,
vbox,
&page->checkbtn_compose_with_format,
window,
vbox,
&page->checkbtn_compose_with_format,
- _("Use a specific format for new messages"),
&page->compose_subject_format,
&page->compose_body_format,
FALSE);
&page->compose_subject_format,
&page->compose_body_format,
FALSE);
window,
vbox,
&page->checkbtn_reply_with_format,
window,
vbox,
&page->checkbtn_reply_with_format,
- _("Use a specific reply quote format"),
&page->reply_quotemark,
&page->reply_body_format,
FALSE);
&page->reply_quotemark,
&page->reply_body_format,
FALSE);
window,
vbox,
&page->checkbtn_forward_with_format,
window,
vbox,
&page->checkbtn_forward_with_format,
- _("Use a specific forward quote format"),
&page->forward_quotemark,
&page->forward_body_format,
FALSE);
&page->forward_quotemark,
&page->forward_body_format,
FALSE);
window,
vbox2,
&prefs_quote->checkbtn_compose_with_format,
window,
vbox2,
&prefs_quote->checkbtn_compose_with_format,
- _("New message format"),
&prefs_quote->entry_subject,
&prefs_quote->text_format,
FALSE);
&prefs_quote->entry_subject,
&prefs_quote->text_format,
FALSE);
&prefs_quote->entry_quotemark,
&prefs_quote->text_quotefmt,
FALSE);
&prefs_quote->entry_quotemark,
&prefs_quote->text_quotefmt,
FALSE);
&prefs_quote->entry_fw_quotemark,
&prefs_quote->text_fw_quotefmt,
FALSE);
&prefs_quote->entry_fw_quotemark,
&prefs_quote->text_fw_quotefmt,
FALSE);
void quotefmt_create_new_msg_fmt_widgets(GtkWindow *parent_window,
GtkWidget *parent_box,
GtkWidget **checkbtn_compose_with_format,
void quotefmt_create_new_msg_fmt_widgets(GtkWindow *parent_window,
GtkWidget *parent_box,
GtkWidget **checkbtn_compose_with_format,
- gchar *checkbtn_compose_text,
GtkWidget **edit_subject_format,
GtkWidget **edit_body_format,
gboolean add_info_button)
{
GtkWidget *checkbtn_use_format = NULL;
GtkWidget **edit_subject_format,
GtkWidget **edit_body_format,
gboolean add_info_button)
{
GtkWidget *checkbtn_use_format = NULL;
- GtkWidget *frame_format;
GtkWidget *vbox_format;
GtkWidget *hbox_format;
GtkWidget *label_subject;
GtkWidget *vbox_format;
GtkWidget *hbox_format;
GtkWidget *label_subject;
if (add_info_button)
g_return_if_fail(parent_window != NULL);
g_return_if_fail(parent_box != NULL);
if (add_info_button)
g_return_if_fail(parent_window != NULL);
g_return_if_fail(parent_box != NULL);
- if (checkbtn_compose_with_format) {
+ if (checkbtn_compose_with_format)
g_return_if_fail(checkbtn_compose_with_format != NULL);
g_return_if_fail(checkbtn_compose_with_format != NULL);
- g_return_if_fail(checkbtn_compose_text != NULL);
- }
g_return_if_fail(edit_subject_format != NULL);
g_return_if_fail(edit_body_format != NULL);
if (checkbtn_compose_with_format)
PACK_CHECK_BUTTON (parent_box, checkbtn_use_format,
g_return_if_fail(edit_subject_format != NULL);
g_return_if_fail(edit_body_format != NULL);
if (checkbtn_compose_with_format)
PACK_CHECK_BUTTON (parent_box, checkbtn_use_format,
- _("Use format when composing new messages"));
-
- frame_format = gtk_frame_new(checkbtn_compose_text);
- gtk_widget_show(frame_format);
- gtk_box_pack_start(GTK_BOX(parent_box), frame_format, TRUE, TRUE, 0);
- gtk_frame_set_label_align(GTK_FRAME(frame_format), 0.01, 0.5);
+ _("Use template when composing new messages"));
vbox_format = gtk_vbox_new (FALSE, 4);
gtk_widget_show(vbox_format);
vbox_format = gtk_vbox_new (FALSE, 4);
gtk_widget_show(vbox_format);
- gtk_container_add(GTK_CONTAINER (frame_format), vbox_format);
+ gtk_container_add(GTK_CONTAINER (parent_box), vbox_format);
gtk_container_set_border_width (GTK_CONTAINER (vbox_format), 8);
gtk_container_set_border_width (GTK_CONTAINER (vbox_format), 8);
- if (checkbtn_compose_with_format)
- SET_TOGGLE_SENSITIVITY(checkbtn_use_format, frame_format);
-
hbox_format = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox_format);
gtk_box_pack_start (GTK_BOX (vbox_format), hbox_format, FALSE, FALSE, 0);
hbox_format = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox_format);
gtk_box_pack_start (GTK_BOX (vbox_format), hbox_format, FALSE, FALSE, 0);
gtk_text_view_set_editable (GTK_TEXT_VIEW (text_format), TRUE);
gtk_widget_set_size_request(text_format, -1, 100);
gtk_text_view_set_editable (GTK_TEXT_VIEW (text_format), TRUE);
gtk_widget_set_size_request(text_format, -1, 100);
+ if (checkbtn_compose_with_format) {
+ SET_TOGGLE_SENSITIVITY(checkbtn_use_format, label_subject);
+ SET_TOGGLE_SENSITIVITY(checkbtn_use_format, entry_subject);
+ SET_TOGGLE_SENSITIVITY(checkbtn_use_format, text_format);
+ }
+
if (add_info_button)
quotefmt_add_info_button(parent_window, vbox_format);
if (add_info_button)
quotefmt_add_info_button(parent_window, vbox_format);
void quotefmt_create_reply_fmt_widgets(GtkWindow *parent_window,
GtkWidget *parent_box,
GtkWidget **checkbtn_reply_with_format,
void quotefmt_create_reply_fmt_widgets(GtkWindow *parent_window,
GtkWidget *parent_box,
GtkWidget **checkbtn_reply_with_format,
- gchar *checkbtn_reply_text,
GtkWidget **edit_reply_quotemark,
GtkWidget **edit_reply_format,
gboolean add_info_button)
{
GtkWidget *checkbtn_use_format = NULL;
GtkWidget **edit_reply_quotemark,
GtkWidget **edit_reply_format,
gboolean add_info_button)
{
GtkWidget *checkbtn_use_format = NULL;
- GtkWidget *frame_quote;
GtkWidget *vbox_quote;
GtkWidget *hbox1;
GtkWidget *hbox2;
GtkWidget *vbox_quote;
GtkWidget *hbox1;
GtkWidget *hbox2;
if (add_info_button)
g_return_if_fail(parent_window != NULL);
g_return_if_fail(parent_box != NULL);
if (add_info_button)
g_return_if_fail(parent_window != NULL);
g_return_if_fail(parent_box != NULL);
- if (checkbtn_reply_with_format) {
+ if (checkbtn_reply_with_format)
g_return_if_fail(checkbtn_reply_with_format != NULL);
g_return_if_fail(checkbtn_reply_with_format != NULL);
- g_return_if_fail(checkbtn_reply_text != NULL);
- }
g_return_if_fail(edit_reply_quotemark != NULL);
g_return_if_fail(edit_reply_format != NULL);
if (checkbtn_reply_with_format)
g_return_if_fail(edit_reply_quotemark != NULL);
g_return_if_fail(edit_reply_format != NULL);
if (checkbtn_reply_with_format)
- PACK_CHECK_BUTTON (parent_box, checkbtn_use_format, checkbtn_reply_text);
-
- frame_quote = gtk_frame_new(checkbtn_reply_text);
- gtk_widget_show(frame_quote);
- gtk_box_pack_start(GTK_BOX(parent_box), frame_quote, TRUE, TRUE, 0);
- gtk_frame_set_label_align(GTK_FRAME(frame_quote), 0.01, 0.5);
+ PACK_CHECK_BUTTON (parent_box, checkbtn_use_format,
+ _("Use template when replying to messages"));
vbox_quote = gtk_vbox_new (FALSE, 4);
gtk_widget_show(vbox_quote);
vbox_quote = gtk_vbox_new (FALSE, 4);
gtk_widget_show(vbox_quote);
- gtk_container_add(GTK_CONTAINER (frame_quote), vbox_quote);
+ gtk_container_add(GTK_CONTAINER (parent_box), vbox_quote);
gtk_container_set_border_width (GTK_CONTAINER (vbox_quote), 8);
gtk_container_set_border_width (GTK_CONTAINER (vbox_quote), 8);
- if (checkbtn_reply_with_format)
- SET_TOGGLE_SENSITIVITY(checkbtn_use_format, frame_quote);
-
hbox1 = gtk_hbox_new (FALSE, 32);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, FALSE, FALSE, 0);
hbox1 = gtk_hbox_new (FALSE, 32);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, FALSE, FALSE, 0);
gtk_text_view_set_editable (GTK_TEXT_VIEW (text_quotefmt), TRUE);
gtk_widget_set_size_request(text_quotefmt, -1, 100);
gtk_text_view_set_editable (GTK_TEXT_VIEW (text_quotefmt), TRUE);
gtk_widget_set_size_request(text_quotefmt, -1, 100);
+ if (checkbtn_reply_with_format) {
+ SET_TOGGLE_SENSITIVITY(checkbtn_use_format, label_quotemark);
+ SET_TOGGLE_SENSITIVITY(checkbtn_use_format, entry_quotemark);
+ SET_TOGGLE_SENSITIVITY(checkbtn_use_format, text_quotefmt);
+ }
+
if (add_info_button)
quotefmt_add_info_button(parent_window, vbox_quote);
if (add_info_button)
quotefmt_add_info_button(parent_window, vbox_quote);
void quotefmt_create_forward_fmt_widgets(GtkWindow *parent_window,
GtkWidget *parent_box,
GtkWidget **checkbtn_forward_with_format,
void quotefmt_create_forward_fmt_widgets(GtkWindow *parent_window,
GtkWidget *parent_box,
GtkWidget **checkbtn_forward_with_format,
- gchar *checkbtn_forward_text,
GtkWidget **edit_fw_quotemark,
GtkWidget **edit_fw_format,
gboolean add_info_button)
{
GtkWidget *checkbtn_use_format = NULL;
GtkWidget **edit_fw_quotemark,
GtkWidget **edit_fw_format,
gboolean add_info_button)
{
GtkWidget *checkbtn_use_format = NULL;
- GtkWidget *frame_quote;
GtkWidget *vbox_quote;
GtkWidget *hbox1;
GtkWidget *hbox2;
GtkWidget *vbox_quote;
GtkWidget *hbox1;
GtkWidget *hbox2;
g_return_if_fail(parent_box != NULL);
if (checkbtn_forward_with_format) {
g_return_if_fail(checkbtn_forward_with_format != NULL);
g_return_if_fail(parent_box != NULL);
if (checkbtn_forward_with_format) {
g_return_if_fail(checkbtn_forward_with_format != NULL);
- g_return_if_fail(checkbtn_forward_text != NULL);
}
g_return_if_fail(edit_fw_quotemark != NULL);
g_return_if_fail(edit_fw_format != NULL);
if (checkbtn_forward_with_format)
}
g_return_if_fail(edit_fw_quotemark != NULL);
g_return_if_fail(edit_fw_format != NULL);
if (checkbtn_forward_with_format)
- PACK_CHECK_BUTTON (parent_box, checkbtn_use_format, checkbtn_forward_text);
-
- frame_quote = gtk_frame_new(checkbtn_forward_text);
- gtk_widget_show(frame_quote);
- gtk_box_pack_start(GTK_BOX(parent_box), frame_quote, TRUE, TRUE, 0);
- gtk_frame_set_label_align(GTK_FRAME(frame_quote), 0.01, 0.5);
+ PACK_CHECK_BUTTON (parent_box, checkbtn_use_format,
+ _("Use template when forwarding messages"));
vbox_quote = gtk_vbox_new (FALSE, 4);
gtk_widget_show(vbox_quote);
vbox_quote = gtk_vbox_new (FALSE, 4);
gtk_widget_show(vbox_quote);
- gtk_container_add(GTK_CONTAINER (frame_quote), vbox_quote);
+ gtk_container_add(GTK_CONTAINER (parent_box), vbox_quote);
gtk_container_set_border_width (GTK_CONTAINER (vbox_quote), 8);
gtk_container_set_border_width (GTK_CONTAINER (vbox_quote), 8);
- if (checkbtn_forward_with_format)
- SET_TOGGLE_SENSITIVITY(checkbtn_use_format, frame_quote);
-
hbox1 = gtk_hbox_new (FALSE, 32);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, FALSE, FALSE, 0);
hbox1 = gtk_hbox_new (FALSE, 32);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, FALSE, FALSE, 0);
gtk_text_view_set_editable (GTK_TEXT_VIEW (text_fw_quotefmt), TRUE);
gtk_widget_set_size_request (text_fw_quotefmt, -1, 100);
gtk_text_view_set_editable (GTK_TEXT_VIEW (text_fw_quotefmt), TRUE);
gtk_widget_set_size_request (text_fw_quotefmt, -1, 100);
+ if (checkbtn_forward_with_format) {
+ SET_TOGGLE_SENSITIVITY(checkbtn_use_format, label_quotemark);
+ SET_TOGGLE_SENSITIVITY(checkbtn_use_format, entry_fw_quotemark);
+ SET_TOGGLE_SENSITIVITY(checkbtn_use_format, text_fw_quotefmt);
+ }
+
if (add_info_button)
quotefmt_add_info_button(parent_window, vbox_quote);
if (add_info_button)
quotefmt_add_info_button(parent_window, vbox_quote);
void quotefmt_create_new_msg_fmt_widgets(GtkWindow *parent_window,
GtkWidget *parent_box,
GtkWidget **checkbtn_compose_with_format,
void quotefmt_create_new_msg_fmt_widgets(GtkWindow *parent_window,
GtkWidget *parent_box,
GtkWidget **checkbtn_compose_with_format,
- gchar *checkbtn_compose_text,
GtkWidget **edit_subject_format,
GtkWidget **edit_body_format,
gboolean add_info_button);
void quotefmt_create_reply_fmt_widgets(GtkWindow *parent_window,
GtkWidget *parent_box,
GtkWidget **checkbtn_reply_with_format,
GtkWidget **edit_subject_format,
GtkWidget **edit_body_format,
gboolean add_info_button);
void quotefmt_create_reply_fmt_widgets(GtkWindow *parent_window,
GtkWidget *parent_box,
GtkWidget **checkbtn_reply_with_format,
- gchar *checkbtn_reply_text,
GtkWidget **edit_reply_quotemark,
GtkWidget **edit_reply_format,
gboolean add_info_button);
void quotefmt_create_forward_fmt_widgets(GtkWindow *parent_window,
GtkWidget *parent_box,
GtkWidget **checkbtn_forward_with_format,
GtkWidget **edit_reply_quotemark,
GtkWidget **edit_reply_format,
gboolean add_info_button);
void quotefmt_create_forward_fmt_widgets(GtkWindow *parent_window,
GtkWidget *parent_box,
GtkWidget **checkbtn_forward_with_format,
- gchar *checkbtn_forward_text,
GtkWidget **edit_fw_quotemark,
GtkWidget **edit_fw_format,
gboolean add_info_button);
GtkWidget **edit_fw_quotemark,
GtkWidget **edit_fw_format,
gboolean add_info_button);