osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Add another wrapper routine, "file_selection_set_extra_widget()", to set 

the "extra options" portion of a file selection dialog, and use it
rather than #if'ed code.

svn path=/trunk/; revision=10512
This commit is contained in:
Guy Harris 2004-03-29 22:55:13 +00:00
parent 29c644691b
commit f76d50c881
3 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/dlg_utils.c
View File

@ -1,7 +1,7 @@
/* dlg_utils.c
* Utilities to use when constructing dialogs
*
* $Id: dlg_utils.c,v 1.23 2004/03/29 22:40:57 guy Exp $
* $Id: dlg_utils.c,v 1.24 2004/03/29 22:55:13 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -378,6 +378,19 @@ file_selection_set_current_folder(GtkWidget *fs, const gchar *filename)
#endif
}
/* Set the "extra" widget for a file selection dialog, with user-supplied
options. */
void
file_selection_set_extra_widget(GtkWidget *fs, GtkWidget *extra)
{
#if (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 4) || GTK_MAJOR_VERSION > 2
gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(fs), extra);
#else
gtk_box_pack_start(GTK_BOX(GTK_FILE_SELECTION(fs)->action_area), extra,
FALSE, FALSE, 0);
#endif
}
/* Set the "activate" signal for a widget to call a routine to
activate the "OK" button for a dialog box.

6
gtk/dlg_utils.h
View File

@ -1,7 +1,7 @@
/* dlg_utils.h
* Declarations of utilities to use when constructing dialogs
*
* $Id: dlg_utils.h,v 1.11 2004/03/29 22:40:57 guy Exp $
* $Id: dlg_utils.h,v 1.12 2004/03/29 22:55:13 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -39,6 +39,10 @@ extern GtkWidget *file_selection_new(const gchar *, file_selection_action_t);
/* Set the current folder for a file selection dialog. */
extern gboolean file_selection_set_current_folder(GtkWidget *, const gchar *);
/* Set the "extra" widget for a file selection dialog, with user-supplied
options. */
extern void file_selection_set_extra_widget(GtkWidget *, GtkWidget *);
/* Create a button row for a dialog */
/* the button widgets will be available by OBJECT_GET_DATA(stock_id) */
extern GtkWidget *dlg_button_row_new(gchar *stock_id_first, ...);

32
gtk/file_dlg.c
View File

@ -1,7 +1,7 @@
/* file_dlg.c
* Dialog boxes for handling files
*
* $Id: file_dlg.c,v 1.101 2004/03/29 22:40:58 guy Exp $
* $Id: file_dlg.c,v 1.102 2004/03/29 22:55:13 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -279,12 +279,7 @@ file_open_cmd(GtkWidget *w)
/* Container for each row of widgets */
main_vb = gtk_vbox_new(FALSE, 3);
gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
#if (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 4) || GTK_MAJOR_VERSION > 2
gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(file_open_w), main_vb);
#else
gtk_box_pack_start(GTK_BOX(GTK_FILE_SELECTION(file_open_w)->action_area),
main_vb, FALSE, FALSE, 0);
#endif
file_selection_set_extra_widget(file_open_w, main_vb);
gtk_widget_show(main_vb);
filter_hbox = gtk_hbox_new(FALSE, 1);
@ -904,12 +899,7 @@ file_save_as_cmd(action_after_save_e action_after_save, gpointer action_after_sa
main_vb = gtk_vbox_new(FALSE, 5);
gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
#if (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 4) || GTK_MAJOR_VERSION > 2
gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(file_save_as_w), main_vb);
#else
gtk_box_pack_start(GTK_BOX(GTK_FILE_SELECTION(file_save_as_w)->action_area),
main_vb, FALSE, FALSE, 0);
#endif
file_selection_set_extra_widget(file_save_as_w, main_vb);
gtk_widget_show(main_vb);
/*** Packet Range frame ***/
@ -1297,13 +1287,7 @@ file_color_import_cmd_cb(GtkWidget *w _U_, gpointer data)
/* Container for each row of widgets */
main_vb = gtk_vbox_new(FALSE, 3);
gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
#if (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 4) || GTK_MAJOR_VERSION > 2
gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(file_color_import_w),
main_vb);
#else
gtk_box_pack_start(GTK_BOX(GTK_FILE_SELECTION(file_color_import_w)->action_area),
main_vb, FALSE, FALSE, 0);
#endif
file_selection_set_extra_widget(file_color_import_w, main_vb);
gtk_widget_show(main_vb);
@ -1460,13 +1444,7 @@ file_color_export_cmd_cb(GtkWidget *w _U_, gpointer data _U_)
/* Container for each row of widgets */
main_vb = gtk_vbox_new(FALSE, 3);
gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
#if (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 4) || GTK_MAJOR_VERSION > 2
gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(file_color_export_w),
main_vb);
#else
gtk_box_pack_start(GTK_BOX(GTK_FILE_SELECTION(file_color_export_w)->action_area),
main_vb, FALSE, FALSE, 0);
#endif
file_selection_set_extra_widget(file_color_export_w, main_vb);
gtk_widget_show(main_vb);
cfmark_cb = gtk_check_button_new_with_label("Export only marked filters");