Changeset 1335

Timestamp:

06/05/07 23:02:25 (1 year ago)

Author:

arj..@yirdis.nl

Message:

Added more property pages

Files:

• gaphor/trunk/TODO (modified) (1 diff)
• gaphor/trunk/gaphor/adapters/propertypages.py (modified) (7 diffs)
• gaphor/trunk/gaphor/diagram/dependency.py (modified) (6 diffs)

gaphor/trunk/TODO

@@ -6 +6 @@
- - bug in zope.component package: in zope.component.globalregistry.py zope.testing is included.  This package is only a dependency for the [test] setting. zope.testing is not mandatory.
- Use a more recent version
+
+ - Figure out how to allow users to split segments.
-
- - allow comments to render multi-line.

gaphor/trunk/gaphor/adapters/propertypages.py

@@ -18 +18 @@
-from zope import interface, component
-from gaphor import UML
+import gaphas.item
-
-class NamedItemPropertyPage(object):
@@ -133 +134 @@
-
-
-ropertyP
+
-    """
-    An editor for attributes associated with classes and interfaces
@@ -147 +148 @@
-
-    def __init__(self, context):
-ropertyP
+
-        self.context = context
-        
@@ -218 +219 @@
-            attr[0] = attr[1].render()
-
-ropertyP
-
-
-ropertyP
+
+
+
+
-    """
-    An editor for operations associated with classes and interfaces
@@ -235 +236 @@
-
-    def __init__(self, context):
-ropertyP
+
-        self.context = context
-        
@@ -306 +307 @@
-            attr[0] = attr[1].render()
-
-ropertyP
+
-
-
@@ -383 +384 @@
-
-
+class DependencyPropertyPage(object):
+    """
+    An editor for tagged values associated with elements.
+
+    Tagged values are stored in a ListSore: tag, value, taggedValue. taggedValue
+    is an UML model element (hidden).
+    """
+
+    interface.implements(IPropertyPage)
+    component.adapts(items.DependencyItem)
+
+    dependency_types = (
+        (_('Dependency'), UML.Dependency),
+        (_('Usage'), UML.Usage),
+        (_('Realization'), UML.Realization))
+
+    def __init__(self, context):
+        super(DependencyPropertyPage, self).__init__()
+        self.context = context
+        self.size_group = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL)
+        
+    def construct(self):
+        page = gtk.VBox()
+
+        hbox = gtk.HBox()
+        label = gtk.Label(_('Dependency type'))
+        label.set_justify(gtk.JUSTIFY_LEFT)
+        self.size_group.add_widget(label)
+        hbox.pack_start(label, expand=False)
+
+        dependency_type = gtk.ListStore(str)
+        
+        for t, l in self.dependency_types:
+            dependency_type.append([t])
+        
+        self.dependency_type = dependency_type
+        
+        combo = gtk.ComboBox(dependency_type)
+        cell = gtk.CellRendererText()
+        combo.pack_start(cell, True)
+        combo.add_attribute(cell, 'text', 0)
+        combo.connect('changed', self._on_dependency_type_change)
+        self.combo = combo
+
+        hbox.pack_start(combo, expand=False)
+
+        page.pack_start(hbox, expand=False)
+
+        hbox = gtk.HBox()
+
+        label = gtk.Label(_('Automatic'))
+        label.set_justify(gtk.JUSTIFY_LEFT)
+        self.size_group.add_widget(label)
+        hbox.pack_start(label, expand=False)
+
+        button = gtk.CheckButton()
+        button.set_active(self.context.auto_dependency)
+        button.connect('toggled', self._on_auto_dependency_change)
+        hbox.pack_start(button)
+
+        page.pack_start(hbox, expand=False)
+
+        page.show_all()
+
+        self.update()
+
+        return page
+
+    def update(self):
+        for index, (_, dep_type) in enumerate(self.dependency_types):
+            if dep_type is self.context.dependency_type:
+                self.combo.set_active(index)
+                break
+
+    def _on_dependency_type_change(self, combo):
+        self.context.dependency_type = self.dependency_types[combo.get_active()][1]
+
+    def _on_auto_dependency_change(self, button):
+        self.context.auto_dependency = button.get_active()
+
+
+component.provideAdapter(DependencyPropertyPage, name='Properties')
+
+
+class AssociationPropertyPage(NamedItemPropertyPage):
+    """
+    """
+
+    interface.implements(IPropertyPage)
+    component.adapts(items.AssociationItem)
+
+    def __init__(self, context):
+        super(AssociationPropertyPage, self).__init__()
+        self.context = context
+        self.size_group = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL)
+        
+    def construct(self):
+        page = super(AssociationPropertyPage, self).construct()
+        return page
+
+        hbox = gtk.HBox()
+        label = gtk.Label(_('Dependency type'))
+        label.set_justify(gtk.JUSTIFY_LEFT)
+        self.size_group.add_widget(label)
+        hbox.pack_start(label, expand=False)
+
+        dependency_type = gtk.ListStore(str)
+        
+        for t, l in self.dependency_types:
+            dependency_type.append([t])
+        
+        self.dependency_type = dependency_type
+        
+        combo = gtk.ComboBox(dependency_type)
+        cell = gtk.CellRendererText()
+        combo.pack_start(cell, True)
+        combo.add_attribute(cell, 'text', 0)
+        combo.connect('changed', self._on_dependency_type_change)
+        self.combo = combo
+
+        hbox.pack_start(combo, expand=False)
+
+        page.pack_start(hbox, expand=False)
+
+        hbox = gtk.HBox()
+
+        label = gtk.Label(_('Automatic'))
+        label.set_justify(gtk.JUSTIFY_LEFT)
+        self.size_group.add_widget(label)
+        hbox.pack_start(label, expand=False)
+
+        button = gtk.CheckButton()
+        button.set_active(self.context.auto_dependency)
+        button.connect('toggled', self._on_auto_dependency_change)
+        hbox.pack_start(button)
+
+        page.pack_start(hbox, expand=False)
+
+        page.show_all()
+
+        self.update()
+
+        return page
+
+    def update(self):
+        for index, (_, dep_type) in enumerate(self.dependency_types):
+            if dep_type is self.context.dependency_type:
+                self.combo.set_active(index)
+                break
+
+    def _on_dependency_type_change(self, combo):
+        self.context.dependency_type = self.dependency_types[combo.get_active()][1]
+
+    def _on_auto_dependency_change(self, button):
+        self.context.auto_dependency = button.get_active()
+
+component.provideAdapter(AssociationPropertyPage, name='Properties')
+
+
+class LineStylePage(object):
+    """
+    Basic line style properties: color, orthogonal, etc.
+    """
+
+    interface.implements(IPropertyPage)
+    component.adapts(gaphas.item.Line)
+
+    def __init__(self, context):
+        super(LineStylePage, self).__init__()
+        self.context = context
+        self.size_group = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL)
+        
+    def construct(self):
+        page = gtk.VBox()
+
+        hbox = gtk.HBox()
+        label = gtk.Label(_('Orthogonal'))
+        label.set_justify(gtk.JUSTIFY_LEFT)
+        self.size_group.add_widget(label)
+        hbox.pack_start(label, expand=False)
+
+        button = gtk.CheckButton()
+        button.set_active(self.context.orthogonal)
+        button.connect('toggled', self._on_orthogonal_change)
+        hbox.pack_start(button)
+
+        page.pack_start(hbox, expand=False)
+
+        hbox = gtk.HBox()
+        label = gtk.Label(_('horizontal'))
+        label.set_justify(gtk.JUSTIFY_LEFT)
+        self.size_group.add_widget(label)
+        hbox.pack_start(label, expand=False)
+
+        button = gtk.CheckButton()
+        button.set_active(self.context.horizontal)
+        button.connect('toggled', self._on_horizontal_change)
+        hbox.pack_start(button)
+
+        page.pack_start(hbox, expand=False)
+
+        page.show_all()
+
+        return page
+
+    def _on_orthogonal_change(self, button):
+        self.context.orthogonal = button.get_active()
+
+    def _on_horizontal_change(self, button):
+        self.context.horizontal = button.get_active()
+
+component.provideAdapter(LineStylePage, name='Style')
+
+
-# vim:sw=4:et:ai

gaphor/trunk/gaphor/diagram/dependency.py

@@ -54 +54 @@
-    # we need to be very strict here
-    __stereotype__ = {
-
-
-
+_
+_
+_
-    }
-
@@ -74 +74 @@
-        DiagramLine.__init__(self, id)
-
-
+_
-        self.auto_dependency = True
-        self._dash_style = True
@@ -80 +80 @@
-    def save(self, save_func):
-        DiagramLine.save(self, save_func)
-
+_
-        save_func('auto_dependency', self.auto_dependency)
-
@@ -102 +102 @@
-
-    def get_dependency_type(self):
-
+_
-
-
@@ -108 +108 @@
-        if not dependency_type and self.auto_dependency:
-            dependency_type = self.determine_dependency_type(self.head.connected_to, self.tail.connected_to)
-
+_
-        self.request_update()
-
+    dependency_type = property(lambda s: s._dependency_type,
+                               set_dependency_type, set_dependency_type)
-
-    def update(self, context):
@@ -116 +118 @@
-
-        from interface import InterfaceItem
-
+_
-        c1 = self.head.connected_to
-        if c1 and dependency_type is UML.Usage \