Merge branch 'transparent_bg' into 'master'

Transparent backgrounds behind view See merge request plom/plom!440
plomgrading · May 13, 2020 · 3f315b0 · 3f315b0
2 parents 7678803 + 84d8ad4
commit 3f315b0
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 65 deletions.
diff --git a/plom/client/backGrid.py b/plom/client/backGrid.py
@@ -25,5 +25,5 @@ def __init__(self, username=None):
             x in username.lower() for x in ["omer", "remo", "legna", "angel"]
         ):
             self.setTexture(QPixmap(os.path.join(base_path, "backGrid2.png")))
-        else:
-            self.setTexture(QPixmap(os.path.join(base_path, "backGrid1.svg")))
+        # else:
+        #    self.setTexture(QPixmap(os.path.join(base_path, "backGrid1.svg")))
diff --git a/plom/client/backGrid1.svg b/plom/client/backGrid1.svg
diff --git a/plom/client/backGrid3.png b/plom/client/backGrid3.png
diff --git a/plom/client/examviewwindow.py b/plom/client/examviewwindow.py
@@ -78,6 +78,7 @@ def __init__(self, fnames):
 
     def initUI(self, fnames):
         # set background
+        self.setStyleSheet("background: transparent")
         self.setBackgroundBrush(BackGrid())
         self.setRenderHint(QPainter.Antialiasing, True)
         self.setRenderHint(QPainter.SmoothPixmapTransform, True)

diff --git a/plom/client/pageview.py b/plom/client/pageview.py
@@ -24,7 +24,8 @@ def __init__(self, parent, username=None):
         # Set scrollbars
         self.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
         self.setHorizontalScrollBarPolicy(Qt.ScrollBarAsNeeded)
-        # set the area outside the groupimage to be tiled grid png
+        # set the area outside the groupimage to be tiled grid image
+        self.setStyleSheet("background: transparent")
         self.setBackgroundBrush(QBrush(BackGrid(username)))
 
         # Nice antialiasing and scaling of objects (esp the groupimage)