Merged remote changes. 5_3_x

Sun, 28 Apr 2013 19:04:34 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 28 Apr 2013 19:04:34 +0200
branch
5_3_x
changeset 2638
11b930473425
parent 2637
066683ed6976 (current diff)
parent 2635
76edcbd56632 (diff)
child 2639
d9c43b41da5b

Merged remote changes.

install.py file | annotate | diff | comparison | revisions
--- a/Debugger/EditWatchpointDialog.py	Wed Apr 24 19:44:41 2013 +0200
+++ b/Debugger/EditWatchpointDialog.py	Sun Apr 28 19:04:34 2013 +0200
@@ -80,7 +80,6 @@
             # should not happen
             self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
         
-        
     def getData(self):
         """
         Public method to retrieve the entered data.
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Help/source.qhp	Wed Apr 24 19:44:41 2013 +0200
+++ b/Documentation/Help/source.qhp	Sun Apr 28 19:04:34 2013 +0200
@@ -8127,7 +8127,6 @@
       <keyword name="Project.__initProjectTypes" id="Project.__initProjectTypes" ref="eric5.Project.Project.html#Project.__initProjectTypes" />
       <keyword name="Project.__loadDiagram" id="Project.__loadDiagram" ref="eric5.Project.Project.html#Project.__loadDiagram" />
       <keyword name="Project.__loadRecent" id="Project.__loadRecent" ref="eric5.Project.Project.html#Project.__loadRecent" />
-      <keyword name="Project.__makePpathRe" id="Project.__makePpathRe" ref="eric5.Project.Project.html#Project.__makePpathRe" />
       <keyword name="Project.__openRecent" id="Project.__openRecent" ref="eric5.Project.Project.html#Project.__openRecent" />
       <keyword name="Project.__pluginCreateArchive" id="Project.__pluginCreateArchive" ref="eric5.Project.Project.html#Project.__pluginCreateArchive" />
       <keyword name="Project.__pluginCreatePkgList" id="Project.__pluginCreatePkgList" ref="eric5.Project.Project.html#Project.__pluginCreatePkgList" />
--- a/Documentation/Source/eric5.Project.Project.html	Wed Apr 24 19:44:41 2013 +0200
+++ b/Documentation/Source/eric5.Project.Project.html	Sun Apr 28 19:04:34 2013 +0200
@@ -224,9 +224,6 @@
 <td><a href="#Project.__loadRecent">__loadRecent</a></td>
 <td>Private method to load the recently opened project filenames.</td>
 </tr><tr>
-<td><a href="#Project.__makePpathRe">__makePpathRe</a></td>
-<td>Private method to generate a regular expression for the project path.</td>
-</tr><tr>
 <td><a href="#Project.__openRecent">__openRecent</a></td>
 <td>Private method to open a project from the list of rencently opened projects.</td>
 </tr><tr>
@@ -854,11 +851,6 @@
 <b>__loadRecent</b>(<i></i>)
 <p>
         Private method to load the recently opened project filenames.
-</p><a NAME="Project.__makePpathRe" ID="Project.__makePpathRe"></a>
-<h4>Project.__makePpathRe</h4>
-<b>__makePpathRe</b>(<i></i>)
-<p>
-        Private method to generate a regular expression for the project path.
 </p><a NAME="Project.__openRecent" ID="Project.__openRecent"></a>
 <h4>Project.__openRecent</h4>
 <b>__openRecent</b>(<i>act</i>)
--- a/Network/IRC/IrcChannelWidget.py	Wed Apr 24 19:44:41 2013 +0200
+++ b/Network/IRC/IrcChannelWidget.py	Sun Apr 28 19:04:34 2013 +0200
@@ -932,7 +932,6 @@
             "{0} {1}".format(match.group(1), ircFilter(match.group(2))))
         return True
     
-    
     def __handleCtcp(self, match):
         """
         Private method to handle a CTCP channel command.
--- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py	Wed Apr 24 19:44:41 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py	Sun Apr 28 19:04:34 2013 +0200
@@ -141,7 +141,6 @@
         """
         self.__updateOK()
     
-    
     @pyqtSlot(str)
     def on_id1Edit_textChanged(self, txt):
         """
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py	Wed Apr 24 19:44:41 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py	Sun Apr 28 19:04:34 2013 +0200
@@ -376,7 +376,6 @@
         self.hgQueueGotoForceAct.triggered[()].connect(self.__hgQueueGotoPatchForced)
         self.actions.append(self.hgQueueGotoForceAct)
     
