Changeset 1341

Timestamp:

06/06/07 12:03:04 (1 year ago)

Author:

arj..@yirdis.nl

Message:

Added Association property editor

Files:

• gaphor/trunk/TODO (modified) (3 diffs)
• gaphor/trunk/gaphor/adapters/propertypages.py (modified) (2 diffs)
• gaphor/trunk/gaphor/diagram/association.py (modified) (2 diffs)

gaphor/trunk/TODO

@@ -7 +7 @@
- Use a more recent version
-
- - Figure out how to allow users to split segments.
-
- - allow comments to render multi-line.
-
- - add more property pages.
+    - Stereotype
-
- - Load / save regression testing
@@ -30 +27 @@
-    * use zope.component.event for centralized event notification.
- 
- - use GTK's UIManager for menu management.
-    * figure out naming conventions, also for diagram item popup menus.
-    * 
-
-- Copy/Paste for diagramitems
-  - How to do a copy/paste? shallow copy or deep copy? -> just create a diagram
@@ -44 +37 @@
-    - __stereotype__
-    - __fixed_stereotype__
-
- - Use setuptools (pkg_resources) to load plugins.
-   Maybe define stuff in terms of services, like PIDA does (pida.org?)
-
- - In some cases (like when editing attributes) Enter should be used to

gaphor/trunk/gaphor/adapters/propertypages.py

@@ -482 +482 @@
-        #self.size_group = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL)
-        
+    def construct_end(self, title, end):
+        hbox = gtk.HBox()
+        label = gtk.Label(title)
+        label.set_justify(gtk.JUSTIFY_LEFT)
+        self.size_group.add_widget(label)
+        hbox.pack_start(label, expand=False)
+
+        entry = gtk.Entry()        
+        entry.set_text(render_attribute(end.subject) or '')
+        entry.connect('changed', self._on_end_name_change, end)
+        hbox.pack_start(entry)
+
+        combo = gtk.combo_box_new_text()
+        for t in ('Unknown navigation', 'Not navigable', 'Navigable'):
+            combo.append_text(t)
+        
+        combo.set_active([None, False, True].index(end.navigability))
+
+        combo.connect('changed', self._on_navigability_change, end)
+        hbox.pack_start(combo, expand=False)
+
+        combo = gtk.combo_box_new_text()
+        for t in ('No aggregation', 'Shared', 'Composite'):
+            combo.append_text(t)
+        
+        combo.set_active(['none', 'shared', 'composite'].index(end.subject.aggregation))
+
+        combo.connect('changed', self._on_aggregation_change, end)
+        hbox.pack_start(combo, expand=False)
+        
+        return hbox
+
-    def construct(self):
-        page = super(AssociationPropertyPage, self).construct()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        page.pack_start(hbox, expand=False)
-
@@ -531 +533 @@
-
-    def update(self):
-for index, (_, dep_type) in enumerate(self.dependency_types):
-
-            self.combo.set_active(index)
-        break
-
-dependency_type_change(self, combo
-self.context.dependency_type = self.dependency_types[combo.get_active()][1
-
-uto_dependency_change(self, button
-self.context.auto_dependency = button.get_active()
+pass
+
+def _on_end_name_change(self, entry, end):
+end.subject.parse(entry.get_text())
+
+navigability_change(self, combo, end
+end.navigability = (None, False, True)[combo.get_active()
+
+ggregation_change(self, combo, end
+end.subject.aggregation = ('none', 'shared', 'composite')[combo.get_active()]
-
-component.provideAdapter(AssociationPropertyPage, name='Properties')

gaphor/trunk/gaphor/diagram/association.py

@@ -467 +467 @@
-                
-
-set_navigable
+_set_navigability
-        """
-        Change the AssociationEnd's navigability.
@@ -516 +516 @@
-                        (subject and 'subject' or 'opposite Property'))
-
+    navigability = property(get_navigability, _set_navigability)
-
-    def point_name(self, x, y):