diff -r 8a7677a63c8d -r 68ec9c3d4de5 eric7/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py
--- a/eric7/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Sat May 22 18:51:46 2021 +0200
@@ -13,8 +13,8 @@
from VCS.ProjectHelper import VcsProjectHelper
-from E5Gui.E5Action import E5Action
-from E5Gui.E5Application import e5App
+from E5Gui.EricAction import EricAction
+from E5Gui.EricApplication import ericApp
import UI.PixmapCache
@@ -38,7 +38,7 @@
"""
Public method to get a list of all actions.
- @return list of all actions (list of E5Action)
+ @return list of all actions (list of EricAction)
"""
return self.actions[:]
@@ -46,7 +46,7 @@
"""
Public method to generate the action objects.
"""
- self.vcsNewAct = E5Action(
+ self.vcsNewAct = EricAction(
self.tr('New from repository'),
UI.PixmapCache.getIcon("vcsCheckout"),
self.tr('&New from repository...'), 0, 0, self,
@@ -62,7 +62,7 @@
self.vcsNewAct.triggered.connect(self._vcsCheckout)
self.actions.append(self.vcsNewAct)
- self.vcsUpdateAct = E5Action(
+ self.vcsUpdateAct = EricAction(
self.tr('Update from repository'),
UI.PixmapCache.getIcon("vcsUpdate"),
self.tr('&Update from repository'), 0, 0, self,
@@ -78,7 +78,7 @@
self.vcsUpdateAct.triggered.connect(self._vcsUpdate)
self.actions.append(self.vcsUpdateAct)
- self.vcsCommitAct = E5Action(
+ self.vcsCommitAct = EricAction(
self.tr('Commit changes to repository'),
UI.PixmapCache.getIcon("vcsCommit"),
self.tr('&Commit changes to repository...'), 0, 0, self,
@@ -94,7 +94,7 @@
self.vcsCommitAct.triggered.connect(self._vcsCommit)
self.actions.append(self.vcsCommitAct)
- self.svnLogBrowserAct = E5Action(
+ self.svnLogBrowserAct = EricAction(
self.tr('Show log browser'),
UI.PixmapCache.getIcon("vcsLog"),
self.tr('Show log browser'),
@@ -111,7 +111,7 @@
self.svnLogBrowserAct.triggered.connect(self._vcsLogBrowser)
self.actions.append(self.svnLogBrowserAct)
- self.vcsDiffAct = E5Action(
+ self.vcsDiffAct = EricAction(
self.tr('Show differences'),
UI.PixmapCache.getIcon("vcsDiff"),
self.tr('Show &difference'),
@@ -127,7 +127,7 @@
self.vcsDiffAct.triggered.connect(self._vcsDiff)
self.actions.append(self.vcsDiffAct)
- self.svnExtDiffAct = E5Action(
+ self.svnExtDiffAct = EricAction(
self.tr('Show differences (extended)'),
UI.PixmapCache.getIcon("vcsDiff"),
self.tr('Show differences (extended)'),
@@ -143,7 +143,7 @@
self.svnExtDiffAct.triggered.connect(self.__svnExtendedDiff)
self.actions.append(self.svnExtDiffAct)
- self.svnUrlDiffAct = E5Action(
+ self.svnUrlDiffAct = EricAction(
self.tr('Show differences (URLs)'),
UI.PixmapCache.getIcon("vcsDiff"),
self.tr('Show differences (URLs)'),
@@ -159,7 +159,7 @@
self.svnUrlDiffAct.triggered.connect(self.__svnUrlDiff)
self.actions.append(self.svnUrlDiffAct)
- self.vcsStatusAct = E5Action(
+ self.vcsStatusAct = EricAction(
self.tr('Show status'),
UI.PixmapCache.getIcon("vcsStatus"),
self.tr('Show &status'),
@@ -174,7 +174,7 @@
self.vcsStatusAct.triggered.connect(self._vcsStatus)
self.actions.append(self.vcsStatusAct)
- self.svnChangeListsAct = E5Action(
+ self.svnChangeListsAct = EricAction(
self.tr('Show change lists'),
UI.PixmapCache.getIcon("vcsChangeLists"),
self.tr('Show change lists'),
@@ -190,7 +190,7 @@
self.svnChangeListsAct.triggered.connect(self.__svnChangeLists)
self.actions.append(self.svnChangeListsAct)
- self.vcsTagAct = E5Action(
+ self.vcsTagAct = EricAction(
self.tr('Tag in repository'),
UI.PixmapCache.getIcon("vcsTag"),
self.tr('&Tag in repository...'),
@@ -205,7 +205,7 @@
self.vcsTagAct.triggered.connect(self._vcsTag)
self.actions.append(self.vcsTagAct)
- self.vcsExportAct = E5Action(
+ self.vcsExportAct = EricAction(
self.tr('Export from repository'),
UI.PixmapCache.getIcon("vcsExport"),
self.tr('&Export from repository...'),
@@ -220,7 +220,7 @@
self.vcsExportAct.triggered.connect(self._vcsExport)
self.actions.append(self.vcsExportAct)
- self.vcsPropsAct = E5Action(
+ self.vcsPropsAct = EricAction(
self.tr('Command options'),
self.tr('Command &options...'), 0, 0, self,
'subversion_options')
@@ -233,7 +233,7 @@
self.vcsPropsAct.triggered.connect(self._vcsCommandOptions)
self.actions.append(self.vcsPropsAct)
- self.vcsRevertAct = E5Action(
+ self.vcsRevertAct = EricAction(
self.tr('Revert changes'),
UI.PixmapCache.getIcon("vcsRevert"),
self.tr('Re&vert changes'),
@@ -248,7 +248,7 @@
self.vcsRevertAct.triggered.connect(self._vcsRevert)
self.actions.append(self.vcsRevertAct)
- self.vcsMergeAct = E5Action(
+ self.vcsMergeAct = EricAction(
self.tr('Merge'),
UI.PixmapCache.getIcon("vcsMerge"),
self.tr('Mer&ge changes...'),
@@ -264,7 +264,7 @@
self.vcsMergeAct.triggered.connect(self._vcsMerge)
self.actions.append(self.vcsMergeAct)
- self.vcsSwitchAct = E5Action(
+ self.vcsSwitchAct = EricAction(
self.tr('Switch'),
UI.PixmapCache.getIcon("vcsSwitch"),
self.tr('S&witch...'),
@@ -279,7 +279,7 @@
self.vcsSwitchAct.triggered.connect(self._vcsSwitch)
self.actions.append(self.vcsSwitchAct)
- self.vcsResolveAct = E5Action(
+ self.vcsResolveAct = EricAction(
self.tr('Conflicts resolved'),
self.tr('Con&flicts resolved'),
0, 0, self, 'subversion_resolve')
@@ -294,7 +294,7 @@
self.vcsResolveAct.triggered.connect(self.__svnResolve)
self.actions.append(self.vcsResolveAct)
- self.vcsCleanupAct = E5Action(
+ self.vcsCleanupAct = EricAction(
self.tr('Cleanup'),
self.tr('Cleanu&p'),
0, 0, self, 'subversion_cleanup')
@@ -308,7 +308,7 @@
self.vcsCleanupAct.triggered.connect(self._vcsCleanup)
self.actions.append(self.vcsCleanupAct)
- self.vcsCommandAct = E5Action(
+ self.vcsCommandAct = EricAction(
self.tr('Execute command'),
self.tr('E&xecute command...'),
0, 0, self, 'subversion_command')
@@ -322,7 +322,7 @@
self.vcsCommandAct.triggered.connect(self._vcsCommand)
self.actions.append(self.vcsCommandAct)
- self.svnTagListAct = E5Action(
+ self.svnTagListAct = EricAction(
self.tr('List tags'),
self.tr('List tags...'),
0, 0, self, 'subversion_list_tags')
@@ -336,7 +336,7 @@
self.svnTagListAct.triggered.connect(self.__svnTagList)
self.actions.append(self.svnTagListAct)
- self.svnBranchListAct = E5Action(
+ self.svnBranchListAct = EricAction(
self.tr('List branches'),
self.tr('List branches...'),
0, 0, self, 'subversion_list_branches')
@@ -350,7 +350,7 @@
self.svnBranchListAct.triggered.connect(self.__svnBranchList)
self.actions.append(self.svnBranchListAct)
- self.svnListAct = E5Action(
+ self.svnListAct = EricAction(
self.tr('List repository contents'),
self.tr('List repository contents...'),
0, 0, self, 'subversion_contents')
@@ -364,7 +364,7 @@
self.svnListAct.triggered.connect(self.__svnTagList)
self.actions.append(self.svnListAct)
- self.svnPropSetAct = E5Action(
+ self.svnPropSetAct = EricAction(
self.tr('Set Property'),
self.tr('Set Property...'),
0, 0, self, 'subversion_property_set')
@@ -378,7 +378,7 @@
self.svnPropSetAct.triggered.connect(self.__svnPropSet)
self.actions.append(self.svnPropSetAct)
- self.svnPropListAct = E5Action(
+ self.svnPropListAct = EricAction(
self.tr('List Properties'),
self.tr('List Properties...'),
0, 0, self, 'subversion_property_list')
@@ -392,7 +392,7 @@
self.svnPropListAct.triggered.connect(self.__svnPropList)
self.actions.append(self.svnPropListAct)
- self.svnPropDelAct = E5Action(
+ self.svnPropDelAct = EricAction(
self.tr('Delete Property'),
self.tr('Delete Property...'),
0, 0, self, 'subversion_property_delete')
@@ -406,7 +406,7 @@
self.svnPropDelAct.triggered.connect(self.__svnPropDel)
self.actions.append(self.svnPropDelAct)
- self.svnRelocateAct = E5Action(
+ self.svnRelocateAct = EricAction(
self.tr('Relocate'),
UI.PixmapCache.getIcon("vcsSwitch"),
self.tr('Relocate...'),
@@ -422,7 +422,7 @@
self.svnRelocateAct.triggered.connect(self.__svnRelocate)
self.actions.append(self.svnRelocateAct)
- self.svnRepoBrowserAct = E5Action(
+ self.svnRepoBrowserAct = EricAction(
self.tr('Repository Browser'),
UI.PixmapCache.getIcon("vcsRepoBrowser"),
self.tr('Repository Browser...'),
@@ -437,7 +437,7 @@
self.svnRepoBrowserAct.triggered.connect(self.__svnRepoBrowser)
self.actions.append(self.svnRepoBrowserAct)
- self.svnConfigAct = E5Action(
+ self.svnConfigAct = EricAction(
self.tr('Configure'),
self.tr('Configure...'),
0, 0, self, 'subversion_configure')
@@ -452,7 +452,7 @@
self.svnConfigAct.triggered.connect(self.__svnConfigure)
self.actions.append(self.svnConfigAct)
- self.svnUpgradeAct = E5Action(
+ self.svnUpgradeAct = EricAction(
self.tr('Upgrade'),
self.tr('Upgrade...'),
0, 0, self, 'subversion_upgrade')
@@ -533,7 +533,7 @@
@param ui reference to the main window (UserInterface)
@param toolbarManager reference to a toolbar manager object
- (E5ToolBarManager)
+ (EricToolBarManager)
"""
self.__toolbar = QToolBar(self.tr("Subversion (svn)"), ui)
self.__toolbar.setIconSize(UI.Config.ToolBarIconSize)
@@ -576,7 +576,7 @@
@param ui reference to the main window (UserInterface)
@param toolbarManager reference to a toolbar manager object
- (E5ToolBarManager)
+ (EricToolBarManager)
"""
ui.removeToolBar(self.__toolbar)
ui.unregisterToolbar("subversion")
@@ -654,7 +654,7 @@
"""
Private slot to open the configuration dialog.
"""
- e5App().getObject("UserInterface").showPreferences(
+ ericApp().getObject("UserInterface").showPreferences(
"zzz_subversionPage")
def __svnChangeLists(self):
