Merge branch 'master' of https://github.com/tux3/toxgui

main.cpp

@@ -19,16 +19,12 @@ int main(int argc, char *argv[])
 /** TODO
  * ">using a dedicated tool to maintain a TODO list" edition
  *
- * Audio boilerplate, able to create/accept/reject/hang empty audio calls
- * Play received sound during audio calls
- * Record sound during audio calls, and send it
  * Sort the friend list by status, online first then busy then offline
  * Don't do anything if a friend is disconnected, don't print to the chat
  * Show the picture's size between name and size after transfer completion if it's a pic
  * Adjust all status icons to match the mockup, including scooting the friendslist ones to the left and making the user one the same size
  * Sidepanel (friendlist) should be resizeable
  * The online/offline/away status at the top (our) is way too big i think (follow the mockup/uTox)
- * Color change of friendlist widgets on hover/selected
  * In-chat messages should have line wrapping
  * An extra side panel for groupchats, like Venom does (?)
  *

widget/form/chatform.cpp

@@ -156,6 +156,7 @@ void ChatForm::addMessage(QLabel* author, QLabel* message, QLabel* date)
     lockSliderToBottom = scroll && scroll->value() == scroll->maximum();
     author->setAlignment(Qt::AlignTop | Qt::AlignRight);
     date->setAlignment(Qt::AlignTop);
+    message->setWordWrap(true);
     message->setTextInteractionFlags(Qt::TextBrowserInteraction);
     author->setTextInteractionFlags(Qt::TextBrowserInteraction);
     date->setTextInteractionFlags(Qt::TextBrowserInteraction);

widget/form/groupchatform.cpp

@@ -138,6 +138,7 @@ void GroupChatForm::addMessage(QLabel* author, QLabel* message, QLabel* date)
     lockSliderToBottom = scroll && scroll->value() == scroll->maximum();
     author->setAlignment(Qt::AlignTop | Qt::AlignLeft);
     date->setAlignment(Qt::AlignTop);
+    message->setWordWrap(true);
     message->setTextInteractionFlags(Qt::TextBrowserInteraction);
     author->setTextInteractionFlags(Qt::TextBrowserInteraction);
     date->setTextInteractionFlags(Qt::TextBrowserInteraction);