From 2914a9883c7167d31409e7e75ecb8403a54740ae Mon Sep 17 00:00:00 2001 From: krepa098 Date: Sun, 18 Jan 2015 12:20:13 +0100 Subject: [PATCH] ChatMessage::createTypingNotification, resized images to 18x18, new (spinning) notification icon --- src/chatlog/chatmessage.cpp | 14 ++++++-- src/chatlog/chatmessage.h | 1 + src/widget/form/chatform.cpp | 2 +- ui/chatArea/error.png | Bin 765 -> 510 bytes ui/chatArea/info.png | Bin 791 -> 511 bytes ui/chatArea/innerStyle.css | 4 +-- ui/chatArea/symbols.svg | 65 +++++++++++++++++++++++------------ ui/chatArea/typing.png | Bin 580 -> 613 bytes 8 files changed, 59 insertions(+), 27 deletions(-) diff --git a/src/chatlog/chatmessage.cpp b/src/chatlog/chatmessage.cpp index aece1a4d8..8d600cd5e 100644 --- a/src/chatlog/chatmessage.cpp +++ b/src/chatlog/chatmessage.cpp @@ -58,7 +58,7 @@ ChatMessage::Ptr ChatMessage::createChatMessage(const QString &sender, const QSt msg->addColumn(new Text(isAction ? "
*
" : sender, isMe ? Style::getFont(Style::BigBold) : Style::getFont(Style::Big), isAction ? false : true, sender), ColumnFormat(NAME_COL_WIDTH, ColumnFormat::FixedSize, ColumnFormat::Right)); msg->addColumn(new Text(text, Style::getFont(Style::Big), false, isAction ? QString("*%1 %2*").arg(sender, rawMessage) : rawMessage), ColumnFormat(1.0, ColumnFormat::VariableSize)); - msg->addColumn(new Spinner(QSizeF(16, 16)), ColumnFormat(TIME_COL_WIDTH, ColumnFormat::FixedSize, ColumnFormat::Right)); + msg->addColumn(new Spinner(":/ui/chatArea/spinner.png", QSizeF(16, 16), 8.0), ColumnFormat(TIME_COL_WIDTH, ColumnFormat::FixedSize, ColumnFormat::Right)); if(!date.isNull()) msg->markAsSent(date); @@ -78,7 +78,7 @@ ChatMessage::Ptr ChatMessage::createChatInfoMessage(const QString &rawMessage, S case TYPING: img = ":/ui/chatArea/typing.png"; break; } - msg->addColumn(new Image(QSizeF(20, 20), img), ColumnFormat(NAME_COL_WIDTH, ColumnFormat::FixedSize, ColumnFormat::Right)); + msg->addColumn(new Image(QSizeF(18, 18), img), ColumnFormat(NAME_COL_WIDTH, ColumnFormat::FixedSize, ColumnFormat::Right)); msg->addColumn(new Text(rawMessage, Style::getFont(Style::Big), false, ""), ColumnFormat(1.0, ColumnFormat::VariableSize, ColumnFormat::Center)); msg->addColumn(new Text(date.toString(Settings::getInstance().getTimestampFormat()), Style::getFont(Style::Big)), ColumnFormat(TIME_COL_WIDTH, ColumnFormat::FixedSize, ColumnFormat::Right)); @@ -96,6 +96,16 @@ ChatMessage::Ptr ChatMessage::createFileTransferMessage(const QString& sender, T return msg; } +ChatMessage::Ptr ChatMessage::createTypingNotification() +{ + ChatMessage::Ptr msg = ChatMessage::Ptr(new ChatMessage); + + msg->addColumn(new Spinner(":/ui/chatArea/typing.png", QSizeF(18, 18), 6.0), ColumnFormat(NAME_COL_WIDTH, ColumnFormat::FixedSize, ColumnFormat::Right)); + msg->addColumn(new Text("%1 ...", Style::getFont(Style::Big), false, ""), ColumnFormat(1.0, ColumnFormat::VariableSize, ColumnFormat::Left)); + + return msg; +} + void ChatMessage::markAsSent(const QDateTime &time) { // remove the spinner and replace it by $time diff --git a/src/chatlog/chatmessage.h b/src/chatlog/chatmessage.h index c03ed8991..2fba9e68b 100644 --- a/src/chatlog/chatmessage.h +++ b/src/chatlog/chatmessage.h @@ -40,6 +40,7 @@ public: static ChatMessage::Ptr createChatMessage(const QString& sender, const QString& rawMessage, bool isAction, bool alert, bool isMe, const QDateTime& date = QDateTime()); static ChatMessage::Ptr createChatInfoMessage(const QString& rawMessage, SystemMessageType type, const QDateTime& date); static ChatMessage::Ptr createFileTransferMessage(const QString& sender, ToxFile file, bool isMe, const QDateTime& date); + static ChatMessage::Ptr createTypingNotification(); void markAsSent(const QDateTime& time); QString toString() const; diff --git a/src/widget/form/chatform.cpp b/src/widget/form/chatform.cpp index 8e5138a4a..805bf5c8a 100644 --- a/src/widget/form/chatform.cpp +++ b/src/widget/form/chatform.cpp @@ -59,7 +59,7 @@ ChatForm::ChatForm(Friend* chatFriend) netcam = new NetCamView(); timer = nullptr; - chatWidget->setTypingNotification(ChatMessage::createChatInfoMessage("", ChatMessage::TYPING, QDateTime())); + chatWidget->setTypingNotification(ChatMessage::createTypingNotification()); headTextLayout->addWidget(statusMessageLabel); headTextLayout->addStretch(); diff --git a/ui/chatArea/error.png b/ui/chatArea/error.png index 06686cd6cfc5de2f50d81aea41d1b75bd8c5aa4e..52f96da3f7358bcc0b2df77f109d3dc9c8d38d18 100644 GIT binary patch delta 461 zcmV;;0W$vm1^xpeiBL{Q4GJ0x0000DNk~Le0000I0000I2nGNE09MY9SCJta3jp5$ z007?s53OO2kwzzf0eeYAK~y-6t(3h=13?spzk9R02>yYErNk712pS?u=OaY0(AL(@ z(n3MR03WlHg(y1wk|=5C&Xr{E@sVy6agon6p_;b) zs#+?BVbcRh&cxZy*~$tAcp@&_Pu8xai)FaTgOlfnO`%@%YcW3>B6tnu+6tlVtG{)r! zG&Gr=))<^tsa9(%fU52S{XanZ$=Z(*DTZMak&3G_P-S^)ido$e@TMKaVH3>Bj&$K`OOB;V@#G=bSdav)y?8J-yZd_Cgs8FEjhghq9(HHG`MqUk zzWIidkVqttve_y6z6;5XzBOcRW2I0yL&5Np2m`F!wT1BaQ6N9iNTg}zR^B~?Z4td>gUfeajb-ek*|T}o?-z_)#nm9a3~eqApA zif!Qg=H`--$^d2_0`F2SB)vDq;z?fv5&Ro~iARFBbs3UxZ=1Mb;Mnsfeewrl{Q1}O zb9}DX@h1#_VMxrT)A%qy-!H6YrRDDFFx{;!V|L@f0pNG5g-hSZbr|9*2vEPijuSQ$ zF*@oPh*o>-1^2>QJTnFaU`b4lkH?Cmw04-ucwO(pUM`n<)oh+5-fDwNs{VAGrLBBE zFaR*!Y_1Ot4glmrl-N2`kVz8X3d5dH!la%701J|T^1O|>QMIcpysK7ww!NR5!{S7| z-79hfB+XGaJB9mm`yB;I53l>>9%ZvrmcH*M8FDtA#;3(a0Kk`e9hHlVfgRBIT?@$t z89T_3co}WEbSgD48~`A>rhl)el>ylp8J%nxSvxWVvbJGX3WYNOqcG7}DHP5OBt>P^ zP(^8fAClUOurzD~ZKeT$Q^z@g)H}UBg{11K;~aDhY~}NT$ep3_$(?q^+{pv0rBYdB zWeD&}ccpwI5sii6Hh|g_@@o;JqX!kGp@hpIfFz6=gXjNF&HangTPB85miIgh-V}=` zR$6|HH6gNMrR835;D5fFb!()T)4LImdp-XZ3;VQUz>4JErT_o{07*qoM6N<$f*UeU ATL1t6 diff --git a/ui/chatArea/info.png b/ui/chatArea/info.png index 47e7b0f3dbf28964c25b5f5d9fd9ace63babb1d3..67a1e255d257789b3d4ede7963a6eed54c61a32b 100644 GIT binary patch delta 462 zcmV;<0WtoU2LA&giBL{Q4GJ0x0000DNk~Le0000I0000I2nGNE09MY9SCJta3jp5$ z007?s53OO2kwzzf0eneBK~y-6t(4CzL{SvSKli@(5QS2jh19UI5SkH%l!XmzvtzQx z%97O7%wA2iC6@dL7K&s+GwJ;Sek9Q=3#l3VL4N#ka z^Mgo;DoECQD(4Os4txL|GJ!}YD&o1%JYIT4oI9X0^_ee@f^{xTPL9^jczdoezcYi~ zVtsQa7Gs5p-76a)xD(?#v)hx12-?;r+6iWd)#}M&T$FWf>UyvE_!YlC(PpC^qZms3 zJ{zSIMi#h#JAUB)?2(t-SCT7(^i0OgjY=nU_)bjdpX+6OefTH(69P%I*FQijC^jmh zps0~rsbM=(E9oFRZUZuIetQ2#1BgW$sQy8u8qC%sQV*bHO`Y1&bPaUU+|guUB^!p< z4olusIoBO)B^ui1_9mvbM!z`;LmL+U{~L+ow;$UT2NqbJKf)<~CjbBd07*qoM6N<$ Ef@S2%EdT%j delta 744 zcmV{I&hbH6QWLqhZ0eQ@L+*A zPg>wbFgzR4@YLB9x(H$?AxJO}LdYacsH+{?p>hy2CIq2WZtuNchiy97a&Mc?zOci1 z`~N?mxA*`5-tRA}N+l6QCe}tnULYNIM8W{JYSLta$?3j-xs+1bgyKhFYJJMywG;iK zdKVZ_Xe%wp4zQvk%dJjiHQEz(Y8DvZ7#T#(6QHB4>G8x7Z*sP4VW}#CvCZL-<=Km< z_ErckB1p_N&d{@)&r`ky9=y4KO@&uLq$c=L5~AFh>7L&zE0BY~1)5F?p3j~rw~8f> z35;zHhb-5BdXJAg|ML1PA76aJ&3K4`=13D=k8hM4mT)b%v+!}4!mE~NFZzK4{QiDG zdOw4E;Ntvp+5h&_&#*|2ahOAa>}vPF;DXHo>?6p3RXE@AGG57#dj6|$o@omr!*iekQS=tXjegq{Fr&684V=F+xMjMF8x^K-F-7O4(-;W2;vGAJ!OKHEB#H zcy0oJCKF7W>AtyCu9K;21a_wT=29lt!>!a?09a8}4S + @@ -46,7 +53,7 @@ id="flowPara2994">! + id="info"> i + id="error"> i + + + + + id="notification"> - - + d="m 494.05192,469.82629 a 2.5618966,2.5618966 0 1 1 -5.1238,0 2.5618966,2.5618966 0 1 1 5.1238,0 z" + transform="matrix(8.782556,0,0,8.782556,-3756.8812,-3871.6691)" + id="path3806-4" + style="fill:#6bc260;fill-opacity:1;stroke:none" /> + + diff --git a/ui/chatArea/typing.png b/ui/chatArea/typing.png index 8e0f08478c6abfdca4a5c77affa3cb9879ef3230..d103baa5bb4f1819b3fa5aebae9b380b2980bebc 100644 GIT binary patch delta 562 zcmV-20?qxz1my%FiBL{Q4GJ0x0000DNk~Le0000I0000I2nGNE09MY9SCJtb3Vr|p z0)7Gh>gy_zMks&cNklA$ty9=ezQgCn-ad9)n)Ph9uYv__OLuPR* zLJ$Y3e}fc3YCt+!p;M)WETw|@MTkf#6%{&!E+TC%Fm>5(}}49_W*;)u6lWLd+x*D`Ac_7rJQ)btZ)Z# zK*K;~rdDgp?#KBX#_$7}7H?UYJ6y#EShhPaM#E*lxkQa}Qbkw}-%hUxus zKmst~j9HRz_4z+2S5rpVo9t#L4_?ESOy*yT2%vf$p>muO0=U+A*Nu0(j{Z#2>Npa7 z{Q{s7$H_^YBqzWHznyyIj9o-%2f~g~R~c*!RDe!^Yg=mMB}KN2Ehkb&d)g}_%VBGqyRgnKyx8y|n~aC%TUT-*k1e5_z0m9Dvz z(i}eFU`y(onF2hMaYH*8ESFx+y;$@2B@H|)UUPVy0rnGzi^Aa)wld)E74KHO&H(#{ z-9_PWIRh+kr8chs*gRGDRd~S)YWC;rydDkOitM;U4*Y>M^>}{?+-FAM@a8EM8 zHgKRQ9L|4afCcU}YV-t_@IC|VGj=xV^wkiHIGK@mGa|k>zU{%aU8=)ln`>`P94<>Z zw~Rd*dDmj}HI31+YlrYdyK5^sdR;qr33Dwu>#B{pJ$k6Q^Qtava_v^GR_Dj`l+sar zRBb1l>Q1iWNJMPpX!X$$_c4ndBe3VHa~v$?f}vUShPa@vaq_kK3xE z-^8(L^m@4(rj+*KTtqyYMrSsqbhRU<$@ns@KvLC4AMq+8&Q2pR#HBhr{%g43PCV_v TNlnKL00000NkvXXu0mjfVbbk@