Use QApplication.instance() instead of qApp because qApp seems to ignore the attribut...

[bertos.git] / wizard / BFolderPage.py

diff --git a/wizard/BFolderPage.py b/wizard/BFolderPage.py
index b6038ae31b6b37e2e6a9e9e2965c49f0ee9e5f19..7caf4382cfeb31795eb14293028bde91a9c51938 100644 (file)
--- a/wizard/BFolderPage.py
+++ b/wizard/BFolderPage.py
@@ -39,6 +39,9 @@ from PyQt4.QtGui import *
 from BWizardPage import *
 import bertos_utils
 
+from BVersionPage import BVersionPage
+from BBoardPage import BBoardPage
+
 from const import *
 
 class BFolderPage(BWizardPage):
@@ -61,9 +64,17 @@ class BFolderPage(BWizardPage):
         self.setDefaultFolder(self._destination_folder)
         if self.pageContent.projectPath.text() != "None":
             self.setProjectInfo("PROJECT_PATH", unicode(self.pageContent.projectPath.text()))
+            self.setProjectInfo("PROJECT_NAME", os.path.basename(unicode(self.pageContent.projectPath.text())))
             return True
         else:
             return False
+
+    def nextId(self):
+        """
+        Overload of the QWizardPage nextId method.
+        """
+        return self.wizard().pageIndex(self.next_page)
+        
     
     ####
 
@@ -103,7 +114,12 @@ class BFolderPage(BWizardPage):
         """
         Slot called when the project folder is changed manually by the user.
         """
-        self._destination_folder = unicode(QDir.toNativeSeparators(directory))
+        try:
+            directory = unicode(directory).encode("ascii")
+        except UnicodeEncodeError:
+            directory = self._destination_folder
+            self.pageContent.directoryEdit.setText(directory)
+        self._destination_folder = directory
         self.setProjectPath()
 
     def selectDirectory(self):
@@ -112,9 +128,19 @@ class BFolderPage(BWizardPage):
         """
         directory = unicode(QFileDialog.getExistingDirectory(self, self.tr("Open Directory"), self.pageContent.directoryEdit.text(), QFileDialog.ShowDirsOnly))
         if len(directory) > 0:
-            self.pageContent.directoryEdit.setText(directory)
+            self.pageContent.directoryEdit.setText(QDir.toNativeSeparators(directory))
 
     ####
+
+    @property
+    def next_page(self):
+        """
+        Contains the next page class.
+        """
+        if self.pageContent.customButton.isChecked():
+            return BVersionPage
+        else:
+            return BBoardPage
     
     def initializeAttributes(self):
         """