Merge lp:~gaspa/a4/presentation-objects into lp:a4

[Andrea Gasparini]

Refactoring code for a better and simpler use of object in the editor.

it should add some base objects and a test object (PolaroidObject).

[Andrea Colangelo (warp10)]

List of bugs:
1- all rectangles are always drawn from the presentation upper edge.
2- all rectangles have a lower border way bigger than other ones
3- very small rectangles are badly drawn
4- rectangles have weird starting points (I mean: there is a weird correlation between the point you begin to draw and the place the rectangle is actually drawn)
5- when a selection is drawn downside up, the rectangle is drawn outside of the presentation, starting from the upper edge. Further, the black part of the rectangle is bigger than the white part

[lp:~gaspa/a4/presentation-objects]

91. By Andrea Gasparini on 2010-11-26

added test svg for "polaroid" object

92. By Andrea Gasparini on 2010-11-26

refactoring of objects and editor modes

93. By Andrea Gasparini on 2010-11-28

started on menus

94. By Andrea Gasparini on 2010-12-01

merged from trunk a couple of fixes

95. By Andrea Gasparini on 2010-12-02

select button,working on getting the right position of shapes

96. By Andrea Gasparini on 2010-12-06

drawing rectangles in right position,even when region is rotated (but still no rotated rect)

97. By Andrea Gasparini on 2010-12-10

rotated shapes work(!!)

98. By Andrea Gasparini on 2010-12-11

little cleaning

99. By Andrea Gasparini on 2010-12-11

reenable button for "polaroid" object

100. By Andrea Gasparini on 2010-12-12

polaroid objects working

101. By Andrea Gasparini on 2010-12-12

polaroid object has now proportional border

102. By Andrea Gasparini on 2010-12-12

text in polaroid start working

103. By Andrea Gasparini on 2010-12-12

undo saved test image

104. By Andrea Gasparini on 2010-12-12

added images, near to work

105. By Andrea Gasparini on 2010-12-13

image objects work

106. By Andrea Gasparini on 2010-12-22

little cleaning

[Andrea Gasparini (gaspa)]

now bugs should be fixed.

Re-writing down what this branch aims to do: implement a (still stub) system to handle graphics objects, both simple as rects/circles and more complex as the image or "polaroid" object.

What comes toghether with these changes:
 * a method in region.py that helps calculate point coordinates between screen coords and svg coords.
 * I added a sample of the polaroid object, perhaps we could keep them in that directory (I'd like to have more 'complex objects' than simple ones, that can be drawn simply by a normal svg editor)
 * there is a couple of unused button in the editor toolbar (things like 'frames','notes') that could be drop... perhaps :p

If someone can do a little test if everything seems to work, I'd merge this to trunk in the next days.

=== modified file 'a4lib/app.py'
--- a4lib/app.py	2010-12-01 23:24:34 +0000
+++ a4lib/app.py	2010-12-22 22:58:09 +0000
@@ -66,10 +66,10 @@
             # Try to open a file.
             if is_edited:
                 self.player = Editor(file_name, self.drawing_area,
-                                 self.builder.get_object('iconview1'),force_loading)
+                        self.builder.get_object('iconview1'), force_loading)
             else:
                 self.player = GtkCairoPlayer(file_name, self.drawing_area,
-                                force_loading)
+                        force_loading)
         except PresentationError as error:
             # The file doesn't exist, or is not an SVG file. Show an error
             # dialog and don't do anything else.
@@ -241,11 +241,34 @@
                 widget.set_active(False)
                 self.builder.get_object('drawing_toolbar').set_visible(False)
 
+    def _ask_image_dialog(self):
+        dialog = gtk.FileChooserDialog(
+            None, None, gtk.FILE_CHOOSER_ACTION_OPEN, (
+                gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
+                gtk.STOCK_SAVE, gtk.RESPONSE_OK))
+        dialog.set_default_response(gtk.RESPONSE_OK)
+        # If an another file has been opened, use its location as starting
+        # folder for the dialog.
+        if self.last_path is not None:
+            dialog.set_current_folder(path)
+
+        # Show the dialog, back up the relevant properties and destroy it.
+        response = dialog.run()
+        file_name = dialog.get_filename()
+        dialog.destroy()
+        # Save in the specified location
+        if response == gtk.RESPONSE_OK and self.player:
+            return file_name
+        return ""
+
     def on_toggle_tool(self, widget):
         if not isinstance(self.player, Editor):
             return
