Mercurial Repositories > eric / file comparison
comparison: Snapshot/SnapWidget.py
Snapshot/SnapWidget.py
- changeset 6911
- 8f4a050c6895
- parent 6910
- 5b938c17bc0a
- child 6913
- be170600edcd
- child 6914
- 5ae038f273c4
equal
deleted
inserted
replaced
| 6910:5b938c17bc0a | 6911:8f4a050c6895 |
|---|---|
| 55 self.copyPreviewButton.setIcon(UI.PixmapCache.getIcon("editCopy.png")) | 55 self.copyPreviewButton.setIcon(UI.PixmapCache.getIcon("editCopy.png")) |
| 56 self.setWindowIcon(UI.PixmapCache.getIcon("ericSnap.png")) | 56 self.setWindowIcon(UI.PixmapCache.getIcon("ericSnap.png")) |
| 57 | 57 |
| 58 self.modeCombo.addItem(self.tr("Fullscreen"), | 58 self.modeCombo.addItem(self.tr("Fullscreen"), |
| 59 SnapWidget.ModeFullscreen) | 59 SnapWidget.ModeFullscreen) |
| 60 if QApplication.desktop().screenCount() > 1: | 60 if qVersionTuple() >= (5, 10, 0): |
| 61 self.modeCombo.addItem(self.tr("Current Screen"), | 61 if len(QApplication.screens()) > 1: |
| 62 SnapWidget.ModeScreen) | 62 self.modeCombo.addItem(self.tr("Current Screen"), |
| 63 SnapWidget.ModeScreen) | |
| 64 else: | |
| 65 if QApplication.desktop().screenCount() > 1: | |
| 66 self.modeCombo.addItem(self.tr("Current Screen"), | |
| 67 SnapWidget.ModeScreen) | |
| 63 self.modeCombo.addItem(self.tr("Rectangular Selection"), | 68 self.modeCombo.addItem(self.tr("Rectangular Selection"), |
| 64 SnapWidget.ModeRectangle) | 69 SnapWidget.ModeRectangle) |
| 65 self.modeCombo.addItem(self.tr("Elliptical Selection"), | 70 self.modeCombo.addItem(self.tr("Elliptical Selection"), |
| 66 SnapWidget.ModeEllipse) | 71 SnapWidget.ModeEllipse) |
| 67 self.modeCombo.addItem(self.tr("Freehand Selection"), | 72 self.modeCombo.addItem(self.tr("Freehand Selection"), |
| 380 else: | 385 else: |
| 381 self.__snapshot = QPixmap.grabWindow( | 386 self.__snapshot = QPixmap.grabWindow( |
| 382 desktop.winId(), desktop.x(), desktop.y(), | 387 desktop.winId(), desktop.x(), desktop.y(), |
| 383 desktop.width(), desktop.height()) | 388 desktop.width(), desktop.height()) |
| 384 elif self.__mode == SnapWidget.ModeScreen: | 389 elif self.__mode == SnapWidget.ModeScreen: |
| 385 desktop = QApplication.desktop() | 390 if qVersionTuple() >= (5, 10, 0): |
| 386 screenId = desktop.screenNumber(QCursor.pos()) | 391 screen = QApplication.screenAt(QCursor.pos()) |
| 387 geom = desktop.screenGeometry(screenId) | 392 geom = screen.geometry() |
| 393 else: | |
| 394 desktop = QApplication.desktop() | |
| 395 screenId = desktop.screenNumber(QCursor.pos()) | |
| 396 geom = desktop.screenGeometry(screenId) | |
| 388 x = geom.x() | 397 x = geom.x() |
| 389 y = geom.y() | 398 y = geom.y() |
| 390 if qVersionTuple() >= (5, 0, 0): | 399 if qVersionTuple() >= (5, 0, 0): |
| 391 self.__snapshot = QApplication.screens()[0].grabWindow( | 400 self.__snapshot = QApplication.screens()[0].grabWindow( |
| 392 desktop.winId(), x, y, geom.width(), geom.height()) | 401 desktop.winId(), x, y, geom.width(), geom.height()) |
