X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos.py;h=3aa845f3be666061b5e3219ccfe7226bc382bd08;hb=4c61653db84fe75fc2bb8f5af9d1ac0343068b4c;hp=f04c16f639c163f9ac2a410b9464891fe0ec98c6;hpb=9f3c363cdc2ce50d6803ac039103a027b142bbe3;p=bertos.git diff --git a/wizard/bertos.py b/wizard/bertos.py index f04c16f6..3aa845f3 100755 --- a/wizard/bertos.py +++ b/wizard/bertos.py @@ -28,7 +28,6 @@ # # Copyright 2008 Develer S.r.l. (http://www.develer.com/) # -# $Id$ # # Author: Lorenzo Berni # @@ -49,13 +48,12 @@ from BWizard import BWizard from BIntroPage import BIntroPage from BFolderPage import BFolderPage 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 BOutputPage import BOutputPage from BCreationPage import BCreationPage from BFinalPage import BFinalPage @@ -67,7 +65,7 @@ from LoadException import VersionException, ToolchainException def newProject(): QApplication.instance().project = BProject() - page_list = [BIntroPage, BFolderPage, BVersionPage, 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_() @@ -123,7 +121,7 @@ def main(): 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)) + os.system("rcc -binary \"%s\" -o \"%s\"" %(qrc, rcc)) QResource.registerResource(rcc) if len(sys.argv) == 3 and sys.argv[1] == "--edit": editProject(os.path.abspath(sys.argv[2]))