-        toggle_modes = {'PathToolbutton': 'path',
+        toggle_modes = {'SelectToolbutton': 'select',
+                        'PathToolbutton': 'path',
                         'ShapesToolbutton': 'rect',
+                        'ImageToolbutton': 'image',
+                        'PolaroidToolbutton': 'polaroid',
                         'TextToolbutton': 'text'}
 
         widget_name = gtk.Buildable.get_name(widget)
@@ -257,7 +280,14 @@
                     obj = self.builder.get_object(i)
                     if obj.get_active():
                         obj.set_active(False)
-            self.player.set_editor_mode(toggle_modes[widget_name])
+            object_name = toggle_modes[widget_name]
+            if object_name in ['path', 'select']:
+                self.player.set_editor_mode(object_name)
+            else:
+                self.player.set_editor_mode('objects')
+            self.player.set_next_new_object(toggle_modes[widget_name])
+            if toggle_modes[widget_name] == 'image':
+                self.player.set_target_image(self._ask_image_dialog())
         if not any(self.builder.get_object(i).get_active() for i in toggle_modes.keys()):
             self.player.set_editor_mode()
         self.drawing_area.queue_draw()

=== modified file 'a4lib/editor.py'
--- a4lib/editor.py	2010-12-01 23:24:34 +0000
+++ a4lib/editor.py	2010-12-22 22:58:09 +0000
@@ -9,6 +9,14 @@
 from a4lib.player import GtkCairoPlayer
 from a4lib.region import Region
 
+from presentation_objects import RectObject, TextObject, PolaroidObject, ImageObject
+
+
+def object_class_from_name(name):
+    obj_dict = {'rect': RectObject, 'text': TextObject,
+                'image': ImageObject, 'polaroid': PolaroidObject}
+    return obj_dict[name]
+
 
 class Editor(GtkCairoPlayer):
 
@@ -25,15 +33,18 @@
         self.treeview.set_item_width(120)
         self.treeview.set_size_request(130, -1)
 
-        ## used to keep status of each tool.
+        ## used to keep status of mouse actions:
+        ## value currently used: [None,'start','moving']
         self.action_status = None
         ## tells if we should draw the rect of the path.
         self.show_path = None
         ## tell the tool we're using and how we should behave.
-        self.editor_modes = ['select', 'path', 'rect', 'text']
+        self.editor_modes = ['select', 'path', 'objects']
         self.editor_mode = 'select'
+        self.new_object_name = None
         ## the selected object id:
         self.current_object = None
+        self.target_filename = None
 
         for i in xrange(0, len(self.presentation.path)):
             region = self.presentation.get_path_region(i)
@@ -42,64 +53,72 @@
     def set_show_path(self, flag=True):
         self.show_path = flag
 
+    # objects mode: rect/polaroid
+    def set_next_new_object(self, obj_name):
+        self.new_object_name = obj_name
+
+    # select/objects
     def set_editor_mode(self, status='select'):
         if status in self.editor_modes:
             self.editor_mode = status
 
+    def set_target_image(self, file_name):
+        self.target_filename = file_name
+
     def on_area_button_press_event(self, widget, event):
+        event_point = (event.x, event.y)
+        winsize = self.area.window.get_size()
+        cr = self.current_region
+        point = cr.get_point_from_window_coordinates(winsize, event_point)
+
+        self.selection_start_position = (event.x, event.y)
+        self.action_status = 'start'
         if self.editor_mode == 'select':
             pass  # presentation.select(something)
-        elif self.editor_mode == 'rect':
-            props = {'x': event.x, 'y': event.y}
-            myid = self.presentation.draw_rect(0, 0, props)
-            self.current_object = myid
-            self.action_status = "selection"
-            self.selection_start_position = (event.x, event.y)
-        elif self.editor_mode == 'text':
-            props = {'x': event.x, 'y': event.y}
-            myid = self.presentation.draw_text("", props)
-            self.current_object = myid
-            self.action_status = "selection"
-            self.selection_start_position = (event.x, event.y)
-        elif self.editor_mode == 'path' and event.state & gtk.gdk.CONTROL_MASK:
-                self.action_status = "selection"
-                self.selection_start_position = (event.x, event.y)
+        elif self.editor_mode == 'objects':
+            cls = object_class_from_name(self.new_object_name)
+            self.current_object = cls(x=point[0], y=point[1],
+                                      rotate=self.current_region.rotate)
+            if self.new_object_name == 'image':
+                self.current_object.set_image(self.target_filename)
+            self.presentation.add_object(self.current_object)
         else:
             GtkCairoPlayer.on_area_button_press_event(self, widget, event)
 
     def on_area_button_release_event(self, widget, event):
         GtkCairoPlayer.on_area_button_release_event(self, widget, event)
-        if self.editor_mode == 'path' and self.action_status is not None:
+        if self.editor_mode == 'path' and event.state & gtk.gdk.CONTROL_MASK:
             rect = (self.selection_start_position, self.mouse_position)
             self.add_treeview_icon(rect)
-        if self.editor_mode == 'rect' and self.action_status is not None:
-            self.current_object = None
-        if self.editor_mode != 'text':
-            self.action_status = None
+        elif self.editor_mode == 'objects':
+            pass
+        self.action_status = None
 
     def on_area_motion_notify_event(self, widget, event):
         if self.action_status is None:
             GtkCairoPlayer.on_area_motion_notify_event(self, widget, event)
-        elif self.editor_mode == 'path':
-            self.mouse_position = (event.x, event.y)
-            self.area.queue_draw()
-        elif self.editor_mode == 'rect' and self.action_status is not None:
-            if self.current_object:
-                ## x/y is ignored
-                props = {'id': self.current_object}
-                w = event.x - self.selection_start_position[0]
-                h = event.y - self.selection_start_position[1]
-                myid = self.presentation.draw_rect(w, h, props)
-            self.mouse_position = (event.x, event.y)
-            self.area.queue_draw()
+        else:
+            if self.editor_mode == 'path':
+                if event.state & gtk.gdk.CONTROL_MASK:
+                    self.mouse_position = (event.x, event.y)
+                    self.area.queue_draw()
+            elif self.editor_mode == 'objects' and self.action_status:
+                if self.current_object:
+                    winsize = self.area.window.get_size()
+                    cr = self.current_region
+                    scale = self.current_region.get_window_scale_factor(winsize)
+                    w = (event.x - self.selection_start_position[0]) / scale
+                    h = (event.y - self.selection_start_position[1]) / scale
+                    self.current_object.set_size(w, h)
+                self.mouse_position = (event.x, event.y)
+                self.area.queue_draw()
+            self.action_status = 'moving'
 
     def on_area_key_press(self, widget, event):
-        if self.editor_mode == 'text' and self.action_status:
+        if self.current_object:
             if True:  # premo tutto tranne esc:
-                props = {'id': self.current_object}
                 key = gtk.gdk.keyval_name(event.keyval)
-                text = self.presentation.get_text(self.current_object) + key
-                self.presentation.draw_text(text, props)
+                self.current_object.character_pressed(key)
                 self.area.queue_draw()
             elif False:  # premo esc
                 self.action_status = None
@@ -109,14 +128,10 @@
         context.save()
         if not region:
             context.set_matrix(cairo.Matrix(1, 0, 0, 1, 0, 0))
-            #a = context.set_matrix( 1,0,0,1,0,0 )
-            #matrix = array([[a[0], a[2], a[4]], [a[1], a[3], a[5]], [0, 0, 1]])
             x0 = self.selection_start_position[0]
             y0 = self.selection_start_position[1]
             x1 = self.mouse_position[0]
             y1 = self.mouse_position[1]
-            #x0, y0, nulla = dot(inv(matrix), [x0, y0, 1])
-            #x1, y1, nulla = dot(inv(matrix), [x1, y1, 1])
         else:
             context.translate(region.xc, region.yc)
             context.rotate(region.rotate)
@@ -149,9 +164,8 @@
             for i in xrange(0, len(self.presentation.path)):
                 region = self.presentation.get_path_region(i)
                 self.draw_selection_box(context, region)
-            if self.editor_mode == 'path' and self.action_status == "selection":
+            if self.editor_mode == 'path' and self.action_status:
                 self.draw_selection_box(context)
-        #self.rotate_icon.render(context, self.area.window.get_size() )
 
     def add_treeview_icon(self, rect=None):
         ## * trasforma rect in Regione
@@ -174,10 +188,6 @@
                     (rect2[1][0] - rect2[0][0]),
                     (rect2[1][1] - rect2[0][1]),
                     self.current_region.rotate)
