From 9f79315277d064fc533e1741fb43a0c540057105 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Sat, 18 Aug 2001 19:59:59 +0000 Subject: New, replacing `shortcut_bar_mode_changed_cb'. * e-shell-view-menu.c (shortcut_bar_visibility_changed_cb): New, replacing `shortcut_bar_mode_changed_cb'. (folder_bar_visibility_changed_cb): New, replacing `folder_bar_mode_changed_cb'. (command_toggle_folder_bar): Use `e_shell_view_show_folder_bar()' instead of `e_shell_view_set_folder_bar_mode()'. (command_toggle_shortcut_bar): Use `e_shell_view_show_shortcut_bar()' instead of `e_shell_view_set_shortcut_bar_mode()'. (e_shell_view_menu_setup): Updated for the "shortcut_bar_visibility_changed" and "folder_bar_visibility_changed" signals and the above changes. * e-shell-view.c: New member `folder_bar_popup' in `EShellViewPrivate'. Replaced `folder_bar_mode' and `shortcut_bar_mode' with `folder_bar_shown' and `shortcut_bar_shown', respectively. (init): Updated to initialize these correctly. (reparent): New helper function. (reparent_storage_set_view_box_and_destroy_popup): New helper function. (popdown_transient_folder_bar): Updated to use the `folder_bar_popup'. (folder_bar_popup_map_callback): Renamed from `storage_set_view_box_map_cb'. (e_shell_view_set_shortcut_bar_mode): Removed. (e_shell_view_set_folder_bar_mode): Removed. (e_shell_view_show_shortcut_bar): New. All the calls to `e_shell_view_set_shortcut_bar_mode()' replaced with calls to this one. (e_shell_view_show_folder_bar): New. All the calls to `e_shell_view_set_folder_bar_mode()' replaced with calls to this one. (e_shell_view_folder_bar_shown): New. All the calls to `e_shell_view_get_folder_bar_mode()' replaced with calls to this one. (e_shell_view_shortcut_bar_shown): New. All the calls to `e_shell_view_get_shortcut_bar_mode()' replaced with calls to this one. (class_init): Replace signal `folder_bar_mode_changed' with `folder_bar_visibility_changed' and `shortcut_bar_mode_changed' with `shortcut_visibility_changed'. (e_shell_view_save_settings): Use keys "ShortcutBarShown" and "FolderBarShown" instead of "ShortcutBarMode" and "FolderBarMode", respectively. (e_shell_view_load_settings): Likewise. * e-shell-view.h: Removed enum `EShellViewSubwindowMode'. Renamed signal `shortcut_bar_mode_changed' to `shortcut_bar_visibility_changed' and `folder_bar_mode_changed' to `folder_bar_visibility_changed'. svn path=/trunk/; revision=12203 --- shell/e-shell-view.h | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'shell/e-shell-view.h') diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h index a49d0cf337..9b7b53a47d 100644 --- a/shell/e-shell-view.h +++ b/shell/e-shell-view.h @@ -48,13 +48,6 @@ typedef struct _EShellViewClass EShellViewClass; #define DEFAULT_URI "evolution:/local/Inbox" -enum _EShellViewSubwindowMode { - E_SHELL_VIEW_SUBWINDOW_HIDDEN, - E_SHELL_VIEW_SUBWINDOW_TRANSIENT, - E_SHELL_VIEW_SUBWINDOW_STICKY -}; -typedef enum _EShellViewSubwindowMode EShellViewSubwindowMode; - struct _EShellView { BonoboWindow parent; @@ -65,8 +58,8 @@ struct _EShellViewClass { BonoboWindowClass parent_class; /* Signals. */ - void (* shortcut_bar_mode_changed) (EShellView *shell_view, EShellViewSubwindowMode new_mode); - void (* folder_bar_mode_changed) (EShellView *shell_view, EShellViewSubwindowMode mode); + void (* shortcut_bar_visibility_changed) (EShellView *shell_view, gboolean visible); + void (* folder_bar_visibility_changed) (EShellView *shell_view, gboolean visible); }; @@ -86,13 +79,12 @@ const GNOME_Evolution_ShellView e_shell_view_get_corba_interface (EShellView * gboolean e_shell_view_display_uri (EShellView *shell_view, const char *uri); -void e_shell_view_set_shortcut_bar_mode (EShellView *shell_view, - EShellViewSubwindowMode mode); -EShellViewSubwindowMode e_shell_view_get_shortcut_bar_mode (EShellView *shell_view); - -void e_shell_view_set_folder_bar_mode (EShellView *shell_view, - EShellViewSubwindowMode mode); -EShellViewSubwindowMode e_shell_view_get_folder_bar_mode (EShellView *shell_view); +void e_shell_view_show_shortcut_bar (EShellView *shell_view, + gboolean show); +gboolean e_shell_view_shortcut_bar_shown (EShellView *shell_view); +void e_shell_view_show_folder_bar (EShellView *shell_view, + gboolean show); +gboolean e_shell_view_folder_bar_shown (EShellView *shell_view); ETaskBar *e_shell_view_get_task_bar (EShellView *shell_view); EShell *e_shell_view_get_shell (EShellView *shell_view); -- cgit