Renamed a few excternal references.

Sat, 05 Jul 2014 13:57:33 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 05 Jul 2014 13:57:33 +0200
changeset 3676
2f62b060a931
parent 3675
aa48d3e9b008
child 3677
a53cf139293f

Renamed a few excternal references.

E5XML/PluginRepositoryReader.py file | annotate | diff | comparison | revisions
PluginManager/PluginManager.py file | annotate | diff | comparison | revisions
PluginManager/PluginRepositoryDialog.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/PluginManagerPage.py file | annotate | diff | comparison | revisions
Preferences/__init__.py file | annotate | diff | comparison | revisions
UI/UserInterface.py file | annotate | diff | comparison | revisions
diff -r aa48d3e9b008 -r 2f62b060a931 E5XML/PluginRepositoryReader.py
--- a/E5XML/PluginRepositoryReader.py	Sat Jul 05 12:23:15 2014 +0200
+++ b/E5XML/PluginRepositoryReader.py	Sat Jul 05 13:57:33 2014 +0200
@@ -50,7 +50,7 @@
                         self.raiseUnsupportedFormatVersion(self.version)
                 elif self.name() == "RepositoryUrl":
                     url = self.readElementText()
-                    Preferences.setUI("PluginRepositoryUrl5", url)
+                    Preferences.setUI("PluginRepositoryUrl6", url)
                 elif self.name() == "Plugin":
                     self.__readPlugin()
                 else:
diff -r aa48d3e9b008 -r 2f62b060a931 PluginManager/PluginManager.py
--- a/PluginManager/PluginManager.py	Sat Jul 05 12:23:15 2014 +0200
+++ b/PluginManager/PluginManager.py	Sat Jul 05 13:57:33 2014 +0200
@@ -1094,7 +1094,7 @@
         self.__updateAvailable = False
         
         request = QNetworkRequest(
-            QUrl(Preferences.getUI("PluginRepositoryUrl5")))
+            QUrl(Preferences.getUI("PluginRepositoryUrl6")))
         request.setAttribute(QNetworkRequest.CacheLoadControlAttribute,
                              QNetworkRequest.AlwaysNetwork)
         reply = self.__networkManager.get(request)
@@ -1115,7 +1115,7 @@
                 self.tr(
                     """<p>Could not download the requested file"""
                     """ from {0}.</p><p>Error: {1}</p>"""
-                ).format(Preferences.getUI("PluginRepositoryUrl5"),
+                ).format(Preferences.getUI("PluginRepositoryUrl6"),
                          reply.errorString())
             )
             return
@@ -1132,13 +1132,13 @@
             f = QFile(self.pluginRepositoryFile)
             if f.open(QIODevice.ReadOnly):
                 # save current URL
-                url = Preferences.getUI("PluginRepositoryUrl5")
+                url = Preferences.getUI("PluginRepositoryUrl6")
                 
                 # read the repository file
                 from E5XML.PluginRepositoryReader import PluginRepositoryReader
                 reader = PluginRepositoryReader(f, self.checkPluginEntry)
                 reader.readXML()
-                if url != Preferences.getUI("PluginRepositoryUrl5"):
+                if url != Preferences.getUI("PluginRepositoryUrl6"):
                     # redo if it is a redirect
                     self.checkPluginUpdatesAvailable()
                     return
diff -r aa48d3e9b008 -r 2f62b060a931 PluginManager/PluginRepositoryDialog.py
--- a/PluginManager/PluginRepositoryDialog.py	Sat Jul 05 12:23:15 2014 +0200
+++ b/PluginManager/PluginRepositoryDialog.py	Sat Jul 05 13:57:33 2014 +0200
@@ -91,7 +91,7 @@
         self.__installButton.setEnabled(False)
         
         self.repositoryUrlEdit.setText(
-            Preferences.getUI("PluginRepositoryUrl5"))
+            Preferences.getUI("PluginRepositoryUrl6"))
         
         self.repositoryList.headerItem().setText(
             self.repositoryList.columnCount(), "")
@@ -361,7 +361,7 @@
                 self.repositoryList.resizeColumnToContents(1)
                 self.repositoryList.resizeColumnToContents(2)
                 self.__resortRepositoryList()
