STM32: USB: compact code and silent a buggy doxygen warning

[bertos.git] / wizard / bertos.py

diff --git a/wizard/bertos.py b/wizard/bertos.py
index 65e578ccdaa4e787a4f5d4731a89b3b44ce464fe..ebc91357e285490eee381e3bbb32392ea182c2cb 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>
 #


@@ -48,15 +47,13 @@ from BWizard import BWizard
 
 from BIntroPage import BIntroPage
 from BFolderPage import BFolderPage
 
 from BIntroPage import BIntroPage
 from BFolderPage import BFolderPage

-from BTypePage import BTypePage

 from BBoardPage import BBoardPage
 from BBoardPage import BBoardPage

-from BRoutePage import BRoutePage
+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 BCreationPage import BCreationPage
 from BFinalPage import BFinalPage
 


@@ -68,7 +65,7 @@ from LoadException import VersionException, ToolchainException
 
 def newProject():
     QApplication.instance().project = BProject()
 
 def newProject():
     QApplication.instance().project = BProject()

-    page_list = [BIntroPage, BFolderPage, BVersionPage, BTypePage, BBoardPage, BRoutePage, BCpuPage, BToolchainPage, BModulePage, BOutputPage, BCreationPage, BFinalPage]
+    page_list = [BIntroPage, BFolderPage, BVersionPage, BBoardPage, BProjectPresets, BCpuPage, BToolchainPage, BModulePage, BCreationPage, BFinalPage]

     wizard = BWizard(page_list)
     wizard.show()
     wizard.exec_()
     wizard = BWizard(page_list)
     wizard.show()
     wizard.exec_()


@@ -122,10 +119,10 @@ def main():
     app.settings = QSettings("Develer", "Bertos Configurator")
     # Development utility lines, to be removed for production
     datadir = DATA_DIR
     app.settings = QSettings("Develer", "Bertos Configurator")
     # Development utility lines, to be removed for production
     datadir = DATA_DIR

-    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)
+    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

     if len(sys.argv) == 3 and sys.argv[1] == "--edit":
         editProject(os.path.abspath(sys.argv[2]))
     else:
     if len(sys.argv) == 3 and sys.argv[1] == "--edit":
         editProject(os.path.abspath(sys.argv[2]))
     else: