Move the .ui files in the ui directory

[bertos.git] / wizard / BFolderPage.py

diff --git a/wizard/BFolderPage.py b/wizard/BFolderPage.py
index 76f99172bed5dfa76f95ed6076f5124c0bf4f60a..374b231da7c5ff8c8c96fac6487ca5bdc7a9313a 100644 (file)
--- a/wizard/BFolderPage.py
+++ b/wizard/BFolderPage.py
@@ -15,10 +15,12 @@ from PyQt4.QtGui import *
 from BWizardPage import *
 import bertos_utils
 
+from const import *
+
 class BFolderPage(BWizardPage):
     
     def __init__(self):
-        BWizardPage.__init__(self, "dir_select.ui")
+        BWizardPage.__init__(self, UI_LOCATION + "/dir_select.ui")
         self.setTitle(self.tr("Select the project name"))
         self._initializeAttributes()
         self._connectSignals()
@@ -45,18 +47,19 @@ class BFolderPage(BWizardPage):
         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 + "/")
+            self.pageContent.projectPath.setText(self._destinationFolder + self._projectName)
         else:
             self.pageContent.projectPath.setText("None")
         self.emit(SIGNAL("completeChanged()"))
     
     def _selectDirectory(self):
-        directory = QFileDialog.getExistingDirectory(self, self.tr("Open Directory"), "", QFileDialog.ShowDirsOnly)
-        self.pageContent.directoryEdit.setText(directory)
+        directory = unicode(QFileDialog.getExistingDirectory(self, self.tr("Open Directory"), "", QFileDialog.ShowDirsOnly))
+        if len(directory) == "":
+            self.pageContent.directoryEdit.setText(directory)
     
     def isComplete(self):
         if self.pageContent.projectPath.text() != "None":
-            self._projectInfoStore("PROJECT_PATH", self.pageContent.projectPath.text())
+            self._projectInfoStore("PROJECT_PATH", unicode(self.pageContent.projectPath.text()))
             return True
         else:
             return False
\ No newline at end of file