Changeset 1188

Timestamp:

04/02/07 23:10:36 (2 years ago)

Author:

arj..@yirdis.nl

Message:

updated properties on directories

Files:

• gaphor/trunk (modified) (1 prop)
• gaphor/trunk/data (modified) (1 prop)
• gaphor/trunk/data/pixmaps (modified) (1 prop)
• gaphor/trunk/doc (modified) (1 prop)
• gaphor/trunk/gaphor (modified) (1 prop)
• gaphor/trunk/gaphor/UML (modified) (1 prop)
• gaphor/trunk/gaphor/__init__.py (modified) (2 diffs)
• gaphor/trunk/gaphor/application.py (modified) (1 diff)
• gaphor/trunk/gaphor/diagram (modified) (1 prop)
• gaphor/trunk/gaphor/misc (modified) (1 prop)
• gaphor/trunk/gaphor/services/pluginmanager.py (modified) (4 diffs)
• gaphor/trunk/gaphor/ui (modified) (1 prop)
• gaphor/trunk/po (modified) (1 prop)
• gaphor/trunk/setup.py (modified) (2 diffs)
• gaphor/trunk/tests (modified) (1 prop)
• gaphor/trunk/utils (modified) (1 prop)

gaphor/trunk/gaphor/__init__.py

@@ -40 +40 @@
-            self.args = args
-
+
+def new_main(gaphor_file=None):
+    """
+    Not yet used. see main() below.
+    """
+    from gaphor.application import Application
+    Application.init()
+
+    # backwards compatible
+    main_window = resource("MainWindow", Application.main_window)
+
+    if gaphor_file:
+        main_window.set_filename(gaphor_file)
+        main_window.execute_action('FileRevert')
+    else:
+        main_window.execute_action('FileNew')
+    Application.run()
+    Application.shutdown()
+
+
-def main(gaphor_file=None):
-
+
+
-
-    This involves importing plugins and creating the main window.
@@ -56 +77 @@
-    from ui.mainwindow import MainWindow
-
-bootstrap(
+init(None
-
-    ui.load_accel_map()

gaphor/trunk/gaphor/application.py

@@ -20 +20 @@
-class _Application(object):
-
+    # interface.implements(IApplication)
+    
-    def __init__(self):
-        self.services = {

gaphor/trunk/gaphor/services/pluginmanager.py

@@ -53 +53 @@
-    A plugin represents one plugin loaded from the file system.
-    """
-    interface.implements(IService)
-
-    def __init__(self):
@@ -65 +64 @@
-        self.module = None
-        self.status = ''
-
-    def init(self, app):
-        self._app = app
-
-    def requirements_met(self, manager):
@@ -301 +297 @@
-    """
-
+    interface.implements(IService)
+
-    def __init__(self):
-        self.plugins = odict()
@@ -310 +308 @@
-        self.parser.setFeature(handler.feature_namespaces, 1)
-        self.parser.setContentHandler(self.loader)
+
+    def init(self, app):
+        self._app = app
+        self.bootstrap()
-
-    def bootstrap(self):

gaphor/trunk/setup.py

@@ +1 @@
+"""
+Setup script for Gaphor.
+
+Run 'python setup.py develop' to set up a development environment, including
+dependencies.
+
+Run 'python setup.py run' to start Gaphor directly (without install).
+"""
-
-import sys
@@ -84 +92 @@
-
-    entry_points = {
-#        'distutils.commands': [
-#            'build_uml = utils.command.build_uml:build_uml',
-#            'build_pot = utils.command.build_pot:build_pot',
-#            'build_mo = utils.command.build_mo:build_mo',
-#            'install_mo = utils.command.install_mo:install_mo',
-#            'build_version = utils.command.build_version:build_version',
-#            'install_version = utils.command.install_version:install_version',
-#            'run  = utils.command.run :run ',
-#        ],
-        'console_scripts': [
-            'gaphor = gaphor:main',
+        ],
+        'gaphor.services': [
+            'undo_manager = gaphor.services.undomanager:UndoManager',
+            'plugin_manager = gaphor.services.pluginmanager:PluginManager',
-        ],
-    },