+2005-02-03 [paul] 1.0.0cvs25.3
+
+ * src/folderview.c
+ * src/headerview.c
+ * src/summaryview.c
+ * src/textview.c
+ * src/gtk/colorlabel.c
+ third and final part of initial sync with main-gtk2
+
2005-02-03 [paul] 1.0.0cvs25.2
* src/jpilot.c
( cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/common/xml.c; ) > 1.0.0cvs24.3.patchset
( cvs diff -u -r 1.94.2.41 -r 1.94.2.42 src/messageview.c; ) > 1.0.0cvs25.1.patchset
( cvs diff -u -r 1.18.2.6 -r 1.18.2.7 src/jpilot.c; ) > 1.0.0cvs25.2.patchset
+( cvs diff -u -r 1.207.2.28 -r 1.207.2.29 src/folderview.c; cvs diff -u -r 1.8.2.3 -r 1.8.2.4 src/headerview.c; cvs diff -u -r 1.395.2.50 -r 1.395.2.51 src/summaryview.c; cvs diff -u -r 1.96.2.41 -r 1.96.2.42 src/textview.c; cvs diff -u -r 1.2.2.4 -r 1.2.2.5 src/gtk/colorlabel.c; ) > 1.0.0cvs25.3.patchset
BINARY_AGE=0
EXTRA_VERSION=25
EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.2
+EXTRA_GTK2_VERSION=.3
if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
if (!bold_style) {
PangoFontDescription *font_desc;
bold_style = gtk_style_copy(gtk_widget_get_style(ctree));
- font_desc = pango_font_description_from_string(prefs_common.boldfont);
+ font_desc = pango_font_description_from_string(BOLD_FONT);
if (font_desc) {
if (bold_style->font_desc)
pango_font_description_free
(bold_style->font_desc);
bold_style->font_desc = font_desc;
}
+ pango_font_description_set_weight
+ (bold_style->font_desc, PANGO_WEIGHT_BOLD);
bold_color_style = gtk_style_copy(bold_style);
bold_color_style->fg[GTK_STATE_NORMAL] = folderview->color_new;
#include "defs.h"
#include <glib.h>
-#ifdef GDK_WINDOWING_X11
-# include <gdk/gdkx.h>
-#endif /* GDK_WINDOWING_X11 */
#include <gtk/gtk.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkimage.h>
{
static PangoFontDescription *boldfont = NULL;
- if (!boldfont && BOLD_FONT)
- boldfont = pango_font_description_from_string
- (BOLD_FONT);
-
-#define SET_FONT_STYLE(wid) \
-{ \
- if (boldfont) \
- gtk_widget_modify_font(headerview->wid, boldfont); \
-}
+ if (!boldfont) {
+ boldfont = pango_font_description_from_string(BOLD_FONT);
+ pango_font_description_set_weight(boldfont, PANGO_WEIGHT_BOLD);
+ }
- SET_FONT_STYLE(from_header_label);
- SET_FONT_STYLE(to_header_label);
- SET_FONT_STYLE(ng_header_label);
- SET_FONT_STYLE(subject_header_label);
+ if (boldfont) {
+ gtk_widget_modify_font(headerview->from_header_label, boldfont);
+ gtk_widget_modify_font(headerview->to_header_label, boldfont);
+ gtk_widget_modify_font(headerview->ng_header_label, boldfont);
+ gtk_widget_modify_font(headerview->subject_header_label, boldfont);
+ }
headerview_clear(headerview);
headerview_set_visibility(headerview, prefs_common.display_header_pane);
void summary_init(SummaryView *summaryview)
{
- GtkStyle *style;
GtkWidget *pixmap;
+ PangoFontDescription *font_desc;
+ gint size;
gtk_widget_realize(summaryview->ctree);
stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_MARK,
stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_GPG_SIGNED,
&gpgsignedxpm, &gpgsignedxpmmask);
- if (!small_style) {
- PangoFontDescription *font_desc = NULL;
-
- small_style = gtk_style_copy
- (gtk_widget_get_style(summaryview->ctree));
- if (SMALL_FONT)
- font_desc = pango_font_description_from_string
- (SMALL_FONT);
- if (font_desc) {
- if (small_style->font_desc)
- pango_font_description_free(small_style->font_desc);
- small_style->font_desc = font_desc;
- }
- small_marked_style = gtk_style_copy(small_style);
- small_marked_style->fg[GTK_STATE_NORMAL] =
- summaryview->color_marked;
- small_deleted_style = gtk_style_copy(small_style);
- small_deleted_style->fg[GTK_STATE_NORMAL] =
- summaryview->color_dim;
- }
if (!bold_style) {
- PangoFontDescription *font_desc = NULL;
bold_style = gtk_style_copy
(gtk_widget_get_style(summaryview->ctree));
- if (BOLD_FONT)
- font_desc = pango_font_description_from_string
- (BOLD_FONT);
- if (font_desc) {
- if (bold_style->font_desc)
- pango_font_description_free
- (bold_style->font_desc);
- bold_style->font_desc = font_desc;
- }
+ pango_font_description_set_weight
+ (bold_style->font_desc, PANGO_WEIGHT_BOLD);
bold_marked_style = gtk_style_copy(bold_style);
bold_marked_style->fg[GTK_STATE_NORMAL] =
summaryview->color_marked;
summaryview->color_dim;
}
- style = gtk_style_copy(gtk_widget_get_style
- (summaryview->statlabel_folder));
- gtk_widget_set_style(summaryview->statlabel_folder, style);
- gtk_widget_set_style(summaryview->statlabel_select, style);
- gtk_widget_set_style(summaryview->statlabel_msgs, style);
+ font_desc = pango_font_description_new();
+ size = pango_font_description_get_size
+ (summaryview->statlabel_folder->style->font_desc);
+ pango_font_description_set_size(font_desc, size * PANGO_SCALE_SMALL);
+ gtk_widget_modify_font(summaryview->statlabel_folder, font_desc);
+ gtk_widget_modify_font(summaryview->statlabel_select, font_desc);
+ gtk_widget_modify_font(summaryview->statlabel_msgs, font_desc);
+ pango_font_description_free(font_desc);
pixmap = stock_pixmap_widget(summaryview->hbox_l, STOCK_PIXMAP_DIR_OPEN);
gtk_box_pack_start(GTK_BOX(summaryview->hbox_l), pixmap, FALSE, FALSE, 4);
GtkItemFactory *popupfactory;
GtkWidget *popupmenu;
gint n_entries;
- PangoFontDescription *font_desc = NULL;
debug_print("Creating text view...\n");
textview = g_new0(TextView, 1);
gtk_widget_ensure_style(text);
- if (prefs_common.normalfont)
- font_desc = pango_font_description_from_string
- (prefs_common.normalfont);
- if (font_desc) {
- gtk_widget_modify_font(text, font_desc);
- }
- pango_font_description_free(font_desc);
-
gtk_widget_ref(scrolledwin);
gtk_container_add(GTK_CONTAINER(scrolledwin), text);
static void textview_create_tags(GtkTextView *text, TextView *textview)
{
- GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
+ GtkTextBuffer *buffer;
GtkTextTag *tag;
+ static PangoFontDescription *font_desc, *bold_font_desc;
+
+ if (!font_desc)
+ font_desc = pango_font_description_from_string
+ (NORMAL_FONT);
+
+ if (!bold_font_desc) {
+ bold_font_desc = pango_font_description_from_string
+ (BOLD_FONT);
+ pango_font_description_set_weight
+ (bold_font_desc, PANGO_WEIGHT_BOLD);
+ }
+
+ buffer = gtk_text_view_get_buffer(text);
gtk_text_buffer_create_tag(buffer, "header",
"pixels-above-lines", 0,
"pixels-above-lines-set", TRUE,
"pixels-below-lines", 0,
"pixels-below-lines-set", TRUE,
+ "font-desc", font_desc,
"left-margin", 0,
"left-margin-set", TRUE,
NULL);
gtk_text_buffer_create_tag(buffer, "header_title",
- "font", prefs_common.boldfont,
+ "font-desc", bold_font_desc,
NULL);
gtk_text_buffer_create_tag(buffer, "quote0",
"foreground-gdk", "e_colors[0],
if (prefs_common.textfont) {
PangoFontDescription *font_desc = NULL;
- if (prefs_common.textfont)
- font_desc = pango_font_description_from_string
+ font_desc = pango_font_description_from_string
(prefs_common.textfont);
if (font_desc) {
gtk_widget_modify_font(textview->text, font_desc);