X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos.py;h=a5610a75b6e74f919ea9618a89780bf5e2a52112;hb=59b722f4223ca77d5d37f1fba79301bafb621872;hp=f178a0a04174db2adf2ee7515afdcc55dd212952;hpb=e2d74f4537238431847a972b8aa86e730775f3ed;p=bertos.git

diff --git a/wizard/bertos.py b/wizard/bertos.py
index f178a0a0..a5610a75 100755
--- a/wizard/bertos.py
+++ b/wizard/bertos.py
@@ -1,8 +1,32 @@
 #!/usr/bin/env python
 # encoding: utf-8
 #
+# This file is part of BeRTOS.
+#
+# Bertos is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# As a special exception, you may use this file as part of a free software
+# library without restriction.  Specifically, if other files instantiate
+# templates or use macros or inline functions from this file, or you compile
+# this file and link it with other files to produce an executable, this
+# file does not by itself cause the resulting executable to be covered by
+# the GNU General Public License.  This exception does not however
+# invalidate any other reasons why the executable file might be covered by
+# the GNU General Public License.
+#
 # Copyright 2008 Develer S.r.l. (http://www.develer.com/)
-# All rights reserved.
 #
 # $Id$
 #
@@ -31,6 +55,8 @@ from BOutputPage import BOutputPage
 from BCreationPage import BCreationPage
 from BFinalPage import BFinalPage
 
+from BEditingDialog import BEditingDialog
+
 import bertos_utils
 
 def newProject():
@@ -38,12 +64,22 @@ def newProject():
     wizard = BWizard.BWizard(page_list)
     wizard.show()
     wizard.exec_()
+    project = QApplication.instance().project
+    to_be_opened = project.info("TO_BE_OPENED")
+    command_lines = project.info("COMMAND_LINES")
+    relevant_files = project.info("RELEVANT_FILES")
+    if to_be_opened:
+        for ide in to_be_opened:
+            command_line = command_lines[ide]
+            relevant_file = relevant_files[ide]
+            import subprocess
+            subprocess.call(command_line + " \"" + relevant_file + "\"")
+    sys.exit()
     
-def editProject():
-    page_list = [BOpenPage, BVersionPage, BCpuPage, BToolchainPage, BModulePage, BOutputPage, BCreationPage, BFinalPage]
-    wizard = BWizard.BWizard(page_list)
-    wizard.show()
-    wizard.exec_()
+def editProject(project_file):
+    QApplication.instance().project = bertos_utils.loadBertosProject(project_file)
+    dialog = BEditingDialog()
+    dialog.exec_()
 
 def showStartPage():
     QApplication.instance().dialog = BStartPage.BStartPage()
@@ -60,18 +96,11 @@ def main():
     if not (hasattr(sys, "frozen") and sys.frozen) and newer("bertos.qrc", "bertos.rcc"):
         os.system("rcc -binary bertos.qrc -o bertos.rcc")
     QResource.registerResource("bertos.rcc")
-    if "--create" in sys.argv and "--edit" not in sys.argv:
-        newProject()
-    elif "--edit" in sys.argv and "--create" not in sys.argv:
-        editProject()
-    elif "--create" in sys.argv and "--edit" in sys.argv:
-        # TODO need an explaining message
-        print " ".join(sys.argv)
-        print "Invalid usage!"
-        pass
+    if len(sys.argv) == 3 and sys.argv[1] == "--edit":
+        editProject(sys.argv[2])
     else:
-        showStartPage()
-        sys.exit(app.exec_())
+        newProject()
+ 
 
 if __name__ == '__main__':
     main()