-                url = Preferences.getUI("PluginRepositoryUrl5")
+                url = Preferences.getUI("PluginRepositoryUrl6")
                 if url != self.repositoryUrlEdit.text():
                     self.repositoryUrlEdit.setText(url)
                     E5MessageBox.warning(
diff -r aa48d3e9b008 -r 2f62b060a931 Preferences/ConfigurationPages/PluginManagerPage.py
--- a/Preferences/ConfigurationPages/PluginManagerPage.py	Sat Jul 05 12:23:15 2014 +0200
+++ b/Preferences/ConfigurationPages/PluginManagerPage.py	Sat Jul 05 13:57:33 2014 +0200
@@ -63,7 +63,7 @@
         self.downloadedOnlyCheckBox.setChecked(
             Preferences.getPluginManager("CheckInstalledOnly"))
         
-        self.__repositoryUrl = Preferences.getUI("PluginRepositoryUrl5")
+        self.__repositoryUrl = Preferences.getUI("PluginRepositoryUrl6")
         self.repositoryUrlEdit.setText(self.__repositoryUrl)
     
     def save(self):
@@ -99,7 +99,7 @@
         
         if self.repositoryUrlEdit.text() != self.__repositoryUrl:
             Preferences.setUI(
-                "PluginRepositoryUrl5", self.repositoryUrlEdit.text())
+                "PluginRepositoryUrl6", self.repositoryUrlEdit.text())
     
     @pyqtSlot()
     def on_downloadDirButton_clicked(self):
diff -r aa48d3e9b008 -r 2f62b060a931 Preferences/__init__.py
--- a/Preferences/__init__.py	Sat Jul 05 12:23:15 2014 +0200
+++ b/Preferences/__init__.py	Sat Jul 05 13:57:33 2014 +0200
@@ -189,12 +189,12 @@
         "ProxyType/Ftp": E5FtpProxyType.NoProxy,
         "ProxyAccount/Ftp": "",
         
-        "PluginRepositoryUrl5":
-        "http://eric-ide.python-projects.org/plugins5/repository.xml",
-        "VersionsUrls5": [
-            "http://die-offenbachs.homelinux.org:48888/eric/snapshots5/"
-            "versions",
-            "http://eric-ide.python-projects.org/snapshots5/versions",
+        "PluginRepositoryUrl6":
+        "http://eric-ide.python-projects.org/plugins6/repository.xml",
+        "VersionsUrls6": [
+            "http://die-offenbachs.homelinux.org:48888/eric/versions/"
+            "versions6",
+            "http://eric-ide.python-projects.org/versions/versions6",
         ],
         
         "OpenOnStartup": 0,        # 0 = nothing
@@ -1519,7 +1519,7 @@
             return state
         else:
             return prefClass.uiDefaults[key]
-    elif key in ["VersionsUrls5"]:
+    elif key in ["VersionsUrls6"]:
         urls = toList(
             prefClass.settings.value("UI/" + key, prefClass.uiDefaults[key]))
         if len(urls) == 0:
diff -r aa48d3e9b008 -r 2f62b060a931 UI/UserInterface.py
--- a/UI/UserInterface.py	Sat Jul 05 12:23:15 2014 +0200
+++ b/UI/UserInterface.py	Sat Jul 05 13:57:33 2014 +0200
@@ -562,7 +562,7 @@
         self.helpWindow = None
         
         # list of web addresses serving the versions file
-        self.__httpAlternatives = Preferences.getUI("VersionsUrls5")
+        self.__httpAlternatives = Preferences.getUI("VersionsUrls6")
         self.__inVersionCheck = False
         self.__versionCheckProgress = None
         
@@ -5206,7 +5206,7 @@
             else:
                 self.__setWindowCaption(editor="")
         
-        self.__httpAlternatives = Preferences.getUI("VersionsUrls5")
+        self.__httpAlternatives = Preferences.getUI("VersionsUrls6")
         self.performVersionCheck(False)
         
         self.__configureDockareaCornerUsage()
@@ -5964,7 +5964,7 @@
                 urls.append(versions[line])
                 line += 1
             
-            Preferences.setUI("VersionsUrls5", urls)
+            Preferences.setUI("VersionsUrls6", urls)
         
     def __versionCheckResult(self, versions):
         """

eric ide

mercurial