Mercurial Repositories > eric / changeset

--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Tue May 28 20:52:12 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Thu May 30 14:48:05 2013 +0200
@@ -1055,21 +1055,6 @@
             else:
                 self.graftButton.setEnabled(False)
     
-    def __updateGraftButton(self):
-        """
-        Private slot to update the status of the graft button.
-        """
-        if self.graftButton.isVisible():
-            # step 1: count selected entries not belonging to the current branch
-            otherBranches = 0
-            for itm in self.logTree.selectedItems():
-                branch = itm.text(self.BranchColumn)
-                if branch != self.__projectBranch:
-                    otherBranches += 1
-            
-            # step 2: set the status of the graft button
-            self.graftButton.setEnabled(otherBranches > 0)
-    
     def __updateGui(self, itm):
         """
         Private slot to update GUI elements except the diff and phase buttons.

--- a/Preferences/__init__.py	Tue May 28 20:52:12 2013 +0200
+++ b/Preferences/__init__.py	Thu May 30 14:48:05 2013 +0200
@@ -1430,39 +1430,6 @@
         if sys.version_info[0] == 2:
             prefClass.settings.remove("UI/ViewProfiles")
         return viewProfiles
-    elif key in "ViewProfiles2":
-        profiles = prefClass.settings.value("UI/ViewProfiles2")
-        if profiles is not None:
-            viewProfiles = {}
-            profiles = json.loads(profiles)
-            for name in ["edit", "debug"]:
-                viewProfiles[name] = [
-                    QByteArray.fromBase64(profiles[name][0].encode()),
-                    profiles[name][1][:],
-                    []
-                ]
-                for bs in profiles[name][2]:
-                    viewProfiles[name][2].append(QByteArray.fromBase64(bs.encode()))
-        else:
-            # migrate from the old ViewProfiles settings
-            try:
-                profiles = prefClass.settings.value("UI/ViewProfiles")
-            except TypeError:
-                profiles = None
-            if profiles is not None:
-                viewProfiles = {}
-                for name in ["edit", "debug"]:
-                    viewProfiles[name] = [
-                        QByteArray(profiles[name][4]),
-                        profiles[name][5][:],
-                        []
-                    ]
-                    for b in profiles[name][6]:
-                        viewProfiles[name][2].append(QByteArray(b))
-            else:
-                # use the defaults
-                viewProfiles = prefClass.uiDefaults["ViewProfiles2"]
-        return viewProfiles
     elif key in ["ToolbarManagerState", "PreviewSplitterState"]:
         state = prefClass.settings.value("UI/" + key)
         if state is not None: