forked from osmocom/wireshark
Don't include a Clear button in the packet- and capture-file-comment dialogs:
the user can just Ctrl-A + backspace if they want to do that. svn path=/trunk/; revision=42836
This commit is contained in:
parent
373e0925f3
commit
135ebc4148
|
@ -51,17 +51,6 @@
|
||||||
static GtkWidget *edit_or_add_pkt_comment_dlg = NULL;
|
static GtkWidget *edit_or_add_pkt_comment_dlg = NULL;
|
||||||
static GtkWidget *edit_or_add_capture_comment_dlg = NULL;
|
static GtkWidget *edit_or_add_capture_comment_dlg = NULL;
|
||||||
|
|
||||||
|
|
||||||
static void
|
|
||||||
comment_text_buff_clear_cb(GtkWidget *w _U_, GtkWidget *view)
|
|
||||||
{
|
|
||||||
GtkTextBuffer *buffer;
|
|
||||||
|
|
||||||
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
|
|
||||||
gtk_text_buffer_set_text (buffer, "", -1);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
pkt_comment_text_buff_ok_cb(GtkWidget *w _U_, GtkWidget *view)
|
pkt_comment_text_buff_ok_cb(GtkWidget *w _U_, GtkWidget *view)
|
||||||
{
|
{
|
||||||
|
@ -116,7 +105,7 @@ edit_packet_comment_dlg (GtkAction *action _U_, gpointer data _U_)
|
||||||
GtkWidget *vbox;
|
GtkWidget *vbox;
|
||||||
GtkWidget *view;
|
GtkWidget *view;
|
||||||
GtkWidget *bbox;
|
GtkWidget *bbox;
|
||||||
GtkWidget *ok_bt, *clear_bt, *cancel_bt, *help_bt;
|
GtkWidget *ok_bt, *cancel_bt, *help_bt;
|
||||||
GtkTextBuffer *buffer = NULL;
|
GtkTextBuffer *buffer = NULL;
|
||||||
gchar *opt_comment;
|
gchar *opt_comment;
|
||||||
gchar *buf_str;
|
gchar *buf_str;
|
||||||
|
@ -147,16 +136,13 @@ edit_packet_comment_dlg (GtkAction *action _U_, gpointer data _U_)
|
||||||
gtk_widget_show (view);
|
gtk_widget_show (view);
|
||||||
|
|
||||||
/* Button row. */
|
/* Button row. */
|
||||||
bbox = dlg_button_row_new (GTK_STOCK_OK, GTK_STOCK_CLEAR, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
|
bbox = dlg_button_row_new (GTK_STOCK_OK, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
|
||||||
gtk_box_pack_end (GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
|
gtk_box_pack_end (GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
|
||||||
|
|
||||||
ok_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_OK);
|
ok_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_OK);
|
||||||
g_signal_connect (ok_bt, "clicked", G_CALLBACK(pkt_comment_text_buff_ok_cb), view);
|
g_signal_connect (ok_bt, "clicked", G_CALLBACK(pkt_comment_text_buff_ok_cb), view);
|
||||||
gtk_widget_set_sensitive (ok_bt, TRUE);
|
gtk_widget_set_sensitive (ok_bt, TRUE);
|
||||||
|
|
||||||
clear_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLEAR);
|
|
||||||
g_signal_connect(clear_bt, "clicked", G_CALLBACK(comment_text_buff_clear_cb), view);
|
|
||||||
|
|
||||||
cancel_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_CANCEL);
|
cancel_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_CANCEL);
|
||||||
window_set_cancel_button (edit_or_add_pkt_comment_dlg, cancel_bt, window_cancel_button_cb);
|
window_set_cancel_button (edit_or_add_pkt_comment_dlg, cancel_bt, window_cancel_button_cb);
|
||||||
|
|
||||||
|
@ -187,7 +173,7 @@ edit_capture_dlg_launch (void)
|
||||||
GtkWidget *vbox;
|
GtkWidget *vbox;
|
||||||
GtkWidget *view;
|
GtkWidget *view;
|
||||||
GtkWidget *bbox;
|
GtkWidget *bbox;
|
||||||
GtkWidget *ok_bt, *clear_bt, *cancel_bt, *help_bt;
|
GtkWidget *ok_bt, *cancel_bt, *help_bt;
|
||||||
GtkTextBuffer *buffer = NULL;
|
GtkTextBuffer *buffer = NULL;
|
||||||
const gchar *comment_str = NULL;
|
const gchar *comment_str = NULL;
|
||||||
gchar *buf_str;
|
gchar *buf_str;
|
||||||
|
@ -227,16 +213,13 @@ edit_capture_dlg_launch (void)
|
||||||
gtk_widget_show (view);
|
gtk_widget_show (view);
|
||||||
|
|
||||||
/* Button row. */
|
/* Button row. */
|
||||||
bbox = dlg_button_row_new (GTK_STOCK_OK, GTK_STOCK_CLEAR, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
|
bbox = dlg_button_row_new (GTK_STOCK_OK, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
|
||||||
gtk_box_pack_end (GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
|
gtk_box_pack_end (GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
|
||||||
|
|
||||||
ok_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_OK);
|
ok_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_OK);
|
||||||
g_signal_connect (ok_bt, "clicked", G_CALLBACK(capture_comment_text_buff_ok_cb), view);
|
g_signal_connect (ok_bt, "clicked", G_CALLBACK(capture_comment_text_buff_ok_cb), view);
|
||||||
gtk_widget_set_sensitive (ok_bt, TRUE);
|
gtk_widget_set_sensitive (ok_bt, TRUE);
|
||||||
|
|
||||||
clear_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLEAR);
|
|
||||||
g_signal_connect(clear_bt, "clicked", G_CALLBACK(comment_text_buff_clear_cb), view);
|
|
||||||
|
|
||||||
cancel_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_CANCEL);
|
cancel_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_CANCEL);
|
||||||
window_set_cancel_button (edit_or_add_capture_comment_dlg, cancel_bt, window_cancel_button_cb);
|
window_set_cancel_button (edit_or_add_capture_comment_dlg, cancel_bt, window_cancel_button_cb);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue