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, 11 insertions, 43 deletions

diff --git a/embed/print-dialog.h b/embed/print-dialog.h
index 3ca150172..f7801d8f5 100644
--- a/embed/print-dialog.h
+++ b/embed/print-dialog.h
@@ -1,5 +1,6 @@
 /*
  *  Copyright (C) 2002 Jorn Baayen
+ *  Copyright (C) 2003 Christian Persch
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -18,61 +19,28 @@
  *  $Id$
  */
 
-#ifndef PRINT_DIALOG_H
-#define PRINT_DIALOG_H
+#ifndef EPHY_PRINT_DIALOG_H
+#define EPHY_PRINT_DIALOG_H
 
-#include "ephy-embed-dialog.h"
+#include "ephy-dialog.h"
 #include "ephy-embed.h"
 
 #include <glib-object.h>
 #include <glib.h>
+#include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
 
-#define EPHY_TYPE_PRINT_DIALOG		(print_dialog_get_type ())
-#define EPHY_PRINT_DIALOG(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_PRINT_DIALOG, PrintDialog))
-#define EPHY_PRINT_DIALOG_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_PRINT_DIALOG, PrintDialogClass))
-#define EPHY_IS_PRINT_DIALOG(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_PRINT_DIALOG))
-#define EPHY_IS_PRINT_DIALOG_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_PRINT_DIALOG))
-#define EPHY_PRINT_DIALOG_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_PRINT_DIALOG, PrintDialogClass))
-
-typedef struct PrintDialog PrintDialog;
-typedef struct PrintDialogClass PrintDialogClass;
-typedef struct PrintDialogPrivate PrintDialogPrivate;
-
-struct PrintDialog
-{
-	EphyEmbedDialog parent;
-
-	/*< private >*/
-	PrintDialogPrivate *priv;
-
-	//FIXME: These should be gobject properties
-	gboolean only_collect_info;
-	EmbedPrintInfo **ret_info;
-};
-
-struct PrintDialogClass
-{
-        EphyEmbedDialogClass parent_class;
-
-	void (* preview)    (PrintDialog *dialog);
-};
-
-GType		print_dialog_get_type		(void);
-
-EphyDialog     *print_dialog_new		(EphyEmbed *embed,
-						 EmbedPrintInfo **ret_info);
-
-EphyDialog     *print_dialog_new_with_parent	(GtkWidget *window,
+EphyDialog	*ephy_print_dialog_new		(GtkWidget *parent,
 						 EphyEmbed *embed,
-						 EmbedPrintInfo **ret_info);
+						 gboolean only_collect_info);
 
-gboolean	print_dialog_is_preview		(PrintDialog *dialog);
+EphyDialog	*ephy_print_setup_dialog_new	(void);
 
-void		print_free_info			(EmbedPrintInfo *info);
+EmbedPrintInfo  *ephy_print_get_print_info	(void);
+
+void		 ephy_print_info_free		(EmbedPrintInfo *info);
 
 G_END_DECLS
 
 #endif
-