[gnumeric] Fix custom autofilter dialog. [#678259]

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

commit c8e0660effccc2917a1cbb1fb08a4ff39ae2df96
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Sun Jun 17 14:10:02 2012 -0600

    Fix custom autofilter dialog. [#678259]
    
    2012-06-17  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* autofilter-expression.ui: add missing label fields

 NEWS                                 |    2 +-
 src/dialogs/ChangeLog                |    4 ++
 src/dialogs/autofilter-expression.ui |   67 ++++++++++++++++++----------------
 3 files changed, 40 insertions(+), 33 deletions(-)
---
diff --git a/NEWS b/NEWS
index 54eee65..373a48b 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@ Andreas:
 	* Fix custom colour combos for conditional format selection. [#677967]
 	* Fix cell-clearing/autofilter interaction. [#674814]
 	* Fix autofilter handling of column deletion undo. [#625702]
-	* Fix top-10 autofilter dialog. [#678258]
+	* Fix top-10 and custom autofilter dialogs. [#678258][#678259]
 
 Jean:
 	* Fix graph series headers when a multiple selection is used. [#675913]
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index df715b0..7a1c6bc 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,5 +1,9 @@
 2012-06-17  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* autofilter-expression.ui: add missing label fields
+
+2012-06-17  Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* autofilter-top10.ui: fix radio button grouping
 
 2012-06-13  Andreas J. Guelzow <aguelzow pyrshep ca>
diff --git a/src/dialogs/autofilter-expression.ui b/src/dialogs/autofilter-expression.ui
index 324f05e..26fd02b 100644
--- a/src/dialogs/autofilter-expression.ui
+++ b/src/dialogs/autofilter-expression.ui
@@ -102,6 +102,21 @@
               </packing>
             </child>
             <child>
+              <object class="GtkLabel" id="col-label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="xpad">5</property>
+                <property name="ypad">5</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
               <object class="GtkComboBox" id="op0">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -115,13 +130,28 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">0</property>
+                <property name="left_attach">1</property>
                 <property name="top_attach">1</property>
                 <property name="width">1</property>
                 <property name="height">1</property>
               </packing>
             </child>
             <child>
+              <object class="GtkLabel" id="col-label2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="xpad">5</property>
+                <property name="ypad">5</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">3</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
               <object class="GtkComboBox" id="op1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -135,7 +165,7 @@
                 </child>
               </object>
               <packing>
-                <property name="left_attach">0</property>
+                <property name="left_attach">1</property>
                 <property name="top_attach">3</property>
                 <property name="width">1</property>
                 <property name="height">1</property>
@@ -166,28 +196,7 @@
                     <property name="height">1</property>
                   </packing>
                 </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
+                 <child>
                   <object class="GtkRadioButton" id="or_button">
                     <property name="label" translatable="yes">_Or</property>
                     <property name="use_action_appearance">False</property>
@@ -216,12 +225,6 @@
               </packing>
             </child>
             <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
               <object class="GtkEntry" id="value0">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -229,7 +232,7 @@
                 <property name="invisible_char_set">True</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
+                <property name="left_attach">2</property>
                 <property name="top_attach">1</property>
                 <property name="width">1</property>
                 <property name="height">1</property>
@@ -243,7 +246,7 @@
                 <property name="invisible_char_set">True</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
+                <property name="left_attach">2</property>
                 <property name="top_attach">3</property>
                 <property name="width">1</property>
                 <property name="height">1</property>