Mercurial Repositories > eric / changeset

--- a/Snapshot/SnapWidget.py	Sat Oct 06 14:12:20 2012 +0200
+++ b/Snapshot/SnapWidget.py	Sat Oct 06 14:50:12 2012 +0200
@@ -14,9 +14,11 @@
 import os
 
 from PyQt4.QtCore import pyqtSlot, QFile, QFileInfo, QTimer, QPoint, QMimeData, Qt, \
-    QEvent, QRegExp
+    QEvent, QRegExp, qVersion
 from PyQt4.QtGui import QWidget, QImageWriter, QApplication, QPixmap, QCursor, QDrag, \
     QShortcut, QKeySequence, QDesktopServices
+if qVersion() >= "5.0.0":
+    from PyQt4.QtGui import QScreen
 
 from E5Gui import E5FileDialog, E5MessageBox
 
@@ -350,16 +352,24 @@
         
         if self.__mode == SnapWidget.ModeFullscreen:
             desktop = QApplication.desktop()
-            self.__snapshot = QPixmap.grabWindow(desktop.winId(),
-                desktop.x(), desktop.y(), desktop.width(), desktop.height())
+            if qVersion() >= "5.0.0":
+                self.__snapshot = QScreen.grabWindow(desktop.winId(),
+                    desktop.x(), desktop.y(), desktop.width(), desktop.height())
+            else:
+                self.__snapshot = QPixmap.grabWindow(desktop.winId(),
+                    desktop.x(), desktop.y(), desktop.width(), desktop.height())
         elif self.__mode == SnapWidget.ModeScreen:
             desktop = QApplication.desktop()
             screenId = desktop.screenNumber(QCursor.pos())
             geom = desktop.screenGeometry(screenId)
             x = geom.x()
             y = geom.y()
-            self.__snapshot = QPixmap.grabWindow(
-                desktop.winId(), x, y, geom.width(), geom.height())
+            if qVersion() >= "5.0.0":
+                self.__snapshot = QScreen.grabWindow(
+                    desktop.winId(), x, y, geom.width(), geom.height())
+            else:
+                self.__snapshot = QPixmap.grabWindow(
+                    desktop.winId(), x, y, geom.width(), geom.height())
         else:
             self.__snapshot = QPixmap()
         

--- a/Snapshot/SnapshotFreehandGrabber.py	Sat Oct 06 14:12:20 2012 +0200
+++ b/Snapshot/SnapshotFreehandGrabber.py	Sat Oct 06 14:50:12 2012 +0200
@@ -7,9 +7,11 @@
 Module implementing a grabber widget for a freehand snapshot region.
 """
 
-from PyQt4.QtCore import pyqtSignal, Qt, QRect, QPoint, QTimer
+from PyQt4.QtCore import pyqtSignal, Qt, QRect, QPoint, QTimer, qVersion
 from PyQt4.QtGui import QWidget, QPixmap, QColor, QRegion, QApplication, QPainter, \
     QPalette, QToolTip, QPolygon, QPen, QBrush, QPaintEngine
+if qVersion() >= "5.0.0":
+    from PyQt4.QtGui import QScreen
 
 
 def drawPolygon(painter, polygon, outline, fill=QColor()):
@@ -80,8 +82,12 @@
         self.__desktop = QApplication.desktop()
         x = self.__desktop.x()
         y = self.__desktop.y()
-        self.__pixmap = QPixmap.grabWindow(self.__desktop.winId(), x, y,
-            self.__desktop.width(), self.__desktop.height())
+        if qVersion() >= "5.0.0":
+            self.__pixmap = QScreen.grabWindow(self.__desktop.winId(), x, y,
+                self.__desktop.width(), self.__desktop.height())
+        else:
+            self.__pixmap = QPixmap.grabWindow(self.__desktop.winId(), x, y,
+                self.__desktop.width(), self.__desktop.height())
         self.resize(self.__pixmap.size())
         self.move(x, y)
         self.setCursor(Qt.CrossCursor)

--- a/Snapshot/SnapshotRegionGrabber.py	Sat Oct 06 14:12:20 2012 +0200
+++ b/Snapshot/SnapshotRegionGrabber.py	Sat Oct 06 14:50:12 2012 +0200
@@ -7,10 +7,11 @@
 Module implementing a grabber widget for a rectangular snapshot region.
 """
 
-from PyQt4.QtCore import pyqtSignal, Qt, QRect, QPoint, QTimer
+from PyQt4.QtCore import pyqtSignal, Qt, QRect, QPoint, QTimer, qVersion
 from PyQt4.QtGui import QWidget, QPixmap, QColor, QRegion, QApplication, QPainter, \
     QPalette, QToolTip, QPaintEngine, QPen, QBrush
-
+if qVersion() >= "5.0.0":
+    from PyQt4.QtGui import QScreen
 
 def drawRect(painter, rect, outline, fill=QColor()):
     """
@@ -108,8 +109,12 @@
         self.__desktop = QApplication.desktop()
         x = self.__desktop.x()
         y = self.__desktop.y()
-        self.__pixmap = QPixmap.grabWindow(self.__desktop.winId(), x, y,
-            self.__desktop.width(), self.__desktop.height())
+        if qVersion() >= "5.0.0":
+            self.__pixmap = QScreen.grabWindow(self.__desktop.winId(), x, y,
+                self.__desktop.width(), self.__desktop.height())
+        else:
+            self.__pixmap = QPixmap.grabWindow(self.__desktop.winId(), x, y,
+                self.__desktop.width(), self.__desktop.height())
         self.resize(self.__pixmap.size())
         self.move(x, y)
         self.setCursor(Qt.CrossCursor)