From 09415d6aba2e181c49863393a047d0947c969d21 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Sun, 12 Aug 2018 07:48:51 -0600 Subject: [PATCH] olaf updates neophyte theme, keypad numlock tweaks --- cinelerra-5.1/guicast/bctextbox.C | 20 +- cinelerra-5.1/guicast/bcwindowbase.C | 20 +- .../theme_neophyte/data/checkbox_checked.png | Bin 831 -> 809 bytes .../data/checkbox_checkedhi.png | Bin 984 -> 967 bytes .../theme_neophyte/data/checkbox_dn.png | Bin 606 -> 654 bytes .../theme_neophyte/data/checkbox_hi.png | Bin 420 -> 489 bytes .../theme_neophyte/data/checkbox_up.png | Bin 192 -> 249 bytes .../theme_neophyte/data/file_size_capb_dn.png | Bin 0 -> 871 bytes .../theme_neophyte/data/file_size_capb_hi.png | Bin 0 -> 894 bytes .../theme_neophyte/data/file_size_capb_up.png | Bin 0 -> 893 bytes .../theme_neophyte/data/file_size_lwrb_dn.png | Bin 0 -> 747 bytes .../theme_neophyte/data/file_size_lwrb_hi.png | Bin 0 -> 791 bytes .../theme_neophyte/data/file_size_lwrb_up.png | Bin 0 -> 801 bytes .../theme_neophyte/data/file_size_semi_dn.png | Bin 0 -> 673 bytes .../theme_neophyte/data/file_size_semi_hi.png | Bin 0 -> 704 bytes .../theme_neophyte/data/file_size_semi_up.png | Bin 0 -> 737 bytes .../theme_neophyte/data/file_size_zero_dn.png | Bin 0 -> 934 bytes .../theme_neophyte/data/file_size_zero_hi.png | Bin 0 -> 987 bytes .../theme_neophyte/data/file_size_zero_up.png | Bin 0 -> 992 bytes .../theme_neophyte/data/hscroll_handle_bg.png | Bin 336 -> 361 bytes .../theme_neophyte/data/hscroll_handle_dn.png | Bin 596 -> 643 bytes .../theme_neophyte/data/hscroll_handle_hi.png | Bin 450 -> 471 bytes .../theme_neophyte/data/hscroll_handle_up.png | Bin 520 -> 549 bytes .../theme_neophyte/data/vscroll_handle_bg.png | Bin 307 -> 321 bytes .../theme_neophyte/data/vscroll_handle_dn.png | Bin 609 -> 722 bytes .../theme_neophyte/data/vscroll_handle_hi.png | Bin 542 -> 635 bytes .../theme_neophyte/data/vscroll_handle_up.png | Bin 459 -> 567 bytes .../plugins/theme_neophyte/neophyte.C | 225 +++++++++++------- 28 files changed, 167 insertions(+), 98 deletions(-) create mode 100644 cinelerra-5.1/plugins/theme_neophyte/data/file_size_capb_dn.png create mode 100644 cinelerra-5.1/plugins/theme_neophyte/data/file_size_capb_hi.png create mode 100644 cinelerra-5.1/plugins/theme_neophyte/data/file_size_capb_up.png create mode 100644 cinelerra-5.1/plugins/theme_neophyte/data/file_size_lwrb_dn.png create mode 100644 cinelerra-5.1/plugins/theme_neophyte/data/file_size_lwrb_hi.png create mode 100644 cinelerra-5.1/plugins/theme_neophyte/data/file_size_lwrb_up.png create mode 100644 cinelerra-5.1/plugins/theme_neophyte/data/file_size_semi_dn.png create mode 100644 cinelerra-5.1/plugins/theme_neophyte/data/file_size_semi_hi.png create mode 100644 cinelerra-5.1/plugins/theme_neophyte/data/file_size_semi_up.png create mode 100644 cinelerra-5.1/plugins/theme_neophyte/data/file_size_zero_dn.png create mode 100644 cinelerra-5.1/plugins/theme_neophyte/data/file_size_zero_hi.png create mode 100644 cinelerra-5.1/plugins/theme_neophyte/data/file_size_zero_up.png diff --git a/cinelerra-5.1/guicast/bctextbox.C b/cinelerra-5.1/guicast/bctextbox.C index da7afa0f..57a8c5dd 100644 --- a/cinelerra-5.1/guicast/bctextbox.C +++ b/cinelerra-5.1/guicast/bctextbox.C @@ -1128,9 +1128,19 @@ int BC_TextBox::repeat_event(int64_t duration) void BC_TextBox::default_keypress(int &dispatch_event, int &result) { int key = top_level->get_keypress(), len; - if( (key == RETURN) || ( key >= 32 && key <= 255 ) ) { + if( (key == RETURN) || ( key >= 32 && key <= 255 ) || + (key >= KP1 && key <= KP9) || key == KPINS ) { wchar_t *wkeys = top_level->get_wkeystring(&len); - if( key == RETURN ) { wkeys[0] = '\n'; wkeys[1] = 0; len = 1; } + switch( key ) { + case RETURN: key = '\n'; goto kpchr; + case KPINS: key = '0'; goto kpchr; + case KP1: case KP2: case KP3: case KP4: case KP5: + case KP6: case KP7: case KP8: case KP9: + key = key - KP1 + '1'; + kpchr: + wkeys[0] = key; wkeys[1] = 0; len = 1; + break; + } insert_text(wkeys, len); find_ibeam(1); draw(1); @@ -1185,6 +1195,10 @@ int BC_TextBox::keypress_event() result = 1; wlen = 0; break; } + case KPINS: last_keypress = KP1-'1'+'0'; // fall thru + case KP1: case KP2: case KP3: case KP4: case KP5: + case KP6: case KP7: case KP8: case KP9: + last_keypress = last_keypress-KP1 + '1'; case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': @@ -1618,7 +1632,7 @@ int BC_TextBox::keypress_event() default: { if( ctrl_down() ) { - switch( get_keypress() ) { + switch( last_keypress ) { case 'c': case 'C': { result = copy(0); break; } diff --git a/cinelerra-5.1/guicast/bcwindowbase.C b/cinelerra-5.1/guicast/bcwindowbase.C index c380792e..d7440bde 100644 --- a/cinelerra-5.1/guicast/bcwindowbase.C +++ b/cinelerra-5.1/guicast/bcwindowbase.C @@ -1233,25 +1233,25 @@ locking_message = event->xclient.message_type; case XK_KP_Subtract: key_pressed = KPMINUS; break; case XK_KP_Multiply: key_pressed = KPSTAR; break; case XK_KP_Divide: key_pressed = KPSLASH; break; - case XK_KP_1: key_pressed = '1'; break; + case XK_KP_1: case XK_KP_End: key_pressed = KP1; break; - case XK_KP_2: key_pressed = '2'; break; + case XK_KP_2: case XK_KP_Down: key_pressed = KP2; break; - case XK_KP_3: key_pressed = '3'; break; + case XK_KP_3: case XK_KP_Page_Down: key_pressed = KP3; break; - case XK_KP_4: key_pressed = '4'; break; + case XK_KP_4: case XK_KP_Left: key_pressed = KP4; break; - case XK_KP_5: key_pressed = '5'; break; + case XK_KP_5: case XK_KP_Begin: key_pressed = KP5; break; - case XK_KP_6: key_pressed = '6'; break; + case XK_KP_6: case XK_KP_Right: key_pressed = KP6; break; - case XK_KP_7: key_pressed = '7'; break; + case XK_KP_7: case XK_KP_Home: key_pressed = KP7; break; - case XK_KP_8: key_pressed = '8'; break; + case XK_KP_8: case XK_KP_Up: key_pressed = KP8; break; - case XK_KP_9: key_pressed = '9'; break; + case XK_KP_9: case XK_KP_Page_Up: key_pressed = KP9; break; - case XK_KP_0: key_pressed = '0'; break; + case XK_KP_0: case XK_KP_Insert: key_pressed = KPINS; break; case XK_KP_Decimal: case XK_KP_Delete: key_pressed = KPDEL; break; diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_checked.png b/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_checked.png index 160035f64012a182a673fba349829de64066df8a..1d1d0a9fbe60c1ac486eb1c376043629393e6064 100644 GIT binary patch delta 652 zcmV;70(1Sp2B`*+sefxpL_t(IjkVOvPZLoTz~SG$^Ju3JiWZ4gKq5wiE-)@IaY5qR zKb)0rFk%8U5>!kDW+-i$$G!Ks7zG4NQ1C2faTZ_hoR^xKniBp)_yCKGi#Lj{udkP| zbM9J@0P0-s+Hf2d#8tz5Tt%PZuLU1QhGbe$b&p+}(MiJV!+(QFNbYI8P6Y}}-pTnQ z8F!Q56c#xhjH8A_Tc{uFvFIogk~xp?VG}7V0_bLlnJw7yGw7asaTY={t-w>TZHdzJ zErH{zBc88Nebz>dDU%{75g0lq`kMG`Dbgy$Gn#OriK_aO z0dWG>VfQjB+c}L`aFk`$09G8R^0$>LKT0d=ukLfO5O5qgk|z<3H;>SvkMa~~g;HSl zQ}o7w=68#8?xd_fK&xlTj#7?Bmdeu>Dl9vThT6(3gMW!0jg>i+6T~^hm31`-8L}4B z+BKY?tCJcBLzvvOB!wefYU2kQF%A`KYRerk7H2GC1u+&Arxb5{Ozspoxp;1VpJNBD zZc1PF;dvYXcJwnZNTJHTb%O2ZWUF79=%%^c8?eZifC&9$5%tI1d~CumVn5W m(W}A#7(Rgcb){}FegJ0KSvUt{;uQb@002ovP6b4+LSTZGi2p^?J?~Wt;w~cvU51Jun$Z=$TG{fFBc$7xE*COe? z7Lq0G+klm=Kz~;01X`pcHHnHlqNYxr**hBe^>ZP7$YM z50~iNR!Uc2?l_5b))Mk(w~#bJ5(kL`r-WWXz7x25U;372ZUh>A!5Fs)O@@OJ`l$hu?UzCgimAQ zs~(GcOq@)u8q92S%>_gLOB&Z@u<1rcCz+vw;g z^pQgwGk=&@MC-bSB2c~DW$AsaTlRDA+09$n4(z8r8V}ltbC?L`Bju|ui<<%B+0b*r z>Y=sm`FwRqa=i&=ly3$sYn&kXKH5I7rhK`)eh=)?f?J)07*qo IM6N<$g2BK%T>t<8 diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_checkedhi.png b/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_checkedhi.png index 9a7bb0b719ce0d443de594798c831dbffe6d3976..626c7355c37f4606bdd3c1ff81ac2c04c4501c06 100644 GIT binary patch delta 750 zcmVOdJ~=uQ1p%`@QqgT{(;mEZAa&lRC_y zr}gWenyOOudR_P*!T`+A&;O_B^73*HJLe7s383CtJ2V`YQh&l?#wTGB{T6>HxLL}G zjtOeaqhVvFqF^*wdp@<<@2JjvL!o*KfVjCqbL}@aHh(2Lq4A~)kXn+dgnuOFc;vr< zMcx!fyW-Fms!THT{bh=^>7m0)M`vm44$bm?f)gOAMF2e>kWHsNH!-ZfbK^LG=$Jwo z#mVD8zJ~&Aw|^e9^zs(wbOFh-d{G1?0$s;MOA`Wm5AFqySEnGD9VeKp@uYQ|cK6wE zPCI|IxV3JdOTb^ZT=(=nl5> z6m>Uw@ZuNDS7WHapo|B`15aaL#T3>PDxtjodJSO3fq%+NMXCIuw8EV8xxaRuo#qOE zG=3(yIDrlf%2S{fN`Z?6z0zU)rNucn3|F@-m6ZX>;}(+GyyAD?dS4nI?%cq9TS7Sj z=Mb0Y)kc=_aGHrm_8J|6opbnIOYP}^_|FjA&A>V&bD$tNKL(k_4N_cek<4P7F{MVG zGm}3Ip?`bua2-3St`3OHf}Kn8YP+4}1W8riw@$F_6o0kK*YlTIzqhb&AMD#8g{1~b z`7|!*ql-S0Ih4*1v9ZNGEpuV+3jOWpG?wllqr$kDU~!W^M_@KVc^;w^k~#Exi3?}0 z(hoOzbo&}MOWs2dh5;9C!(xZjKZ=vbuY%Li`g ze^$XiTP0cRQCx1JV|(DHq)$07*qoM6N<$f{-+Fga7~l delta 767 zcmVnp8wys@$2T_(J_xtX{CBJxg9tba3n>&)GIXZWBLF$@gr zMeG=~8Ns}YfZ&sb@fr4Jsk*t|!fvI>AX?l5jWW@rBq z<28-5>>(yYR-wfyjZrbr7{FRP!-fkfp=W7Eb=Ec>Qmn4ez09v&BQ|@SER-oUKunfD z5O7vuPePQV=YKOkDP|ni!MVD?D149We?tNG2T$0Ve2;U(N0KQjAVStPtc*PdnMF_G zVPF_Egu=Bl&Q+grt<8(pw{z&h=s7Qrzr(##L=~KTxem(JWcxAIo@OD`06E-UN*Fga zZnFehp|nOXyX+T#WxM+W0Efq0JU{vx|85!Oy#^f(j(@^*L&}|u%0$n;-UV1X(F}$u zwwmD-3!ng{aMxXSTR)MsPw8b(@gLL>V^G>6N`V5~w*)&eOJj}jrU*2E7ek|?(JxO) zUxgs~zKIpw8y>G}zu?{t5Mv;U}{3-0mVD z)jy;2>bYd?x&t;d&`2$a$dvtCYIb!&F54zW`vQ#&P;<`riNm002ovPDHLkV1iG4baem# diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_dn.png index e59a99e48649d4b790ff8d4d8f94e4ba1e25fae0..3577008c7d1df79342101486f87d919d501b36de 100644 GIT binary patch delta 451 zcmV;!0X+WR1daue)qkW(L_t(IjjfeGOT$1I#-BG{Qf$){^nwmj=^z#T45EXmo77GG zv-mw6T>3p!=qANY=pf=(uoN6@(ZR(+V^V1na}FgXZLg_lp6TFtfA4$GJ(m#YJOI!| zvPv@mUBfUkzV9bOWQ@VGEQbMr@B8TWdWnDs4FG_MKtzcELw}Bv2u&h3+9@hc6*$@J zqO|#i)#d&jG+GQd_p`XZOT+ahpOQG|wyx_L*L87BW!IKs~y{I_7n8W+W z%yhDt3PKXFv9M>s1l#KP-M4QJ&Ac)r|YGELJq3?mZ+!PutC z1P-@9vAOXZ)qiwJL_t(Ijn&mpO9DX{2Jq({*HpTw6&VU@WWnOG0!!#tK|uw5 z2oK)+8U^0^5_ag2(6Nvbx{4@)9gO~%g&P#oWaMU@hhaQ;AF7Iz&=4EFH0B4LD zurQo+2QkKscsxF3C7jJ>O$`8q5LUVXfXTr^2+Lt1#ORLg8h^*(<~z1mYY6+A0Dz~r zXF#vGR2VTs%O`Ii)hy+@Hp6kH|^k4(~u_{i^SMX7n&zT3kMrjb$Dm3HWuw=cl}ceONSTseJjI@3oYsJ zhYn9Q0wk@MZhuAj)u{}ZU!3ZDe0A?phBG;jI(%_EgHpvc7A;j=NZ)wXVZ#KHsnAHg zRB<7h3c+j-)&l?$kr9nXrN56|6FA=b!d|S7CI1fq;PKgsOwNt;jTh|>Nk5v;=S?Ca xL)Udn&*MU&@E_0PNx=kw6OpBtsSv{P3%ag21G4KOa0~zd002ovPDHLkV1ledxxoMc diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_hi.png index 500fea8047cda948c30a4472f17d907666780748..60fee0903df1faa388e42c804497dfa8a8d173bb 100644 GIT binary patch delta 388 zcmV-~0ek+W1L*^hZhvM;L_t(Ijn&n`YQjJe2H=0wgqjdAsSBl4V%r>=L+=HlN>6>A z_7!}AzKj=d)l(lJ1*xExwuE9pg_xp=yFC;|aif98LkISnZum(?G;N03Jkl7e1GX0hxsA^U^@Q5xc`h% zw*@v&zVk#_(M(v?2dJjCwyzd!s0ACw#SPw?kBGvdxTrFP4m4&dd$GQAzYFIUj!aMr&JLa4T^M$Pl zhwrK3@6l)a9)0_rR%&?AX{Lw0mj)(&ZznqOd+^*wdN_`zaO*V$gKi=k47zaZHO%9g z5GIt;nXc=?u}LHuCs%hkzPyEADE)$dA78Ie@Z1JCi^YcqK}0B}GfmSnoyTDq{>OQ| iPgsfLIMdG*fbs)Qjx?|yce8E)0000Mz)+%Th;D#EHnyS2j4Mq|N*R)}F!5iWnS67SNzNevBq3yp9HW#vAcT-5W2~Gf z%sG#ZJi%oC9$d_PwNL_O4(iP-RH~-{faraU*{F}{um`zb?SBrJts2^Q4=`(Izv>ok z!J;kDi);9vi}+)n-qfZ})6is0`yB1tdl-e1K1`XDi6(K%ZuH@Lv$GZbj@?MVn+jJB zkF{a5dZG{S5~ZX*94%h8;b`%u56?!A+OT-;>%-Gw51|OQqM-;d8Fckwxn9Bd+)O+a z0esJelAo#PnK)yU7)2aiIpU3-$3HG#1zW{&#WnV;v RJDLCh002ovPDHLkV1o9@oE-oF diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/checkbox_up.png index 9e1621eb5abb295d0ec214800bff8a826f4e0e4f..9b003a3bd67588ce90c81aa4da7fb47cdcb385e1 100644 GIT binary patch delta 147 zcmV;E0Brxj0r>%tZhv-3L_t(IjqTO33cw%?1klsO#o59C|2kI(C&6@Rp>{t7p*LoD z93c>wQZg)v0zl3gAp{E8dq*kdhE)|YMhe_o1MoC9GmJ4Pu$i3<&jVHtUBwUYftQ^d z3wF+ZVb&_V_iNzu8t*wb5uv>%5qaTSD+Qf%0Sa1>^6_M={0sm9002ovPDHLkV1o0< BJeB|e delta 89 zcmV-f0H*)>0l)!}Zc;r-L_t(IjqTO34FDhr1<^y8g#A}y6B2E$4R-$qcHhf(5^2e46P2;!g`Py89%`00000NkvXXu0mjfjMpUO diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/file_size_capb_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_capb_dn.png new file mode 100644 index 0000000000000000000000000000000000000000..abcf3abcc186925f28406dff21abca3ad9b183c9 GIT binary patch literal 871 zcmV-t1DO1YP)P000>X1^@s6#OZ}&00004b3#c}2nYxW zd6e%LL3xR}MM9}DrGue!D=CXSj&NS+rGcjl%960Q6 zul239_FiiX(=;Vp3=Ke06r|jIEg=NiY&Iui3vD*+z&GD>5onN0O9-)ssH&>u*~lQO zs^aq*sHzG;JRav~Xp#B31s**f;^nK+k|M%1O{rzjj5@b{CZ6wK=+j{g2CNbR*F5r zmV6M!M3lmEt^YEaG{yLEBtrMq8vuAbI*pCn9eseynb?sy@uAQnQc8pnSe8}P-bUHC zYuC;l2q6fC7MYuycironiH$AKiWDwTG%*BqGw-0rn)n@BaTr*MCzc;*)Hw=S=tq17rYy;rQ(6DPzjv|VpplP}Be*M~IEGq?ou4~lP z1oESQbZngdI}gfhMxW0h8jYbS3f0xs`O%)VES8qSeEjs8;o+x@j*XXmx`k<)((m_| xtbaL>QWA^B{?GH9?~|>-nm&m}qgx_k;}1cu(dw1oazOw9002ovPDHLkV1mkAg9`uv literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/file_size_capb_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_capb_hi.png new file mode 100644 index 0000000000000000000000000000000000000000..17be052c5cdc7bd08859d964afca99bceb63533e GIT binary patch literal 894 zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%1|*NXY)uAIEX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(jXlrt`Q}{`DrEPiAAXl<>lpinR(g8$%zH2dih1^v)|cB0TpqB6gifb zWaJky_~#_1DFv-d1q#c6gk4gLlZ!G7N;32F7>o=IEp!bmbPWxx6!KC__131Gc?47^ z0aE8&l$r=qq!5ysn~J1TBYg5r1_q`Xo-U3d9-Vuq`Fex|iX5-c-#4qIjiq#h4(DPq zMHN3yQI%Ovf?Ie`wYp}?A4yOZ+@>MCC@N&O*~MkIT3LcU#Wc4F6lE>CyW;8`vt`;tJZ*E*OZKvyaJ)FD|St~cCB{KOS?uD&neTUWxU>`Biwmx z#=L(=Z`@$Nw?|fSs#m)6h2l&BMHZ(QwiA3*3U_)jag{xjlF=0{#T_Plnwr;5<6J8#Phcm1|_o2zSL`u51{wdpl~E>H5( zaqIZ#x%A7g8MVg7oA2!X?!cUXdzY%VTWGO^Sf6(_k7J~rV!#xZiy1r&u7O3zp4jRo zPxyJ3!7O*pvBxW2LPMG4?bCl2i{0Z1^nKjA^Y+_Aw*&mIuk>S(v#UCD#LdG8IEseqh8Qc8n``37z zLB{5SU+&vy^%;rHlVa=?SsEQCeEH)W5Waoy4_%&_@0DlzByEk_=y7S$j6+d77*5Q) z+Z(mrxAyP1?*iSf)+cp3F27u|cWo=T?Q;f>Ry9tx{ZHCwoGys(#jzU{@DvfaI( zJ{9GdX)`?hz_0i1Tjo|rVEA_4O-wH{<8ug|%D&oka)_r&huh*7r^!7%`<@>?eZ4#H zMe5WUigo`5>i!2@d*-C8&T_Kpf_2qVHP0$N-c9$P>q{wc|FHkJ`yaz(QKgVf`@OQj Pbj;xC>gTe~DWM4fUzUK^ literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/file_size_capb_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_capb_up.png new file mode 100644 index 0000000000000000000000000000000000000000..19a00611560aac6f0d026e04618b63d151f9a0e0 GIT binary patch literal 893 zcmV-@1A_dCP)P000>X1^@s6#OZ}&00004b3#c}2nYxW zd% zBEnAnAS|J53nGJxvZ6y!U_X?okkBY7FuIu5NixtSba!1>_Q%-nbZ~du)|uT!*1qt< z%=^su`M%$0-uIc2yk4)#IztAit*u2>)ru!K41>A3xfKybQP6e0;v$QSi$KPSX_}57Y(rdeFX<^RKH~>f_63hof%+3UO{pKwnKaG_ql0T6}EEdP@t_EOc zHb5*E2SC%D)YsL~)VK+suZ8;$9`X3e)1r=Sout!gmY08{C^G&leN0Y%&&51$Hz&J} z;`6nzf8SnS48F`Q!peywUu5-2-YcjoSdIszP&flO?}oxeDhBtBuNB=A*QE)TJlTouEK}2ab4d)YwI?Sbar4E2A3{hBaukj z^2!$R_jZ#?rIBTU)9C~t5ctK3u2W1+{V2LP$h`RMMB&IH7K;;&E)fn#2!+A`G&Iz6 z)!)O;9c`A}e12I@PM_^ze0(BzUsY8_d;2bqA3IFXg)^M%zR2+KNNFclThJ~RkH;Ap z807A~hX5Qpc%UdhcTS4gwTpiq`vO2?V*_q?wQUYLKZzae${Af+%3Vtt$5tpy#Oj;? zY;S7?ARJy`K65zpAxYA|B34O+kS(2Pn#P{p?R0i_0PyVj5UEsZ6+hd#ZQF{&;XsxJ z0RG z^oo(u_qGCACz99eHFaIbFbvz3tQD%N5{*Xx4nJ z@ErkR#;MwT(jXlrt`Q}{`DrEPiAAXl<>lpinR(g8$%zH2dih1^v)|cB0TpqB6gifb zWaJky_~#_1DFv-d1q#c6gk4gLlZ!G7N;32F7>o=IEp!bmbPWxx6!KC__131Gc?47^ z0aE8&l$r=qq!5ysn~J1TBYg5r1_mZpPZ!4!kIubQ&u3pwkT`Dd8NAD2w&iTaxqW|` zH}~b*a#RV3*u2sDA*`PBz*V11F2!2Zmd7Q)(UtY6tW3^y%hfrH>Kn{&yDoh5j4#jV zc1YCZZ65=IjeIWOkgt2#YVJSp`Ojy+_q_k?5)gWI(cuXUE`dij-8!$z!8FxtsaKNl zR_Sl;+wC`VyR0}>6n(s3_UY$a?(=N+#a~~3vB^IDk%`5`^Z(bpy?gKf~d)L^|mzwqfN)ot7BKWJ`sQ&2E6wLCcUvij}CDt2Z~iL+w%mNiek z`kkStfBu8Cq_&kOx%bS8U-D*$$~rG8)5!`PDngsr?E4+CSzmv@>f}gup__*vJZMPY zv%VgNiOH%xDcDXTGp`mLFEZ)4*@ML`SF|bd@&PB)U$bo;gEl!I2 z@^U8ltox9ZH!o>pg!#_Y$QQffR0BnpE@gb-I_dP&f1lrP7rs&W;bzV@WfikJ=C2bc WY4nJ z@ErkR#;MwT(jXlrt`Q}{`DrEPiAAXl<>lpinR(g8$%zH2dih1^v)|cB0TpqB6gifb zWaJky_~#_1DFv-d1q#c6gk4gLlZ!G7N;32F7>o=IEp!bmbPWxx6!KC__131Gc?47^ z0aE8&l$r=qq!5ysn~J1TBYg5r1_mZWPZ!4!kIuc*e6xiEMcU@i=9;PJW56l((of*- zktN##I5k#W=vC0ua$Rfh5F_Hka$75cOK;buUcEO?+8(QTB|5h$g!O*mzp*T`Rl#lJ z)*Ts1k5h~uJE_mK+FqC>%zx+TT;uOH-)r_9?r=~@xR7+4t>DqCn9~d=XS>%sGHmK} zH2Ct&Rb21eoIR`o%`ZfGov+V2v7+r*XzPnzxw5Zbs{PbC_M%sD<^TNCTeQv@@bDx* z<`Lm?UGuN)%%{4wF}wN}=D#_~AA0mv{t=c*J}ClgWB%1@F18ei+_~oWw5g}}{GC7Z z$6vdyqwlA9E%lY`JDtj_)AHcWOgq2ta}T}#x?ol6GP&bB%?&lrUNSslbLZN#q@0o& z8C%+8-ZB65pMP_IzCQEwUy-qYk4=8L{G7tqs!NiV4N-c=MY%oK^Y1ZUxLw`zS~=Xp z{=)eZn?!jY?=`!UO!&DJCFJ*?UA=Sr)#t{>`X|$hf7DpNcyS{(yr)z#P3>k*-;>Xg zv+E7#GAc;i`TD-g{QGI`_@!2n(b^0b)@giuW-Xie+EG$P;tuD5=}$#x?|&#bP4nL4 zn|{|1a=d>1ddcOPYn^Y2vMRDn^g7++EI}mdkBD^;35gd=zr$bLVV#E-5d4RJQx)jPt^?yNdrGT`V-jFH*-1dJXI9R(9H%Qup^C@Zg?*WCH2igTe~DWM4fqD)S4 literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/file_size_lwrb_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_lwrb_up.png new file mode 100644 index 0000000000000000000000000000000000000000..221263c52bd5de3f1916912fe5ce1283ea4e3197 GIT binary patch literal 801 zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%1|*NXY)uAIEX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(jXlrt`Q}{`DrEPiAAXl<>lpinR(g8$%zH2dih1^v)|cB0TpqB6gifb zWaJky_~#_1DFv-d1q#c6gk4gLlZ!G7N;32F7>o=IEp!bmbPWxx6!KC__131Gc?47^ z0aE8&l$r=qq!5ysn~J1TBYg5r1_mZ;PZ!4!kIuc*&ie~HiX6AUe0SQ@4Y^CYuPwOO z6Sv`Oc-E{J2bt6PB^EuZPqbl}<*}pi@gjCh4K+4VA=40pWAPvD1++V`i|meZJGOWbW#}wLZS~lj|fd zrRnU~Xh|q3>A9YNFZ|8s&Feju8<&*4S-3iT{}##G)LA+jbI%z}p0oO+{t_|94wrA0 zdK+Kjh*h>B8b!^W;BmiRnsa+y;i^?mHg&U#(}i6Y-<7edXxO&R zY+uS|mC5=$%l|L@k`Wjxdf8;V!nD^B`BRx18J1=KoBukTH9#aa{9l-e>&>PopMOqc czVnNDPu4nJ z@ErkR#;MwT(jXlrt`Q}{`DrEPiAAXl<>lpinR(g8$%zH2dih1^v)|cB0TpqB6gifb zWaJky_~#_1DFv-d1q#c6gk4gLlZ!G7N;32F7>o=IEp!bmbPWxx6!KC__131Gc?47^ z0aE8&l$r=qq!5ysn~J1TBYg5r1_s96o-U3d9-VuqZp;=AlsRty{;ui-o|C-mEuFQN zPFdXjLdnV^WX0qR-7WQvd~O>Hiwc9z$K zy1SR}BNyw-y$53V7ZjB5dH?&)`_u2s{WX@FNS9q(;FbN;^4^wWlxmW@-y z)?VB0;vnMstZ?VM8=cQzS(^XdVPk& zVf*FO{P*FHs@9q|A51Vgv7$@StYFa=of5U;q?k^DCh5)BKkm_-WgY*rWY;l)g;OrI zIw=Z%T2R;j>+kLZ8@|h%&byFPXL)t;)@AqK&pvKyT>SP&oY%=mhh&3SSH{@yvj6y3 z?)mZKE3dAyc)F=@vxM`s@HnOqkA4PcZPlvh`4`BWM5s literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/file_size_semi_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_semi_hi.png new file mode 100644 index 0000000000000000000000000000000000000000..7e3cdf9be6cf2e8d5acad78fb23d747a6d279e61 GIT binary patch literal 704 zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%1|*NXY)uAIEX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(jXlrt`Q}{`DrEPiAAXl<>lpinR(g8$%zH2dih1^v)|cB0TpqB6gifb zWaJky_~#_1DFv-d1q#c6gk4gLlZ!G7N;32F7>o=IEp!bmbPWxx6!KC__131Gc?47^ z0aE8&l$r=qq!5ysn~J1TBYg5r1_s7ko-U3d9-T+0d3#GIinPs_+G5*7#jPt&M}<6tXr?huz$MS0fC#r z(^F2x*DxC>I$bwtndW+I>KD@v0STq8lbf1q)Q+*OT)Q?gUH#CVL*;&ce!r?&kgZS5>vkIyYO!`eTLMor-W9enGLH|4WowHrQyd&VI3ruVLNm zHEaHDSnF9-bo!;R-D1JF-6 zdzRE0rO0KAZ72K{?Q^RuEGaqjc$3kdd+s8lVo}f1udI7Hvy#EC{#V2G+o$gRtGi`> z?_$}`n93iuUl~@ss>)Mn+-BC*E&Avq%fYYn&ncD}YwGGIR=kj%wd~{5*E;FxX7}g$ zqy>eBo;-L^@iTXK%i-JC7>shJuVM?lx?t@NRTj@<2J6q(x2w#I3ZL*?**lV1h4KBP b{jX(y3s%4Kx$fu)ObHC0u6{1-oD!M<4%R8S literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/file_size_semi_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_semi_up.png new file mode 100644 index 0000000000000000000000000000000000000000..2c99274bf2ec1b135b66d34cc1e495501b768865 GIT binary patch literal 737 zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%1|*NXY)uAIEX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(jXlrt`Q}{`DrEPiAAXl<>lpinR(g8$%zH2dih1^v)|cB0TpqB6gifb zWaJky_~#_1DFv-d1q#c6gk4gLlZ!G7N;32F7>o=IEp!bmbPWxx6!KC__131Gc?47^ z0aE8&l$r=qq!5ysn~J1TBYg5r1_s98o-U3d9-Vuqoy`_@lxUxS*LRxj4$;XsLxLQg zmUgtp>2xMsT)l-|^yA}8-qjx$$o)Cc{bHer;Ksc#{$FYe+Q7la6y&jD`UHh{ zvu(*OyWX5PTj5=f%3J9KstynS9y9#T{MN7PmFg`T zP8|x9PbNsXrGzo;ypySRe(utko6F+6fGC6A>+8MDMBckD1Y|LBkn!@l>QUz{}VIvTX( z_-C7_wbu@&PTBhS%$e5O&8t?$?6y+>+H%WYc&66V^*7392PY?|Y*x3lGgA8cxAcS2 z;nU&T40|g6P09Jjb-%nU$=o}K!$E0b;0b@`4I4LVwrX@;;_sY%_0AieX{sx(zN)$N zN9F5^RaFd}j)79LXFojn7rX1Op7-hXH*df8n#?7-ds1ho@tb%55>mhFF1<88Vs`sf zpsx>@_{LoCof{eRa#!DD3-=#uGG>)&?4SBU)RW=HHro=1^>vJAJeqtW5?ikWlL~{U LtDnm{r-UW|ybeP4 literal 0 HcmV?d00001 diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/file_size_zero_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/file_size_zero_dn.png new file mode 100644 index 0000000000000000000000000000000000000000..19b98035d2feca2369bea66f28835f591a8b2cae GIT binary patch literal 934 zcmV;X16lluP)P000>X1^@s6#OZ}&00004b3#c}2nYxW zd@A)yh{76u_? zf!3~ss0;#;h%AEI1*NGA-DHK?4=AK!JEw$J;>wiJWUj;f*eG|L+rqs5Ff%fty>Q`h z&U?Q1yx(`fbA+NOIy($AfXQS+*SB9w2thO&T@hIo+HR~KeETEEfEiY72_fQ=oK6Q< zuUw|I5~>@Sz>5tgpyNkjvX)KWa%0D2R@UMV&=j9ChT@O zp%W9VrEBw7RawEo1N)hondQdKyLi1SLI_lKp4*L0Oi%yBZkMU9J{LE}mLhII0QGgX3=MvyzU~qLet*E=SgqFNousFy8>Db} z5g`OMHRsv8CzG0*YJ?DkLJJ1RVzDG&_=u*hb7eyaL3ei#>b#Gxu2%>lu&q1&;^Jal z5##RKjD>~Y##ojmRCS)#woY2xI*oaI=30M*LZRf-H8cB*<>h4n9EuW?<8(L-7jtvo zs9G{|0!X|3q?_Mo6Q#Y7IwSK zX>Ph>JZhoP0#@s8qZZd28u5IMeIw|)PB0kUS_Gh=AdlLM7bq;uN0ubKUX@YLH`?2~ znEWvnci#pPNsP000>X1^@s6#OZ}&00004b3#c}2nYxW zdO)%M(1oBsKq$h8F=)u>9vBpaR)}bX1eV>r&1g19osn^$9?UZ{&Kc3N7Hrs@ zwf6e<+P{4{I)}rd@Q*DXU~g^5KLgx%7R^Hd2HI;t5v!M7rzi8kb$}2=%mqM)29C_=juNwRaKqKw=f+mR#*pDfec`wmx|n}LB(+7LpyREVM|C`$Am$jscxC1(Rx zs|5gAp2D7zOhJAgc{_8t&~%xuuD8*Yuw44^N*1@cxH#(T&SJG%=>FJfj3 z*4OtQfK3}Wpx5gN2Io{?xbQKT%i)kPnM?q9yyKe7G3N0AU^E&?OLMGT6SLW@22D&% zAcWv(^FSpHEg} z33JZ22%Trh^ zW>t&Yy2gl2LMUN0B-VR!@7_Z`fBwpe<5lG3WRYyMF+4m%*Xy^mwA|w3r@?3dG2WA< z9P000>X1^@s6#OZ}&00004b3#c}2nYxW zd?yNb^mf1rVQ4d`Vf+9#F3M#rmSXLHA z^jJMq^iU7kg`|T11HlL%wxFe;dr(ji+65vbA}A$DZD+OJ+0|)WXL?w7v}LA?SO*Ra z^ZTCP_jk_u{?1I1rfClU*a85NNCa7yCwz0uvWUmyITA^dP!wgtNm8j4Fp`PmIM}v5 z;UtdZ{5grLmb1Nn3rm+QMpadebecDB-V(hUIs}RtD5so zjVMY8fOI-TD3rryv%{P|dx7@$m!7eiOopDG9)z)(6uKyioH%|2MG4W?_JSP^``J>r zoBAF5c=Gfafq=--!v_e3NxnkHRcp8;67 zaGs~SYHH>K@c#V=hK7d5cjF&DegeS84eO93>8CYWmf5s%9RT+qJR1L4xq2}1iR1(b!u=z4Qqa>DP`GUu5vMgg5#((_$ilX>W{#Ha$93@F6lM_xb)_wqj#l*fgNOaWz O0000^pa`9!}?-R7srr{#<#aN@*Xx2U^%#Wp_9bM|C6q8%5s$DxL;y47OmOvNw4i|3~8?WZ^Q8ctGKKl^>d{?2JuiBEuymh7*0|NsmgQu&X%Q~loCIAaFMX&$> delta 118 zcmaFKbb)EY!~7^u7srr{#25B}Wzcc=u(VG}N_35xi%345XOZ*Mem_gTe~DWM4f?)5fD diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_dn.png index 2746ce3d1fdd20857e021de6502d499b34f2cfac..acc2bda6918ba87c926bd10f1b0706c15c080387 100644 GIT binary patch delta 428 zcmV;d0aO0e1cL>T;eU-uL_t(oh3(hBF9Tr!#_{jDYkEz3;)tJ-3RhwwT`giTAwdVb zKSK;+7lTA%>t+xs211x5Hd8l0f{B4dq}6M$X$y-rZ3w+GzQFo`|NBO!fucNpi{Ma+IA4ie*{Caeo|Qu~^WZBp2JZF-;Q< zprgHw+1cr!J4r4(JA0I!%KHlfP!uJ|KGGlL#D$ccxRCobabDBQCuj{Niq#%!`jB5S zU#ic#Lq;EN%PTc756ING=%wadjtCu7?V0~L>Et_C# z`HHzE@Bg)y=YMa>9JHdTg8h{T0MZL>yp}ZPCmvbK^m>*xH+IiULFMSYor}#&02Vh4 zwof}fKi|j1DVAl4X0yrjiIZQ@|M)&}rRezkL&UFyA5@cqIt4&I?xTgsWF1oEEiSZv z-Qv>enV>sKF4^qv_lXli1ldRWgPgdKk`otlpA%;o1|_;4J@v#PQYbXimfDly{MI+aLmu990Li!zxE zM*1kF5J3=N3Q8xX6at`BD(TK*4B-2IT#%GfcNQao00_fScYh8efdI(o^SW~w1N4qK zvq9-4ApTkyl`SGRR@(q{x)%43vy)9WqNN4N@?w0KzSV7BKWwdeHrLu@GZ6rl2Zu3U zG4NZE<2XY->=wIR9KUmP=~0~f=Jc=zK=75N`t0`2r(tjV6M(Bbm#uZ5gB>4$o60=( z+hX5*8m`Zu*mXTyK`D!q{TeeOE~xtA(veo*d>COEVwKC~D3{BP9L8+W-zKp^y@H0_ zAY-~(tyX-*jk7_<|LYahY&LagF%p;!N--&AT##++y-we<=&h!sUdki${A$w{Q6I68Fi zSSQYnNzlv22^ixY++Q52!Io^(%Qh%ts-E{6l4wZ?VbNq_ewhD1>W@N+=Mn8AXu zgE0nxsR{QX{vZ)&DTz4C#S!NuRUjXmDEN#I^>& z_QpF(LH)_)`DHq>I%AEvt@Stj#SYc0B@Xu*EHA)ut;f;DEa#O63gy+2Yy4IzK2g1# z!_jcM-v(f}lxyX)qbTmYQm(FytyUr5q}A43-_3JYY5;I>qNv@>jD3G`qAB0^`$^0} za)U+_&q0YDkQj{&s+N;ioaJOt{U;>iEF}?Vxxt|7c^>I>TKXL_t(oh3(lfOT$1I#_@kH7mbA^6*{PcLN;-969+$*pTRHG zPvI!ysN$wIO`t^2TpSJxg+|&^dl}x}l-z~zz{_(466AT_Dy0zpW35G(Wr+-^pRBcL zfZ=fHJBwIiGMTsm8Do5B5gjx@UDv*Ihz=ScNfO^V#1iu(PJbHIUmD!k!rB6bN>1H% zYq8bKHgm0SFGIzLF3$Iqw*K@QN2O;#0D!HYp=~#Mj|LbF2CF?C9`JK?gMJ%BxQ{ux zcI(X-ar3^ozXLWq2S809u~|-&UAX)5iLiKB*x!Zd@)mP{2UyJU6$Bvw@#_b)&BFdF z>bfQvjYe%8$5!j7kp}%~8x5KdXypcpotn*N?ugr{LE_)d2UJy+?<}H&G^odnF>XLn v6#32~I%t5RD17G-9dw$e^1Gp@thM|CRp@%*$uwY800000NkvXXu0mjfX^f+B diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_up.png index 42b827e0f128e8969dbd98ac9f133bc2fc305063..9f870e2f6c8d4bc2bdb119712e744c03c77c0a94 100644 GIT binary patch delta 333 zcmV-T0kZyx1f>L!;eRhlL_t(oh3(m~j)FiC#_>P9>jq4K5RI`h7QBG(|2BpK8$$tc zC2`@3i^RL;3Ptyl`IR&?K=#W_HaZ**W8e2I77Ii;q9`Is5=`5+IOot>f4V2}z;j?&N+bZALPBC9*8h_?*ULB?nC@RA}&x8aeslkN1U0ffOC#<95KdV zt(~jPWEcjn*DC;V9HZ2{>3z9e0I=3#%xs_WwGr2K9ev-kTCJ$-n%nJ0Q558P&hdC; zzu!My=j-n(ka6c;F&;sPg&>OUb77buCiz)g#4nx
!h?0dBWj>@4DizVE|;)^&}YMeNW3 z*4o%P#10KmRaNX9;)U%OCmWP54dJwK#^dqWp7T6^Pok5YbANd60m!lprBpI`{?Z!_ zP?qJPkG=QY?{}J}0m2G?tE%d${%Omy0AP&4TFX4o+q*I5NBuwaeNSE2D5aiy^Sge8 zwHDR3t-o9@rvk|a9m{jJH`dy)L1! delta 89 zcmX@ew3%tb!ysEv7srr@*0*O285tBf7#vNQ6kp8m;o4=jxoZFawX3Y|%3d}y{`RA; l$w5JYgN3OPL7m7y!TNP7tEB7WGus(}z|+;wWt~$(69Dh?Acp_| diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/vscroll_handle_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/vscroll_handle_dn.png index 8bc0b93569f4ee2a92f7e394049889996ef9e17a..44bed0fb0068166418c09bd2495fd47506bdd3ae 100644 GIT binary patch delta 487 zcmV=q3mPoFMS=DrJ%+!SgCqj=LP}(xY5?A-35gX!w`J6@${S-BC>A;ULTcq^^pqIAXp0b29eT30^}J2D*E`kcQ?A>{e% zv*t*VSmZAuVrFJq?e6Tb-HEAIM^Q@A>BNN9QNI7`VU;Y)h~q9%6q2SX-R@VSD8%=D d#Gm+H{sGg@ik&Yd8hro&002ovPDHLkV1mh%_5%O_ delta 373 zcmV-*0gC?81>ppc^?z4ML_t(oh3(kCO2beT2JkPpNl7D#0Ub&Q3pF~H?i~t(PoUu7 zdnhjI=qm^gE`ka^fgmW34&o%1bPzfSZAlYJFW&rdalQ$;Dka>rp3Co^;S3)~aU3W0 zeIK@MgE0n5DNNG@r4&h$z%UGiVF*G9bX`Xf1kiOInx?_?Jbzf01%iwsB+Yt~ja(o1 z#gXm9buokxpsJ-H8DDYRy-tYBqdt0_usD*pxJaBR_=*(7iNZxxUi0C(hNri+pFJr! z2~es%$y*YUh(shJ5sAzdva>OslS!`bmc)=&gJE}bgjRzUN1Anpt=QEOqQFN2y z;MPqL9K^kJ5dVzs9UR3`1s6BPO++bT{h*7bmliH}4u>5??v4aOAp?Z~cpR1x0-a6=j4?F>ucP0)M5$^;exS_G6t=3IIN$ z8-p06S-;aqwrcZwNH*O^Wx0)Py04BD=WHDAbWzF)bp#*)0M85VvVvZoUX7!$Jq;nW zCIMC#U&C6$k+Fo-N1A6DeI!Z@Vi1EEVrPgIGNN#k_iX#n1f`(QAf(f4;&x8 zVX4$rN1`V17=OLI9mU4M2p-$PNZ=%0+kztrx_01R;h$4oe-CR3M{13nJ`yDcF^EA7 zVh}atZ`_L)W_sA$Y@sk~t0Vc$0K1hw@|l4;A_f$#7ylWQz(e-@I*FD2DgAqKb?qsv zB^c4acU{*V~1fB$t)qgZeL_t(oh3(kAO2j}E1>iF`n{^0GlC2kan}CR=Pazh*jnCi< z+4};PB9;n*V6pj;IPPpF7O|cT8Ig6lr@6%pAE&s*Frp}mzOHNJc@AR?wAN5cL2C_b zEs`Wb+qNJgNGZ`Y4WyKa;}~UGB27~eMl*h8^hSJs9gdj$n}0w=2tY)`oQjZI!yI3M z)Hd)y z$OXFm3_>mfka-51o4aGOVVD_B(?DyDaU7wP0uk*V6A=gi zwAQfJE(xM_{K;#rf6NmR04#_!A`+47^(se-qL3lZIo$7eIDhBDk@x$Jx~|dpeK?|& z+WhzvX6t2|rYOr2%p6_`06ZQKZzW!297j2lWtkk=6A_6>L?ZIPkgBTWi1;5nP1E`W zBg~B3?S`)F!jZkP*+#9kD2hV1D_D2Tv|X@wIc?kerudQb`7B5FL_{JIk%&Yj4EeKj z@n#3?`yS8d6J<$~AW4$2N`_%T+qUvHYK-xokG%~&%QE@7xM>>S6hCq}9OTI9bdn=` zA|k(p7+|?0VP;Iz1f|qEp640Nyk6vf&wqB>##)O!&x5P5*5V5%%913(%Sdkk0000< KMNUMnLSTY*DzN$h delta 255 zcmV%}FKQi6yerSv@V=oCAfbFRL#5m9|-`=LE~SrSDQQA80% z6nQ7&y{|{6X{tv`-K2=z=S21r#99kxhPC#?Nq}$LlRrVZRuci&<75B;002ovPDHLk FV1m{Hbfo|Q diff --git a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C index d4083589..bd974dc0 100644 --- a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C +++ b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C @@ -47,13 +47,19 @@ #include "vframe.h" #include "vwindowgui.h" -#define CWHITE 0xfffdee // creamy white without black +#define ALARM 0xff00ff // not yet defined, to search for the element +#define CreamyWhite 0xe6e4dd // creamy white 10% black +#define CreamyWhiteBright 0xfffdee // creamy white without black +#define BlackNineTwo 0x141414 // 92% black +#define BlackSevenTwo 0x474747 // 72% black +#define BlackEightFive 0x262626 // 85% black +#define BlackFive 0xf2f2f2 // 5% black +#define BabyBlue 0x5f8dd3 // baby-blue +#define BabyBlueDark 0x162d50 // baby-blue -3 (inkscape), e.g. dialog Subtitle +#define ComicYellow 0xffcc00 +#define DarkRed 0xaa0000 +#define LockedRed 0x400000 -// so einfach ist das nicht -// #undef RED -// #define RED 0xfffdee -// #undef BLUE -// #define BLUE 0xfffdee PluginClient* new_plugin(PluginServer *server) { @@ -99,61 +105,103 @@ void NEOPHYTETHEME::initialize() { BC_Resources *resources = BC_WindowBase::get_resources(); - resources->text_default = 0xe6e4dd; // creamy white 10% black - resources->text_background = 0x141414; // 92% black - resources->text_background_disarmed = 0x400000; // lock-ed (!) + resources->text_default = CreamyWhite; // + resources->text_background = BlackNineTwo; // + resources->text_background_disarmed = LockedRed; // arm track locked (!) - resources->text_border2 = 0x141414; // l,t outside - 92% black - resources->text_border1 = 0x000000; // l,t inside - 100% black - resources->text_border3 = 0x474747; // r,d inside - 72% black - resources->text_border4 = 0x141414; // r,d outside - 92% black + resources->text_border2 = BlackNineTwo; // l,t outside + resources->text_border1 = BLACK; // l,t inside + resources->text_border3 = BlackSevenTwo; // r,d inside + resources->text_border4 = BlackNineTwo; // r,d outside - resources->text_inactive_highlight = 0x162d50; // z.B. Subtitle, baby-blue -3 - - resources->bg_color = 0x262626; // 85% black + resources->text_inactive_highlight = BabyBlueDark; // e.g. Subtitle, baby-blue -3 + resources->text_highlight = BabyBlue; + + resources->bg_color = BlackEightFive; // 85% black resources->border_light2 = resources->bg_color; resources->border_shadow2 = resources->bg_color; - resources->default_text_color = 0xffffff; //0xf2f2f2; timeline … - resources->menu_title_text = 0xffffff; // f2f2f2; - resources->popup_title_text = 0xffffff; // f2f2f2; - resources->menu_item_text = 0xffffff; // f2f2f2; + resources->default_text_color = CreamyWhite; // Timeline, dialogs and much more + resources->menu_title_text = WHITE; // + resources->popup_title_text = WHITE; // + resources->menu_item_text = WHITE; // - resources->menu_highlighted_fontcolor = CWHITE; - resources->generic_button_margin = 30; // 30 - resources->pot_needle_color = 0xe6e4dd; // [resources->text_default] – marginal - resources->pot_offset = 1; // nur die Nadel. + resources->menu_highlighted_fontcolor = CreamyWhiteBright; + resources->generic_button_margin = 30; // [15] + resources->pot_needle_color = CreamyWhite; // [resources->text_default] – marginal + resources->pot_offset = 1; // only the needle resources->progress_text = resources->text_default; resources->meter_font_color = resources->default_text_color; - resources->menu_light = 0x262626; // wird von Grafik überschrieben - resources->menu_down = 0x00ffff; // - resources->menu_up = 0x00ffff; // - resources->menu_shadow = 0x00ffff; // + resources->menu_light = BlackEightFive; // the following four are overwritten by graphics + resources->menu_down = ALARM; // + resources->menu_up = ALARM; // + resources->menu_shadow = ALARM; // - resources->menu_highlighted = 0x5f8dd3; // baby-blue - resources->popupmenu_margin = 15; // Einzug, verschiebt den Knopf-Text nach rechts + resources->menu_highlighted = BabyBlue; // + resources->popupmenu_margin = 15; // indent, moves the button text to the right resources->popupmenu_triangle_margin = 15; - resources->listbox_title_color = CWHITE; // Spalten Überschrift - resources->listbox_title_margin = 15; // [20] Einzug - resources->listbox_title_hotspot = 15; // [20] + resources->listbox_title_color = CreamyWhiteBright; // columns header + resources->listbox_title_margin = 15; // [20] indent + resources->listbox_title_hotspot = 15; // [20] + + resources->listbox_border2 = BlackNineTwo; // as text_border + resources->listbox_border1 = BLACK; + resources->listbox_border3 = BlackSevenTwo; + resources->listbox_border4 = BlackNineTwo; + // ../../guicast/bcresources.C:684: + resources->listbox_border2_hi = BabyBlue; // Highlighting on mouseover + resources->listbox_border3_hi = BabyBlue; + + resources->listbox_highlighted = BabyBlue; // recources, loadfiles + resources->listbox_inactive = BlackNineTwo; // background + resources->listbox_bg = 0; // see ../theme_blond_cv/blondcvtheme.C:249 + resources->listbox_text = CreamyWhite; // + resources->listbox_selected = 0x3d5477; // approximately matches column_hi + + resources->filebox_margin = 130; // [130] + resources->file_color = WHITE; + resources->directory_color = BabyBlue; + + // Footage in the timeline + title_font = MEDIUMFONT; // ../../guicast/fonts.h + title_color = WHITE; + + // Because the colors of the text in the list are fixed. So it is at least uniform. + recordgui_fixed_color = YELLOW; // + recordgui_variable_color = RED; // [RED] + + channel_position_color = ComicYellow; // Set Format + resources->meter_title_w = 25; + + // (asset) edit info text color + edit_font_color = ALARM; // ? ../../cinelerra/theme.h:282 - resources->listbox_border2 = 0x141414; // wie text_border - resources->listbox_border1 = 0x000000; // - resources->listbox_border3 = 0x474747; // - resources->listbox_border4 = 0x141414; // + // tooltip ../../guicast/bcresources.C:786 + resources->tooltip_bg_color = CreamyWhiteBright; + // resources->tooltip_fg_color = ALARM; // undefined. + resources->tooltip_delay = 1500; // [1000] - resources->listbox_highlighted = 0x5f8dd3; // recources, loadfiles - resources->listbox_inactive = 0x141414; // Hintergrund - resources->listbox_bg = 0; // siehe ../theme_blond_cv/blondcvtheme.C:249 - resources->listbox_text = 0xe6e4dd; // -// es fehlt "markiert" in allen Themen, derzeit 0000ff. + // Waveform of audio tracks. + // Instead of squeaky [GREEN]. This three are soft, warm and matte. + // 848661 beige + // 6d876f green + // 665f8a purple + audio_color = 0x6d876f; + + // Resources: the text overlay location display. What for? + // Affects a) Preferences, Performace: BR "Video" (text). + // b) Render. + resources->audiovideo_color = CreamyWhite; // BlackNineTwo; + + // ../../guicast/bcresources.C-781 ff.: Delays must all be different for repeaters + resources->blink_rate = 750; // [250] - we're not on the run. + + // ../../cinelerra/theme.C:87 + // clock_bg_color = BLACK; // -> vclock + clock_fg_color = ComicYellow; - resources->filebox_margin = 130; - resources->file_color = 0xf2f2f2; - resources->directory_color = 0x5f8dd3; // 0xa0a0ff; - new_toggle( "loadmode_new.png", "loadmode_up.png", @@ -225,7 +273,7 @@ void NEOPHYTETHEME::initialize() "fileboxbutton_hi.png", "fileboxbutton_dn.png", "filebox_icons"); - + resources->filebox_text_images = new_button("text.png", "fileboxbutton_up.png", "fileboxbutton_hi.png", @@ -261,7 +309,7 @@ void NEOPHYTETHEME::initialize() "fileboxbutton_hi.png", "fileboxbutton_dn.png", "filebox_reload"); - + resources->filebox_descend_images = new_button("openfolder.png", "filebox_bigbutton_up.png", "filebox_bigbutton_hi.png", @@ -293,28 +341,28 @@ void NEOPHYTETHEME::initialize() "new_bigbutton_dn.png", "new_cancel_images"); - // Uhr – wo? - resources->medium_7segment = new_image_set(TOTAL_7SEGMENT, - "0.png", - "1.png", - "2.png", - "3.png", - "4.png", - "5.png", - "6.png", - "7.png", - "8.png", - "9.png", - "colon.png", - "period.png", - "a.png", - "b.png", - "c.png", - "d.png", - "e.png", - "f.png", - "space.png", - "dash.png"); + // Clock - is not used (AFAIK). See also clock color. + // resources->medium_7segment = new_image_set(TOTAL_7SEGMENT, + // "0.png", + // "1.png", + // "2.png", + // "3.png", + // "4.png", + // "5.png", + // "6.png", + // "7.png", + // "8.png", + // "9.png", + // "colon.png", + // "period.png", + // "a.png", + // "b.png", + // "c.png", + // "d.png", + // "e.png", + // "f.png", + // "space.png", + // "dash.png"); resources->bar_data = new_image("bar", "bar.png"); resources->check = new_image("check", "check.png"); @@ -375,6 +423,22 @@ void NEOPHYTETHEME::initialize() "editpanel_dn.png", "editpanel_hi.png", "listbox_button"); + + // Dialog "Load files…" switch SI/IEC + resources->filebox_szfmt_images = new_image_set(12, + "file_size_capb_up.png", + "file_size_capb_hi.png", + "file_size_capb_dn.png", + "file_size_semi_up.png", + "file_size_semi_hi.png", + "file_size_semi_dn.png", + "file_size_lwrb_up.png", + "file_size_lwrb_hi.png", + "file_size_lwrb_dn.png", + "file_size_zero_up.png", + "file_size_zero_hi.png", + "file_size_zero_dn.png"); + resources->listbox_column = new_image_set(3, "column_up.png", "column_hi.png", @@ -389,7 +453,7 @@ void NEOPHYTETHEME::initialize() "pan_stick.png", "pan_channel_small.png", "pan_stick_small.png"); - resources->pan_text_color = CWHITE; + resources->pan_text_color = CreamyWhiteBright; resources->pot_images = new_image_set(3, "pot_up.png", @@ -472,8 +536,8 @@ void NEOPHYTETHEME::initialize() // MWindow message_normal = resources->text_default; - audio_color = GREEN; - mtransport_margin = 10; + + mtransport_margin = 10; toggle_margin = 10; new_button("pane.png", "pane_up.png", "pane_hi.png", "pane_dn.png", "pane"); @@ -806,22 +870,13 @@ void NEOPHYTETHEME::initialize() new_toggle("tan_smooth.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_smooth"); new_toggle("tan_linear.png", editpanel_up, editpanel_hi, editpanel_checked, editpanel_dn, editpanel_checkedhi, "tan_linear"); - flush_images(); - title_font = MEDIUMFONT_3D; - title_color = 0xf2f2f2; - recordgui_fixed_color = YELLOW; - recordgui_variable_color = 0xffaaff; // RED; - - channel_position_color = MEYELLOW; - resources->meter_title_w = 25; - - // (asset) edit info text color - edit_font_color = YELLOW; } +// BD: CWINDOW is probalby ComposerWindow, V=ViewerWindow #define VWINDOW_METER_MARGIN 5 +//#define CWINDOW_METER_MARGIN 5 void NEOPHYTETHEME::build_bg_data() { @@ -941,7 +996,7 @@ void NEOPHYTETHEME::draw_mwindow_bg(MWindowGUI *gui) get_image("timebar_bg")); // Zoombar - gui->set_color(0x141414); + gui->set_color(BlackNineTwo); gui->draw_box(mzoom_x, mzoom_y, mwindow->session->mwindow_w, -- 2.26.2