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, 16 insertions, 25 deletions

diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index d276753ac..0b4fcf45e 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -70,8 +70,6 @@ void prefs_clear_cache_button_clicked_cb	(GtkWidget *button,
 void prefs_dialog_response_cb			(GtkDialog *widget,
 						 gint response_id,
 						 EphyDialog *dialog);
-void fonts_language_combo_changed_cb		(GtkComboBox *combo,
-						 EphyDialog *dialog);
 void prefs_homepage_current_button_clicked_cb	(GtkWidget *button,
 						 EphyDialog *dialog);
 void prefs_homepage_blank_button_clicked_cb	(GtkWidget *button,
@@ -274,15 +272,6 @@ EphyDialogProperty properties [] =
 	{ NULL }
 };
 
-static const
-char *lang_size_group [] =
-{
-	"language_label",
-	"default_encoding_label",
-	"auto_encoding_label"
-};
-
-static guint n_lang_size_group = G_N_ELEMENTS (lang_size_group);
 enum
 {
 	COL_FONTS_LANG_NAME,
@@ -426,17 +415,18 @@ setup_font_combo (EphyDialog *dialog,
 	ephy_dialog_set_pref (dialog, properties[prop].id, key);
 }
 
-void
-fonts_language_combo_changed_cb (GtkComboBox *combo,
-				 EphyDialog *dialog)
+static void
+fonts_language_changed_cb (EphyDialog *dialog,
+			   const GValue *value,
+			   gpointer data)
 {
-	GValue value = { 0, };
 	const char *code;
 	char key[128];
 	int size;
 
-	ephy_dialog_get_value (dialog, properties[FONTS_LANGUAGE_PROP].id, &value);
-	code = g_value_get_string (&value);
+	code = g_value_get_string (value);
+
+	LOG ("fonts language combo changed, new code '%s'", code)
 
 	setup_font_combo (dialog, "variable", code, VARIABLE_PROP);
 	setup_font_combo (dialog, "monospace", code, MONOSPACE_PROP);
@@ -464,8 +454,6 @@ fonts_language_combo_changed_cb (GtkComboBox *combo,
 		eel_gconf_set_integer (key, default_size[FONT_SIZE_MIN]);
 	}
 	ephy_dialog_set_pref (dialog, properties[MIN_SIZE_PROP].id, key);
-
-	g_value_unset (&value);
 }
 
 static void
@@ -509,9 +497,9 @@ create_fonts_language_menu (EphyDialog *dialog)
 
 	ephy_dialog_set_data_column (dialog, properties[FONTS_LANGUAGE_PROP].id, COL_FONTS_LANG_CODE);
 
-	g_signal_connect (combo, "changed",
-			  G_CALLBACK (fonts_language_combo_changed_cb),
-			  dialog);
+	g_signal_connect (dialog, "changed::fonts_language_combo",
+			  G_CALLBACK (fonts_language_changed_cb),
+			  NULL);
 }
 
 static void
@@ -752,8 +740,11 @@ prefs_dialog_init (PrefsDialog *pd)
 	ephy_dialog_add_enum (dialog, properties[ACCEPT_COOKIES_PROP].id,
 			      n_cookies_accept_enum, cookies_accept_enum);
 
-	ephy_dialog_set_size_group (dialog, lang_size_group,
-				    n_lang_size_group);
+	ephy_dialog_set_size_group (dialog,
+				    properties[LANGUAGE_LABEL_PROP].id,
+				    properties[DEFAULT_ENCODING_LABEL_PROP].id,
+				    properties[AUTO_ENCODING_LABEL_PROP].id,
+				    NULL);
 
 	window = ephy_dialog_get_control (dialog, properties[WINDOW_PROP].id);
 
@@ -929,7 +920,7 @@ prefs_language_more_button_clicked_cb (GtkWidget *button,
 	/* FIXME: make it only modal to prefs dialogue, not to all windows */
 	ephy_dialog_set_modal (EPHY_DIALOG (editor), TRUE);
 
-	g_signal_connect (editor, "changed",
+	g_signal_connect (editor, "list-changed",
 			  G_CALLBACK (language_dialog_changed_cb),
 			  dialog);