diff options
| author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-06 22:06:37 +0000 |
|---|---|---|
| committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-06 22:06:37 +0000 |
| commit | 4e39ec91448708c7f5ad2504f02ce47a6e81db01 (patch) | |
| tree | c654d0bf8d81e280f89ab82976f16a7272845bfc | |
| parent | e59c54b38ddf258e9d58c5f06e211655199d5f6d (diff) | |
Added new_packet_list_set_font() and initialize fonts when using
new packet list.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29316 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | gtk/font_utils.c | 7 | ||||
| -rw-r--r-- | gtk/main.c | 2 | ||||
| -rw-r--r-- | gtk/new_packet_list.c | 8 | ||||
| -rw-r--r-- | gtk/new_packet_list.h | 6 |
4 files changed, 19 insertions, 4 deletions
diff --git a/gtk/font_utils.c b/gtk/font_utils.c index e9799aa09a..3d0cb29204 100644 --- a/gtk/font_utils.c +++ b/gtk/font_utils.c @@ -50,6 +50,9 @@ #include "gtk/main_proto_draw.h" #include "gtk/follow_tcp.h" +#ifdef NEW_PACKET_LIST +#include "gtk/new_packet_list.h" +#endif PangoFontDescription *m_r_font, *m_b_font; @@ -274,7 +277,9 @@ user_font_apply(void) { } /* the font(s) seem to be ok */ -#ifndef NEW_PACKET_LIST +#ifdef NEW_PACKET_LIST + new_packet_list_set_font(new_r_font); +#else packet_list_set_font(new_r_font); #endif set_ptree_font_all(new_r_font); diff --git a/gtk/main.c b/gtk/main.c index b9378bf700..67c14211ca 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -2565,7 +2565,6 @@ main(int argc, char *argv[]) menu_auto_scroll_live_changed(auto_scroll_live); #endif -#ifndef NEW_PACKET_LIST switch (user_font_apply()) { case FA_SUCCESS: break; @@ -2584,7 +2583,6 @@ main(int argc, char *argv[]) recent.gui_zoom_level = 0; /* XXX: would it be a good idea to disable zooming (insensitive GUI)? */ } -#endif /* NEW_PACKET_LIST */ dnd_init(top_level); diff --git a/gtk/new_packet_list.c b/gtk/new_packet_list.c index 2ebcb648b3..fa5252dc88 100644 --- a/gtk/new_packet_list.c +++ b/gtk/new_packet_list.c @@ -151,8 +151,8 @@ create_view_and_model(void) renderer = gtk_cell_renderer_text_new(); g_object_set(renderer, "ypad", 0, - "font-desc", user_font_get_regular(), NULL); + gtk_widget_modify_font(packetlist->view, user_font_get_regular()); for(i = 0; i < cfile.cinfo.num_cols; i++) { col = gtk_tree_view_column_new(); @@ -526,6 +526,12 @@ set_frame_mark(gboolean set, frame_data *frame) } } +void +new_packet_list_set_font(PangoFontDescription *font) +{ + gtk_widget_modify_font(packetlist->view, font); +} + void new_packet_list_mark_frame_cb(GtkWidget *w _U_, gpointer data _U_) { GtkTreeSelection *selection; diff --git a/gtk/new_packet_list.h b/gtk/new_packet_list.h index 68334eb14f..a790fb5616 100644 --- a/gtk/new_packet_list.h +++ b/gtk/new_packet_list.h @@ -32,6 +32,12 @@ GtkWidget *new_packet_list_create(void); void new_packet_list_resize_columns_cb(GtkWidget *widget _U_, gpointer data _U_); gboolean new_packet_list_get_event_row_column(GtkWidget *w, GdkEventButton *event_button, gint *row, gint *column); +/** Set the font of the packet list window. + * + * @param font new font + */ +extern void new_packet_list_set_font(PangoFontDescription *font); + /** Mark the currently selected packet. * * @param widget parent widget (unused) |