Update preset.

[bertos.git] / wizard / bertos.py

diff --git a/wizard/bertos.py b/wizard/bertos.py
index 24d61e03ff14f1cf49201535889d6adffdfdbd99..1608334c57c2904a32362d09194982cae1c72f2d 100755 (executable)
--- a/wizard/bertos.py
+++ b/wizard/bertos.py
@@ -28,7 +28,6 @@
 #
 # Copyright 2008 Develer S.r.l. (http://www.develer.com/)
 #
 #
 # Copyright 2008 Develer S.r.l. (http://www.develer.com/)
 #

-# $Id$

 #
 # Author: Lorenzo Berni <duplo@develer.com>
 #
 #
 # Author: Lorenzo Berni <duplo@develer.com>
 #


@@ -42,31 +41,32 @@ from PyQt4.QtGui import *
 
 import exception_handler
 
 
 import exception_handler
 

-import BProject
+from BProject import BProject

 
 

-import BStartPage
-import BWizard
+from BWizard import BWizard

 
 from BIntroPage import BIntroPage
 from BFolderPage import BFolderPage
 
 from BIntroPage import BIntroPage
 from BFolderPage import BFolderPage

+from BBoardPage import BBoardPage
+from BProjectPresets import BProjectPresets

 from BOpenPage import BOpenPage
 from BVersionPage import BVersionPage
 from BCpuPage import BCpuPage
 from BToolchainPage import BToolchainPage
 from BModulePage import BModulePage
 from BOpenPage import BOpenPage
 from BVersionPage import BVersionPage
 from BCpuPage import BCpuPage
 from BToolchainPage import BToolchainPage
 from BModulePage import BModulePage

-from BOutputPage import BOutputPage

 from BCreationPage import BCreationPage
 from BFinalPage import BFinalPage
 
 from BEditingDialog import BEditingDialog, BVersionDialog, BToolchainDialog
 
 from BCreationPage import BCreationPage
 from BFinalPage import BFinalPage
 
 from BEditingDialog import BEditingDialog, BVersionDialog, BToolchainDialog
 

-import bertos_utils
+from const import DATA_DIR

 
 from LoadException import VersionException, ToolchainException
 
 def newProject():
 
 from LoadException import VersionException, ToolchainException
 
 def newProject():

-    page_list = [BIntroPage, BFolderPage, BVersionPage, BCpuPage, BToolchainPage, BModulePage, BOutputPage, BCreationPage, BFinalPage]
-    wizard = BWizard.BWizard(page_list)
+    QApplication.instance().project = BProject()
+    page_list = [BIntroPage, BFolderPage, BVersionPage, BBoardPage, BProjectPresets, BCpuPage, BToolchainPage, BModulePage, BCreationPage, BFinalPage]
+    wizard = BWizard(page_list)

     wizard.show()
     wizard.exec_()
     project = QApplication.instance().project
     wizard.show()
     wizard.exec_()
     project = QApplication.instance().project


@@ -79,28 +79,35 @@ def newProject():
             relevant_file = relevant_files[ide]
             QProcess.startDetached(command_line, [relevant_file,])
     sys.exit()
             relevant_file = relevant_files[ide]
             QProcess.startDetached(command_line, [relevant_file,])
     sys.exit()

-    
+

 def editProject(project_file):
     info_dict = {}
 def editProject(project_file):
     info_dict = {}

+    # Progress dialog.
+    p_dialog = QProgressDialog(QApplication.instance().tr("Wait project loading"), QApplication.instance().tr("Cancel"), 0, 0)

     while(True):
     while(True):

+        p_dialog.show()
+        # Empty project is the default fallback.
+        QApplication.instance().project = BProject()

         try:
         try:

-            QApplication.instance().project = bertos_utils.loadBertosProject(project_file, info_dict)
+            QApplication.instance().project = BProject(project_file, info_dict)

         except VersionException:
         except VersionException:

+            p_dialog.hide()

             QMessageBox.critical(
                 None,
                 QObject().tr("BeRTOS version not found!"),
             QMessageBox.critical(
                 None,
                 QObject().tr("BeRTOS version not found!"),

-                QObject().tr("The selected BeRTOS version is not found, please select an existing one...")
+                QObject().tr("The selected BeRTOS version was not found, please select another one...")

             )
             dialog = BVersionDialog()
             if dialog.exec_():
                 version = dialog.version_page.currentVersion()
             )
             dialog = BVersionDialog()
             if dialog.exec_():
                 version = dialog.version_page.currentVersion()

-                info_dict["SOURCES_PATH"] = version
+                info_dict["BERTOS_PATH"] = version

             continue
         except ToolchainException, exc:
             continue
         except ToolchainException, exc:

+            p_dialog.hide()

             QMessageBox.critical(
                 None,
                 QObject().tr("Toolchain not found!"),
             QMessageBox.critical(
                 None,
                 QObject().tr("Toolchain not found!"),

-                QObject().tr("The selected toolchain is not found, please select an existing one...")
+                QObject().tr("The selected toolchain was not found, please select another one...")

             )
             QApplication.instance().project = exc.partial_project
             dialog = BToolchainDialog()
             )
             QApplication.instance().project = exc.partial_project
             dialog = BToolchainDialog()


@@ -110,29 +117,34 @@ def editProject(project_file):
             continue
         break
     dialog = BEditingDialog()
             continue
         break
     dialog = BEditingDialog()

+    p_dialog.hide()

     dialog.exec_()
 
     dialog.exec_()
 

-def showStartPage():
-    QApplication.instance().dialog = BStartPage.BStartPage()
-    QApplication.instance().connect(QApplication.instance().dialog, SIGNAL("newProject"), newProject)
-    QApplication.instance().connect(QApplication.instance().dialog, SIGNAL("editProject"), editProject)
-    QApplication.instance().dialog.show()
-

 def main():
 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")
     app = QApplication(sys.argv)
     app.settings = QSettings("Develer", "Bertos Configurator")

-    app.project = BProject.BProject()

     # Development utility lines, to be removed for production
     # Development utility lines, to be removed for production

-    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")
+    datadir = DATA_DIR
+
+    # Something seems to not work, on Windows, using pyrcc4 with BeRTOS Wizard
+    # resources. So I'm restoring the old rcc-based resource generation
+    # system.
+    #
+    # qrc, bertos_rc = os.path.join(datadir, 'bertos.qrc'), os.path.join(datadir, 'bertos_rc.py')
+    # if not (hasattr(sys, "frozen") and sys.frozen) and newer(qrc, bertos_rc):
+    #     os.system("pyrcc4 \"%s\" -o \"%s\"" %(qrc, bertos_rc))
+    # import bertos_rc
+
+    qrc, rcc = os.path.join(datadir, 'bertos.qrc'), os.path.join(datadir, 'bertos.rcc') 
+    if not (hasattr(sys, "frozen") and sys.frozen) and newer(qrc, rcc): 
+        os.system("rcc -binary \"%s\" -o \"%s\"" %(qrc, rcc)) 
+    QResource.registerResource(rcc) 
+    

     if len(sys.argv) == 3 and sys.argv[1] == "--edit":
     if len(sys.argv) == 3 and sys.argv[1] == "--edit":

-        editProject(os.path.join(rundir, sys.argv[2]))
+        editProject(os.path.abspath(sys.argv[2]))

     else:
         newProject()
     else:
         newProject()

- 
+

 
 if __name__ == '__main__':
     main()
 
 if __name__ == '__main__':
     main()