Changeset 1279

Timestamp:

05/14/07 20:43:33 (1 year ago)

Author:

arj..@yirdis.nl

Message:

added about screen

Files:

• gaphor/trunk/gaphor/services/filemanager.py (modified) (3 diffs)
• gaphor/trunk/gaphor/services/helpservice.py (added)
• gaphor/trunk/gaphor/ui/consolewindow.py (modified) (2 diffs)
• gaphor/trunk/gaphor/ui/diagramtab.py (modified) (3 diffs)
• gaphor/trunk/gaphor/ui/mainwindow.py (modified) (14 diffs)
• gaphor/trunk/setup.py (modified) (2 diffs)

gaphor/trunk/gaphor/services/filemanager.py

@@ -32 +32 @@
-              <menuitem action="file-new" />
-              <menuitem action="file-open" />
+              <menu name="recent" action="file-recent-files">
+              </menu>
-              <separator />
-              <menuitem action="file-save" />
@@ -48 +50 @@
-      </ui>
-    """
-#              <menu name="recent" action="file-recent-files">
-#              </menu>
-
-    def __init__(self):
@@ -57 +57 @@
-        self._app = app
-        self.action_group = build_action_group(self)
+        for name, label in (('file-recent-files', '_Recent files'),):
+            a = gtk.Action(name, label, None, None)
+            # TODO: enable this line once we have a recent-files impl.
+            #a.set_property('hide-if-empty', False)
+            self.action_group.add_action(a)
-
-    def shutdown(self):

gaphor/trunk/gaphor/ui/consolewindow.py

@@ -20 +20 @@
-        <ui>
-          <menubar name="mainwindow">
-window
+tools
-              <menuitem action="ConsoleWindow:open" />
-            </menu>
@@ -54 +54 @@
-            self.window.show_all()
-
-
+, accel='<Control><Shift>w'
-    def close(self):
-        self.window.destroy()

gaphor/trunk/gaphor/ui/diagramtab.py

@@ -70 +70 @@
-
-    def construct(self):
-
+
+
+
+
+
-
-        table = gtk.Table(2,2, False)
-        #table.set_row_spacings(4)
-        #table.set_col_spacings(4)
-
-        frame = gtk.Frame()
@@ -103 +105 @@
-
-        table.show_all()
-
-self.owning_window.add_tab(self, table, self.title)
+
+return table
-
-    @action(name='diagram-close', stock_id='gtk-close')
@@ -113 +115 @@
-        """
-        # Set diagram to None, so all refrences to the diagram are destroyed.
+        #self.widget.destroy()
+
-        self.owning_window.remove_tab(self)
-        self.set_diagram(None)

gaphor/trunk/gaphor/ui/mainwindow.py

