From 5319da69aa320b20b48be6030616f17982308bbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Thu, 30 Nov 2017 21:49:44 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@337 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/icons/code-error.png | Bin 722 -> 2780 bytes qad/icons/code-parents.png | Bin 641 -> 1126 bytes qad/icons/code-struct.png | Bin 676 -> 1150 bytes qad/icons/code-union.png | Bin 731 -> 2071 bytes qad/icons/code-variable.png | Bin 387 -> 813 bytes qad/icons/code-word.png | Bin 543 -> 1818 bytes qad/widgets/qcodeedit.cpp | 27 ++++++++++++++++++++++----- qad/widgets/qvariantedit.cpp | 2 +- 8 files changed, 23 insertions(+), 6 deletions(-) diff --git a/qad/icons/code-error.png b/qad/icons/code-error.png index 5b4c488bdfde337177a0fa697d72b92c91bfb4ff..a76314c6b1e017db661b9413366cd160dfda0498 100644 GIT binary patch delta 2749 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 literal 641 zcmV-{0)G98P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L00VXa00VXbebs`@00007bV*G`2igM~ z5;_rA&e2x@00IF?L_t(I%cYLbOOtUN$6w#?p6|0C?0Il5il|t*!WWzIeL4jcM>3-PERM3$&qro3_vg#WME)mG!ltS0*G(p zo7Vl8w`AM0kq!aC`pgc`XF>uXkw{oRpHJ$#j#3Jx6sxPNM59pwpsjz}lD$t2gc3+4 zP+pDQult;{xVR|$`uZ?U6Q|RO$KxTB$#mYe?CCFRdk<-ySO^Kq)Yz>3=oCt&5|v7Y z!^1;_5a_zj(b3U`z$snzTK?2^9yH1=n(bDnU>HUnZ~@r1jb&MAnsy-w`a=_+KYkh8 zu5Gyh!rsTHkBlc1X9pr4k58_xt&JB71poqp0HIJQ#$TA_-@HFxhTbg$ATAX?oMrYE z#{#GV9^e)K!R%%0wQSGLy)G^-#p?OI8~e}a%>Mqy&B4L9T?xL&V)nh^VT4i$hXWxc zLP~y4O*OP`1RJRoW;jf{*+eRZ)O9q&U~6SX?@Ca$EVA?SDAUB@^&*{4^qw9L8V$M< z>{P4V$mM9~asag2Z8Rw})Cqt}Ug!C6zLT+3P=AtNE1YxTPT2!lcE!u^< z$VIk_pa{%xK+*!EBrJ$%Q42LmC}-4h=G}MiJ@@?kwYaardGnqQP19WAec^E4yXW4+ z?{j{?bAG=Aef8B>Uu!AVYvAl3AM9&o*H0Y#<*ll9zIYfd{=j>9ddDGi|HjAn@7eb1 zm!$$Y`Rie~b7E^WJb1SX$|J!e2#6;HkKhS-;&fJQI-z#mJE_(JpxSHT$eGtG@4omx zm*+1a;t4?z9A10@(QfrxO}+EQD{B@)JpsIh*>r|P#{}^p4liNBaB2UqS1aHsA3&bN zY%9jYTiLFpd|H06u^X#qY?O+SpKXYPnwP3DDAk zG^^mkZ6=6>IP3Y+lCXOF)9)*L4;~=RG~Np?fb-IBAeEYW@6_p)htSUZ9?_3(w*wci zTvbujeKA519vIswn@6^ok2tfe*pEWaTr(%v1{c7#jrSgW5Uy)W4ZCuH(UJAf#I3ug z{+zj9v)=Up@Ko7kHmqN_zsEF5yFc3QjdPwGvBBh~SoI)yFC=-OnR$#<8P(a!0X}){ zyHg#Tva5dJ+gl9}xBG>S?6M}mUuh9c0bqk*oDlsJbJc*&^~wSMBS~i{nLLwZJ}pxH z&ECA}6P>4}0a%(}k_4PZx$fyZ2>2vf_I%O*4e;Rhab3U1NEiZXbhIHD*sNvu6Aziv zdZ4jxaB_F^;>oXn`mJW|;xKYv*t2W9ZEP6bSC$LY(c6?5D^|oEu0B8?V71EW)zan9 z8hfoxk0Xq9EuIufrQSF&@of54DFNae`uL86hli`f8@nWG!KK$4=RbaP3K%RUfR4jR zW#}p{y#xp%0mK(qQn6GAYf2}Tf#qINR~ukSIjx%@E+?1_g+s&v7Q}%l#9u(i<=F$$ zSx$=v$!C!~LGXxpz=NG3m`hNL(XFU7057*o>4kE-c_YHj{fJEsh=!mMH&-}IMW{i@ zn^LM%Xi*sHG!i#=9^)>&Ix02S1MV{d#jwSIilfQWP?F-1Im*4FDXNnd^S)mLAA^>qj6Z^{cuNdN!< literal 676 zcmV;V0$crwP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L00VXa00VXbebs`@00007bV*G`2iXP= z5h@JrLoAR000JaQL_t(|+KtamNK{c6#_|8T_s(cmWQJc!7D5sk71F{mf|^COXyc-7 zpwI`nkTzii3W-7xg#-qXn?5#LtAa{&5{raHltxW3a~x~@oE#lz=FZ%EPiGQ$!psjI z&gPuweUBIlyt?&y`f1zbqSuWg1QhNnk5wMH(tNq1W#ICPT#N>+Yx9&fQqgOR+b%Nx#oe`Th!`(S+L8W?@5+?Hkn$m&l80GO;6R z*+}>w&83r@vlo~_$pLDkq512>6H6o#=H?yUjTH`I6y=uQ4Xs2UOwa#fOF`~FN()PF zvsoZfvJD6IF*Hq*lGH7Vce~?)^qv8Am)f2;&CD${Px*tS6c^-i>e%5XGAuw!DcFWa zhJ+B3Z5U+8{PVJL^=D^me6f!dJ*$X4#~-!}((43jr(SzxSAfb&wXWY!~66jX{QzRz8uXRfH6P zp^6-EAB^iC?wsYtfS+`()l}O*`bG8dnqkIJ-^$KNKzAHxM zdB*!Ldp}oP`GIFjUmpDMEw`OmH-JC<{;8=wd#?MtbD7PYJtLtki7_tgW47812DbW~ zX7A`X$S75cR>7s0UT%WP$rq0A*?-{XXb}RPwyYpWgvi8UVMq|mt9V* z!i7TRf7pypyTd!2m4beTkq$7nr(s zFW2mzTJ}Hh{fad2g9pGl$N2a-*X*7mrO5GP$A->d`4K6UQleZean224nX%*QodEpn z^;7)zH@_xU6|Gi_&=}lL$%hYpA9cz{Zn=#suDpsJJ9cv9uYVa_V+=~~M+0C6J_NEM zgUu3SV`BjP>DgznlyJ^bRjX$%RmGC==Vzbc6L($3*!VahctmtybcNta$wu*j5xgf2 z@jz+}2AG?jC8o6%ytij(dvq#GUkCLd19Lw*g+lNo%Z38zal8toH3EpbG%i$OC4fdw zO-@WQbLPxY88bWvydO%TE`ToBwMq`>94RGK74MfkU}lVuZz9IX!omVCz4%YEETbs$ z5j{`_YzY4*CntK(|DHQfUKDEr(Dw7a=kc*|M1-;|DNE1HnU@KrN1WoE!^}pD0keb; zVMP(CCrnICOmNf99|EA$USM%?u`Xz=EMWaLV{&qWs;cO8+DuGLa^R*9^5aK;$in?+zXti1ttua)j;iB-32fo>xxZPgh@t^;UiOESs6th%=H0vDz zQc9#0i7|5a>xJSoLKI5N79QdF=3E05)&lf;b&K<{d9_%I3{m0C?>1PneyX1%zaS$E@1}(b7;A z2rxZ!x|bI7EGOF9(rBLLy#hFM_RNLr#z<;3CQ=*@pnFzORSdge|1OI((_Xy9P$4>8 zFeVuVz#2SYeUj5<4j+6Iu(I;b!@4EbaM_YPNf>g0bw)l9tj@h|Fbg6|2!TA$*|zNx zf}if~rbs`6I)l~rCobN0Nl$jGDAv@ST0+>mve24?*peX#P6ek9=Nwt)m_2t6fZOl* z7)5KWQKT7}I-DxbY5nXn%o44l;MUvk0AO}@7MEo>SI?)a2wJD>WdB_d_ly=noI@3y zD58prB3gUk=+Ps5^w!(BVgHTXu)n^#`O5wGp?TIjG8$l^;yd4caM>DvJNg`%b0jm& zq)wrlkR;9eu~+#=01#_qRdFhaI#i`Gz6PM8Jo&`05D~7s{(3ID=pypGAj>l{m-WSf z^}vMSnR|PVBS)U&$tRw`Ifo=8H2@?DkyO)Enq)Gh5)ag=_k8v}_JB$AKTx_^v3t@ojQR-R8j+Srsd*QJ1SUYNLs%Qhq8Nx07e~}W zBHHY#_IAEYD|NN;+KUTWdKU$SS``S0)pDZQVKYTF5tASdz3Nn1VJIw6tlMa7}n5-8Vz5Rv*eqw5K)(`Yh78;V%0=ZliCSaV;@AsSH=%xYPk ziFR}H`T*ql7)6%jeFO+HtrOEJ(5 z&PGDV7^z}KY%)w0BdMz2W31}$tBS?NMfUC8VXwA3Pp`X>&Cf3!EK4tYrlu^<3#wRA zdXEnkA%teJxK!u>QR>X(99foA6a__5kma>_Q&(RprY@yYs^_U9z6ylk@jg(63g>dJ z*|po+osOKJKYwtfpP26a_?^45+&y&et+x)md3J`E@u0s+n)x$@c1u&d2-{|z>T)iHroGZ`w!j%jH{#X+-Cp)002ovPDHLkV1l&% B>KXt5 literal 731 zcmV<10wn#3P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2iXS@ z0T&T??ur_RZ^|+1W4Yna`gfNfQ1C-}lkBF@{89XJ%J2Imqm%PqMx& z%Wz!>1p2zD*Xs~M@ZPpG}nWtA@^f`|;xWGt3v~C=;78J~oQBSR4ns z4&wdvI~XRK)iT4Tjb&L_UamDX;4FXy&$6)sI%C@saTIFBaoiw)!xdQEdjr+#689Ux zZ`xeX!@|O^=3ZVAsZ=Uq+x8u-vO~cd}5 zd~1XcMn`Vr`;VXeU;6h4_wL@o`GE`Q>FvYWzEeR3LZ~?1(~bKiR{yyH%2?rvcr;4S zYb+O)N||lMA#RF&f)=P$m1djE<)A1E48tIT22H1>X%Msw(`4J!RF1fUeS#_24$N>E zKEQ}X)7ior zTe>ivhYv8B-U9beXgKg&P=(;j)ZV_89#bN7?fQ*Dbf=DEtvGoig}?VN6c&e4snP%d N002ovPDHLkV1nAmmF6A_D0O7UD28}~>ld2e(o^7{HZ=)mA1uIn0gT|;XPr4*D>9XtLelSyw(DTV2D z3Z)c?sFTIXWWt%4&1Rj<5D|nBXqtut_~i`5C@7^m5BJ`8O3GTxYvP>u9@bh2At0sf z)Vwi<_vU%tiF_=hA@QR!f6y)otu;sA7=!ckbB=VDWu3?q5r_!J7)KC8vqUu4|y&| znuuVnh1MD&1QbQVwO^JcvMl3n6yF1%WpoCtwFn_}qF)pRwAQ`8Ulaw4duv;3d-i+p zi7|(G(1Dki7XZM<#s-{o9S6#?WD)JRYgv}a^L(_uDDp(a|Gkn76h+ai$%BJ~g?rlL zW9;|3-bykMiS6?P*H4SS(ZUc$$!2`M0@U|3tPM7-gCw|hiVli z^mAtif1aLje0;ptZvpQ;in7Gk_BMW9UoZDXc6xReem_30-GLvQn>al=5lAEwi9{li dNF);fgTGY)RNzd#0v9w5I;|mCfa7f^?Cg$AR-PyUE zg`$X;dx8v1HS^8<%+J6ol4XU9n_=xk#9E6)#d${v0e@RsoDYN$8C;(w-6r__YET~? zZlS7(R_J%yQqZcxI>C8iVy1PcX@K{_qFS`V{reFy3f+mry zg=5s8W!*H(NwW#LnQ_}6)z9e*??urHd-=KvK*vl!$jyx07!GzelGEe8WM0f$;nK^m zg6+++a7Dz+5v9-b(jpq2h{10aOZZewr%q!tlGA~8y1&*ShiS$zV00_9frU=5g4 QjQ{`u07*qoM6N<$g0$tHT>t<8 diff --git a/qad/icons/code-word.png b/qad/icons/code-word.png index e61f08f080813b004102b916daad6934e361e137..3f6725a347e9850a922a3ac2e01984c9f192d331 100644 GIT binary patch literal 1818 zcmV+#2j%#QP)%Q9 zY=aG^*u*&Ok&b+QUY`5>&+~SkbH&zQ_9;@SbMPH+2lqkS4)*7brv~6zS44B&dU8qm z;u!-_Uc^&7bNsSA@f34SsOixu_E!35CkTK%tK zKH>uqO3fP*P1 z;TwF*>ob5E&*~d3rg&85JPPH4-?>{412o1P#H`(?0W{aG=lIXOab2-uDMij?ANbF(&084e^ z)2F)A9xtScOapUwUkEsT?If+9mnkycL}eIn@m~IZ z^EA)bzKW*Bw2*N@vk=l{0TBN^HF%QC;};nrG6*MRsI-?AbS%a%+jiiL*abWb3?>SiB)#nB(%BpI zefD-7eP%bubLXABnR?`{FB#=`zu3>+$X(tadY_}dqeMetbR{s*QPRSeHi2je0a&Ju z6}D-7cN0#Rfy-&&E-2)=&96{j_Ec?ndd=0AH!pWyc{_GHjb~jEp7J7k21fYCD(IC` z&fHdMnzmpvNsOhj&GuxTJGXkSnWnk%_=V$?xJo#-w~Idwy@x`gPzWJ044qIQj3xw8 z!aQ15jl*!_G)zq0$+MnTq#fkL8}IQ_Z5uzXFRhs|p~Q!So`Dgrht~QIANxVa{g}(U z2m9NTd9Gfw<~p#k`*Jt0)g7R3tdFviM?eQ%7Z{qxxv@_$G=UI;{&62=rR#8MtGG8k z$?({J`O)8A;Mcoe=SrZ5mulPCQROb50njrrLeIcRPHjG!r;H!5EX!haYLt6{Npz=< zFu;^Lg{BK3!Im~sNTjrpQgL>7>Hi%7+&} z!7MN^ojOjJL1CfEp6b24x}%Lsx929X0kDlcC0zylux545UweMq9;0^s7EIkq+-w#k?EwSu0iXZonPZe!Z^AGfls{BPZRKNhwH!-0><1YY%MY+^ zQ%ZfQ=F<(ORNZ3hMLr9dMe@Wx;EDM2zkrVxv;TZ1vSp+H0hC^piT%GZ$N&HU07*qo IM6N<$f0U8|m0D=P}&if9T zITS^aWFRQSQ47(5cxe)98Y~IjC(A){4xaV|D*o`p=HF}mtjpf4Z#Pv{N#j}WL{(`t z8Y&{pBXCNqR;vQw0$6L=+`7wI@#f`=_#7LEz+^HZyX3GO1S~Er((83Om(602j~R_d z430vg_y{HvjDSu;Zf%s=?+@Ag{FO{5!}tAPbPs-W{l-m3ON0tq^1W{^T_Eu~sZ0ZhAImZ*il>CP%RsT-LZwCiO_ z%s_;gysetIcon(QIcon(":/icons/f1.png")); lbl_help[1]->setText(trUtf8("Press F1 for details")); completer = new QTreeWidget(); - completer->setWindowFlags(Qt::Tool | Qt::FramelessWindowHint); + completer->setWindowFlags(Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint); completer->setFocusPolicy(Qt::NoFocus); completer->setColumnCount(2); completer->setRootIsDecorated(false); @@ -59,7 +59,7 @@ QCodeEdit::QCodeEdit(QWidget * parent): QWidget(parent) { (QHeaderView::ResizeToContents); completer->header()->setStretchLastSection(true); //completer->setColumnWidth(0, 180); - completer->resize(500, 200); + //completer->resize(500, 200); textCode = new QPlainTextEdit(); textLines = new QPlainTextEdit(); textCode->setFrameShadow(QFrame::Plain); @@ -794,11 +794,20 @@ void QCodeEdit::raiseHelp(QTextCursor tc, int arg) { } es_cursor.cursor = tc; applyExtraSelection(); - tc.movePosition(QTextCursor::Left, QTextCursor::MoveAnchor, st.size()); + //tc.movePosition(QTextCursor::StartOfWord, QTextCursor::MoveAnchor); lbl_help[0]->setFont(font()); + qApp->processEvents(); widget_help->resize(widget_help->sizeHint()); - widget_help->move(textCode->viewport()->mapToGlobal(textCode->cursorRect(tc).topLeft()/* - QPoint(0, widget_help->height() + 8)*/)); + qApp->processEvents(); + QRect whr = textCode->cursorRect(tc); + whr.setWidth(textCode->fontMetrics().width(st)); + QPoint whp; + whp.setX(whr.left() - whr.width() - (widget_help->width() - whr.width()) / 2); + whp.setY(whr.top() - widget_help->height() - (fontHeight() / 3)); + //qDebug() << whr << whp << widget_help->width() << ", " << st; + widget_help->move(textCode->viewport()->mapToGlobal(whp)); widget_help->show(); + widget_help->raise(); cursor_scope = scope.first; cursor_scope << scope.second; //qDebug() << "tooltip" << st; @@ -961,7 +970,15 @@ void QCodeEdit::invokeAutoCompletition(bool force) { completer->setCurrentItem(completer->topLevelItem(1)); if (completer->isHidden()) completer->move(textCode->mapToGlobal(textCode->cursorRect().bottomRight())); - completer->setVisible(completer->topLevelItemCount() > 0); + if (completer->topLevelItemCount() > 0) { + completer->setVisible(true); + //qApp->processEvents(); + int sz = completer->verticalScrollBar()->width(); + for (int i = 0; i < completer->header()->count(); ++i) + sz += qMax(sz, ((QAbstractItemView*)completer)->sizeHintForColumn(i)); + completer->resize(sz, fontHeight() * 16); + } else + completer->hide(); } diff --git a/qad/widgets/qvariantedit.cpp b/qad/widgets/qvariantedit.cpp index 9150f9a..6408901 100644 --- a/qad/widgets/qvariantedit.cpp +++ b/qad/widgets/qvariantedit.cpp @@ -111,7 +111,7 @@ PathEdit::PathEdit(QWidget * parent): QWidget(parent), lay(QBoxLayout::LeftToRig butt_select->setIcon(QIcon(":/icons/document-open.png")); butt_select->setToolTip(tr("Choose") + " ..."); lay.setContentsMargins(0, 0, 0, 0); - lay.setSpacing(2); + //lay.setSpacing(2); lay.addWidget(line); lay.addWidget(butt_select); connect(line, SIGNAL(textChanged(QString)), this, SIGNAL(valueChanged()));