gnumeric r16803 - trunk/src/dialogs

[guelzow svn gnome org]

Author: guelzow
Date: Wed Sep 17 08:33:15 2008
New Revision: 16803
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16803&view=rev

Log:
2008-09-17  Andreas J. Guelzow <aguelzow pyrshep ca>

	* histogram.glade: move widgets so that opening the 2nd page does not
	  cause automatic switch to predetermined cutoffs
	* dialog-analysis-tools.c (dialog_histogram_tool): require keyboard input to
	  switch to calculated cutoffs




Modified:
   trunk/src/dialogs/ChangeLog
   trunk/src/dialogs/dialog-analysis-tools.c
   trunk/src/dialogs/histogram.glade

Modified: trunk/src/dialogs/dialog-analysis-tools.c
==============================================================================
--- trunk/src/dialogs/dialog-analysis-tools.c	(original)
+++ trunk/src/dialogs/dialog-analysis-tools.c	Wed Sep 17 08:33:15 2008
@@ -2664,13 +2664,13 @@
 		"changed",
 		G_CALLBACK (histogram_tool_update_sensitivity_cb), state);
 	g_signal_connect (G_OBJECT (state->n_entry),
-		"focus-in-event",
+		"key-press-event",
 		G_CALLBACK (histogram_tool_set_calculated), state);
 	g_signal_connect (G_OBJECT (state->min_entry),
-		"focus-in-event",
+		"key-press-event",
 		G_CALLBACK (histogram_tool_set_calculated), state);
 	g_signal_connect (G_OBJECT (state->max_entry),
-		"focus-in-event",
+		"key-press-event",
 		G_CALLBACK (histogram_tool_set_calculated), state);
 	g_signal_connect (G_OBJECT
 			  (gnm_expr_entry_get_entry (

Modified: trunk/src/dialogs/histogram.glade
==============================================================================
--- trunk/src/dialogs/histogram.glade	(original)
+++ trunk/src/dialogs/histogram.glade	Wed Sep 17 08:33:15 2008
@@ -145,62 +145,6 @@
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
                 <child>
-                  <widget class="GtkTable" id="bin_table">
-                    <property name="visible">True</property>
-                    <property name="n_rows">3</property>
-                    <property name="n_columns">2</property>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <widget class="GtkRadioButton" id="pre_determined_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">_Predetermined cutoffs</property>
-                        <property name="use_underline">True</property>
-                        <property name="response_id">0</property>
-                        <property name="draw_indicator">True</property>
-                      </widget>
-                      <packing>
-                        <property name="right_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="var2-label">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="xpad">5</property>
-                        <property name="label" translatable="yes">Cutoff _range:</property>
-                        <property name="use_underline">True</property>
-                        <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                      </widget>
-                      <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                  </widget>
-                </child>
-                <child>
-                  <widget class="GtkHSeparator" id="hseparator2">
-                    <property name="visible">True</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
                   <widget class="GtkTable" id="table2">
                     <property name="visible">True</property>
                     <property name="n_rows">4</property>
@@ -305,6 +249,7 @@
                         <property name="label" translatable="yes">_Calculated cutoffs</property>
                         <property name="use_underline">True</property>
                         <property name="response_id">0</property>
+                        <property name="active">True</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">pre_determined_button</property>
                       </widget>
@@ -316,6 +261,66 @@
                   </widget>
                   <packing>
                     <property name="padding">5</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHSeparator" id="hseparator2">
+                    <property name="visible">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkTable" id="bin_table">
+                    <property name="visible">True</property>
+                    <property name="n_rows">3</property>
+                    <property name="n_columns">2</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <widget class="GtkRadioButton" id="pre_determined_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="has_focus">True</property>
+                        <property name="label" translatable="yes">_Predetermined cutoffs</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                      <packing>
+                        <property name="right_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="var2-label">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="xpad">5</property>
+                        <property name="label" translatable="yes">Cutoff _range:</property>
+                        <property name="use_underline">True</property>
+                        <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                      </widget>
+                      <packing>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="padding">5</property>
                     <property name="position">2</property>
                   </packing>
                 </child>