[gnumeric] Temporarily remember the sort setups. [#100541]

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

commit 53cf96bad06c40df19e3f16bd4444d31cb8f53e5
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Sat Nov 14 15:08:40 2009 -0700

    Temporarily remember the sort setups. [#100541]
    
    2009-11-14  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* dialog-cell-sort.c (cb_update_sensitivity): rename to
    	cb_update_to_new_range and change all callers
    	(dialog_cell_sort_load_sort_setup): implement
    	(dialog_load_selection): move another line of code from
    	  dialog_init to here

 NEWS                           |    1 +
 src/dialogs/ChangeLog          |    8 ++++
 src/dialogs/dialog-cell-sort.c |   75 +++++++++++++++++++++++++++++-----------
 3 files changed, 64 insertions(+), 20 deletions(-)
---
diff --git a/NEWS b/NEWS
index bf96c3e..f083a34 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Andreas:
 	* Clarify distinction between Document and View Properties.
 	* Sort the translated labels in the preference dialog.
 	* Turn view properties dialog into instant-apply dialog.
+	* Temporarily remember the sort setups. [#100541]
 
 Jean:
 	* Fix cursor and cell edition on dark backgrounds. [#600656]
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index 740bbab..7d1bf82 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,5 +1,13 @@
 2009-11-14  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* dialog-cell-sort.c (cb_update_sensitivity): rename to
+	cb_update_to_new_range and change all callers
+	(dialog_cell_sort_load_sort_setup): implement
+	(dialog_load_selection): move another line of code from
+	  dialog_init to here
+
+2009-11-14  Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* dialog-cell-sort.c (set_ok_button_sensitivity): check whether 
 	  state->sel is NULL
 	(cb_dialog_ok_clicked): store a copy of the setup.
diff --git a/src/dialogs/dialog-cell-sort.c b/src/dialogs/dialog-cell-sort.c
index 7de64d7..09662ff 100644
--- a/src/dialogs/dialog-cell-sort.c
+++ b/src/dialogs/dialog-cell-sort.c
@@ -411,7 +411,7 @@ cb_sort_header_check(SortFlowState *state)
 }
 
 static void
-cb_update_sensitivity (SortFlowState *state)
+cb_update_to_new_range (SortFlowState *state)
 {
         GnmValue *range;
 
@@ -483,7 +483,7 @@ cb_dialog_ok_clicked (SortFlowState *state)
 				    -1);
 		item++;
 		this_array_item->offset = number - base;
-		this_array_item->asc = descending ? TRUE : FALSE;
+		this_array_item->asc = !!descending;
 		this_array_item->cs = case_sensitive;
 		this_array_item->val = sort_by_value;
 		this_array_item++;
@@ -529,22 +529,57 @@ cb_dialog_cancel_clicked (G_GNUC_UNUSED GtkWidget *button,
 static void
 dialog_cell_sort_load_sort_setup (SortFlowState *state, GnmSortData const *data)
 {
-/* 	int i; */
-/* 	GnmSortClause *this = data->clauses; */
-
-/* 	g_print ("Found a matching sort setup!\n"); */
-/* 	go_locale_sel_set_locale (state->locale_selector, data->locale); */
-/* 	gtk_toggle_button_set_active ( */
-/* 		GTK_TOGGLE_BUTTON (state->retain_format_check), data->retain_formats); */
-
-/* 	for (i = 0; i < data->num_clause; i++) { */
-		
-
-
+	int i;
+	GnmSortClause *this = data->clauses;
+	gint base, max, index;
+	Sheet *sheet = state->sel->v_range.cell.a.sheet;
 
+	if (sheet == NULL)
+		sheet = state->sheet;
+	
+	go_locale_sel_set_locale (state->locale_selector, data->locale);
+	
+	gtk_toggle_button_set_active (
+		GTK_TOGGLE_BUTTON (state->retain_format_check), data->retain_formats);
+	
+	gtk_toggle_button_set_active (
+		GTK_TOGGLE_BUTTON (state->cell_sort_row_rb), !data->top);
+	state->is_cols = data->top;
 
-/* 		this++; */
-/* 	} */
+	index = (data->top ? state->sel->v_range.cell.a.row : state->sel->v_range.cell.a.col);
+	base = (data->top ? state->sel->v_range.cell.a.col : state->sel->v_range.cell.a.row);
+	max = (data->top ? state->sel->v_range.cell.b.col : state->sel->v_range.cell.b.row);
+	gtk_list_store_clear (state->model);
+	state->sort_items = 0;
+	for (i = 0; i < data->num_clause; i++) {		
+		if (data->clauses[i].offset <= max ) {
+			GtkTreeIter iter;
+			gchar *str, *header;
+			int id = data->clauses[i].offset + base;
+
+			header = state->is_cols
+				? header_name (sheet, id, index)
+				: header_name (sheet, index, id);
+			str = col_row_name (sheet, id, id, FALSE, state->is_cols);
+
+			gtk_list_store_append (state->model, &iter);
+			gtk_list_store_set (state->model, &iter,
+					    ITEM_HEADER,  header,
+					    ITEM_NAME,  str,
+					    ITEM_DESCENDING, data->clauses[i].asc,
+					    ITEM_DESCENDING_IMAGE, 
+					    !data->clauses[i].asc
+					    ? state->image_ascending
+					    : state->image_descending,
+					    ITEM_CASE_SENSITIVE, data->clauses[i].cs,
+					    ITEM_SORT_BY_VALUE, data->clauses[i].val,
+					    ITEM_MOVE_FORMAT, TRUE,
+					    ITEM_NUMBER, id,
+					    -1);
+			state->sort_items++;
+		}
+		this++;
+	}
 }
 
 static GnmRange const *
@@ -575,6 +610,8 @@ dialog_load_selection (SortFlowState *state, gboolean *col_rb)
 					  gnm_expr_entry_get_text (state->range_entry));
 	if (data != NULL)
 		dialog_cell_sort_load_sort_setup (state, data);
+	else
+		cb_update_to_new_range (state);
 	
 	return first;
 }
@@ -939,7 +976,7 @@ dialog_init (SortFlowState *state)
 	gtk_widget_show (GTK_WIDGET (state->range_entry));
 	g_signal_connect_swapped (G_OBJECT (state->range_entry),
 				  "changed",
-				  G_CALLBACK (cb_update_sensitivity), state);
+				  G_CALLBACK (cb_update_to_new_range), state);
 
 	state->locale_selector = GO_LOCALE_SEL (go_locale_sel_new ());
 	gtk_widget_show_all (GTK_WIDGET (state->locale_selector));
@@ -1038,7 +1075,7 @@ dialog_init (SortFlowState *state)
 	state->cell_sort_col_rb = glade_xml_get_widget (state->gui, "cell_sort_col_rb");
 	g_signal_connect_swapped (G_OBJECT (state->cell_sort_row_rb),
 				  "toggled",
-				  G_CALLBACK (cb_update_sensitivity), state);
+				  G_CALLBACK (cb_update_to_new_range), state);
 
 	state->cell_sort_header_check = glade_xml_get_widget (state->gui,
 							      "cell_sort_header_check");
@@ -1108,8 +1145,6 @@ dialog_init (SortFlowState *state)
 
 	range = dialog_load_selection (state, &col_rb);
 
-	cb_update_sensitivity (state);
-
 	gnm_expr_entry_grab_focus(GNM_EXPR_ENTRY (state->add_entry), TRUE);
 }