diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/folderview.c | 28 | ||||
| -rw-r--r-- | src/folderview.h | 1 | ||||
| -rw-r--r-- | src/mainwindow.c | 2 | ||||
| -rw-r--r-- | src/prefs_common_dialog.c | 118 |
4 files changed, 43 insertions, 106 deletions
diff --git a/src/folderview.c b/src/folderview.c index 0706e409..50ce6078 100644 --- a/src/folderview.c +++ b/src/folderview.c @@ -106,6 +106,8 @@ static GdkPixbuf *foldernoselect_pixbuf; static GdkPixbuf *draft_pixbuf; static GdkPixbuf *trash_pixbuf; +static void folderview_set_columns (FolderView *folderview); + static void folderview_select_row (FolderView *folderview, GtkTreeIter *iter); static void folderview_select_row_ref (FolderView *folderview, @@ -302,8 +304,7 @@ FolderView *folderview_create(void) scrolledwin = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(scrolledwin), - GTK_POLICY_AUTOMATIC, - prefs_common.folderview_vscrollbar_policy); + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin), GTK_SHADOW_IN); gtk_widget_set_size_request(scrolledwin, @@ -487,6 +488,8 @@ FolderView *folderview_create(void) folderview->news_popup = news_popup; folderview->news_factory = news_factory; + folderview_set_columns(folderview); + gtk_widget_show_all(scrolledwin); folderview_list = g_list_append(folderview_list, folderview); @@ -508,6 +511,11 @@ void folderview_init(FolderView *folderview) stock_pixbuf_gdk(treeview, STOCK_PIXMAP_TRASH, &trash_pixbuf); } +void folderview_reflect_prefs(FolderView *folderview) +{ + folderview_set_columns(folderview); +} + FolderView *folderview_get(void) { return (FolderView *)folderview_list->data; @@ -545,6 +553,22 @@ void folderview_set_all(void) folderview_set((FolderView *)list->data); } +static void folderview_set_columns(FolderView *folderview) +{ + GtkTreeView *treeview = GTK_TREE_VIEW(folderview->treeview); + GtkTreeViewColumn *column; + + column = gtk_tree_view_get_column(treeview, COL_NEW); + gtk_tree_view_column_set_visible + (column, prefs_common.display_folder_num_columns); + column = gtk_tree_view_get_column(treeview, COL_UNREAD); + gtk_tree_view_column_set_visible + (column, prefs_common.display_folder_num_columns); + column = gtk_tree_view_get_column(treeview, COL_TOTAL); + gtk_tree_view_column_set_visible + (column, prefs_common.display_folder_num_columns); +} + void folderview_select(FolderView *folderview, FolderItem *item) { GtkTreeIter iter; diff --git a/src/folderview.h b/src/folderview.h index 1787678a..92905464 100644 --- a/src/folderview.h +++ b/src/folderview.h @@ -69,6 +69,7 @@ struct _FolderView FolderView *folderview_create (void); void folderview_init (FolderView *folderview); +void folderview_reflect_prefs (FolderView *folderview); FolderView *folderview_get (void); diff --git a/src/mainwindow.c b/src/mainwindow.c index 745740ee..3edf1213 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -1149,6 +1149,8 @@ void main_window_reflect_prefs_all(void) else gtk_widget_show(mainwin->exec_btn); + folderview_reflect_prefs(mainwin->folderview); + headerview_set_visibility(mainwin->messageview->headerview, prefs_common.display_header_pane); diff --git a/src/prefs_common_dialog.c b/src/prefs_common_dialog.c index 1df7d05f..e48473a7 100644 --- a/src/prefs_common_dialog.c +++ b/src/prefs_common_dialog.c @@ -119,12 +119,11 @@ static struct Display { GtkWidget *fontbtn_textfont; GtkWidget *chkbtn_folder_unread; + GtkWidget *chkbtn_folder_num_cols; GtkWidget *entry_ng_abbrev_len; GtkWidget *spinbtn_ng_abbrev_len; GtkObject *spinbtn_ng_abbrev_len_adj; - GtkWidget *chkbtn_transhdr; - GtkWidget *chkbtn_swapfrom; GtkWidget *chkbtn_expand_thread; GtkWidget *entry_datefmt; @@ -319,12 +318,11 @@ static PrefsUIData ui_data[] = { {"display_folder_unread_num", &display.chkbtn_folder_unread, prefs_set_data_from_toggle, prefs_set_toggle}, + {"display_folder_num_columns", &display.chkbtn_folder_num_cols, + prefs_set_data_from_toggle, prefs_set_toggle}, {"newsgroup_abbrev_len", &display.spinbtn_ng_abbrev_len, prefs_set_data_from_spinbtn, prefs_set_spinbtn}, - {"translate_header", &display.chkbtn_transhdr, - prefs_set_data_from_toggle, prefs_set_toggle}, - /* Display: Summary View */ {"enable_swap_from", &display.chkbtn_swapfrom, prefs_set_data_from_toggle, prefs_set_toggle}, @@ -335,90 +333,12 @@ static PrefsUIData ui_data[] = { #if 0 {"enable_rules_hint", NULL, NULL, NULL}, - {"bold_unread", NULL, NULL, NULL}, - - {"toolbar_style", NULL, NULL, NULL}, - {"show_statusbar", NULL, NULL, NULL}, - - {"folderview_vscrollbar_policy", NULL, NULL, NULL}, - - {"summary_col_show_mark", NULL, NULL, NULL}, - {"summary_col_show_unread", NULL, NULL, NULL}, - {"summary_col_show_mime", NULL, NULL, NULL}, - {"summary_col_show_subject", NULL, NULL, NULL}, - {"summary_col_show_from", NULL, NULL, NULL}, - {"summary_col_show_date", NULL, NULL, NULL}, - {"summary_col_show_size", NULL, NULL, NULL}, - {"summary_col_show_number", NULL, NULL, NULL}, - - {"summary_col_pos_mark", NULL, NULL, NULL}, - {"summary_col_pos_unread", NULL, NULL, NULL}, - {"summary_col_pos_mime", NULL, NULL, NULL}, - {"summary_col_pos_subject", NULL, NULL, NULL}, - {"summary_col_pos_from", NULL, NULL, NULL}, - {"summary_col_pos_date", NULL, NULL, NULL}, - {"summary_col_pos_size", NULL, NULL, NULL}, - {"summary_col_pos_number", NULL, NULL, NULL}, - - {"summary_col_size_mark", NULL, NULL, NULL}, - {"summary_col_size_unread", NULL, NULL, NULL}, - {"summary_col_size_mime", NULL, NULL, NULL}, - {"summary_col_size_subject", NULL, NULL, NULL}, - {"summary_col_size_from", NULL, NULL, NULL}, - {"summary_col_size_date", NULL, NULL, NULL}, - {"summary_col_size_size", NULL, NULL, NULL}, - {"summary_col_size_number", NULL, NULL, NULL}, - - /* Widget size */ - {"folderwin_x", NULL, NULL, NULL}, - {"folderwin_y", NULL, NULL, NULL}, - {"folderview_width", NULL, NULL, NULL}, - {"folderview_height", NULL, NULL, NULL}, - {"folderview_visible", NULL, NULL, NULL}, - - {"folder_col_folder", NULL, NULL, NULL}, - {"folder_col_new", NULL, NULL, NULL}, - {"folder_col_unread", NULL, NULL, NULL}, - {"folder_col_total", NULL, NULL, NULL}, - - {"summaryview_width", NULL, NULL, NULL}, - {"summaryview_height", NULL, NULL, NULL}, - - {"main_messagewin_x", NULL, NULL, NULL}, - {"main_messagewin_y", NULL, NULL, NULL}, - {"messageview_width", NULL, NULL, NULL}, - {"messageview_height", NULL, NULL, NULL}, - {"messageview_visible", NULL, NULL, NULL}, - - {"mainview_x", NULL, NULL, NULL}, - {"mainview_y", NULL, NULL, NULL}, - {"mainview_width", NULL, NULL, NULL}, - {"mainview_height", NULL, NULL, NULL}, - {"mainwin_x", NULL, NULL, NULL}, - {"mainwin_y", NULL, NULL, NULL}, - {"mainwin_width", NULL, NULL, NULL}, - {"mainwin_height", NULL, NULL, NULL}, - {"messagewin_width", NULL, NULL, NULL}, - {"messagewin_height", NULL, NULL, NULL}, - {"sourcewin_width", NULL, NULL, NULL}, - {"sourcewin_height", NULL, NULL, NULL}, - {"compose_width", NULL, NULL, NULL}, - {"compose_height", NULL, NULL, NULL}, #endif /* 0 */ /* Message */ {"enable_color", &message.chkbtn_enablecol, prefs_set_data_from_toggle, prefs_set_toggle}, -#if 0 - {"quote_level1_color", NULL, NULL, NULL}, - {"quote_level2_color", NULL, NULL, NULL}, - {"quote_level3_color", NULL, NULL, NULL}, - {"uri_color", NULL, NULL, NULL}, - {"signature_color", NULL, NULL, NULL}, - {"recycle_quote_colors", NULL, NULL, NULL}, -#endif - {"convert_mb_alnum", &message.chkbtn_mbalnum, prefs_set_data_from_toggle, prefs_set_toggle}, {"display_header_pane", &message.chkbtn_disphdrpane, @@ -444,15 +364,6 @@ static PrefsUIData ui_data[] = { {"inline_image", &message.chkbtn_inline_image, prefs_set_data_from_toggle, prefs_set_toggle}, -#if 0 - {"show_other_header", NULL, NULL, NULL}, - - /* MIME viewer */ - {"mime_image_viewer", NULL, NULL, NULL}, - {"mime_audio_player", NULL, NULL, NULL}, - {"mime_open_command", NULL, NULL, NULL}, -#endif - /* Junk mail */ {"enable_junk", &junk.chkbtn_enable_junk, prefs_set_data_from_toggle, prefs_set_toggle}, @@ -487,11 +398,6 @@ static PrefsUIData ui_data[] = { #endif /* USE_GPGME */ /* Interface */ -#if 0 - {"separate_folder", NULL, NULL, NULL}, - {"separate_message", NULL, NULL, NULL}, -#endif - {"always_show_message_when_selected", &interface.checkbtn_always_show_msg, prefs_set_data_from_toggle, prefs_set_toggle}, @@ -1351,8 +1257,9 @@ static void prefs_display_create(void) GtkWidget *table1; GtkWidget *label_textfont; GtkWidget *fontbtn_textfont; - GtkWidget *chkbtn_transhdr; + GtkWidget *frame_folder; GtkWidget *chkbtn_folder_unread; + GtkWidget *chkbtn_folder_num_cols; GtkWidget *hbox1; GtkWidget *label_ng_abbrev; GtkWidget *spinbtn_ng_abbrev_len; @@ -1391,16 +1298,19 @@ static void prefs_display_create(void) gtk_table_attach (GTK_TABLE (table1), fontbtn_textfont, 1, 2, 0, 1, (GTK_EXPAND | GTK_FILL), 0, 0, 0); + /* ---- Folder View ---- */ + + PACK_FRAME(vbox1, frame_folder, _("Folder View")); + vbox2 = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox2); - gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, TRUE, 0); - - PACK_CHECK_BUTTON - (vbox2, chkbtn_transhdr, - _("Translate header name (such as `From:', `Subject:')")); + gtk_container_add (GTK_CONTAINER (frame_folder), vbox2); + gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8); PACK_CHECK_BUTTON (vbox2, chkbtn_folder_unread, _("Display unread number next to folder name")); + PACK_CHECK_BUTTON (vbox2, chkbtn_folder_num_cols, + _("Display message number columns in the folder view")); PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2); @@ -1478,8 +1388,8 @@ static void prefs_display_create(void) display.fontbtn_textfont = fontbtn_textfont; - display.chkbtn_transhdr = chkbtn_transhdr; display.chkbtn_folder_unread = chkbtn_folder_unread; + display.chkbtn_folder_num_cols = chkbtn_folder_num_cols; display.spinbtn_ng_abbrev_len = spinbtn_ng_abbrev_len; display.spinbtn_ng_abbrev_len_adj = spinbtn_ng_abbrev_len_adj; |