+2006-09-06 [wwp] 2.4.0cvs154
+
+ * manual/pl/advanced.xml
+ * manual/advanced.xml
+ * manual/es/advanced.xml
+ * manual/fr/advanced.xml
+ * src/prefs_customheader.c
+ * src/prefs_filtering_action.c
+ * src/foldersel.c
+ * src/prefs_summaries.c
+ * src/prefs_filtering.c
+ * src/account.c
+ * src/compose.c
+ * src/prefs_summary_column.c
+ * src/addr_compl.c
+ * src/prefs_actions.c
+ * src/prefs_folder_column.c
+ * src/ssl_manager.c
+ * src/prefs_template.c
+ * src/prefs_display_header.c
+ * src/prefs_common.h
+ * src/prefs_matcher.c
+ * src/prefs_common.c
+ * src/prefs_toolbar.c
+ * src/summaryview.c
+ * src/folderview.c
+ * src/gtk/gtksctree.c
+ * src/gtk/pluginwindow.c
+ * src/gtk/progressdialog.c
+ * src/gtk/prefswindow.c
+ renamed hidden option enable_rules_hint to use_stripes_everywhere
+ to make its meaning more obvious (all versions of the manual reflect
+ the change).
+ added an extra hidden option use_stripes_in_summary to allow
+ discarding these stripes in mainwindow's folder and message lists;
+ en and fr manuals only are OK towards this.
+
2006-09-06 [colin] 2.4.0cvs153
* src/textview.c
( cvs diff -u -r 1.274.2.147 -r 1.274.2.148 src/mainwindow.c; cvs diff -u -r 1.1.4.20 -r 1.1.4.21 src/gtk/logwindow.c; ) > 2.4.0cvs151.patchset
( cvs diff -u -r 1.14.2.38 -r 1.14.2.39 src/plugins/trayicon/trayicon.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c; ) > 2.4.0cvs152.patchset
( cvs diff -u -r 1.96.2.145 -r 1.96.2.146 src/textview.c; ) > 2.4.0cvs153.patchset
+( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/pl/advanced.xml; cvs diff -u -r 1.1.2.27 -r 1.1.2.28 manual/advanced.xml; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/es/advanced.xml; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 manual/fr/advanced.xml; cvs diff -u -r 1.16.2.22 -r 1.16.2.23 src/prefs_customheader.c; cvs diff -u -r 1.1.4.28 -r 1.1.4.29 src/prefs_filtering_action.c; cvs diff -u -r 1.26.2.27 -r 1.26.2.28 src/foldersel.c; cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/prefs_summaries.c; cvs diff -u -r 1.59.2.42 -r 1.59.2.43 src/prefs_filtering.c; cvs diff -u -r 1.61.2.50 -r 1.61.2.51 src/account.c; cvs diff -u -r 1.382.2.306 -r 1.382.2.307 src/compose.c; cvs diff -u -r 1.10.2.13 -r 1.10.2.14 src/prefs_summary_column.c; cvs diff -u -r 1.27.2.19 -r 1.27.2.20 src/addr_compl.c; cvs diff -u -r 1.60.2.39 -r 1.60.2.40 src/prefs_actions.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/prefs_folder_column.c; cvs diff -u -r 1.3.2.20 -r 1.3.2.21 src/ssl_manager.c; cvs diff -u -r 1.12.2.28 -r 1.12.2.29 src/prefs_template.c; cvs diff -u -r 1.16.2.20 -r 1.16.2.21 src/prefs_display_header.c; cvs diff -u -r 1.103.2.59 -r 1.103.2.60 src/prefs_common.h; cvs diff -u -r 1.43.2.43 -r 1.43.2.44 src/prefs_matcher.c; cvs diff -u -r 1.204.2.99 -r 1.204.2.100 src/prefs_common.c; cvs diff -u -r 1.30.2.28 -r 1.30.2.29 src/prefs_toolbar.c; cvs diff -u -r 1.395.2.244 -r 1.395.2.245 src/summaryview.c; cvs diff -u -r 1.207.2.119 -r 1.207.2.120 src/folderview.c; cvs diff -u -r 1.1.4.27 -r 1.1.4.28 src/gtk/gtksctree.c; cvs diff -u -r 1.5.2.35 -r 1.5.2.36 src/gtk/pluginwindow.c; cvs diff -u -r 1.1.4.17 -r 1.1.4.18 src/gtk/progressdialog.c; cvs diff -u -r 1.12.2.27 -r 1.12.2.28 src/gtk/prefswindow.c; ) > 2.4.0cvs154.patchset
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=153
+EXTRA_VERSION=154
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
</listitem>
</varlistentry>
<varlistentry>
- <term><literal>enable_rules_hint</literal></term>
+ <term><literal>use_stripes_everywhere</literal></term>
<listitem>
<para>
Enable alternately coloured lines in GtkTreeView components.
</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><literal>use_stripes_in_summaries</literal></term>
+ <listitem>
+ <para>
+ Enable alternately coloured lines in main window's GtkTreeView components
+ (folder list and messages list). The only useful way to use this option is
+ to set it to 0 when use_stripes_everywhere is set to 1.
+ </para>
+ </listitem>
+ </varlistentry>
<varlistentry>
<term><literal>enable_swap_from</literal></term>
<listitem>
</listitem>
</varlistentry>
<varlistentry>
- <term><literal>enable_rules_hint</literal></term>
+ <term><literal>use_stripes_everywhere</literal></term>
<listitem>
<para>
Activar las líneas alternantes en los componentes GtkTreeView.
</para>
</listitem>
</varlistentry>
+ <varlistentry>
<varlistentry>
<term><literal>enable_swap_from</literal></term>
<listitem>
<varlistentry><term>enable_hscrollbar</term>
<listitem><para>Active la barre de défilement horizontale dans la liste de messages.</para></listitem>
</varlistentry>
- <varlistentry><term>enable_rules_hint</term>
+ <varlistentry><term>use_stripes_everywhere</term>
<listitem><para>Active les lignes alternées dans les GtkTreeViews (dialogues de filtrage, des traitements, etc.).</para></listitem>
</varlistentry>
+ <varlistentry><term>use_stripes_in_summaries</term>
+ <listitem><para>Active les lignes alternées dans les GtkTreeViews de la fenêtre principale (liste des dossiers et liste des messages). L'emploi de cette option (valeur 0) n'a de sens que lorsque l'option cachée use_stripes_everywhere est activée (valeur 1).</para></listitem>
+ </varlistentry>
<varlistentry><term>enable_swap_from</term>
<listitem><para>Affiche l'adresse électronique de l'expéditeur dans la colonne <quote>De</quote> dans le dossier <quote>Envoyés</quote> au lieu des destinataires.</para></listitem>
</varlistentry>
<varlistentry><term>enable_hscrollbar</term>
<listitem><para>w³±czenie poziomego paska przewijania w li¶cie wiadomo¶ci</para></listitem>
</varlistentry>
- <varlistentry><term>enable_rules_hint</term>
+ <varlistentry><term>use_stripes_everywhere</term>
<listitem><para>w³±czenie alternatywnych linii w GtkTreeViews</para></listitem>
</varlistentry>
<varlistentry><term>enable_swap_from</term>
list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)));
g_object_unref(G_OBJECT(store));
- gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint);
+ gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
gtk_tree_view_set_reorderable(list_view, TRUE);
selector = gtk_tree_view_get_selection(list_view);
list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
g_object_unref(model);
- gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint);
+ gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
gtk_tree_view_set_headers_visible(list_view, FALSE);
selector = gtk_tree_view_get_selection(list_view);
gtk_tree_view_append_column(GTK_TREE_VIEW(attach_clist), column);
gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(attach_clist),
- prefs_common.enable_rules_hint);
+ prefs_common.use_stripes_everywhere);
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(attach_clist));
gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);
g_object_unref(G_OBJECT(tree_store));
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE);
gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview),
- prefs_common.enable_rules_hint);
+ prefs_common.use_stripes_everywhere);
gtk_tree_view_set_search_column(GTK_TREE_VIEW(treeview),
FOLDERSEL_FOLDERNAME);
ctree = gtk_sctree_new_with_titles(N_FOLDER_COLS, col_pos[F_COL_FOLDER],
titles);
-
+
gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[F_COL_NEW],
GTK_JUSTIFY_RIGHT);
gtk_ctree_set_expander_style(GTK_CTREE(ctree),
GTK_CTREE_EXPANDER_TRIANGLE);
}
+
+ gtk_sctree_set_stripes(GTK_SCTREE(ctree), prefs_common.use_stripes_in_summaries);
+
gtk_ctree_set_indent(GTK_CTREE(ctree), CTREE_INDENT);
gtk_clist_set_compare_func(GTK_CLIST(ctree), folderview_clist_compare);
clip_rectangle.y = row_rectangle.y;
clip_rectangle.height = row_rectangle.height;
- if (prefs_common.enable_rules_hint && color_change && row % 2) {
+ if (prefs_common.use_stripes_everywhere && GTK_SCTREE(ctree)->show_stripes
+ && color_change && row % 2) {
clist_row->background = greybg;
clist_row->bg_set = TRUE;
} else {
gtk_clist_column_titles_show (clist);
}
+ GTK_SCTREE(widget)->show_stripes = TRUE;
+
return widget;
}
gtk_ctree_remove_node(GTK_CTREE(sctree), node);
}
+void gtk_sctree_set_stripes(GtkSCTree *sctree, gboolean show_stripes)
+{
+ sctree->show_stripes = show_stripes;
+}
+
/***********************************************************
* Tree sorting functions *
***********************************************************/
list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
g_object_unref(model);
- gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint);
+ gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
gtk_tree_view_set_search_column (list_view, 0);
selector = gtk_tree_view_get_selection(list_view);
model = GTK_TREE_MODEL(prefswindow_create_data_store());
tree_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
g_object_unref(model);
- gtk_tree_view_set_rules_hint(tree_view, prefs_common.enable_rules_hint);
+ gtk_tree_view_set_rules_hint(tree_view, prefs_common.use_stripes_everywhere);
selector = gtk_tree_view_get_selection(tree_view);
gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
g_object_unref(G_OBJECT(store));
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), TRUE);
gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview),
- prefs_common.enable_rules_hint);
+ prefs_common.use_stripes_everywhere);
gtk_widget_show(treeview);
gtk_container_add(GTK_CONTAINER(scrolledwin), treeview);
gtk_widget_set_size_request(treeview, -1, 120);
list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
g_object_unref(model);
- gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint);
+ gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
gtk_tree_view_set_reorderable(list_view, TRUE);
selector = gtk_tree_view_get_selection(list_view);
NULL, NULL, NULL},
{"enable_swap_from", "FALSE", &prefs_common.swap_from, P_BOOL,
NULL, NULL, NULL},
- {"enable_rules_hint", "TRUE", &prefs_common.enable_rules_hint, P_BOOL,
+ {"use_stripes_everywhere", "TRUE", &prefs_common.use_stripes_everywhere, P_BOOL,
+ NULL, NULL, NULL},
+ {"use_stripes_in_summaries", "TRUE", &prefs_common.use_stripes_in_summaries, P_BOOL,
NULL, NULL, NULL},
{"enable_dotted_lines", "FALSE", &prefs_common.enable_dotted_lines, P_BOOL,
NULL, NULL, NULL},
gboolean use_addr_book;
gchar *date_format;
- gboolean enable_rules_hint;
+ gboolean use_stripes_everywhere;
+ gboolean use_stripes_in_summaries; /* overrides if use_stripes_everywhere is set to TRUE */
gboolean enable_dotted_lines;
gboolean enable_hscrollbar;
gboolean bold_unread;
list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
g_object_unref(model);
- gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint);
+ gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
selector = gtk_tree_view_get_selection(list_view);
gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
g_object_unref(G_OBJECT(model));
gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(list_view),
- prefs_common.enable_rules_hint);
+ prefs_common.use_stripes_everywhere);
selector = gtk_tree_view_get_selection(GTK_TREE_VIEW(list_view));
gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(GTK_TREE_MODEL
(prefs_filtering_create_data_store())));
- gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint);
+ gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
gtk_tree_view_set_reorderable(list_view, TRUE);
selector = gtk_tree_view_get_selection(list_view);
list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
g_object_unref(model);
- gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint);
+ gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
selector = gtk_tree_view_get_selection(list_view);
gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
g_object_unref(G_OBJECT(model));
gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(list_view),
- prefs_common.enable_rules_hint);
+ prefs_common.use_stripes_everywhere);
selector = gtk_tree_view_get_selection(GTK_TREE_VIEW(list_view));
gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
g_object_unref(model);
- gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint);
+ gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
selector = gtk_tree_view_get_selection(list_view);
gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
datefmt_list_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
g_object_unref(G_OBJECT(store));
gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(datefmt_list_view),
- prefs_common.enable_rules_hint);
+ prefs_common.use_stripes_everywhere);
gtk_widget_show(datefmt_list_view);
gtk_container_add(GTK_CONTAINER(scrolledwindow1), datefmt_list_view);
g_object_unref(G_OBJECT(model));
gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(list_view),
- prefs_common.enable_rules_hint);
+ prefs_common.use_stripes_everywhere);
selector = gtk_tree_view_get_selection(GTK_TREE_VIEW(list_view));
gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
g_object_unref(model);
- gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint);
+ gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
selector = gtk_tree_view_get_selection(list_view);
gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
gtk_tree_view_append_column(list_view, column);
/* various other tree view attributes */
- gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint);
+ gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
gtk_tree_view_set_headers_visible(list_view, FALSE);
selector = gtk_tree_view_get_selection(list_view);
gtk_tree_view_append_column(list_view, column);
/* various other tree view attributes */
- gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint);
+ gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
selector = gtk_tree_view_get_selection(list_view);
gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(model),
0, GTK_SORT_ASCENDING);
- gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint);
+ gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
selector = gtk_tree_view_get_selection(list_view);
gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
GTK_CTREE_EXPANDER_TRIANGLE);
}
+ gtk_sctree_set_stripes(GTK_SCTREE(ctree), prefs_common.use_stripes_in_summaries);
+
gtk_ctree_set_indent(GTK_CTREE(ctree), 12);
g_object_set_data(G_OBJECT(ctree), "summaryview", (gpointer)summaryview);