*
* 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 <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
+#ifdef G_OS_WIN32
+# include <w32lib.h>
+#endif
+
#include "prefs_common.h"
#include "prefs_gtk.h"
+#include "prefs_summary_open.h"
#include "prefs_summary_column.h"
#include "prefs_folder_column.h"
#include "gtk/menu.h"
#include "gtk/gtkutils.h"
#include "gtk/prefswindow.h"
+#include "gtk/combobox.h"
#include "manage_window.h"
GtkWidget *window;
- GtkWidget *chkbtn_transhdr;
- GtkWidget *chkbtn_folder_unread;
+ GtkWidget *checkbtn_transhdr;
+ GtkWidget *optmenu_folder_unread;
GtkWidget *spinbtn_ng_abbrev_len;
- GtkWidget *chkbtn_useaddrbook;
- GtkWidget *chkbtn_threadsubj;
+ GtkWidget *checkbtn_useaddrbook;
+ GtkWidget *checkbtn_threadsubj;
GtkWidget *button_datefmt;
GtkWidget *entry_datefmt;
+ GtkWidget *checkbtn_reopen_last_folder;
GtkWidget *checkbtn_always_show_msg;
GtkWidget *checkbtn_mark_as_read_on_newwin;
GtkWidget *spinbtn_mark_as_read_delay;
GtkWidget *checkbtn_immedexec;
GtkWidget *checkbtn_ask_mark_all_read;
- GtkWidget *optmenu_select_on_entry;
GtkWidget *optmenu_nextunreadmsgdialog;
} SummariesPage;
SummariesPage *prefs_summaries = (SummariesPage *) _page;
GtkWidget *vbox1;
- GtkWidget *chkbtn_transhdr;
- GtkWidget *chkbtn_folder_unread;
+ GtkWidget *checkbtn_transhdr;
+ GtkWidget *hbox0;
+ GtkWidget *optmenu_folder_unread;
GtkWidget *hbox1;
GtkWidget *label_ng_abbrev;
GtkWidget *spinbtn_ng_abbrev_len;
GtkObject *spinbtn_ng_abbrev_len_adj;
GtkWidget *vbox2;
- GtkWidget *chkbtn_useaddrbook;
- GtkWidget *chkbtn_threadsubj;
+ GtkWidget *checkbtn_useaddrbook;
+ GtkWidget *checkbtn_threadsubj;
GtkWidget *label_datefmt;
GtkWidget *button_datefmt;
GtkWidget *entry_datefmt;
GtkWidget *button_dispitem;
GtkWidget *hbox2;
+ GtkWidget *checkbtn_reopen_last_folder;
GtkWidget *checkbtn_always_show_msg;
GtkWidget *checkbtn_mark_as_read_on_newwin;
GtkWidget *spinbtn_mark_as_read_delay;
GtkWidget *checkbtn_ask_mark_all_read;
GtkTooltips *immedexec_tooltip;
GtkWidget *label, *label_fill;
- GtkWidget *menu;
- GtkWidget *menuitem;
- GtkWidget *optmenu_select_on_entry;
+ GtkListStore *menu;
+ GtkTreeIter iter;
GtkWidget *optmenu_nextunreadmsgdialog;
GtkWidget *folderview_frame;
GtkWidget *summaryview_frame;
+ GtkWidget *button_edit_actions;
+
GtkTooltips *tooltips;
tooltips = gtk_tooltips_new();
vbox2 = gtkut_get_options_frame(vbox1, &folderview_frame, _("Folder list"));
- PACK_CHECK_BUTTON (vbox2, chkbtn_folder_unread,
- _("Display unread number next to folder name"));
+ hbox0 = gtk_hbox_new (FALSE, 8);
+ 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"));
+ gtk_widget_show (label);
+ gtk_box_pack_start(GTK_BOX(hbox0), label, FALSE, FALSE, 0);
+
+ optmenu_folder_unread = gtkut_sc_combobox_create(NULL, FALSE);
+ menu = GTK_LIST_STORE(gtk_combo_box_get_model(
+ GTK_COMBO_BOX(optmenu_folder_unread)));
+ gtk_widget_show (optmenu_folder_unread);
+
+ COMBOBOX_ADD (menu, _("No"), 0);
+ COMBOBOX_ADD (menu, _("Unread messages"), 1);
+ COMBOBOX_ADD (menu, _("Unread and Total messages"), 2);
+
+ gtk_box_pack_start(GTK_BOX(hbox0), optmenu_folder_unread, FALSE, FALSE, 0);
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
gtk_box_pack_start(GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
+ PACK_CHECK_BUTTON
+ (vbox2, checkbtn_reopen_last_folder,
+ _("Open last opened folder at startup"));
+
label_ng_abbrev = gtk_label_new
(_("Abbreviate newsgroup names longer than"));
gtk_widget_show (label_ng_abbrev);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
- label = gtk_label_new (_("When entering a folder"));
- gtk_widget_show (label);
- gtk_box_pack_start(GTK_BOX(hbox1), label, FALSE, FALSE, 0);
-
- optmenu_select_on_entry = gtk_option_menu_new ();
- gtk_widget_show (optmenu_select_on_entry);
-
- menu = gtk_menu_new ();
- MENUITEM_ADD (menu, menuitem, _("Do nothing"), SELECTONENTRY_NOTHING);
- MENUITEM_ADD (menu, menuitem, _("Select first unread (or new or marked) message"),
- SELECTONENTRY_UNM);
- MENUITEM_ADD (menu, menuitem, _("Select first unread (or marked or new) message"),
- SELECTONENTRY_UMN);
- MENUITEM_ADD (menu, menuitem, _("Select first new (or unread or marked) message"),
- SELECTONENTRY_NUM);
- MENUITEM_ADD (menu, menuitem, _("Select first new (or marked or unread) message"),
- SELECTONENTRY_NMU);
- MENUITEM_ADD (menu, menuitem, _("Select first marked (or new or unread) message"),
- SELECTONENTRY_MNU);
- MENUITEM_ADD (menu, menuitem, _("Select first marked (or unread or new) message"),
- SELECTONENTRY_MUN);
-
- gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_select_on_entry), menu);
- gtk_box_pack_start(GTK_BOX(hbox1), optmenu_select_on_entry, FALSE, FALSE, 0);
+ button_edit_actions = gtk_button_new_with_label(_("Set default selection when entering a folder"));
+ gtk_widget_show (button_edit_actions);
+ gtk_box_pack_start (GTK_BOX (hbox1), button_edit_actions,
+ FALSE, TRUE, 0);
+ g_signal_connect (G_OBJECT (button_edit_actions), "clicked",
+ G_CALLBACK (prefs_summary_open_open),
+ NULL);
/* Next Unread Message Dialog */
hbox1 = gtk_hbox_new (FALSE, 10);
gtk_widget_show (label);
gtk_box_pack_start(GTK_BOX(hbox1), label, FALSE, FALSE, 0);
- optmenu_nextunreadmsgdialog = gtk_option_menu_new ();
- gtk_widget_show (optmenu_nextunreadmsgdialog);
+ optmenu_nextunreadmsgdialog = gtkut_sc_combobox_create(NULL, FALSE);
+ menu = GTK_LIST_STORE(gtk_combo_box_get_model(
+ GTK_COMBO_BOX(optmenu_nextunreadmsgdialog)));
+ gtk_widget_show (optmenu_nextunreadmsgdialog);
- menu = gtk_menu_new ();
- MENUITEM_ADD (menu, menuitem, _("Always"), NEXTUNREADMSGDIALOG_ALWAYS);
- MENUITEM_ADD (menu, menuitem, _("Assume 'Yes'"),
- NEXTUNREADMSGDIALOG_ASSUME_YES);
- MENUITEM_ADD (menu, menuitem, _("Assume 'No'"),
- NEXTUNREADMSGDIALOG_ASSUME_NO);
+ COMBOBOX_ADD (menu, _("Always"), NEXTUNREADMSGDIALOG_ALWAYS);
+ COMBOBOX_ADD (menu, _("Assume 'Yes'"), NEXTUNREADMSGDIALOG_ASSUME_YES);
+ COMBOBOX_ADD (menu, _("Assume 'No'"), NEXTUNREADMSGDIALOG_ASSUME_NO);
- gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_nextunreadmsgdialog), menu);
gtk_box_pack_start(GTK_BOX(hbox1), optmenu_nextunreadmsgdialog, FALSE, FALSE, 0);
PACK_CHECK_BUTTON
(vbox2, checkbtn_always_show_msg,
_("Always open message when selected"));
PACK_CHECK_BUTTON
- (vbox2, chkbtn_threadsubj,
+ (vbox2, checkbtn_threadsubj,
_("Thread using subject in addition to standard headers"));
immedexec_tooltip = gtk_tooltips_new();
NULL);
PACK_CHECK_BUTTON
(vbox2, checkbtn_mark_as_read_on_newwin,
- _("Only mark message as read when opened in a new window"));
+ _("Only mark message as read when opened \n"
+ "in a new window, or replied to"));
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
gtk_widget_show_all(hbox1);
PACK_CHECK_BUTTON
- (vbox2, chkbtn_useaddrbook,
+ (vbox2, checkbtn_useaddrbook,
_("Display sender using address book"));
hbox2 = gtk_hbox_new (FALSE, 8);
(vbox1, checkbtn_ask_mark_all_read,
_("Confirm before marking all mails in a folder as read"));
PACK_CHECK_BUTTON
- (vbox1, chkbtn_transhdr,
+ (vbox1, checkbtn_transhdr,
_("Translate header names"));
- gtk_tooltips_set_tip(tooltips, chkbtn_transhdr,
+ gtk_tooltips_set_tip(tooltips, checkbtn_transhdr,
_("The display of standard headers (such as 'From:', 'Subject:') "
"will be translated into your language."), NULL);
prefs_summaries->window = GTK_WIDGET(window);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_transhdr),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_transhdr),
prefs_common.trans_hdr);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_folder_unread),
+ combobox_select_by_data(GTK_COMBO_BOX(optmenu_folder_unread),
prefs_common.display_folder_unread);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_useaddrbook),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_useaddrbook),
prefs_common.use_addr_book);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_threadsubj),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_threadsubj),
prefs_common.thread_by_subject);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_ng_abbrev_len),
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);
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_mark_as_read_on_newwin),
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_ask_mark_all_read),
prefs_common.ask_mark_all_read);
- gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu_select_on_entry),
- prefs_common.select_on_entry);
- gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu_nextunreadmsgdialog),
+ combobox_select_by_data(GTK_COMBO_BOX(optmenu_nextunreadmsgdialog),
prefs_common.next_unread_msg_dialog);
- prefs_summaries->chkbtn_transhdr = chkbtn_transhdr;
- prefs_summaries->chkbtn_folder_unread = chkbtn_folder_unread;
+ 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->chkbtn_useaddrbook = chkbtn_useaddrbook;
- prefs_summaries->chkbtn_threadsubj = chkbtn_threadsubj;
+ prefs_summaries->checkbtn_useaddrbook = checkbtn_useaddrbook;
+ 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_mark_as_read_on_newwin = checkbtn_mark_as_read_on_newwin;
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_select_on_entry = optmenu_select_on_entry;
prefs_summaries->optmenu_nextunreadmsgdialog = optmenu_nextunreadmsgdialog;
prefs_summaries->page.widget = vbox1;
static void prefs_summaries_save(PrefsPage *_page)
{
SummariesPage *page = (SummariesPage *) _page;
- GtkWidget *menu;
- GtkWidget *menuitem;
prefs_common.trans_hdr = gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(page->chkbtn_transhdr));
- prefs_common.display_folder_unread = gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(page->chkbtn_folder_unread));
+ GTK_TOGGLE_BUTTON(page->checkbtn_transhdr));
+
+
+ prefs_common.display_folder_unread = combobox_get_active_data(
+ GTK_COMBO_BOX(page->optmenu_folder_unread));
+
prefs_common.use_addr_book = gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(page->chkbtn_useaddrbook));
+ GTK_TOGGLE_BUTTON(page->checkbtn_useaddrbook));
prefs_common.thread_by_subject = gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(page->chkbtn_threadsubj));
+ GTK_TOGGLE_BUTTON(page->checkbtn_threadsubj));
prefs_common.ng_abbrev_len = gtk_spin_button_get_value_as_int(
GTK_SPIN_BUTTON(page->spinbtn_ng_abbrev_len));
prefs_common.date_format = gtk_editable_get_chars(
GTK_EDITABLE(page->entry_datefmt), 0, -1);
+ 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 = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->checkbtn_always_show_msg));
prefs_common.mark_as_read_on_new_window = 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));
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(page->optmenu_select_on_entry));
- menuitem = gtk_menu_get_active(GTK_MENU(menu));
- prefs_common.select_on_entry = GPOINTER_TO_INT
- (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
-
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(page->optmenu_nextunreadmsgdialog));
- menuitem = gtk_menu_get_active(GTK_MENU(menu));
- prefs_common.next_unread_msg_dialog = GPOINTER_TO_INT
- (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+ prefs_common.next_unread_msg_dialog = combobox_get_active_data(
+ GTK_COMBO_BOX(page->optmenu_nextunreadmsgdialog));
main_window_reflect_prefs_all();
}
struct tm *cal_time;
gchar buffer[100];
gchar *text;
+ struct tm lt;
cur_time = time(NULL);
- cal_time = localtime(&cur_time);
+ cal_time = localtime_r(&cur_time, <);
buffer[0] = 0;
text = gtk_editable_get_chars(editable, 0, -1);
if (text)
projects / claws.git / blobdiff