Ticket #1829: 0001-Added-Label-Thought-Support.patch

new file icons/label-mode.svg

@@ +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   enable-background="new 0 0 55 54.696"
+   height="54.696px"
+   version="1.1"
+   viewBox="0 0 55 54.696"
+   width="55px"
+   x="0px"
+   xml:space="preserve"
+   y="0px"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="label-mode.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
+     id="metadata22"><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 /></cc:Work></rdf:RDF></metadata><defs
+     id="defs20"><inkscape:perspective
+   sodipodi:type="inkscape:persp3d"
+   inkscape:vp_x="0 : 27.348 : 1"
+   inkscape:vp_y="0 : 1000 : 0"
+   inkscape:vp_z="55 : 27.348 : 1"
+   inkscape:persp3d-origin="27.5 : 18.232 : 1"
+   id="perspective24" />
+        
+
+                
+                
+        </defs><sodipodi:namedview
+     inkscape:window-height="735"
+     inkscape:window-width="1264"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showgrid="true"
+     inkscape:zoom="8.4466873"
+     inkscape:cx="27.5"
+     inkscape:cy="27.348"
+     inkscape:window-x="0"
+     inkscape:window-y="4"
+     inkscape:current-layer="svg2"
+     inkscape:window-maximized="0"><inkscape:grid
+       type="xygrid"
+       id="grid2820" /></sodipodi:namedview><g
+     id="g2817"
+     transform="translate(0,2)"
+     style="fill:#ffffff"><rect
+       y="38.695999"
+       x="21"
+       height="5"
+       width="18"
+       id="rect2822"
+       style="fill:#ffffff;fill-opacity:1;stroke:none" /><rect
+       y="4.6959991"
+       x="17"
+       height="39"
+       width="6"
+       id="rect2824"
+       style="fill:#ffffff;fill-opacity:1;stroke:none" /></g></svg>
+ No newline at end of file

labyrinthactivity.py

@@ -274 +274 @@
             activity_toolbar.share.props.visible = False
             toolbox.set_current_toolbar(1)
 
-        self.mods = [None] * 4
+        self.mods = [None] * 6
 
         self.mods[0] = RadioToolButton(named_icon='select-mode')
         self.mods[0].set_tooltip(_('Edit mode'))
@@ -304 +304 @@
         self.mods[3].connect('clicked', self.__mode_cb, MMapArea.MODE_IMAGE)
         target_toolbar.insert(self.mods[3], tool_offset + 3)
 
+        self.mods[5] = RadioToolButton(named_icon='label-mode')
+        self.mods[5].set_tooltip(_('Label mode'))
+        self.mods[5].set_accelerator(_('<ctrl>a'))
+        self.mods[5].set_group(self.mods[0])
+        self.mods[5].connect('clicked', self.__mode_cb, MMapArea.MODE_LABEL)
+        target_toolbar.insert(self.mods[5], tool_offset + 4)
+
         separator = gtk.SeparatorToolItem()
-        target_toolbar.insert(separator, tool_offset + 4)
+        target_toolbar.insert(separator, tool_offset + 5)
 
         tool = ToolButton('link')
         tool.set_tooltip(_('Link/unlink two selected thoughts'))
         tool.set_accelerator(_('<ctrl>l'))
         tool.connect('clicked', self.__link_cb)
-        target_toolbar.insert(tool, tool_offset + 5)
+        target_toolbar.insert(tool, tool_offset + 6)
 
         tool = ToolButton('edit-delete')
         tool.set_tooltip(_('Erase selected thought(s)'))
         tool.connect('clicked', self.__delete_cb)
-        target_toolbar.insert(tool, tool_offset + 6)
+        target_toolbar.insert(tool, tool_offset + 7)
 
         self.show_all()
         self._mode = MMapArea.MODE_TEXT

src/ImageThought.py

