From 2851c60621bfeb8576f6fd9dbf2eafc8ca2f4f7d Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 26 Apr 2022 11:02:28 +0300 Subject: [PATCH] kgreeter: use Plasma default theme wallpaper and rectangle image by default Signed-off-by: Ivailo Monev --- kgreeter/CMakeLists.txt | 11 ++++++-- kgreeter/data/rectangle.png | Bin 0 -> 16159 bytes kgreeter/kcm/CMakeLists.txt | 2 +- kgreeter/kcm/kgreeterconfig.cpp | 19 ++++--------- kgreeter/kgreeter.cpp | 16 ++++------- kgreeter/kgreeter.h | 47 ++++++++++++++++++++++++++++++++ 6 files changed, 69 insertions(+), 26 deletions(-) create mode 100644 kgreeter/data/rectangle.png create mode 100644 kgreeter/kgreeter.h diff --git a/kgreeter/CMakeLists.txt b/kgreeter/CMakeLists.txt index 987da41a..d31c8609 100644 --- a/kgreeter/CMakeLists.txt +++ b/kgreeter/CMakeLists.txt @@ -8,9 +8,8 @@ set_package_properties(GLIB2 PROPERTIES PURPOSE "Needed for the LightDM greeter" ) -add_subdirectory(kcm) - include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} ${LIGHTDM_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ) @@ -24,6 +23,7 @@ target_link_libraries(lightdm-kgreeter-greeter ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBS} + ${KDE4_PLASMA_LIBS} ${LIGHTDM_LIBRARIES} ${GLIB2_LIBRARIES} ) @@ -47,3 +47,10 @@ install( FILES lightdm-kgreeter-greeter.desktop DESTINATION ${KDE4_SHARE_INSTALL_PREFIX}/xgreeters ) + +add_subdirectory(kcm) + +install( + FILES data/rectangle.png + DESTINATION ${KDE4_DATA_INSTALL_DIR}/kgreeter +) diff --git a/kgreeter/data/rectangle.png b/kgreeter/data/rectangle.png new file mode 100644 index 0000000000000000000000000000000000000000..4728aa44bfb39e2419598b21747372cb3fedbf22 GIT binary patch literal 16159 zcmWk#by(C-6aU`9!O@LybeAaIadaphA|;_T(p^V)gGwJEosyDA2ndQt2>g%+<>>D4 z_5EZ2*m?Gu*_qEiGqW?h@w(b-MEEd#004+I)RpxC0EGNEaG==#DDi>uEC3+)M?+b` z(0^gCU_6yxg?zY%aC*8Bm)`fYyGOeMDhyap8nPzgt217YKy`ncUjJ^@NF;{ig0d1A zMg-6asMB}2E2z8wMin98%<~W|wxDHM+eg{#vI-Q_=T+;w-o9NmnzR%-=a~L#rdP_Z zjdi55DP4o6%ND9#E8DATF_l=*NCRs_*TIfAG-ck^&_Y8Oh+!)coY= z#xHcDdlHAuc#O>oQs2llb6hrt8vP<&-^gp8!e;qL+VDH(jjDFNIy&z1hy9<>tX<1& z2r_h40(7}VD!PrJJP7O}pZd>Be<|a5gRA$G)G8?o4VLj$5B#~{u%e65cUO!^&B$t3 z=$YE;@$J{Px%f03^&`n=zH?q1+4x4k(3PpUzsn-keDz9*5mHAQFV-Y~iM9vDDM$aG z9igiF%*bH#y6>eIRmpSG9qfP8NMX=kyigy{ zn}#tqOWxkL_+HgJ@UOLS;jH~om2%Z{d!$Zg`S8aIRf39A1HiWY?)jyUGm}B-4sR1` z*Hgx*bjM(Z)*|>iIol%0FgbF!S^3T;ul_-GcS6?ZKg^fBhugI#`rvXADjEGA<9Z{~aGRAzw#^;1V3d#WL8G3(u z2JdKu{65|2nhi~xG7MHVFlPe@5F{WfjANRJ%=+%CRt+KXeB<&FB917PBCO%tnMP)+ z#Z|+hUB(xAQd3{32I+g>Zx8(8_FGgV*Q6G1-+Y?!H#kHF*I^Rk$q?;e z02GMGpJLq@fSK(?QkL^4o zndG{pVgQnbfQ&Cv5i%$3vfz6D!YJQCZ ziM&gC8s@!@#~REAw>qSe&m3Un<-nYPbZN;mp)fM7oUs^>Oz9`{XZPMhhoY4Q5JyBX zAii_Xg^N+bB_->H%n-j=z8+c0kgQO6Lf}bJ z9co<#WU+0|G2PLkv^D{Tub_d&NCLv4TRB;n0+ zaiy*c?v@y zjXMpia;gaW*|gWl$p-PoWMUY!do?>ut;bBLYZh*q7r?1{ZF(zs&J_%@$i-j#ma6|z zVT?<};jVwUz%qOc_;*R;T-Sa}c!BtdosRv)so%5ptJN#L!{bly|u<8;qLAo-r zP#o^iH7PmcU`CM#R7_W>5OB7$=av6JD8_pi#&-0aqG~JT29+|z`T*;=diHGOaK*hHf_!0jnfNe7oV8wRgEbnX^KZ@2E&*2i6XM&o zId)xuYhGM3!n4W@p$F-2Zm(Egk&ncZTO!xE7J&_@z=3{)3XF#G9yv`?Dk9Wx~MFf0Y0BbNAxP=@rbF$uc^hqxa-JPTUCZ z#EhG<|NRYrGH$3CaJGI|+z(fAxw5L0mfNZ1xwQ6VIl81osRvuEXOG*Rce*su!=J_~ zLQHJ3e!>XJfiYOO;|HN<%oS=hqOf3#ft$!?b_+6*B5(@Ah6h_q?NQNdLaZhsSdQ>WD=Oj;GoAsiBv=zbW->Wu zbhsq;~3>az< z+rScBootrwES>}tIJuhyh-mr;Qf*-AM#wU0nsJHRBYOX( zcrbcV_?g?~&TkP*gEKZAZ093c#z7a7AzWt?MQ9C)rIRT&i+wx?d~$4MyWuZ1UuO}m)+S_C=}{xO z%nq~l-gmg|lI9T8q{}r{t9=8=niZ_UlIyK92>lL@>S0*^iE8~)$2gP}5vj{i^2ohB zb|m%#2)|lUM)8|-K(N)L&btDtMd!`j2AG?rnd6a`Q<9ZJJWRg;Sq0y|MGS5{0ZyrpL%Mg;O7v(NLGkzVlfyi9S>R zK<+2uZ-VfIEVyD}LZX!#2Sien*FIuPT~5j-=_st|j@czH2dlC62&7XvWK$uR z#?@@!K?OLMg260cR%#|fGK_+E%ZZiynZJW5KHbgN7h=l|+Y^eeL%AQ81AnwVWd{N;n)yZu zD#w91)vxWeZ1_+z+t=k}P9-pG%$B8vy|o`bbU?w6qfBCx(jkap4K{biiR~n3 zT7u+webq1tQ`1i8>l#{woX7U&>jBu1gXrjI(Oqxb;47|;QZXhL`yp#U#`keq#m4!Q z8RtOH?a`CD#|ZVvyRz_9QmhS0H{ZRD5k)F~A3zbBx;FaKpl%R-GDUcv>*=R~coKYf z@>K&wB=pwNOMXMzZJ!Tbt5hrN8$`lI9USa^c=@#P!F;3VU#is}a?gW>%)iN| z(nzDR-)0*Sm~fmLOgSS1XWFIYo+)ED9Ld?xFbo9vuu7s%ak`Yn#gyesr935rVM)J> z3Dj;%yFC4`=^PR8$lT4vg(10a9Vw4cQ0wcP)%*zw)zJ^Miopx1znfq`LDyX;3%}j$ zfE&zjgHswxAo3O}M!?ech8djX?m83x%^?oW;tv~AEHzHpL6-SR=7TZYskMcA=mNp4)v{ z4uo*wq8;z`6LDytJ}UlUC*|hi)wv>pYrnZh4y6rQ&`xi?H{?^3k2llL1Z2qmq@CDT<+*%}6|9)6o| zs}ByQVeNwrpiNX}N{|!?jjJ49)>I*?`0yd3K`t)!73f5vy5&@j{_J(>;i+Si&P~k0WB6f% z{S8A44wTm7?S6r{#WfYOsYW5RsBL{MRjy^AvOMU~KZWH%=*+{sJL{f?Fxt;k8yi?$ zvNXSW;c_w$AKIA+I68mlw%xj?XO}V=mj;epFuexl3Mei)HIqhUi}F@BQ;MC*;W)=Lr>7UGkww3 zdS7K+d0)n9UIE+-;F10~rmQ@ZIMzuVYJKtdm=ErBPUcDf`C?xdp&1lh+a!aF#N|xY z_fgBldl?nXpdXiCxLZzzoMOH380qej+rO|~#gY4Cvb?h|9hwDTvVfBF+{ zl)i4j6}NKe{YV3lL#FrJpby4Q?Y)&m3}LG(K#g?bo}ai%hh_knl|$3O+QTIoL|Q%! z1&Aa)FJD150Ifyp=QRr2gxC_at1ZK77ZPeB5KILzJTqC@L1ycFYWO04+QI@Gb_XGR zBvP%e&XVh;_#NZSv-bVxptA`c_-?mJ6q#oUi=SaVhn!XG5p5sr^-LrwDMmgynewzH$zG37-ip1+x z4F?it&{YS%x3vV^?FA%a*;yeDLAw%Q8#Iti=U67a)qTCO{I&?(;QxY7yS09?b9app z?v_XcH5`FM3)P);6PsLrq(=&y#ojsTf(wWuM^q}o0?V?M28hr?08`|)bkh-5p`f8a zQADOnJ!E5uK#5t3a!Ye;wqMe$!Z$ZoOQ}lc=>SP#*>K$_7lO;R%+$6nL1p-9spzYw zv=yf@V#}qYV)r`yI{L-)L_+wbo9wQy;lE(rhOMmnD~0Tq=Bk7ATKr3ZAlf9wd?}6K zQzhzVC9*5@`kOoA!Q-z_0l^k)S-h)BYxF4XueYWkUIdtVW|hC%#-nw#??Z37ZWryIB|DP`@@i#sdB7-?g}yb%Zus%Ry+TrIo=*`@BT9e$V`g__|px=Z55^N&KD3s2bFz z@ht^GKwUXf*7Zmaa-#)C_Vpc8g^5^-xM9%qvU8yjhi*IlKG} z=)yV@TVzME*5@gIscgk3vw~0?DlVfJP4x`aUTuluTa*~07a-o|t)2C}aLro0B7aLu zQ+nxs9#kZ!F-XOFwP#&?#=?-0&_4nh?vrQYwO8_EglDaoTR^dCoLOYLI5dieB-)Xz z-BcR!@b_#zJPUlkf8HR|4%IApk<6h>8_u&=tyHU8tK5{y1<#}8*DV1Nv!VuxZA6!E zu>#qp8woY!c8PbMCZ_oWk~)#5m^+N;_YS?ah%)@R`HI`XIltHYwD2*U0O<|H&q77O znKFVegUipH5>Y}9G7-lh*K`qyJ*y(xILy~Nj?OuNF1(hB1)^Lu#WmlWS!rL6bDTjQ z4nI@(Es+L{_m6Umf)x~61j6{t$&)pz6VAL0YJnc5Q-mHepuo*di4x(ZoNRz9^9CxWc6+^OZVa5avJKq<;m7qqTQp21F zg(ylU-~IK=IsJcrY>PS*;`79KTS?^w^4ZxRY2PhQLYhy!e+0Leg`>W)3#kVFC zV7`pWk#Juor(%Bisva&HuRD)TtjprQ)7V_MMce(c)2T{S$bD^{MbYaA)c8&7#qTw{ zzp9m%`9An(>R_ZiQ;(o|$JKvt*0D*WaWei3Y0?8kF3pE5lSmAG#?qF>EmC7iq~GR$ zBPMVl?{Gy*fhl?PErfk}b~btBU=YV_?zCD_7bEFEJA_5iG??rATWvd_^LF@jAw$@i zhaoG#tOV+?AKE5VAt!1s9f!b~iDteaI~#h38i_+-Q^284swT8xg3XPa<0`Ku$kZ!$ zNYS+(j`yNOmBoOO`H%3-e@yc(3dTTZQI+v6S-h0_0f}BJd~$Dy>v<;%01D~SOVgr1 zaxPr!@vW((j>Hna*21~ZG%}rHW4zzIXfoHZx->#GUb>cO>KXxY^ znl4MAY`vV}P8l}PyI;FWm8s~#xgRs^?3+yrX4SHs-P86zC=aP<2EM$PH5Mk?F^(YV zaF3v<8()0i=Txs9&a)Vc`s$)>KfaBUrV2h^yI_n-5LN&2nN3^AX-`VTrXtcaSMG!1 z+h3FV)plo2MoYPMigZ*(PjGISJhmQQzcgAp?mGNo!l_6VLjzR?u?+}(^Zqdy5S{?- zXLUNU|6>%uGnCU0vg^bhIx-C42J<9mMhL|}c)qxqvAeRHi}mRXG5%hclY1a%f9Ml9 z)5+B59CEpE>#}qzE{brl6?a5S4O$g?6ufE&MP3c)WHXn2w<`}HmhgSLRW{YTVFI`p7QlXy(f( zF3+l(uVG`UhyYZTd1<{Mij4t|D^!eo9!=IaEm2)O%$>oMtasi1);hE4YK-mzDe10rS!~)1Co4sm*D|{ZhLabeo_KlT(z92)(5wb zROk+ZY(C{6;NAj+Z120RDj*|KDCtpvJ%a@yr2~}T>P%1BWlx(^ko@UkU7G-Y-zVY zaPMqoE9J=>qbrXM%aZ5=CEaXGhz3ezS8r|pTynYn;fd7xnjbEYkCG9VJ<+oYb*yyH z{*IU(<|XGFEd}*Bl2SRD;6r&s;O2s;D;W;0qMnLTcHLUjup! ztWk~3NUO%nnED`sRW@siZaPVg_|`N3{PJ(0O#Nzxar`imZR+q79fcqKn(63Pr0>T4 zwih4ncK^G=w;|L8LM$f!;oVd)<*T->PNHoK=KnJ5k|n;+M=Aqx`=2jNTmCcnL~v-0 z+UuU^FcIN4#3rLNg7|#zkP<1GPuCFWU&Jppy(fz@tge?wILUAvL=NIUG=b3+MZMiS zOs1K`dc~hE7|pqs+-aY?b|h}&rxWS$Y8MtXM8u_nu-KH}VlhJw?fgB3=_OxI6X~A! z8P=)>v6wIwyV|3|9dqsSskN@4f|htpiku90RyFwOgR=0tH(JsR?^8%aq`(=w#HK;| zA39nRMirD8%hG}wgU;Chy*}SOT7DGA~jI ziTN{9v+YUSBo>m#TJQ1`xS1^kx8fBqU%xAV%}{KeQg3did}`JbUljm zh&YB%62_uQZWA*^Vi?PV8^-%aLmU@1Y6g}rB5 z!2~=$%3&rWC@8#v&JSp+wt1!4VL)kotFsw+^5+cqD#|A6hlt;sE`0Qa$cnr%-$#!b zTGy6m7e!8wbUp~Lb+bAex-(~&n)WYFh?H|wnV%6v{5Gn1s6V(-tQIF@&5-25YmKeg zI>J+CJ9oy6;?Rg$mj(#T%FSehilE5~r8Wch0}cr}`W=TxK;Rx5#Ps5ak($F&y0L6J zmV}bI8IBz!-AwJo-psQEja31~ayH+xH5<*r(pF)ywS|z$$VT(~@5N zU(!7LBREG>%l9_dVnLJHp@_VGs)AWL{<`3Z;{;CPbCDw^t zxbgX`)?E{oQ~?8jM)H_bhk|ympfGcvmWQx!*-Dr4FF}||SpEKwT`5T|MpeuwoO zA6k3_ks{pCM9dWNuKardZDDCEqN+28^!M--suWdft?kDqRcni+HPKgDkLiIY{K)>o z<=NxNg{3rN%+F@^7$_>fKNF87F$Qk7#pRouO;R`!q+=^8kMyf+r?#P>f0^r93hAVW z(q9moLOD*yTpY6q24HaaX+qQ11+Ew~XN&fhT^Po}xP(Yn|2XA}hKf^!?t%HSo4xpc zs1|F~kA+@|;o8t#cxtenUv6fF*u90;3p5Q25=XoFu!0W1jfBn%Put<#xNVYsG4Q=R0xG%J=qg~X8x78|ly&O}t>cI>s|hU3O4zok__RBRraUb&BaylOMPi3_mZ|o3aZS%KXr+@lN9$LU1D-^J%M{*5H^)1ykw;qoM5KDL z4rb0zzTM~uSJBDMB3w@!I_;x3f+%fVy&RvVa)8Jsut0@$YsWiELxC2M$0ovGoFpyS zhZT!pM|fZE0(ZkJ9=ZUu_}i>_WM@U*LZ+~NV54mUHogo*`uU6eN%qQ&49Ul>J915R z$ArVhHkNNpXA0UonMT4EK03!oqjsXT%A(#f$oQPEeR9O2j;h#T6Zo`H!8Y8x&kH9Z zU@kQ8+4&=IC&A$vTqAA-IVYVGF#*MYw3_<-?kO^5OyxV?bRv+oH+#@gF4hK#Il{a< z?TuCou;C6~i4E{8_TW5~ml)Fh1byW>DM$_Fl!Bo1I8T zfHJMyL)aIkc*MK8ay3m#2k)=&=4K{U67EV+W9IEI3!brwnq>E8`Jj#cxbna)Pki!} zaS=-Lssj>28zMe@Ar7wEU8T_Z_VDwfnCV~qx=EIPK3(p>l0}C<_#Yksa+XDmK5b!5 zFlh`jlil% z#Sqf2t3+aT|8usu8G^99UC@%w8Q{J))w4xPGz~E_So}+OUaIob=YKf3!-FFz1)^1S z=;8!i(jBSd;*`JbOc^g^tHerLm2E#kn3u@WkLWvnTBoQIuef?1WJQ0*%@RWq6x!p1 zF^3=H zpJZ)Xa2LZ-%BWI`;FOznB5YpG5gCA_f$iPEBPjkpUg0cAv->kov~+MUfUY4~>Q?GY zMzp-q(da5pYq-O(OD0ojDQr432Q51+$D@ebhllWwav}of81(oW~ZKbROAH( z>`Bz~AC;{7F5r^gti%252uExFcEN|5p~~q6-%-dVaY-(JOaLj zRjRCB9(Veg?y@r~JF!`%V#(Y;+f_{T4-2XRqxnddgEa^$^l1zw8!3_WksnckP`Cq0 zO-Nr=SnIn#=&3h{@QtV&Xkt{d%0+oK$FigVzh%(W_wL?7K3`~MhU(Jz& z*AN!!1=aHsI&*)2ex=;q*BVj`M(5=D%~XEw%teru#5j%S%O>!zVwd2tqQ2OBCRGaS z(wffA3ucL3uHxDd8N+-&_#fCDI5RVddCw2)rDyitO#YNveqS?)^(OtI7RP_8u%kEO zZ22Oc9A3c%At&GHB+(n=hgh7>pj)>;v_&{Cn&BmFimFLZX@upeXi&Juyb}@EZ*QOl z`2srNls^cS&2u8_6DqPb!3uT^pA@CD&MukEHr=7I&?E0B13_wZ^ZT==!ZcJT z3G)u$O-)mdNHh;M|5AE2U%`%2H=@9fW|ucVrrsI(`gu4u*SELJiqJ)NW*V2r5)W2^ z#>xVfpoQoDoq2X*D_S51rvAu}(+WX1ci89);lBm|X2$;Mj^R{|t2Dx4hV9yuk#(OD z#s*DKf|%gYsy=)?zaEZO-(hRXHC0)6aL!ZZ-W$`Ao8EKo0IzPwU`>9lq5rZivI~~^ z+SC^j+ps(3=k#L)kTnA^A2Y+esgR(OpI{4jMCH>a-w(qilGAON_ZM)obH1zhkRXQ- zM|z1uGbSJH1*vOpaEyrk%`257hAS!ii)&Pa5h)fVV3{k;y`B61NC|ISKmVAUouz%Y zA5_52B}KdW`YmpgP4TjJ99*mzm z=i)~>%hRl*wr{2Mqqh=g2iI43OncvR}(TD zQC0E@NeV&OI;o`a_xQm5)fN9Eqg^XAhG0o!DFif>-hJ1)Ek_OZ2n_=d34W((Bz0R9 zE0tNZK6%%sGd2~_X^SV;M$HPt9xR=fSG}KlS~~{S?T)RGcUa4*zomI+yz-x1n*j)e z;g{B+OGUk8|0Bj6QI}>Uc~2;{(E?&q7E1X*N}J-D)b_9CuIjHXvXo#yd<`+Q+32@U za$FF^z>Vzsrw>~UcUE&$$^9v*4(VkrL6|S4VZk2Zu3iZB8-0X2K*n0wx*@op-w;e% zRQx+nHQs>XBdhJQ7r`{ods|_wd|Hgvy_%m0l2+;W_7PeLYEd=EthH!Jq6O?z12>cD zW>0-XXs1P7j;NJ)+uaFR7x0IwMl=%WZ+5V%cI_V^H)o4Fu-zs;-P`0!utmOE~t*$b~pwdPdf zX5aofz~>@jht;~~cE6miTIFNKG9cfjsyN{C*Np>88AMPxO#zzk8xAVbo)~q%ma%3J z|4P|OpTqsqR{^~^Xs_u-DA}~|#{gnhmZ=tI>2Ktv#L9jc2g=u`r6~t5vr`Wwj7?OSGiIKyprXXyy;{70^v(^09Hf9xF(_aUB7t=6m|dDR=3#6$+NBvv#mcSC z<5@nYftG$hK@mW&GU@sA&C1WFqmjZ$ia5NI$SnT3f-mK(dh4A0fxGkZOjJPN1KRZm z9x2bHh(5w$|2V<(mgj6{Ct6Bz8X&sm+b2#oYKO9Wg8nU@3tG z>rcLt@g2yy(nWA5;p8}RkCcN`Lg&oAt2;N=CMgiO7Xx%7+V>qe=;j;JSA21vxLUer zHDsML9?op4p#%)6IV71K|IIQqsJ!9(g{9j{LMVbmSMFr^!Ta?`DuxnaB|mzZ8b*sq zHRis6yVnq8L8Kq_pUaV3XUV8~{)2y{s#PJ8R4pk+bF9lXIZ()C1*iz!AwKFlm<<;v zl@aqoeU8EC`enS8*x#9K4Y%(c_jWoTJ~ntt1$25Jr4VGkrHM1VVzT$etH9b#ZMq0RSV|er`DqV7ak~S;mT)SGDN9M-!C@Eb9 z;Y++I$Ac~b$R0a?d6xL8ebP~8WR!MJh(pB9nW1FpqS;QMKO|()c4H%6sa{x8WB@0P z#@%pB-ODADr=~!qS{i0B^$ul4h&9A_lH8F01mwMfohIf)0s~%SPc8_rP&x~&>?Z=heufcb)4*(5Yye5@)nsy6pxPmzg?8 zAS1)9;1fr>2GQNM$txjC`C}^xGV#^JfG|^dam%n0yYAj~=@hH!oTTcMlnQy7VLDFM z75zv-Z_DeTOPrSSnN?fF%PyiHwu7+P1SR*Ac5#32iwbECTa1f;`C&tWKjtS4{>bna z%GzCJrd#RtWUd5Kq%NRIlE@^G+YBzNFv`xU=Kjp8PpGjU_kBaDh8D%_dEu0HHXNyx zh$>Yg#WbH!D*FM-PDWct-U!CveZNys;62xCXU0ERMORZx#(I)M7-1LJ zBCT_L{6l1f{jIDumXts%9{$=|mmY)6{Xur-tJ{|lWY=L}CqHf%K-$DR)*45{Ghl^% zx^cnX%zm z<3xag83C)n4I1X)o@z+EN(jqxCZ2p*@|MMEK-tOBn@i(ZWbEzd_d0Us|6Z4M_44CNo=9#Z5ZH78uk1%&D%gwz539 zV;9}|)ukwJZHQk&Gld!&&|CuTs@)j&fLLk_u5RRrQ1ZuzIJ| zV<~l>+)e-#{2h?pdbINh^GcXp%HR9Vzhfgb!>_Kaaarwx{es*P!TSN?<9|m-yTiqH z^%BIVUL~&TQTyj#3L8EV7m2W%dPmPAWU^56=!c9x2(!4=w+QOQpCsh}#IwZuMLkI* zgbJ=-roa;$FY!joaJ}R|`}N#BXc9hd9+E{&aBFW0aEko1N5Wt%ef)KjrBQX>@E8z5 zO^>{iILAE22MX?+gMOS}6S6vy$x3~JC9TeExBm`QPCI*ga}THHOkRssL$F21fi>kc zPCZ&a-A|r=))K&?mvB{7Bess22wu`_q1-Xd?LZQC|@Wn&hD4a?d9IqYkIH z%nBT7k`zTJICeG~p5>_jR>0&#R)ToOW~P+9DI{vHS(SsO=TZyT>vkn)M{)wsJ78Aq-nAF4ib5vXu7M!61G-rtxy$iEuUCc)u{EzrNWpcrM~M z5&Z88clodx?sZ*NJ(;)3ewDE}hjetknC-%Y7*dNGZw{7QSmxJ_AJ+AgLf92)WkM*ehtm^clIC#1u zSyA29m$P*01t4|Yy0L7SUnPE8f=LKfm(sJ%lu|Q?bAmLH&mND&)DUswb`gsiu*IPX z3z+e#1R(BLZ>{#Nror?|5%h~5=%$}>#0LjR)xggK8_lVA^abk98#+6q||F1 z!yO#KGk{Xh4$?n0tp*8zu09p@)%CYTe6LwG;ZdkK;wKOe(z%~zM5fmF1ucVOE?2)U z5&lyas*cT3pk#gWGycqq@Mz~>v3X#rCs!e!h6O>TK!C<}2T+7$P3M#a=is)H@(|V4bEDs z$jz-+kr8X>3P0e21K&=G@(IGLJSPYZ)#wO+!e>*3(3ttr@n}bIx;5xzk3rO|a(jUp529~hVs%Cz&%PhKY)&j*l~e;K+41K;ArMS z7=&2v-LZ@dS0|~Ze~Qa)K!S}&yluX7hMk{wH4;Gl-b7_4f2tD=(TAATk zfE9i2LHDz7Mw@q$XRK92LJB+6xC#AeT1OQK+#S135$eIKN?uuy$GJS&hv@=Yiy_Qh zKZ!gj^tcm@aATiGpMAye4S}h@N$gQF->{CXAyRQIu$A`kUe7(do-we0{|oEv57oaX zo(>gsNfPR=y6XZg+R!X*PF={+&P6YDkx~84AeXdWa$BgALep1Pr0=T#J8s3o-_2DO zKmOUob{C5Po6?43Ltp?tMiNodiUY-zHe0d1GiOyp+Pom~AtqZnUi(iHR9Er>KZnZC zhm5*6E4n!** zx5{nM2$Wv+sE6KPx5f(Z(%k>(<6Hqz1aFeIOipr7YI&iBx!mbr&_Wr$Nc->p=;Qsr z?gUMr$8fgVd7f92DT@~bW$QPRHfj@eS}ZngTyCx1%IkN9vB>iy<|Te;b3mgPu0qkp z7P#*o43HdPT?4J~wmoCSf~1?o1X+A!6t|;?o4Jv_Y^Y0?^asMn7x&Vg(vDgTQbND3 z^*(PyItsEgi-cXE^vYi9(yD52v%&mbfap(3hfjJ)+a?OV%vgh7<7b#{ z!uc=92XJycIqa$0Q1(c&WK$12txsN?uQrspdYR7F>bKs(5YNM(nA0QU!wK4(<`-wM z(VLMYBaMG4e3#KMc)Uyzv3rChf-*LGK+XP?wJBEiWZwW+`dh)8{i=0-?IR#|0qg)d z@nl0#=LLqY4%F4+R6hO|{i{rS(bL+~s8{xHQVU=Y?ir}f%^gzlj9xtvC!M}!^@qUY@04l3A!bR{k@y}dGCd}yB z`s6$uqYQEa5R_Q9B;%ShrSFXk_B7^vXIqbInP z^q<|o#{UwDi+ED>s~Y%n8D>LmM+6Mt#E{^QeW}24zT`OgWYqgzZ8!$97am5@IFPc~ zVel)~mtLa1mP{Ay5U@G$l^5|iy+8!>)A^EtC|?}I?7^Ud7qou_E`!4Elzp`rIy_wR zj9)W!eSP|$5D}6b6r1Wk?myx9L#xld6XYk?yuAp zAwL_W{1!i0^NJ9VGU+y_Hsul`T4-@S+0JvjJy>JfxN;X*XZEOF_s|21M#HB(=*Qmq zLOsmaI|o5cmhD{%{Anfd9-nEF_8$dT*Dg(2+d8H2D#olSKvOS`lRN{5Bd-3x6I62h zSZiYDIA69)+NZ}g`eODm!JU+ztvgK9VY_Bi>%rGh>hZKJDR} z=QN!-W6bs|th|4NJGS{}xvf}LQM01-llUi zjWT-|Lnon{&+}h<$9k=`jAYKP^m{dO2JWh#lI>nQPxUj>jobf>^xJnZ+wIET_bOwY zfQdQ1sA<#B(^!eQ$o^KCYwCKAPJ7H3+1JEs>co@x{$0rvW6mAV-+M6zd3{A!>lLpi z*!}f?Vh=Ebg%AliELiGG9c7B9YA}nJfju65n$b9UliKNqgYLJB2EW$M=WM1> zG|uGYXsk9=Ber;T^NAC`!}lC%sT&1zsI^36`<{|xSE8Timy@3vMhukhWInEzmz4>5 zIY=7Mn&r*8ovc_^L87lky`=aZq<{G9B68~4!1L|#TpV@LQPQdEDy(0BHCjgj zeIgiZnURA2zgqA#*35fRk~DVpnU{1CrAEhk_ksvQmbz?(tOfcaIh>tw7=H#^nW%#8 zQRU5tht~i|(Rlo9=e*+Su6m?$>#$Rb4o;e*E{@)3SRo^_x0V1w$|~spEkqaru+;YK z&b~kYJ!Y*EOo;rJE}Rt8BX_eselsxQt-exce? #include @@ -115,25 +116,17 @@ void KCMGreeter::load() const QString kgreeterfontstring = kgreetersettings.value("greeter/font").toString(); QFont kgreeterfont; if (!kgreeterfont.fromString(kgreeterfontstring)) { - kgreeterfont = KGlobalSettings::generalFont(); + kgreeterfont = KGreeterDefaultFont(); } fontchooser->setFont(kgreeterfont); + const QString kgreeterstyle = kgreetersettings.value("greeter/style", KGreeterDefaultStyle()).toString(); for (int i = 0; i < stylesbox->count(); i++) { - if (stylesbox->itemData(i).toString().toLower() == KStyle::defaultStyle().toLower()) { + if (stylesbox->itemData(i).toString().toLower() == kgreeterstyle.toLower()) { stylesbox->setCurrentIndex(i); break; } } - const QString kgreeterstyle = kgreetersettings.value("greeter/style").toString(); - if (!kgreeterstyle.isEmpty()) { - for (int i = 0; i < stylesbox->count(); i++) { - if (stylesbox->itemData(i).toString().toLower() == kgreeterstyle.toLower()) { - stylesbox->setCurrentIndex(i); - break; - } - } - } colorsbox->setCurrentIndex(0); // default const QString kgreetercolor = kgreetersettings.value("greeter/colorscheme").toString(); @@ -146,10 +139,10 @@ void KCMGreeter::load() } } - const QString kgreeterbackground = kgreetersettings.value("greeter/background").toString(); + const QString kgreeterbackground = kgreetersettings.value("greeter/background", KGreeterDefaultBackground()).toString(); backgroundrequester->setUrl(KUrl(kgreeterbackground)); - const QString kgreeterrectangle = kgreetersettings.value("greeter/rectangle").toString(); + const QString kgreeterrectangle = kgreetersettings.value("greeter/rectangle", KGreeterDefaultRectangle()).toString(); rectanglerequester->setUrl(KUrl(kgreeterrectangle)); enableTest(true); diff --git a/kgreeter/kgreeter.cpp b/kgreeter/kgreeter.cpp index fd6f5dad..99fb046a 100644 --- a/kgreeter/kgreeter.cpp +++ b/kgreeter/kgreeter.cpp @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -32,6 +31,7 @@ #include #include +#include "kgreeter.h" #include "ui_kgreeter.h" #include "config-workspace.h" @@ -103,8 +103,8 @@ KGreeter::KGreeter(QWidget *parent) m_ui.setupUi(this); - m_background = QImage(kgreetersettings.value("greeter/background").toString()); - m_rectangle = QImage(kgreetersettings.value("greeter/rectangle").toString()); + m_background = QImage(kgreetersettings.value("greeter/background", KGreeterDefaultBackground()).toString()); + m_rectangle = QImage(kgreetersettings.value("greeter/rectangle", KGreeterDefaultRectangle()).toString()); m_ldmgreeter = lightdm_greeter_new(); @@ -518,7 +518,7 @@ int main(int argc, char**argv) const QString kgreeterfontstring = kgreetersettings.value("greeter/font").toString(); QFont kgreeterfont; if (!kgreeterfont.fromString(kgreeterfontstring)) { - kgreeterfont = KGlobalSettings::generalFont(); + kgreeterfont = KGreeterDefaultFont(); } app.setFont(kgreeterfont); @@ -528,12 +528,8 @@ int main(int argc, char**argv) app.addLibraryPath(path); } - const QString kgreeterstyle = kgreetersettings.value("greeter/style").toString(); - if (!kgreeterstyle.isEmpty()) { - app.setStyle(kgreeterstyle); - } else { - app.setStyle(KStyle::defaultStyle()); - } + const QString kgreeterstyle = kgreetersettings.value("greeter/style", KGreeterDefaultStyle()).toString(); + app.setStyle(kgreeterstyle); const QString kgreetercolorscheme = kgreetersettings.value("greeter/colorscheme").toString(); if (!kgreetercolorscheme.isEmpty()) { diff --git a/kgreeter/kgreeter.h b/kgreeter/kgreeter.h new file mode 100644 index 00000000..34ce40e2 --- /dev/null +++ b/kgreeter/kgreeter.h @@ -0,0 +1,47 @@ +/* This file is part of the KDE project + Copyright (C) 2022 Ivailo Monev + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2, as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef KGREETER_H +#define KGREETER_H + +#include +#include +#include +#include + +static QFont KGreeterDefaultFont() +{ + return KGlobalSettings::generalFont(); +} + +static QString KGreeterDefaultStyle() +{ + return QString::fromLatin1("Cleanlooks"); +} + +static QString KGreeterDefaultBackground() +{ + return Plasma::Theme::defaultTheme()->wallpaperPath(); +} + +static QString KGreeterDefaultRectangle() +{ + return KStandardDirs::locate("data", "kgreeter/rectangle.png"); +} + +#endif // KGREETER_H