[glom] Examples: Remove unused list_related_* layouts.



commit c65e1f476f7ca55d079323c7af61fea80b7c7c99
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Nov 19 21:48:06 2012 +0100

    Examples: Remove unused list_related_* layouts.
    
            * examples/example_film_manager.glom:
            * examples/example_smallbusiness.glom:
            * glom/mode_data/box_data_calendar_related.cc:
            * glom/mode_data/box_data_list_related.cc:
            * ldtp/database-templates/PostgresCentral/Test.glom:
            * ldtp/database-templates/SQLite/Test.glom: These were
    saved by very old versions of Glom and not automatically
    removed by newer versions.

 ChangeLog                                         |   13 +++++
 examples/example_film_manager.glom                |   30 -----------
 examples/example_smallbusiness.glom               |   54 ---------------------
 glom/mode_data/box_data_calendar_related.cc       |    4 +-
 glom/mode_data/box_data_list_related.cc           |    2 +-
 ldtp/database-templates/PostgresCentral/Test.glom |   54 ---------------------
 ldtp/database-templates/SQLite/Test.glom          |   54 ---------------------
 7 files changed, 17 insertions(+), 194 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 827de40..c7bf4c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2012-11-19  Murray Cumming  <murrayc murrayc com>
+
+        Examples: Remove unused list_related_* layouts.
+
+        * examples/example_film_manager.glom:
+        * examples/example_smallbusiness.glom:
+        * glom/mode_data/box_data_calendar_related.cc:
+        * glom/mode_data/box_data_list_related.cc:
+        * ldtp/database-templates/PostgresCentral/Test.glom:
+        * ldtp/database-templates/SQLite/Test.glom: These were
+	saved by very old versions of Glom and not automatically
+	removed by newer versions.
+
 1.23.1:
 
 2012-11-19  Murray Cumming  <murrayc murrayc com>
diff --git a/examples/example_film_manager.glom b/examples/example_film_manager.glom
index a25fdf9..1ab9898 100644
--- a/examples/example_film_manager.glom
+++ b/examples/example_film_manager.glom
@@ -4082,21 +4082,6 @@ Orientation=portrait
           </data_layout_group>
         </data_layout_groups>
       </data_layout>
-      <data_layout name="list_related_related_department_crew" parent_table="crew">
-        <data_layout_groups>
-          <data_layout_group name="main">
-            <data_layout_item name="description" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="contact_id" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="name_full" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-          </data_layout_group>
-        </data_layout_groups>
-      </data_layout>
       <data_layout name="list" parent_table="departments">
         <data_layout_groups>
           <data_layout_group name="main">
@@ -7100,21 +7085,6 @@ else:
           </data_layout_group>
         </data_layout_groups>
       </data_layout>
-      <data_layout name="list_related_related_scene_crew" parent_table="scene_crew">
-        <data_layout_groups>
-          <data_layout_group name="main">
-            <data_layout_item name="contact_id" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="name_full" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="comments" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-          </data_layout_group>
-        </data_layout_groups>
-      </data_layout>
     </data_layouts>
     <reports>
       <report name="locations_list" show_table_title="true">
diff --git a/examples/example_smallbusiness.glom b/examples/example_smallbusiness.glom
index 5c01ead..25cd9df 100644
--- a/examples/example_smallbusiness.glom
+++ b/examples/example_smallbusiness.glom
@@ -1840,60 +1840,6 @@ Orientation=portrait
           </data_layout_group>
         </data_layout_groups>
       </data_layout>
-      <data_layout name="list_related_related_invoice_lines" parent_table="invoices">
-        <data_layout_groups>
-          <data_layout_group name="main">
-            <data_layout_item name="product_id" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="product_name" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="product_price" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="count" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="total_price" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="vat_percentage" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="total_price_vat" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-          </data_layout_group>
-        </data_layout_groups>
-      </data_layout>
-      <data_layout name="list_related_related_invoice_lines" parent_table="invoice_lines">
-        <data_layout_groups>
-          <data_layout_group name="main">
-            <data_layout_item name="product_id" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="product_name" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="product_price" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="count" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="total_price" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="vat_percentage" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="total_price_vat" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-          </data_layout_group>
-        </data_layout_groups>
-      </data_layout>
     </data_layouts>
     <reports>
       <report name="by_customer" title="By Customer">