@@ -100 +100 @@
                 utils.export_thought_outline (context, self.ul, self.lr, self.background_color, self.am_selected, self.am_primary, utils.STYLE_NORMAL,
                                                                           (move_x, move_y))
                 if self.pic:
-            raw_pixels = self.pic.get_pixels_array()
+                        raw_pixels = self.pic.get_pixels_array()
                         if hasattr(context, "set_source_pixbuf"):
                                 context.set_source_pixbuf (self.pic, self.pic_location[0]+move_x, self.pic_location[1]+move_y)
                         elif hasattr(context, "set_source_surface"):

new file src/LabelThought.py

@@ +1 @@
+#! /usr/bin/env python
+# LabelThoughts.py
+# This file is part of Labyrinth
+#
+# Copyright (C) 2010 - Jorge Saldivar <jsaldivar@paraguayeduca.org>
+#                      Martin Abente <mabente@paraguayeduca.org>
+#
+# Labyrinth is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Labyrinth is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.    See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Labyrinth; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA  02110-1301  USA
+#
+
+import gtk
+import pango
+import utils
+import xml.dom
+
+from BaseThought import *
+from TextThought import TextThought
+
+class LabelThought (TextThought):
+    def __init__ (self, coords, pango_context, thought_number, save, undo, loading, background_color, foreground_color, name="label_thought"):
+        super (LabelThought, self).__init__(coords, pango_context, thought_number, save, undo, loading, background_color, foreground_color, name)
+        self.edge = True
+
+    def can_be_parent(self):
+        return False
+
+    def draw (self, context):
+        self.recalc_edges ()
+        if self.edge:
+            ResizableThought.draw(self, context)
+        if self.creating:
+            return
+        (textx, texty) = (self.min_x, self.min_y)
+        if self.am_primary:
+            r, g, b = utils.primary_colors["text"]
+        elif (self.foreground_color):
+            r, g, b = utils.gtk_to_cairo_color(self.foreground_color)
+        else:
+            r, g ,b = utils.gtk_to_cairo_color(utils.default_colors["text"])
+        context.set_source_rgb (r, g, b)
+        self.layout.set_alignment(pango.ALIGN_CENTER)
+        context.move_to (textx, texty)
+        context.show_layout (self.layout)
+        if self.editing:
+            if self.preedit:
+                (strong, weak) = self.layout.get_cursor_pos (self.index + self.preedit[2])
+            else:
+                (strong, weak) = self.layout.get_cursor_pos (self.index)
+            (startx, starty, curx,cury) = strong
+            startx /= pango.SCALE
+            starty /= pango.SCALE
+            curx /= pango.SCALE
+            cury /= pango.SCALE
+            context.move_to (textx + startx, texty + starty)
+            context.line_to (textx + startx, texty + starty + cury)
+            context.stroke ()
+        context.set_source_rgb (0,0,0)
+        context.stroke ()
+
+    def update_save (self):
+        next = self.element.firstChild
+        while next:
+            m = next.nextSibling
+            if next.nodeName == "attribute":
+                self.element.removeChild (next)
+                next.unlink ()
+            next = m
+
+        if self.text_element.parentNode is not None:
+            self.text_element.replaceWholeText (self.text)
+        text = self.extended_buffer.get_text ()
+        if text:
+            self.extended_buffer.update_save()
+        else:
+            try:
+                self.element.removeChild(self.extended_buffer.element)
+            except xml.dom.NotFoundErr:
+                pass
+        self.element.setAttribute ("cursor", str(self.index))
+        self.element.setAttribute ("ul-coords", str(self.ul))
+        self.element.setAttribute ("lr-coords", str(self.lr))
+        self.element.setAttribute ("identity", str(self.identity))
+        self.element.setAttribute ("background-color", utils.color_to_string(self.background_color))
+        self.element.setAttribute ("foreground-color", utils.color_to_string(self.foreground_color))
+        self.element.setAttribute ("edge", str(self.edge))
+        if self.am_selected:
+                self.element.setAttribute ("current_root", "true")
+        else:
+            try:
+                self.element.removeAttribute ("current_root")
+            except xml.dom.NotFoundErr:
+                pass
+        if self.am_primary:
+            self.element.setAttribute ("primary_root", "true");
+        else:
+            try:
+                self.element.removeAttribute ("primary_root")
+            except xml.dom.NotFoundErr:
+                pass
+        doc = self.element.ownerDocument
+        it = self.attributes.get_iterator()
+        while (1):
+            r = it.range()
+            for x in it.get_attrs():
+                if x.type == pango.ATTR_WEIGHT and x.value == pango.WEIGHT_BOLD:
+                    elem = doc.createElement ("attribute")
+                    self.element.appendChild (elem)
+                    elem.setAttribute("start", str(r[0]))
+                    elem.setAttribute("end", str(r[1]))
+                    elem.setAttribute("type", "bold")
+                elif x.type == pango.ATTR_STYLE and x.value == pango.STYLE_ITALIC:
+                    elem = doc.createElement ("attribute")
+                    self.element.appendChild (elem)
+                    elem.setAttribute("start", str(r[0]))
+                    elem.setAttribute("end", str(r[1]))
+                    elem.setAttribute("type", "italics")
+                elif x.type == pango.ATTR_UNDERLINE and x.value == pango.UNDERLINE_SINGLE:
+                    elem = doc.createElement ("attribute")
+                    self.element.appendChild (elem)
+                    elem.setAttribute("start", str(r[0]))
+                    elem.setAttribute("end", str(r[1]))
+                    elem.setAttribute("type", "underline")
+                elif x.type == pango.ATTR_FONT_DESC:
+                    elem = doc.createElement ("attribute")
+                    self.element.appendChild (elem)
+                    elem.setAttribute("start", str(r[0]))
+                    elem.setAttribute("end", str(r[1]))
+                    elem.setAttribute("type", "font")
+                    elem.setAttribute("value", x.desc.to_string ())
+            if not it.next():
+                break
+
+    def load (self, node, tar):
+        self.index = int (node.getAttribute ("cursor"))
+        self.end_index = self.index
+        tmp = node.getAttribute ("ul-coords")
+        self.ul = utils.parse_coords (tmp)
+        tmp = node.getAttribute ("lr-coords")
+        self.lr = utils.parse_coords (tmp)
+
+        self.width = self.lr[0] - self.ul[0]
+        self.height = self.lr[1] - self.ul[1]
+
+        self.identity = int (node.getAttribute ("identity"))
+        try:
+            tmp = node.getAttribute ("background-color")
+            self.background_color = gtk.gdk.color_parse(tmp)
+            tmp = node.getAttribute ("foreground-color")
+            self.foreground_color = gtk.gdk.color_parse(tmp)
+        except ValueError:
+            pass
+
+        self.am_selected = node.hasAttribute ("current_root")
+        self.am_primary = node.hasAttribute ("primary_root")
+        
+        if node.getAttribute ("edge") == "True":
+            self.edge = True
+        else:
+            self.edge = False
+
+        for n in node.childNodes:
+            if n.nodeType == n.TEXT_NODE:
+                self.text = n.data
+            elif n.nodeName == "Extended":
+                self.extended_buffer.load(n)
+            elif n.nodeName == "attribute":
+                attrType = n.getAttribute("type")
+                start = int(n.getAttribute("start"))
+                end = int(n.getAttribute("end"))
+
+                if attrType == "bold":
+                    attr = pango.AttrWeight(pango.WEIGHT_BOLD, start, end)
+                elif attrType == "italics":
+                    attr = pango.AttrStyle(pango.STYLE_ITALIC, start, end)
+                elif attrType == "underline":
+                    attr = pango.AttrUnderline(pango.UNDERLINE_SINGLE, start, end)
+                elif attrType == "font":
+                    font_name = str(n.getAttribute("value"))
+                    pango_font = pango.FontDescription (font_name)
+                    attr = pango.AttrFontDesc (pango_font, start, end)
+                self.attributes.change(attr)
+            else:
+                print "Unknown: "+n.nodeName
+        self.rebuild_byte_table ()
+        self.recalc_edges()
+
+    def enter(self):
+        if self.editing:
+            return
+        self.orig_text = self.text
+        self.editing = True
+        self.edge = True
+
+    def leave(self):
+        if not self.editing:
+            return
+        ResizableThought.leave(self)
+        self.editing = False
+        self.end_index = self.index
+        self.emit ("update_links")
+        self.edge = False
+        self.recalc_edges ()

