From d7494c8f160b12e1199b06dcafdc8ff01b24b796 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 4 Mar 2010 15:26:59 -0500
Subject: 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.)
---
 doc/reference/shell/eshell-sections.txt        |  2 ++
 doc/reference/shell/tmpl/e-shell-switcher.sgml |  3 ++-
 doc/reference/shell/tmpl/e-shell-utils.sgml    |  9 +++++++++
 doc/reference/shell/tmpl/e-shell.sgml          | 14 ++++++++++++++
 4 files changed, 27 insertions(+), 1 deletion(-)

(limited to 'doc/reference')

diff --git a/doc/reference/shell/eshell-sections.txt b/doc/reference/shell/eshell-sections.txt
index 2ae9b9153a..be5171cb3d 100644
--- a/doc/reference/shell/eshell-sections.txt
+++ b/doc/reference/shell/eshell-sections.txt
@@ -15,6 +15,7 @@ e_shell_watch_window
 e_shell_get_watched_windows
 e_shell_get_active_window
 e_shell_send_receive
+e_shell_get_express_mode
 e_shell_get_module_directory
 e_shell_get_network_available
 e_shell_set_network_available
@@ -238,6 +239,7 @@ EShellTaskbarPrivate
 <SECTION>
 <FILE>e-shell-utils</FILE>
 <TITLE>Shell Utilities</TITLE>
+e_shell_configure_ui_manager
 e_shell_configure_web_view
 e_shell_run_open_dialog
 e_shell_run_save_dialog
diff --git a/doc/reference/shell/tmpl/e-shell-switcher.sgml b/doc/reference/shell/tmpl/e-shell-switcher.sgml
index f656b65988..33a6479c06 100644
--- a/doc/reference/shell/tmpl/e-shell-switcher.sgml
+++ b/doc/reference/shell/tmpl/e-shell-switcher.sgml
@@ -55,7 +55,8 @@ EShellSwitcher
 </para>
 
 @switcher: 
-@action: 
+@switch_action: 
+@new_window_action: 
 
 
 <!-- ##### FUNCTION e_shell_switcher_get_style ##### -->
diff --git a/doc/reference/shell/tmpl/e-shell-utils.sgml b/doc/reference/shell/tmpl/e-shell-utils.sgml
index 5fb4913f96..a5768cf1f8 100644
--- a/doc/reference/shell/tmpl/e-shell-utils.sgml
+++ b/doc/reference/shell/tmpl/e-shell-utils.sgml
@@ -17,6 +17,15 @@ Shell Utilities
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### FUNCTION e_shell_configure_ui_manager ##### -->
+<para>
+
+</para>
+
+@shell: 
+@ui_manager: 
+
+
 <!-- ##### FUNCTION e_shell_configure_web_view ##### -->
 <para>
 
diff --git a/doc/reference/shell/tmpl/e-shell.sgml b/doc/reference/shell/tmpl/e-shell.sgml
index 394645413c..4d3f9a4e47 100644
--- a/doc/reference/shell/tmpl/e-shell.sgml
+++ b/doc/reference/shell/tmpl/e-shell.sgml
@@ -94,6 +94,11 @@ EShell
 
 @eshell: the object which received the signal.
 
+<!-- ##### ARG EShell:express-mode ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG EShell:geometry ##### -->
 <para>
 
@@ -241,6 +246,15 @@ EShell
 @parent: 
 
 
+<!-- ##### FUNCTION e_shell_get_express_mode ##### -->
+<para>
+
+</para>
+
+@shell: 
+@Returns: 
+
+
 <!-- ##### FUNCTION e_shell_get_module_directory ##### -->
 <para>
 
-- 
cgit