X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBBoardPage.py;h=03f96048202ba2a00a7a0458930c48aaa64c0dff;hb=57dfb183e24175bc782647d4e6aebe31063f3881;hp=5d83fda38ddab5a030171e445baee875e5f2b597;hpb=f0c8799f695c20bda1134592ac357620af6cc9fd;p=bertos.git

diff --git a/wizard/BBoardPage.py b/wizard/BBoardPage.py
index 5d83fda3..03f96048 100644
--- a/wizard/BBoardPage.py
+++ b/wizard/BBoardPage.py
@@ -28,7 +28,6 @@
 #
 # Copyright 2010 Develer S.r.l. (http://www.develer.com/)
 #
-# $Id$
 #
 # Author: Lorenzo Berni <duplo@develer.com>
 #
@@ -41,12 +40,10 @@ from PyQt4.QtGui import *
 from BWizardPage import BWizardPage
 
 from BCpuPage import BCpuPage
-from BOutputPage import BOutputPage
-from BRoutePage import BRoutePage
 
 import const
 import qvariant_converter
-from bertos_utils import presetList
+from bertos_utils import presetList, _cmp
 
 class BBoardPage(BWizardPage):
     """
@@ -56,7 +53,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 ##
 
@@ -64,13 +61,23 @@ class BBoardPage(BWizardPage):
         """
         Overload of the QWizardPage isComplete method.
         """
-        return False
-
-    # def nextId(self):
-    #     """
-    #     Overload of the QWizardPage nextId method.
-    #     """
-    #     return self.wizard().pageIndex(BRoutePage)
+        if self.selected:
+            preset_path = qvariant_converter.getDict(self.selected.data(Qt.UserRole))
+            preset_path = qvariant_converter.getStringDict(preset_path["info"])
+            preset_path = preset_path["path"]
+            self.setProjectInfo("PROJECT_BOARD", preset_path)
+            self.setProjectInfo("PROJECT_FROM_PRESET", True)
+            self.setProjectInfo("PRESET_LOADED", False)
+            return True
+        else:
+            return False
+
+    def nextId(self):
+        wizard = self.wizard()
+        if not self.projectInfo("PROJECT_FROM_PRESET"):
+            return wizard.pageIndex(BCpuPage)
+        else:
+            return QWizardPage.nextId(self)
 
     ####
 
@@ -86,26 +93,57 @@ class BBoardPage(BWizardPage):
         """
         Overload of the BWizardPage connectSignals method.
         """
+        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):
+    def reloadData(self, previous_id=None):
         """
         Overload of the BWizardPage reloadData method.
         """
+        self.project.loadProjectPresets()
         preset_list = self.projectInfo("PRESET_TREE")
         preset_list = preset_list["children"]
-        def _cmp(x, y):
-            return cmp(x["info"].get('ord', 0), y["info"].get('ord', 0))
-        preset_list = sorted(preset_list, _cmp)
+        preset_list = sorted(preset_list.values(), _cmp)
         self.setItems(preset_list)
+        project_from_preset = self.projectInfo("PROJECT_FROM_PRESET")
+        project_board = self.projectInfo("PROJECT_BOARD")
+        if not (project_from_preset and project_board):
+            self.pageContent.boardList.setCurrentRow(0)
 
     ####
 
     ## Slots ##
 
+    def updateUi(self):
+        if self.selected:
+            info_dict = qvariant_converter.getDict(self.selected.data(Qt.UserRole))
+            info_dict = qvariant_converter.getStringDict(info_dict["info"])
+            description = info_dict.get("description", "")
+            path = unicode(QUrl.fromLocalFile(info_dict["path"]).toString())
+            description = description.replace("$path", path)
+            self.pageContent.descriptionArea.setHtml(description)
+
+    def customButtonClicked(self):
+        self.setProjectInfo("PROJECT_FROM_PRESET", False)
+        self.wizard().next()
 
     ####
 
     def setItems(self, preset_list):
         self.pageContent.boardList.clear()
-        for item in preset_list:
-            self.pageContent.boardList.addItem(item["info"].get("name", item["info"]["filename"]))
\ No newline at end of file
+        selected_board = self.projectInfo("PROJECT_BOARD")
+        for item_data in preset_list:
+            item_name = item_data["info"].get("name", item_data["info"]["filename"])
+            item_icon = os.path.join(item_data["info"]["path"], const.PREDEFINED_BOARD_ICON_FILE)
+            if not os.path.exists(item_icon):
+                item_icon = const.PREDEFINED_BOARD_DEFAULT_ICON
+            item = QListWidgetItem(QIcon(item_icon), item_name)
+            item.setData(Qt.UserRole, qvariant_converter.convertDict(item_data))
+            self.pageContent.boardList.addItem(item)
+            if selected_board and selected_board == item_data["info"]["path"]:
+                self.pageContent.boardList.setCurrentItem(item)
+
+    @property
+    def selected(self):
+        return self.pageContent.boardList.currentItem()