-    
     def __initGuardsActions(self):
         """
         Public method to generate the guards action objects.
@@ -690,7 +689,6 @@
         self.vcs.getExtensionObject("mq")\
             .hgQueueShowHeader(self.project.getProjectPath())
     
-    
     def __hgQueuePushPopPatches(self, name, operation, all=False, named=False,
                                 force=False):
         """
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py	Wed Apr 24 19:44:41 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py	Sun Apr 28 19:04:34 2013 +0200
@@ -140,7 +140,6 @@
         """
         self.__updateOK()
     
-    
     @pyqtSlot(str)
     def on_id1Edit_textChanged(self, txt):
         """
--- a/Preferences/ConfigurationPages/EmailPage.py	Wed Apr 24 19:44:41 2013 +0200
+++ b/Preferences/ConfigurationPages/EmailPage.py	Sun Apr 28 19:04:34 2013 +0200
@@ -67,7 +67,6 @@
         Preferences.setUser("MailServerUseTLS",
             self.useTlsCheckBox.isChecked())
     
-    
     def __updateTestButton(self):
         """
         Private slot to update the enabled state of the test button.
--- a/Preferences/ConfigurationPages/HelpVirusTotalPage.py	Wed Apr 24 19:44:41 2013 +0200
+++ b/Preferences/ConfigurationPages/HelpVirusTotalPage.py	Sun Apr 28 19:04:34 2013 +0200
@@ -43,7 +43,6 @@
             Preferences.getHelp("VirusTotalSecure"))
         self.vtServiceKeyEdit.setText(
             Preferences.getHelp("VirusTotalServiceKey"))
-        
     
     def save(self):
         """
--- a/Preferences/ShortcutsDialog.py	Wed Apr 24 19:44:41 2013 +0200
+++ b/Preferences/ShortcutsDialog.py	Sun Apr 28 19:04:34 2013 +0200
@@ -426,7 +426,6 @@
                     itm.setHidden(False)
             topItem.setHidden(childHiddenCount == topItem.childCount())
     
-    
     @pyqtSlot(bool)
     def on_actionButton_toggled(self, checked):
         """
--- a/Project/Project.py	Wed Apr 24 19:44:41 2013 +0200
+++ b/Project/Project.py	Sun Apr 28 19:04:34 2013 +0200
@@ -14,7 +14,6 @@
 import fnmatch
 import copy
 import zipfile
-import re
 
 from PyQt4.QtCore import QFile, QFileInfo, pyqtSignal, QCryptographicHash, QIODevice, \
     QByteArray, QObject, Qt
@@ -392,7 +391,6 @@
         self.__dirty = False      # dirty flag
         self.pfile = ""         # name of the project file
         self.ppath = ""         # name of the project directory
-        self.ppathRe = None
         self.translationsRoot = ""  # the translations prefix
         self.name = ""
         self.opened = False
@@ -650,21 +648,6 @@
                 self.pdata[index].remove(file)
             self.setDirty(True)
         
-    def __makePpathRe(self):
-        """
-        Private method to generate a regular expression for the project path.
-        """
-        ppathRe = (self.ppath + os.sep)\
-            .replace("\\", "@@")\
-            .replace("/", "@@")\
-            .replace("@@", r"[\\/]")
-        if ppathRe.endswith(r"[\\/]"):
-            ppathRe += "*"
-        if Utilities.isWindowsPlatform():
-            self.ppathRe = re.compile(ppathRe, re.IGNORECASE)
-        else:
-            self.ppathRe = re.compile(ppathRe)
-        
     def __readProject(self, fn):
         """
         Private method to read in a project (.e4p) file.
@@ -688,7 +671,6 @@
         
         self.pfile = os.path.abspath(fn)
         self.ppath = os.path.abspath(os.path.dirname(fn))
-        self.__makePpathRe()
         
         # insert filename into list of recently opened projects
         self.__syncRecent()
@@ -775,7 +757,6 @@
         if res:
             self.pfile = os.path.abspath(fn)
             self.ppath = os.path.abspath(os.path.dirname(fn))
-            self.__makePpathRe()
             self.name = os.path.splitext(os.path.basename(fn))[0]
             self.setDirty(False)
             
@@ -1877,7 +1858,6 @@
         if dlg.exec_() == QDialog.Accepted:
             self.closeProject()
             dlg.storeData()
-            self.__makePpathRe()
             self.pdata["VCS"] = ['None']
             self.opened = True
             if not self.pdata["FILETYPES"]:
@@ -2103,7 +2083,6 @@
             else:
                 self.newProjectHooks.emit()
                 self.newProject.emit()
-            
 
     def newProjectAddFiles(self, mainscript):
         """
@@ -2848,10 +2827,14 @@
         
         @param path path to be checked (string)
         """
-        if self.ppath and path == self.ppath:
-            return True
-        elif self.ppathRe:
-            return self.ppathRe.match(path) is not None
+        if self.ppath:
+            if path == self.ppath:
+                return True
+            elif Utilities.normcasepath(Utilities.toNativeSeparators(path)).startswith(
+                 Utilities.normcasepath(Utilities.toNativeSeparators(self.ppath + "/"))):
+                return True
+            else:
+                return False
         else:
             return False
         
@@ -2909,7 +2892,7 @@
             if self.ppath and path == self.ppath:
                 return ""
             else:
-                return self.ppathRe.sub("", path, 1)
+                return path[len(self.ppath) + 1:]
         else:
             return path
         
--- a/QScintilla/Editor.py	Wed Apr 24 19:44:41 2013 +0200
+++ b/QScintilla/Editor.py	Sun Apr 28 19:04:34 2013 +0200
@@ -3675,7 +3675,6 @@
                     lineNo -= 1
                 else:
                     lineNo += 1
-            
     
     ############################################################################
     ## Setup methods below
--- a/QScintilla/QsciScintillaCompat.py	Wed Apr 24 19:44:41 2013 +0200
+++ b/QScintilla/QsciScintillaCompat.py	Sun Apr 28 19:04:34 2013 +0200
@@ -962,7 +962,6 @@
             QsciScintilla.SC_MARKNUM_FOLDEREND, foreColor)
         self.SendScintilla(QsciScintilla.SCI_MARKERSETBACK,
             QsciScintilla.SC_MARKNUM_FOLDEREND, backColor)
-        
     
     ###########################################################################
     # interface methods to the standard keyboard command set
--- a/UI/FindFileNameDialog.py	Wed Apr 24 19:44:41 2013 +0200
+++ b/UI/FindFileNameDialog.py	Sun Apr 28 19:04:34 2013 +0200
@@ -180,7 +180,6 @@
         if self.searchDirCheckBox.isChecked():
             self.__searchFile()
         
-        
     @pyqtSlot()
     def on_searchDirButton_clicked(self):
         """
--- a/UI/UserInterface.py	Wed Apr 24 19:44:41 2013 +0200
+++ b/UI/UserInterface.py	Sun Apr 28 19:04:34 2013 +0200
@@ -4677,7 +4677,6 @@
             Preferences.getEditor("SpellCheckingDefaultLanguage"))
         
         self.preferencesChanged.emit()
-        
     
     def __masterPasswordChanged(self, oldPassword, newPassword):
         """
--- a/install.py	Wed Apr 24 19:44:41 2013 +0200
+++ b/install.py	Sun Apr 28 19:04:34 2013 +0200
@@ -1094,6 +1094,7 @@
         pass
     
     # cleanup old installation
+    print("Cleaning up old installation ...")
     try:
         if doCleanup:
             if distDir:
@@ -1105,10 +1106,11 @@
         exit(7)
 
     # Create a config file and delete the default one
+    print("\nCreating configuration file ...")
     createConfig()
 
     # Compile .ui files
-    print("Compiling user interface files...")
+    print("\nCompiling user interface files ...")
     # step 1: remove old Ui_*.py files
     for root, _, files in os.walk(sourceDir):
         for file in [f for f in files if fnmatch.fnmatch(f, 'Ui_*.py')]:
@@ -1117,7 +1119,7 @@
     compileUiFiles()
     
     if doCompile:
-        print("\nCompiling source files...")
+        print("\nCompiling source files ...")
         if distDir:
             compileall.compile_dir(sourceDir,
                 ddir=os.path.join(distDir, modDir, cfg['ericDir']),

eric ide

mercurial