[gnumeric] enable conditional styles related to number formats and alignment

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

commit f57534926a0cb2e6e0482a4e7a5eca0b877a4ebd
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Thu Jul 7 20:19:28 2011 -0600

    enable conditional styles related to number formats and alignment
    
    2011-07-07  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* cell-format-cond-def.ui: enable number and alignment checkboxes
    	* dialog-cell-format-cond.c (cb_c_fmt_dialog_chooser_buttons):
    	handle number format and alignment items

 NEWS                                  |    2 +-
 src/dialogs/ChangeLog                 |   10 ++++++++--
 src/dialogs/cell-format-cond-def.ui   |    2 --
 src/dialogs/dialog-cell-format-cond.c |   18 ++++++++++++++++--
 4 files changed, 25 insertions(+), 7 deletions(-)
---
diff --git a/NEWS b/NEWS
index 740fe45..957c82b 100644
--- a/NEWS
+++ b/NEWS
@@ -7,7 +7,7 @@ Andreas:
 	* Fix xlsx schema violations.
 	* Fix keyword handling in properties dialog. [#653378]
 	* Allow document properties to be edited and added.
-	* Add an interface for conditional formatting.
+	* Add an interface for conditional styles.
 
 Morten:
 	* Fix --with-gnome compilation:  [#652802]
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index 7ed3ae8..91ba852 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,10 +1,16 @@
 2011-07-07  Andreas J. Guelzow <aguelzow pyrshep ca>
 
-	* cell-format-cond-def.ui: enable font and background checkbox
+	* cell-format-cond-def.ui: enable number and alignment checkboxes
+	* dialog-cell-format-cond.c (cb_c_fmt_dialog_chooser_buttons):
+	handle number format and alignment items
+
+2011-07-07  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* cell-format-cond-def.ui: enable font and background checkboxes
 	* dialog-cell-format-cond.c (cb_c_fmt_dialog_chooser_check_page): new
 	(cb_c_fmt_dialog_chooser_new_button): check checkboxes
 	(cb_c_fmt_dialog_chooser_buttons): handle font items
-	
+
 2011-07-07  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* dialog-cell-format-cond.c (c_fmt_dialog_set_sensitive): fix parse
diff --git a/src/dialogs/cell-format-cond-def.ui b/src/dialogs/cell-format-cond-def.ui
index 88e8120..a022db2 100644
--- a/src/dialogs/cell-format-cond-def.ui
+++ b/src/dialogs/cell-format-cond-def.ui
@@ -125,7 +125,6 @@
               <object class="GtkCheckButton" id="check-number">
                 <property name="label" translatable="yes">Number Format</property>
                 <property name="visible">True</property>
-                <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
@@ -140,7 +139,6 @@
               <object class="GtkCheckButton" id="check-align">
                 <property name="label" translatable="yes">Alignment</property>
                 <property name="visible">True</property>
-                <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
diff --git a/src/dialogs/dialog-cell-format-cond.c b/src/dialogs/dialog-cell-format-cond.c
index ce237de..d5dd1a4 100644
--- a/src/dialogs/dialog-cell-format-cond.c
+++ b/src/dialogs/dialog-cell-format-cond.c
@@ -266,11 +266,25 @@ cb_c_fmt_dialog_chooser_buttons (GtkWidget *btn, CFormatChooseState *state)
 			}
 			if (cb_c_fmt_dialog_chooser_check_page 
 			    (state, "check-number", FD_NUMBER)) {
-
+				gnm_style_merge_element (cond->overlay, state->style, 
+							 MSTYLE_FORMAT);
 			}
 			if (cb_c_fmt_dialog_chooser_check_page 
 			    (state, "check-align", FD_ALIGNMENT)) {
-
+				gnm_style_merge_element (cond->overlay, state->style, 
+							 MSTYLE_ALIGN_V);
+				gnm_style_merge_element (cond->overlay, state->style, 
+							 MSTYLE_ALIGN_H);
+				gnm_style_merge_element (cond->overlay, state->style, 
+							 MSTYLE_INDENT);
+				gnm_style_merge_element (cond->overlay, state->style, 
+							 MSTYLE_ROTATION);
+				gnm_style_merge_element (cond->overlay, state->style, 
+							 MSTYLE_TEXT_DIR);
+				gnm_style_merge_element (cond->overlay, state->style, 
+							 MSTYLE_WRAP_TEXT);
+				gnm_style_merge_element (cond->overlay, state->style, 
+							 MSTYLE_SHRINK_TO_FIT);
 			}
 			if (cb_c_fmt_dialog_chooser_check_page 
 			    (state, "check-font", FD_FONT)) {