aboutsummaryrefslogtreecommitdiffstats
path: root/src/ephy-shell.h
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2003-12-07 18:23:31 +0800
committerChristian Persch <chpe@src.gnome.org>2003-12-07 18:23:31 +0800
commitec22aa6d6229b0e3405e5fca4be0662f41946b77 (patch)
tree2fa06838674189651e1cdfd5a03a2c3a021af94e /src/ephy-shell.h
parent83bcb61ae1b7790c9d483d3706641dcc61686c67 (diff)
downloadgsoc2013-epiphany-ec22aa6d6229b0e3405e5fca4be0662f41946b77.tar
gsoc2013-epiphany-ec22aa6d6229b0e3405e5fca4be0662f41946b77.tar.gz
gsoc2013-epiphany-ec22aa6d6229b0e3405e5fca4be0662f41946b77.tar.bz2
gsoc2013-epiphany-ec22aa6d6229b0e3405e5fca4be0662f41946b77.tar.lz
gsoc2013-epiphany-ec22aa6d6229b0e3405e5fca4be0662f41946b77.tar.xz
gsoc2013-epiphany-ec22aa6d6229b0e3405e5fca4be0662f41946b77.tar.zst
gsoc2013-epiphany-ec22aa6d6229b0e3405e5fca4be0662f41946b77.zip
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.
Diffstat (limited to 'src/ephy-shell.h')
-rw-r--r--src/ephy-shell.h47
1 files changed, 22 insertions, 25 deletions
diff --git a/src/ephy-shell.h b/src/ephy-shell.h
index c114d415f..a93d318c7 100644
--- a/src/ephy-shell.h
+++ b/src/ephy-shell.h
@@ -38,12 +38,7 @@ G_BEGIN_DECLS
#define EPHY_IS_SHELL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_SHELL))
#define EPHY_SHELL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_SHELL, EphyShellClass))
-/* FIXME: huh? */
-#ifndef EPHY_SHELL_TYPE_DEF
typedef struct EphyShell EphyShell;
-#define EPHY_SHELL_TYPE_DEF
-#endif
-
typedef struct EphyShellClass EphyShellClass;
typedef struct EphyShellPrivate EphyShellPrivate;
@@ -60,14 +55,14 @@ typedef enum
typedef enum
{
- EPHY_SHELL_STARTUP_TABS = 1 << 0,
- EPHY_SHELL_STARTUP_EXISTING_WINDOW = 1 << 2,
- EPHY_SHELL_STARTUP_FULLSCREEN = 1 << 3,
- EPHY_SHELL_STARTUP_BOOKMARKS_EDITOR = 1 << 4,
- EPHY_SHELL_STARTUP_SESSION = 1 << 5,
- EPHY_SHELL_STARTUP_IMPORT_BOOKMARKS = 1 << 6,
- EPHY_SHELL_STARTUP_ADD_BOOKMARK = 1 << 7,
- EPHY_SHELL_STARTUP_SERVER = 1 << 8
+ EPHY_SHELL_STARTUP_TABS = 1 << 0,
+ EPHY_SHELL_STARTUP_EXISTING_WINDOW = 1 << 2,
+ EPHY_SHELL_STARTUP_FULLSCREEN = 1 << 3,
+ EPHY_SHELL_STARTUP_BOOKMARKS_EDITOR = 1 << 4,
+ EPHY_SHELL_STARTUP_SESSION = 1 << 5,
+ EPHY_SHELL_STARTUP_IMPORT_BOOKMARKS = 1 << 6,
+ EPHY_SHELL_STARTUP_ADD_BOOKMARK = 1 << 7,
+ EPHY_SHELL_STARTUP_SERVER = 1 << 8
} EphyShellStartupFlags;
typedef enum
@@ -102,44 +97,46 @@ struct EphyShellClass
EphyEmbedShellClass parent_class;
};
-GQuark ephy_shell_error_quark (void);
-
GType ephy_shell_get_type (void);
+GQuark ephy_shell_error_quark (void);
+
EphyShell *ephy_shell_new (void);
-gboolean ephy_shell_startup (EphyShell *gs,
+gboolean ephy_shell_startup (EphyShell *shell,
EphyShellStartupFlags flags,
const char **args,
const char *string_arg,
GError **error);
-EphyWindow *ephy_shell_get_active_window (EphyShell *gs);
+EphyWindow *ephy_shell_get_active_window (EphyShell *shell);
-EphyTab *ephy_shell_new_tab (EphyShell *shell,
+EphyTab *ephy_shell_new_tab (EphyShell *shell,
EphyWindow *parent_window,
EphyTab *previous_tab,
const char *url,
EphyNewTabFlags flags);
-GObject *ephy_shell_get_session (EphyShell *gs);
+GObject *ephy_shell_get_session (EphyShell *shell);
-EphyBookmarks *ephy_shell_get_bookmarks (EphyShell *gs);
+EphyBookmarks *ephy_shell_get_bookmarks (EphyShell *shell);
-GObject *ephy_shell_get_toolbars_model (EphyShell *gs,
+GObject *ephy_shell_get_toolbars_model (EphyShell *shell,
gboolean fullscreen);
-GObject *ephy_shell_get_extensions_manager (EphyShell *es);
+GObject *ephy_shell_get_extensions_manager (EphyShell *shell);
-GtkWidget *ephy_shell_get_bookmarks_editor (EphyShell *gs);
+GtkWidget *ephy_shell_get_bookmarks_editor (EphyShell *shell);
-GtkWidget *ephy_shell_get_history_window (EphyShell *gs);
+GtkWidget *ephy_shell_get_history_window (EphyShell *shell);
GObject *ephy_shell_get_pdm_dialog (EphyShell *shell);
GObject *ephy_shell_get_prefs_dialog (EphyShell *shell);
-void ephy_shell_delete_on_exit (EphyShell *gs,
+GObject *ephy_shell_get_print_setup_dialog (EphyShell *shell);
+
+void ephy_shell_delete_on_exit (EphyShell *shell,
const char *path);
G_END_DECLS