glom r1239 - in trunk: . glom/layout_item_dialogs glom/libglom/data_structure/layout glom/libglom/document glom/mode_design/print_layouts glom/utility_widgets glom/utility_widgets/canvas

[murrayc svn gnome org]

Author: murrayc
Date: 2007-10-25 12:34:35 +0100 (Thu, 25 Oct 2007)
New Revision: 1239
ViewCVS link: http://svn.gnome.org/viewcvs/glom?rev=1239&view=rev

Modified:
   trunk/ChangeLog
   trunk/glom/layout_item_dialogs/box_formatting.cc
   trunk/glom/layout_item_dialogs/box_formatting.h
   trunk/glom/libglom/data_structure/layout/fieldformatting.h
   trunk/glom/libglom/data_structure/layout/layoutitem_text.cc
   trunk/glom/libglom/data_structure/layout/layoutitem_text.h
   trunk/glom/libglom/document/document_glom.cc
   trunk/glom/libglom/document/document_glom.h
   trunk/glom/mode_design/print_layouts/canvas_layout_item.cc
   trunk/glom/mode_design/print_layouts/canvas_layout_item.h
   trunk/glom/mode_design/print_layouts/canvas_print_layout.cc
   trunk/glom/utility_widgets/canvas/canvas_text_movable.cc
   trunk/glom/utility_widgets/datawidget.cc
   trunk/glom/utility_widgets/flowtablewithfields.cc
   trunk/glom/utility_widgets/layoutwidgetbase.cc
   trunk/glom/utility_widgets/layoutwidgetbase.h
Log:
2007-10-25  Murray Cumming  <murrayc murrayc com>

* glom/libglom/data_structure/layout/layoutitem_text.cc:
* glom/libglom/data_structure/layout/layoutitem_text.h: 
Added m_formatting and get_formatting_used() here, as in 
LayoutItem_Field. They should probably share a base class if 
this gets silly.
* glom/libglom/document/document_glom.cc:
* glom/libglom/document/document_glom.h: load and save the 
formatting for text items as well as just fields.
* glom/layout_item_dialogs/box_formatting.cc:
* glom/layout_item_dialogs/box_formatting.h: Added default 
arguments for set_formatting() parameters, so we can ignore 
stuff that is only relevant to fields.
* glom/mode_design/print_layouts/canvas_layout_item.cc:
* glom/mode_design/print_layouts/canvas_layout_item.h: 
set_layout_item(): Use set_text() rather than property_text(), 
so that the markup is constructed. Use markup for text items as well 
as fields. 
* glom/mode_design/print_layouts/canvas_print_layout.cc:
on_context_menu(): Show formatting options for text items as well as 
fields.
* glom/utility_widgets/layoutwidgetbase.cc: 
* glom/utility_widgets/layoutwidgetbase.h: Added the 
apply_formatting(widget, formatting) convenience method.
* glom/utility_widgets/datawidget.cc: Constructor: Use the 
apply_formatting() convenience method.
* glom/utility_widgets/flowtablewithfields.cc: add_textobject():
Use formatting for text items.