diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2010-03-05 04:26:59 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2010-03-14 09:53:17 +0800 |
commit | d7494c8f160b12e1199b06dcafdc8ff01b24b796 (patch) | |
tree | 28e4c85c915c770a4e7bfb48ede7f686d18da206 /shell/e-shell-window.c | |
parent | 51cbd483d163138c3b570b01f0921f767ca64a7e (diff) | |
download | gsoc2013-evolution-d7494c8f160b12e1199b06dcafdc8ff01b24b796.tar.gz gsoc2013-evolution-d7494c8f160b12e1199b06dcafdc8ff01b24b796.tar.zst gsoc2013-evolution-d7494c8f160b12e1199b06dcafdc8ff01b24b796.zip |
Shell and UI manager cleanups.
Replace the EVO_EXPRESS environment variable with an --express command
line option. (Note, this adds a new translatable string for --help.)
Add an EUIManager class with an "express-mode" property and custom load
functions that use our new "express" preprocessor. This replaces the UI
manager functions in e-utils.c.
(Also going to see if I can get GTK+ to add an "add_ui_from_string"
method to GtkUIManagerClass that we can override. Then we could just
call gtk_ui_manager_add_ui_from_string() and the preprocessor would
automatically do its thing and chain up.)
Add an "express-mode" read-only GObject property to EShell.
Add e_shell_configure_ui_manager() to e-shell-utils.c. For now this
just creates a one-way property binding:
EShell:express-mode -> EUIManager:express-mode
Call this immediately after e_ui_manager_new(). (EUIManager can't do
this itself because it lives too low in the dependency hierarchy and
doesn't know about EShell.)
Diffstat (limited to 'shell/e-shell-window.c')
-rw-r--r-- | shell/e-shell-window.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 8cb1ed8831..283445766c 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -541,7 +541,8 @@ shell_window_create_shell_view (EShellWindow *shell_window, /* Register the GtkUIManager ID for the shell view. */ id = E_SHELL_VIEW_GET_CLASS (shell_view)->ui_manager_id; ui_manager = e_shell_window_get_ui_manager (shell_window); - e_plugin_ui_register_manager (ui_manager, id, shell_view); + e_plugin_ui_register_manager ( + E_UI_MANAGER (ui_manager), id, shell_view); /* Add pages to the various shell window notebooks. */ @@ -1149,18 +1150,6 @@ e_shell_window_get_safe_mode (EShellWindow *shell_window) } /** - * e_shell_window_get_safe_mode: - * @shell_window: an #EShellWindow - * - * Returns %TRUE if @shell_window is in "express mode". - **/ -gboolean -e_shell_window_get_express_mode (EShellWindow *shell_window) -{ - return e_shell_get_express_mode (e_shell_window_get_shell (shell_window)); -} - -/** * e_shell_window_set_safe_mode: * @shell_window: an #EShellWindow * @safe_mode: whether to put @shell_window into "safe mode" |