Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py
eric6/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py
- changeset 7533
- 88261c96484b
- parent 7492
- 39e3ed0bc0c6
- child 7779
- 757334671130
equal
deleted
inserted
replaced
| 7532:1358e9d67a1c | 7533:88261c96484b |
|---|---|
| 99 self.rDiffEdit.customContextMenuRequested.connect( | 99 self.rDiffEdit.customContextMenuRequested.connect( |
| 100 self.__showRDiffContextMenu) | 100 self.__showRDiffContextMenu) |
| 101 | 101 |
| 102 self.__lDiffMenu = QMenu() | 102 self.__lDiffMenu = QMenu() |
| 103 self.__stageLinesAct = self.__lDiffMenu.addAction( | 103 self.__stageLinesAct = self.__lDiffMenu.addAction( |
| 104 UI.PixmapCache.getIcon("vcsAdd.png"), | 104 UI.PixmapCache.getIcon("vcsAdd"), |
| 105 self.tr("Stage Selected Lines"), | 105 self.tr("Stage Selected Lines"), |
| 106 self.__stageHunkOrLines) | 106 self.__stageHunkOrLines) |
| 107 self.__revertLinesAct = self.__lDiffMenu.addAction( | 107 self.__revertLinesAct = self.__lDiffMenu.addAction( |
| 108 UI.PixmapCache.getIcon("vcsRevert.png"), | 108 UI.PixmapCache.getIcon("vcsRevert"), |
| 109 self.tr("Revert Selected Lines"), | 109 self.tr("Revert Selected Lines"), |
| 110 self.__revertHunkOrLines) | 110 self.__revertHunkOrLines) |
| 111 self.__stageHunkAct = self.__lDiffMenu.addAction( | 111 self.__stageHunkAct = self.__lDiffMenu.addAction( |
| 112 UI.PixmapCache.getIcon("vcsAdd.png"), | 112 UI.PixmapCache.getIcon("vcsAdd"), |
| 113 self.tr("Stage Hunk"), | 113 self.tr("Stage Hunk"), |
| 114 self.__stageHunkOrLines) | 114 self.__stageHunkOrLines) |
| 115 self.__revertHunkAct = self.__lDiffMenu.addAction( | 115 self.__revertHunkAct = self.__lDiffMenu.addAction( |
| 116 UI.PixmapCache.getIcon("vcsRevert.png"), | 116 UI.PixmapCache.getIcon("vcsRevert"), |
| 117 self.tr("Revert Hunk"), | 117 self.tr("Revert Hunk"), |
| 118 self.__revertHunkOrLines) | 118 self.__revertHunkOrLines) |
| 119 | 119 |
| 120 self.__rDiffMenu = QMenu() | 120 self.__rDiffMenu = QMenu() |
| 121 self.__unstageLinesAct = self.__rDiffMenu.addAction( | 121 self.__unstageLinesAct = self.__rDiffMenu.addAction( |
| 122 UI.PixmapCache.getIcon("vcsRemove.png"), | 122 UI.PixmapCache.getIcon("vcsRemove"), |
| 123 self.tr("Unstage Selected Lines"), | 123 self.tr("Unstage Selected Lines"), |
| 124 self.__unstageHunkOrLines) | 124 self.__unstageHunkOrLines) |
| 125 self.__unstageHunkAct = self.__rDiffMenu.addAction( | 125 self.__unstageHunkAct = self.__rDiffMenu.addAction( |
| 126 UI.PixmapCache.getIcon("vcsRemove.png"), | 126 UI.PixmapCache.getIcon("vcsRemove"), |
| 127 self.tr("Unstage Hunk"), | 127 self.tr("Unstage Hunk"), |
| 128 self.__unstageHunkOrLines) | 128 self.__unstageHunkOrLines) |
| 129 | 129 |
| 130 self.lDiffHighlighter = GitDiffHighlighter(self.lDiffEdit.document()) | 130 self.lDiffHighlighter = GitDiffHighlighter(self.lDiffEdit.document()) |
| 131 self.rDiffHighlighter = GitDiffHighlighter(self.rDiffEdit.document()) | 131 self.rDiffHighlighter = GitDiffHighlighter(self.rDiffEdit.document()) |
| 255 self.tr("Adjust column sizes"), self.__resizeColumns) | 255 self.tr("Adjust column sizes"), self.__resizeColumns) |
| 256 act.setToolTip(self.tr( | 256 act.setToolTip(self.tr( |
| 257 "Adjusts the width of all columns to their contents")) | 257 "Adjusts the width of all columns to their contents")) |
| 258 | 258 |
| 259 self.actionsButton.setIcon( | 259 self.actionsButton.setIcon( |
| 260 UI.PixmapCache.getIcon("actionsToolButton.png")) | 260 UI.PixmapCache.getIcon("actionsToolButton")) |
| 261 self.actionsButton.setMenu(self.__actionsMenu) | 261 self.actionsButton.setMenu(self.__actionsMenu) |
| 262 | 262 |
| 263 def closeEvent(self, e): | 263 def closeEvent(self, e): |
| 264 """ | 264 """ |
| 265 Protected slot implementing a close event handler. | 265 Protected slot implementing a close event handler. |
