From 7f0a96e4488d512093415efc8aa857eb62080cdc Mon Sep 17 00:00:00 2001 From: Hombre Date: Sat, 12 Mar 2016 00:09:30 +0100 Subject: [PATCH] Fix #3203 and restore the hover color for the 'Enabled' buttons --- rtdata/images/Dark/actions/expanderClosed.png | Bin 404 -> 409 bytes .../images/Dark/actions/expanderDisabled.png | Bin 444 -> 442 bytes .../images/Dark/actions/expanderEnabled.png | Bin 559 -> 572 bytes .../Dark/actions/expanderInconsistent.png | Bin 495 -> 504 bytes rtdata/images/Dark/actions/expanderOpened.png | Bin 430 -> 410 bytes .../images/Light/actions/expanderClosed.png | Bin 416 -> 408 bytes .../images/Light/actions/expanderDisabled.png | Bin 427 -> 410 bytes .../images/Light/actions/expanderEnabled.png | Bin 576 -> 561 bytes .../Light/actions/expanderInconsistent.png | Bin 480 -> 460 bytes .../images/Light/actions/expanderOpened.png | Bin 435 -> 423 bytes rtdata/themes/RawTherapee.css | 4 ++++ rtgui/guiutils.cc | 2 ++ .../source_icons/scalable/expanderClosed.file | 2 +- .../source_icons/scalable/expanderClosed.svg | 20 +++++++++--------- .../scalable/expanderDisabled.file | 2 +- .../scalable/expanderDisabled.svg | 16 +++++++------- .../scalable/expanderEnabled.file | 2 +- .../source_icons/scalable/expanderEnabled.svg | 18 ++++++++-------- .../scalable/expanderInconsistent.file | 2 +- .../scalable/expanderInconsistent.svg | 16 +++++++------- .../source_icons/scalable/expanderOpened.file | 2 +- .../source_icons/scalable/expanderOpened.svg | 20 +++++++++--------- 22 files changed, 56 insertions(+), 50 deletions(-) diff --git a/rtdata/images/Dark/actions/expanderClosed.png b/rtdata/images/Dark/actions/expanderClosed.png index 1de08957046e27288531b09704c231e5e7a33ad3..559f201db62aad28a0d64cfa574aef877631f2c3 100644 GIT binary patch delta 357 zcmV-r0h<1l1DOLMiBL{Q4GJ0x0000DNk~Le0000E0000E2nGNE03S##(UBn=3Nioy z05Snir{r^yMks$4NklSE!4?Of`8@A?&H?xr;yC8kT6T)V004@jnCy1DB>+6m zX0x|rM1DwM%u`C;Wm&e|Y&QNWA~VKJj4_v5>nKgr+tq(+<&KH+kia=Oj-#!$!WiQs z;x%LJD$nzByWN&i6b++|oO7+Uc9c@CG3Lzkyg*8MSN1i@1nhW+S`LJbr19T zy!-VzL^Lhbb^RiQxSvj^?_pG!Mks#~Nkl}@8Ys}TH-{StRn zs+$Uef{U9tWND7GS3~Y~5uuYQ?E}yH<9Sd-;1HpMCJLisfh5qg^v(Bt>+eB}h)5}=3?foWNt9AdL=r-{D2n0>0Gi0000gx~56qb7{i0*t+;l_wK#l_dV`_|CUl}sFWI>>N{uHi*v@7S;TQ{ zX|4U^A+5C^$MM0eWkO*XJ~4Cu7-Z&t5Co4V+#SL&3~Ybf&Z8(=0ss*)5itNnQM9xy z>vJ-hJRE>~r`w_^-r9!ix@*^U*KNJoY+kFXx;t1o%d)G*Vlg}S7yyu_=}c>V*(KI> zZ99(B`~?ybVgD0t?6zqdpP9ueh?xZu`2e;ZD5b205Fcrpj!uC}sd2B@dzVtyW+HaG z-3t+o=kreaJpeOVD5XXKMuWj1>n=^#)oSJCc`k(z*UbFAU-1UOS5;Nd)9JMQ6>OCx kiRXEq4*+FZ7ADZ@2S7uIFd4~aH2?qr07*qoM6N<$f-s+}tpET3 delta 392 zcmV;30eAko1H1zviBL{Q4GJ0x0000DNk~Le0000I0000E2nGNE03zBpG!Mks$dNklev}|W5Xm4yTpS#Vi$rh{rR1JNtpxFsqQ33!JwCj<#}mwq{|GWA#^dpJ6h*B+ zLzZRjYOS|^4JApkxyoHF6o%nBfX??Kt#vn!(@ zd(F%{aU6FWA!goB)AVwAR!ZG@p7*#+14sbWLqQO15Yc=v7-&&u3ZuSR>uz1AD6EHjg0000p7! diff --git a/rtdata/images/Dark/actions/expanderEnabled.png b/rtdata/images/Dark/actions/expanderEnabled.png index a3d16f51c256fb80993007d969e007439a1a29e7..33e8515af35a47237f389c3c8282f4e710f30c32 100644 GIT binary patch delta 521 zcmV+k0`~o{1iS6g~INGc!!$G6@l}&=0Uu2-psWNi>DUvT2qr zR>5!ZL&U;D-Nsf6B_J~|*-9*e&3=G|pscba2+4Eiy?NJW3C?WxR+n?`x#!#qTvAz< z?WJkDdl^sLz{zB?)9rQ_T5GIUtM+I#`ct0~b%2@4^Spn6nFTY8^ZtTC1yD*oC8Dk| z=2a9$r&?>|d463=`53@yzu!N);HZ>3Y`5Dlg%Ht}6gxtQ*J+yWR~%=vS*z7*{Qw}B z%jG>O<R zERW(iK1+X+#PBMgGzgVy?27={N*sc~JTlp0GZ51ILUv)P<%z6tv+g200000 LNkvXXu0mjf^(O6Q delta 508 zcmVpG!Mks%*Nkl5QhJ%%#e%|vSIh+S-f~r6k!h%WM-sU5O<$I z4?clU;Kdj4;L(#P=s{ToAtpV{fV(Giac{cf6G%WzW-{qcd6~!(I$8ZM4SyA1|J6;A zh`=SS^}dMwOp@f2vtdP^%k2027rWi=yXkcL3qbc@K>HSxtJkM`i zYp(!E&-z;H#{gc%as2h%M8n~5KMcb@GjBU0USj5>G)=Fc2ck}=^PGsp7;`8hrv3z5 z*WVD)j)*+n2pS9qSA!tfDa-O%k|ZZesnfD7Us!9O06-K)??vR0h<39qb3VQY0L;8c zL@0{l-FxRZM4?r%zR+2RRCT)6ZyX1BBH-wmx#y*01;`d9j&UWV{0vfAUN0n zQuXaK0IZ{e}0pQ;5T7LlGRJeH0&H=pu0000At56ov0i9twhx*MwT3bZiH!&fOYt$y7wh@5%28 zbXQ*_lnf3nlu{fVZ4rc8%v6o$z1yXV36Y-hzVmU;eHY+_gb=;aXw*IRjzz;D2+V4= z`nB0?Xt&#)cRHQ#yhkenrIZy!L?Y6pl$9b+2J}2n3&VfV%A3M4v^>wtcn?*5-`6?k zy);eVG)?<44C73S4yc0W30VetsY(1m6=4&`JGZ~<~YtYpXfNwRM+(x=lm{H z^{>YDcszav05DB+ktE4G5xttGxc~rIE|)J#shdpYe!qVvgm@_Wgkued!)_Es{E%2K zmo*}y|3H7nm`u}DKi)A$M2m-DEb vqp>Xn_ws$eWEh4801(IV(skW!-t!BClB4=N3jz%y00000NkvXXu0mjfX>`LW delta 444 zcmV;t0Ym=y1MdSNiBL{Q4GJ0x0000DNk~Le0000I0000E2nGNE03zBpG!Mks%5Nkl0@sWu3lv2k_K}3}9cDo$_ zuq>Ves4CLXHg)-Fs=;4c#Y~$W5(n02O-3X zl=5`eP^na?)oNV=*vw|LFHxXhU!+>Cn(1`@E8h$so5m&@gzFxlR6&}_Zk mZd=3QFesHu{iw^c`U1hmx6tw@D^36a002ovPDBK*LSTXzRl}hG diff --git a/rtdata/images/Dark/actions/expanderOpened.png b/rtdata/images/Dark/actions/expanderOpened.png index 176e99daec52baa150709e027dc292a791a5492e..9a7f161eecb84e6d9dae60c675be1d37501ca4f3 100644 GIT binary patch delta 358 zcmV-s0h#`;1DXRNiBL{Q4GJ0x0000DNk~Le0000E0000E2nGNE03S##(UBn=3Nioy z05Snir{r^yMks$5NklU(p@*C{2gnHoiP?xC zLfp6zaiJhHbW%+Bbh$AQ^LGHhO+h`rDtN&EhX7zYon9GZF0|HaGt4;)0EmbfV`5#` zPwUJ8Kv5Jc05^ldz-g_i@B5r{?$*vOIOpT@HuCbLZTd zwbm9zaY95(rPSk&2msdF88d$Z$V8-wNC7~MF%r?e_de|vtEyTu^E`ymh)B*kBc+sL zj30GfFSg71Q--znA%yUrQtF7PXJ%GP-2srJVpUa9L}np`mYG*w*S&b}-?pV45dcP` z(R16juT3t~G{4{WV)iYG=vG9oz4zaT#Dh#G6MZcI0cspG!Mks$PNklY5C-6PZxfS)6bktPHa2Nfqz$^(QI_DloqtWxWjK0G5 z-k(=h_0G(ss?N+*M5rvw**0Vi8Vm*nGvCG-OI0NziU8*0@%U{QsPX+$6vcItBt7r_ zArURoG`&LF1zCF$08A#65M#VpE|(u6gqwc9U;YUKfIQFVF~%qF{oSqzQ2(P11N1l0 YC(`t%hm@`<@Bjb+07*qoM6N<$f*uH-_5c6? diff --git a/rtdata/images/Light/actions/expanderClosed.png b/rtdata/images/Light/actions/expanderClosed.png index 90d1269aacac9001634bc8aef04a01ece2fa7de3..81a7d85ab1d571f5ad4d35538197bb0602ca5179 100644 GIT binary patch delta 356 zcmV-q0h|7y1DFFLiBL{Q4GJ0x0000DNk~Le0000E0000E2nGNE03S##(UBn=3Nioy z05Snir{r^yMks$3NklwpkYN(n*;F~ zlyjbyWtjnhS)9l@KXhG}V2oYQ^E^taueFXj=O^BSQbGtR zgm^Z_qRcv9;D2$MLo6y4Dzz0l>PdD!F*0QVN6+<1h>xDP=Lw^G#6{Z%bd@ zL9MlEn&vE)QhJ@|`QsA!1gB}z#+a+Bs_uRQf6fQi#fDY}>Furn0000pG!Mks$BNklJ{15Q)|38Wd43S_EWpF4-lC#-t#s@cIlrqMI&be_IhNpjNn!aqe+xz8mX?sH=f=Vfh zq9_y*G{zitU3Y1%9Z#pz2d(vEp66dXApig(VrJHe7>I~ytqA~RyrIO;uH!rfHrLab6Tf-D?^%0}-M3-dSrmbzQ#(L2#Sr`P=SyenH-QZ>{|( z%krI>@3J&3EBXR|r*&=H&W$nIVzKDMf(J&h zAzmO-7bJuj7+8@ShovoTbv+jTDS!Nbb{v5J77?XHl+M)`a|J2o;l9RV>WwkUG}PXW zvO^=RwfBg)nu3V9vew=W^ZkK{u9*4NIp^ANK*Rt5;GBPR-ut&a&o@(02q8>amM>jF zDOD?_>dseH^^AyTqgSSBdTfl@?)-)EuG=ijj{1pl97|^Qe}T-*Q4}qDP$~5V00{u# z9u5H@X|uo5THji0FXkw%b!m*b>3qLv2;tFtf0^g``D8K@(K>{%UM`nU!|}a}qBxLJ zUNiHF5aKSQ-Ro3J`Q9|mLtWS3JHcTCAw<%GpF^P252cY$3nC;pG!Mks$MNklK_#%d$P^T`CLz1}v-8OabUI2w&!MWikw5*=+ioo)e`RqbHiI=%&q zq8J0HSN-mGyJ-laBw0p5Bx$XER@IXjXg;4`7-JrPY_r*H-U2wv^Za-@K}1Zu-99H- z8w>^yF_1qj-&()lPbQPeC4fT!FC;C#Mt<_%-?8E_Wt}D>#yQtWlB6t(Vq67S*e4{b Vj#HW?c47bk002ovPDHLkV1ko>mh=0prJr<6Qzid z_yzb6A_@v11xQp-fRHF6s8Yo=SFk#rL_w8EF|u{HX1%*NG$y(`o2^Fk=FNL=mcf6X zlybM*?cSVDr$08~WK%PWqU|sYe`i?+#+d7An$GJpbklz_MBG|obXBhjT&dZ6jEFsB z%*%3L2=Rmva;B6zT2qu#9)w}|f-%-zvp~o;W9(JG-`}ecrIgo#Ab94S`(v$r!x$_6 z4Xo;SMNupWA&0}^uw7Q%ZM9mR`F#FdDHSJ4a-p?;>%BiplH@`u6$8K_rF2JY{qQm) z=lm8T!g7DP{IXhvaUAcL?KpG!Mks&1Nklfu*kX%?MHWHa z{RCQAS^5cV`~nu1R$`%rvIv4!2HdSIf?G`fjQ9yGl4ruid4FsYScaLfp7OlIk9!{X zlC>5^3d8Ua!0*v$^sO+ElT&22+wH53M&pB&at7e?ML>TnZx9h_t+yCs1Ym3J{THa) z?e4W&ttS9*zOoSFSrkRrF9Z@o9QwZhnK5=HA97vy8WEicA#QC15fKGJ@QN{JjWNes zYh|s4wN?XwG3Fg(Y@2ibVk1ZhaidnNZO`ZPmvJ1QB}tN`Y5Lk2^Be%;IR0piIR>!P zY&Hu&-&uc6bdQK2rTnsf7z_pv&j*b$eIh!lR4NAm-WE>edEO-=0udFi0{}3_+*Ms( zT1`rMs+2;#UOy@W0XP5v&iVIJkk-0Co6UatzW=z>>Dm&?;E%N`|3l9ctP{L%J$J$E{t-X@|Q$8r8@txv||@ef;e-7EbAh6uR4{Fm-1 P00000NkvXXu0mjfRYm7% diff --git a/rtdata/images/Light/actions/expanderInconsistent.png b/rtdata/images/Light/actions/expanderInconsistent.png index 9f87059dcf824178d8c05b9682b87c2a018767dd..3c2339b60f30a609661fe902954823c3e5693bf2 100644 GIT binary patch delta 408 zcmV;J0cZZ;1Iz;$J`v(t? zTiIa<4W48dVJi&0=wg!{tVOfRzT12Ge)--@9GsC5;wcD%D9`h(?wr&$qbTaM+wITw zdTq4UmsytOwujb%N~spviz=mBbsig}jIq!*mAw;hRV05&;&9HVgpdvZ7-K-leiK4S zhjTtnlEnD~rfE9XS}&!P(oU38O0D%WP1CUrQc5XXEEX>S;QRh+v)Q~CMe*kQ{t5u% zIDVy+@{^H;5Ep~N;GymjtX&^_yL( z$ruyH*xg_`YB(ImjIqg~t`>D&cc!%-_51yil}tG2x5k(o*L7#d@s)%S-gdja2XIX( zU6p%X5kfvZ&wHNF=RdXJ@ddlxE(Cx^qw#eN9P|q}DsMJ#g0px40000pG!Mks$>NklT#@hF@ z@EJr>DF{jkx$G4_KuD1UgOQuD5jm2(BtL93JM;1X%PfirDZqP!v^R+UnSh`V7JmNs#;1ZsaY8hZc$*~s;Jy|OU~5m9S> zqm-&HHu=6EMNxFV5vbX0UJ%h&k|YTt{@d|9Pn>fvB647@JzfhUqR=_l0RSkM%e~ob z_LipUgLCd%M1+~2nAsFs5)o*%TH9LdI}w3ZCyJtb0KmLE0sxrL=UYVdv+51v5t&gvJ? W@TpDFP`Gvg0000lE6Ol-qb08uSk=7WK^_m6% zt#!rB599Ip1^{{QyAVPUk&cK$2*G>r-;P5S0OWaIO{ag;I7yN;j^iYXqG&iA4wO=g znNd|$F`LbvHk(b?8-GrVqG)NY%|)bBN-+^JGoxvmmWW;#i-o_~2mrg?uANLKVCK2j zdLSZQUDtJ4mfO{8^?Y8=Nf}v|y<2NPz4uN;!r^eJopUb$pG!Mks$UNkl=%%Qg)ya=T)set_name("MyExpanderStatus"); imageEvBox->add(*statusImage); imageEvBox->set_above_child(true); imageEvBox->signal_button_release_event().connect( sigc::mem_fun(this, & MyExpander::on_enabled_change) ); @@ -645,6 +646,7 @@ MyExpander::MyExpander(bool useEnabled, Glib::ustring titleLabel) : titleEvBox = Gtk::manage(new Gtk::EventBox()); titleEvBox->set_name("MyExpanderTitle"); + titleEvBox->set_border_width(2); titleEvBox->add(*headerHBox); titleEvBox->set_above_child(false); // this is the key! By make it below the child, they will get the events first. titleEvBox->set_can_focus(false); diff --git a/tools/source_icons/scalable/expanderClosed.file b/tools/source_icons/scalable/expanderClosed.file index 039041106..46bb9877d 100644 --- a/tools/source_icons/scalable/expanderClosed.file +++ b/tools/source_icons/scalable/expanderClosed.file @@ -1 +1 @@ -expanderClosed.png,w18,actions +expanderClosed.png,w14,actions diff --git a/tools/source_icons/scalable/expanderClosed.svg b/tools/source_icons/scalable/expanderClosed.svg index ca47969f8..b9778cca4 100644 --- a/tools/source_icons/scalable/expanderClosed.svg +++ b/tools/source_icons/scalable/expanderClosed.svg @@ -10,11 +10,11 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="1300" + width="1000" height="1000" id="svg2" sodipodi:version="0.32" - inkscape:version="0.48.3.1 r9886" + inkscape:version="0.91 r13725" sodipodi:docname="expanderClosed.svg" inkscape:export-filename="/home/philippe/devel/rawtherapee/icons/NewIcons/crop22.png" inkscape:export-xdpi="2.1600001" @@ -637,13 +637,13 @@ id="stop4223-6" /> + height="1.3672854" + style="color-interpolation-filters:sRGB"> image/svg+xml - + @@ -717,12 +717,12 @@ transform="matrix(1.5074827,0,0,1.5074827,-9.4212231,-17.89429)"> + transform="matrix(0,-1.0901186,1.0901183,0,-116.40447,102.17828)"> image/svg+xml - + @@ -619,12 +619,12 @@ id="g4060" transform="matrix(1.5074827,0,0,1.5074827,-9.4212231,-17.89429)"> diff --git a/tools/source_icons/scalable/expanderEnabled.file b/tools/source_icons/scalable/expanderEnabled.file index 790e109da..0835d223a 100644 --- a/tools/source_icons/scalable/expanderEnabled.file +++ b/tools/source_icons/scalable/expanderEnabled.file @@ -1 +1 @@ -expanderEnabled.png,w18,actions +expanderEnabled.png,w14,actions diff --git a/tools/source_icons/scalable/expanderEnabled.svg b/tools/source_icons/scalable/expanderEnabled.svg index 1407ca335..4606416c0 100644 --- a/tools/source_icons/scalable/expanderEnabled.svg +++ b/tools/source_icons/scalable/expanderEnabled.svg @@ -10,11 +10,11 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="1300" + width="1000" height="1000" id="svg2" sodipodi:version="0.32" - inkscape:version="0.48.3.1 r9886" + inkscape:version="0.91 r13725" sodipodi:docname="expanderEnabled.svg" inkscape:export-filename="/home/philippe/devel/rawtherapee/icons/NewIcons/crop22.png" inkscape:export-xdpi="2.1600001" @@ -555,7 +555,7 @@ + style="color-interpolation-filters:sRGB"> + style="color-interpolation-filters:sRGB"> + style="color-interpolation-filters:sRGB"> image/svg+xml - + @@ -1222,7 +1222,7 @@ id="g4060" transform="matrix(1.5074827,0,0,1.5074827,-9.4212231,-17.89429)"> diff --git a/tools/source_icons/scalable/expanderOpened.file b/tools/source_icons/scalable/expanderOpened.file index c2175efad..f6bfd1a54 100644 --- a/tools/source_icons/scalable/expanderOpened.file +++ b/tools/source_icons/scalable/expanderOpened.file @@ -1 +1 @@ -expanderOpened.png,w18,actions +expanderOpened.png,w14,actions diff --git a/tools/source_icons/scalable/expanderOpened.svg b/tools/source_icons/scalable/expanderOpened.svg index c00fe2d85..a0092792c 100644 --- a/tools/source_icons/scalable/expanderOpened.svg +++ b/tools/source_icons/scalable/expanderOpened.svg @@ -10,11 +10,11 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="1300" + width="1000" height="1000" id="svg2" sodipodi:version="0.32" - inkscape:version="0.48.3.1 r9886" + inkscape:version="0.91 r13725" sodipodi:docname="expanderOpened.svg" inkscape:export-filename="/home/philippe/devel/rawtherapee/icons/NewIcons/crop22.png" inkscape:export-xdpi="2.1600001" @@ -637,13 +637,13 @@ id="stop4223-6" /> + height="1.3672854" + style="color-interpolation-filters:sRGB"> image/svg+xml - + @@ -727,12 +727,12 @@ transform="matrix(1.5074827,0,0,1.5074827,-9.4212231,-17.89429)"> + transform="matrix(1.0901186,0,0,1.0901184,-42.507088,11.516234)">