Mercurial Repositories > eric / file diff

diff: src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py

src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py

branch
eric7
changeset 9413
80c06d472826
parent 9221
bf71ee032bb4
child 9421
989ee2535d59
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py	Tue Oct 18 16:05:20 2022 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py	Tue Oct 18 16:06:21 2022 +0200
@@ -11,13 +11,13 @@
 
 from PyQt6.QtWidgets import QMenu, QDialog
 
-from EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets.EricApplication import ericApp
 
-from Project.ProjectBrowserModel import ProjectBrowserFileItem
+from eric7.Project.ProjectBrowserModel import ProjectBrowserFileItem
 
-from VCS.ProjectBrowserHelper import VcsProjectBrowserHelper
+from eric7.VCS.ProjectBrowserHelper import VcsProjectBrowserHelper
 
-import UI.PixmapCache
+from eric7.EricGui import EricPixmapCache
 
 
 class HgProjectBrowserHelper(VcsProjectBrowserHelper):
@@ -289,7 +289,7 @@
         menu = QMenu(self.tr("Version Control"))
 
         act = menu.addAction(
-            UI.PixmapCache.getIcon(
+            EricPixmapCache.getIcon(
                 os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.svg")
             ),
             self.vcs.vcsName(),
@@ -301,7 +301,7 @@
         menu.addSeparator()
 
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsCommit"),
+            EricPixmapCache.getIcon("vcsCommit"),
             self.tr("Commit changes to repository..."),
             self._VCSCommit,
         )
@@ -309,17 +309,19 @@
         self.__addExtensionsMenu(menu, "mainMenu")
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd"), self.tr("Add to repository"), self._VCSAdd
+            EricPixmapCache.getIcon("vcsAdd"),
+            self.tr("Add to repository"),
+            self._VCSAdd,
         )
         self.vcsAddMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove"),
+            EricPixmapCache.getIcon("vcsRemove"),
             self.tr("Remove from repository (and disk)"),
             self._VCSRemove,
         )
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove"),
+            EricPixmapCache.getIcon("vcsRemove"),
             self.tr("Remove from repository only"),
             self.__HgForget,
         )
@@ -331,37 +333,39 @@
         self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsLog"),
+            EricPixmapCache.getIcon("vcsLog"),
             self.tr("Show log browser"),
             self._VCSLogBrowser,
         )
         self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsStatus"), self.tr("Show status"), self._VCSStatus
+            EricPixmapCache.getIcon("vcsStatus"),
+            self.tr("Show status"),
+            self._VCSStatus,
         )
         self.vcsMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff"),
+            EricPixmapCache.getIcon("vcsDiff"),
             self.tr("Show differences"),
             self._VCSDiff,
         )
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsSbsDiff"),
+            EricPixmapCache.getIcon("vcsSbsDiff"),
             self.tr("Show differences side-by-side"),
             self.__HgSbsDiff,
         )
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff"),
+            EricPixmapCache.getIcon("vcsDiff"),
             self.tr("Show differences (extended)"),
             self.__HgExtendedDiff,
         )
         self.vcsMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsSbsDiff"),
+            EricPixmapCache.getIcon("vcsSbsDiff"),
             self.tr("Show differences side-by-side (extended)"),
             self.__HgSbsExtendedDiff,
         )
@@ -372,7 +376,7 @@
         self.vcsMenuActions.append(self.annotateAct)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert"),
+            EricPixmapCache.getIcon("vcsRevert"),
             self.tr("Revert changes"),
             self.__HgRevert,
         )
@@ -418,7 +422,7 @@
         menu = QMenu(self.tr("Version Control"))
 
         act = menu.addAction(
-            UI.PixmapCache.getIcon(
+            EricPixmapCache.getIcon(
                 os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.svg")
             ),
             self.vcs.vcsName(),
@@ -430,7 +434,7 @@
         menu.addSeparator()
 
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsCommit"),
+            EricPixmapCache.getIcon("vcsCommit"),
             self.tr("Commit changes to repository..."),
             self._VCSCommit,
         )
@@ -438,42 +442,46 @@
         self.__addExtensionsMenu(menu, "multiMenu")
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd"), self.tr("Add to repository"), self._VCSAdd
+            EricPixmapCache.getIcon("vcsAdd"),
+            self.tr("Add to repository"),
+            self._VCSAdd,
         )
         self.vcsAddMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove"),
+            EricPixmapCache.getIcon("vcsRemove"),
             self.tr("Remove from repository (and disk)"),
             self._VCSRemove,
         )
         self.vcsMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove"),
+            EricPixmapCache.getIcon("vcsRemove"),
             self.tr("Remove from repository only"),
             self.__HgForget,
         )
         self.vcsMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsStatus"), self.tr("Show status"), self._VCSStatus
+            EricPixmapCache.getIcon("vcsStatus"),
+            self.tr("Show status"),
+            self._VCSStatus,
         )
         self.vcsMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff"),
