Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py
src/eric7/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py
- branch
- eric7
- changeset 9221
- bf71ee032bb4
- parent 9209
- b99e7fd55fd3
- child 9413
- 80c06d472826
equal
deleted
inserted
replaced
| 9220:e9e7eca7efee | 9221:bf71ee032bb4 |
|---|---|
| 21 | 21 |
| 22 class SvnProjectHelper(VcsProjectHelper): | 22 class SvnProjectHelper(VcsProjectHelper): |
| 23 """ | 23 """ |
| 24 Class implementing the VCS project helper for Subversion. | 24 Class implementing the VCS project helper for Subversion. |
| 25 """ | 25 """ |
| 26 | |
| 26 def __init__(self, vcsObject, projectObject, parent=None, name=None): | 27 def __init__(self, vcsObject, projectObject, parent=None, name=None): |
| 27 """ | 28 """ |
| 28 Constructor | 29 Constructor |
| 29 | 30 |
| 30 @param vcsObject reference to the vcs object | 31 @param vcsObject reference to the vcs object |
| 31 @param projectObject reference to the project object | 32 @param projectObject reference to the project object |
| 32 @param parent parent widget (QWidget) | 33 @param parent parent widget (QWidget) |
| 33 @param name name of this object (string) | 34 @param name name of this object (string) |
| 34 """ | 35 """ |
| 35 VcsProjectHelper.__init__(self, vcsObject, projectObject, parent, name) | 36 VcsProjectHelper.__init__(self, vcsObject, projectObject, parent, name) |
| 36 | 37 |
| 37 def getActions(self): | 38 def getActions(self): |
| 38 """ | 39 """ |
| 39 Public method to get a list of all actions. | 40 Public method to get a list of all actions. |
| 40 | 41 |
| 41 @return list of all actions (list of EricAction) | 42 @return list of all actions (list of EricAction) |
| 42 """ | 43 """ |
| 43 return self.actions[:] | 44 return self.actions[:] |
| 44 | 45 |
| 45 def initActions(self): | 46 def initActions(self): |
| 46 """ | 47 """ |
| 47 Public method to generate the action objects. | 48 Public method to generate the action objects. |
| 48 """ | 49 """ |
| 49 self.vcsNewAct = EricAction( | 50 self.vcsNewAct = EricAction( |
| 50 self.tr('New from repository'), | 51 self.tr("New from repository"), |
| 51 UI.PixmapCache.getIcon("vcsCheckout"), | 52 UI.PixmapCache.getIcon("vcsCheckout"), |
| 52 self.tr('&New from repository...'), 0, 0, self, | 53 self.tr("&New from repository..."), |
| 53 'subversion_new') | 54 0, |
| 54 self.vcsNewAct.setStatusTip(self.tr( | 55 0, |
| 55 'Create a new project from the VCS repository' | 56 self, |
| 56 )) | 57 "subversion_new", |
| 57 self.vcsNewAct.setWhatsThis(self.tr( | 58 ) |
| 58 """<b>New from repository</b>""" | 59 self.vcsNewAct.setStatusTip( |
| 59 """<p>This creates a new local project from the VCS""" | 60 self.tr("Create a new project from the VCS repository") |
| 60 """ repository.</p>""" | 61 ) |
| 61 )) | 62 self.vcsNewAct.setWhatsThis( |
| 63 self.tr( | |
| 64 """<b>New from repository</b>""" | |
| 65 """<p>This creates a new local project from the VCS""" | |
| 66 """ repository.</p>""" | |
| 67 ) | |
| 68 ) | |
| 62 self.vcsNewAct.triggered.connect(self._vcsCheckout) | 69 self.vcsNewAct.triggered.connect(self._vcsCheckout) |
| 63 self.actions.append(self.vcsNewAct) | 70 self.actions.append(self.vcsNewAct) |
| 64 | 71 |
| 65 self.vcsUpdateAct = EricAction( | 72 self.vcsUpdateAct = EricAction( |
| 66 self.tr('Update from repository'), | 73 self.tr("Update from repository"), |
| 67 UI.PixmapCache.getIcon("vcsUpdate"), | 74 UI.PixmapCache.getIcon("vcsUpdate"), |
| 68 self.tr('&Update from repository'), 0, 0, self, | 75 self.tr("&Update from repository"), |
| 69 'subversion_update') | 76 0, |
| 70 self.vcsUpdateAct.setStatusTip(self.tr( | 77 0, |
| 71 'Update the local project from the VCS repository' | 78 self, |
| 72 )) | 79 "subversion_update", |
| 73 self.vcsUpdateAct.setWhatsThis(self.tr( | 80 ) |
| 74 """<b>Update from repository</b>""" | 81 self.vcsUpdateAct.setStatusTip( |
| 75 """<p>This updates the local project from the VCS""" | 82 self.tr("Update the local project from the VCS repository") |
| 76 """ repository.</p>""" | 83 ) |
| 77 )) | 84 self.vcsUpdateAct.setWhatsThis( |
| 85 self.tr( | |
| 86 """<b>Update from repository</b>""" | |
| 87 """<p>This updates the local project from the VCS""" | |
| 88 """ repository.</p>""" | |
| 89 ) | |
| 90 ) | |
| 78 self.vcsUpdateAct.triggered.connect(self._vcsUpdate) | 91 self.vcsUpdateAct.triggered.connect(self._vcsUpdate) |
| 79 self.actions.append(self.vcsUpdateAct) | 92 self.actions.append(self.vcsUpdateAct) |
| 80 | 93 |
| 81 self.vcsCommitAct = EricAction( | 94 self.vcsCommitAct = EricAction( |
| 82 self.tr('Commit changes to repository'), | 95 self.tr("Commit changes to repository"), |
| 83 UI.PixmapCache.getIcon("vcsCommit"), | 96 UI.PixmapCache.getIcon("vcsCommit"), |
| 84 self.tr('&Commit changes to repository...'), 0, 0, self, | 97 self.tr("&Commit changes to repository..."), |
| 85 'subversion_commit') | 98 0, |
| 86 self.vcsCommitAct.setStatusTip(self.tr( | 99 0, |
| 87 'Commit changes to the local project to the VCS repository' | 100 self, |
| 88 )) | 101 "subversion_commit", |
| 89 self.vcsCommitAct.setWhatsThis(self.tr( | 102 ) |
| 90 """<b>Commit changes to repository</b>""" | 103 self.vcsCommitAct.setStatusTip( |
| 91 """<p>This commits changes to the local project to the VCS""" | 104 self.tr("Commit changes to the local project to the VCS repository") |
| 92 """ repository.</p>""" | 105 ) |
| 93 )) | 106 self.vcsCommitAct.setWhatsThis( |
| 107 self.tr( | |
| 108 """<b>Commit changes to repository</b>""" | |
| 109 """<p>This commits changes to the local project to the VCS""" | |
| 110 """ repository.</p>""" | |
| 111 ) | |
| 112 ) | |
| 94 self.vcsCommitAct.triggered.connect(self._vcsCommit) | 113 self.vcsCommitAct.triggered.connect(self._vcsCommit) |
| 95 self.actions.append(self.vcsCommitAct) | 114 self.actions.append(self.vcsCommitAct) |
| 96 | 115 |
| 97 self.svnLogBrowserAct = EricAction( | 116 self.svnLogBrowserAct = EricAction( |
| 98 self.tr('Show log browser'), | 117 self.tr("Show log browser"), |
| 99 UI.PixmapCache.getIcon("vcsLog"), | 118 UI.PixmapCache.getIcon("vcsLog"), |
| 100 self.tr('Show log browser'), | 119 self.tr("Show log browser"), |
| 101 0, 0, self, 'subversion_log_browser') | 120 0, |
| 102 self.svnLogBrowserAct.setStatusTip(self.tr( | 121 0, |
| 103 'Show a dialog to browse the log of the local project' | 122 self, |
| 104 )) | 123 "subversion_log_browser", |
| 105 self.svnLogBrowserAct.setWhatsThis(self.tr( | 124 ) |
| 106 """<b>Show log browser</b>""" | 125 self.svnLogBrowserAct.setStatusTip( |
| 107 """<p>This shows a dialog to browse the log of the local""" | 126 self.tr("Show a dialog to browse the log of the local project") |
| 108 """ project. A limited number of entries is shown first. More""" | 127 ) |
| 109 """ can be retrieved later on.</p>""" | 128 self.svnLogBrowserAct.setWhatsThis( |
| 110 )) | 129 self.tr( |
| 130 """<b>Show log browser</b>""" | |
| 131 """<p>This shows a dialog to browse the log of the local""" | |
| 132 """ project. A limited number of entries is shown first. More""" | |
| 133 """ can be retrieved later on.</p>""" | |
| 134 ) | |
| 135 ) | |
| 111 self.svnLogBrowserAct.triggered.connect(self._vcsLogBrowser) | 136 self.svnLogBrowserAct.triggered.connect(self._vcsLogBrowser) |
| 112 self.actions.append(self.svnLogBrowserAct) | 137 self.actions.append(self.svnLogBrowserAct) |
| 113 | 138 |
| 114 self.vcsDiffAct = EricAction( | 139 self.vcsDiffAct = EricAction( |
| 115 self.tr('Show differences'), | 140 self.tr("Show differences"), |
| 116 UI.PixmapCache.getIcon("vcsDiff"), | 141 UI.PixmapCache.getIcon("vcsDiff"), |
| 117 self.tr('Show &difference'), | 142 self.tr("Show &difference"), |
| 118 0, 0, self, 'subversion_diff') | 143 0, |
| 119 self.vcsDiffAct.setStatusTip(self.tr( | 144 0, |
| 120 'Show the difference of the local project to the repository' | 145 self, |
| 121 )) | 146 "subversion_diff", |
| 122 self.vcsDiffAct.setWhatsThis(self.tr( | 147 ) |
| 123 """<b>Show differences</b>""" | 148 self.vcsDiffAct.setStatusTip( |
| 124 """<p>This shows differences of the local project to the""" | 149 self.tr("Show the difference of the local project to the repository") |
| 125 """ repository.</p>""" | 150 ) |
| 126 )) | 151 self.vcsDiffAct.setWhatsThis( |
| 152 self.tr( | |
| 153 """<b>Show differences</b>""" | |
| 154 """<p>This shows differences of the local project to the""" | |
| 155 """ repository.</p>""" | |
| 156 ) | |
| 157 ) | |
| 127 self.vcsDiffAct.triggered.connect(self._vcsDiff) | 158 self.vcsDiffAct.triggered.connect(self._vcsDiff) |
| 128 self.actions.append(self.vcsDiffAct) | 159 self.actions.append(self.vcsDiffAct) |
| 129 | 160 |
| 130 self.svnExtDiffAct = EricAction( | 161 self.svnExtDiffAct = EricAction( |
| 131 self.tr('Show differences (extended)'), | 162 self.tr("Show differences (extended)"), |
| 132 UI.PixmapCache.getIcon("vcsDiff"), | 163 UI.PixmapCache.getIcon("vcsDiff"), |
| 133 self.tr('Show differences (extended)'), | 164 self.tr("Show differences (extended)"), |
| 134 0, 0, self, 'subversion_extendeddiff') | 165 0, |
| 135 self.svnExtDiffAct.setStatusTip(self.tr( | 166 0, |
| 136 'Show the difference of revisions of the project to the repository' | 167 self, |
| 137 )) | 168 "subversion_extendeddiff", |
| 138 self.svnExtDiffAct.setWhatsThis(self.tr( | 169 ) |
| 139 """<b>Show differences (extended)</b>""" | 170 self.svnExtDiffAct.setStatusTip( |
| 140 """<p>This shows differences of selectable revisions of""" | 171 self.tr("Show the difference of revisions of the project to the repository") |
| 141 """ the project.</p>""" | 172 ) |
| 142 )) | 173 self.svnExtDiffAct.setWhatsThis( |
| 174 self.tr( | |
| 175 """<b>Show differences (extended)</b>""" | |
| 176 """<p>This shows differences of selectable revisions of""" | |
| 177 """ the project.</p>""" | |
| 178 ) | |
| 179 ) | |
| 143 self.svnExtDiffAct.triggered.connect(self.__svnExtendedDiff) | 180 self.svnExtDiffAct.triggered.connect(self.__svnExtendedDiff) |
| 144 self.actions.append(self.svnExtDiffAct) | 181 self.actions.append(self.svnExtDiffAct) |
| 145 | 182 |
| 146 self.svnUrlDiffAct = EricAction( | 183 self.svnUrlDiffAct = EricAction( |
| 147 self.tr('Show differences (URLs)'), | 184 self.tr("Show differences (URLs)"), |
| 148 UI.PixmapCache.getIcon("vcsDiff"), | 185 UI.PixmapCache.getIcon("vcsDiff"), |
| 149 self.tr('Show differences (URLs)'), | 186 self.tr("Show differences (URLs)"), |
| 150 0, 0, self, 'subversion_urldiff') | 187 0, |
| 151 self.svnUrlDiffAct.setStatusTip(self.tr( | 188 0, |
| 152 'Show the difference of the project between two repository URLs' | 189 self, |
| 153 )) | 190 "subversion_urldiff", |
| 154 self.svnUrlDiffAct.setWhatsThis(self.tr( | 191 ) |
| 155 """<b>Show differences (URLs)</b>""" | 192 self.svnUrlDiffAct.setStatusTip( |
| 156 """<p>This shows differences of the project between""" | 193 self.tr("Show the difference of the project between two repository URLs") |
| 157 """ two repository URLs.</p>""" | 194 ) |
| 158 )) | 195 self.svnUrlDiffAct.setWhatsThis( |
| 196 self.tr( | |
| 197 """<b>Show differences (URLs)</b>""" | |
| 198 """<p>This shows differences of the project between""" | |
| 199 """ two repository URLs.</p>""" | |
| 200 ) | |
| 201 ) | |
| 159 self.svnUrlDiffAct.triggered.connect(self.__svnUrlDiff) | 202 self.svnUrlDiffAct.triggered.connect(self.__svnUrlDiff) |
| 160 self.actions.append(self.svnUrlDiffAct) | 203 self.actions.append(self.svnUrlDiffAct) |
| 161 | 204 |
| 162 self.vcsStatusAct = EricAction( | 205 self.vcsStatusAct = EricAction( |
| 163 self.tr('Show status'), | 206 self.tr("Show status"), |
| 164 UI.PixmapCache.getIcon("vcsStatus"), | 207 UI.PixmapCache.getIcon("vcsStatus"), |
| 165 self.tr('Show &status'), | 208 self.tr("Show &status"), |
| 166 0, 0, self, 'subversion_status') | 209 0, |
| 167 self.vcsStatusAct.setStatusTip(self.tr( | 210 0, |
| 168 'Show the status of the local project' | 211 self, |
| 169 )) | 212 "subversion_status", |
| 170 self.vcsStatusAct.setWhatsThis(self.tr( | 213 ) |
| 171 """<b>Show status</b>""" | 214 self.vcsStatusAct.setStatusTip(self.tr("Show the status of the local project")) |
| 172 """<p>This shows the status of the local project.</p>""" | 215 self.vcsStatusAct.setWhatsThis( |
| 173 )) | 216 self.tr( |
| 217 """<b>Show status</b>""" | |
| 218 """<p>This shows the status of the local project.</p>""" | |
| 219 ) | |
| 220 ) | |
| 174 self.vcsStatusAct.triggered.connect(self._vcsStatus) | 221 self.vcsStatusAct.triggered.connect(self._vcsStatus) |
| 175 self.actions.append(self.vcsStatusAct) | 222 self.actions.append(self.vcsStatusAct) |
| 176 | 223 |
| 177 self.svnChangeListsAct = EricAction( | 224 self.svnChangeListsAct = EricAction( |
| 178 self.tr('Show change lists'), | 225 self.tr("Show change lists"), |
| 179 UI.PixmapCache.getIcon("vcsChangeLists"), | 226 UI.PixmapCache.getIcon("vcsChangeLists"), |
| 180 self.tr('Show change lists'), | 227 self.tr("Show change lists"), |
| 181 0, 0, self, 'subversion_changelists') | 228 0, |
| 182 self.svnChangeListsAct.setStatusTip(self.tr( | 229 0, |
| 183 'Show the change lists and associated files of the local project' | 230 self, |
| 184 )) | 231 "subversion_changelists", |
| 185 self.svnChangeListsAct.setWhatsThis(self.tr( | 232 ) |
| 186 """<b>Show change lists</b>""" | 233 self.svnChangeListsAct.setStatusTip( |
| 187 """<p>This shows the change lists and associated files of the""" | 234 self.tr("Show the change lists and associated files of the local project") |
| 188 """ local project.</p>""" | 235 ) |
| 189 )) | 236 self.svnChangeListsAct.setWhatsThis( |
| 237 self.tr( | |
| 238 """<b>Show change lists</b>""" | |
| 239 """<p>This shows the change lists and associated files of the""" | |
| 240 """ local project.</p>""" | |
| 241 ) | |
| 242 ) | |
| 190 self.svnChangeListsAct.triggered.connect(self.__svnChangeLists) | 243 self.svnChangeListsAct.triggered.connect(self.__svnChangeLists) |
| 191 self.actions.append(self.svnChangeListsAct) | 244 self.actions.append(self.svnChangeListsAct) |
| 192 | 245 |
| 193 self.vcsTagAct = EricAction( | 246 self.vcsTagAct = EricAction( |
| 194 self.tr('Tag in repository'), | 247 self.tr("Tag in repository"), |
| 195 UI.PixmapCache.getIcon("vcsTag"), | 248 UI.PixmapCache.getIcon("vcsTag"), |
| 196 self.tr('&Tag in repository...'), | 249 self.tr("&Tag in repository..."), |
| 197 0, 0, self, 'subversion_tag') | 250 0, |
| 198 self.vcsTagAct.setStatusTip(self.tr( | 251 0, |
| 199 'Tag the local project in the repository' | 252 self, |
| 200 )) | 253 "subversion_tag", |
| 201 self.vcsTagAct.setWhatsThis(self.tr( | 254 ) |
| 202 """<b>Tag in repository</b>""" | 255 self.vcsTagAct.setStatusTip(self.tr("Tag the local project in the repository")) |
| 203 """<p>This tags the local project in the repository.</p>""" | 256 self.vcsTagAct.setWhatsThis( |
| 204 )) | 257 self.tr( |
| 258 """<b>Tag in repository</b>""" | |
| 259 """<p>This tags the local project in the repository.</p>""" | |
| 260 ) | |
| 261 ) | |
| 205 self.vcsTagAct.triggered.connect(self._vcsTag) | 262 self.vcsTagAct.triggered.connect(self._vcsTag) |
| 206 self.actions.append(self.vcsTagAct) | 263 self.actions.append(self.vcsTagAct) |
| 207 | 264 |
| 208 self.vcsExportAct = EricAction( | 265 self.vcsExportAct = EricAction( |
| 209 self.tr('Export from repository'), | 266 self.tr("Export from repository"), |
| 210 UI.PixmapCache.getIcon("vcsExport"), | 267 UI.PixmapCache.getIcon("vcsExport"), |
| 211 self.tr('&Export from repository...'), | 268 self.tr("&Export from repository..."), |
| 212 0, 0, self, 'subversion_export') | 269 0, |
| 213 self.vcsExportAct.setStatusTip(self.tr( | 270 0, |
| 214 'Export a project from the repository' | 271 self, |
| 215 )) | 272 "subversion_export", |
| 216 self.vcsExportAct.setWhatsThis(self.tr( | 273 ) |
| 217 """<b>Export from repository</b>""" | 274 self.vcsExportAct.setStatusTip(self.tr("Export a project from the repository")) |
| 218 """<p>This exports a project from the repository.</p>""" | 275 self.vcsExportAct.setWhatsThis( |
| 219 )) | 276 self.tr( |
| 277 """<b>Export from repository</b>""" | |
| 278 """<p>This exports a project from the repository.</p>""" | |
| 279 ) | |
| 280 ) | |
| 220 self.vcsExportAct.triggered.connect(self._vcsExport) | 281 self.vcsExportAct.triggered.connect(self._vcsExport) |
| 221 self.actions.append(self.vcsExportAct) | 282 self.actions.append(self.vcsExportAct) |
| 222 | 283 |
| 223 self.vcsPropsAct = EricAction( | 284 self.vcsPropsAct = EricAction( |
| 224 self.tr('Command options'), | 285 self.tr("Command options"), |
| 225 self.tr('Command &options...'), 0, 0, self, | 286 self.tr("Command &options..."), |
| 226 'subversion_options') | 287 0, |
| 227 self.vcsPropsAct.setStatusTip(self.tr( | 288 0, |
| 228 'Show the VCS command options')) | 289 self, |
| 229 self.vcsPropsAct.setWhatsThis(self.tr( | 290 "subversion_options", |
| 230 """<b>Command options...</b>""" | 291 ) |
| 231 """<p>This shows a dialog to edit the VCS command options.</p>""" | 292 self.vcsPropsAct.setStatusTip(self.tr("Show the VCS command options")) |
| 232 )) | 293 self.vcsPropsAct.setWhatsThis( |
| 294 self.tr( | |
| 295 """<b>Command options...</b>""" | |
| 296 """<p>This shows a dialog to edit the VCS command options.</p>""" | |
| 297 ) | |
| 298 ) | |
| 233 self.vcsPropsAct.triggered.connect(self._vcsCommandOptions) | 299 self.vcsPropsAct.triggered.connect(self._vcsCommandOptions) |
| 234 self.actions.append(self.vcsPropsAct) | 300 self.actions.append(self.vcsPropsAct) |
| 235 | 301 |
| 236 self.vcsRevertAct = EricAction( | 302 self.vcsRevertAct = EricAction( |
| 237 self.tr('Revert changes'), | 303 self.tr("Revert changes"), |
| 238 UI.PixmapCache.getIcon("vcsRevert"), | 304 UI.PixmapCache.getIcon("vcsRevert"), |
| 239 self.tr('Re&vert changes'), | 305 self.tr("Re&vert changes"), |
| 240 0, 0, self, 'subversion_revert') | 306 0, |
| 241 self.vcsRevertAct.setStatusTip(self.tr( | 307 0, |
| 242 'Revert all changes made to the local project' | 308 self, |
| 243 )) | 309 "subversion_revert", |
| 244 self.vcsRevertAct.setWhatsThis(self.tr( | 310 ) |
| 245 """<b>Revert changes</b>""" | 311 self.vcsRevertAct.setStatusTip( |
| 246 """<p>This reverts all changes made to the local project.</p>""" | 312 self.tr("Revert all changes made to the local project") |
| 247 )) | 313 ) |
| 314 self.vcsRevertAct.setWhatsThis( | |
| 315 self.tr( | |
| 316 """<b>Revert changes</b>""" | |
| 317 """<p>This reverts all changes made to the local project.</p>""" | |
| 318 ) | |
| 319 ) | |
| 248 self.vcsRevertAct.triggered.connect(self._vcsRevert) | 320 self.vcsRevertAct.triggered.connect(self._vcsRevert) |
| 249 self.actions.append(self.vcsRevertAct) | 321 self.actions.append(self.vcsRevertAct) |
| 250 | 322 |
| 251 self.vcsMergeAct = EricAction( | 323 self.vcsMergeAct = EricAction( |
| 252 self.tr('Merge'), | 324 self.tr("Merge"), |
| 253 UI.PixmapCache.getIcon("vcsMerge"), | 325 UI.PixmapCache.getIcon("vcsMerge"), |
| 254 self.tr('Mer&ge changes...'), | 326 self.tr("Mer&ge changes..."), |
| 255 0, 0, self, 'subversion_merge') | 327 0, |
| 256 self.vcsMergeAct.setStatusTip(self.tr( | 328 0, |
| 257 'Merge changes of a tag/revision into the local project' | 329 self, |
| 258 )) | 330 "subversion_merge", |
| 259 self.vcsMergeAct.setWhatsThis(self.tr( | 331 ) |
| 260 """<b>Merge</b>""" | 332 self.vcsMergeAct.setStatusTip( |
| 261 """<p>This merges changes of a tag/revision into the local""" | 333 self.tr("Merge changes of a tag/revision into the local project") |
| 262 """ project.</p>""" | 334 ) |
| 263 )) | 335 self.vcsMergeAct.setWhatsThis( |
| 336 self.tr( | |
| 337 """<b>Merge</b>""" | |
| 338 """<p>This merges changes of a tag/revision into the local""" | |
| 339 """ project.</p>""" | |
| 340 ) | |
| 341 ) | |
| 264 self.vcsMergeAct.triggered.connect(self._vcsMerge) | 342 self.vcsMergeAct.triggered.connect(self._vcsMerge) |
| 265 self.actions.append(self.vcsMergeAct) | 343 self.actions.append(self.vcsMergeAct) |
| 266 | 344 |
| 267 self.vcsSwitchAct = EricAction( | 345 self.vcsSwitchAct = EricAction( |
| 268 self.tr('Switch'), | 346 self.tr("Switch"), |
| 269 UI.PixmapCache.getIcon("vcsSwitch"), | 347 UI.PixmapCache.getIcon("vcsSwitch"), |
| 270 self.tr('S&witch...'), | 348 self.tr("S&witch..."), |
| 271 0, 0, self, 'subversion_switch') | 349 0, |
| 272 self.vcsSwitchAct.setStatusTip(self.tr( | 350 0, |
| 273 'Switch the local copy to another tag/branch' | 351 self, |
| 274 )) | 352 "subversion_switch", |
| 275 self.vcsSwitchAct.setWhatsThis(self.tr( | 353 ) |
| 276 """<b>Switch</b>""" | 354 self.vcsSwitchAct.setStatusTip( |
| 277 """<p>This switches the local copy to another tag/branch.</p>""" | 355 self.tr("Switch the local copy to another tag/branch") |
| 278 )) | 356 ) |
| 357 self.vcsSwitchAct.setWhatsThis( | |
| 358 self.tr( | |
| 359 """<b>Switch</b>""" | |
| 360 """<p>This switches the local copy to another tag/branch.</p>""" | |
| 361 ) | |
| 362 ) | |
| 279 self.vcsSwitchAct.triggered.connect(self._vcsSwitch) | 363 self.vcsSwitchAct.triggered.connect(self._vcsSwitch) |
| 280 self.actions.append(self.vcsSwitchAct) | 364 self.actions.append(self.vcsSwitchAct) |
| 281 | 365 |
| 282 self.vcsResolveAct = EricAction( | 366 self.vcsResolveAct = EricAction( |
| 283 self.tr('Conflicts resolved'), | 367 self.tr("Conflicts resolved"), |
| 284 self.tr('Con&flicts resolved'), | 368 self.tr("Con&flicts resolved"), |
| 285 0, 0, self, 'subversion_resolve') | 369 0, |
| 286 self.vcsResolveAct.setStatusTip(self.tr( | 370 0, |
| 287 'Mark all conflicts of the local project as resolved' | 371 self, |
| 288 )) | 372 "subversion_resolve", |
| 289 self.vcsResolveAct.setWhatsThis(self.tr( | 373 ) |
| 290 """<b>Conflicts resolved</b>""" | 374 self.vcsResolveAct.setStatusTip( |
| 291 """<p>This marks all conflicts of the local project as""" | 375 self.tr("Mark all conflicts of the local project as resolved") |
| 292 """ resolved.</p>""" | 376 ) |
| 293 )) | 377 self.vcsResolveAct.setWhatsThis( |
| 378 self.tr( | |
| 379 """<b>Conflicts resolved</b>""" | |
| 380 """<p>This marks all conflicts of the local project as""" | |
| 381 """ resolved.</p>""" | |
| 382 ) | |
| 383 ) | |
| 294 self.vcsResolveAct.triggered.connect(self.__svnResolve) | 384 self.vcsResolveAct.triggered.connect(self.__svnResolve) |
| 295 self.actions.append(self.vcsResolveAct) | 385 self.actions.append(self.vcsResolveAct) |
| 296 | 386 |
| 297 self.vcsCleanupAct = EricAction( | 387 self.vcsCleanupAct = EricAction( |
| 298 self.tr('Cleanup'), | 388 self.tr("Cleanup"), self.tr("Cleanu&p"), 0, 0, self, "subversion_cleanup" |
| 299 self.tr('Cleanu&p'), | 389 ) |
| 300 0, 0, self, 'subversion_cleanup') | 390 self.vcsCleanupAct.setStatusTip(self.tr("Cleanup the local project")) |
| 301 self.vcsCleanupAct.setStatusTip(self.tr( | 391 self.vcsCleanupAct.setWhatsThis( |
| 302 'Cleanup the local project' | 392 self.tr( |
| 303 )) | 393 """<b>Cleanup</b>""" |
| 304 self.vcsCleanupAct.setWhatsThis(self.tr( | 394 """<p>This performs a cleanup of the local project.</p>""" |
| 305 """<b>Cleanup</b>""" | 395 ) |
| 306 """<p>This performs a cleanup of the local project.</p>""" | 396 ) |
| 307 )) | |
| 308 self.vcsCleanupAct.triggered.connect(self._vcsCleanup) | 397 self.vcsCleanupAct.triggered.connect(self._vcsCleanup) |
| 309 self.actions.append(self.vcsCleanupAct) | 398 self.actions.append(self.vcsCleanupAct) |
| 310 | 399 |
| 311 self.vcsCommandAct = EricAction( | 400 self.vcsCommandAct = EricAction( |
| 312 self.tr('Execute command'), | 401 self.tr("Execute command"), |
| 313 self.tr('E&xecute command...'), | 402 self.tr("E&xecute command..."), |
| 314 0, 0, self, 'subversion_command') | 403 0, |
| 315 self.vcsCommandAct.setStatusTip(self.tr( | 404 0, |
| 316 'Execute an arbitrary VCS command' | 405 self, |
| 317 )) | 406 "subversion_command", |
| 318 self.vcsCommandAct.setWhatsThis(self.tr( | 407 ) |
| 319 """<b>Execute command</b>""" | 408 self.vcsCommandAct.setStatusTip(self.tr("Execute an arbitrary VCS command")) |
| 320 """<p>This opens a dialog to enter an arbitrary VCS command.</p>""" | 409 self.vcsCommandAct.setWhatsThis( |
| 321 )) | 410 self.tr( |
| 411 """<b>Execute command</b>""" | |
| 412 """<p>This opens a dialog to enter an arbitrary VCS command.</p>""" | |
| 413 ) | |
| 414 ) | |
| 322 self.vcsCommandAct.triggered.connect(self._vcsCommand) | 415 self.vcsCommandAct.triggered.connect(self._vcsCommand) |
| 323 self.actions.append(self.vcsCommandAct) | 416 self.actions.append(self.vcsCommandAct) |
| 324 | 417 |
| 325 self.svnTagListAct = EricAction( | 418 self.svnTagListAct = EricAction( |
| 326 self.tr('List tags'), | 419 self.tr("List tags"), |
| 327 self.tr('List tags...'), | 420 self.tr("List tags..."), |
| 328 0, 0, self, 'subversion_list_tags') | 421 0, |
| 329 self.svnTagListAct.setStatusTip(self.tr( | 422 0, |
| 330 'List tags of the project' | 423 self, |
| 331 )) | 424 "subversion_list_tags", |
| 332 self.svnTagListAct.setWhatsThis(self.tr( | 425 ) |
| 333 """<b>List tags</b>""" | 426 self.svnTagListAct.setStatusTip(self.tr("List tags of the project")) |
| 334 """<p>This lists the tags of the project.</p>""" | 427 self.svnTagListAct.setWhatsThis( |
| 335 )) | 428 self.tr( |
| 429 """<b>List tags</b>""" """<p>This lists the tags of the project.</p>""" | |
| 430 ) | |
| 431 ) | |
| 336 self.svnTagListAct.triggered.connect(self.__svnTagList) | 432 self.svnTagListAct.triggered.connect(self.__svnTagList) |
| 337 self.actions.append(self.svnTagListAct) | 433 self.actions.append(self.svnTagListAct) |
| 338 | 434 |
| 339 self.svnBranchListAct = EricAction( | 435 self.svnBranchListAct = EricAction( |
| 340 self.tr('List branches'), | 436 self.tr("List branches"), |
| 341 self.tr('List branches...'), | 437 self.tr("List branches..."), |
| 342 0, 0, self, 'subversion_list_branches') | 438 0, |
| 343 self.svnBranchListAct.setStatusTip(self.tr( | 439 0, |
| 344 'List branches of the project' | 440 self, |
| 345 )) | 441 "subversion_list_branches", |
| 346 self.svnBranchListAct.setWhatsThis(self.tr( | 442 ) |
| 347 """<b>List branches</b>""" | 443 self.svnBranchListAct.setStatusTip(self.tr("List branches of the project")) |
| 348 """<p>This lists the branches of the project.</p>""" | 444 self.svnBranchListAct.setWhatsThis( |
| 349 )) | 445 self.tr( |
| 446 """<b>List branches</b>""" | |
| 447 """<p>This lists the branches of the project.</p>""" | |
| 448 ) | |
| 449 ) | |
| 350 self.svnBranchListAct.triggered.connect(self.__svnBranchList) | 450 self.svnBranchListAct.triggered.connect(self.__svnBranchList) |
| 351 self.actions.append(self.svnBranchListAct) | 451 self.actions.append(self.svnBranchListAct) |
| 352 | 452 |
| 353 self.svnListAct = EricAction( | 453 self.svnListAct = EricAction( |
| 354 self.tr('List repository contents'), | 454 self.tr("List repository contents"), |
| 355 self.tr('List repository contents...'), | 455 self.tr("List repository contents..."), |
| 356 0, 0, self, 'subversion_contents') | 456 0, |
| 357 self.svnListAct.setStatusTip(self.tr( | 457 0, |
| 358 'Lists the contents of the repository' | 458 self, |
| 359 )) | 459 "subversion_contents", |
| 360 self.svnListAct.setWhatsThis(self.tr( | 460 ) |
| 361 """<b>List repository contents</b>""" | 461 self.svnListAct.setStatusTip(self.tr("Lists the contents of the repository")) |
| 362 """<p>This lists the contents of the repository.</p>""" | 462 self.svnListAct.setWhatsThis( |
| 363 )) | 463 self.tr( |
| 464 """<b>List repository contents</b>""" | |
| 465 """<p>This lists the contents of the repository.</p>""" | |
| 466 ) | |
| 467 ) | |
| 364 self.svnListAct.triggered.connect(self.__svnTagList) | 468 self.svnListAct.triggered.connect(self.__svnTagList) |
| 365 self.actions.append(self.svnListAct) | 469 self.actions.append(self.svnListAct) |
| 366 | 470 |
| 367 self.svnPropSetAct = EricAction( | 471 self.svnPropSetAct = EricAction( |
| 368 self.tr('Set Property'), | 472 self.tr("Set Property"), |
| 369 self.tr('Set Property...'), | 473 self.tr("Set Property..."), |
| 370 0, 0, self, 'subversion_property_set') | 474 0, |
| 371 self.svnPropSetAct.setStatusTip(self.tr( | 475 0, |
| 372 'Set a property for the project files' | 476 self, |
| 373 )) | 477 "subversion_property_set", |
| 374 self.svnPropSetAct.setWhatsThis(self.tr( | 478 ) |
| 375 """<b>Set Property</b>""" | 479 self.svnPropSetAct.setStatusTip(self.tr("Set a property for the project files")) |
| 376 """<p>This sets a property for the project files.</p>""" | 480 self.svnPropSetAct.setWhatsThis( |
| 377 )) | 481 self.tr( |
| 482 """<b>Set Property</b>""" | |
| 483 """<p>This sets a property for the project files.</p>""" | |
| 484 ) | |
| 485 ) | |
| 378 self.svnPropSetAct.triggered.connect(self.__svnPropSet) | 486 self.svnPropSetAct.triggered.connect(self.__svnPropSet) |
| 379 self.actions.append(self.svnPropSetAct) | 487 self.actions.append(self.svnPropSetAct) |
| 380 | 488 |
| 381 self.svnPropListAct = EricAction( | 489 self.svnPropListAct = EricAction( |
| 382 self.tr('List Properties'), | 490 self.tr("List Properties"), |
| 383 self.tr('List Properties...'), | 491 self.tr("List Properties..."), |
| 384 0, 0, self, 'subversion_property_list') | 492 0, |
| 385 self.svnPropListAct.setStatusTip(self.tr( | 493 0, |
| 386 'List properties of the project files' | 494 self, |
| 387 )) | 495 "subversion_property_list", |
| 388 self.svnPropListAct.setWhatsThis(self.tr( | 496 ) |
| 389 """<b>List Properties</b>""" | 497 self.svnPropListAct.setStatusTip( |
| 390 """<p>This lists the properties of the project files.</p>""" | 498 self.tr("List properties of the project files") |
| 391 )) | 499 ) |
| 500 self.svnPropListAct.setWhatsThis( | |
| 501 self.tr( | |
| 502 """<b>List Properties</b>""" | |
| 503 """<p>This lists the properties of the project files.</p>""" | |
| 504 ) | |
| 505 ) | |
| 392 self.svnPropListAct.triggered.connect(self.__svnPropList) | 506 self.svnPropListAct.triggered.connect(self.__svnPropList) |
| 393 self.actions.append(self.svnPropListAct) | 507 self.actions.append(self.svnPropListAct) |
| 394 | 508 |
| 395 self.svnPropDelAct = EricAction( | 509 self.svnPropDelAct = EricAction( |
| 396 self.tr('Delete Property'), | 510 self.tr("Delete Property"), |
| 397 self.tr('Delete Property...'), | 511 self.tr("Delete Property..."), |
| 398 0, 0, self, 'subversion_property_delete') | 512 0, |
| 399 self.svnPropDelAct.setStatusTip(self.tr( | 513 0, |
| 400 'Delete a property for the project files' | 514 self, |
| 401 )) | 515 "subversion_property_delete", |
| 402 self.svnPropDelAct.setWhatsThis(self.tr( | 516 ) |
| 403 """<b>Delete Property</b>""" | 517 self.svnPropDelAct.setStatusTip( |
| 404 """<p>This deletes a property for the project files.</p>""" | 518 self.tr("Delete a property for the project files") |
| 405 )) | 519 ) |
| 520 self.svnPropDelAct.setWhatsThis( | |
| 521 self.tr( | |
| 522 """<b>Delete Property</b>""" | |
| 523 """<p>This deletes a property for the project files.</p>""" | |
| 524 ) | |
| 525 ) | |
| 406 self.svnPropDelAct.triggered.connect(self.__svnPropDel) | 526 self.svnPropDelAct.triggered.connect(self.__svnPropDel) |
| 407 self.actions.append(self.svnPropDelAct) | 527 self.actions.append(self.svnPropDelAct) |
| 408 | 528 |
| 409 self.svnRelocateAct = EricAction( | 529 self.svnRelocateAct = EricAction( |
| 410 self.tr('Relocate'), | 530 self.tr("Relocate"), |
| 411 UI.PixmapCache.getIcon("vcsSwitch"), | 531 UI.PixmapCache.getIcon("vcsSwitch"), |
| 412 self.tr('Relocate...'), | 532 self.tr("Relocate..."), |
| 413 0, 0, self, 'subversion_relocate') | 533 0, |
| 414 self.svnRelocateAct.setStatusTip(self.tr( | 534 0, |
| 415 'Relocate the working copy to a new repository URL' | 535 self, |
| 416 )) | 536 "subversion_relocate", |
| 417 self.svnRelocateAct.setWhatsThis(self.tr( | 537 ) |
| 418 """<b>Relocate</b>""" | 538 self.svnRelocateAct.setStatusTip( |
| 419 """<p>This relocates the working copy to a new repository""" | 539 self.tr("Relocate the working copy to a new repository URL") |
| 420 """ URL.</p>""" | 540 ) |
| 421 )) | 541 self.svnRelocateAct.setWhatsThis( |
| 542 self.tr( | |
| 543 """<b>Relocate</b>""" | |
| 544 """<p>This relocates the working copy to a new repository""" | |
| 545 """ URL.</p>""" | |
| 546 ) | |
| 547 ) | |
| 422 self.svnRelocateAct.triggered.connect(self.__svnRelocate) | 548 self.svnRelocateAct.triggered.connect(self.__svnRelocate) |
| 423 self.actions.append(self.svnRelocateAct) | 549 self.actions.append(self.svnRelocateAct) |
| 424 | 550 |
| 425 self.svnRepoBrowserAct = EricAction( | 551 self.svnRepoBrowserAct = EricAction( |
| 426 self.tr('Repository Browser'), | 552 self.tr("Repository Browser"), |
| 427 UI.PixmapCache.getIcon("vcsRepoBrowser"), | 553 UI.PixmapCache.getIcon("vcsRepoBrowser"), |
| 428 self.tr('Repository Browser...'), | 554 self.tr("Repository Browser..."), |
| 429 0, 0, self, 'subversion_repo_browser') | 555 0, |
| 430 self.svnRepoBrowserAct.setStatusTip(self.tr( | 556 0, |
| 431 'Show the Repository Browser dialog' | 557 self, |
| 432 )) | 558 "subversion_repo_browser", |
| 433 self.svnRepoBrowserAct.setWhatsThis(self.tr( | 559 ) |
| 434 """<b>Repository Browser</b>""" | 560 self.svnRepoBrowserAct.setStatusTip( |
| 435 """<p>This shows the Repository Browser dialog.</p>""" | 561 self.tr("Show the Repository Browser dialog") |
| 436 )) | 562 ) |
| 563 self.svnRepoBrowserAct.setWhatsThis( | |
| 564 self.tr( | |
| 565 """<b>Repository Browser</b>""" | |
| 566 """<p>This shows the Repository Browser dialog.</p>""" | |
| 567 ) | |
| 568 ) | |
| 437 self.svnRepoBrowserAct.triggered.connect(self.__svnRepoBrowser) | 569 self.svnRepoBrowserAct.triggered.connect(self.__svnRepoBrowser) |
| 438 self.actions.append(self.svnRepoBrowserAct) | 570 self.actions.append(self.svnRepoBrowserAct) |
| 439 | 571 |
| 440 self.svnConfigAct = EricAction( | 572 self.svnConfigAct = EricAction( |
| 441 self.tr('Configure'), | 573 self.tr("Configure"), |
| 442 self.tr('Configure...'), | 574 self.tr("Configure..."), |
| 443 0, 0, self, 'subversion_configure') | 575 0, |
| 444 self.svnConfigAct.setStatusTip(self.tr( | 576 0, |
| 445 'Show the configuration dialog with the Subversion page selected' | 577 self, |
| 446 )) | 578 "subversion_configure", |
| 447 self.svnConfigAct.setWhatsThis(self.tr( | 579 ) |
| 448 """<b>Configure</b>""" | 580 self.svnConfigAct.setStatusTip( |
| 449 """<p>Show the configuration dialog with the Subversion page""" | 581 self.tr("Show the configuration dialog with the Subversion page selected") |
| 450 """ selected.</p>""" | 582 ) |
| 451 )) | 583 self.svnConfigAct.setWhatsThis( |
| 584 self.tr( | |
| 585 """<b>Configure</b>""" | |
| 586 """<p>Show the configuration dialog with the Subversion page""" | |
| 587 """ selected.</p>""" | |
| 588 ) | |
| 589 ) | |
| 452 self.svnConfigAct.triggered.connect(self.__svnConfigure) | 590 self.svnConfigAct.triggered.connect(self.__svnConfigure) |
| 453 self.actions.append(self.svnConfigAct) | 591 self.actions.append(self.svnConfigAct) |
| 454 | 592 |
| 455 self.svnUpgradeAct = EricAction( | 593 self.svnUpgradeAct = EricAction( |
| 456 self.tr('Upgrade'), | 594 self.tr("Upgrade"), self.tr("Upgrade..."), 0, 0, self, "subversion_upgrade" |
| 457 self.tr('Upgrade...'), | 595 ) |
| 458 0, 0, self, 'subversion_upgrade') | 596 self.svnUpgradeAct.setStatusTip( |
| 459 self.svnUpgradeAct.setStatusTip(self.tr( | 597 self.tr("Upgrade the working copy to the current format") |
| 460 'Upgrade the working copy to the current format' | 598 ) |
| 461 )) | 599 self.svnUpgradeAct.setWhatsThis( |
| 462 self.svnUpgradeAct.setWhatsThis(self.tr( | 600 self.tr( |
| 463 """<b>Upgrade</b>""" | 601 """<b>Upgrade</b>""" |
| 464 """<p>Upgrades the working copy to the current format.</p>""" | 602 """<p>Upgrades the working copy to the current format.</p>""" |
| 465 )) | 603 ) |
| 604 ) | |
| 466 self.svnUpgradeAct.triggered.connect(self.__svnUpgrade) | 605 self.svnUpgradeAct.triggered.connect(self.__svnUpgrade) |
| 467 self.actions.append(self.svnUpgradeAct) | 606 self.actions.append(self.svnUpgradeAct) |
| 468 | 607 |
| 469 def initMenu(self, menu): | 608 def initMenu(self, menu): |
| 470 """ | 609 """ |
| 471 Public method to generate the VCS menu. | 610 Public method to generate the VCS menu. |
| 472 | 611 |
| 473 @param menu reference to the menu to be populated (QMenu) | 612 @param menu reference to the menu to be populated (QMenu) |
| 474 """ | 613 """ |
| 475 menu.clear() | 614 menu.clear() |
| 476 | 615 |
| 477 act = menu.addAction( | 616 act = menu.addAction( |
| 478 UI.PixmapCache.getIcon( | 617 UI.PixmapCache.getIcon( |
| 479 os.path.join("VcsPlugins", "vcsSubversion", "icons", | 618 os.path.join("VcsPlugins", "vcsSubversion", "icons", "subversion.svg") |
| 480 "subversion.svg")), | 619 ), |
| 481 self.vcs.vcsName(), self._vcsInfoDisplay) | 620 self.vcs.vcsName(), |
| 621 self._vcsInfoDisplay, | |
| 622 ) | |
| 482 font = act.font() | 623 font = act.font() |
| 483 font.setBold(True) | 624 font.setBold(True) |
| 484 act.setFont(font) | 625 act.setFont(font) |
| 485 menu.addSeparator() | 626 menu.addSeparator() |
| 486 | 627 |
| 487 menu.addAction(self.vcsUpdateAct) | 628 menu.addAction(self.vcsUpdateAct) |
| 488 menu.addAction(self.vcsCommitAct) | 629 menu.addAction(self.vcsCommitAct) |
| 489 menu.addSeparator() | 630 menu.addSeparator() |
| 490 menu.addAction(self.vcsTagAct) | 631 menu.addAction(self.vcsTagAct) |
| 491 if self.vcs.otherData["standardLayout"]: | 632 if self.vcs.otherData["standardLayout"]: |
| 524 menu.addSeparator() | 665 menu.addSeparator() |
| 525 menu.addAction(self.svnConfigAct) | 666 menu.addAction(self.svnConfigAct) |
| 526 menu.addSeparator() | 667 menu.addSeparator() |
| 527 menu.addAction(self.vcsNewAct) | 668 menu.addAction(self.vcsNewAct) |
| 528 menu.addAction(self.vcsExportAct) | 669 menu.addAction(self.vcsExportAct) |
| 529 | 670 |
| 530 def initToolbar(self, ui, toolbarManager): | 671 def initToolbar(self, ui, toolbarManager): |
| 531 """ | 672 """ |
| 532 Public slot to initialize the VCS toolbar. | 673 Public slot to initialize the VCS toolbar. |
| 533 | 674 |
| 534 @param ui reference to the main window (UserInterface) | 675 @param ui reference to the main window (UserInterface) |
| 535 @param toolbarManager reference to a toolbar manager object | 676 @param toolbarManager reference to a toolbar manager object |
| 536 (EricToolBarManager) | 677 (EricToolBarManager) |
| 537 """ | 678 """ |
| 538 self.__toolbar = QToolBar(self.tr("Subversion (svn)"), ui) | 679 self.__toolbar = QToolBar(self.tr("Subversion (svn)"), ui) |
| 539 self.__toolbar.setIconSize(UI.Config.ToolBarIconSize) | 680 self.__toolbar.setIconSize(UI.Config.ToolBarIconSize) |
| 540 self.__toolbar.setObjectName("SubversionToolbar") | 681 self.__toolbar.setObjectName("SubversionToolbar") |
| 541 self.__toolbar.setToolTip(self.tr('Subversion (svn)')) | 682 self.__toolbar.setToolTip(self.tr("Subversion (svn)")) |
| 542 | 683 |
| 543 self.__toolbar.addAction(self.svnLogBrowserAct) | 684 self.__toolbar.addAction(self.svnLogBrowserAct) |
| 544 self.__toolbar.addAction(self.vcsStatusAct) | 685 self.__toolbar.addAction(self.vcsStatusAct) |
| 545 self.__toolbar.addSeparator() | 686 self.__toolbar.addSeparator() |
| 546 self.__toolbar.addAction(self.vcsDiffAct) | 687 self.__toolbar.addAction(self.vcsDiffAct) |
| 547 self.__toolbar.addSeparator() | 688 self.__toolbar.addSeparator() |
| 548 self.__toolbar.addAction(self.svnRepoBrowserAct) | 689 self.__toolbar.addAction(self.svnRepoBrowserAct) |
| 549 self.__toolbar.addAction(self.vcsNewAct) | 690 self.__toolbar.addAction(self.vcsNewAct) |
| 550 self.__toolbar.addAction(self.vcsExportAct) | 691 self.__toolbar.addAction(self.vcsExportAct) |
| 551 self.__toolbar.addSeparator() | 692 self.__toolbar.addSeparator() |
| 552 | 693 |
| 553 title = self.__toolbar.windowTitle() | 694 title = self.__toolbar.windowTitle() |
| 554 toolbarManager.addToolBar(self.__toolbar, title) | 695 toolbarManager.addToolBar(self.__toolbar, title) |
| 555 toolbarManager.addAction(self.vcsUpdateAct, title) | 696 toolbarManager.addAction(self.vcsUpdateAct, title) |
| 556 toolbarManager.addAction(self.vcsCommitAct, title) | 697 toolbarManager.addAction(self.vcsCommitAct, title) |
| 557 toolbarManager.addAction(self.svnExtDiffAct, title) | 698 toolbarManager.addAction(self.svnExtDiffAct, title) |
| 560 toolbarManager.addAction(self.vcsTagAct, title) | 701 toolbarManager.addAction(self.vcsTagAct, title) |
| 561 toolbarManager.addAction(self.vcsRevertAct, title) | 702 toolbarManager.addAction(self.vcsRevertAct, title) |
| 562 toolbarManager.addAction(self.vcsMergeAct, title) | 703 toolbarManager.addAction(self.vcsMergeAct, title) |
| 563 toolbarManager.addAction(self.vcsSwitchAct, title) | 704 toolbarManager.addAction(self.vcsSwitchAct, title) |
| 564 toolbarManager.addAction(self.svnRelocateAct, title) | 705 toolbarManager.addAction(self.svnRelocateAct, title) |
| 565 | 706 |
| 566 self.__toolbar.setEnabled(False) | 707 self.__toolbar.setEnabled(False) |
| 567 self.__toolbar.setVisible(False) | 708 self.__toolbar.setVisible(False) |
| 568 | 709 |
| 569 ui.registerToolbar("subversion", self.__toolbar.windowTitle(), | 710 ui.registerToolbar( |
| 570 self.__toolbar, "vcs") | 711 "subversion", self.__toolbar.windowTitle(), self.__toolbar, "vcs" |
| 712 ) | |
| 571 ui.addToolBar(self.__toolbar) | 713 ui.addToolBar(self.__toolbar) |
| 572 | 714 |
| 573 def removeToolbar(self, ui, toolbarManager): | 715 def removeToolbar(self, ui, toolbarManager): |
| 574 """ | 716 """ |
| 575 Public method to remove a toolbar created by initToolbar(). | 717 Public method to remove a toolbar created by initToolbar(). |
| 576 | 718 |
| 577 @param ui reference to the main window (UserInterface) | 719 @param ui reference to the main window (UserInterface) |
| 578 @param toolbarManager reference to a toolbar manager object | 720 @param toolbarManager reference to a toolbar manager object |
| 579 (EricToolBarManager) | 721 (EricToolBarManager) |
| 580 """ | 722 """ |
| 581 ui.removeToolBar(self.__toolbar) | 723 ui.removeToolBar(self.__toolbar) |
| 582 ui.unregisterToolbar("subversion") | 724 ui.unregisterToolbar("subversion") |
| 583 | 725 |
| 584 title = self.__toolbar.windowTitle() | 726 title = self.__toolbar.windowTitle() |
| 585 toolbarManager.removeCategoryActions(title) | 727 toolbarManager.removeCategoryActions(title) |
| 586 toolbarManager.removeToolBar(self.__toolbar) | 728 toolbarManager.removeToolBar(self.__toolbar) |
| 587 | 729 |
| 588 self.__toolbar.deleteLater() | 730 self.__toolbar.deleteLater() |
| 589 self.__toolbar = None | 731 self.__toolbar = None |
| 590 | 732 |
| 591 def __svnResolve(self): | 733 def __svnResolve(self): |
| 592 """ | 734 """ |
| 593 Private slot used to resolve conflicts of the local project. | 735 Private slot used to resolve conflicts of the local project. |
| 594 """ | 736 """ |
| 595 self.vcs.vcsResolved(self.project.ppath) | 737 self.vcs.vcsResolved(self.project.ppath) |
| 596 | 738 |
| 597 def __svnPropList(self): | 739 def __svnPropList(self): |
| 598 """ | 740 """ |
| 599 Private slot used to list the properties of the project files. | 741 Private slot used to list the properties of the project files. |
| 600 """ | 742 """ |
| 601 self.vcs.svnListProps(self.project.ppath, True) | 743 self.vcs.svnListProps(self.project.ppath, True) |
| 602 | 744 |
| 603 def __svnPropSet(self): | 745 def __svnPropSet(self): |
| 604 """ | 746 """ |
| 605 Private slot used to set a property for the project files. | 747 Private slot used to set a property for the project files. |
| 606 """ | 748 """ |
| 607 self.vcs.svnSetProp(self.project.ppath, True) | 749 self.vcs.svnSetProp(self.project.ppath, True) |
| 608 | 750 |
| 609 def __svnPropDel(self): | 751 def __svnPropDel(self): |
| 610 """ | 752 """ |
| 611 Private slot used to delete a property for the project files. | 753 Private slot used to delete a property for the project files. |
| 612 """ | 754 """ |
| 613 self.vcs.svnDelProp(self.project.ppath, True) | 755 self.vcs.svnDelProp(self.project.ppath, True) |
| 614 | 756 |
| 615 def __svnTagList(self): | 757 def __svnTagList(self): |
| 616 """ | 758 """ |
| 617 Private slot used to list the tags of the project. | 759 Private slot used to list the tags of the project. |
| 618 """ | 760 """ |
| 619 self.vcs.svnListTagBranch(self.project.ppath, True) | 761 self.vcs.svnListTagBranch(self.project.ppath, True) |
| 620 | 762 |
| 621 def __svnBranchList(self): | 763 def __svnBranchList(self): |
| 622 """ | 764 """ |
| 623 Private slot used to list the branches of the project. | 765 Private slot used to list the branches of the project. |
| 624 """ | 766 """ |
| 625 self.vcs.svnListTagBranch(self.project.ppath, False) | 767 self.vcs.svnListTagBranch(self.project.ppath, False) |
| 626 | 768 |
| 627 def __svnExtendedDiff(self): | 769 def __svnExtendedDiff(self): |
| 628 """ | 770 """ |
| 629 Private slot used to perform a svn diff with the selection of | 771 Private slot used to perform a svn diff with the selection of |
| 630 revisions. | 772 revisions. |
| 631 """ | 773 """ |
| 632 self.vcs.svnExtendedDiff(self.project.ppath) | 774 self.vcs.svnExtendedDiff(self.project.ppath) |
| 633 | 775 |
| 634 def __svnUrlDiff(self): | 776 def __svnUrlDiff(self): |
| 635 """ | 777 """ |
| 636 Private slot used to perform a svn diff with the selection of | 778 Private slot used to perform a svn diff with the selection of |
| 637 repository URLs. | 779 repository URLs. |
| 638 """ | 780 """ |
| 639 self.vcs.svnUrlDiff(self.project.ppath) | 781 self.vcs.svnUrlDiff(self.project.ppath) |
| 640 | 782 |
| 641 def __svnRelocate(self): | 783 def __svnRelocate(self): |
| 642 """ | 784 """ |
| 643 Private slot used to relocate the working copy to a new repository URL. | 785 Private slot used to relocate the working copy to a new repository URL. |
| 644 """ | 786 """ |
| 645 self.vcs.svnRelocate(self.project.ppath) | 787 self.vcs.svnRelocate(self.project.ppath) |
| 646 | 788 |
| 647 def __svnRepoBrowser(self): | 789 def __svnRepoBrowser(self): |
| 648 """ | 790 """ |
| 649 Private slot to open the repository browser. | 791 Private slot to open the repository browser. |
| 650 """ | 792 """ |
| 651 self.vcs.svnRepoBrowser(projectPath=self.project.ppath) | 793 self.vcs.svnRepoBrowser(projectPath=self.project.ppath) |
| 652 | 794 |
| 653 def __svnConfigure(self): | 795 def __svnConfigure(self): |
| 654 """ | 796 """ |
| 655 Private slot to open the configuration dialog. | 797 Private slot to open the configuration dialog. |
| 656 """ | 798 """ |
| 657 ericApp().getObject("UserInterface").showPreferences( | 799 ericApp().getObject("UserInterface").showPreferences("zzz_subversionPage") |
| 658 "zzz_subversionPage") | 800 |
| 659 | |
| 660 def __svnChangeLists(self): | 801 def __svnChangeLists(self): |
| 661 """ | 802 """ |
| 662 Private slot used to show a list of change lists. | 803 Private slot used to show a list of change lists. |
| 663 """ | 804 """ |
| 664 self.vcs.svnShowChangelists(self.project.ppath) | 805 self.vcs.svnShowChangelists(self.project.ppath) |
| 665 | 806 |
| 666 def __svnUpgrade(self): | 807 def __svnUpgrade(self): |
| 667 """ | 808 """ |
| 668 Private slot used to upgrade the working copy format. | 809 Private slot used to upgrade the working copy format. |
| 669 """ | 810 """ |
| 670 self.vcs.svnUpgrade(self.project.ppath) | 811 self.vcs.svnUpgrade(self.project.ppath) |
