Changeset 1262

Timestamp:

05/09/07 21:10:43 (1 year ago)

Author:

arj..@yirdis.nl

Message:

Migrated main window to gtk.UIManager menus. All functionality has still to be ported though.

Files:

• gaphor/trunk/TODO (modified) (1 diff)
• gaphor/trunk/gaphor/actions/mainactions.py (modified) (6 diffs)
• gaphor/trunk/gaphor/actions/placementactions.py (modified) (1 diff)
• gaphor/trunk/gaphor/application.py (modified) (3 diffs)
• gaphor/trunk/gaphor/services/guimanager.py (modified) (3 diffs)
• gaphor/trunk/gaphor/ui/consolewindow.py (modified) (3 diffs)
• gaphor/trunk/gaphor/ui/mainwindow.py (modified) (23 diffs)
• gaphor/trunk/gaphor/ui/tests/test_mainwindow.py (modified) (1 diff)
• gaphor/trunk/gaphor/ui/toolbox.py (modified) (4 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
+
+ - Placement actions should be instantiated on a per-view basis. the view's
+   action_group should be added/removed when visible/hidden.
+
+ - Toolbox should proxy gtk.Action in stead of using the Menu Factory.
+
+ - fix settings for new actions (PlacementEvent?) by using subscribtions or handlers.
-
- - filename should not be part of the main window

gaphor/trunk/gaphor/actions/mainactions.py

@@ -1 @@
-# vim: sw=4:et
-"""
-Main window actions.
@@ -105 +104 @@
-        #stereotypes.name = 'Stereotypes'
-        self._window.set_filename(None)
-
+#
-        element_factory.notify_model()
-
@@ -155 +154 @@
-                error_handler(message='Error while loading model from file %s' % filename, exc_info=worker.exc_info)
-
-
+#
-            model = self._window.get_model()
-            view = self._window.get_tree_view()
@@ -347 +346 @@
-        ew.construct()
-        self._window.add_transient_window(ew)
-
+#
-
-register_action(OpenEditorWindowAction)
@@ -366 +365 @@
-        ew.construct()
-        self._window.add_transient_window(ew)
-
+#
-
-register_action(OpenConsoleWindowAction)
@@ -723 +722 @@
-register_slot('RecentFiles', RecentFilesSlot)
-
+# vim: sw=4:et

gaphor/trunk/gaphor/actions/placementactions.py

@@ -89 +89 @@
-
-    def item_factory(self):
-
+
+
+
-        subject = None
-        if self.subject_type:

gaphor/trunk/gaphor/application.py

@@ -24 +24 @@
-        self._uninitialized_services = {}
-
-
+, services=None
-        """
-        Initialize the application.
-        """
-
+services
-        self.init_all_services()
-
-
+, services=None
-        """
-        Load services from resources.
@@ -44 +44 @@
-            if not IService.implementedBy(cls):
-                raise 'MisConfigurationException', 'Entry point %s doesn''t provide IService' % ep.name
-
-
+
+
+
-
-    def init_all_services(self):
@@ -92 +93 @@
-
-def restart():
+    global Application
-    Application.shutdown()
-    Application = _Application()

gaphor/trunk/gaphor/services/guimanager.py

@@ -4 +4 @@
-import pkg_resources
-from zope import interface
-
+, IActionProvider
-
-
@@ -53 +53 @@
-            uicomp.ui_manager = self.ui_manager
-            self._ui_components[ep.name] = uicomp
-
+
+
+
+
-    def init_main_window(self):
-        from gaphor.ui.accelmap import load_accel_map
@@ -60 +63 @@
-
-        load_accel_map()
-
-
-
-
-
-
+
-        self._main_window.construct()
-
-        # When the state changes to CLOSED, quit the application
-
-
+
-    def init_actions(self):
-        from gaphor.actions import diagramactions, editoractions, mainactions

gaphor/trunk/gaphor/ui/consolewindow.py

@@ -4 +4 @@
-import sys
-import gtk
+from zope import interface
-import gaphor
-from gaphor.interfaces import IActionProvider
@@ -9 +10 @@
-from gaphor.action import action, build_action_group
-from gaphor.misc.console import GTKInterpreterConsole
-zope import interface
+toplevelwindow import ToplevelWindow
-
-
+
+
-    
-, IUIComponent
+
-
-    menu_xml = """
-        <ui>
-action
-_Window" action="
+name
+Window
-              <menuitem name='_Console' action="ConsoleWindow:open" />
-            </menu>
-          </menubar>
-action
-
+name
+File
-              <menuitem name='_Close' action="ConsoleWindow:close" />
-            </menu>
@@ -45 +47 @@
-        return console
-
-    def construct(self):
-        self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
-        self.window.set_title(self.title)
-        self.window.set_size_request(*self.size)
-        self.window.set_resizable(True)
-
-        vbox = gtk.VBox()
-        self.window.add(vbox)
-        vbox.show()
-
-        self.ui_manager.insert_action_group(self.action_group, 0)
-        self.ui_manager.add_ui_from_string(self.menu_xml)
-
-        self.window.add_accel_group(self.ui_manager.get_accel_group())
-
-        menubar = self.ui_manager.get_widget(self.menubar_path)
-        vbox.pack_start(menubar, expand=False)
-        
-        if self.toolbar_path:
-            toolbar = self.ui_manager.get_widget(self.toolbar_path)
-            vbox.pack_start(toolbar, expand=False)
-
-        vbox.pack_end(self.ui_component(), expand=True)
-
-        # TODO: add statusbar
-        self.window.show_all()
-
-    @action(name='Menu', label='_File')
-    def dummy(self): pass
-
-    @action(name='ConsoleWindow:open', label='Console')
-    def open(self):

gaphor/trunk/gaphor/ui/mainwindow.py

@@ -1 @@
-
-
+
+
+
-
-import gtk
-
-
-
+
+
+
-
-from gaphor import UML
-from gaphor.core import inject
+from gaphor.action import action, build_action_group
-from gaphor.i18n import _
-from gaphor.ui import namespace
-
+#
-from gaphor.ui.diagramtab import DiagramTab
-from gaphor.ui.toolbox import Toolbox
-from gaphor.ui.menufactory import toolbox_to_menu
+from toplevelwindow import ToplevelWindow
-
-from gaphor.ui.objectinspector import ObjectInspector
@@ -21 +25 @@
-from interfaces import IUIComponent, IDiagramElementReceivedFocus
-from gaphor.interfaces import IServiceEvent
-
-
-Abstract
+
+
+Toplevel
-    """
-    The main window for the application.
@@ -32 +36 @@
-    properties = inject('properties')
-    element_factory = inject('element_factory')
-
+
+
+
-    toolbox = (
-        ('', (
@@ -158 +164 @@
-                'RefreshNamespaceModel',
-                '<NamespacePopupSlot>')
+    # </old>
+
+    title = 'Gaphor'
+    size = property(lambda s: s.properties.get('ui.window-size', (760, 580)))
+    menubar_path = '/mainwindow'
+    toolbar_path = '/mainwindow_toolbar'
-
-    menu_xml = """
-      <ui>
-menu
+window
-          <menu name="FileMenu" action="FileMenu">
-            <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>
-            <menuitem action="FileQuit" />
-          </menu>
+          <menu name="EditMenu" action="EditMenu"/>
+          <menu name="DiagramMenu" action="DiagramMenu"/>
+          <menu name="WindowMenu" action="WindowMenu"/>
-        </menubar>
-
-
-
-
-
-
-
-
-
-
-
-
+
-        </toolbar>
-        <toolbar action="tools">
@@ -214 +197 @@
-      </ui>
-    """
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    def __init__(self):
-Abstract
+Toplevel
-        self._filename = None
-        #self._transient_windows = []
-        self.notebook_map = {}
+        # Tree view:
+        self._model = None
+        self._view = None 
+
+        self.action_group = build_action_group(self)
+        for name, label in (('FileMenu', '_File'),
+                             ('EditMenu', '_Edit'),
+                             ('DiagramMenu', '_Diagram'),
+                             ('WindowMenu', '_Window')):
+            self.action_group.add_action(gtk.Action(name, label, None, None))
-
-    def get_model(self):
@@ -226 +250 @@
-        (shown on the left side in a TreeView).
-        """
-
-
+
+
+
-
-    def get_tree_view(self):
@@ -234 +259 @@
-        See also get_model().
-        """
-
+
+
+
-
-    def set_filename(self, filename):
@@ -248 +275 @@
-                recent_files = [filename] + recent_files[:8]
-                self.properties.set('recent-files', recent_files)
-
+
+
-
-    def get_filename(self):
@@ -255 +283 @@
-        """
-        return self._filename
-
-#    def get_transient_windows(self):
-#        """Get the windows that act as child windows of the main window.
-#        """
-#        return self._transient_windows
-
-    def get_current_diagram_tab(self):
@@ -278 +301 @@
-
-    def get_current_diagram_view(self):
-
+
+
-        See also: get_current_diagram_tab(), get_current_diagram().
-        """
@@ -288 +312 @@
-        Ask user to close window.
-        """
-get_window()
+window
-            gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
-            gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO,
@@ -297 +321 @@
-
-    def show_diagram(self, diagram):
-
+
+
-        If a tab is already open, show that one instead.
-        """
@@ -311 +336 @@
-        return tab
-
-
-
+
+
+
-        """
-        model = namespace.NamespaceModel(self.element_factory)
@@ -347 +373 @@
-        component.provideHandler(diagramReceivedFocus)
-        
-P
-P
+_p
+_p
-                                 int(self.properties.get('ui.object-inspector-position', 600)))
-P
-P
-P
-P
+_p
+_p
+_p
+_p
-        paned.show_all()
-
-P
+_p
-                            self.on_object_inspector_notify_position)
-
-        self.notebook = notebook
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        self.window.connect('delete-event', self._on_window_delete)
-
-        vbox.set_border_width(3)
-
-        toolbox = Toolbox(self.menu_factory, self.toolbox)
-        toolbox.construct()
-        #toolbox.connect('toggled', self.on_toolbox_toggled)
-        vbox.pack_start(toolbox, expand=False)
-        toolbox.show()
-
-        self._toolbox = toolbox
-
-        # We want to store the window size, so it can be reloaded on startup
-        self.window.set_property('allow-shrink', True)
-        self.window.connect('size-allocate', self.on_window_size_allocate)
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-    # Notebook methods:
-
-    def new_tab(self, window, contents, label):
-
+
+
-        Returns: The page number of the tab.
-        """
-        #contents = tab.get_contents()
-        l = gtk.Label(label)
-        #img = gtk.Image()
-        #img.set_from_stock('gtk-close', gtk.ICON_SIZE_MENU)
-        #b = gtk.Button()
-        #b.set_border_width(0)
-        #b.add(img)
-        #h = gtk.HBox()
-        #h.set_spacing(4)
-        #h.pack_start(l, expand=False)
-        #h.pack_start(b, expand=False)
-        #h.show_all()
-        self.notebook.append_page(contents, l)
-        page_num = self.notebook.page_num(contents)
@@ -419 +436 @@
-
-    def get_current_tab(self):
-
+
+
-        notebook.
-        """
@@ -427 +445 @@
-
-    def set_current_page(self, tab):
-
+
+
-        """
-        for p, t in self.notebook_map.iteritems():
@@ -459 +478 @@
-
-    def select_element(self, element):
-
+
+
-        The element is selected. After this an action may be executed,
-        such as OpenModelElement, which will try to open the element (if it's
@@ -476 +496 @@
-
-    def _on_window_destroy(self, window):
-
-
-
-
-
+
+
+
+
+
+
+
-
-    def _on_window_delete(self, window = None, event = None):
@@ -486 +508 @@
-
-    def on_view_event(self, view, event):
-
-
-
-
+
+
+
-        # handle mouse button 3:
-        if event.type == gtk.gdk.BUTTON_PRESS and event.button == 3:
@@ -495 +516 @@
-
-    def on_view_row_activated(self, view, path, column):
-Double click on an element in the tree view.
-"""
-self._check_state(AbstractWindow.STATE_ACTIVE)
+
+Double click on an element in the tree view.
+"""
-        self.action_manager.execute('OpenModelElement')
-        # Set the pointer tool as default tool.
@@ -503 +524 @@
-
-    def on_view_cursor_changed(self, view):
-
+
+
-        """
-        self.action_manager.execute('SelectRow')
-
-    def on_notebook_switch_page(self, notebook, tab, page_num):
-
+
+
-        A dummy action is executed.
-        """
@@ -515 +538 @@
-    def on_window_size_allocate(self, window, allocation):
-        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):
@@ -525 +551 @@
-#        self._transient_windows.remove(window)
-
-
-
+
+
+
+
+
-
-gtk.accel_map_add_filter('gaphor')
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+

gaphor/trunk/gaphor/ui/tests/test_mainwindow.py

@@ -1 +1 @@
-
+import gtk
-import unittest
-
-from gaphor.ui.mainwindow import MainWindow
-
+
-
-class MainWindowTestCase(unittest.TestCase):
-
+    def setUp(self):
+        from gaphor.application import restart, Application
+        restart()
+        Application.init(services=['element_factory', 'properties', 'action_manager'])
+
-    def test_creation(self):
-        # MainWindow should be created as resource
-
-
-
-
-
+
+
+
+
-        self.assertEqual(main_w.get_current_diagram(), None)
-

gaphor/trunk/gaphor/ui/toolbox.py

@@ -7 +7 @@
-
-from gaphor.core import inject
+
+#from gaphor.ui.wrapbox import WrapBox
+
-
-class Toolbox(gtk.VBox):
@@ -18 +21 @@
-    The toolbox is generated based on a definition with the form:
-    ('name', ('boxAction1', 'boxAction2',...), 'name2', ('BoxActionN',...))
+
+    1 Create action pool for placement actions
+    2 Create gtk.RadioButtons for each item.
+    3 connect to action
-    """
-
@@ -87 +94 @@
-        button.connect('clicked', self.on_wrapbox_decorator_toggled, content)
-
-        #AJM: vbox.pack_start(content, True, True)
-        
-        vbox.label = label
-        vbox.content = content
@@ -140 +145 @@
-                self.boxes.append(wrapbox)
-
+
-# vim:sw=4:et:ai