Changeset 1260

Timestamp:

05/08/07 03:24:46 (2 years ago)

Author:

arj..@yirdis.nl

Message:

Some more work on new GUI management

Files:

• gaphor/trunk/gaphor/services/guimanager.py (modified) (3 diffs)
• gaphor/trunk/gaphor/ui/consolewindow.py (modified) (4 diffs)
• gaphor/trunk/gaphor/ui/interfaces.py (modified) (1 diff)
• gaphor/trunk/gaphor/ui/tests/test_consolewindow.py (modified) (1 diff)
• gaphor/trunk/setup.py (modified) (1 diff)

gaphor/trunk/gaphor/services/guimanager.py

@@ -2 +2 @@
-"""
-
+import pkg_resources
-from zope import interface
-from gaphor.interfaces import IService
@@ -19 +20 @@
-
-        #self.init_pygtk()
+        self.init_ui_manager()
-        self.init_stock_icons()
-        self.init_actions()
+        self.init_ui_components()
-        self.init_main_window()
-
@@ -31 +34 @@
-        del pygtk
-
+    def init_ui_manager(self):
+        import gtk
+        self.ui_manager = gtk.UIManager()
+
-    def init_stock_icons(self):
-        # Load stock items
-        import gaphor.ui.stock
-        gaphor.ui.stock.load_stock_icons()
+
+    def init_ui_components(self):
+        from gaphor.ui.interfaces import IUIComponent
+        for ep in pkg_resources.iter_entry_points('gaphor.uicomponents'):
+            log.debug('found entry point uicomponent.%s' % ep.name)
+            cls = ep.load()
+            if not IUIComponent.implementedBy(cls):
+                raise 'MisConfigurationException', 'Entry point %s doesn''t provide IUIComponent' % ep.name
+            uicomp = cls()
+            uicomp.ui_manager = self.ui_manager
+            self._ui_components[ep.name] = uicomp
-
-    def init_main_window(self):

gaphor/trunk/gaphor/ui/consolewindow.py

@@ -6 +6 @@
-import gaphor
-from gaphor.interfaces import IActionProvider
+from gaphor.ui.interfaces import IUIComponent
-from gaphor.action import action, build_action_group
-from gaphor.misc.console import GTKInterpreterConsole
@@ -12 +13 @@
-class ConsoleWindow(object):
-    
-
+, IUIComponent
-
-    menu_xml = """
-        <ui>
+          <menubar action="mainwindow">
+            <menu name="_Window" action="Menu">
+              <menuitem name='_Console' action="ConsoleWindow:open" />
+            </menu>
+          </menubar>
-          <menubar action="consolewindow">
-File
-_
+
+:
-            </menu>
-          </menubar>
@@ -24 +30 @@
-        """
-
-
+
+
+
+
-
-    def __init__(self):
-        self.action_group = build_action_group(self)
+        self.window = None
+        self.ui_manager = None # injected
+
+    def ui_component(self):
+        console = GTKInterpreterConsole()
+        console.show()
+        return console
-
-    def construct(self):
-        console = GTKInterpreterConsole()
-        console.show()
-
-        #self._construct_window(name='console',
-        #                       title='Gaphor Console',
-        #                       size=(400, 400),
-        #                       contents=console)
-        self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
-'Gaphor Console'
-400, 400
+self.title
+*self.size
-        self.window.set_resizable(True)
-
-        self.ui_manager = gtk.UIManager()
-        self.ui_manager.insert_action_group(self.action_group, 0)
-        self.ui_manager.add_ui_from_string(self.menu_xml)
-
-        menubar = self.ui_manager.get_widget('/consolewindow')
-
-        vbox = gtk.VBox()
@@ -52 +55 @@
-        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)
-
+
+
+
+
+
+
-
-        # TODO: add statusbar
-        self.window.show_all()
-
-File
+
-    def dummy(self): pass
-
-
+
+
+
+
+
+
+
+
-    def close(self):
-        self.window.destroy()
-
-
-
+
-

gaphor/trunk/gaphor/ui/interfaces.py

@@ -14 +14 @@
-    """A user interface component"""
-    
+    ui_manager = interface.Attribute("The gtk.UIManager, set after construction")
+    def construct(self):
+        """
+        Create and display the UI components (windows).
+        """
+
+    #title = interface.Attribute("Title for the window")
+    #size = interface.Attribute("initial window size (width, height)")
+    #menubar_path = interface.Attribute("UIManager path for menu bar")
+    #toolbar_path = interface.Attribute("UIManager path for tool bar")
+
+    #def ui_component(self):
+    #    """Create the UI component to be shown in a window."""
+
+
-class IDetailsPage(IUIComponent):
-    """A property page which can display itself in a notebook"""

gaphor/trunk/gaphor/ui/tests/test_consolewindow.py

@@ -6 +6 @@
-
-    def test1(self):
+        import gtk
+        ui_manager = gtk.UIManager()
-        window = ConsoleWindow()
-
+
+
-        window.construct()
-        window.close()

gaphor/trunk/setup.py

@@ -86 +86 @@
-            'element_factory = gaphor.UML.elementfactory:ElementFactory',
-        ],
-adapter
-connectors = gaphor.adapters.connectors
-editors = gaphor.adapters.editors
+uicomponent
+mainwindow = gaphor.ui.mainwindow:MainWindow
+consolewindow = gaphor.ui.consolewindow:ConsoleWindow
-        ],
-    },