Changeset 1269

Timestamp:

05/11/07 05:57:00 (1 year ago)

Author:

arj..@yirdis.nl

Message:

Implemented Open and Save (as)

Files:

• gaphor/trunk/gaphor/services/actionmanager.py (modified) (1 diff)
• gaphor/trunk/gaphor/services/filemanager.py (modified) (4 diffs)
• gaphor/trunk/gaphor/ui/mainwindow.py (modified) (1 diff)
• gaphor/trunk/setup.py (modified) (1 diff)

gaphor/trunk/gaphor/services/actionmanager.py

@@ -57 +57 @@
-            
-            assert action_provider.action_group
+            self.ui_manager.insert_action_group(action_provider.action_group, -1)
-            if action_provider.menu_xml:
-                action_provider.__ui_merge_id = \
-                        self.ui_manager.add_ui_from_string(action_provider.menu_xml)
-                log.debug('Added menu xml %d' % action_provider.__ui_merge_id)
-            self.ui_manager.insert_action_group(action_provider.action_group, -1)
-            self.update_actions()
-

gaphor/trunk/gaphor/services/filemanager.py

@@ -4 +4 @@
-
-import gc
+import gobject, gtk
-from zope import interface, component
-from gaphor.interfaces import IService, IActionProvider
-from gaphor.core import _, inject, action, build_action_group
-from gaphor import UML
-
+
+
+
+
+
-
-class FileManager(object):
@@ -43 +48 @@
-
-    def init(self, app):
+        self._app = app
-        self.action_group = build_action_group(self)
-
@@ -77 +83 @@
-    @action(name='file-open', stock_id='gtk-open')
-    def open(self):
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    @action(name='file-save', stock_id='gtk-save')
-    def save(self):
-
+
+
+
+
+
-
-    @action(name='file-save-as', stock_id='gtk-save-as')
-    def save_as(self):
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-    @action(name='file-recent-files', label=_('Recent files'), stock_id='gtk-recent')
@@ -92 +199 @@
-
-
+def show_status_window(title, message, parent=None, queue=None):
+    win = gtk.Window(gtk.WINDOW_TOPLEVEL)
+    win.set_title(title)
+    win.set_position(gtk.WIN_POS_CENTER_ON_PARENT)
+    win.set_transient_for(parent)
+    win.set_modal(True)
+    win.set_resizable(False)
+    win.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
+    #win.set_skip_taskbar_hint(True)
+    #win.set_skip_pager_hint(True)
+    win.set_border_width(24)
+    vbox = gtk.VBox(spacing=24)
+    win.add(vbox)
+    label = gtk.Label(message)
+    label.set_padding(8,8)
+    vbox.pack_start(label)
+    progress_bar = gtk.ProgressBar()
+    vbox.pack_start(progress_bar, expand=False, fill=False, padding=0)
+
+    def progress_idle_handler(progress_bar, queue):
+        #print '.',
+        percentage = 0
+        try:
+            while True:
+                percentage = queue.get()
+        except QueueEmpty:
+            pass
+        if percentage:
+            progress_bar.set_fraction(min(percentage / 100.0, 100.0))
+        return True
+
+    if queue:
+        idle_id = gobject.idle_add(progress_idle_handler, progress_bar, queue,
+                                   priority=gobject.PRIORITY_LOW)
+        # Make sure the idle fucntion is removed as soon as the window
+        # is destroyed.
+        def remove_progress_idle_handler(window, idle_id):
+            #print 'remove_progress_idle_handler', idle_id
+            gobject.source_remove(idle_id)
+        win.connect('destroy', remove_progress_idle_handler, idle_id)
+
+    win.show_all()
+    return win
+
-#vim:sw=4:et:ai

gaphor/trunk/gaphor/ui/mainwindow.py

@@ -429 +429 @@
-        super(MainWindow, self).construct()
-
+        # Add accelerators from ui manager:
+
+        # Does not work:
+        # ./gaphor/ui/mainwindow.py:437: GtkWarning: _gtk_accel_group_attach: assertion `g_slist_find (accel_group->acceleratables, object) == NULL' failed
+        #  self.window.add_accel_group(self.ui_manager.get_accel_group())
+
+        self.window.add_accel_group(self.ui_manager.get_accel_group())
+
-        self.window.connect('delete-event', self._on_window_delete)
-

gaphor/trunk/setup.py

@@ -82 +82 @@
-            'undo_manager = gaphor.services.undomanager:UndoManager',
-#            'plugin_manager = gaphor.services.pluginmanager:PluginManager',
-            'action_manager = gaphor.services.actionmanager:ActionManager',
-            'element_factory = gaphor.UML.elementfactory:ElementFactory',
-            'file_manager = gaphor.services.filemanager:FileManager',
-            'gui_manager = gaphor.services.guimanager:GUIManager',
+            'action_manager = gaphor.services.actionmanager:ActionManager',
-        ],
-        'gaphor.uicomponents': [