src/MMapArea.py

@@ -21 +21 @@
 #
 
 import math
-
 import time
 import gtk
 import pango
@@ -35 +34 @@
 
 import Links
 import TextThought
+import LabelThought
 import ImageThought
 import DrawingThought
 import ResourceThought
@@ -53 +53 @@
 MODE_IMAGE              = 2
 MODE_DRAW               = 3
 MODE_RESOURCE   = 4
+MODE_LABEL              = 5
 
 VIEW_LINES = 0
 VIEW_BEZIER = 1
@@ -534 +535 @@
                 else:
                         map(lambda x : x.unselect(), self.selected)
                         self.selected = [thought]
-                self.current_root = []
+                if thought.can_be_parent():
+                        self.current_root = []
                 for x in self.selected:
                         if x.can_be_parent():
                                 self.current_root.append(x)
@@ -723 +725 @@
 
                 if type == MODE_TEXT:
                         thought = TextThought.TextThought (coords, self.pango_context, self.nthoughts, self.save, self.undo, loading, self.background_color, self.foreground_color)
+                elif type == MODE_LABEL:
+                        thought = LabelThought.LabelThought (coords, self.pango_context, self.nthoughts, self.save, self.undo, loading, self.background_color, self.foreground_color)
                 elif type == MODE_IMAGE:
                         thought = ImageThought.ImageThought (coords, self.pango_context, self.nthoughts, self.save, self.undo, loading, self.background_color, self.foreground_color)
                 elif type == MODE_DRAW:
