From 35be7aa348f671b0ed50ee43d903444edc4892af Mon Sep 17 00:00:00 2001 From: batt Date: Fri, 28 May 2010 15:36:41 +0000 Subject: [PATCH] Change some strings. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3879 38d2e660-2303-0410-9eaa-f027e97ec537 --- wizard/BBoardPage.py | 8 ++++---- wizard/BCpuPage.py | 2 +- wizard/BCreationPage.py | 7 ++++--- wizard/BFinalPage.py | 4 ++-- wizard/BModulePage.py | 2 +- wizard/BProjectPresets.py | 4 ++-- wizard/BToolchainPage.py | 2 +- wizard/BVersionPage.py | 4 ++-- wizard/ui/board_select.ui | 30 ++---------------------------- wizard/ui/final_page.ui | 15 ++++++++++++--- wizard/ui/toolchain_search.ui | 4 ++-- 11 files changed, 33 insertions(+), 49 deletions(-) diff --git a/wizard/BBoardPage.py b/wizard/BBoardPage.py index fd6fc929..f063e774 100644 --- a/wizard/BBoardPage.py +++ b/wizard/BBoardPage.py @@ -54,7 +54,7 @@ class BBoardPage(BWizardPage): def __init__(self): BWizardPage.__init__(self, const.UI_LOCATION + "/board_select.ui") - self.setTitle(self.tr("Select the board from the predefined ones")) + self.setTitle(self.tr("Select your development board")) ## Overloaded QWizardPage methods ## @@ -93,8 +93,8 @@ class BBoardPage(BWizardPage): """ Overload of the BWizardPage connectSignals method. """ - self.connect(self.pageContent.boardList, SIGNAL("itemSelectionChanged()"), self.updateUi) - self.connect(self.pageContent.boardList, SIGNAL("itemSelectionChanged()"), self, SIGNAL("completeChanged()")) + self.connect(self.pageContent.boardList, SIGNAL("currentItemChanged(QListWidgetItem*,QListWidgetItem*)"), self.updateUi) + self.connect(self.pageContent.boardList, SIGNAL("currentItemChanged(QListWidgetItem*,QListWidgetItem*)"), self, SIGNAL("completeChanged()")) self.connect(self.pageContent.customButton, SIGNAL("clicked()"), self.customButtonClicked) def reloadData(self): @@ -142,4 +142,4 @@ class BBoardPage(BWizardPage): @property def selected(self): - return self.pageContent.boardList.currentItem() \ No newline at end of file + return self.pageContent.boardList.currentItem() diff --git a/wizard/BCpuPage.py b/wizard/BCpuPage.py index 4a5fcf6f..2b3a257a 100644 --- a/wizard/BCpuPage.py +++ b/wizard/BCpuPage.py @@ -47,7 +47,7 @@ class BCpuPage(BWizardPage): def __init__(self): BWizardPage.__init__(self, UI_LOCATION + "/cpu_select.ui") - self.setTitle(self.tr("Select the CPU")) + self.setTitle(self.tr("Select the CPU on your board")) self.freq_modified = False ## Overloaded QWizardPage methods ## diff --git a/wizard/BCreationPage.py b/wizard/BCreationPage.py index 225aa2e2..8cd1d369 100644 --- a/wizard/BCreationPage.py +++ b/wizard/BCreationPage.py @@ -46,7 +46,8 @@ class BCreationPage(BWizardPage): def __init__(self): BWizardPage.__init__(self, UI_LOCATION + "/project_creation.ui") - self.setTitle(self.tr("Settings summary")) + self.setTitle(self.tr("Project summary")) + self.setSubTitle(self.tr("Your project is ready to be created. Review your selections and press the \"Create\" button")) self._completed = False ## Overloaded BWizardPage methods ## @@ -86,7 +87,7 @@ class BCreationPage(BWizardPage): toolchain_target = QTreeWidgetItem(toolchain_title, QStringList([version])) toolchain_path = QTreeWidgetItem(toolchain_title, QStringList([self.tr("path: " + os.path.normpath(toolchain_info["path"]))])) top_level.append(toolchain_title) - module_title = QTreeWidgetItem(QStringList([self.tr("Modules")])) + module_title = QTreeWidgetItem(QStringList([self.tr("Selected modules")])) configurations = self.projectInfo("CONFIGURATIONS") module_categories = {} for module, information in self.projectInfo("MODULES").items(): @@ -110,4 +111,4 @@ class BCreationPage(BWizardPage): for item in top_level: self.pageContent.summaryTree.expandItem(item) - #### \ No newline at end of file + #### diff --git a/wizard/BFinalPage.py b/wizard/BFinalPage.py index 020b5a58..2306b863 100644 --- a/wizard/BFinalPage.py +++ b/wizard/BFinalPage.py @@ -49,7 +49,7 @@ class BFinalPage(BWizardPage): def __init__(self): BWizardPage.__init__(self, UI_LOCATION + "/final_page.ui") - self.setTitle(self.tr("Project created successfully")) + self.setTitle(self.tr("Project created successfully!")) ## Overloaded BWizardPage methods ## @@ -117,4 +117,4 @@ class BFinalPage(BWizardPage): to_be_opened.append(plugin) self.setProjectInfo("TO_BE_OPENED", to_be_opened) - #### \ No newline at end of file + #### diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py index 1ce7b859..b07c1562 100644 --- a/wizard/BModulePage.py +++ b/wizard/BModulePage.py @@ -147,7 +147,7 @@ class BModulePage(BWizardPage): # Set the row count to the current index + 1 self.pageContent.propertyTable.setRowCount(index + 1) item = QTableWidgetItem(configurations[property]["brief"]) - item.setFlags(Qt.NoItemFlags) + item.setFlags(item.flags() & ~Qt.ItemIsSelectable) item.setToolTip(property) item.setData(Qt.UserRole, qvariant_converter.convertString(property)) self.pageContent.propertyTable.setItem(index, 0, item) diff --git a/wizard/BProjectPresets.py b/wizard/BProjectPresets.py index 200e6768..0ae1d8a3 100644 --- a/wizard/BProjectPresets.py +++ b/wizard/BProjectPresets.py @@ -167,7 +167,7 @@ class BProjectPresets(BWizardPage): preset_tree = self.projectInfo("PRESET_TREE") preset_list = preset_tree["children"][preset_path]["children"] preset_list = sorted(preset_list.values(), _cmp) - self.setTitle(self.tr("Select the template/demo for %1").arg(preset_tree["children"][preset_path]["info"].get("name", preset_tree["children"][preset_path]["info"]["filename"]))) + self.setTitle(self.tr("Select the project template for %1").arg(preset_tree["children"][preset_path]["info"].get("name", preset_tree["children"][preset_path]["info"]["filename"]))) self.setupTabs(preset_list) def connectSignals(self): @@ -213,4 +213,4 @@ class BProjectPresets(BWizardPage): current_widget = self.pageContent.boardTabWidget.currentWidget() return current_widget.preset_data["children"][self.selected_path] else: - return None \ No newline at end of file + return None diff --git a/wizard/BToolchainPage.py b/wizard/BToolchainPage.py index 255ae1de..92de4752 100644 --- a/wizard/BToolchainPage.py +++ b/wizard/BToolchainPage.py @@ -56,7 +56,7 @@ class BToolchainPage(BWizardPage): def __init__(self): BWizardPage.__init__(self, UI_LOCATION + "/toolchain_select.ui") self.setTitle(self.tr("Select toolchain")) - self._validation_process = None + self.setSubTitle(self.tr("You can look for more toolchains in your system by pressing the \"Search\" button, or manually add them with the \"+\" button")) self._valid_items = [] self._toolchain_manager = ToolchainManager() diff --git a/wizard/BVersionPage.py b/wizard/BVersionPage.py index 23f6fb01..1f7e61bf 100644 --- a/wizard/BVersionPage.py +++ b/wizard/BVersionPage.py @@ -51,8 +51,8 @@ class BVersionPage(BWizardPage): def __init__(self, edit=False): self._edit = edit BWizardPage.__init__(self, UI_LOCATION + "/bertos_versions.ui") - self.setTitle(self.tr("Select the BeRTOS directory")) - self.setSubTitle(self.tr("The project created will be based on the BeRTOS version found")) + self.setTitle(self.tr("Select BeRTOS version")) + self.setSubTitle(self.tr("Your project will be created with the specified BeRTOS version")) ## Overloaded QWizardPage methods ## diff --git a/wizard/ui/board_select.ui b/wizard/ui/board_select.ui index 80cc0de2..fd1e48f0 100644 --- a/wizard/ui/board_select.ui +++ b/wizard/ui/board_select.ui @@ -43,43 +43,17 @@ - - - - - Qt::Horizontal - - - - 20 - 20 - - - - + <p><strong>Custom board project </strong>- select me when your board is not present into the list above.</p> - Custom Board + I have a custom board... - - - - Qt::Horizontal - - - - 20 - 20 - - - - diff --git a/wizard/ui/final_page.ui b/wizard/ui/final_page.ui index c3c554ff..8f90b808 100644 --- a/wizard/ui/final_page.ui +++ b/wizard/ui/final_page.ui @@ -38,7 +38,16 @@ QFrame::Plain - Project created successfully. Now start to develop your BeRTOS application! + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Project created successfully!</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">You can now start developing your application.</p></body></html> + + + Qt::RichText true @@ -63,8 +72,8 @@ 0 0 - 556 - 76 + 564 + 82 diff --git a/wizard/ui/toolchain_search.ui b/wizard/ui/toolchain_search.ui index eeb5af01..b0e038c7 100644 --- a/wizard/ui/toolchain_search.ui +++ b/wizard/ui/toolchain_search.ui @@ -23,14 +23,14 @@ - Search in PATH + Search in the system PATH - Custom directories + Additional search directories: -- 2.25.1