#include "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkwindow.h>
#include <gtk/gtkvbox.h>
#include <gtk/gtkbutton.h>
#include <gdk/gdkkeysyms.h>
-#include "intl.h"
#include "prefs_gtk.h"
#include "prefs_common.h"
#include "prefs_summary_column.h"
N_("Attachment"), /* S_COL_MIME */
N_("Subject"), /* S_COL_SUBJECT */
N_("From"), /* S_COL_FROM */
+ N_("To"), /* S_COL_TO */
N_("Date"), /* S_COL_DATE */
N_("Size"), /* S_COL_SIZE */
N_("Number"), /* S_COL_NUMBER */
{ S_COL_MIME , TRUE },
{ S_COL_SUBJECT, TRUE },
{ S_COL_FROM , TRUE },
+ { S_COL_TO , FALSE },
{ S_COL_DATE , TRUE },
{ S_COL_SIZE , TRUE },
{ S_COL_NUMBER , FALSE },
{ S_COL_SCORE , FALSE },
- { S_COL_LOCKED , FALSE },
+ { S_COL_LOCKED , FALSE },
};
static void prefs_summary_column_create (void);
static GtkListStore *prefs_summary_column_create_store (void);
-static gint prefs_summary_column_insert_column (GtkListStore *store,
+static void prefs_summary_column_insert_column (GtkListStore *store,
gint row,
const gchar *name,
SummaryColumnType type);
GtkWidget *shown_list_view;
GtkWidget *btn_vbox;
- GtkWidget *btn_vbox1;
GtkWidget *add_btn;
GtkWidget *remove_btn;
GtkWidget *up_btn;
gtk_window_set_modal(GTK_WINDOW(window), TRUE);
gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
gtk_window_set_title(GTK_WINDOW(window),
- _("Displayed items configuration"));
+ _("Message list columns configuration"));
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(prefs_summary_column_delete_event),
NULL);
gtk_box_pack_start(GTK_BOX(vbox), label_hbox, FALSE, FALSE, 4);
label = gtk_label_new
- (_("Select items to be displayed in the summary view. You can modify\n"
+ (_("Select columns to be displayed in the message list. You can modify\n"
"the order by using the Up / Down buttons or by dragging the items."));
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(label_hbox), label, FALSE, FALSE, 4);
stock_list_view = prefs_summary_column_list_view_create
- (_("Available items"));
+ (_("Hidden columns"));
gtk_widget_show(stock_list_view);
gtk_container_add(GTK_CONTAINER(scrolledwin), stock_list_view);
/* add/remove button */
- btn_vbox = gtk_vbox_new(FALSE, 0);
+ btn_vbox = gtk_vbox_new(FALSE, 8);
gtk_widget_show(btn_vbox);
gtk_box_pack_start(GTK_BOX(hbox1), btn_vbox, FALSE, FALSE, 0);
- btn_vbox1 = gtk_vbox_new(FALSE, 8);
- gtk_widget_show(btn_vbox1);
- gtk_box_pack_start(GTK_BOX(btn_vbox), btn_vbox1, TRUE, FALSE, 0);
-
- add_btn = gtk_button_new_with_label(_(" -> "));
+ add_btn = gtk_button_new_from_stock(GTK_STOCK_ADD);
gtk_widget_show(add_btn);
- gtk_box_pack_start(GTK_BOX(btn_vbox1), add_btn, FALSE, FALSE, 0);
-
- remove_btn = gtk_button_new_with_label(_(" <- "));
- gtk_widget_show(remove_btn);
- gtk_box_pack_start(GTK_BOX(btn_vbox1), remove_btn, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(btn_vbox), add_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(add_btn), "clicked",
G_CALLBACK(prefs_summary_column_add), NULL);
- g_signal_connect(G_OBJECT(remove_btn), "clicked",
- G_CALLBACK(prefs_summary_column_remove), NULL);
clist_hbox = gtk_hbox_new(FALSE, 8);
gtk_widget_show(clist_hbox);
GTK_POLICY_AUTOMATIC);
shown_list_view = prefs_summary_column_list_view_create
- (_("Displayed items"));
+ (_("Displayed columns"));
gtk_widget_show(shown_list_view);
gtk_container_add(GTK_CONTAINER(scrolledwin), shown_list_view);
/* up/down button */
- btn_vbox = gtk_vbox_new(FALSE, 0);
+ btn_vbox = gtk_vbox_new(FALSE, 8);
gtk_widget_show(btn_vbox);
gtk_box_pack_start(GTK_BOX(hbox1), btn_vbox, FALSE, FALSE, 0);
- btn_vbox1 = gtk_vbox_new(FALSE, 8);
- gtk_widget_show(btn_vbox1);
- gtk_box_pack_start(GTK_BOX(btn_vbox), btn_vbox1, TRUE, FALSE, 0);
+ remove_btn = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
+ gtk_widget_show(remove_btn);
+ gtk_box_pack_start(GTK_BOX(btn_vbox), remove_btn, FALSE, TRUE, 0);
up_btn = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
gtk_widget_show(up_btn);
- gtk_box_pack_start(GTK_BOX(btn_vbox1), up_btn, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(btn_vbox), up_btn, FALSE, TRUE, 0);
down_btn = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
gtk_widget_show(down_btn);
- gtk_box_pack_start(GTK_BOX(btn_vbox1), down_btn, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(btn_vbox), down_btn, FALSE, TRUE, 0);
+ g_signal_connect(G_OBJECT(remove_btn), "clicked",
+ G_CALLBACK(prefs_summary_column_remove), NULL);
g_signal_connect(G_OBJECT(up_btn), "clicked",
G_CALLBACK(prefs_summary_column_up), NULL);
g_signal_connect(G_OBJECT(down_btn), "clicked",
state = prefs_summary_column_get_config();
for (pos = 0; pos < N_SUMMARY_COLS; pos++) {
- gint row;
type = state[pos].type;
name = gettext(col_name[type]);
-1);
}
-static gint prefs_summary_column_insert_column(GtkListStore *store,
+static void prefs_summary_column_insert_column(GtkListStore *store,
gint row,
const gchar *name,
SummaryColumnType type)
SUMCOL_NAME, name,
SUMCOL_TYPE, type,
-1);
- return -1 + gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store),
- NULL);
+ return;
} else {
/* change existing */
gtk_list_store_set(store, &iter,
list_view = gtk_tree_view_new_with_model(model);
g_object_unref(G_OBJECT(model));
- gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(list_view), TRUE);
+ gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(list_view),
+ prefs_common.enable_rules_hint);
selector = gtk_tree_view_get_selection(GTK_TREE_VIEW(list_view));
gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
GtkSelectionData *data, guint info,
guint time, GtkTreeModel *model)
{
- GtkWidget *source;
GtkTreeIter iter;
SummaryColumnType type;
GtkTreeModel *source_model;
GtkTreePath *dst = NULL, *sel = NULL;
GtkTreeIter isel, idst;
GtkTreeViewDropPosition pos;
- gboolean before;
SummaryColumnType type;
GtkTreeModel *sel_model;
gchar *name;