X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBFolderPage.py;h=374b231da7c5ff8c8c96fac6487ca5bdc7a9313a;hb=255e98716335ab8e40da330bad016a8983046dec;hp=5a0a9566e9392571e337793748e8ee8b61729cef;hpb=7a6e7a6b51151ca0c221e004871fc1e4c5748124;p=bertos.git

diff --git a/wizard/BFolderPage.py b/wizard/BFolderPage.py
index 5a0a9566..374b231d 100644
--- a/wizard/BFolderPage.py
+++ b/wizard/BFolderPage.py
@@ -15,17 +15,20 @@ 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()
 
     def _initializeAttributes(self):
         self._projectName = ""
-        self._destinationFolder = ""
+        self._destinationFolder = os.path.expanduser("~")
+        self.pageContent.directoryEdit.setText(self._destinationFolder)
     
     def _connectSignals(self):
         self.connect(self.pageContent.nameEdit, SIGNAL("textChanged(const QString)"), self._nameChanged)
@@ -41,17 +44,22 @@ class BFolderPage(BWizardPage):
         self._setProjectPath()
     
     def _setProjectPath(self):
-        if self._destinationFolder <> "" and self._projectName <> "":
+        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):
-        return self.pageContent.projectPath.text() != "None"
\ No newline at end of file
+        if self.pageContent.projectPath.text() != "None":
+            self._projectInfoStore("PROJECT_PATH", unicode(self.pageContent.projectPath.text()))
+            return True
+        else:
+            return False
\ No newline at end of file