/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2009 Colin Leroy <colin@colino.net> & The Claws Mail Team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2005-2015 Colin Leroy and The Claws Mail Team
*
* 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
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
GtkWidget *entry_datefmt;
GtkWidget *checkbtn_reopen_last_folder;
- GtkWidget *optmenu_always_show_msg;
+ GtkWidget *checkbtn_always_show_msg;
+ GtkWidget *checkbtn_show_on_folder_open;
+ GtkWidget *checkbtn_show_on_search_results;
+ GtkWidget *checkbtn_show_on_prevnext;
+ GtkWidget *checkbtn_show_on_deletemove;
+ GtkWidget *checkbtn_show_on_directional;
GtkWidget *checkbtn_mark_as_read_on_newwin;
GtkWidget *spinbtn_mark_as_read_delay;
GtkWidget *checkbtn_immedexec;
GtkWidget *checkbtn_ask_mark_all_read;
- GtkWidget *optmenu_nextunreadmsgdialog;
+ GtkWidget *optmenu_sort_key;
+ GtkWidget *optmenu_sort_type;
+ GtkWidget *optmenu_nextunreadmsgdialog;
} SummariesPage;
GtkWidget *date_format);
static void mark_as_read_toggled (GtkToggleButton *button,
GtkWidget *spinbtn);
+static void always_show_msg_toggled (GtkToggleButton *button,
+ gpointer user_data);
static GtkWidget *date_format_create(GtkButton *button, void *data)
{
GtkTreeViewColumn *column;
GtkTreeSelection *selection;
- time_format[0].txt = _("the full abbreviated weekday name");
+ time_format[0].txt = _("the abbreviated weekday name");
time_format[1].txt = _("the full weekday name");
time_format[2].txt = _("the abbreviated month name");
time_format[3].txt = _("the full month name");
G_CALLBACK(date_format_entry_on_change),
label3);
- gtk_window_set_position(GTK_WINDOW(datefmt_win), GTK_WIN_POS_CENTER);
- gtk_window_set_modal(GTK_WINDOW(datefmt_win), TRUE);
-
gtk_widget_show(datefmt_win);
manage_window_set_transient(GTK_WINDOW(datefmt_win));
+ gtk_window_set_modal(GTK_WINDOW(datefmt_win), TRUE);
gtk_widget_grab_focus(ok_btn);
{
SummariesPage *prefs_summaries = (SummariesPage *) _page;
- GtkWidget *vbox1;
GtkWidget *checkbtn_transhdr;
- GtkWidget *hbox0;
+ GtkWidget *hbox0, *hbox1, *hbox2;
+ GtkWidget *vbox1, *vbox2, *vbox3, *vbox4;
GtkWidget *optmenu_folder_unread;
- GtkWidget *hbox1;
GtkWidget *label_ng_abbrev;
GtkWidget *spinbtn_ng_abbrev_len;
- GtkObject *spinbtn_ng_abbrev_len_adj;
- GtkWidget *vbox2;
- GtkWidget *vbox3;
+ GtkAdjustment *spinbtn_ng_abbrev_len_adj;
GtkWidget *checkbtn_useaddrbook;
GtkWidget *checkbtn_show_tooltips;
GtkWidget *checkbtn_threadsubj;
GtkWidget *entry_datefmt;
GtkWidget *hbox_dispitem;
GtkWidget *button_dispitem;
- GtkWidget *hbox2;
GtkWidget *checkbtn_reopen_last_folder;
- GtkWidget *optmenu_always_show_msg;
+ GtkWidget *checkbtn_always_show_msg;
+ GtkWidget *checkbtn_show_on_folder_open;
+ GtkWidget *checkbtn_show_on_search_results;
+ GtkWidget *checkbtn_show_on_prevnext;
+ GtkWidget *checkbtn_show_on_deletemove;
+ GtkWidget *checkbtn_show_on_directional;
GtkWidget *spinbtn_mark_as_read_delay;
- GtkObject *spinbtn_mark_as_read_delay_adj;
+ GtkAdjustment *spinbtn_mark_as_read_delay_adj;
GtkWidget *checkbtn_immedexec;
GtkWidget *checkbtn_ask_mark_all_read;
GtkWidget *label, *label_fill;
GtkWidget *button_edit_actions;
GtkWidget *radio_mark_as_read_on_select;
GtkWidget *radio_mark_as_read_on_new_win;
- CLAWS_TIP_DECL();
+ GtkWidget *optmenu_sort_key;
+ GtkWidget *optmenu_sort_type;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_widget_show (hbox0);
gtk_box_pack_start(GTK_BOX (vbox2), hbox0, FALSE, FALSE, 0);
- label = gtk_label_new (_("Display message number next to folder name"));
+ label = gtk_label_new (_("Display message count next to folder name"));
gtk_widget_show (label);
gtk_box_pack_start(GTK_BOX(hbox0), label, FALSE, FALSE, 0);
PACK_CHECK_BUTTON
(vbox2, checkbtn_reopen_last_folder,
- _("Open last opened folder at startup"));
+ _("Open last opened folder at start-up"));
label_ng_abbrev = gtk_label_new
(_("Abbreviate newsgroup names longer than"));
gtk_widget_show (label_ng_abbrev);
gtk_box_pack_start (GTK_BOX (hbox1), label_ng_abbrev, FALSE, FALSE, 0);
- spinbtn_ng_abbrev_len_adj = gtk_adjustment_new (16, 0, 999, 1, 10, 0);
+ spinbtn_ng_abbrev_len_adj = GTK_ADJUSTMENT(gtk_adjustment_new (16, 0, 999, 1, 10, 0));
spinbtn_ng_abbrev_len = gtk_spin_button_new
(GTK_ADJUSTMENT (spinbtn_ng_abbrev_len_adj), 1, 0);
gtk_widget_show (spinbtn_ng_abbrev_len);
gtk_box_pack_start (GTK_BOX (hbox1), spinbtn_ng_abbrev_len,
FALSE, FALSE, 0);
- gtk_widget_set_size_request (spinbtn_ng_abbrev_len, 56, -1);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_ng_abbrev_len),
TRUE);
vbox2 = gtkut_get_options_frame(vbox1, &summaryview_frame, _("Message list"));
+ hbox1 = gtk_hbox_new(FALSE, 10);
+ gtk_widget_show(hbox1);
+ gtk_box_pack_start(GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
+
+ label = gtk_label_new(_("Sort new folders by"));
+ gtk_widget_show(label);
+ gtk_box_pack_start(GTK_BOX(hbox1), label, FALSE, FALSE, 0);
+
+ optmenu_sort_key = gtkut_sc_combobox_create(NULL, FALSE);
+ menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu_sort_key)));
+ gtk_widget_show(optmenu_sort_key);
+
+ COMBOBOX_ADD(menu, _("Number"), SORT_BY_NUMBER);
+ COMBOBOX_ADD(menu, _("Size"), SORT_BY_SIZE);
+ COMBOBOX_ADD(menu, _("Date"), SORT_BY_DATE);
+ COMBOBOX_ADD(menu, _("Thread date"), SORT_BY_THREAD_DATE);
+ COMBOBOX_ADD(menu, _("From"), SORT_BY_FROM);
+ COMBOBOX_ADD(menu, _("To"), SORT_BY_TO);
+ COMBOBOX_ADD(menu, _("Subject"), SORT_BY_SUBJECT);
+ COMBOBOX_ADD(menu, _("Color label"), SORT_BY_LABEL);
+ COMBOBOX_ADD(menu, _("Tag"), SORT_BY_TAGS);
+ COMBOBOX_ADD(menu, _("Mark"), SORT_BY_MARK);
+ COMBOBOX_ADD(menu, _("Status"), SORT_BY_STATUS);
+ COMBOBOX_ADD(menu, _("Attachment"), SORT_BY_MIME);
+ COMBOBOX_ADD(menu, _("Score"), SORT_BY_SCORE);
+ COMBOBOX_ADD(menu, _("Locked"), SORT_BY_LOCKED);
+ COMBOBOX_ADD(menu, _("Don't sort"), SORT_BY_NONE);
+
+ gtk_box_pack_start(GTK_BOX(hbox1), optmenu_sort_key, FALSE, FALSE, 0);
+
+ optmenu_sort_type = gtkut_sc_combobox_create(NULL, FALSE);
+ menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu_sort_type)));
+ gtk_widget_show(optmenu_sort_type);
+
+ COMBOBOX_ADD(menu, _("Ascending"), SORT_ASCENDING);
+ COMBOBOX_ADD(menu, _("Descending"), SORT_DESCENDING);
+
+ gtk_box_pack_start(GTK_BOX(hbox1), optmenu_sort_type, FALSE, FALSE, 0);
+
hbox1 = gtk_hbox_new (FALSE, 10);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(hbox1), optmenu_nextunreadmsgdialog, FALSE, FALSE, 0);
/* Open message on select policy */
- hbox1 = gtk_hbox_new (FALSE, 10);
- gtk_widget_show (hbox1);
- gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
- label = gtk_label_new (_("Open message when selected"));
- gtk_widget_show (label);
- gtk_box_pack_start(GTK_BOX(hbox1), label, FALSE, FALSE, 0);
-
- optmenu_always_show_msg = gtkut_sc_combobox_create(NULL, FALSE);
- menu = GTK_LIST_STORE(gtk_combo_box_get_model(
- GTK_COMBO_BOX(optmenu_always_show_msg)));
- gtk_widget_show (optmenu_always_show_msg);
- COMBOBOX_ADD (menu, _("Never"), OPENMSG_REQUEST_ONLY);
- COMBOBOX_ADD (menu, _("Always"), OPENMSG_ALWAYS);
- COMBOBOX_ADD (menu, _("When message view is visible"),
- OPENMSG_WHEN_VIEW_VISIBLE);
- gtk_box_pack_start(GTK_BOX(hbox1), optmenu_always_show_msg, FALSE, FALSE, 0);
+ vbox4 = gtkut_get_options_frame(vbox2, NULL, _("Open message when selected"));
+
+ PACK_CHECK_BUTTON(vbox4, checkbtn_always_show_msg,
+ _("Always"));
+ PACK_CHECK_BUTTON(vbox4, checkbtn_show_on_folder_open,
+ _("When opening a folder"));
+ PACK_CHECK_BUTTON(vbox4, checkbtn_show_on_search_results,
+ _("When displaying search results"));
+ PACK_CHECK_BUTTON(vbox4, checkbtn_show_on_prevnext,
+ _("When selecting next or previous message using shortcuts"));
+ PACK_CHECK_BUTTON(vbox4, checkbtn_show_on_deletemove,
+ _("When deleting or moving messages"));
+ PACK_CHECK_BUTTON(vbox4, checkbtn_show_on_directional,
+ _("When using directional keys"));
PACK_CHECK_BUTTON
(vbox2, checkbtn_threadsubj,
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_box_pack_start (GTK_BOX (hbox1), radio_mark_as_read_on_select, FALSE, FALSE, 0);
- spinbtn_mark_as_read_delay_adj = gtk_adjustment_new (0, 0, 60, 1, 10, 0);
+ spinbtn_mark_as_read_delay_adj = GTK_ADJUSTMENT(gtk_adjustment_new (0, 0, 60, 1, 10, 0));
spinbtn_mark_as_read_delay = gtk_spin_button_new
(GTK_ADJUSTMENT (spinbtn_mark_as_read_delay_adj), 1, 0);
gtk_box_pack_start (GTK_BOX (hbox1), spinbtn_mark_as_read_delay,
FALSE, FALSE, 0);
- gtk_widget_set_size_request (spinbtn_mark_as_read_delay, 56, -1);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_mark_as_read_delay),
TRUE);
gtk_box_pack_start (GTK_BOX (hbox1), gtk_label_new
(vbox2, checkbtn_show_tooltips,
_("Show tooltips"));
-#if !GTK_CHECK_VERSION(2,12,0) && !GENERIC_UMPC
- gtk_widget_hide(checkbtn_show_tooltips);
-#endif
hbox2 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox2);
gtk_box_pack_start (GTK_BOX (vbox2), hbox2, FALSE, TRUE, 0);
entry_datefmt = gtk_entry_new ();
gtk_widget_show (entry_datefmt);
- gtk_widget_set_size_request(entry_datefmt, 200, -1);
gtk_box_pack_start (GTK_BOX (hbox2), entry_datefmt, FALSE, FALSE, 0);
-#if GTK_CHECK_VERSION(2, 8, 0)
button_datefmt = gtk_button_new_from_stock(GTK_STOCK_INFO);
-#else
- button_datefmt = gtk_button_new_with_label ("Info...");
-#endif
gtk_widget_show (button_datefmt);
gtk_box_pack_start (GTK_BOX (hbox2), button_datefmt, FALSE, FALSE, 0);
PACK_CHECK_BUTTON
(vbox1, checkbtn_ask_mark_all_read,
- _("Confirm before marking all mails in a folder as read"));
+ _("Confirm before marking all messages in a folder as read"));
PACK_CHECK_BUTTON
(vbox1, checkbtn_transhdr,
_("Translate header names"));
gtk_widget_show (hbox2);
gtk_box_pack_start (GTK_BOX (vbox1), hbox2, FALSE, FALSE, 0);
+ prefs_summaries->checkbtn_transhdr = checkbtn_transhdr;
+ prefs_summaries->optmenu_folder_unread = optmenu_folder_unread;
+ prefs_summaries->spinbtn_ng_abbrev_len = spinbtn_ng_abbrev_len;
+ prefs_summaries->checkbtn_useaddrbook = checkbtn_useaddrbook;
+ prefs_summaries->checkbtn_show_tooltips = checkbtn_show_tooltips;
+ prefs_summaries->checkbtn_threadsubj = checkbtn_threadsubj;
+ prefs_summaries->entry_datefmt = entry_datefmt;
+ prefs_summaries->checkbtn_reopen_last_folder = checkbtn_reopen_last_folder;
+
+ prefs_summaries->checkbtn_always_show_msg = checkbtn_always_show_msg;
+ prefs_summaries->checkbtn_show_on_folder_open = checkbtn_show_on_folder_open;
+ prefs_summaries->checkbtn_show_on_search_results = checkbtn_show_on_search_results;
+ prefs_summaries->checkbtn_show_on_prevnext = checkbtn_show_on_prevnext;
+ prefs_summaries->checkbtn_show_on_deletemove = checkbtn_show_on_deletemove;
+ prefs_summaries->checkbtn_show_on_directional = checkbtn_show_on_directional;
+
+ prefs_summaries->checkbtn_mark_as_read_on_newwin = radio_mark_as_read_on_new_win;
+ prefs_summaries->spinbtn_mark_as_read_delay = spinbtn_mark_as_read_delay;
+ prefs_summaries->checkbtn_immedexec = checkbtn_immedexec;
+ prefs_summaries->checkbtn_ask_mark_all_read = checkbtn_ask_mark_all_read;
+ prefs_summaries->optmenu_sort_key = optmenu_sort_key;
+ prefs_summaries->optmenu_sort_type = optmenu_sort_type;
+ prefs_summaries->optmenu_nextunreadmsgdialog = optmenu_nextunreadmsgdialog;
+
+ prefs_summaries->page.widget = vbox1;
+ g_signal_connect(G_OBJECT(checkbtn_always_show_msg), "toggled",
+ G_CALLBACK(always_show_msg_toggled), prefs_summaries);
+
g_signal_connect(G_OBJECT(radio_mark_as_read_on_select), "toggled",
G_CALLBACK(mark_as_read_toggled),
spinbtn_mark_as_read_delay);
prefs_common.ng_abbrev_len);
gtk_entry_set_text(GTK_ENTRY(entry_datefmt),
prefs_common.date_format?prefs_common.date_format:"");
-
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_reopen_last_folder),
prefs_common.goto_last_folder_on_startup);
- combobox_select_by_data(GTK_COMBO_BOX(optmenu_always_show_msg),
+
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_always_show_msg),
prefs_common.always_show_msg);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_show_on_folder_open),
+ prefs_common.open_selected_on_folder_open);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_show_on_search_results),
+ prefs_common.open_selected_on_search_results);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_show_on_prevnext),
+ prefs_common.open_selected_on_prevnext);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_show_on_deletemove),
+ prefs_common.open_selected_on_deletemove);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_show_on_directional),
+ prefs_common.open_selected_on_directional);
+
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_mark_as_read_on_new_win),
prefs_common.mark_as_read_on_new_window);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_mark_as_read_delay),
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_ask_mark_all_read),
prefs_common.ask_mark_all_read);
+ combobox_select_by_data(GTK_COMBO_BOX(optmenu_sort_key),
+ prefs_common.default_sort_key);
+ combobox_select_by_data(GTK_COMBO_BOX(optmenu_sort_type),
+ prefs_common.default_sort_type);
+
combobox_select_by_data(GTK_COMBO_BOX(optmenu_nextunreadmsgdialog),
prefs_common.next_unread_msg_dialog);
-
- prefs_summaries->checkbtn_transhdr = checkbtn_transhdr;
- prefs_summaries->optmenu_folder_unread = optmenu_folder_unread;
- prefs_summaries->spinbtn_ng_abbrev_len = spinbtn_ng_abbrev_len;
- prefs_summaries->checkbtn_useaddrbook = checkbtn_useaddrbook;
- prefs_summaries->checkbtn_show_tooltips = checkbtn_show_tooltips;
- prefs_summaries->checkbtn_threadsubj = checkbtn_threadsubj;
- prefs_summaries->entry_datefmt = entry_datefmt;
-
- prefs_summaries->checkbtn_reopen_last_folder = checkbtn_reopen_last_folder;
- prefs_summaries->optmenu_always_show_msg = optmenu_always_show_msg;
- prefs_summaries->checkbtn_mark_as_read_on_newwin = radio_mark_as_read_on_new_win;
- prefs_summaries->spinbtn_mark_as_read_delay = spinbtn_mark_as_read_delay;
- prefs_summaries->checkbtn_immedexec = checkbtn_immedexec;
- prefs_summaries->checkbtn_ask_mark_all_read = checkbtn_ask_mark_all_read;
- prefs_summaries->optmenu_nextunreadmsgdialog = optmenu_nextunreadmsgdialog;
-
- prefs_summaries->page.widget = vbox1;
}
static void prefs_summaries_save(PrefsPage *_page)
prefs_common.goto_last_folder_on_startup = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->checkbtn_reopen_last_folder));
- prefs_common.always_show_msg = combobox_get_active_data(
- GTK_COMBO_BOX(page->optmenu_always_show_msg));
+
+ prefs_common.always_show_msg = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON(page->checkbtn_always_show_msg));
+ prefs_common.open_selected_on_folder_open = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON(page->checkbtn_show_on_folder_open));
+ prefs_common.open_selected_on_search_results = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON(page->checkbtn_show_on_search_results));
+ prefs_common.open_selected_on_prevnext = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON(page->checkbtn_show_on_prevnext));
+ prefs_common.open_selected_on_deletemove = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON(page->checkbtn_show_on_deletemove));
+ prefs_common.open_selected_on_directional = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON(page->checkbtn_show_on_directional));
+
prefs_common.mark_as_read_on_new_window = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->checkbtn_mark_as_read_on_newwin));
prefs_common.immediate_exec = gtk_toggle_button_get_active(
prefs_common.mark_as_read_delay = gtk_spin_button_get_value_as_int(
GTK_SPIN_BUTTON(page->spinbtn_mark_as_read_delay));
+ prefs_common.default_sort_key = combobox_get_active_data(
+ GTK_COMBO_BOX(page->optmenu_sort_key));
+ prefs_common.default_sort_type = combobox_get_active_data(
+ GTK_COMBO_BOX(page->optmenu_sort_type));
prefs_common.next_unread_msg_dialog = combobox_get_active_data(
GTK_COMBO_BOX(page->optmenu_nextunreadmsgdialog));
main_window_reflect_prefs_all();
static gboolean date_format_key_pressed(GtkWidget *keywidget, GdkEventKey *event,
GtkWidget **widget)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
date_format_cancel_btn_clicked(NULL, widget);
return FALSE;
}
text = gtk_editable_get_chars(editable, 0, -1);
if (text)
fast_strftime(buffer, sizeof buffer, text, cal_time);
- g_free(text);
-
- text = conv_codeset_strdup(buffer,
- conv_get_locale_charset_str(),
- CS_UTF_8);
- if (!text)
- text = g_strdup(buffer);
- gtk_label_set_text(example, text);
+ gtk_label_set_text(example, buffer);
g_free(text);
}
strncpy(new_format, old_format, cur_pos);
new_format[cur_pos] = '\0';
strcat(new_format, format);
+ g_free(format);
strcat(new_format, &old_format[cur_pos]);
gtk_entry_set_text(GTK_ENTRY(datefmt_sample), new_format);
g_free(new_format);
}
+static void always_show_msg_toggled(GtkToggleButton *button,
+ gpointer user_data)
+{
+ const SummariesPage *prefs_summaries = (SummariesPage *)user_data;
+ gboolean state;
+
+ cm_return_if_fail(prefs_summaries != NULL);
+
+ state = gtk_toggle_button_get_active(button);
+
+ gtk_widget_set_sensitive(prefs_summaries->checkbtn_show_on_folder_open, !state);
+ gtk_widget_set_sensitive(prefs_summaries->checkbtn_show_on_search_results, !state);
+ gtk_widget_set_sensitive(prefs_summaries->checkbtn_show_on_prevnext, !state);
+ gtk_widget_set_sensitive(prefs_summaries->checkbtn_show_on_deletemove, !state);
+ gtk_widget_set_sensitive(prefs_summaries->checkbtn_show_on_directional, !state);
+}
+
static void mark_as_read_toggled(GtkToggleButton *button, GtkWidget *spinbtn)
{
gtk_widget_set_sensitive(spinbtn,
projects / claws.git / blobdiff