@@ -140 +140 @@
-            )
-
-    toolbar =  ('FileOpen',
-                'separator',
-                'FileSave',
-                'FileSaveAs',
-                'separator',
-                'Undo',
-                'Redo',
-                'separator',
-                'ViewZoomIn',
-                'ViewZoomOut',
-                'ViewZoom100')
-    ns_popup = ('RenameModelElement',
-                'OpenModelElement',
-                'separator',
-                'CreateDiagram',
-                'DeleteDiagram',
-                'separator',
-                'RefreshNamespaceModel',
-                '<NamespacePopupSlot>')
-    # </old>
-
@@ -169 +150 @@
-      <ui>
-        <menubar name="mainwindow">
-name="file" 
+
-            <placeholder name="primary" />
-            <placeholder name="secondary" />
@@ -176 +157 @@
-            <menuitem action="file-quit" />
-          </menu>
-name="edit" 
+
-            <placeholder name="primary" />
-            <placeholder name="secondary" />
-            <placeholder name="ternary" />
-          </menu>
-name="diagram" 
+
-            <placeholder name="primary" />
-            <placeholder name="secondary" />
-            <placeholder name="ternary" />
-          </menu>
-name="window" action="window
+action="tools
-            <placeholder name="primary" />
-            <placeholder name="secondary" />
-            <placeholder name="ternary" />
-          </menu>
-
+
+
+
+
+
+
-            <placeholder name="primary" />
-            <placeholder name="secondary" />
@@ -204 +190 @@
-          <menuitem action="tree-view-open" />
-          <menuitem action="tree-view-rename" />
+          <separator />
+          <menuitem action="tree-view-create-diagram" />
+          <menuitem action="tree-view-delete-diagram" />
+          <separator />
+          <menuitem action="tree-view-refresh" />
-        </popup>
-      </ui>
-    """
-#            <menuitem name="New" action="FileNew" />
-#            <menuitem name="Open" action="FileOpen" />
-#            <menuitem name="Revert" action="FileRevert" />
-#            <menu name="Recent files" action="FileRecent">
-#              <placeholder action="RecentFiles" />
-#            </menu>
-#            <separator />
-#            <menuitem action="FileSave" />
-#            <menuitem action="FileSaveAs" />
-#            <placeholder action="SaveSlot" />
-#            <separator />
-#            <menu action="Import">
-#              <placeholder action="FileImportSlot" />
-#            </menu>
-#            <menu action="Export">
-#              <placeholder action="FileExportSlot" />
-#            </menu>
-#            <separator />
-#            <menuitem action="FileCloseTab" />
-#            <placeholder action="FileSlot" />
-#            <separator />
-
-#          <toolitem action="FileOpen" />
-#          <toolitem action="separator" />
-#          <toolitem action="FileSave" />
-#          <toolitem action="FileSaveAs" />
-#          <separator />
-#          <toolitem action="Undo" />
-#          <toolitem action="Redo" />
-#          <separator />
-#          <toolitem action="ViewZoomIn" />
-#          <toolitem action="ViewZoomOut" />
-#          <toolitem action="ViewZoom100" />
-
-#        <popup action="NamespacePopup">
-#          <menuitem action="RenameModelElement" />
-#          <menuitem action="OpenModelElement" />
-#          <separator />
-#          <menuitem action="CreateDiagram" />
-#          <menuitem action="DeleteDiagram" />
-#          <separator />
-#          <menuitem action="RefreshNamespaceModel" />
-#          <placeholder action="namespacePopupSlot" />
-#        </popup>
-
-    def __init__(self):
@@ -264 +211 @@
-                             ('edit', '_Edit'),
-                             ('diagram', '_Diagram'),
+                             ('tools', '_Tools'),
-                             ('window', '_Window'),
-                             ('help', '_Help')):
-            a = gtk.Action(name, label, None, None)
-is-important', Tru
+hide-if-empty', Fals
-            self.action_group.add_action(a)
-        self._tab_ui_settings = None
@@ -359 +307 @@
-        tab = DiagramTab(self)
-        tab.set_diagram(diagram)
-
+
+
+
+
-        return tab
-
@@ -385 +336 @@
-        
-        notebook = gtk.Notebook()
-        #notebook.popup_enable()
-        notebook.set_scrollable(True)
-        notebook.set_show_border(False)
-        #notebook.set_size_request(-1, 10000)
-
-        notebook.connect_after('switch-page', self._on_notebook_switch_page)
@@ -435 +384 @@
-        self.window.connect('destroy', self._on_window_destroy)
-
-        # TODO: add action_groups and menu_xml from NamespaceView
-
-#    def add_transient_window(self, window):
-#        """Add a window as a sub-window of the main application.
-#        """
-#        # Assign the window the accelerators od the main window too
-#        pass #window.get_window().add_accel_group(self.accel_group)
-#        #self._transient_windows.append(window)
-#        #window.connect(self.on_transient_window_closed)
-
-    # Notebook methods:
@@ -453 +393 @@
-        """
-        self.notebook_map[contents] = tab_id
+        #contents.connect('destroy', self._on_tab_destroy)
-        l = gtk.Label(label)
-        # Note: append_page() emits switch-page event
@@ -499 +440 @@
-                self.notebook.remove_page(num)
-                del self.notebook_map[p]
-                if self._tab_ui_settings:
-                    action_group, ui_id = self._tab_ui_settings
-                    self.ui_manager.remove_action_group(action_group)
-                    self.ui_manager.remove_ui(ui_id)
-                return
-
@@ -532 +469 @@
-        gtk.main_quit()
-
+    def _on_tab_destroy(self, widget):
+        tab = self.notebook_map[widget]
+        assert isinstance(tab, DiagramTab)
+        self.remove_tab(tab)
+
-    def _on_window_delete(self, window = None, event = None):
-        return not self.ask_to_close()
@@ -563 +505 @@
-        A dummy action is executed.
-        """
+        log.debug('Switching page to %d' % page_num)
-        if self._tab_ui_settings:
-            action_group, ui_id = self._tab_ui_settings
-            self.ui_manager.remove_action_group(action_group)
-            self.ui_manager.remove_ui(ui_id)
+            self.ui_manager.ensure_update()
-
-        content = self.notebook.get_nth_page(page_num)
@@ -575 +519 @@
-        ui_id = self.ui_manager.add_ui_from_string(tab.menu_xml)
-        self._tab_ui_settings = tab.action_group, ui_id
+        self.ui_manager.ensure_update()
+        log.debug('Menus updated with %s, %d' % self._tab_ui_settings)
-
-    def _on_window_size_allocate(self, window, allocation):
+        """
+        Store the window size in a property.
+        """
-        self.properties.set('ui.window-size', (allocation.width, allocation.height))
-
-    def _on_window_destroy(self, window):
-        self.quit()
-
-    def _on_object_inspector_notify_position(self, paned, arg):
-        self.properties.set('ui.object-inspector-position',
-                     paned.get_position())
-
-#    def on_transient_window_closed(self, window):
-#        assert window in self._transient_windows
-#        log.debug('%s closed.' % window)
-#        self._transient_windows.remove(window)
-
-    # Actions:
@@ -617 +558 @@
-        cell.set_property('editable', 0)
-
+    @action(name='tree-view-create-diagram', label=_('_New diagram'), stock_id='gaphor-diagram')
+    def tree_view_create_diagram(self):
+        element = self._tree_view.get_selected_element()
+        diagram = self.element_factory.create(UML.Diagram)
+        diagram.package = element
+
+        diagram.name = '%s diagram' % element.name
+
+        self.select_element(diagram)
+        self.show_diagram(diagram)
+        self.tree_view_rename_selected()
+
+    @action(name='tree-view-delete-diagram', label=_('_Delete diagram'), stock_id='gtk-delete')
+    def tree_view_delete_diagram(self):
+        diagram = self._tree_view.get_selected_element()
+        assert isinstance(diagram, UML.Diagram)
+        m = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_QUESTION,
+                              gtk.BUTTONS_YES_NO,
+                              'Do you really want to delete diagram %s?\n\n'
+                              'This will possibly delete diagram items\n'
+                              'that are not shown in other diagrams.\n'
+                              'This operation is not undoable!' \
+                              % (diagram.name or '<None>'))
+        if (m.run() == gtk.RESPONSE_YES):
+            diagram.unlink()
+        m.destroy()
+
+    @action(name='tree-view-refresh', label=_('_Refresh'))
+    def tree_view_refresh(self):
+        self._tree_view.get_model().refresh()
+
-
-gtk.accel_map_add_filter('gaphor')

gaphor/trunk/setup.py

@@ -86 +86 @@
-            'gui_manager = gaphor.services.guimanager:GUIManager',
-            'action_manager = gaphor.services.actionmanager:ActionManager',
+            'help = gaphor.services.helpservice:HelpService',
-        ],
-        'gaphor.uicomponents': [
@@ -123 +124 @@
-)
- 
-e
+w