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 /widgets | |
| 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 'widgets')
| -rw-r--r-- | widgets/misc/e-attachment-view.c | 3 | ||||
| -rw-r--r-- | widgets/misc/e-web-view.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/widgets/misc/e-attachment-view.c b/widgets/misc/e-attachment-view.c index 1d76b5dd8d..9725604865 100644 --- a/widgets/misc/e-attachment-view.c +++ b/widgets/misc/e-attachment-view.c @@ -28,6 +28,7 @@ #include "e-util/e-binding.h" #include "e-util/e-selection.h" +#include "e-util/e-ui-manager.h" #include "e-util/e-util.h" #include "e-attachment-dialog.h" #include "e-attachment-handler-image.h" @@ -787,7 +788,7 @@ e_attachment_view_init (EAttachmentView *view) priv = e_attachment_view_get_private (view); - ui_manager = gtk_ui_manager_new (); + ui_manager = e_ui_manager_new (); priv->merge_id = gtk_ui_manager_new_merge_id (ui_manager); priv->ui_manager = ui_manager; diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c index ce41c32d4c..8744bef74b 100644 --- a/widgets/misc/e-web-view.c +++ b/widgets/misc/e-web-view.c @@ -1229,7 +1229,7 @@ web_view_init (EWebView *web_view) web_view->priv = E_WEB_VIEW_GET_PRIVATE (web_view); - ui_manager = gtk_ui_manager_new (); + ui_manager = e_ui_manager_new (); web_view->priv->ui_manager = ui_manager; g_signal_connect_swapped ( @@ -1331,8 +1331,8 @@ web_view_init (EWebView *web_view) g_error ("%s", error->message); id = "org.gnome.evolution.webview"; - e_plugin_ui_register_manager (ui_manager, id, web_view); - e_plugin_ui_enable_manager (ui_manager, id); + e_plugin_ui_register_manager (E_UI_MANAGER (ui_manager), id, web_view); + e_plugin_ui_enable_manager (E_UI_MANAGER (ui_manager), id); } GType |