X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBEditingDialog.py;h=2569a85278c510fa8d0d31991090c5b3ae917252;hb=e28fc9dfd2361aecf99ecb8f3f256a8776e266d3;hp=cc8a80aa38a9d33d2201203432d20a51e5274aa5;hpb=2be5d4598fdfee024f3929a110f5f93c751c355c;p=bertos.git

diff --git a/wizard/BEditingDialog.py b/wizard/BEditingDialog.py
index cc8a80aa..2569a852 100644
--- a/wizard/BEditingDialog.py
+++ b/wizard/BEditingDialog.py
@@ -39,11 +39,14 @@ import os
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from bertos_utils import loadBertosProject, bertosVersion, getToolchainName, createBertosProject
+from bertos_utils import bertosVersion, getToolchainName
 from BToolchainPage import BToolchainPage
 from BVersionPage import BVersionPage
+
+from BProject import BProject
+
 import qvariant_converter
-import BModulePage
+from BModulePage import BModulePage
 import bertos_utils
 
 class BEditingDialog(QDialog):
@@ -57,18 +60,18 @@ class BEditingDialog(QDialog):
     
     def setupUi(self):
         layout = QVBoxLayout()
-        self.module_page = BModulePage.BModulePage()
+        self.module_page = BModulePage()
         layout.addWidget(self.module_page)
-	frequency_layout = QHBoxLayout()
-	frequency_layout.addWidget(QLabel(self.tr("CPU frequency")))
-	self.cpu_frequency_spinbox = QDoubleSpinBox()
-	self.cpu_frequency_spinbox.setSuffix("Hz")
-	self.cpu_frequency_spinbox.setRange(1, 1000000000)
-	self.cpu_frequency_spinbox.setSingleStep(1000)
-	self.cpu_frequency_spinbox.setDecimals(0)
-	frequency_layout.addWidget(self.cpu_frequency_spinbox)
-	frequency_layout.addStretch()
-	layout.addLayout(frequency_layout)
+        frequency_layout = QHBoxLayout()
+        frequency_layout.addWidget(QLabel(self.tr("CPU frequency")))
+        self.cpu_frequency_spinbox = QDoubleSpinBox()
+        self.cpu_frequency_spinbox.setSuffix("Hz")
+        self.cpu_frequency_spinbox.setRange(1, 1000000000)
+        self.cpu_frequency_spinbox.setSingleStep(1000)
+        self.cpu_frequency_spinbox.setDecimals(0)
+        frequency_layout.addWidget(self.cpu_frequency_spinbox)
+        frequency_layout.addStretch()
+        layout.addLayout(frequency_layout)
         button_layout = QHBoxLayout()
         self.advanced_button = QToolButton()
         self.setupMenu()
@@ -129,10 +132,11 @@ class BEditingDialog(QDialog):
                     qApp.setOverrideCursor(QCursor(Qt.WaitCursor))
                     dialog.version_page.setProjectInfo("SOURCES_PATH", version)
                     dialog.version_page.setProjectInfo("OLD_SOURCES_PATH", current_version)
-                    enabled_modules = bertos_utils.enabledModules(dialog.version_page.project())
+                    enabled_modules = bertos_utils.enabledModules(dialog.version_page.project)
                     old_configuration = dialog.version_page.projectInfo("CONFIGURATIONS")
-                    dialog.version_page.project().loadSourceTree()
-                    bertos_utils.loadModuleData(dialog.version_page.project())
+                    dialog.version_page.project.loadSourceTree()
+                    QApplication.instance().project.reloadCpuInfo()
+                    QApplication.instance().project.loadModuleData()
                     new_configuration = dialog.version_page.projectInfo("CONFIGURATIONS")
                     merged_configuration = {}
                     for conf in new_configuration:
@@ -142,7 +146,7 @@ class BEditingDialog(QDialog):
                             configuration = new_configuration[conf]
                         merged_configuration[conf] = configuration
                     dialog.version_page.setProjectInfo("CONFIGURATIONS", merged_configuration)
-                    bertos_utils.setEnabledModules(dialog.version_page.project(), enabled_modules)
+                    bertos_utils.setEnabledModules(dialog.version_page.project, enabled_modules)
                     self.module_page.fillModuleTree()
                 finally:
                     qApp.restoreOverrideCursor()
@@ -153,7 +157,7 @@ class BEditingDialog(QDialog):
     def apply(self):
         try:
             qApp.setOverrideCursor(QCursor(Qt.WaitCursor))
-            createBertosProject(self.module_page.project(), edit=True)
+            QApplication.instance().project.createBertosProject(edit=True)
         finally:
             qApp.restoreOverrideCursor()
         self.accept()
@@ -235,7 +239,7 @@ def main():
         print "Invalid usage: use <command> project_file"
         sys.exit()
     app = QApplication([])
-    app.project = loadBertosProject(project_file)
+    app.project = BProject(project_file)
     app.settings = QSettings("Develer", "Bertos Configurator")
     dialog = BEditingDialog()
     dialog.show()