Mercurial Repositories > eric / changeset

--- a/MultiProject/MultiProject.py	Tue Jul 10 19:06:38 2012 +0200
+++ b/MultiProject/MultiProject.py	Wed Jul 11 19:15:52 2012 +0200
@@ -406,7 +406,7 @@
             fn = E5FileDialog.getOpenFileName(
                 self.parent(),
                 self.trUtf8("Open multiproject"),
-                Preferences.getMultiProject("Workspace"),
+                Preferences.getMultiProject("Workspace") or Utilities.getHomeDir(),
                 self.trUtf8("Multiproject Files (*.e4m)"))
             
             if fn == "":
@@ -460,7 +460,8 @@
         if self.ppath:
             defaultPath = self.ppath
         else:
-            defaultPath = Preferences.getMultiProject("Workspace")
+            defaultPath = Preferences.getMultiProject("Workspace") or \
+                          Utilities.getHomeDir()
         fn, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
             self.parent(),
             self.trUtf8("Save multiproject as"),

--- a/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py	Tue Jul 10 19:06:38 2012 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py	Wed Jul 11 19:15:52 2012 +0200
@@ -52,7 +52,7 @@
         self.localProtocol = True
         
         self.vcsProjectDirEdit.setText(Utilities.toNativeSeparators(
-            Preferences.getMultiProject("Workspace")))
+            Preferences.getMultiProject("Workspace") or Utilities.getHomeDir()))
     
     @pyqtSlot()
     def on_vcsUrlButton_clicked(self):

--- a/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py	Tue Jul 10 19:06:38 2012 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py	Wed Jul 11 19:15:52 2012 +0200
@@ -53,7 +53,7 @@
         self.localProtocol = True
         
         self.vcsProjectDirEdit.setText(Utilities.toNativeSeparators(
-            Preferences.getMultiProject("Workspace")))
+            Preferences.getMultiProject("Workspace") or Utilities.getHomeDir()))
         
     @pyqtSlot()
     def on_vcsUrlButton_clicked(self):

--- a/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py	Tue Jul 10 19:06:38 2012 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py	Wed Jul 11 19:15:52 2012 +0200
@@ -53,7 +53,7 @@
         self.localProtocol = True
         
         self.vcsProjectDirEdit.setText(Utilities.toNativeSeparators(
-            Preferences.getMultiProject("Workspace")))
+            Preferences.getMultiProject("Workspace") or Utilities.getHomeDir()))
         
     @pyqtSlot()
     def on_vcsUrlButton_clicked(self):

--- a/Preferences/ConfigurationPages/MultiProjectPage.py	Tue Jul 10 19:06:38 2012 +0200
+++ b/Preferences/ConfigurationPages/MultiProjectPage.py	Wed Jul 11 19:15:52 2012 +0200
@@ -39,7 +39,7 @@
             Preferences.getMultiProject("RecentNumber"))
         self.workspaceEdit.setText(
             Utilities.toNativeSeparators(
-                Preferences.getMultiProject("Workspace")))
+                Preferences.getMultiProject("Workspace") or Utilities.getHomeDir()))
         
     def save(self):
         """

--- a/Project/Project.py	Tue Jul 10 19:06:38 2012 +0200
+++ b/Project/Project.py	Wed Jul 11 19:15:52 2012 +0200
@@ -2251,7 +2251,7 @@
             fn = E5FileDialog.getOpenFileName(
                 self.parent(),
                 self.trUtf8("Open project"),
-                Preferences.getMultiProject("Workspace"),
+                Preferences.getMultiProject("Workspace") or Utilities.getHomeDir(),
                 self.trUtf8("Project Files (*.e4p)"))
         
         QApplication.processEvents()
@@ -2415,7 +2415,8 @@
         if self.ppath:
             defaultPath = self.ppath
         else:
-            defaultPath = Preferences.getMultiProject("Workspace")
+            defaultPath = Preferences.getMultiProject("Workspace") or \
+                          Utilities.getHomeDir()
         fn, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
             self.parent(),
             self.trUtf8("Save project as"),

--- a/Project/PropertiesDialog.py	Tue Jul 10 19:06:38 2012 +0200
+++ b/Project/PropertiesDialog.py	Wed Jul 11 19:15:52 2012 +0200
@@ -122,10 +122,7 @@
                 self.languageComboBox.findText("Python3"))
             self.projectTypeComboBox.setCurrentIndex(
                 self.projectTypeComboBox.findText(projectTypes["Qt4"]))
-            hp = Preferences.getMultiProject("Workspace")
-            if not hp:
-                hp = os.getcwd()
-                hp = hp + os.sep
+            hp = Preferences.getMultiProject("Workspace") or Utilities.getHomeDir()
             self.dirEdit.setText(hp)
             self.versionEdit.setText('0.1')
             self.vcsLabel.hide()

--- a/QScintilla/Editor.py	Tue Jul 10 19:06:38 2012 +0200
+++ b/QScintilla/Editor.py	Wed Jul 11 19:15:52 2012 +0200
@@ -2577,7 +2577,7 @@
             if not path and self.fileName is not None:
                 path = os.path.dirname(self.fileName)
             if not path:
-                path = Preferences.getMultiProject("Workspace")
+                path = Preferences.getMultiProject("Workspace") or Utilities.getHomeDir()
             defaultFilter = Preferences.getEditor("DefaultSaveFilter")
             fn, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
                 self,

--- a/ViewManager/ViewManager.py	Tue Jul 10 19:06:38 2012 +0200
+++ b/ViewManager/ViewManager.py	Wed Jul 11 19:15:52 2012 +0200
@@ -5507,7 +5507,7 @@
             return e5App().getObject("Project").ppath
         
         else:
-            return Preferences.getMultiProject("Workspace")
+            return Preferences.getMultiProject("Workspace") or Utilities.getHomeDir()
         
     def _getOpenFileFilter(self):
         """