[gnumeric] Add an initialy hidden long format toolbar.

[Andreas J. Guelzow <guelzow src gnome org>]

commit 3eb258ee3c6b1c16f2644584af04230f6081acce
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Sun Jun 28 18:58:20 2009 -0600

    Add an initialy hidden long format toolbar.
    
    2009-06-28 Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* schemas/gnumeric-general.schemas.in: add schema for
    	  long format toolbar and fix other toolbar schemas
    	* src/GNOME_Gnumeric-gtk.xml.in: provide a long version of
    	  the format toolbar

 ChangeLog                           |    7 +++++++
 NEWS                                |    1 +
 schemas/gnumeric-general.schemas.in |   28 +++++++++++++++++++++++++---
 src/GNOME_Gnumeric-gtk.xml.in       |   31 +++++++++++++++++++++++++++++--
 4 files changed, 62 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8588dd8..c56be1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-06-28 Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* schemas/gnumeric-general.schemas.in: add schema for 
+	  long format toolbar and fix other toolbar schemas
+	* src/GNOME_Gnumeric-gtk.xml.in: provide a long version of 
+	  the format toolbar
+
+2009-06-28 Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* src/wbc-gtk-actions.c (cb_help_docs): pass flags to g_spawn_async
 	  and provide more descriptive error message
 
diff --git a/NEWS b/NEWS
index 01f6a67..fc861a1 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ Andreas:
 	* Import some conditional cell formats from ODF.
 	* Fix "not-between" conditional styles. [#586818]
 	* Show existence of conditional styles in format dialog.
+	* Add an initialy hidden long format toolbar.
 
 Morten:
 	* Make SUMIF/COUNTIF and the D* functions understand pattern. [#586215]
diff --git a/schemas/gnumeric-general.schemas.in b/schemas/gnumeric-general.schemas.in
index 0cb528d..b945bef 100644
--- a/schemas/gnumeric-general.schemas.in
+++ b/schemas/gnumeric-general.schemas.in
@@ -1,6 +1,6 @@
 <gconfschemafile>
     <schemalist>
-      <!-- Override the global setting becaue our toolbars look terrible with text -->
+      <!-- Override the global setting because our toolbars look terrible with text -->
       <schema>
         <key>/schemas/apps/gnome-settings/gnumeric/toolbar_style</key>
         <applyto>/apps/gnome-settings/gnumeric/toolbar_style</applyto>
@@ -196,11 +196,33 @@
         <type>int</type>
 	<default>2</default>
         <locale name="C">
-        <short>Standard toolbar position</short>
+        <short>Format toolbar position</short>
         <long>This variable determines where the format toolbar should be shown.  0 is left, 1 is right, 2 is top.</long>
         </locale>
       </schema>
       <schema>
+        <key>/schemas/apps/gnumeric/core/gui/toolbars/LongFormatToolbar</key>
+        <applyto>/apps/gnumeric/core/gui/toolbars/LongFormatToolbar</applyto>
+        <owner>Gnumeric</owner>
+        <type>bool</type>
+	<default>FALSE</default>
+        <locale name="C">
+        <short>Long format toolbar visible</short>
+        <long>This variable determines whether the long format toolbar should be visible initially.</long>
+        </locale>
+      </schema>
+      <schema>
+        <key>/schemas/apps/gnumeric/core/gui/toolbars/LongFormatToolbar-position</key>
+        <applyto>/apps/gnumeric/core/gui/toolbars/LongFormatToolbar-position</applyto>
+        <owner>Gnumeric</owner>
+        <type>int</type>
+	<default>2</default>
+        <locale name="C">
+        <short>Long format toolbar position</short>
+        <long>This variable determines where the long format toolbar should be shown.  0 is left, 1 is right, 2 is top.</long>
+        </locale>
+      </schema>
+      <schema>
         <key>/schemas/apps/gnumeric/core/gui/toolbars/ObjectToolbar</key>
         <applyto>/apps/gnumeric/core/gui/toolbars/ObjectToolbar</applyto>
         <owner>Gnumeric</owner>
@@ -218,7 +240,7 @@
         <type>int</type>
 	<default>2</default>
         <locale name="C">
-        <short>Standard toolbar position</short>
+        <short>Object toolbar position</short>
         <long>This variable determines where the object toolbar should be shown.  0 is left, 1 is right, 2 is top.</long>
         </locale>
       </schema>
diff --git a/src/GNOME_Gnumeric-gtk.xml.in b/src/GNOME_Gnumeric-gtk.xml.in
index 7c48e0a..6417be1 100644
--- a/src/GNOME_Gnumeric-gtk.xml.in
+++ b/src/GNOME_Gnumeric-gtk.xml.in
@@ -270,8 +270,6 @@
     <toolitem action="FontBold"/>
     <toolitem action="FontItalic"/>
     <toolitem action="FontUnderline"/>
-    <toolitem action="FontSuperscript"/>
-    <toolitem action="FontSubscript"/>
     <separator name="fmt-sep1"/>
     <toolitem action="AlignLeft"/>
     <toolitem action="AlignCenter"/>
@@ -293,6 +291,35 @@
     <toolitem action="ColorBack"/>
     <toolitem action="ColorFore"/>
   </toolbar>
+  <toolbar _name="LongFormatToolbar">
+    <toolitem action="FontName"/>
+    <toolitem action="FontSize"/>
+    <toolitem action="FontSuperscript"/>
+    <toolitem action="FontSubscript"/>
+    <toolitem action="FontBold"/>
+    <toolitem action="FontItalic"/>
+    <toolitem action="FontUnderline"/>
+    <separator name="fmt-sep1"/>
+    <toolitem action="BorderSelector"/>
+    <toolitem action="ColorBack"/>
+    <toolitem action="ColorFore"/>
+    <separator name="fmt-sep2"/>
+    <toolitem action="AlignLeft"/>
+    <toolitem action="AlignCenter"/>
+    <toolitem action="AlignRight"/>
+    <toolitem action="CenterAcrossSelection"/>
+    <toolitem action="FormatMergeCells"/>
+    <toolitem action="FormatUnmergeCells"/>
+    <separator name="fmt-sep3"/>
+    <toolitem action="FormatAsAccounting"/>
+    <toolitem action="FormatAsPercentage"/>
+    <toolitem action="FormatWithThousands"/>
+    <toolitem action="FormatIncreasePrecision"/>
+    <toolitem action="FormatDecreasePrecision"/>
+    <separator name="fmt-sep4"/>
+    <toolitem action="FormatDecreaseIndent"/>
+    <toolitem action="FormatIncreaseIndent"/>
+  </toolbar>
   <toolbar _name="ObjectToolbar">
 <!-- Functionally Equivalent to CreateRectangle
      <toolitem action="CreateLabel"/> -->