From 03cb0e5c363fc25f3d2acb60b51acc2369c4afa0 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Tue, 22 May 2012 18:47:55 +0200 Subject: [PATCH] layout statusbar control: Implemented design by Mirek M. Change-Id: Icaef88ba850f40e2354e896f688d11abba31fd8a --- icon-themes/galaxy/sw/res/doublepage_10x22.png | Bin 0 -> 264 bytes icon-themes/galaxy/sw/res/doublepage_11x23.png | Bin 321 -> 0 bytes icon-themes/galaxy/sw/res/doublepage_a_10x22.png | Bin 0 -> 266 bytes icon-themes/galaxy/sw/res/doublepage_a_11x23.png | Bin 321 -> 0 bytes icon-themes/galaxy/sw/res/emptypage_10x22.png | Bin 0 -> 236 bytes icon-themes/galaxy/sw/res/emptypage_11x15.png | Bin 279 -> 0 bytes icon-themes/galaxy/sw/res/emptypage_a_10x22.png | Bin 0 -> 237 bytes icon-themes/galaxy/sw/res/emptypage_a_11x15.png | Bin 277 -> 0 bytes icon-themes/galaxy/sw/res/twopages_10x22.png | Bin 0 -> 241 bytes icon-themes/galaxy/sw/res/twopages_11x25.png | Bin 303 -> 0 bytes icon-themes/galaxy/sw/res/twopages_a_10x22.png | Bin 0 -> 242 bytes icon-themes/galaxy/sw/res/twopages_a_11x25.png | Bin 303 -> 0 bytes .../hicontrast/sw/res/doublepage_11x23.png | Bin 116 -> 0 bytes .../hicontrast/sw/res/doublepage_a_11x23.png | Bin 127 -> 0 bytes icon-themes/hicontrast/sw/res/emptypage_11x15.png | Bin 99 -> 0 bytes .../hicontrast/sw/res/emptypage_a_11x15.png | Bin 111 -> 0 bytes icon-themes/hicontrast/sw/res/twopages_11x25.png | Bin 114 -> 0 bytes .../hicontrast/sw/res/twopages_a_11x25.png | Bin 124 -> 0 bytes icon-themes/human/sw/res/emptypage_11x15.png | Bin 428 -> 0 bytes icon-themes/human/sw/res/emptypage_a_11x15.png | Bin 429 -> 0 bytes icon-themes/oxygen/sw/res/emptypage_11x15.png | Bin 428 -> 0 bytes icon-themes/oxygen/sw/res/emptypage_a_11x15.png | Bin 429 -> 0 bytes sw/source/ui/utlui/utlui.src | 12 ++++++------ sw/source/ui/utlui/viewlayoutctrl.cxx | 14 ++++++++------ 24 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 icon-themes/galaxy/sw/res/doublepage_10x22.png delete mode 100644 icon-themes/galaxy/sw/res/doublepage_11x23.png create mode 100644 icon-themes/galaxy/sw/res/doublepage_a_10x22.png delete mode 100644 icon-themes/galaxy/sw/res/doublepage_a_11x23.png create mode 100644 icon-themes/galaxy/sw/res/emptypage_10x22.png delete mode 100644 icon-themes/galaxy/sw/res/emptypage_11x15.png create mode 100644 icon-themes/galaxy/sw/res/emptypage_a_10x22.png delete mode 100644 icon-themes/galaxy/sw/res/emptypage_a_11x15.png create mode 100644 icon-themes/galaxy/sw/res/twopages_10x22.png delete mode 100644 icon-themes/galaxy/sw/res/twopages_11x25.png create mode 100644 icon-themes/galaxy/sw/res/twopages_a_10x22.png delete mode 100644 icon-themes/galaxy/sw/res/twopages_a_11x25.png delete mode 100644 icon-themes/hicontrast/sw/res/doublepage_11x23.png delete mode 100644 icon-themes/hicontrast/sw/res/doublepage_a_11x23.png delete mode 100644 icon-themes/hicontrast/sw/res/emptypage_11x15.png delete mode 100644 icon-themes/hicontrast/sw/res/emptypage_a_11x15.png delete mode 100644 icon-themes/hicontrast/sw/res/twopages_11x25.png delete mode 100644 icon-themes/hicontrast/sw/res/twopages_a_11x25.png delete mode 100644 icon-themes/human/sw/res/emptypage_11x15.png delete mode 100644 icon-themes/human/sw/res/emptypage_a_11x15.png delete mode 100644 icon-themes/oxygen/sw/res/emptypage_11x15.png delete mode 100644 icon-themes/oxygen/sw/res/emptypage_a_11x15.png diff --git a/icon-themes/galaxy/sw/res/doublepage_10x22.png b/icon-themes/galaxy/sw/res/doublepage_10x22.png new file mode 100644 index 0000000000000000000000000000000000000000..bfa998b487170d34e1ecdba7f13b6bda6ed8d9a5 GIT binary patch literal 264 zcmeAS@N?(olHy`uVBq!ia0vp^VnEEr!3HEZELe9NNU;<lFz z(U|ylq9NZQ2OgI6Ksg5AjL(xx{xp4)JDMM0=j45y-|TFm70<+&fV3sqWpB5ZPRp%Q zncFC7G3hbuom_kSklSw=l?zza7OWH;Z}x4rb~n*V96$G=Im^EgK>R{($?9Ppsd&3 zJ6_21|1^Y!>)ZFuwc_-J&1aej)0lc8jAd~A4y zdWV#Cf{ulfpn{K`#*Srq00005bW%=J00Rk6O`wDPHvj+tb4f%&RCr!p$VV2#Fc1Pz zWLt9Y>AmOvHw^Re(;|NXGr*+9y;$%{A;{`geWH&A?@Y5RLm1cewHQMv9ZcfApZDY~ zW`2qGt{JK$y)3Gs>9o6k%G(XSE!uqQ9Sm+ei4A!kBsS!Fk=T&OR$@cW{{Z{|92pP! Tn9AUX00000NkvXXu0mjfZit`; diff --git a/icon-themes/galaxy/sw/res/doublepage_a_10x22.png b/icon-themes/galaxy/sw/res/doublepage_a_10x22.png new file mode 100644 index 0000000000000000000000000000000000000000..7423b4c018f61191926c63a8f0c84e954632ae33 GIT binary patch literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^VnEEr!3HEZELe9NNU;<i^t8A0szdiItc*Bi->f4uI)7!e;uw@r> z!PF^dU4wouJD!jeziDA@u8hF`N9li>rR9&`-c@w1{v!*YgiE&m6M=6)Coy=s`njxg HN@xNAAn#zx literal 0 HcmV?d00001 diff --git a/icon-themes/galaxy/sw/res/doublepage_a_11x23.png b/icon-themes/galaxy/sw/res/doublepage_a_11x23.png deleted file mode 100644 index 52584d4de54c4dd8ef238efd4310160c9c7141c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 321 zcmV-H0lxl;P)|l+xw7<}}%}{Qdr=zv{Zq@9gsX#MSYt!t2!F^|8n8;p+GhMtI`t_!LZl7*mQPWT6sBd=^iI z99onbR*oWLpdetK^_Ikv00005bW%=J00Rk6O`wDPHvj+tb4f%&RCr!p$VV2#Fc1Pz zWLt9Y>AmOvHw^Re(;|NXGr*+9y;$%{A;{`geWH&A?@Y5RLm1cewHQMv9ZcfApZDY~ zW`2qGt{JK$y)3Gs>9o6k%G(XSE!uqQ9Sm+ei4A!kBsS!Fk=T&OR$@cW{{Z{|92pP! Tn9AUX00000NkvXXu0mjfY3i`-TaTevj2+2398sG6Xz{>}}l|D*F~tJutlTs0*> zVS35VW`;?37=mUp8*g9=HnDD5_0`qy0mHNv`EOLq-u!ga$;=jgv2Bs4{m16(kGIx2 acJdsV@Ak81&D{Tc9q)=3NgfByOd1utH+_5Yv0|G+d*-WR9lrvADAZ#{m6 zf~PK6^Z)MCcVIks<<|c|Wz1ML*LBbMf9J_-6x=gw*?*8Y3{|jq7aXY)PuIvBv zw;yq0kUY)+%c*Gn|MufooERjJQ*%a1!~f6Ue&EC)d7PS43Tpm;|M?py2Fc^poS0kj dpAbe?4*;osK0=UVQ|tf$002ovPDHLkV1g~6j6DDV diff --git a/icon-themes/galaxy/sw/res/emptypage_a_10x22.png b/icon-themes/galaxy/sw/res/emptypage_a_10x22.png new file mode 100644 index 0000000000000000000000000000000000000000..ac011b843df8f2322a17ff964f3964068d4dff1f GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^VnEEr!3HEZELe9NNU;<;na8m5OrzwD2F+QrPFH^^sTVMKUornCWc{s1dD@n3TqV&LyXOBm`1)hi c{sk^<^2gkN_~uFVdQ&MBb@09ch%oB#j- literal 0 HcmV?d00001 diff --git a/icon-themes/galaxy/sw/res/emptypage_a_11x15.png b/icon-themes/galaxy/sw/res/emptypage_a_11x15.png deleted file mode 100644 index 4f63bed1c12d297f38831dc8b7c071d6a279fec0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277 zcmV+w0qXvVP)hG$1@AcX=Ktp7&;M^c{P@3Qa3^kOO9XfQKXUaW zP7IRA8DL`mt^cn)_=*#Q&b$R diff --git a/icon-themes/galaxy/sw/res/twopages_10x22.png b/icon-themes/galaxy/sw/res/twopages_10x22.png new file mode 100644 index 0000000000000000000000000000000000000000..9c9526819b36ec31e78f4bd281e550c8ce764ae9 GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^VnEEr!3HEZELe9NNU;<kyM?VCJ#h6=-(Gas+< zotd=l!ilF7jwHT2WO>DbzsDi`l&Sp7>lZ{L8Wv8;4rZRXb@PrD8<%LRD;!f@zsPO> i$CbAqU;Wdx+@@c}Q*g!JRT4m(89ZJ6T-G@yGywovidd`w literal 0 HcmV?d00001 diff --git a/icon-themes/galaxy/sw/res/twopages_11x25.png b/icon-themes/galaxy/sw/res/twopages_11x25.png deleted file mode 100644 index 99426dfa329508a583d755ce5715105c4ac1e80d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 303 zcmV+~0nq-5P)P000XJ0{{R3y(!kg0001ZP)t-s|Ns90 z000000D_R6g_59tiF;cKgLQ(A zm7uJQnx@;~=X!^f2>+?+00005bW%=J00{$6O~R>}g#Z8mVM#91p$})mS#z;Whq&PVGe0Yj%EpYqTWh<_7W07=8y93y*rq@yk{%( z<|Vo&MV2asGj~MUjif%3t|GoM2TOnbta>~Lj`!4{s z>^Sr0$kmS<4?mU+?mTnj&Fr&=+zGaw~8wdzD9Oz-F5E0WI(f2SYJrv8sF+= zn~y)2iJIc1J@p#UR@RarzhDMVW`Ey9D`&O>1rj}7978H@`JN2rJK(^>eDTt>nKK{$ zGtbdl?RD?^iEAF8G=+l2LKr(Q-w-nM2KbFX!ihX{lIA_Ve z+vgq}dTjcjlc}6BT%<*~Wzm6i2gF!E_jg|tXOj@%ZE?L*0`jz{tDnm{r-UW|T9$`5 diff --git a/icon-themes/hicontrast/sw/res/doublepage_11x23.png b/icon-themes/hicontrast/sw/res/doublepage_11x23.png deleted file mode 100644 index f3a4954fb51cc640d435ee364d24ae1df4ebc340..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^;y}#J!2%@h%jv*CscTXAeF&J<-1-`GJ z_pPQR;m5@*JGi@Nh%d@DNMQY6WOz{b`?)(m3zmO)9cp1aGy6f*k>fXPowwLoJA?=B Q1RBHO>FVdQ&MBb@0NM^IWdHyG diff --git a/icon-themes/hicontrast/sw/res/doublepage_a_11x23.png b/icon-themes/hicontrast/sw/res/doublepage_a_11x23.png deleted file mode 100644 index c4816f86b2fe51f560b1ba410a5751abf44a83bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^;y}#J!3HF!*oip+DK}3S$B>G+x91f37!-J%1N-jH z77y{At;WsP_+x{@y$BUu-sVY@9~Qp~`>LyV;)Bffm_pM7p+^~+x!*BbP0l+XkKmHR4z diff --git a/icon-themes/hicontrast/sw/res/emptypage_11x15.png b/icon-themes/hicontrast/sw/res/emptypage_11x15.png deleted file mode 100644 index 6ef313ce7252a7859a4cc000e248bea8da684b22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^{6Ngj!2%??{N%3#DJ@SI$B>G+u(QqG<(jv*CsZ+i{77!-Jp{QC0G z#xKmp@sXNEOPt~ahAt`TJ?0VfJ0w@Uwvk_{Ya=>S;GW?ob>WAxZVV6iiu{}?eC)M} YvPHl-m3c?60gYquboFyt=akR{0AD01F#rGn diff --git a/icon-themes/human/sw/res/emptypage_11x15.png b/icon-themes/human/sw/res/emptypage_11x15.png deleted file mode 100644 index ead9edfb23d90a3e0350bbe90d09474e8c0d61f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 428 zcmV;d0aN~oP)v=LbjAb=P^nqjzg(t`h=zy3hMi`Q)Z|L5;NFb$OVMOF_GKrF}x z{r&rw;rY8yD29Lf@}1$~iw_J|mX-{^jvU{_$jHb7)c6-92M|Cgn*aRy&A`OSh@$!X zuU`xcm#sn;Vgm_-7yto;ruh#8Gcyy4=16}xhPQ9uGW_`Qong_c%_wpJ0feF%7$^)Z zOsJZF1HHn@&BwsX&c(pW3bK^p7fcQyfG})kVL{al;Hz|X1=*l~ zfB!NZx%vsk@GoD!Gdz6pfuT0SlA&ht@lA}3j4VKne?f8p0feUcHv=m(BZ}sqzkV?| zR;)r6VgusuAO=7Hp=tiZz|P8qqPafSjp6v=LbjAb=P^nqjzg(t`h=zy3hMi`Q)Z|L5;NFb$OVMOF_GKrF}x z{r&rw;rY8yD29Lf@}1$~iw_J|mX-{^jvU{_$jHb7)c6-92M|Cgn*aRy&A`OSh@$!X zuU`xcm#sn;Vgm_-7yto;ruh#8Gcyy4=16}xhPQ9uGW_`Qong_c%_wpJ0feF%7$^)Z zOsJZF1HHn@&BwsX&c(pW3bK^p7fcQyfG})kVL{al;Hz|X1=*l~ zfB!NZx%vsk@GoD!Gdz6pfuT0SlA&ht@lA}3j4VKne?f8p0feUcHv=m(BZ}sqzkV?| zR;)r6VgusuAO=7Hp=tiZz|P8qqPafSjp6mnState; const bool bAutomatic = 1 == mpImpl->mnState; const bool bBookMode = 2 == mpImpl->mnState; const long nXOffset = (aRect.GetWidth() - nImageWidthSum)/2; - const long nYOffset = (aRect.GetHeight() - nImageHeight)/2; + const long nYOffset = (aControlRect.GetHeight() - nImageHeight)/2; aRect.Left() = aRect.Left() + nXOffset; aRect.Top() = aRect.Top() + nYOffset;