@@ -1022 +1026 @@
                 for node in top_element.childNodes:
                         if node.nodeName == "thought":
                                 self.load_thought (node, MODE_TEXT, tar)
+                        elif node.nodeName == "label_thought":
+                                self.load_thought (node, MODE_LABEL, tar)
                         elif node.nodeName == "image_thought":
                                 self.load_thought (node, MODE_IMAGE, tar)
                         elif node.nodeName == "drawing_thought":
@@ -1167 +1173 @@
         def link_menu_cb (self):
                 if len (self.selected) != 2:
                         return
+                if not self.selected[0].can_be_parent() or \
+                        not self.selected[1].can_be_parent():
+                                return
                 lnk = None
                 for l in self.links:
                         if l.connects (self.selected[0], self.selected[1]):
@@ -1225 +1234 @@
 
                 if not thought:
                         return True
-                if not self.primary:
-                        self.make_primary (thought)
-                        self.select_thought (thought, None)
+                if not self.primary and \
+                        thought.can_be_parent():
+                                self.make_primary (thought)
+                                self.select_thought (thought, None)
                 else:
                         self.emit ("change_buffer", thought.extended_buffer)
                         self.hookup_im_context (thought)
@@ -1235 +1245 @@
                         self.undo.block ()
                         if not self.current_root:
                                 self.current_root.append(self.primary)
-                        for x in self.current_root:
-                                self.create_link (x, None, thought)
+                        if thought.can_be_parent():
+                                for x in self.current_root:
+                                        if x.can_be_parent():
+                                                self.create_link (x, None, thought)
                         for x in self.selected:
                                 x.unselect ()
                         self.selected = [thought]