-        #print "Finestra", self.area.window.get_size()
-        #print "Current", self.current_region
-        #print "Aggiungo", region
-        #print
         ## * metti la regione in lista
         self.presentation.path.append(region)
         ## * usa la regione per la pixbuf.

=== modified file 'a4lib/presentation.py'
--- a4lib/presentation.py	2010-12-01 23:24:34 +0000
+++ a4lib/presentation.py	2010-12-22 22:58:09 +0000
@@ -20,6 +20,7 @@
 a4nsmap = {'a4': A4HTMLNS}
 nsmap = {
     'a4': A4HTMLNS,
+    'xlink': 'http://www.w3.org/1999/xlink',
     'svg': 'http://www.w3.org/2000/svg'}
 
 available_version = '0.1'
@@ -269,7 +270,8 @@
         Presentation.__init__(self, file_name, force_loading)
         # main_g is the main <g> tag. it will be used mainly to add othe
         # tag painted with A4
-        self.main_g = self.svgtree.xpath('/svg:svg/svg:g', namespaces=nsmap)[0]
+        #self.main_g = self.svgtree.xpath('/svg:svg/svg:g', namespaces=nsmap)[0]
+        self.main_g = self.svgtree.xpath('/svg:svg', namespaces=nsmap)[0]
         self.render_cairo = self._render_cairo
 
     def _render_cairo(self, context):
