From 883e14e3aa3f31f24ccadcead42e39e168d6f4de Mon Sep 17 00:00:00 2001
From: Balthasar Reuter <github@re-web.eu>
Date: Tue, 3 Jul 2018 23:45:08 +0200
Subject: [PATCH] Adapted Stylesheets to work on Raspberry Pi screen

---
 photobooth/gui/Qt5Gui/Frames.py              |   2 +-
 photobooth/gui/Qt5Gui/images/checkmark.png   | Bin 2078 -> 1148 bytes
 photobooth/gui/Qt5Gui/images/down.png        | Bin 316 -> 0 bytes
 photobooth/gui/Qt5Gui/images/up-down.svg     |  83 -------------------
 photobooth/gui/Qt5Gui/images/up.png          | Bin 310 -> 0 bytes
 photobooth/gui/Qt5Gui/stylesheets/dark.qss   |   8 +-
 photobooth/gui/Qt5Gui/stylesheets/pastel.qss |  14 +++-
 7 files changed, 17 insertions(+), 90 deletions(-)
 delete mode 100644 photobooth/gui/Qt5Gui/images/down.png
 delete mode 100644 photobooth/gui/Qt5Gui/images/up-down.svg
 delete mode 100644 photobooth/gui/Qt5Gui/images/up.png

diff --git a/photobooth/gui/Qt5Gui/Frames.py b/photobooth/gui/Qt5Gui/Frames.py
index 8efd287..2f2b48a 100644
--- a/photobooth/gui/Qt5Gui/Frames.py
+++ b/photobooth/gui/Qt5Gui/Frames.py
@@ -457,7 +457,7 @@ class Settings(QtWidgets.QFrame):
 
         layout = QtWidgets.QVBoxLayout()
         layout.addWidget(self.createTabs())
-        layout.addStretch(1)
+        # layout.addStretch(1)
         layout.addWidget(self.createButtons())
         self.setLayout(layout)
 
