diff -r 45e7bb09c120 -r 80c06d472826 src/eric7/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py Tue Oct 18 16:05:20 2022 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/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 GitProjectBrowserHelper(VcsProjectBrowserHelper):
@@ -184,7 +184,7 @@
menu = QMenu(self.tr("Version Control"))
act = menu.addAction(
- UI.PixmapCache.getIcon(
+ EricPixmapCache.getIcon(
os.path.join("VcsPlugins", "vcsGit", "icons", "git.svg")
),
self.vcs.vcsName(),
@@ -196,32 +196,32 @@
menu.addSeparator()
act = menu.addAction(
- UI.PixmapCache.getIcon("vcsCommit"),
+ EricPixmapCache.getIcon("vcsCommit"),
self.tr("Commit changes to repository..."),
self._VCSCommit,
)
self.vcsMenuActions.append(act)
menu.addSeparator()
act = menu.addAction(
- UI.PixmapCache.getIcon("vcsAdd"),
+ EricPixmapCache.getIcon("vcsAdd"),
self.tr("Add/Stage to repository"),
self._VCSAdd,
)
act = menu.addAction(
- UI.PixmapCache.getIcon("vcsRevert"),
+ EricPixmapCache.getIcon("vcsRevert"),
self.tr("Unstage changes"),
self.__GitUnstage,
)
self.vcsMenuActions.append(act)
menu.addSeparator()
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.__GitForget,
)
@@ -233,37 +233,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.__GitSbsDiff,
)
self.vcsMenuActions.append(act)
act = menu.addAction(
- UI.PixmapCache.getIcon("vcsDiff"),
+ EricPixmapCache.getIcon("vcsDiff"),
self.tr("Show differences (extended)"),
self.__GitExtendedDiff,
)
self.vcsMenuActions.append(act)
act = menu.addAction(
- UI.PixmapCache.getIcon("vcsSbsDiff"),
+ EricPixmapCache.getIcon("vcsSbsDiff"),
self.tr("Show differences side-by-side (extended)"),
self.__GitSbsExtendedDiff,
)
@@ -275,7 +277,7 @@
self.vcsMenuActions.append(self.annotateAct)
menu.addSeparator()
act = menu.addAction(
- UI.PixmapCache.getIcon("vcsRevert"),
+ EricPixmapCache.getIcon("vcsRevert"),
self.tr("Revert changes"),
self.__GitRevert,
)
@@ -314,7 +316,7 @@
menu = QMenu(self.tr("Version Control"))
act = menu.addAction(
- UI.PixmapCache.getIcon(
+ EricPixmapCache.getIcon(
os.path.join("VcsPlugins", "vcsGit", "icons", "git.svg")
),
self.vcs.vcsName(),
@@ -326,57 +328,59 @@
menu.addSeparator()
act = menu.addAction(
- UI.PixmapCache.getIcon("vcsCommit"),
+ EricPixmapCache.getIcon("vcsCommit"),
self.tr("Commit changes to repository..."),
self._VCSCommit,
)
self.vcsMultiMenuActions.append(act)
menu.addSeparator()
act = menu.addAction(
- UI.PixmapCache.getIcon("vcsAdd"),
+ EricPixmapCache.getIcon("vcsAdd"),
self.tr("Add/Stage to repository"),
self._VCSAdd,
)
act = menu.addAction(
- UI.PixmapCache.getIcon("vcsRevert"),
+ EricPixmapCache.getIcon("vcsRevert"),
self.tr("Unstage changes"),
self.__GitUnstage,
)
self.vcsMultiMenuActions.append(act)
menu.addSeparator()
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.__GitForget,
)
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.__GitExtendedDiff,
)
self.vcsMultiMenuActions.append(act)
menu.addSeparator()
act = menu.addAction(
- UI.PixmapCache.getIcon("vcsRevert"),
+ EricPixmapCache.getIcon("vcsRevert"),
self.tr("Revert changes"),
self.__GitRevert,
)
@@ -414,7 +418,7 @@
menu = QMenu(self.tr("Version Control"))
act = menu.addAction(
- UI.PixmapCache.getIcon(
+ EricPixmapCache.getIcon(
os.path.join("VcsPlugins", "vcsGit", "icons", "git.svg")
),
self.vcs.vcsName(),
@@ -461,7 +465,7 @@
menu = QMenu(self.tr("Version Control"))
act = menu.addAction(
- UI.PixmapCache.getIcon(
+ EricPixmapCache.getIcon(
os.path.join("VcsPlugins", "vcsGit", "icons", "git.svg")
),
self.vcs.vcsName(),
@@ -473,26 +477,26 @@
menu.addSeparator()
act = menu.addAction(
- UI.PixmapCache.getIcon("vcsCommit"),
+ EricPixmapCache.getIcon("vcsCommit"),
self.tr("Commit changes to repository..."),
self._VCSCommit,
)
self.vcsDirMenuActions.append(act)
menu.addSeparator()
act = menu.addAction(
- UI.PixmapCache.getIcon("vcsAdd"),
+ EricPixmapCache.getIcon("vcsAdd"),
self.tr("Add/Stage to repository"),
self._VCSAdd,
)
act = menu.addAction(
- UI.PixmapCache.getIcon("vcsRevert"),
+ EricPixmapCache.getIcon("vcsRevert"),
self.tr("Unstage changes"),
self.__GitUnstage,
)
self.vcsDirMenuActions.append(act)
menu.addSeparator()
act = menu.addAction(
- UI.PixmapCache.getIcon("vcsRemove"),
+ EricPixmapCache.getIcon("vcsRemove"),
self.tr("Remove from repository (and disk)"),
self._VCSRemove,
)
@@ -504,32 +508,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.__GitExtendedDiff,
)
self.vcsDirMenuActions.append(act)
menu.addSeparator()
act = menu.addAction(
- UI.PixmapCache.getIcon("vcsRevert"),
+ EricPixmapCache.getIcon("vcsRevert"),
self.tr("Revert changes"),
self.__GitRevert,
)
@@ -572,7 +578,7 @@
menu = QMenu(self.tr("Version Control"))
act = menu.addAction(
- UI.PixmapCache.getIcon(
+ EricPixmapCache.getIcon(
os.path.join("VcsPlugins", "vcsGit", "icons", "git.svg")
),
self.vcs.vcsName(),
@@ -584,51 +590,53 @@
menu.addSeparator()
act = menu.addAction(
- UI.PixmapCache.getIcon("vcsCommit"),
+ EricPixmapCache.getIcon("vcsCommit"),
self.tr("Commit changes to repository..."),
self._VCSCommit,
)
self.vcsDirMultiMenuActions.append(act)
menu.addSeparator()
act = menu.addAction(
- UI.PixmapCache.getIcon("vcsAdd"),
+ EricPixmapCache.getIcon("vcsAdd"),
self.tr("Add/Stage to repository"),
self._VCSAdd,
)
act = menu.addAction(
- UI.PixmapCache.getIcon("vcsRevert"),
+ EricPixmapCache.getIcon("vcsRevert"),
self.tr("Unstage changes"),
self.__GitUnstage,
)
self.vcsDirMultiMenuActions.append(act)
menu.addSeparator()
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.__GitExtendedDiff,
)
self.vcsDirMultiMenuActions.append(act)
menu.addSeparator()
act = menu.addAction(
- UI.PixmapCache.getIcon("vcsRevert"),
+ EricPixmapCache.getIcon("vcsRevert"),
self.tr("Revert changes"),
self.__GitRevert,
)
@@ -668,7 +676,7 @@
Private slot called by the context menu to remove the selected file
from the Git 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])
