Split print dialogue in print setup and actual print, and move print

2003-12-07  Christian Persch  <chpe@cvs.gnome.org>

	* data/glade/print.glade:
	* data/ui/epiphany-ui.xml:
	* embed/mozilla/PrintingPromptService.cpp:
	* embed/mozilla/mozilla-embed.cpp:
	* embed/print-dialog.c: (ephy_print_info_free),
	(ephy_print_get_print_info), (ephy_print_dialog_response_cb),
	(print_filechooser_response_cb),
	(ephy_print_dialog_browse_button_cb),
	(ephy_print_setup_dialog_close_button_cb), (ephy_print_dialog_new),
	(ephy_print_setup_dialog_new):
	* embed/print-dialog.h:
	* src/ephy-nautilus-view.c: (ephy_nautilus_view_new_component),
	(gnv_cmd_file_print):
	* src/ephy-nautilus-view.h:
	* src/ephy-shell.c: (ephy_shell_get_type), (ephy_shell_class_init),
	(ephy_automation_factory_cb), (ephy_automation_factory_new),
	(ephy_shell_init), (server_timeout), (ephy_shell_startup),
	(ephy_shell_finalize), (ephy_shell_new_tab),
	(ephy_shell_get_session), (ephy_shell_get_bookmarks),
	(ephy_shell_get_toolbars_model), (ephy_shell_get_bookmarks_editor),
	(ephy_shell_get_history_window),
	(ephy_shell_get_print_setup_dialog), (ephy_shell_delete_on_exit):
	* src/ephy-shell.h:
	* src/ephy-window.c: (ephy_window_set_print_preview),
	(ephy_window_print):
	* src/ephy-window.h:
	* src/window-commands.c: (window_cmd_file_print_setup),
	(window_cmd_file_print_preview):
	* src/window-commands.h:

	Split print dialogue in print setup and actual print, and move
	print preview into the menus too. Made print setup a global dialogue,
	print a per-window dialogue.

	* lib/ephy-dialog.c: (set_value_from_pref), (set_pref_from_value),
	(set_value_from_combobox), (set_combo_box_from_value),
	(set_radiobuttongroup_from_value), (set_pref_from_info_and_emit),
	(togglebutton_clicked_cb), (radiobutton_clicked_cb),
	(spinbutton_timeout_cb), (changed_cb), (init_props), (load_info),
	(save_info), (impl_show), (ephy_dialog_set_size_group),
	(ephy_dialog_construct), (run_response_cb), (ephy_dialog_run),
	(ephy_dialog_set_parent), (ephy_dialog_class_init),
	(ephy_dialog_new_with_parent):
	* lib/ephy-dialog.h:
	* src/language-editor.c: (language_editor_class_init):
	* src/language-editor.h:
	* src/pdm-dialog.c: (pdm_dialog_init):
	* src/prefs-dialog.c: (fonts_language_changed_cb),
	(create_fonts_language_menu), (prefs_dialog_init),
	(prefs_language_more_button_clicked_cb):

	Slight api change; port callers.

1 files changed, 5 insertions, 10 deletions

diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index 69c63b4ae..4a1a2b118 100755
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -114,15 +114,6 @@ EphyDialogProperty properties [] =
 	{ NULL }
 };
 
-static const
-char *size_group [] =
-{
-	"cookies_remove_button",
-	"cookies_properties_button",
-	"passwords_remove_button"
-};
-const guint n_size_group = G_N_ELEMENTS (size_group);
-
 static void pdm_dialog_class_init	(PdmDialogClass *klass);
 static void pdm_dialog_init		(PdmDialog *dialog);
 static void pdm_dialog_finalize		(GObject *object);
@@ -804,7 +795,11 @@ pdm_dialog_init (PdmDialog *dialog)
 	 * avoid the little jerk you get otherwise when switching pages because
 	 * one set of buttons is wider than another.
 	 */
-	ephy_dialog_set_size_group (EPHY_DIALOG (dialog), size_group, n_size_group);
+	ephy_dialog_set_size_group (EPHY_DIALOG (dialog),
+				    properties[PROP_COOKIES_REMOVE].id,
+				    properties[PROP_COOKIES_PROPERTIES].id,
+				    properties[PROP_PASSWORDS_REMOVE].id,
+				    NULL);
 
 	cookies = g_new0 (PdmActionInfo, 1);
 	cookies->construct = pdm_dialog_cookies_construct;