X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos.py;h=24d61e03ff14f1cf49201535889d6adffdfdbd99;hb=4b501c175222af60573616b51e00adf00c13830f;hp=edb131d67663c3f27282f592222dbefe158febf5;hpb=efa322fd22f708abb3cb46c750908b065ba6290e;p=bertos.git

diff --git a/wizard/bertos.py b/wizard/bertos.py
index edb131d6..24d61e03 100755
--- a/wizard/bertos.py
+++ b/wizard/bertos.py
@@ -47,6 +47,7 @@ import BProject
 import BStartPage
 import BWizard
 
+from BIntroPage import BIntroPage
 from BFolderPage import BFolderPage
 from BOpenPage import BOpenPage
 from BVersionPage import BVersionPage
@@ -64,7 +65,7 @@ import bertos_utils
 from LoadException import VersionException, ToolchainException
 
 def newProject():
-    page_list = [BFolderPage, BVersionPage, BCpuPage, BToolchainPage, BModulePage, BOutputPage, BCreationPage, BFinalPage]
+    page_list = [BIntroPage, BFolderPage, BVersionPage, BCpuPage, BToolchainPage, BModulePage, BOutputPage, BCreationPage, BFinalPage]
     wizard = BWizard.BWizard(page_list)
     wizard.show()
     wizard.exec_()
@@ -118,6 +119,7 @@ def showStartPage():
     QApplication.instance().dialog.show()
 
 def main():
+    rundir = os.getcwd()
     os.chdir(os.path.dirname(os.path.abspath(sys.argv[0])))
     app = QApplication(sys.argv)
     app.settings = QSettings("Develer", "Bertos Configurator")
@@ -127,7 +129,7 @@ def main():
         os.system("rcc -binary bertos.qrc -o bertos.rcc")
     QResource.registerResource("bertos.rcc")
     if len(sys.argv) == 3 and sys.argv[1] == "--edit":
-        editProject(sys.argv[2])
+        editProject(os.path.join(rundir, sys.argv[2]))
     else:
         newProject()