Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py
src/eric7/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py
- branch
- eric7
- changeset 9413
- 80c06d472826
- parent 9221
- bf71ee032bb4
- child 9421
- 989ee2535d59
equal
deleted
inserted
replaced
| 9412:45e7bb09c120 | 9413:80c06d472826 |
|---|---|
| 9 | 9 |
| 10 import os | 10 import os |
| 11 | 11 |
| 12 from PyQt6.QtWidgets import QMenu, QDialog | 12 from PyQt6.QtWidgets import QMenu, QDialog |
| 13 | 13 |
| 14 from EricWidgets.EricApplication import ericApp | 14 from eric7.EricWidgets.EricApplication import ericApp |
| 15 | 15 |
| 16 from Project.ProjectBrowserModel import ProjectBrowserFileItem | 16 from eric7.Project.ProjectBrowserModel import ProjectBrowserFileItem |
| 17 | 17 |
| 18 from VCS.ProjectBrowserHelper import VcsProjectBrowserHelper | 18 from eric7.VCS.ProjectBrowserHelper import VcsProjectBrowserHelper |
| 19 | 19 |
| 20 import UI.PixmapCache | 20 from eric7.EricGui import EricPixmapCache |
| 21 | 21 |
| 22 | 22 |
| 23 class GitProjectBrowserHelper(VcsProjectBrowserHelper): | 23 class GitProjectBrowserHelper(VcsProjectBrowserHelper): |
| 24 """ | 24 """ |
| 25 Class implementing the VCS project browser helper for Git. | 25 Class implementing the VCS project browser helper for Git. |
| 182 self.vcsAddMenuActions = [] | 182 self.vcsAddMenuActions = [] |
| 183 | 183 |
| 184 menu = QMenu(self.tr("Version Control")) | 184 menu = QMenu(self.tr("Version Control")) |
| 185 | 185 |
| 186 act = menu.addAction( | 186 act = menu.addAction( |
| 187 UI.PixmapCache.getIcon( | 187 EricPixmapCache.getIcon( |
| 188 os.path.join("VcsPlugins", "vcsGit", "icons", "git.svg") | 188 os.path.join("VcsPlugins", "vcsGit", "icons", "git.svg") |
| 189 ), | 189 ), |
| 190 self.vcs.vcsName(), | 190 self.vcs.vcsName(), |
| 191 self._VCSInfoDisplay, | 191 self._VCSInfoDisplay, |
| 192 ) | 192 ) |
| 194 font.setBold(True) | 194 font.setBold(True) |
| 195 act.setFont(font) | 195 act.setFont(font) |
| 196 menu.addSeparator() | 196 menu.addSeparator() |
| 197 | 197 |
| 198 act = menu.addAction( | 198 act = menu.addAction( |
| 199 UI.PixmapCache.getIcon("vcsCommit"), | 199 EricPixmapCache.getIcon("vcsCommit"), |
| 200 self.tr("Commit changes to repository..."), | 200 self.tr("Commit changes to repository..."), |
| 201 self._VCSCommit, | 201 self._VCSCommit, |
| 202 ) | 202 ) |
| 203 self.vcsMenuActions.append(act) | 203 self.vcsMenuActions.append(act) |
| 204 menu.addSeparator() | 204 menu.addSeparator() |
| 205 act = menu.addAction( | 205 act = menu.addAction( |
| 206 UI.PixmapCache.getIcon("vcsAdd"), | 206 EricPixmapCache.getIcon("vcsAdd"), |
| 207 self.tr("Add/Stage to repository"), | 207 self.tr("Add/Stage to repository"), |
| 208 self._VCSAdd, | 208 self._VCSAdd, |
| 209 ) | 209 ) |
| 210 act = menu.addAction( | 210 act = menu.addAction( |
| 211 UI.PixmapCache.getIcon("vcsRevert"), | 211 EricPixmapCache.getIcon("vcsRevert"), |
| 212 self.tr("Unstage changes"), | 212 self.tr("Unstage changes"), |
| 213 self.__GitUnstage, | 213 self.__GitUnstage, |
| 214 ) | 214 ) |
| 215 self.vcsMenuActions.append(act) | 215 self.vcsMenuActions.append(act) |
| 216 menu.addSeparator() | 216 menu.addSeparator() |
| 217 act = menu.addAction( | 217 act = menu.addAction( |
| 218 UI.PixmapCache.getIcon("vcsRemove"), | 218 EricPixmapCache.getIcon("vcsRemove"), |
| 219 self.tr("Remove from repository (and disk)"), | 219 self.tr("Remove from repository (and disk)"), |
| 220 self._VCSRemove, | 220 self._VCSRemove, |
| 221 ) | 221 ) |
| 222 self.vcsMenuActions.append(act) | 222 self.vcsMenuActions.append(act) |
| 223 act = menu.addAction( | 223 act = menu.addAction( |
| 224 UI.PixmapCache.getIcon("vcsRemove"), | 224 EricPixmapCache.getIcon("vcsRemove"), |
| 225 self.tr("Remove from repository only"), | 225 self.tr("Remove from repository only"), |
| 226 self.__GitForget, | 226 self.__GitForget, |
| 227 ) | 227 ) |
| 228 self.vcsMenuActions.append(act) | 228 self.vcsMenuActions.append(act) |
| 229 menu.addSeparator() | 229 menu.addSeparator() |
| 231 self.vcsMenuActions.append(act) | 231 self.vcsMenuActions.append(act) |
| 232 act = menu.addAction(self.tr("Move"), self.__GitMove) | 232 act = menu.addAction(self.tr("Move"), self.__GitMove) |
| 233 self.vcsMenuActions.append(act) | 233 self.vcsMenuActions.append(act) |
| 234 menu.addSeparator() | 234 menu.addSeparator() |
| 235 act = menu.addAction( | 235 act = menu.addAction( |
| 236 UI.PixmapCache.getIcon("vcsLog"), | 236 EricPixmapCache.getIcon("vcsLog"), |
| 237 self.tr("Show log browser"), | 237 self.tr("Show log browser"), |
| 238 self._VCSLogBrowser, | 238 self._VCSLogBrowser, |
| 239 ) | 239 ) |
| 240 self.vcsMenuActions.append(act) | 240 self.vcsMenuActions.append(act) |
| 241 menu.addSeparator() | 241 menu.addSeparator() |
| 242 act = menu.addAction( | 242 act = menu.addAction( |
| 243 UI.PixmapCache.getIcon("vcsStatus"), self.tr("Show status"), self._VCSStatus | 243 EricPixmapCache.getIcon("vcsStatus"), |
| 244 ) | 244 self.tr("Show status"), |
| 245 self.vcsMenuActions.append(act) | 245 self._VCSStatus, |
| 246 menu.addSeparator() | 246 ) |
| 247 act = menu.addAction( | 247 self.vcsMenuActions.append(act) |
| 248 UI.PixmapCache.getIcon("vcsDiff"), | 248 menu.addSeparator() |
| 249 act = menu.addAction( | |
| 250 EricPixmapCache.getIcon("vcsDiff"), | |
| 249 self.tr("Show differences"), | 251 self.tr("Show differences"), |
| 250 self._VCSDiff, | 252 self._VCSDiff, |
| 251 ) | 253 ) |
| 252 self.vcsMenuActions.append(act) | 254 self.vcsMenuActions.append(act) |
| 253 act = menu.addAction( | 255 act = menu.addAction( |
| 254 UI.PixmapCache.getIcon("vcsSbsDiff"), | 256 EricPixmapCache.getIcon("vcsSbsDiff"), |
| 255 self.tr("Show differences side-by-side"), | 257 self.tr("Show differences side-by-side"), |
| 256 self.__GitSbsDiff, | 258 self.__GitSbsDiff, |
| 257 ) | 259 ) |
| 258 self.vcsMenuActions.append(act) | 260 self.vcsMenuActions.append(act) |
| 259 act = menu.addAction( | 261 act = menu.addAction( |
| 260 UI.PixmapCache.getIcon("vcsDiff"), | 262 EricPixmapCache.getIcon("vcsDiff"), |
| 261 self.tr("Show differences (extended)"), | 263 self.tr("Show differences (extended)"), |
| 262 self.__GitExtendedDiff, | 264 self.__GitExtendedDiff, |
| 263 ) | 265 ) |
| 264 self.vcsMenuActions.append(act) | 266 self.vcsMenuActions.append(act) |
| 265 act = menu.addAction( | 267 act = menu.addAction( |
| 266 UI.PixmapCache.getIcon("vcsSbsDiff"), | 268 EricPixmapCache.getIcon("vcsSbsDiff"), |
| 267 self.tr("Show differences side-by-side (extended)"), | 269 self.tr("Show differences side-by-side (extended)"), |
| 268 self.__GitSbsExtendedDiff, | 270 self.__GitSbsExtendedDiff, |
| 269 ) | 271 ) |
| 270 self.vcsMenuActions.append(act) | 272 self.vcsMenuActions.append(act) |
| 271 menu.addSeparator() | 273 menu.addSeparator() |
| 273 self.tr("Show annotated file"), self.__GitBlame | 275 self.tr("Show annotated file"), self.__GitBlame |
| 274 ) | 276 ) |
| 275 self.vcsMenuActions.append(self.annotateAct) | 277 self.vcsMenuActions.append(self.annotateAct) |
| 276 menu.addSeparator() | 278 menu.addSeparator() |
| 277 act = menu.addAction( | 279 act = menu.addAction( |
| 278 UI.PixmapCache.getIcon("vcsRevert"), | 280 EricPixmapCache.getIcon("vcsRevert"), |
| 279 self.tr("Revert changes"), | 281 self.tr("Revert changes"), |
| 280 self.__GitRevert, | 282 self.__GitRevert, |
| 281 ) | 283 ) |
| 282 self.vcsMenuActions.append(act) | 284 self.vcsMenuActions.append(act) |
| 283 menu.addSeparator() | 285 menu.addSeparator() |
| 312 self.vcsMultiMenuActions = [] | 314 self.vcsMultiMenuActions = [] |
| 313 | 315 |
| 314 menu = QMenu(self.tr("Version Control")) | 316 menu = QMenu(self.tr("Version Control")) |
| 315 | 317 |
| 316 act = menu.addAction( | 318 act = menu.addAction( |
| 317 UI.PixmapCache.getIcon( | 319 EricPixmapCache.getIcon( |
| 318 os.path.join("VcsPlugins", "vcsGit", "icons", "git.svg") | 320 os.path.join("VcsPlugins", "vcsGit", "icons", "git.svg") |
| 319 ), | 321 ), |
| 320 self.vcs.vcsName(), | 322 self.vcs.vcsName(), |
| 321 self._VCSInfoDisplay, | 323 self._VCSInfoDisplay, |
| 322 ) | 324 ) |
| 324 font.setBold(True) | 326 font.setBold(True) |
| 325 act.setFont(font) | 327 act.setFont(font) |
| 326 menu.addSeparator() | 328 menu.addSeparator() |
| 327 | 329 |
| 328 act = menu.addAction( | 330 act = menu.addAction( |
| 329 UI.PixmapCache.getIcon("vcsCommit"), | 331 EricPixmapCache.getIcon("vcsCommit"), |
| 330 self.tr("Commit changes to repository..."), | 332 self.tr("Commit changes to repository..."), |
| 331 self._VCSCommit, | 333 self._VCSCommit, |
| 332 ) | 334 ) |
| 333 self.vcsMultiMenuActions.append(act) | 335 self.vcsMultiMenuActions.append(act) |
| 334 menu.addSeparator() | 336 menu.addSeparator() |
| 335 act = menu.addAction( | 337 act = menu.addAction( |
| 336 UI.PixmapCache.getIcon("vcsAdd"), | 338 EricPixmapCache.getIcon("vcsAdd"), |
| 337 self.tr("Add/Stage to repository"), | 339 self.tr("Add/Stage to repository"), |
| 338 self._VCSAdd, | 340 self._VCSAdd, |
| 339 ) | 341 ) |
| 340 act = menu.addAction( | 342 act = menu.addAction( |
| 341 UI.PixmapCache.getIcon("vcsRevert"), | 343 EricPixmapCache.getIcon("vcsRevert"), |
| 342 self.tr("Unstage changes"), | 344 self.tr("Unstage changes"), |
| 343 self.__GitUnstage, | 345 self.__GitUnstage, |
| 344 ) | 346 ) |
| 345 self.vcsMultiMenuActions.append(act) | 347 self.vcsMultiMenuActions.append(act) |
| 346 menu.addSeparator() | 348 menu.addSeparator() |
| 347 act = menu.addAction( | 349 act = menu.addAction( |
| 348 UI.PixmapCache.getIcon("vcsRemove"), | 350 EricPixmapCache.getIcon("vcsRemove"), |
| 349 self.tr("Remove from repository (and disk)"), | 351 self.tr("Remove from repository (and disk)"), |
| 350 self._VCSRemove, | 352 self._VCSRemove, |
| 351 ) | 353 ) |
| 352 self.vcsMultiMenuActions.append(act) | 354 self.vcsMultiMenuActions.append(act) |
| 353 act = menu.addAction( | 355 act = menu.addAction( |
| 354 UI.PixmapCache.getIcon("vcsRemove"), | 356 EricPixmapCache.getIcon("vcsRemove"), |
| 355 self.tr("Remove from repository only"), | 357 self.tr("Remove from repository only"), |
| 356 self.__GitForget, | 358 self.__GitForget, |
| 357 ) | 359 ) |
| 358 self.vcsMultiMenuActions.append(act) | 360 self.vcsMultiMenuActions.append(act) |
| 359 menu.addSeparator() | 361 menu.addSeparator() |
| 360 act = menu.addAction( | 362 act = menu.addAction( |
| 361 UI.PixmapCache.getIcon("vcsStatus"), self.tr("Show status"), self._VCSStatus | 363 EricPixmapCache.getIcon("vcsStatus"), |
| 364 self.tr("Show status"), | |
| 365 self._VCSStatus, | |
| 362 ) | 366 ) |
| 363 self.vcsMultiMenuActions.append(act) | 367 self.vcsMultiMenuActions.append(act) |
| 364 menu.addSeparator() | 368 menu.addSeparator() |
| 365 act = menu.addAction( | 369 act = menu.addAction( |
| 366 UI.PixmapCache.getIcon("vcsDiff"), | 370 EricPixmapCache.getIcon("vcsDiff"), |
| 367 self.tr("Show differences"), | 371 self.tr("Show differences"), |
| 368 self._VCSDiff, | 372 self._VCSDiff, |
| 369 ) | 373 ) |
| 370 self.vcsMultiMenuActions.append(act) | 374 self.vcsMultiMenuActions.append(act) |
| 371 act = menu.addAction( | 375 act = menu.addAction( |
| 372 UI.PixmapCache.getIcon("vcsDiff"), | 376 EricPixmapCache.getIcon("vcsDiff"), |
| 373 self.tr("Show differences (extended)"), | 377 self.tr("Show differences (extended)"), |
| 374 self.__GitExtendedDiff, | 378 self.__GitExtendedDiff, |
| 375 ) | 379 ) |
| 376 self.vcsMultiMenuActions.append(act) | 380 self.vcsMultiMenuActions.append(act) |
| 377 menu.addSeparator() | 381 menu.addSeparator() |
| 378 act = menu.addAction( | 382 act = menu.addAction( |
| 379 UI.PixmapCache.getIcon("vcsRevert"), | 383 EricPixmapCache.getIcon("vcsRevert"), |
| 380 self.tr("Revert changes"), | 384 self.tr("Revert changes"), |
| 381 self.__GitRevert, | 385 self.__GitRevert, |
| 382 ) | 386 ) |
| 383 self.vcsMultiMenuActions.append(act) | 387 self.vcsMultiMenuActions.append(act) |
| 384 menu.addSeparator() | 388 menu.addSeparator() |
| 412 @param mainMenu reference to the menu to be amended | 416 @param mainMenu reference to the menu to be amended |
| 413 """ | 417 """ |
| 414 menu = QMenu(self.tr("Version Control")) | 418 menu = QMenu(self.tr("Version Control")) |
| 415 | 419 |
| 416 act = menu.addAction( | 420 act = menu.addAction( |
| 417 UI.PixmapCache.getIcon( | 421 EricPixmapCache.getIcon( |
| 418 os.path.join("VcsPlugins", "vcsGit", "icons", "git.svg") | 422 os.path.join("VcsPlugins", "vcsGit", "icons", "git.svg") |
| 419 ), | 423 ), |
| 420 self.vcs.vcsName(), | 424 self.vcs.vcsName(), |
| 421 self._VCSInfoDisplay, | 425 self._VCSInfoDisplay, |
| 422 ) | 426 ) |
| 459 self.vcsAddDirMenuActions = [] | 463 self.vcsAddDirMenuActions = [] |
| 460 | 464 |
| 461 menu = QMenu(self.tr("Version Control")) | 465 menu = QMenu(self.tr("Version Control")) |
| 462 | 466 |
| 463 act = menu.addAction( | 467 act = menu.addAction( |
| 464 UI.PixmapCache.getIcon( | 468 EricPixmapCache.getIcon( |
| 465 os.path.join("VcsPlugins", "vcsGit", "icons", "git.svg") | 469 os.path.join("VcsPlugins", "vcsGit", "icons", "git.svg") |
| 466 ), | 470 ), |
| 467 self.vcs.vcsName(), | 471 self.vcs.vcsName(), |
| 468 self._VCSInfoDisplay, | 472 self._VCSInfoDisplay, |
| 469 ) | 473 ) |
| 471 font.setBold(True) | 475 font.setBold(True) |
| 472 act.setFont(font) | 476 act.setFont(font) |
| 473 menu.addSeparator() | 477 menu.addSeparator() |
| 474 | 478 |
| 475 act = menu.addAction( | 479 act = menu.addAction( |
| 476 UI.PixmapCache.getIcon("vcsCommit"), | 480 EricPixmapCache.getIcon("vcsCommit"), |
| 477 self.tr("Commit changes to repository..."), | 481 self.tr("Commit changes to repository..."), |
| 478 self._VCSCommit, | 482 self._VCSCommit, |
| 479 ) | 483 ) |
| 480 self.vcsDirMenuActions.append(act) | 484 self.vcsDirMenuActions.append(act) |
| 481 menu.addSeparator() | 485 menu.addSeparator() |
| 482 act = menu.addAction( | 486 act = menu.addAction( |
| 483 UI.PixmapCache.getIcon("vcsAdd"), | 487 EricPixmapCache.getIcon("vcsAdd"), |
| 484 self.tr("Add/Stage to repository"), | 488 self.tr("Add/Stage to repository"), |
| 485 self._VCSAdd, | 489 self._VCSAdd, |
| 486 ) | 490 ) |
| 487 act = menu.addAction( | 491 act = menu.addAction( |
| 488 UI.PixmapCache.getIcon("vcsRevert"), | 492 EricPixmapCache.getIcon("vcsRevert"), |
| 489 self.tr("Unstage changes"), | 493 self.tr("Unstage changes"), |
| 490 self.__GitUnstage, | 494 self.__GitUnstage, |
| 491 ) | 495 ) |
| 492 self.vcsDirMenuActions.append(act) | 496 self.vcsDirMenuActions.append(act) |
| 493 menu.addSeparator() | 497 menu.addSeparator() |
| 494 act = menu.addAction( | 498 act = menu.addAction( |
| 495 UI.PixmapCache.getIcon("vcsRemove"), | 499 EricPixmapCache.getIcon("vcsRemove"), |
| 496 self.tr("Remove from repository (and disk)"), | 500 self.tr("Remove from repository (and disk)"), |
| 497 self._VCSRemove, | 501 self._VCSRemove, |
| 498 ) | 502 ) |
| 499 self.vcsDirMenuActions.append(act) | 503 self.vcsDirMenuActions.append(act) |
| 500 menu.addSeparator() | 504 menu.addSeparator() |
| 502 self.vcsDirMenuActions.append(act) | 506 self.vcsDirMenuActions.append(act) |
| 503 act = menu.addAction(self.tr("Move"), self.__GitMove) | 507 act = menu.addAction(self.tr("Move"), self.__GitMove) |
| 504 self.vcsDirMenuActions.append(act) | 508 self.vcsDirMenuActions.append(act) |
| 505 menu.addSeparator() | 509 menu.addSeparator() |
| 506 act = menu.addAction( | 510 act = menu.addAction( |
| 507 UI.PixmapCache.getIcon("vcsLog"), | 511 EricPixmapCache.getIcon("vcsLog"), |
| 508 self.tr("Show log browser"), | 512 self.tr("Show log browser"), |
| 509 self._VCSLogBrowser, | 513 self._VCSLogBrowser, |
| 510 ) | 514 ) |
| 511 self.vcsDirMenuActions.append(act) | 515 self.vcsDirMenuActions.append(act) |
| 512 menu.addSeparator() | 516 menu.addSeparator() |
| 513 act = menu.addAction( | 517 act = menu.addAction( |
| 514 UI.PixmapCache.getIcon("vcsStatus"), self.tr("Show status"), self._VCSStatus | 518 EricPixmapCache.getIcon("vcsStatus"), |
| 515 ) | 519 self.tr("Show status"), |
| 516 self.vcsDirMenuActions.append(act) | 520 self._VCSStatus, |
| 517 menu.addSeparator() | 521 ) |
| 518 act = menu.addAction( | 522 self.vcsDirMenuActions.append(act) |
| 519 UI.PixmapCache.getIcon("vcsDiff"), | 523 menu.addSeparator() |
| 524 act = menu.addAction( | |
| 525 EricPixmapCache.getIcon("vcsDiff"), | |
| 520 self.tr("Show differences"), | 526 self.tr("Show differences"), |
| 521 self._VCSDiff, | 527 self._VCSDiff, |
| 522 ) | 528 ) |
| 523 self.vcsDirMenuActions.append(act) | 529 self.vcsDirMenuActions.append(act) |
| 524 act = menu.addAction( | 530 act = menu.addAction( |
| 525 UI.PixmapCache.getIcon("vcsDiff"), | 531 EricPixmapCache.getIcon("vcsDiff"), |
| 526 self.tr("Show differences (extended)"), | 532 self.tr("Show differences (extended)"), |
| 527 self.__GitExtendedDiff, | 533 self.__GitExtendedDiff, |
| 528 ) | 534 ) |
| 529 self.vcsDirMenuActions.append(act) | 535 self.vcsDirMenuActions.append(act) |
| 530 menu.addSeparator() | 536 menu.addSeparator() |
| 531 act = menu.addAction( | 537 act = menu.addAction( |
| 532 UI.PixmapCache.getIcon("vcsRevert"), | 538 EricPixmapCache.getIcon("vcsRevert"), |
| 533 self.tr("Revert changes"), | 539 self.tr("Revert changes"), |
| 534 self.__GitRevert, | 540 self.__GitRevert, |
| 535 ) | 541 ) |
| 536 self.vcsDirMenuActions.append(act) | 542 self.vcsDirMenuActions.append(act) |
| 537 menu.addSeparator() | 543 menu.addSeparator() |
| 570 self.vcsDirMultiMenuActions = [] | 576 self.vcsDirMultiMenuActions = [] |
| 571 | 577 |
| 572 menu = QMenu(self.tr("Version Control")) | 578 menu = QMenu(self.tr("Version Control")) |
| 573 | 579 |
| 574 act = menu.addAction( | 580 act = menu.addAction( |
| 575 UI.PixmapCache.getIcon( | 581 EricPixmapCache.getIcon( |
| 576 os.path.join("VcsPlugins", "vcsGit", "icons", "git.svg") | 582 os.path.join("VcsPlugins", "vcsGit", "icons", "git.svg") |
| 577 ), | 583 ), |
| 578 self.vcs.vcsName(), | 584 self.vcs.vcsName(), |
| 579 self._VCSInfoDisplay, | 585 self._VCSInfoDisplay, |
| 580 ) | 586 ) |
| 582 font.setBold(True) | 588 font.setBold(True) |
| 583 act.setFont(font) | 589 act.setFont(font) |
| 584 menu.addSeparator() | 590 menu.addSeparator() |
| 585 | 591 |
| 586 act = menu.addAction( | 592 act = menu.addAction( |
| 587 UI.PixmapCache.getIcon("vcsCommit"), | 593 EricPixmapCache.getIcon("vcsCommit"), |
| 588 self.tr("Commit changes to repository..."), | 594 self.tr("Commit changes to repository..."), |
| 589 self._VCSCommit, | 595 self._VCSCommit, |
| 590 ) | 596 ) |
| 591 self.vcsDirMultiMenuActions.append(act) | 597 self.vcsDirMultiMenuActions.append(act) |
| 592 menu.addSeparator() | 598 menu.addSeparator() |
| 593 act = menu.addAction( | 599 act = menu.addAction( |
| 594 UI.PixmapCache.getIcon("vcsAdd"), | 600 EricPixmapCache.getIcon("vcsAdd"), |
| 595 self.tr("Add/Stage to repository"), | 601 self.tr("Add/Stage to repository"), |
| 596 self._VCSAdd, | 602 self._VCSAdd, |
| 597 ) | 603 ) |
| 598 act = menu.addAction( | 604 act = menu.addAction( |
| 599 UI.PixmapCache.getIcon("vcsRevert"), | 605 EricPixmapCache.getIcon("vcsRevert"), |
| 600 self.tr("Unstage changes"), | 606 self.tr("Unstage changes"), |
| 601 self.__GitUnstage, | 607 self.__GitUnstage, |
| 602 ) | 608 ) |
| 603 self.vcsDirMultiMenuActions.append(act) | 609 self.vcsDirMultiMenuActions.append(act) |
| 604 menu.addSeparator() | 610 menu.addSeparator() |
| 605 act = menu.addAction( | 611 act = menu.addAction( |
| 606 UI.PixmapCache.getIcon("vcsRemove"), | 612 EricPixmapCache.getIcon("vcsRemove"), |
| 607 self.tr("Remove from repository (and disk)"), | 613 self.tr("Remove from repository (and disk)"), |
| 608 self._VCSRemove, | 614 self._VCSRemove, |
| 609 ) | 615 ) |
| 610 self.vcsDirMultiMenuActions.append(act) | 616 self.vcsDirMultiMenuActions.append(act) |
| 611 menu.addSeparator() | 617 menu.addSeparator() |
| 612 act = menu.addAction( | 618 act = menu.addAction( |
| 613 UI.PixmapCache.getIcon("vcsStatus"), self.tr("Show status"), self._VCSStatus | 619 EricPixmapCache.getIcon("vcsStatus"), |
| 620 self.tr("Show status"), | |
| 621 self._VCSStatus, | |
| 614 ) | 622 ) |
| 615 self.vcsDirMultiMenuActions.append(act) | 623 self.vcsDirMultiMenuActions.append(act) |
| 616 menu.addSeparator() | 624 menu.addSeparator() |
| 617 act = menu.addAction( | 625 act = menu.addAction( |
| 618 UI.PixmapCache.getIcon("vcsDiff"), | 626 EricPixmapCache.getIcon("vcsDiff"), |
| 619 self.tr("Show differences"), | 627 self.tr("Show differences"), |
| 620 self._VCSDiff, | 628 self._VCSDiff, |
| 621 ) | 629 ) |
| 622 self.vcsDirMultiMenuActions.append(act) | 630 self.vcsDirMultiMenuActions.append(act) |
| 623 act = menu.addAction( | 631 act = menu.addAction( |
| 624 UI.PixmapCache.getIcon("vcsDiff"), | 632 EricPixmapCache.getIcon("vcsDiff"), |
| 625 self.tr("Show differences (extended)"), | 633 self.tr("Show differences (extended)"), |
| 626 self.__GitExtendedDiff, | 634 self.__GitExtendedDiff, |
| 627 ) | 635 ) |
| 628 self.vcsDirMultiMenuActions.append(act) | 636 self.vcsDirMultiMenuActions.append(act) |
| 629 menu.addSeparator() | 637 menu.addSeparator() |
| 630 act = menu.addAction( | 638 act = menu.addAction( |
| 631 UI.PixmapCache.getIcon("vcsRevert"), | 639 EricPixmapCache.getIcon("vcsRevert"), |
| 632 self.tr("Revert changes"), | 640 self.tr("Revert changes"), |
| 633 self.__GitRevert, | 641 self.__GitRevert, |
| 634 ) | 642 ) |
| 635 self.vcsDirMultiMenuActions.append(act) | 643 self.vcsDirMultiMenuActions.append(act) |
| 636 menu.addSeparator() | 644 menu.addSeparator() |
| 666 def __GitForget(self): | 674 def __GitForget(self): |
| 667 """ | 675 """ |
| 668 Private slot called by the context menu to remove the selected file | 676 Private slot called by the context menu to remove the selected file |
| 669 from the Git repository leaving a copy in the project directory. | 677 from the Git repository leaving a copy in the project directory. |
| 670 """ | 678 """ |
| 671 from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog | 679 from eric7.UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog |
| 672 | 680 |
| 673 if self.isTranslationsBrowser: | 681 if self.isTranslationsBrowser: |
| 674 items = self.browser.getSelectedItems([ProjectBrowserFileItem]) | 682 items = self.browser.getSelectedItems([ProjectBrowserFileItem]) |
| 675 names = [itm.fileName() for itm in items] | 683 names = [itm.fileName() for itm in items] |
| 676 | 684 |