diff --git a/glom/mode_data/box_data_calendar_related.cc b/glom/mode_data/box_data_calendar_related.cc
index 278d2e8..5a171d2 100644
--- a/glom/mode_data/box_data_calendar_related.cc
+++ b/glom/mode_data/box_data_calendar_related.cc
@@ -54,7 +54,9 @@ Box_Data_Calendar_Related::Box_Data_Calendar_Related()
   //m_calendar.add_events(Gdk::BUTTON_PRESS_MASK); //Allow us to catch button_press_event and button_release_event
   m_calendar.signal_button_press_event().connect_notify( sigc::mem_fun(*this, &Box_Data_Calendar_Related::on_calendar_button_press_event) );
 
-  m_layout_name = "list_related_calendar"; //TODO: We need a unique name when 2 portals use the same table.
+  //We do not actually use this,
+  //so it is a bug if this appears in the .glom file:
+  m_layout_name = "NotUsedlist_related_calendar";
 }
 
 Box_Data_Calendar_Related::~Box_Data_Calendar_Related()
diff --git a/glom/mode_data/box_data_list_related.cc b/glom/mode_data/box_data_list_related.cc
index a18f72c..3c2771f 100644
--- a/glom/mode_data/box_data_list_related.cc
+++ b/glom/mode_data/box_data_list_related.cc
@@ -54,7 +54,7 @@ Box_Data_List_Related::Box_Data_List_Related()
 
   //We do not actually use this,
   //so it is a bug if this appears in the .glom file:
-  m_layout_name = "list_related";
+  m_layout_name = "NotUsedlist_related";
 }
 
 void Box_Data_List_Related::enable_buttons()
diff --git a/ldtp/database-templates/PostgresCentral/Test.glom b/ldtp/database-templates/PostgresCentral/Test.glom
index 41501ed..c64ff42 100644
--- a/ldtp/database-templates/PostgresCentral/Test.glom
+++ b/ldtp/database-templates/PostgresCentral/Test.glom
@@ -717,60 +717,6 @@ if __name__ == "__main__":
           </data_layout_group>
         </data_layout_groups>
       </data_layout>
-      <data_layout name="list_related_related_invoice_lines" parent_table="invoices">
-        <data_layout_groups>
-          <data_layout_group name="main">
-            <data_layout_item name="product_id" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="product_name" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="product_price" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="count" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="total_price" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="vat_percentage" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="total_price_vat" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-          </data_layout_group>
-        </data_layout_groups>
-      </data_layout>
-      <data_layout name="list_related_related_invoice_lines" parent_table="invoice_lines">
-        <data_layout_groups>
-          <data_layout_group name="main">
-            <data_layout_item name="product_id" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="product_name" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="product_price" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="count" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="total_price" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="vat_percentage" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="total_price_vat" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-          </data_layout_group>
-        </data_layout_groups>
-      </data_layout>
     </data_layouts>
     <reports>
       <report name="By Customer" title="By Customer">
diff --git a/ldtp/database-templates/SQLite/Test.glom b/ldtp/database-templates/SQLite/Test.glom
index 285e953..a28f568 100644
--- a/ldtp/database-templates/SQLite/Test.glom
+++ b/ldtp/database-templates/SQLite/Test.glom
@@ -717,60 +717,6 @@ if __name__ == "__main__":
           </data_layout_group>
         </data_layout_groups>
       </data_layout>
-      <data_layout name="list_related_related_invoice_lines" parent_table="invoices">
-        <data_layout_groups>
-          <data_layout_group name="main">
-            <data_layout_item name="product_id" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="product_name" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="product_price" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="count" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="total_price" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="vat_percentage" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="total_price_vat" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-          </data_layout_group>
-        </data_layout_groups>
-      </data_layout>
-      <data_layout name="list_related_related_invoice_lines" parent_table="invoice_lines">
-        <data_layout_groups>
-          <data_layout_group name="main">
-            <data_layout_item name="product_id" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="product_name" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="product_price" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="count" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="total_price" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="vat_percentage" editable="true" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-            <data_layout_item name="total_price_vat" use_default_formatting="true">
-              <formatting/>
-            </data_layout_item>
-          </data_layout_group>
-        </data_layout_groups>
-      </data_layout>
     </data_layouts>
     <reports>
       <report name="By Customer" title="By Customer">



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]