Changeset 1280

Timestamp:

05/14/07 22:58:34 (2 years ago)

Author:

arj..@yirdis.nl

Message:

Added select/deselect/delete to diagrams, added recent files support.

Files:

• gaphor/trunk/gaphor/actions/mainactions.py (deleted)
• gaphor/trunk/gaphor/diagram/feature.py (modified) (1 diff)
• gaphor/trunk/gaphor/services/filemanager.py (modified) (10 diffs)
• gaphor/trunk/gaphor/services/tests/test_filemanager.py (added)
• gaphor/trunk/gaphor/ui/diagramtab.py (modified) (4 diffs)
• gaphor/trunk/gaphor/ui/mainwindow.py (modified) (2 diffs)

gaphor/trunk/gaphor/diagram/feature.py

@@ -24 +24 @@
-        self.height = 0
-        self.text = ''
+        # Fool unlink code:
+        self.canvas = None
-
-

gaphor/trunk/gaphor/services/filemanager.py

@@ -24 +24 @@
-    element_factory = inject('element_factory')
-    gui_manager = inject('gui_manager')
+    properties = inject('properties')
-
-    menu_xml = """
@@ -33 +34 @@
-              <menuitem action="file-open" />
-              <menu name="recent" action="file-recent-files">
+                <menuitem action="file-recent-0" />
+                <menuitem action="file-recent-1" />
+                <menuitem action="file-recent-2" />
+                <menuitem action="file-recent-3" />
+                <menuitem action="file-recent-4" />
+                <menuitem action="file-recent-5" />
+                <menuitem action="file-recent-6" />
+                <menuitem action="file-recent-7" />
+                <menuitem action="file-recent-8" />
-              </menu>
-              <separator />
@@ -52 +62 @@
-
-    def __init__(self):
-
+
+
-
-    def init(self, app):
@@ -59 +70 @@
-        for name, label in (('file-recent-files', '_Recent files'),):
-            a = gtk.Action(name, label, None, None)
-
-
+
-            self.action_group.add_action(a)
+
+        self._recent_files = self.properties('recent-files', [])
+        for i in xrange(0, 9):
+            a = gtk.Action('file-recent-%d' % i, None, None, None)
+            a.set_property('visible', False)
+            self.action_group.add_action(a)
+            a.connect('activate', self.load_recent, i)
+        self.update_recent_files()
-
-    def shutdown(self):
-        pass
-
+    def _set_filename(self, filename):
+        if filename != self._filename:
+            self._filename = filename
+            self.update_recent_files(filename)
+
+    filename = property(lambda s: s._filename, _set_filename)
+
+    def update_recent_files(self, new_filename=None):
+        if new_filename and new_filename not in self._recent_files:
+            self._recent_files.insert(0, new_filename)
+            self._recent_files = self._recent_files[0:9]
+            self.properties.set('recent-files', self._recent_files)
+
+        for i in xrange(0, 9):
+            self.action_group.get_action('file-recent-%d' % i).set_property('visible', False)
+
+        for i, f in enumerate(self._recent_files):
+            id = 'file-recent%d' % i
+            a = self.action_group.get_action('file-recent-%d' % i)
+            a.props.label = '_%d. %s' % (i+1, f.replace('_', '__'))
+            a.props.tooltip = 'Load %s.' % f
+            a.props.visible = True
+
+    def load_recent(self, action, index):
+        filename = self._recent_files[index]
+        self._load(filename)
+        
-    @action(name='file-new', stock_id='gtk-new')
-    def new(self):
@@ -93 +138 @@
-        main_window.show_diagram(diagram)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        try:
-            from gaphor import storage
@@ -141 +163 @@
-            view = main_window.get_tree_view()
-
+            self.filename = filename
-            main_window.set_filename(filename)
-
@@ -176 +199 @@
-                out.close()
-
+                self.filename = filename
-                self.gui_manager.main_window.set_filename(filename)
-
@@ -183 +207 @@
-                win.destroy()
-
+    @action(name='file-open', stock_id='gtk-open')
+    def open(self):
+        filesel = gtk.FileChooserDialog(title='Open Gaphor model',
+                                        action=gtk.FILE_CHOOSER_ACTION_OPEN,
+                                        buttons=(gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL,gtk.STOCK_OPEN,gtk.RESPONSE_OK))
+
+        filter = gtk.FileFilter()
+        filter.set_name("Gaphor models")
+        filter.add_pattern("*.gaphor")
+        filesel.add_filter(filter)
+
+        filter = gtk.FileFilter()
+        filter.set_name("All files")
+        filter.add_pattern("*")
+        filesel.add_filter(filter)
+
+        if self.filename:
+            filesel.set_current_name(self.filename)
+
+        response = filesel.run()
+        filename = filesel.get_filename()
+        filesel.destroy()
+        if not filename or response != gtk.RESPONSE_OK:
+            return
+        self._load(filename)
+
-    @action(name='file-save', stock_id='gtk-save')
-    def save(self):
-gui_manager.main_window.get_filename()
+filename
-        if filename:
-            self._save(filename)
@@ -193 +243 @@
-    @action(name='file-save-as', stock_id='gtk-save-as')
-    def save_as(self):
-gui_manager.main_window.get_
+
-        filesel = gtk.FileChooserDialog(title=_('Save Gaphor model as'),
-                                        action=gtk.FILE_CHOOSER_ACTION_SAVE,
@@ -205 +255 @@
-        filesel.destroy()
-        self._save(filename)
-
-    @action(name='file-recent-files', label=_('Recent files'), stock_id='gtk-recent')
-    def recent_files(self):
-        pass
-
-

gaphor/trunk/gaphor/ui/diagramtab.py

@@ -5 +5 @@
-
-from gaphor import UML
-
+transactional, 
-from gaphor.diagram.interfaces import IPopupMenu
-from gaphor.diagram import get_diagram_item
@@ -21 +21 @@
-      <ui>
-        <menubar action="mainwindow">
-
+
+
+
+
+
+
+
-            <menuitem action="diagram-zoom-in" />
-            <menuitem action="diagram-zoom-out" />
@@ -137 +143 @@
-        self.view.zoom(1 / zx)
-
+    @action(name='diagram-select-all', label='_Select all', accel='<Control>a')
+    def select_all(self):
+        self.view.select_all()
+
+    @action(name='diagram-deselect-all', label='Des_elect all',
+            accel='<Control><Shift>a')
+    def deselect_all(self):
+        self.view.deselect_all()
+        
+    @action(name='diagram-delete', stock_id='gtk-delete', accel='<Del>')
+    @transactional
+    def delete_selected_items(self):
+        items = self.view.selected_items
+        for i in items:
+            s = i.subject
+            if s and len(s.presentation) == 1:
+                s.unlink()
+            i.unlink()
+
+    def may_remove_from_model(self, view):
+        """
+        Check if there are items which will be deleted from the model
+        (when their last views are deleted). If so request user
+        confirmation before deletion.
+        """
+        items = self.view.selected_items
+        last_in_model = filter(lambda i: i.subject and len(i.subject.presentation) == 1, items)
+        log.debug('Last in model: %s' % str(last_in_model))
+        if last_in_model:
+            return self.confirm_deletion_of_items(last_in_model)
+        return True
+
+    def confirm_deletion_of_items(self, last_in_model):
+        """
+        Request user confirmation on deleting the item from the model.
+        """
+        s = ''
+        for item in last_in_model:
+            s += '%s\n' % str(item)
+
+        dialog = gtk.MessageDialog(
+                None,
+                gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
+                gtk.MESSAGE_WARNING,
+                gtk.BUTTONS_YES_NO,
+                'This will remove the following selected items from the model:\n%s\nAre you sure?' % s
+                )
+        dialog.set_transient_for(self.owning_window.window)
+        value = dialog.run()
+        dialog.destroy()
+        if value == gtk.RESPONSE_YES:
+            return True
+        return False
-
-    def _on_key_press_event(self, view, event):
@@ -146 +205 @@
-        if view.is_focus():
-            if event.keyval == 0xFFFF and event.state == 0: # Delete
-
+
+
-
-

gaphor/trunk/gaphor/ui/mainwindow.py

@@ -510 +510 @@
-            self.ui_manager.remove_action_group(action_group)
-            self.ui_manager.remove_ui(ui_id)
-
+#
-
-        content = self.notebook.get_nth_page(page_num)
@@ -519 +519 @@
-        ui_id = self.ui_manager.add_ui_from_string(tab.menu_xml)
-        self._tab_ui_settings = tab.action_group, ui_id
-
+#
-        log.debug('Menus updated with %s, %d' % self._tab_ui_settings)
-