@@ -277,39 +279,15 @@
         svg_handler = rsvg.Handle(data=tempdata)
         svg_handler.render_cairo(context)
 
-    def _generate_new_id(self):
-        import random
-        return str(random.random()).split('.')[1]
+    def add_object(self, presentation_object):
+        self.main_g.append(presentation_object.element)
 
-    def _init_tag(self, tagname, piuprops={}):
-        ## if piuprops contains an id already present modify inplace the rect.
-        if 'id' in piuprops:
-            target = self.svgtree.xpath(
+    def search_id(self, object_id):
+        target = self.svgtree.xpath(
                 "//*[@id='{0}']".format(piuprops['id']), namespaces=nsmap)[0]
-        else:
-            target = etree.SubElement(self.main_g, 'rect')
-            if 'x' not in piuprops or 'y' not in piuprops:
-                return False
-            target.attrib['id'] = self._generate_new_id()
-        for k in piuprops.keys():
-            target.attrib[k] = str(piuprops[k])
-        return target
-
-    def draw_rect(self, width, height, piuprops={}):
-        target_rect = self._init_tag('rect', piuprops)
-        target_rect.attrib['width'] = str(width)
-        target_rect.attrib['height'] = str(height)
-        return target_rect.attrib['id']
-
-    def get_text(self, textid):
-        target_text = self.svgtree.xpath(
-            "//*[@id='{0}']".format(textid), namespaces=nsmap)[0]
-        return target_text.text
-
-    def draw_text(self, text="", piuprops={}):
-        target_text = self._init_tag('text', piuprops)
-        target_text.text = text
-        return target_text.attrib['id']
+        if target:
+            return target
+        return False
 
 
 class PathElement(object):

=== added file 'a4lib/presentation_objects.py'
--- a4lib/presentation_objects.py	1970-01-01 00:00:00 +0000
+++ a4lib/presentation_objects.py	2010-12-22 22:58:09 +0000
@@ -0,0 +1,139 @@
+# Copyright 2010 A4 Developers.  This software is licensed under the
+# GNU General Public License version 3 (see the file COPYING).
+
+import random
+import math
+from lxml import etree
+
+import presentation
+
+
+class PresentationObject(object):
+    def __init__(self, tag_name, x=0, y=0, rotate=0.0):
+        self.element = etree.Element(tag_name, nsmap=presentation.nsmap)
+        self.element.attrib['id'] = self._generate_new_id()
+        self.move(x, y)
+        self.rotate(rotate)
+
+    def _generate_new_id(self, length=10):
+        seed = "abcdef0123456789"
+        return ''.join(random.choice(seed) for i in xrange(length))
+
+    def append_attributes(self, attribs):
+        for key in attribs:
+            self.element.attrib[key] = str(piuprops[key])
+
+    @property
+    def get_id(self):
+        return self.element.attrib['id']
+
+    def move(self, x, y):
+        self.element.attrib['x'] = str(x)
+        self.element.attrib['y'] = str(y)
+
+    def rotate(self, rotate):
+        # need to calculate the transform matrix to rotate the object around his (x,y),
+        # otherwise it will rotate around (0,0)
+        xc = float(self.element.attrib['x'])
+        yc = float(self.element.attrib['y'])
+        xc1 = math.cos(-rotate) * xc - math.sin(-rotate) * yc
+        yc1 = math.sin(-rotate) * xc + math.cos(-rotate) * yc
+        self.element.attrib['transform'] =  ("rotate(%s)" % str(math.degrees(rotate))) + \
+            (" translate(%s,%s)" % (xc1 - xc, yc1 - yc))
+
+    def set_size(self, width, height):
+        self.element.attrib['width'] = str(width)
+        self.element.attrib['height'] = str(height)
+
+    ## Methods that could be implemented in subclasses.
+    ## Implementing a stub here so subclasses doesn't have to reimplement.
+    def start_move(self):
+        pass
+    def end_move(self):
+        pass
+    def character_pressed(self, char):
+        pass
+    def clicked_on_(self, x, y):
+        pass
+
+
+class RectObject(PresentationObject):
+    def __init__(self, x=0, y=0, rotate=0.0):
+        PresentationObject.__init__(self, 'rect', x, y, rotate)
+
+
+class TextObject(PresentationObject):
+    def __init__(self, x=0, y=0, rotate=0.0, text=""):
+        PresentationObject.__init__(self, 'text', x, y, rotate)
+        self.element.text = text
+
+    def character_pressed(self, char):
+        self.element.text += char
+
+    def get_text(self):
+        return self.element.text
+
+    def set_text(self, text):
+        self.element.text = text
+
+    text = property(get_text, set_text)
+
+
+class PolaroidObject(PresentationObject):
+    def __init__(self, x=0, y=0, rotate=0.0, text=""):
+        PresentationObject.__init__(self, 'g', x, y, rotate)
+
+        self.xratio = 0.95
+        self.yratio = 0.80
+
+        self.rect1 = etree.Element('rect')
+        self.rect1.attrib['id'] = self._generate_new_id()
+        self.rect1.attrib['style'] = "fill:#fbfae1;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+        self.rect1.attrib['x'] = str(x)
+        self.rect1.attrib['y'] = str(y)
+
+        self.rect2 = etree.Element('rect')
+        self.rect2.attrib['id'] = self._generate_new_id()
+        self.rect2.attrib['style'] = "fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+        self.rect2.attrib['x'] = str(x)
+        self.rect2.attrib['y'] = str(y)
+
+        self.textelement = etree.Element('text')
+        self.textelement.attrib['id'] = self._generate_new_id()
+        self.textelement.text = ""
+
+        self.element.append(self.rect1)
+        self.element.append(self.rect2)
+        self.element.append(self.textelement)
+
+    def set_size(self, width, height):
+        self.rect1.attrib['width'] = str(width)
+        self.rect1.attrib['height'] = str(height)
+
+        self.rect2.attrib['width'] = str(width * self.xratio)
+        self.rect2.attrib['height'] = str(height * self.yratio)
+
+        top = (width - width * self.xratio) / 2
+
+        self.rect2.attrib['x'] = str(float(self.rect1.attrib['x']) + top)
+        self.rect2.attrib['y'] = str(float(self.rect1.attrib['y']) + top)
+
+        self.textelement.attrib['x'] = str(float(self.rect1.attrib['x']) +
+                width / 2)
+        self.textelement.attrib['y'] = str(float(self.rect1.attrib['y']) +
+                height - (height - (height * self.yratio + top)) / 2)
+
+    def get_size(self):
+        return (self.rect1.attrib['width'], self.rect1.attrib['height'])
+
+    def character_pressed(self, char):
+        self.textelement.text += char
+
+
+class ImageObject(PresentationObject):
+    def __init__(self, x=0, y=0, rotate=0.0):
+        PresentationObject.__init__(self, 'image', x, y, rotate)
+
+    def set_image(self, target):
+        href_attr = '{%s}href' % "http://www.w3.org/1999/xlink"
+        self.element.attrib[href_attr] = "file://" + target

=== modified file 'a4lib/region.py'
--- a4lib/region.py	2010-08-11 16:33:02 +0000
+++ a4lib/region.py	2010-12-22 22:58:09 +0000
@@ -83,6 +83,28 @@
         else:
             return ((scale_x - scale_y) * self.width, 0)
 
+    def get_point_from_window_coordinates(self, window_size, window_point):
+        scale = self.get_window_scale_factor(window_size)
+        translate = self.get_window_fit_vector(window_size)
+
+        x = window_point[0]
+        y = window_point[1]
+
+        x -= translate[0] / 2.0
+        y -= translate[1] / 2.0
+
+        x = x / scale
+        y = y / scale
+
+        x -= self.width / 2
+        y -= self.height / 2
+        x1 = math.cos(self.rotate) * x - math.sin(self.rotate) * y
+        y1 = math.sin(self.rotate) * x + math.cos(self.rotate) * y
+        x1 += self.xc
+        y1 += self.yc
+
+        return (x1, y1)
+
     def render(self, context, svg_image, window_size):
         """Render the region of interest to the given Cairo context."""
         scale = self.get_window_scale_factor(window_size)

=== modified file 'data/window_main.glade'
--- data/window_main.glade	2010-11-20 12:46:38 +0000
+++ data/window_main.glade	2010-12-22 22:58:09 +0000
@@ -304,6 +304,7 @@
                 <property name="label" translatable="yes">Selector</property>
                 <property name="use_underline">True</property>
                 <property name="active">True</property>
+                <signal name="toggled" handler="on_toggle_tool"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -337,11 +338,38 @@
               </packing>
             </child>
             <child>
+              <object class="GtkToggleToolButton" id="ImageToolbutton">
+                <property name="visible">True</property>
+                <property name="is_important">True</property>
+                <property name="label" translatable="yes">Image</property>
+                <property name="use_underline">True</property>
+                <signal name="toggled" handler="on_toggle_tool"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToggleToolButton" id="PolaroidToolbutton">
+                <property name="visible">True</property>
+                <property name="is_important">True</property>
+                <property name="label" translatable="yes">Polaroid</property>
+                <property name="use_underline">True</property>
+                <signal name="toggled" handler="on_toggle_tool"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
               <object class="GtkMenuToolButton" id="toolbutton4">
                 <property name="visible">True</property>
                 <property name="is_important">True</property>
                 <property name="label" translatable="yes">Frames</property>
                 <property name="use_underline">True</property>
+                <property name="menu">FramesMenu</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -452,5 +480,36 @@
   <object class="GtkAction" id="action1"/>
   <object class="GtkMenu" id="ShapesMenu">
     <property name="visible">True</property>
+    <child>
+      <object class="GtkMenuItem" id="rect_item">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">Rect</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="polaroid_item">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">Polaroid</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+  </object>
+  <object class="GtkMenu" id="FramesMenu">
+    <property name="visible">True</property>
+    <child>
+      <object class="GtkMenuItem" id="normal_frame">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">Normal frame</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="hidden_frame">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">Hidden Frame</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
   </object>
 </interface>

=== added directory 'tests/objects'
=== added file 'tests/objects/polaroid.svg'
--- tests/objects/polaroid.svg	1970-01-01 00:00:00 +0000
+++ tests/objects/polaroid.svg	2010-12-22 22:58:09 +0000
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="polaroid.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="305.17697"
+     inkscape:cy="860.0891"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1440"
+     inkscape:window-height="827"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g id="layer1">
+    <rect
+       style="fill:#fbfae1;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect2985"
+       width="327.14285"
+       height="220.71428"
+       x="82.85714"
+       y="20.933611" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect3755"
+       width="314.28571"
+       height="186.42857"
+       x="89.285713"
+       y="26.647896" />
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       x="245"
+       y="227.36218"
+       id="text3757"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3759"
+         x="245"
+         y="227.36218"
+         style="font-family:Times New Roman;-inkscape-font-specification:Times New Roman">polaroid-text</tspan></text>
+  </g>
+</svg>