X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBEditingDialog.py;h=075a739450653cee43375fb056d6ac4bccb86200;hb=ec871ac76d4a666bcf35ff91733dc496a808bc83;hp=1ae0fd864c693236955f5498e6341fc3955c1911;hpb=df9d729fb8f0f2d34197215920576381b895c7f7;p=bertos.git diff --git a/wizard/BEditingDialog.py b/wizard/BEditingDialog.py index 1ae0fd86..075a7394 100644 --- a/wizard/BEditingDialog.py +++ b/wizard/BEditingDialog.py @@ -39,14 +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, createBertosProject 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): @@ -60,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() @@ -135,7 +135,8 @@ class BEditingDialog(QDialog): 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()) + QApplication.instance().project.reloadCpuInfo() + QApplication.instance().project.loadModuleData() new_configuration = dialog.version_page.projectInfo("CONFIGURATIONS") merged_configuration = {} for conf in new_configuration: