From b050c23cd1ef467436c97fa3448678e25816b211 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Sat, 4 Aug 2012 04:36:00 +0000 Subject: [PATCH] 2012-08-03 21:30 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/resources/b_18.png * contrib/hbide/resources/b_19.png * contrib/hbide/resources/b_2.png * contrib/hbide/resources/b_5.png * contrib/hbide/resources/b_8.png % Reordered: to put more glamour to HbIDE. * contrib/hbide/edit.prg * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp ! Fixed: tab key was misbehaving on an empty line. ! Fixed: while in column mode, if the original text cursor was before logical cursor, insertion of any key was clearing the selection. An annoying bug it was. --- harbour/ChangeLog | 15 +++++++++ harbour/contrib/hbide/edit.prg | 6 +++- harbour/contrib/hbide/resources/b_18.png | Bin 589 -> 739 bytes harbour/contrib/hbide/resources/b_19.png | Bin 463 -> 742 bytes harbour/contrib/hbide/resources/b_2.png | Bin 742 -> 463 bytes harbour/contrib/hbide/resources/b_5.png | Bin 739 -> 755 bytes harbour/contrib/hbide/resources/b_8.png | Bin 755 -> 589 bytes .../hbqt/qtgui/hbqt_hbqplaintextedit.cpp | 31 ++++++++---------- 8 files changed, 34 insertions(+), 18 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index cdf13f49f6..c20138c5d9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,21 @@ The license applies to all entries newer than 2009-04-28. */ +2012-08-03 21:30 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbide/resources/b_18.png + * contrib/hbide/resources/b_19.png + * contrib/hbide/resources/b_2.png + * contrib/hbide/resources/b_5.png + * contrib/hbide/resources/b_8.png + % Reordered: to put more glamour to HbIDE. + + * contrib/hbide/edit.prg + * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp + ! Fixed: tab key was misbehaving on an empty line. + ! Fixed: while in column mode, if the original text cursor was + before logical cursor, insertion of any key was clearing the selection. + An annoying bug it was. + 2012-08-03 15:31 UTC+0200 Viktor Szakats (harbour syenar.net) + bin/commit.hb + bin/find.hb diff --git a/harbour/contrib/hbide/edit.prg b/harbour/contrib/hbide/edit.prg index a2c1ecf44a..b8e1994f96 100644 --- a/harbour/contrib/hbide/edit.prg +++ b/harbour/contrib/hbide/edit.prg @@ -1238,7 +1238,11 @@ METHOD IdeEdit:handleTab( key ) ENDIF cLine := ::getLine( nRow + 1 ) IF key == Qt_Key_Tab - cLine := substr( cLine, 1, nCol ) + cComment + substr( cLine, nCol + 1 ) + IF empty( cLine ) + cLine := cComment + ELSE + cLine := substr( cLine, 1, nCol ) + cComment + substr( cLine, nCol + 1 ) + ENDIF ELSE cLine := substr( cLine, 1, nCol - nLen ) + substr( cLine, nCol + 1 ) ENDIF diff --git a/harbour/contrib/hbide/resources/b_18.png b/harbour/contrib/hbide/resources/b_18.png index 8f57c1151d855943944c9a4c5bc03e6745d6e952..0f78b277040ebcbfddd8327f9ee3461abe99c26b 100644 GIT binary patch delta 726 zcmV;{0xA8?1mgve8Gi-<0051N9Sr~g0;)+wK~#9!)sp>7Q&AYl_pAO5>z}z1y=mb~ zzA;Ui3{59$IuQ|VYQE&1ZpVghYi%lXYu#;4WL*J8ur9}yg-UBuam6y2kky)(C!y0>^~6gQmY%=yYTb(A*7{0 zC}BCI|YXP_#T9PQYUF6$ra~@cqX=1@CVA2d@X zCSW2$v2Rq%FSme;C+UNc*{GlbwsemO?dCDKJ28VW6%?&wr3gmh9AW4H|EUUCZ!+@@ zCNp#m*Imi2#J-h-;fC0?MD|)xfr1QhlpkJ|3C@XN2p1n@1kJKcjw>y4yXB zPHz+|^nXoYXz2!}r=UENs;8(?haVIObPwC1t#?@L=(92E9J&_1{adIH1ffw0g4NvO2+$8F)1j2tyq}!B%ab=bxb?hdZ^YY$cZK(xAB$g#-!?0S?+ZV~9)J4__;|f?$kzoF`F5g| zDv43sZqY4>dsXK@_|j2XTGLNi$tfibbW2mEw0Z7UV%5nWI1~7SQAXwIF?*KUm|C9B zdYY7WJmYyw;vrwB9Jyndp%q%= zi-~jsqmpnZiGOrz5vzKIG8U>i${~jt1_s#lzc7QG&gnTIVc;zDxvx2apiD7B$PqF- z;L6lS*U$lOU|}pnDdn{x z(y~5!hFECo$({_Pg{l*`WGkQ^0`yG*y69NiLX)mq?SEFUV?^-jHiX+Oi-`j`&m`|(nkzCjuSNpNUH2(P14e#nngZF>=+KBX${hbKX|Nf$WB zFP!0w&by71-u|E(p2`ql0Px%yW>tQ;u2zwQ&jkaMtcAK$OCBVDCL15r_#!^3VS{RH zmz8x{l{n*aRE|wlrroF}Et^2#tI|zM7Q~tZ?G|qF`FAM z+|p~_wN1B`dYWnKV8}M#=4|OGYZ#hW3oAz<(=dX>lKVvr3A}Ni?sMTra8>;3fgksr z%Q?UEJm)#5;A*zeRH)GR)JOHDgT%iWV1v*4^JIzS!`U!9wtw=3#Mk1~NP48`QZj#L zK;@nH4)!MfoHywe9xnESD1*_JQHZU_V1}I*7CtU;=?`g=c$d0%p^VPZD*s$yE|?7P zfph?n!RG_;I6Dl}Z>L~&XBBeaa}sM`SU$6rNul)IG?^qrP}V!&3y3U?u0-MW&NA$A zd+_V`F`S&9z<>VHK5oFLHdExx^yw*@^2~ZTStbiHT}*Z3>jrQq9Gw0+MNlk7I?K*- zk!*xg2;Ffvp<}dgju2CX!{b9y#-mV@Z+?3Z2{tYai-l4Moe?M774HJEAc!oLQXXF( zhfFR5pAJ65!O;&%y!&$(UTtS#;>`qvUxZnO&`#`mSAWzEo}@>X{);la6vl-pl?sC_ zZNG%XdIAfEo8}clOVE;Udt`&|$!?U%{GU2Tied!&vJCK^Dum6xW>y58V@~LqVa}A| zokRi3@r&co;sXfI2b3wB?wd%xt6sQBDvM=sd@t55Fp~^X3K;{AR22nCaY#+E1pZSusyUriM{sVzWm>7(TvY9- zqslF1L~GKp*Bfr+5v@_fmYd6n-lnH;PQjIIe*sxITpd}tJI(+A002ovPDHLkV1ixM BTrL0r delta 438 zcmV;n0ZIPm1VG007YUO~0X(RtVuwiCd50&Q(caY20`O zy@YXRyn;JVL1NmpM`1%C8WU5b45h<#T(reWMb`Qr|GMBIAM_>Krbw}ZhJm*Z{6%n| zkG=?w6nKUWtm6?bFhQ#4g+oh%W$$EY*vAgGkzy0u*g%5sIDdEJxm6X3s`t7Q4ZCP! z4FN4|Vi$F!*vDga16>t~s!T@NYV1AEkqp^iG?@%64VeeMTyc(?tTS6>6=R| zjJ4HJpg@iSQ{=cp?zbG5*u+HJT(mGoZl*+m9683gKtKZl8HN~QVibL`NP;2|&d1#Lq! g2^t2D9r$nk0v&R6Yuwjh`Tzg`07*qoM6N<$g0k+wQ~&?~ diff --git a/harbour/contrib/hbide/resources/b_2.png b/harbour/contrib/hbide/resources/b_2.png index ede38b7a7e6b778886cc1b91ca11f6d5ee50f7f3..735feeed2b23e4147ba5f35357a57149e9e80f57 100644 GIT binary patch delta 438 zcmV;n0ZIPm1VG007YUO~0X(RtVuwiCd50&Q(caY20`O zy@YXRyn;JVL1NmpM`1%C8WU5b45h<#T(reWMb`Qr|GMBIAM_>Krbw}ZhJm*Z{6%n| zkG=?w6nKUWtm6?bFhQ#4g+oh%W$$EY*vAgGkzy0u*g%5sIDdEJxm6X3s`t7Q4ZCP! z4FN4|Vi$F!*vDga16>t~s!T@NYV1AEkqp^iG?@%64VeeMTyc(?tTS6>6=R| zjJ4HJpg@iSQ{=cp?zbG5*u+HJT(mGoZl*+m9683gKtKZl8HN~QVibL`NP;2|&d1#Lq! g2^t2D9r$nk0v&R6Yuwjh`Tzg`07*qoM6N<$g0k+wQ~&?~ delta 719 zcmV;=0xM7Q~tZ?G|qF`FAM z+|p~_wN1B`dYWnKV8}M#=4|OGYZ#hW3oAz<(=dX>lKVvr3A}Ni?sMTra8>;3fgksr z%Q?UEJm)#5;A*zeRH)GR)JOHDgT%iWV1v*4^JIzS!`U!9wtw=3#Mk1~NP48`QZj#L zK;@nH4)!MfoHywe9xnESD1*_JQHZU_V1}I*7CtU;=?`g=c$d0%p^VPZD*s$yE|?7P zfph?n!RG_;I6Dl}Z>L~&XBBeaa}sM`SU$6rNul)IG?^qrP}V!&3y3U?u0-MW&NA$A zd+_V`F`S&9z<>VHK5oFLHdExx^yw*@^2~ZTStbiHT}*Z3>jrQq9Gw0+MNlk7I?K*- zk!*xg2;Ffvp<}dgju2CX!{b9y#-mV@Z+?3Z2{tYai-l4Moe?M774HJEAc!oLQXXF( zhfFR5pAJ65!O;&%y!&$(UTtS#;>`qvUxZnO&`#`mSAWzEo}@>X{);la6vl-pl?sC_ zZNG%XdIAfEo8}clOVE;Udt`&|$!?U%{GU2Tied!&vJCK^Dum6xW>y58V@~LqVa}A| zokRi3@r&co;sXfI2b3wB?wd%xt6sQBDvM=sd@t55Fp~^X3K;{AR22nCaY#+E1pZSusyUriM{sVzWm>7(TvY9- zqslF1L~GKp*Bfr+5v@_fmYd6n-lnH;PQjIIe*sxITpd}tJI(+A002ovPDHLkV1ixM BTrL0r diff --git a/harbour/contrib/hbide/resources/b_5.png b/harbour/contrib/hbide/resources/b_5.png index 0f78b277040ebcbfddd8327f9ee3461abe99c26b..de7b7080d26b1aa62565dc709cbaac49a19b2588 100644 GIT binary patch delta 731 zcmV<10wn$81@i@vB!9X|L_t(I%hlAsZyZGw!13?SkGqQ2|nfuCY^6 zMsb8Y^B<&28UGEW%wJ(DBS6%2PICoFfFcp0Bqx$6ckA=5Z*TWz=PkvO1nC^5g^{M1 zk=|$CJn237udm>$%bG_qNxbiMeuyduLfWHUq1J+wt{v)*J%8n*co+=7$lnXr$$8() z{GRxWuV|Hp{RdX(iO`o~Ll`qdJ2WyzXONj^4SLE2ChFrI(9(*<($j8|KZ4ID9DG?8zkbPFwI^Q;#{DIA8(TXNLI;!jt=ZF*-HWG7>? zI~lo|(&0na>0(Ig78;B4g42+TBdcq2q|yW@TNP(lw%$+t+#i!Zn2;U>h-qQjAR$o^ zu~@W%0>_+!xpLKpB;Q|?-reh5AH8!p{K#4Vl2rWooas?Xx#{o$fJGBDZBQHRWQXoa zB%QBsvOjw7`1+Rb5@BO+PIl<yl! delta 715 zcmV;+0yO>e1>*&fB!8+&L_t(|+SQW%OH)x8$M>uL4eOt|5xr^QOTIBpnG8)QYB~`S zZEC*coo>g5Zfk8Sb8FpgO=d%xX^m?Rr57}ABo;+d+#(Z1*p2&ipF^x4?i7FZfiLHU z^L)XL}mIoZMx+6UCaKfZ-UU1CCd2cvD0)MepW-1!ZJr&IA;IynW zXd8Dw7Fp*bdBPikNnZ>+p#%hL*J8ur9}ynjH7F0YfU_6O}gX3*{zDeONG?NX~7+q>}d_aUUEKPUv#O6Qk&ar#Mu zQ33m`Ueagv$j1QDB8a~ZAf2W_3V$Pfg3ux_Kjacb1?;*v#rNC1FzO7VGElTU9ZtYv z@)ZcXd+`0oJ_YZ5{syb5EeOP(gJUkntAHK-R-u=5!GFk<{~t6{B_?1ZLa}dD%P+Tp zizn%Wk=dxA0=9II2<_%ExH~a}FclQ7W2Fd2;T&P;0RO29SZ^}(4JI>m4cTGH?#l|r zKZyW@K?LePGwyyDX!E@g%x_x8JYpBMKC^=dCW~O zxMOia=YSQOItM^+?2zhOy9nlLvW3yqqb=7rhVo0Qq{{{6po~y*v!240cA#)h_iiW` z<5|qnoD{W2leVm;f#erei5IVz%IB{X0_s9uF+>&aT`JUx3Y6ek&1oVp&ycIDZDxup x4dhyBHGj20C!myy`GSfXQdZr_;2F)CjK8@sY7?{e2~Ge2002ovPDHLkV1iE@RYd>* diff --git a/harbour/contrib/hbide/resources/b_8.png b/harbour/contrib/hbide/resources/b_8.png index de7b7080d26b1aa62565dc709cbaac49a19b2588..8f57c1151d855943944c9a4c5bc03e6745d6e952 100644 GIT binary patch delta 575 zcmV-F0>J(A1{adIH1ffw0g4NvO2+$8F)1j2tyq}!B%ab=bxb?hdZ^YY$cZK(xAB$g#-!?0S?+ZV~9)J4__;|f?$kzoF`F5g| zDv43sZqY4>dsXK@_|j2XTGLNi$tfibbW2mEw0Z7UV%5nWI1~7SQAXwIF?*KUm|C9B zdYY7WJmYyw;vrwB9Jyndp%q%= zi-~jsqmpnZiGOrz5vzKIG8U>i${~jt1_s#lzc7QG&gnTIVc;zDxvx2apiD7B$PqF- z;L6lS*U$lOU|}pnDdn{x z(y~5!hFECo$({_Pg{l*`WGkQ^0`yG*y69NiLX)mq?SEFUV?^-jHiX+Oi-`j`&m`|(nkzCjuSNpNUH2(P14e#nngZF>=+KBX${hbKX|Nf$WB zFP!0w&by71-u|E(p2`ql0Px%yW>tQ;u2zwQ&jkaMtcAK$OCBVDCL15r_#!^3VS{RH zmz8x{l{n*aRE|wlrroF}Et^2#tI|z+`K|Z}(>B zEya=q=^Uknk*1iD-e=xC={@+bui&c7nny87yzg~>h$;s{+JB>6q1J+wt{v)*J>{Z! z7!1G2-wW2sdEd+Yp7@KeXqB5boCPEqYB(uHO&KuB)J9K25Pyr5n{k9e&;C!<^AT<L^pw{gFmP6XbfIJD|nK@<0&?+0)L1v{BxmX@hnk4hkS$LbinGbyE(fz$JL!1=iCQ(Bp?G*`9^~A|S;2E?NU( zn@pW=YJZ9WEKYUEv9%I2Tmga81#a@B?;-(Qp7-CyfmAH8!p{K#4VlKl9b=}}3!>F@!7 zMH4h_P#f%Ihwe!vov&}QKYH)@`j+n!VPkJjcIfbf0@wQoO(X0uAv)E}AAZU0od4bW Y8^ZBGSD3>=BLDyZ07*qoM6N<$f+>1i6#xJL diff --git a/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp b/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp index 71c2e0ba14..1eb72790b2 100644 --- a/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp +++ b/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp @@ -1249,26 +1249,23 @@ bool HBQPlainTextEdit::hbKeyPressSelection( QKeyEvent * event ) } else if( ! ctrl && k >= ' ' && k < 127 && columnBegins >= 0 && selectionMode == selectionMode_column ) { - if( isCursorInSelection() ) + if( block ) { - if( block ) - { - PHB_ITEM p1 = hb_itemPutNI( NULL, 21013 ); - PHB_ITEM p2 = hbqt_bindGetHbObject( NULL, ( void * ) event, "HB_QKEYEVENT", NULL, 0 ) ; - hb_vmEvalBlockV( block, 2, p1, p2 ); - hb_itemRelease( p1 ); - hb_itemRelease( p2 ); + PHB_ITEM p1 = hb_itemPutNI( NULL, 21013 ); + PHB_ITEM p2 = hbqt_bindGetHbObject( NULL, ( void * ) event, "HB_QKEYEVENT", NULL, 0 ) ; + hb_vmEvalBlockV( block, 2, p1, p2 ); + hb_itemRelease( p1 ); + hb_itemRelease( p2 ); - if( columnBegins == columnEnds ) - { - columnBegins++; - columnEnds++; - hbPostSelectionInfo(); - } - event->accept(); - repaint(); - return true; + if( columnBegins == columnEnds ) + { + columnBegins++; + columnEnds++; + hbPostSelectionInfo(); } + event->accept(); + repaint(); + return true; } else {