diff options
| author | TingPing <tingping@tingping.se> | 2014-02-05 18:08:40 -0500 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2014-02-06 20:17:07 -0500 |
| commit | 5f7321280e2dfaa097fbd4855b547069ee96edc2 (patch) | |
| tree | 8d7e919a55763f924da99a0d44ba16e3bf254f8f /src/fe-gtk/rawlog.c | |
| parent | 8d77fd6a57b2cc54fbeae0a3d745cf60bfa9caec (diff) | |
Use a standard GtkScrolledWindow with xtext
Used in maingui, fkeys, text events, rawlog This also implements the set_scroll_adjustments signal in xtext
Diffstat (limited to 'src/fe-gtk/rawlog.c')
| -rw-r--r-- | src/fe-gtk/rawlog.c | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/src/fe-gtk/rawlog.c b/src/fe-gtk/rawlog.c index fea53e84..f2527492 100644 --- a/src/fe-gtk/rawlog.c +++ b/src/fe-gtk/rawlog.c @@ -100,7 +100,7 @@ rawlog_key_cb (GtkWidget * wid, GdkEventKey * key, gpointer userdata) void open_rawlog (struct server *serv) { - GtkWidget *hbox, *vscrollbar, *vbox; + GtkWidget *bbox, *scrolledwindow, *vbox; char tbuf[256]; if (serv->gui->rawlog_window) @@ -115,37 +115,30 @@ open_rawlog (struct server *serv) 640, 320, &vbox, serv); gtkutil_destroy_on_esc (serv->gui->rawlog_window); - hbox = gtk_hbox_new (FALSE, 2); - gtk_container_add (GTK_CONTAINER (vbox), hbox); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 4); - gtk_widget_show (hbox); + scrolledwindow = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_SHADOW_IN); + gtk_container_add (GTK_CONTAINER (vbox), scrolledwindow); serv->gui->rawlog_textlist = gtk_xtext_new (colors, 0); - - gtk_container_add (GTK_CONTAINER (hbox), serv->gui->rawlog_textlist); + gtk_container_add (GTK_CONTAINER (scrolledwindow), serv->gui->rawlog_textlist); gtk_xtext_set_font (GTK_XTEXT (serv->gui->rawlog_textlist), prefs.hex_text_font); GTK_XTEXT (serv->gui->rawlog_textlist)->ignore_hidden = 1; - gtk_widget_show (serv->gui->rawlog_textlist); - - vscrollbar = gtk_vscrollbar_new (GTK_XTEXT (serv->gui->rawlog_textlist)->adj); - gtk_box_pack_start (GTK_BOX (hbox), vscrollbar, FALSE, FALSE, 0); - show_and_unfocus (vscrollbar); - hbox = gtk_hbutton_box_new (); - gtk_button_box_set_layout (GTK_BUTTON_BOX (hbox), GTK_BUTTONBOX_SPREAD); - gtk_box_pack_end (GTK_BOX (vbox), hbox, 0, 0, 0); - gtk_widget_show (hbox); + bbox = gtk_hbutton_box_new (); + gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_SPREAD); + gtk_box_pack_end (GTK_BOX (vbox), bbox, 0, 0, 4); - gtkutil_button (hbox, GTK_STOCK_CLEAR, NULL, rawlog_clearbutton, + gtkutil_button (bbox, GTK_STOCK_CLEAR, NULL, rawlog_clearbutton, serv, _("Clear Raw Log")); - gtkutil_button (hbox, GTK_STOCK_SAVE_AS, NULL, rawlog_savebutton, + gtkutil_button (bbox, GTK_STOCK_SAVE_AS, NULL, rawlog_savebutton, serv, _("Save As...")); /* Copy selection to clipboard when Ctrl+Shift+C is pressed AND text auto-copy is disabled */ g_signal_connect (G_OBJECT (serv->gui->rawlog_window), "key_press_event", G_CALLBACK (rawlog_key_cb), serv->gui->rawlog_textlist); - gtk_widget_show (serv->gui->rawlog_window); + gtk_widget_show_all (serv->gui->rawlog_window); } void |