*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#ifdef HAVE_CONFIG_H
#include "quote_fmt.h"
#include "prefs_template.h"
#include "alertpanel.h"
+#include "combobox.h"
typedef struct _WritingPage
{
GtkWidget *checkbtn_forward_account_autosel;
GtkWidget *checkbtn_reedit_account_autosel;
GtkWidget *spinbtn_undolevel;
+ GtkWidget *checkbtn_reply_with_quote;
GtkWidget *checkbtn_default_reply_list;
GtkWidget *checkbtn_forward_as_attachment;
GtkWidget *checkbtn_redirect_keep_from;
GtkWidget *checkbtn_autosave;
GtkWidget *spinbtn_autosave_length;
GtkWidget *optmenu_dnd_insert_or_attach;
- GtkWidget *checkbtn_compose_with_format;
- GtkWidget *entry_subject;
- GtkWidget *text_format;
+ GtkWidget *entry_quote_chars;
} WritingPage;
static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *window,
GtkObject *spinbtn_undolevel_adj;
GtkWidget *spinbtn_undolevel;
+ GtkWidget *checkbtn_reply_with_quote;
GtkWidget *checkbtn_default_reply_list;
GtkWidget *checkbtn_forward_as_attachment;
GtkWidget *hbox_dnd_insert_or_attach;
GtkWidget *label_dnd_insert_or_attach;
GtkWidget *optmenu_dnd_insert_or_attach;
- GtkWidget *menu;
- GtkWidget *menuitem;
-
- GtkWidget *frame_format;
- GtkWidget *checkbtn_compose_with_format;
- GtkWidget *vbox_format;
- GtkWidget *hbox_format;
- GtkWidget *label_subject;
- GtkWidget *entry_subject;
- GtkWidget *scrolledwin_format;
- GtkWidget *text_format;
- GtkWidget *hbox_formatdesc;
- GtkWidget *btn_formatdesc;
+ GtkListStore *menu;
+ GtkTreeIter iter;
+
+ GtkWidget *frame_quote;
+ GtkWidget *hbox1;
+ GtkWidget *hbox2;
+ GtkWidget *vbox_quote;
+ GtkWidget *entry_quote_chars;
+ GtkWidget *label_quote_chars;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
PACK_CHECK_BUTTON (hbox_autosel, checkbtn_reedit_account_autosel,
_("when re-editing"));
- vbox2 = gtkut_get_options_frame(vbox1, &frame, _("Forwarding"));
-
- PACK_CHECK_BUTTON (vbox2, checkbtn_forward_as_attachment,
- _("Forward as attachment"));
-
- PACK_CHECK_BUTTON (vbox2, checkbtn_redirect_keep_from,
- _("Keep the original 'From' header when redirecting"));
-
vbox2 = gtkut_get_options_frame(vbox1, &frame, _("Editing"));
PACK_CHECK_BUTTON (vbox2, checkbtn_autoextedit,
gtk_widget_set_size_request (spinbtn_undolevel, 64, -1);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_undolevel), TRUE);
- PACK_CHECK_BUTTON (vbox1, checkbtn_default_reply_list,
+ vbox2 = gtkut_get_options_frame(vbox1, &frame, _("Replying"));
+
+ PACK_CHECK_BUTTON (vbox2, checkbtn_reply_with_quote,
+ _("Reply will quote by default"));
+
+ PACK_CHECK_BUTTON (vbox2, checkbtn_default_reply_list,
_("Reply button invokes mailing list reply"));
+ vbox2 = gtkut_get_options_frame(vbox1, &frame, _("Forwarding"));
+
+ PACK_CHECK_BUTTON (vbox2, checkbtn_forward_as_attachment,
+ _("Forward as attachment"));
+
+ PACK_CHECK_BUTTON (vbox2, checkbtn_redirect_keep_from,
+ _("Keep the original 'From' header when redirecting"));
+
/* dnd insert or attach */
label_dnd_insert_or_attach = gtk_label_new (_("When dropping files into the Compose window"));
gtk_misc_set_alignment(GTK_MISC(label_dnd_insert_or_attach), 0, 0.5);
gtk_widget_show (label_dnd_insert_or_attach);
- optmenu_dnd_insert_or_attach = gtk_option_menu_new ();
+ optmenu_dnd_insert_or_attach = gtkut_sc_combobox_create(NULL, FALSE);
gtk_widget_show (optmenu_dnd_insert_or_attach);
- menu = gtk_menu_new ();
- MENUITEM_ADD (menu, menuitem, _("Ask"), COMPOSE_DND_ASK);
- MENUITEM_ADD (menu, menuitem, _("Insert"), COMPOSE_DND_INSERT);
- MENUITEM_ADD (menu, menuitem, _("Attach"), COMPOSE_DND_ATTACH);
-
- gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_dnd_insert_or_attach), menu);
+ menu = GTK_LIST_STORE(gtk_combo_box_get_model(
+ GTK_COMBO_BOX(optmenu_dnd_insert_or_attach)));
+ COMBOBOX_ADD (menu, _("Ask"), COMPOSE_DND_ASK);
+ COMBOBOX_ADD (menu, _("Insert"), COMPOSE_DND_INSERT);
+ COMBOBOX_ADD (menu, _("Attach"), COMPOSE_DND_ATTACH);
hbox_dnd_insert_or_attach = gtk_hbox_new(FALSE, 20);
gtk_widget_show(hbox_dnd_insert_or_attach);
SET_TOGGLE_SENSITIVITY (checkbtn_autosave, spinbtn_autosave_length);
SET_TOGGLE_SENSITIVITY (checkbtn_autosave, label_autosave_length);
- PACK_CHECK_BUTTON (vbox1, checkbtn_compose_with_format,
- _("Use format when composing new messages"));
-
- vbox_format = gtkut_get_options_frame(vbox1, &frame_format, _("New message 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);
-
- label_subject = gtk_label_new (_("Subject"));
- gtk_widget_show (label_subject);
- gtk_box_pack_start (GTK_BOX (hbox_format), label_subject, FALSE, FALSE, 0);
-
- entry_subject = gtk_entry_new ();
- gtk_widget_show (entry_subject);
- gtk_box_pack_start (GTK_BOX (hbox_format), entry_subject, TRUE, TRUE, 0);
- gtk_widget_set_size_request (entry_subject, 100, -1);
-
- scrolledwin_format = gtk_scrolled_window_new (NULL, NULL);
- gtk_widget_show (scrolledwin_format);
- gtk_box_pack_start (GTK_BOX (vbox_format), scrolledwin_format,
- TRUE, TRUE, 0);
- gtk_scrolled_window_set_policy
- (GTK_SCROLLED_WINDOW (scrolledwin_format),
- GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
- gtk_scrolled_window_set_shadow_type
- (GTK_SCROLLED_WINDOW (scrolledwin_format), GTK_SHADOW_IN);
-
- text_format = gtk_text_view_new ();
- if (prefs_common.textfont) {
- PangoFontDescription *font_desc;
-
- font_desc = pango_font_description_from_string
- (prefs_common.textfont);
- if (font_desc) {
- gtk_widget_modify_font(text_format, font_desc);
- pango_font_description_free(font_desc);
- }
- }
- gtk_widget_show (text_format);
- gtk_container_add(GTK_CONTAINER(scrolledwin_format), text_format);
- gtk_text_view_set_editable (GTK_TEXT_VIEW (text_format), TRUE);
- gtk_widget_set_size_request(text_format, -1, 100);
-
- hbox_formatdesc = gtk_hbox_new (FALSE, 32);
- gtk_widget_show (hbox_formatdesc);
- gtk_box_pack_start (GTK_BOX (vbox_format), hbox_formatdesc, FALSE, FALSE, 0);
-
-#if GTK_CHECK_VERSION(2, 8, 0)
- btn_formatdesc = gtk_button_new_from_stock(GTK_STOCK_INFO);
-#else
- btn_formatdesc =
- gtk_button_new_with_label (_(" Description of symbols... "));
-#endif
- gtk_widget_show (btn_formatdesc);
- gtk_box_pack_start (GTK_BOX (hbox_formatdesc), btn_formatdesc, FALSE, FALSE, 0);
- g_signal_connect(G_OBJECT(btn_formatdesc), "clicked",
- G_CALLBACK(quote_fmt_quote_description), GTK_WIDGET(window));
+ /* quote chars */
+
+ PACK_FRAME (vbox1, frame_quote, _("Quotation characters"));
+
+ vbox_quote = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ gtk_widget_show (vbox_quote);
+ gtk_container_add (GTK_CONTAINER (frame_quote), vbox_quote);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox_quote), 8);
+
+ hbox1 = gtk_hbox_new (FALSE, 32);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, FALSE, FALSE, 0);
+
+ hbox2 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox2);
+ gtk_box_pack_start (GTK_BOX (hbox1), hbox2, FALSE, FALSE, 0);
+
+ label_quote_chars = gtk_label_new (_("Treat these characters as quotation marks: "));
+ gtk_widget_show (label_quote_chars);
+ gtk_box_pack_start (GTK_BOX (hbox2), label_quote_chars, FALSE, FALSE, 0);
+
+ entry_quote_chars = gtk_entry_new ();
+ gtk_widget_show (entry_quote_chars);
+ gtk_box_pack_start (GTK_BOX (hbox2), entry_quote_chars,
+ FALSE, FALSE, 0);
+ gtk_widget_set_size_request (entry_quote_chars, 64, -1);
- SET_TOGGLE_SENSITIVITY(checkbtn_compose_with_format, frame_format);
prefs_writing->checkbtn_autoextedit = checkbtn_autoextedit;
prefs_writing->checkbtn_forward_as_attachment =
checkbtn_forward_as_attachment;
- prefs_writing->checkbtn_redirect_keep_from =
- checkbtn_redirect_keep_from;
+ prefs_writing->checkbtn_redirect_keep_from = checkbtn_redirect_keep_from;
+ prefs_writing->checkbtn_reply_with_quote = checkbtn_reply_with_quote;
prefs_writing->checkbtn_default_reply_list = checkbtn_default_reply_list;
prefs_writing->optmenu_dnd_insert_or_attach = optmenu_dnd_insert_or_attach;
- prefs_writing->checkbtn_compose_with_format
- = checkbtn_compose_with_format;
- prefs_writing->entry_subject = entry_subject;
- prefs_writing->text_format = text_format;
+ prefs_writing->entry_quote_chars = entry_quote_chars;
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefs_writing->checkbtn_autoextedit),
prefs_common.auto_exteditor);
prefs_common.forward_account_autosel);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefs_writing->checkbtn_reedit_account_autosel),
prefs_common.reedit_account_autosel);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefs_writing->checkbtn_reply_with_quote),
+ prefs_common.reply_with_quote);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefs_writing->checkbtn_default_reply_list),
prefs_common.default_reply_list);
- gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu_dnd_insert_or_attach),
+ combobox_select_by_data(GTK_COMBO_BOX(optmenu_dnd_insert_or_attach),
prefs_common.compose_dnd_mode);
-
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefs_writing->checkbtn_compose_with_format),
- prefs_common.compose_with_format);
- pref_set_entry_from_pref(GTK_ENTRY(prefs_writing->entry_subject), prefs_common.compose_subject_format);
- pref_set_textview_from_pref(GTK_TEXT_VIEW(prefs_writing->text_format), prefs_common.compose_body_format);
+ gtk_entry_set_text(GTK_ENTRY(entry_quote_chars),
+ prefs_common.quote_chars?prefs_common.quote_chars:"");
prefs_writing->page.widget = vbox1;
}
static void prefs_compose_writing_save(PrefsPage *_page)
{
- GtkWidget *menu;
- GtkWidget *menuitem;
-
WritingPage *page = (WritingPage *) _page;
+
prefs_common.auto_exteditor =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_autoextedit));
prefs_common.forward_as_attachment =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_forward_account_autosel));
prefs_common.reedit_account_autosel =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_reedit_account_autosel));
+ prefs_common.reply_with_quote = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON(page->checkbtn_reply_with_quote));
prefs_common.default_reply_list =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_default_reply_list));
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(page->optmenu_dnd_insert_or_attach));
- menuitem = gtk_menu_get_active(GTK_MENU(menu));
- prefs_common.compose_dnd_mode = GPOINTER_TO_INT
- (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
-
- prefs_common.compose_with_format =
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_compose_with_format));
- prefs_common.compose_subject_format = pref_get_pref_from_entry(
- GTK_ENTRY(page->entry_subject));
- if (!prefs_template_string_is_valid(prefs_common.compose_subject_format))
- alertpanel_error(_("New message subject format error."));
- prefs_common.compose_body_format = pref_get_pref_from_textview(
- GTK_TEXT_VIEW(page->text_format));
- if (!prefs_template_string_is_valid(prefs_common.compose_body_format))
- alertpanel_error(_("New message body format error."));
+ prefs_common.compose_dnd_mode = combobox_get_active_data(
+ GTK_COMBO_BOX(page->optmenu_dnd_insert_or_attach));
+
+ g_free(prefs_common.quote_chars);
+ prefs_common.quote_chars = gtk_editable_get_chars(
+ GTK_EDITABLE(page->entry_quote_chars), 0, -1);
+ remove_space(prefs_common.quote_chars);
}
static void prefs_compose_writing_destroy_widget(PrefsPage *_page)
projects / claws.git / blobdiff