Update to new kernel config; use cpu_relax().

[bertos.git] / wizard / BFolderPage.py

diff --git a/wizard/BFolderPage.py b/wizard/BFolderPage.py
index a14dda2f5d000e8c358b77d5904d2a29ad5fc853..7de7fc73ff508bd430d87d926556436986d83301 100644 (file)
--- a/wizard/BFolderPage.py
+++ b/wizard/BFolderPage.py
@@ -30,9 +30,9 @@ class BFolderPage(BWizardPage):
         self.pageContent.warningLabel.setVisible(False)
     
     def _initializeAttributes(self):
-        self._projectName = ""
-        self._destinationFolder = os.path.expanduser("~")
-        self.pageContent.directoryEdit.setText(self._destinationFolder)
+        self._project_name = ""
+        self._destination_folder = os.path.expanduser("~")
+        self.pageContent.directoryEdit.setText(self._destination_folder)
     
     def _connectSignals(self):
         self.connect(self.pageContent.nameEdit, SIGNAL("textChanged(const QString)"), self._nameChanged)
@@ -40,21 +40,22 @@ class BFolderPage(BWizardPage):
         self.connect(self.pageContent.directoryButton, SIGNAL("clicked()"), self._selectDirectory)
     
     def _nameChanged(self, name):
-        self._projectName = str(name).replace(" ", "_")
+        self._project_name = str(name).replace(" ", "_")
         self._setProjectPath()
     
     def _directoryChanged(self, directory):
-        self._destinationFolder = str(directory)
+        self._destination_folder = str(QDir.toNativeSeparators(directory))
         self._setProjectPath()
     
     def _setProjectPath(self):
-        if self._destinationFolder != "" and self._projectName <> "":
-            if not self._destinationFolder.endswith(os.sep):
-                self._destinationFolder += os.sep
-            self.pageContent.projectPath.setText(self._destinationFolder + self._projectName)
-            if os.path.exists(self._destinationFolder + self._projectName):
+        if self._destination_folder != "" and self._project_name <> "":
+            if not self._destination_folder.endswith(os.sep):
+                self._destination_folder += "/"
+            self.pageContent.projectPath.setText(QDir.toNativeSeparators(self._destination_folder + self._project_name))
+            if os.path.exists(self._destination_folder + self._project_name):
                 self.pageContent.warningLabel.setVisible(True)
-                self.pageContent.warningLabel.setText(self.tr("<font color='#FF0000'>Warning: the selected directory exists, it will be destroyed with all contained subdirectories and files...</font>"))
+                self.pageContent.warningLabel.setText(self.tr("<font color='#FF0000'>Warning: the selected directory exists, \
+                    it will be destroyed with all contained subdirectories and files...</font>"))
             else:
                 self.pageContent.warningLabel.setVisible(False)
                 self.pageContent.warningLabel.setText("")
@@ -66,7 +67,7 @@ class BFolderPage(BWizardPage):
     
     def _selectDirectory(self):
         directory = unicode(QFileDialog.getExistingDirectory(self, self.tr("Open Directory"), "", QFileDialog.ShowDirsOnly))
-        if len(directory) == "":
+        if len(directory) > 0:
             self.pageContent.directoryEdit.setText(directory)
     
     def isComplete(self):