Mercurial Repositories > eric / file comparison
comparison: Snapshot/SnapWidget.py
Snapshot/SnapWidget.py
- changeset 6913
- be170600edcd
- parent 6911
- 8f4a050c6895
- child 6926
- 519145f2ba79
equal
deleted
inserted
replaced
| 6911:8f4a050c6895 | 6913:be170600edcd |
|---|---|
| 57 | 57 |
| 58 self.modeCombo.addItem(self.tr("Fullscreen"), | 58 self.modeCombo.addItem(self.tr("Fullscreen"), |
| 59 SnapWidget.ModeFullscreen) | 59 SnapWidget.ModeFullscreen) |
| 60 if qVersionTuple() >= (5, 10, 0): | 60 if qVersionTuple() >= (5, 10, 0): |
| 61 if len(QApplication.screens()) > 1: | 61 if len(QApplication.screens()) > 1: |
| 62 self.modeCombo.addItem(self.tr("Current Screen"), | 62 self.modeCombo.addItem(self.tr("Select Screen"), |
| 63 SnapWidget.ModeScreen) | 63 SnapWidget.ModeScreen) |
| 64 else: | 64 else: |
| 65 if QApplication.desktop().screenCount() > 1: | 65 if QApplication.desktop().screenCount() > 1: |
| 66 self.modeCombo.addItem(self.tr("Current Screen"), | 66 self.modeCombo.addItem(self.tr("Select Screen"), |
| 67 SnapWidget.ModeScreen) | 67 SnapWidget.ModeScreen) |
| 68 self.modeCombo.addItem(self.tr("Rectangular Selection"), | 68 self.modeCombo.addItem(self.tr("Rectangular Selection"), |
| 69 SnapWidget.ModeRectangle) | 69 SnapWidget.ModeRectangle) |
| 70 self.modeCombo.addItem(self.tr("Elliptical Selection"), | 70 self.modeCombo.addItem(self.tr("Elliptical Selection"), |
| 71 SnapWidget.ModeEllipse) | 71 SnapWidget.ModeEllipse) |
| 385 else: | 385 else: |
| 386 self.__snapshot = QPixmap.grabWindow( | 386 self.__snapshot = QPixmap.grabWindow( |
| 387 desktop.winId(), desktop.x(), desktop.y(), | 387 desktop.winId(), desktop.x(), desktop.y(), |
| 388 desktop.width(), desktop.height()) | 388 desktop.width(), desktop.height()) |
| 389 elif self.__mode == SnapWidget.ModeScreen: | 389 elif self.__mode == SnapWidget.ModeScreen: |
| 390 desktop = QApplication.desktop() | |
| 390 if qVersionTuple() >= (5, 10, 0): | 391 if qVersionTuple() >= (5, 10, 0): |
| 391 screen = QApplication.screenAt(QCursor.pos()) | 392 screen = QApplication.screenAt(QCursor.pos()) |
| 392 geom = screen.geometry() | 393 geom = screen.geometry() |
| 393 else: | 394 else: |
| 394 desktop = QApplication.desktop() | |
| 395 screenId = desktop.screenNumber(QCursor.pos()) | 395 screenId = desktop.screenNumber(QCursor.pos()) |
| 396 geom = desktop.screenGeometry(screenId) | 396 geom = desktop.screenGeometry(screenId) |
| 397 x = geom.x() | 397 x = geom.x() |
| 398 y = geom.y() | 398 y = geom.y() |
| 399 if qVersionTuple() >= (5, 0, 0): | 399 if qVersionTuple() >= (5, 0, 0): |