diff --git a/photobooth/gui/Qt5Gui/images/checkmark.png b/photobooth/gui/Qt5Gui/images/checkmark.png
index 44868ff3905c907753188215dfd3d625620d0927..d04adb59410be012892686b8d998f467902c6476 100644
GIT binary patch
literal 1148
zcmV-?1cUpDP)<h;3K|Lk000e1NJLTq000{R000{Z1ONa4C*3^W00004XF*Lt006O%
z3;baP0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00002
zVoOIv0PgKS>`edw010qNS#tmY4c7nw4c7reD4Tcy000McNliru;s*m22LxpdP?7)u
z18+%0K~y-)z0%8X8$}!k@bCP7<MlJ~BZ(5*d9?8>PFyO8df>#VfDjzGAp{ptg#;1^
zwc-#|ltyg?6txrz2nkiHdIs?aa7&unA?=|^9NLtIQbgnT#%u4cy}RZR5|Sn@H|92@
z?`K9c^9BCTApjtXzc4n;79RZeAMsIGJ`T8w3@CUS_JseUe8yQAXjUGBVz9iuZ+niJ
zw^+d_ipjv&?q}r`4O;m=?NRU`3{U7C?~F1nGXxNXfC~`hdR4jDjZN;0qG%}LH@q`4
zA_N^_8x=fREiZA35`uY>hMlVeTKOR~2F=y~rgv8M16J8Q%>YnEx>CtglG6e-fn<9r
zx>4GJBB*inHQ$^Z0_=uyy7~<RfQjGHU$YiOoHIgFmJYNR`x;w!96_6hUh$oA#R0pa
zpRIi9*LiD46|oI{QH;_Q2}&c;&d1ae06)q!{IdTOIVxbA`WM<+rFjqAtcxNdTIU)K
zaaKsqit%P4S2xh0#7q89<+y;On_sCPyVQHYzig8R8=VEjC`ZIeF<!~vuU~n=|Cvky
zPRIDJc}l6R0S_|+WrSLt0%Dvc$!Qw9;PubR4A3>rOWG_~*8WNEVgTSEthJWJAm@l>
z()FB-0Zzxf+&t+i-Pum<VJ6B5X`N*;##xf20A1a@qMa1QoqeVK8lj_6wQqK<&6%~@
zI`3aE?n>-AP2v#DQ24m_eHqwX5kc~4d4EfN9E(FA>^bFmSM~r-&Hhykked%vue}s8
zYWuTce1z*$z4OZJ>;|l|aYmn~13W>*IT2|69M;vnEDlS#`MmFQ<tQ=GUejmPOTJR4
zATpdFg`Q$xrw}&kyV(ew-rzCsylX;;uG7Aue^C5^tUnN|H<vlZDZzY*-1<tNQQu-w
zXozG3v!3^4zkuUd-#1R&T?{!T07VQ}^#V=uK~i{{{N{4lP{BYHmW&<so%6g%Zot|w
zztuhr-dRU;`#YjlZG|$NAjyZ>Yc3BMJPxNP_?CCxl@rv3z1o`7&Y^aD$3wO80HfvB
zHO^9kTs$oT#&zyPH{qLC(gKcS{iL5L{pfDr-&24ZhN^mjQ<NkrpWs36L94E;(~+(;
zFYCwomp{83`}D>}5%EgvDy2C|iWp%PK}Wl#tXeD03-<b5JbI`YtQ$8dhp=(}Zxz~6
z@fBgOtpET3C3HntbYx+4WjbSWWnpw>05UK!I4v+YEif}wGBG+dFgi6iD=;!TFfa?F
z(7gZv03~!qSaf7zbY(hiZ)9m^c>ppnF*q$SH!UzTR5CF-FgH3dG%GMNIxsL%^ArOB
O0000<MNUMnLSTZE^zi2Z

delta 2071
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
B>;nJ*

diff --git a/photobooth/gui/Qt5Gui/images/down.png b/photobooth/gui/Qt5Gui/images/down.png
deleted file mode 100644
index a5012aa8ac51559817c0791f07860f12873c92e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 316
zcmeAS@N?(olHy`uVBq!ia0vp^+(69F!3HFaY)uV-6kC$Fy9>iR5bVnQAOaNOEbxdd
z2I{yD!i-KDvnzmt>?NMQuI!K4WW@9ov_yY*0EJF^x;TbtobSD4>(%Ti()#c?zv2=e
zMsM!v0v;2+1PU3OvNxPyis`OZ(dN+HdV(n@h;yR=i?0Hsqu{6HV&=mJKR+C3eRywr
z@jD)7{T)X)Zj#z@__Ltfjssl%6^De>cewED@;uaP+r5H!-$vi6;*y1js*N<R-j=(Q
zBy)C>S%ru6+zzdsbq{pPD{LA3zdKAlz`Vw|IsVS{GV9(GSH23rWiB^7`=C?m>qp@S
z;(4zgh>4x#I$IKv`ax*3g}>6$u<IYSp8s3uR<q3Js{ECit}EZKm<;k1gQu&X%Q~lo
FCIAO>b`}5t

diff --git a/photobooth/gui/Qt5Gui/images/up-down.svg b/photobooth/gui/Qt5Gui/images/up-down.svg
deleted file mode 100644
index 318c4d5..0000000
--- a/photobooth/gui/Qt5Gui/images/up-down.svg
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="2.5244994mm"
-   height="3.3670478mm"
-   viewBox="0 0 2.5244994 3.3670478"
-   version="1.1"
-   id="svg1335"
-   inkscape:version="0.92.3 (unknown)"
-   sodipodi:docname="up-down.svg">
-  <defs
-     id="defs1329">
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Lend"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path1903"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="-25.987692"
-     inkscape:cy="101.94875"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1855"
-     inkscape:window-height="1056"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata1332">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-87.944799,-119.45095)">
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
-       d="M 89.202381,120.33484 V 122.375"
-       id="path1337"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-  </g>
-</svg>
diff --git a/photobooth/gui/Qt5Gui/images/up.png b/photobooth/gui/Qt5Gui/images/up.png
deleted file mode 100644
index 640acf613b1366deee7a1958113e2adf4419fac1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 310
zcmeAS@N?(olHy`uVBq!ia0vp^+(69F!3HFaY)uV-6kC$Fy9>iR5bVnQAOaNOEbxdd
z2I{yD!i-KDvnzmt>?NMQuI!K4WW@AY_<8jtfI^2oT^vI+&i7v2=yfPi<oHK^wHYc&
zH}431VQSj!y*N1e>_g=rT<02-H_!Ig7kK#O$)hI^6j;2f1(I~XADX}Vx=q1@qW9DF
z_ZRd34n1h?<+p-8=b|O+yhq}X{~z$KVXbJ+`e=CeYe#p%x<%DzZ1}I;m@HG#T*{Px
z!A9h<WO(O-zU9u(Qj>aZ{m<%NG5WZ!FnUkLQN84QNda5x(+=EN&2dkC{{F+|4M}qs
z*S3k@X+66)u|v@AgYdRn9fw$}G}77DEa<-}KlOoGi^``p(}3P#@O1TaS?83{1OO|N
Bd@uk2

diff --git a/photobooth/gui/Qt5Gui/stylesheets/dark.qss b/photobooth/gui/Qt5Gui/stylesheets/dark.qss
index d837ffa..80201e7 100644
--- a/photobooth/gui/Qt5Gui/stylesheets/dark.qss
+++ b/photobooth/gui/Qt5Gui/stylesheets/dark.qss
@@ -55,18 +55,20 @@ QFrame#IdleMessage QPushButton:pressed {
 /* Greeter Screen */
 
 QFrame#GreeterMessage {
-    padding: 50px;
+    padding: 30px;
 }
 
 QFrame#GreeterMessage QLabel#title {
     font-size: 180px;
+    margin: 0;
+    padding: 0;
     qproperty-alignment: AlignCenter;
 }
 
 QFrame#GreeterMessage QPushButton#button {
     border: none;
     font-size: 120px;
-    margin: 60px 0 20px 0;
+    margin: 0;
     min-height: 160px;
     padding: 0;
     text-align: center;
@@ -74,6 +76,8 @@ QFrame#GreeterMessage QPushButton#button {
 
 QFrame#GreeterMessage QLabel#message {
     font-size: 120px;
+    margin: 0;
+    padding: 0;
     qproperty-alignment: AlignCenter;
 }
 
diff --git a/photobooth/gui/Qt5Gui/stylesheets/pastel.qss b/photobooth/gui/Qt5Gui/stylesheets/pastel.qss
index 8c47e02..35d5810 100644
--- a/photobooth/gui/Qt5Gui/stylesheets/pastel.qss
+++ b/photobooth/gui/Qt5Gui/stylesheets/pastel.qss
@@ -55,18 +55,20 @@ QFrame#IdleMessage QPushButton:pressed {
 /* Greeter Screen */
 
 QFrame#GreeterMessage {
-    padding: 50px;
+    padding: 30px;
 }
 
 QFrame#GreeterMessage QLabel#title {
     font-size: 180px;
+    margin: 0;
+    padding: 0;
     qproperty-alignment: AlignCenter;
 }
 
 QFrame#GreeterMessage QPushButton#button {
     border: none;
     font-size: 120px;
-    margin: 60px 0 20px 0;
+    margin: 0;
     min-height: 160px;
     padding: 0;
     text-align: center;
@@ -74,6 +76,8 @@ QFrame#GreeterMessage QPushButton#button {
 
 QFrame#GreeterMessage QLabel#message {
     font-size: 120px;
+    margin: 0;
+    padding: 0;
     qproperty-alignment: AlignCenter;
 }
 
@@ -187,11 +191,12 @@ QTabBar::tab:selected {
 
 QTabWidget QWidget {
     color: #333333;
+    font-size: 30px;
 }
 
 QCheckBox::indicator {
-    width: 45px;
-    height: 45px;
+    width: 30px;
+    height: 30px;
     background-color: transparent;
     border-style: outset;
     border-width: 2px;
@@ -207,6 +212,7 @@ QCheckBox::indicator::checked {
 QComboBox, QDateEdit, QLineEdit, QSpinBox, QTimeEdit {
     background-color: #eeeeee;
     color: #333333;
+    font-size: 30px;
 }
 
 QComboBox QAbstractItemView {