From ec22aa6d6229b0e3405e5fca4be0662f41946b77 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sun, 7 Dec 2003 10:23:31 +0000 Subject: Split print dialogue in print setup and actual print, and move print 2003-12-07 Christian Persch * 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. --- data/glade/print.glade | 1378 +++++++++++++++++++++++++---------------------- data/ui/epiphany-ui.xml | 2 + 2 files changed, 730 insertions(+), 650 deletions(-) (limited to 'data') diff --git a/data/glade/print.glade b/data/glade/print.glade index c28975d01..573b4af1e 100644 --- a/data/glade/print.glade +++ b/data/glade/print.glade @@ -4,14 +4,19 @@ - + 5 - Print + Print Setup GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False - True + False False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST False @@ -25,43 +30,18 @@ True GTK_BUTTONBOX_END - - - True - True - True - gtk-print-preview - True - GTK_RELIEF_NORMAL - 50 - - - - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - -6 - - - - True True True True - gtk-print + gtk-close True GTK_RELIEF_NORMAL - -5 - + True + -7 + @@ -85,22 +65,25 @@ False - + 12 True + 2 + 2 False - 18 + 18 + 36 - + True False 6 - + True - <b>Print To</b> + <b>Colors</b> False True GTK_JUSTIFY_LEFT @@ -119,13 +102,13 @@ - + True False 0 - + True False @@ -146,106 +129,82 @@ - + True - 2 - 2 False - 6 - 12 + 6 - + True True - P_rinter: + C_olor True GTK_RELIEF_NORMAL + True False False True - 0 - 1 - 0 - 1 - fill - + 0 + False + False - + True True - _File: + _Grayscale True GTK_RELIEF_NORMAL + True False False True - printer_radiobutton + print_color_radiobutton - 0 - 1 - 1 - 2 - fill - + 0 + False + False - + True - 10 - Choose a file to print to - False - False + False + 0 - - + + + 18 True - True - True - True - 0 - - True - * - False + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + - 1 - 2 - 1 - 2 - - - - - - - True - True - True - True - 0 - lpr - True - * - False - - - 1 - 2 - 0 - 1 - + 0 + True + True @@ -264,22 +223,25 @@ - 0 - False - False + 1 + 2 + 0 + 1 + fill + fill - + True False 6 - + True - <b>Page Range</b> + <b>Margins (in mm)</b> False True GTK_JUSTIFY_LEFT @@ -298,13 +260,13 @@ - + True False 0 - + True False @@ -325,46 +287,53 @@ - + True - 3 + 4 2 False 6 - 6 + 12 - + True - True - _All pages + _Bottom: True - GTK_RELIEF_NORMAL - False - False - True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + bottom_spinbutton 0 1 - 0 - 1 + 1 + 2 fill - + True - True - Pa_ges + _Left: True - GTK_RELIEF_NORMAL - False - False - True - all_pages_radiobutton + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + left_spinbutton 0 @@ -377,128 +346,143 @@ - + True - False - 12 - - - - True - fr_om: - True - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - from_spinbutton - - - 0 - False - False - - - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 1 9999 1 10 10 - - - 0 - False - True - - + _Right: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + right_spinbutton + + + 0 + 1 + 3 + 4 + fill + + + - - - True - _to: - True - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - to_spinbutton - - - 0 - False - False - - + + + True + _Top: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + top_spinbutton + + + 0 + 1 + 0 + 1 + fill + + + - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 1 9999 1 10 10 - - - 0 - False - True - - + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 10 0 100 1 10 10 + + + 1 + 2 + 1 + 2 + + + + + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 10 0 100 1 10 10 1 2 2 3 - fill + - + True True - _Selection - True - GTK_RELIEF_NORMAL - False - False - True - all_pages_radiobutton + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 10 0 100 1 10 10 - 0 - 1 - 1 - 2 - fill + 1 + 2 + 0 + 1 + + + + + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 10 0 100 1 10 10 + + + 1 + 2 + 3 + 4 0 - True - True + False + False @@ -510,54 +494,25 @@ - 0 - False - True + 0 + 1 + 0 + 1 + fill + fill - - - False - True - - - - - - True - General - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - - - - - 12 - True - False - 18 - + True False 6 - + True - <b>Size</b> + <b>Headers</b> False True GTK_JUSTIFY_LEFT @@ -576,13 +531,13 @@ - + True False 0 - + True False @@ -603,59 +558,22 @@ - + True - True + False 6 - - True - True - A_4 - True - GTK_RELIEF_NORMAL - True - False - True - - - 0 - False - False - - - - - - True - True - _Letter - True - GTK_RELIEF_NORMAL - False - False - True - A4_radiobutton - - - 0 - False - False - - - - - + True True - L_egal + P_age title True GTK_RELIEF_NORMAL + True False False True - A4_radiobutton 0 @@ -665,16 +583,16 @@ - + True True - E_xecutive + Page a_ddress True GTK_RELIEF_NORMAL + True False False True - A4_radiobutton 0 @@ -698,22 +616,25 @@ - 0 - False - False + 1 + 2 + 1 + 2 + fill + fill - + True False 6 - + True - <b>Orientation</b> + <b>Footers</b> False True GTK_JUSTIFY_LEFT @@ -732,13 +653,13 @@ - + True False 0 - + True False @@ -759,18 +680,19 @@ - + True False 6 - + True True - P_ortrait + Page _numbers True GTK_RELIEF_NORMAL + True False False True @@ -783,16 +705,16 @@ - + True True - Lan_dscape + _Date True GTK_RELIEF_NORMAL + True False False True - orient_p_radiobutton 0 @@ -810,15 +732,18 @@ 0 - True - True + False + False - 0 - False - False + 0 + 1 + 1 + 2 + fill + fill @@ -829,9 +754,9 @@ - + True - Paper + Appearance False False GTK_JUSTIFY_LEFT @@ -848,25 +773,22 @@ - + 12 True - 2 - 2 False - 18 - 36 + 18 - + True False 6 - + True - <b>Colors</b> + <b>Size</b> False True GTK_JUSTIFY_LEFT @@ -885,13 +807,13 @@ - + True False 0 - + True False @@ -912,19 +834,20 @@ - + True - False + True 6 - + True True - C_olor + A_4 True GTK_RELIEF_NORMAL - False + True + True False True @@ -936,16 +859,17 @@ - + True True - _Grayscale + _Letter True GTK_RELIEF_NORMAL + True False False True - print_color_radiobutton + A4_radiobutton 0 @@ -955,37 +879,42 @@ - + True - False - 0 + True + L_egal + True + GTK_RELIEF_NORMAL + True + False + False + True + A4_radiobutton + + + 0 + False + False + + - - - 18 - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + + + True + True + E_xecutive + True + GTK_RELIEF_NORMAL + True + False + False + True + A4_radiobutton 0 - True - True + False + False @@ -1004,25 +933,22 @@ - 1 - 2 - 0 - 1 - fill - fill + 0 + False + False - + True False 6 - + True - <b>Margins (in mm)</b> + <b>Orientation</b> False True GTK_JUSTIFY_LEFT @@ -1041,13 +967,13 @@ - + True False 0 - + True False @@ -1068,232 +994,191 @@ - + True - 4 - 2 False - 6 - 12 + 6 - + True - _Bottom: + True + P_ortrait True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - bottom_spinbutton + GTK_RELIEF_NORMAL + True + False + False + True - 0 - 1 - 1 - 2 - fill - + 0 + False + False - + True - _Left: + True + Lan_dscape True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - left_spinbutton + GTK_RELIEF_NORMAL + True + False + False + True + orient_p_radiobutton - 0 - 1 - 2 - 3 - fill - + 0 + False + False + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + False + False + + + + + False + True + + - - - True - _Right: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - right_spinbutton - - - 0 - 1 - 3 - 4 - fill - - - + + + True + Paper + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + 0 + True + True + + + + + - - - True - _Top: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - top_spinbutton - - - 0 - 1 - 0 - 1 - fill - - - + + 5 + Print + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + False + - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 10 0 100 1 10 10 - - - 1 - 2 - 1 - 2 - - - + + + True + False + 6 - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 10 0 100 1 10 10 - - - 1 - 2 - 2 - 3 - - - + + + True + GTK_BUTTONBOX_END - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 10 0 100 1 10 10 - - - 1 - 2 - 0 - 1 - - - + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + -6 + + - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 10 0 100 1 10 10 - - - 1 - 2 - 3 - 4 - - - - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - 1 - 0 - 1 - fill - fill - - + + + True + True + True + True + gtk-print + True + GTK_RELIEF_NORMAL + True + -5 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 5 + True + False + 2 + + + + True + False + 18 - + True False 6 - + True - <b>Headers</b> + <b>Print To</b> False True GTK_JUSTIFY_LEFT @@ -1312,13 +1197,13 @@ - + True False 0 - + True False @@ -1339,44 +1224,129 @@ - + True + 2 + 2 False - 6 + 6 + 12 - + True True - P_age title + P_rinter: True GTK_RELIEF_NORMAL + True False False True - 0 - False - False + 0 + 1 + 0 + 1 + fill + - + True True - Page a_ddress + _File: True GTK_RELIEF_NORMAL + True False False True + printer_radiobutton - 0 - False - False + 0 + 1 + 1 + 2 + fill + + + + + + + True + True + True + True + 0 + lpr + True + * + False + + + 1 + 2 + 0 + 1 + + + + + + + True + False + 6 + + + + True + True + True + True + 0 + + True + * + False + + + 0 + True + True + + + + + + True + True + _Browse... + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + + + + + 1 + 2 + 1 + 2 + fill + fill @@ -1395,25 +1365,22 @@ - 1 - 2 - 1 - 2 - fill - fill + 0 + False + False - + True False 6 - + True - <b>Footers</b> + <b>Page Range</b> False True GTK_JUSTIFY_LEFT @@ -1432,13 +1399,13 @@ - + True False 0 - + True False @@ -1459,44 +1426,176 @@ - + True + 3 + 2 False - 6 + 6 + 6 - + True True - Page _numbers + _All pages True GTK_RELIEF_NORMAL + True False False True - 0 - False - False + 0 + 1 + 0 + 1 + fill + - + True True - _Date + Pa_ges True GTK_RELIEF_NORMAL + True False False True + all_pages_radiobutton - 0 - False - False + 0 + 1 + 2 + 3 + fill + + + + + + + True + False + 12 + + + + True + fr_om: + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + from_spinbutton + + + 0 + False + False + + + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 1 9999 1 10 10 + + + 0 + False + True + + + + + + True + _to: + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + to_spinbutton + + + 0 + False + False + + + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 1 9999 1 10 10 + + + 0 + False + True + + + + + 1 + 2 + 2 + 3 + fill + + + + + + True + True + _Selection + True + GTK_RELIEF_NORMAL + True + False + False + True + all_pages_radiobutton + + + 0 + 1 + 1 + 2 + fill + @@ -1509,43 +1608,22 @@ 0 - False - False + True + True - 0 - 1 - 1 - 2 - fill - fill + 0 + False + True - False - True - - - - - - True - Appearance - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - tab + 0 + True + True diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml index 60f9de706..6fd3f4ee1 100644 --- a/data/ui/epiphany-ui.xml +++ b/data/ui/epiphany-ui.xml @@ -7,6 +7,8 @@ + + -- cgit v1.2.3