X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBEditingDialog.py;h=d177d4d19e52581cef2c6516edfd815e62315f2e;hb=976d522209efc4c11a019ae6b34657b6b3f59ba0;hp=e0d2785321179432433fb409d3d91275fe5eaab4;hpb=c3cc4415853f43acb452ec0074a9c6769d7b0af8;p=bertos.git diff --git a/wizard/BEditingDialog.py b/wizard/BEditingDialog.py index e0d27853..d177d4d1 100644 --- a/wizard/BEditingDialog.py +++ b/wizard/BEditingDialog.py @@ -28,7 +28,6 @@ # # Copyright 2008 Develer S.r.l. (http://www.develer.com/) # -# $Id$ # # Author: Lorenzo Berni # @@ -39,11 +38,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 +59,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() @@ -109,71 +111,32 @@ class BEditingDialog(QDialog): self.module_page.setProjectInfo("SELECTED_FREQ", frequency) def changeToolchain(self): - dialog = QDialog() - dialog.setWindowIcon(QIcon(":/images/appicon.png")) - layout = QVBoxLayout() - toolchain_page = BToolchainPage() - current_toolchain = toolchain_page.projectInfo("TOOLCHAIN") - toolchain_page.reloadData() - # TODO: to be moved in BToolchainPage - for toolchain_row in range(toolchain_page.pageContent.toolchainList.count()): - toolchain = qvariant_converter.getStringDict(toolchain_page.pageContent.toolchainList.item(toolchain_row).data(Qt.UserRole)) - if toolchain["path"] == current_toolchain["path"]: - toolchain_page.pageContent.toolchainList.setCurrentRow(toolchain_row) - toolchain_page.selectionChanged() - break - layout.addWidget(toolchain_page) - button_layout = QHBoxLayout() - button_layout.addStretch() - cancel_button = QPushButton(self.tr("Cancel")) - button_layout.addWidget(cancel_button) - ok_button = QPushButton(self.tr("Ok")) - button_layout.addWidget(ok_button) - dialog.connect(cancel_button, SIGNAL("clicked()"), dialog.reject) - layout.addLayout(button_layout) - dialog.setLayout(layout) - dialog.connect(ok_button, SIGNAL("clicked()"), dialog.accept) - dialog.setWindowTitle(self.tr("Change toolchain")) + dialog = BToolchainDialog() if dialog.exec_(): - toolchain = qvariant_converter.getStringDict(toolchain_page.currentItem().data(Qt.UserRole)) - toolchain_page.setProjectInfo("TOOLCHAIN", toolchain) + toolchain = qvariant_converter.getStringDict(dialog.toolchain_page.currentItem().data(Qt.UserRole)) + dialog.toolchain_page.setProjectInfo("TOOLCHAIN", toolchain) def changeBertosVersion(self): - dialog = QDialog() - dialog.setWindowIcon(QIcon(":/images/appicon.png")) - layout = QVBoxLayout() - version_page = BVersionPage() - version_page.reloadData() - layout.addWidget(version_page) - button_layout = QHBoxLayout() - button_layout.addStretch() - cancel_button = QPushButton(self.tr("Cancel")) - button_layout.addWidget(cancel_button) - ok_button = QPushButton(self.tr("Ok")) - button_layout.addWidget(ok_button) - dialog.connect(cancel_button, SIGNAL("clicked()"), dialog.reject) - layout.addLayout(button_layout) - dialog.setLayout(layout) - dialog.connect(ok_button, SIGNAL("clicked()"), dialog.accept) - current_version = version_page.projectInfo("SOURCES_PATH") - dialog.setWindowTitle(self.tr("Change BeRTOS version")) + current_version = self.module_page.projectInfo("BERTOS_PATH") + dialog = BVersionDialog() if dialog.exec_(): - version = qvariant_converter.getString(version_page.currentItem().data(Qt.UserRole)) - if version != current_version: - if QMessageBox.question( - version_page, - self.tr("BeRTOS version update"), - self.tr("Changing the BeRTOS version will destroy all the modification done on the BeRTOS sources"), - QMessageBox.Ok | QMessageBox.Cancel - ) == QMessageBox.Ok: - qApp.setOverrideCursor(QCursor(Qt.WaitCursor)) - version_page.setProjectInfo("SOURCES_PATH", version) - version_page.setProjectInfo("OLD_SOURCES_PATH", current_version) - enabled_modules = bertos_utils.enabledModules(version_page.project()) - old_configuration = version_page.projectInfo("CONFIGURATIONS") - bertos_utils.loadSourceTree(version_page.project()) - bertos_utils.loadModuleData(version_page.project()) - new_configuration = version_page.projectInfo("CONFIGURATIONS") + version = qvariant_converter.getString(dialog.version_page.currentItem().data(Qt.UserRole)) + if QMessageBox.question( + dialog.version_page, + self.tr("BeRTOS version update"), + self.tr("Changing the BeRTOS version will destroy all the modification done on the BeRTOS sources"), + QMessageBox.Ok | QMessageBox.Cancel + ) == QMessageBox.Ok: + try: + qApp.setOverrideCursor(QCursor(Qt.WaitCursor)) + dialog.version_page.setProjectInfo("BERTOS_PATH", version) + dialog.version_page.setProjectInfo("OLD_BERTOS_PATH", current_version) + enabled_modules = bertos_utils.enabledModules(dialog.version_page.project) + old_configuration = dialog.version_page.projectInfo("CONFIGURATIONS") + 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: if conf in old_configuration: @@ -181,18 +144,21 @@ class BEditingDialog(QDialog): else: configuration = new_configuration[conf] merged_configuration[conf] = configuration - version_page.setProjectInfo("CONFIGURATIONS", merged_configuration) - bertos_utils.setEnabledModules(version_page.project(), enabled_modules) + dialog.version_page.setProjectInfo("CONFIGURATIONS", merged_configuration) + dialog.version_page.project.setEnabledModules(enabled_modules) self.module_page.fillModuleTree() + finally: qApp.restoreOverrideCursor() - else: - # Rollback version to the previous selected one. - version_page.setProjectInfo("SOURCES_PATH", current_version) + else: + # Rollback version to the previous selected one. + dialog.version_page.setProjectInfo("BERTOS_PATH", current_version) def apply(self): - qApp.setOverrideCursor(QCursor(Qt.WaitCursor)) - createBertosProject(self.module_page.project(), edit=True) - qApp.restoreOverrideCursor() + try: + qApp.setOverrideCursor(QCursor(Qt.WaitCursor)) + QApplication.instance().project.createBertosProject() + finally: + qApp.restoreOverrideCursor() self.accept() def toolchains(self): @@ -208,11 +174,61 @@ class BEditingDialog(QDialog): return self.module_page.versions() def currentVersion(self): - return self.module_page.projectInfo("SOURCES_PATH") + return self.module_page.projectInfo("BERTOS_PATH") def setCurrentVersion(self, version): - self.module_page.setProjectInfo("SOURCES_PATH", version) + self.module_page.setProjectInfo("BERTOS_PATH", version) +class BToolchainDialog(QDialog): + def __init__(self): + QDialog.__init__(self) + self.setWindowIcon(QIcon(":/images/appicon.png")) + layout = QVBoxLayout() + toolchain_page = BToolchainPage() + current_toolchain = toolchain_page.projectInfo("TOOLCHAIN") + toolchain_page.reloadData() + # TODO: to be moved in BToolchainPage + for toolchain_row in range(toolchain_page.pageContent.toolchainList.count()): + toolchain = qvariant_converter.getStringDict(toolchain_page.pageContent.toolchainList.item(toolchain_row).data(Qt.UserRole)) + if current_toolchain and toolchain["path"] == current_toolchain["path"]: + toolchain_page.pageContent.toolchainList.setCurrentRow(toolchain_row) + toolchain_page.selectionChanged() + break + self.toolchain_page = toolchain_page + layout.addWidget(toolchain_page) + button_layout = QHBoxLayout() + button_layout.addStretch() + cancel_button = QPushButton(self.tr("Cancel")) + button_layout.addWidget(cancel_button) + ok_button = QPushButton(self.tr("Ok")) + button_layout.addWidget(ok_button) + self.connect(cancel_button, SIGNAL("clicked()"), self.reject) + layout.addLayout(button_layout) + self.setLayout(layout) + self.connect(ok_button, SIGNAL("clicked()"), self.accept) + self.setWindowTitle(self.tr("Change toolchain")) + +class BVersionDialog(QDialog): + def __init__(self): + QDialog.__init__(self) + self.setWindowIcon(QIcon(":/images/appicon.png")) + layout = QVBoxLayout() + version_page = BVersionPage(edit=True) + version_page.reloadData() + self.version_page = version_page + layout.addWidget(version_page) + button_layout = QHBoxLayout() + button_layout.addStretch() + cancel_button = QPushButton(self.tr("Cancel")) + button_layout.addWidget(cancel_button) + ok_button = QPushButton(self.tr("Ok")) + button_layout.addWidget(ok_button) + self.connect(cancel_button, SIGNAL("clicked()"), self.reject) + layout.addLayout(button_layout) + self.setLayout(layout) + self.connect(ok_button, SIGNAL("clicked()"), self.accept) + current_version = version_page.projectInfo("BERTOS_PATH") + self.setWindowTitle(self.tr("Change BeRTOS version")) def main(): @@ -222,7 +238,7 @@ def main(): print "Invalid usage: use 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()