Change some strings.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3879 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/wizard/BBoardPage.py b/wizard/BBoardPage.py
index fd6fc9292e7a51afe8fe83fe9ec97fe813eb021a..f063e77448402b524cf283b1ef34b3178da2ff55 100644 (file)
--- 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 4a5fcf6fda2e8fdbc11623abf75b14c6d9b52e61..2b3a257aadce9db86475a3ab56ae71582501f6e8 100644 (file)
--- 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 225aa2e29c7944e78fd6e70d2647ada454cf5a9e..8cd1d369ca44dfb35882805da02f7f1d5dc3c5ea 100644 (file)
--- 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 020b5a58a61ed7eb3b6b1a42c49508c792a76d9b..2306b8630d8adec21b6c9a54ad0e2b751bc6a2dc 100644 (file)
--- 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 1ce7b8592c0ab4af60a213898e6adf26d757007c..b07c15625b8735e629a484ebd0d19ff3d46acc97 100644 (file)
--- 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 200e676841101b9c005c0a6f0e823d672bcd8406..0ae1d8a3df721fa577d9319130d0da45372f4d35 100644 (file)
--- 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 255ae1de9033dc056b5a4647a0f3a1e436dfb839..92de4752d8eaf2945b084c0272fe3cbe04c7bb25 100644 (file)
--- 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 23f6fb01b299efac4cb2848238fca03deedd31d4..1f7e61bfedf87459d4651ce206e64699087000a0 100644 (file)
--- 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 80cc0de26e06d495219873f87932d29e156777d9..fd1e48f0db8a538f1bbf6c3139bf4f2f76b22da0 100644 (file)
--- a/wizard/ui/board_select.ui
+++ b/wizard/ui/board_select.ui
@@ -43,43 +43,17 @@
       </layout>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1,0">
-       <item>
-        <spacer name="horizontalSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
+      <layout class="QHBoxLayout" name="horizontalLayout" stretch="1">
        <item>
         <widget class="QPushButton" name="customButton">
          <property name="toolTip">
           <string>&lt;p&gt;&lt;strong&gt;Custom board project &lt;/strong&gt;- select me when your board is not present into the list above.&lt;/p&gt;</string>
          </property>
          <property name="text">
-          <string>Custom Board</string>
+          <string>I have a custom board...</string>
          </property>
         </widget>
        </item>
-       <item>
-        <spacer name="horizontalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
       </layout>
      </item>
     </layout>

diff --git a/wizard/ui/final_page.ui b/wizard/ui/final_page.ui
index c3c554ff991ad8dde72df3ba70018ed1e6c4eef6..8f90b80896207140b0199e43ef3d8b1b08d9ed8c 100644 (file)
--- a/wizard/ui/final_page.ui
+++ b/wizard/ui/final_page.ui
@@ -38,7 +38,16 @@
         <enum>QFrame::Plain</enum>
        </property>
        <property name="text">
-        <string>Project created successfully. Now start to develop your BeRTOS application!</string>
+        <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Project created successfully!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-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;&quot;&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;You can now start developing your application.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="textFormat">
+        <enum>Qt::RichText</enum>
        </property>
        <property name="wordWrap">
         <bool>true</bool>
@@ -63,8 +72,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>556</width>
-        <height>76</height>
+        <width>564</width>
+        <height>82</height>
        </rect>
       </property>
      </widget>

diff --git a/wizard/ui/toolchain_search.ui b/wizard/ui/toolchain_search.ui
index eeb5af0192783db363d72346e56c0813e2edc937..b0e038c7b0a58cf5d3cb0f2b2c762dcc8758d382 100644 (file)
--- a/wizard/ui/toolchain_search.ui
+++ b/wizard/ui/toolchain_search.ui
@@ -23,14 +23,14 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>Search in PATH</string>
+      <string>Search in the system PATH</string>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
-      <string>Custom directories</string>
+      <string>Additional search directories:</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>