[pygccxml-commit] SF.net SVN: pygccxml:[1446] ui

[<rom...@us...>]

Revision: 1446
          http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1446&view=rev
Author:   roman_yakovenko
Date:     2008-10-23 05:40:53 +0000 (Thu, 23 Oct 2008)

Log Message:
-----------
concentrating all UI modules in a single place

Modified Paths:
--------------
    pyplusplus_dev/setup.py
    ui/ide/_dev_run_ide_.py
    ui/simple/ui.py
    ui/simple/ui_runner.py

Added Paths:
-----------
    ui/ide/
    ui/simple/

Removed Paths:
-------------
    pyplusplus_dev/ide/
    pyplusplus_dev/pyplusplus/gui/

Modified: pyplusplus_dev/setup.py
===================================================================
--- pyplusplus_dev/setup.py	2008-10-22 21:55:39 UTC (rev 1445)
+++ pyplusplus_dev/setup.py	2008-10-23 05:40:53 UTC (rev 1446)
@@ -98,7 +98,6 @@
        scripts = ["scripts/pyplusplus_gui",
                   "scripts/pyplusplus_gui.pyw"],
        packages=[ 'pyplusplus',
-                  'pyplusplus.gui',
                   'pyplusplus.file_writers',
                   'pyplusplus.code_creators',
                   'pyplusplus.module_creator',


Property changes on: ui/ide
___________________________________________________________________
Added: svn:ignore
   + .settings
.project
.pydevproject

Added: svn:mergeinfo
   + 

Modified: ui/ide/_dev_run_ide_.py
===================================================================
--- pyplusplus_dev/ide/_dev_run_ide_.py	2008-10-22 21:55:39 UTC (rev 1445)
+++ ui/ide/_dev_run_ide_.py	2008-10-23 05:40:53 UTC (rev 1446)
@@ -1,11 +1,11 @@
 import sys
 
-sys.path.append( '..' )
 sys.path.append( '../../pygccxml_dev' )
+sys.path.append( '../../pyplusplus_dev' )
 
 import pygccxml
 import pyplusplus
 
 import ide
 
-ide.main()
\ No newline at end of file
+ide.main()


Property changes on: ui/simple
___________________________________________________________________
Added: svn:ignore
   + *.pyc

Added: svn:mergeinfo
   + 

Modified: ui/simple/ui.py
===================================================================
--- pyplusplus_dev/pyplusplus/gui/ui.py	2008-10-22 21:55:39 UTC (rev 1445)
+++ ui/simple/ui.py	2008-10-23 05:40:53 UTC (rev 1446)
@@ -117,8 +117,9 @@
         this_module_dir_path = os.path.abspath ( os.path.dirname( sys.modules[__name__].__file__) )
         this_module_dir_path = this_module_dir_path.replace( '\\', '/' )
         this_module_dir_path = this_module_dir_path.lower()
-        if this_module_dir_path.endswith( '/sources/pyplusplus_dev/pyplusplus/gui' ):
-            gccxml_09_path = os.path.join( this_module_dir_path, '..', '..', '..', 'gccxml_bin', 'v09', sys.platform, 'bin' )
+        if this_module_dir_path.endswith( 'sources/ui/simple' ):
+            gccxml_09_path = os.path.join( this_module_dir_path, '..', '..', 'gccxml_bin', 'v09', sys.platform, 'bin' )
+            
             self._gccxml_location.insert( 0, gccxml_09_path )
             
     def _select_gccxml_executable( self ):

Modified: ui/simple/ui_runner.py
===================================================================
--- pyplusplus_dev/pyplusplus/gui/ui_runner.py	2008-10-22 21:55:39 UTC (rev 1445)
+++ ui/simple/ui_runner.py	2008-10-23 05:40:53 UTC (rev 1446)
@@ -13,11 +13,18 @@
 import os
 import sys
 
-#pygccxml
-sys.path.append( os.path.abspath( './../../../pygccxml_dev' ) )
-#pyplusplus
-sys.path.append( os.path.abspath( './../..' ) )
+this_module_dir_path = os.path.abspath ( os.path.dirname( sys.modules[__name__].__file__) )
+projects_root_dir = os.path.dirname( os.path.dirname( this_module_dir_path ) )
 
+sys.path.insert( 0, os.path.join( this_module_dir_path, 'web.zip' ) )
+
+if os.path.exists( os.path.join( projects_root_dir, 'pygccxml_dev' ) ):
+    sys.path.append( os.path.join( projects_root_dir, 'pygccxml_dev' ) )
+if os.path.exists( os.path.join( projects_root_dir, 'pyplusplus_dev' ) ):    
+    sys.path.append( os.path.join( projects_root_dir, 'pyplusplus_dev' ) )
+#else use installed modules 
+
+
 import ui
 if __name__ == '__main__':
-    ui.show_demo()
\ No newline at end of file
+    ui.show_demo()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.