Mercurial Repositories > eric / file comparison
comparison: Plugins/PluginVcsSubversion.py
Plugins/PluginVcsSubversion.py
- changeset 3656
- 441956d8fce5
- parent 3523
- 8df1ab89e261
- child 3677
- a53cf139293f
equal
deleted
inserted
replaced
| 3654:ffeb85cdc72d | 3656:441956d8fce5 |
|---|---|
| 9 | 9 |
| 10 from __future__ import unicode_literals | 10 from __future__ import unicode_literals |
| 11 | 11 |
| 12 import os | 12 import os |
| 13 | 13 |
| 14 from PyQt4.QtCore import QObject | 14 from PyQt5.QtCore import QObject, QCoreApplication |
| 15 from PyQt4.QtGui import QApplication | |
| 16 | 15 |
| 17 from E5Gui.E5Application import e5App | 16 from E5Gui.E5Application import e5App |
| 18 | 17 |
| 19 import Preferences | 18 import Preferences |
| 20 from Preferences.Shortcuts import readShortcuts | 19 from Preferences.Shortcuts import readShortcuts |
| 54 if Utilities.isWindowsPlatform(): | 53 if Utilities.isWindowsPlatform(): |
| 55 exe += '.exe' | 54 exe += '.exe' |
| 56 | 55 |
| 57 data = { | 56 data = { |
| 58 "programEntry": True, | 57 "programEntry": True, |
| 59 "header": QApplication.translate( | 58 "header": QCoreApplication.translate( |
| 60 "VcsSubversionPlugin", "Version Control - Subversion (svn)"), | 59 "VcsSubversionPlugin", "Version Control - Subversion (svn)"), |
| 61 "exe": exe, | 60 "exe": exe, |
| 62 "versionCommand": '--version', | 61 "versionCommand": '--version', |
| 63 "versionStartsWith": 'svn', | 62 "versionStartsWith": 'svn', |
| 64 "versionPosition": 2, | 63 "versionPosition": 2, |
| 95 """ | 94 """ |
| 96 exe = 'svn' | 95 exe = 'svn' |
| 97 if Utilities.isWindowsPlatform(): | 96 if Utilities.isWindowsPlatform(): |
| 98 exe += '.exe' | 97 exe += '.exe' |
| 99 if Utilities.isinpath(exe): | 98 if Utilities.isinpath(exe): |
| 100 return QApplication.translate( | 99 return QCoreApplication.translate( |
| 101 'VcsSubversionPlugin', 'Subversion (svn)') | 100 'VcsSubversionPlugin', 'Subversion (svn)') |
| 102 else: | 101 else: |
| 103 return "" | 102 return "" |
| 104 | 103 |
| 105 subversionCfgPluginObject = None | 104 subversionCfgPluginObject = None |
| 128 @return dictionary with key "zzz_subversionPage" containing the relevant | 127 @return dictionary with key "zzz_subversionPage" containing the relevant |
| 129 data | 128 data |
| 130 """ | 129 """ |
| 131 return { | 130 return { |
| 132 "zzz_subversionPage": | 131 "zzz_subversionPage": |
| 133 [QApplication.translate("VcsSubversionPlugin", "Subversion"), | 132 [QCoreApplication.translate("VcsSubversionPlugin", "Subversion"), |
| 134 os.path.join("VcsPlugins", "vcsSubversion", "icons", | 133 os.path.join("VcsPlugins", "vcsSubversion", "icons", |
| 135 "preferences-subversion.png"), | 134 "preferences-subversion.png"), |
| 136 createConfigurationPage, "vcsPage", None], | 135 createConfigurationPage, "vcsPage", None], |
| 137 } | 136 } |
| 138 | 137 |