+            EricPixmapCache.getIcon("vcsDiff"),
             self.tr("Show differences"),
             self._VCSDiff,
         )
         self.vcsMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff"),
+            EricPixmapCache.getIcon("vcsDiff"),
             self.tr("Show differences (extended)"),
             self.__HgExtendedDiff,
         )
         self.vcsMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert"),
+            EricPixmapCache.getIcon("vcsRevert"),
             self.tr("Revert changes"),
             self.__HgRevert,
         )
@@ -515,7 +523,7 @@
         menu = QMenu(self.tr("Version Control"))
 
         act = menu.addAction(
-            UI.PixmapCache.getIcon(
+            EricPixmapCache.getIcon(
                 os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.svg")
             ),
             self.vcs.vcsName(),
@@ -562,7 +570,7 @@
         menu = QMenu(self.tr("Version Control"))
 
         act = menu.addAction(
-            UI.PixmapCache.getIcon(
+            EricPixmapCache.getIcon(
                 os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.svg")
             ),
             self.vcs.vcsName(),
@@ -574,7 +582,7 @@
         menu.addSeparator()
 
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsCommit"),
+            EricPixmapCache.getIcon("vcsCommit"),
             self.tr("Commit changes to repository..."),
             self._VCSCommit,
         )
@@ -582,11 +590,13 @@
         self.__addExtensionsMenu(menu, "dirMenu")
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd"), self.tr("Add to repository"), self._VCSAdd
+            EricPixmapCache.getIcon("vcsAdd"),
+            self.tr("Add to repository"),
+            self._VCSAdd,
         )
         self.vcsAddDirMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove"),
+            EricPixmapCache.getIcon("vcsRemove"),
             self.tr("Remove from repository (and disk)"),
             self._VCSRemove,
         )
@@ -598,32 +608,34 @@
         self.vcsDirMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsLog"),
+            EricPixmapCache.getIcon("vcsLog"),
             self.tr("Show log browser"),
             self._VCSLogBrowser,
         )
         self.vcsDirMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsStatus"), self.tr("Show status"), self._VCSStatus
+            EricPixmapCache.getIcon("vcsStatus"),
+            self.tr("Show status"),
+            self._VCSStatus,
         )
         self.vcsDirMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff"),
+            EricPixmapCache.getIcon("vcsDiff"),
             self.tr("Show differences"),
             self._VCSDiff,
         )
         self.vcsDirMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff"),
+            EricPixmapCache.getIcon("vcsDiff"),
             self.tr("Show differences (extended)"),
             self.__HgExtendedDiff,
         )
         self.vcsDirMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert"),
+            EricPixmapCache.getIcon("vcsRevert"),
             self.tr("Revert changes"),
             self.__HgRevert,
         )
@@ -671,7 +683,7 @@
         menu = QMenu(self.tr("Version Control"))
 
         act = menu.addAction(
-            UI.PixmapCache.getIcon(
+            EricPixmapCache.getIcon(
                 os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.svg")
             ),
             self.vcs.vcsName(),
@@ -683,7 +695,7 @@
         menu.addSeparator()
 
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsCommit"),
+            EricPixmapCache.getIcon("vcsCommit"),
             self.tr("Commit changes to repository..."),
             self._VCSCommit,
         )
@@ -691,36 +703,40 @@
         self.__addExtensionsMenu(menu, "dirMultiMenu")
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsAdd"), self.tr("Add to repository"), self._VCSAdd
+            EricPixmapCache.getIcon("vcsAdd"),
+            self.tr("Add to repository"),
+            self._VCSAdd,
         )
         self.vcsAddDirMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRemove"),
+            EricPixmapCache.getIcon("vcsRemove"),
             self.tr("Remove from repository (and disk)"),
             self._VCSRemove,
         )
         self.vcsDirMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsStatus"), self.tr("Show status"), self._VCSStatus
+            EricPixmapCache.getIcon("vcsStatus"),
+            self.tr("Show status"),
+            self._VCSStatus,
         )
         self.vcsDirMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff"),
+            EricPixmapCache.getIcon("vcsDiff"),
             self.tr("Show differences"),
             self._VCSDiff,
         )
         self.vcsDirMultiMenuActions.append(act)
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsDiff"),
+            EricPixmapCache.getIcon("vcsDiff"),
             self.tr("Show differences (extended)"),
             self.__HgExtendedDiff,
         )
         self.vcsDirMultiMenuActions.append(act)
         menu.addSeparator()
         act = menu.addAction(
-            UI.PixmapCache.getIcon("vcsRevert"),
+            EricPixmapCache.getIcon("vcsRevert"),
             self.tr("Revert changes"),
             self.__HgRevert,
         )
@@ -888,7 +904,7 @@
         Private slot called by the context menu to remove the selected file
         from the Mercurial repository leaving a copy in the project directory.
         """
-        from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
+        from eric7.UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
 
         if self.isTranslationsBrowser:
             items = self.browser.getSelectedItems([ProjectBrowserFileItem])

Mercurial Repository: eric

eric ide

mercurial