[glom] Related Choices: Allow the user to specify a sort order.

[Murray Cumming <murrayc src gnome org>]

commit adab12f9d3ee8e228ce31e54396702a9fc148146
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Dec 29 12:09:46 2011 +0100

    Related Choices: Allow the user to specify a sort order.
    
      * glom/libglom/data_structure/layout/fieldformatting.[h|cc]:
      set/get_choices_related(): Added a sort_fields parameter.
      * glom/libglom/document/document.[h|cc]: fill_layout_field_details(),
      load_after_layout_item_formatting(), save_before_layout_item_formatting():
      Load and save the sort fields for related choices.
      * glom/libglom/utils.cc: get_choice_values(): Use the sort fields.
      Added get_list_of_sort_fields_for_display().
    
      * glom/mode_data/datawidget/cellcreation.cc:
      * glom/mode_data/datawidget/combo_as_radio_buttons.cc:
      * glom/mode_data/datawidget/combochoiceswithtreemodel.cc: Adapted.
    
      * Makefile.am, Makefile_glom.am:
      * glom/mode_design/layout/layout_item_dialogs/dialog_groupby_sortfields.[h|cc]:
      Rename to:
      glom/mode_design/layout/layout_item_dialogs/dialog_sortfields.[h|cc]:
      and rename the class to Dialog_SortFields.
    * ui/developer/dialog_groupby_sort_fields.glade: Rename to
    * ui/developer/dialog_sort_fields.glade
    
    * ui/developer/box_formatting.glade:
      * glom/mode_design/layout/layout_item_dialogs/box_formatting.cc: Add UI to
      specify the related choices sort order, using the new dialog, much like
      the existing extra-fields UI.

 ChangeLog                                          |   29 ++++++++++++++++++++
 .../data_structure/layout/fieldformatting.cc       |    3 ++
 2 files changed, 32 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f9b8d80..0764226 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,34 @@
 2011-12-29  Murray Cumming  <murrayc murrayc com>
 
+	Related Choices: Allow the user to specify a sort order.
+
+  * glom/libglom/data_structure/layout/fieldformatting.[h|cc]:
+  set/get_choices_related(): Added a sort_fields parameter.
+  * glom/libglom/document/document.[h|cc]: fill_layout_field_details(),
+  load_after_layout_item_formatting(), save_before_layout_item_formatting():
+  Load and save the sort fields for related choices.
+  * glom/libglom/utils.cc: get_choice_values(): Use the sort fields.
+  Added get_list_of_sort_fields_for_display().
+  
+  * glom/mode_data/datawidget/cellcreation.cc:
+  * glom/mode_data/datawidget/combo_as_radio_buttons.cc:
+  * glom/mode_data/datawidget/combochoiceswithtreemodel.cc: Adapted.
+  
+  * Makefile.am, Makefile_glom.am:
+  * glom/mode_design/layout/layout_item_dialogs/dialog_groupby_sortfields.[h|cc]:
+  Rename to:
+  glom/mode_design/layout/layout_item_dialogs/dialog_sortfields.[h|cc]:
+  and rename the class to Dialog_SortFields.
+	* ui/developer/dialog_groupby_sort_fields.glade: Rename to 
+	* ui/developer/dialog_sort_fields.glade
+	
+	* ui/developer/box_formatting.glade:
+  * glom/mode_design/layout/layout_item_dialogs/box_formatting.cc: Add UI to
+  specify the related choices sort order, using the new dialog, much like 
+  the existing extra-fields UI.
+	
+2011-12-29  Murray Cumming  <murrayc murrayc com>
+
 	Foreign key ID fields: Add a New Button next to the existing Find button.
 
 	* glom/mode_data/datawidget/dialog_new_record.[h|cc]: A new dialog to 
diff --git a/glom/libglom/data_structure/layout/fieldformatting.cc b/glom/libglom/data_structure/layout/fieldformatting.cc
index 72b310f..a6a61b7 100644
--- a/glom/libglom/data_structure/layout/fieldformatting.cc
+++ b/glom/libglom/data_structure/layout/fieldformatting.cc
@@ -57,6 +57,7 @@ FieldFormatting::FieldFormatting(const FieldFormatting& src)
   m_horizontal_alignment(src.m_horizontal_alignment),
   m_choices_related_field(src.m_choices_related_field),
   m_choices_extra_layout_group(src.m_choices_extra_layout_group),
+  m_choices_related_sort_fields(src.m_choices_related_sort_fields),
   m_choices_related_show_all(src.m_choices_related_show_all)
 {
 }
@@ -76,6 +77,7 @@ bool FieldFormatting::operator==(const FieldFormatting& src) const
     (m_choices_related == src.m_choices_related) &&
     (m_choices_related_field == src.m_choices_related_field) &&
     (m_choices_extra_layout_group == src.m_choices_extra_layout_group) &&
+    (m_choices_related_sort_fields == src.m_choices_related_sort_fields) &&
     (m_text_format_multiline == src.m_text_format_multiline) &&
     (m_text_multiline_height_lines == src.m_text_multiline_height_lines) &&
     (m_text_font == src.m_text_font) &&
@@ -99,6 +101,7 @@ FieldFormatting& FieldFormatting::operator=(const FieldFormatting& src)
   m_choices_related = src.m_choices_related;
   m_choices_related_field = src.m_choices_related_field;
   m_choices_extra_layout_group = src.m_choices_extra_layout_group;
+  m_choices_related_sort_fields = src.m_choices_related_sort_fields;
   m_choices_related_show_all = src.m_choices_related_show_all;
 
   m_text_format_multiline = src.m_text_format_multiline;