From 5662aa933f1beb6c0fe58b3d6a7b84c6cf06e999 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Fri, 26 Sep 2014 16:39:29 +0200
Subject: [PATCH 01/18] Added MaskablePixmapWidget, improved avatar rendering

---
 img/avatar_mask.png             | Bin 0 -> 5766 bytes
 img/avatar_mask_circle.png      | Bin 0 -> 9310 bytes
 mainwindow.ui                   |  51 +++++++++-----------------
 qtox.pro                        |   5 +--
 res.qrc                         |   2 ++
 widget/form/chatform.cpp        |   7 ++--
 widget/form/genericchatform.cpp |   5 +--
 widget/form/genericchatform.h   |   3 +-
 widget/form/groupchatform.cpp   |   3 +-
 widget/friendwidget.cpp         |  17 ++++-----
 widget/friendwidget.h           |   4 ++-
 widget/maskablepixmapwidget.cpp |  61 ++++++++++++++++++++++++++++++++
 widget/maskablepixmapwidget.h   |  45 +++++++++++++++++++++++
 widget/tool/clickablelabel.h    |  22 ------------
 widget/widget.cpp               |  10 ++++--
 widget/widget.h                 |   2 ++
 16 files changed, 160 insertions(+), 77 deletions(-)
 create mode 100644 img/avatar_mask.png
 create mode 100644 img/avatar_mask_circle.png
 create mode 100644 widget/maskablepixmapwidget.cpp
 create mode 100644 widget/maskablepixmapwidget.h
 delete mode 100644 widget/tool/clickablelabel.h

diff --git a/img/avatar_mask.png b/img/avatar_mask.png
new file mode 100644
index 0000000000000000000000000000000000000000..508914f0425838a3c1b5496ff87ff6388115ace3
GIT binary patch
literal 5766
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%0D7#ii&y1dD
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

literal 0
HcmV?d00001

diff --git a/img/avatar_mask_circle.png b/img/avatar_mask_circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..83cb97dfc4e3874237965d1d0a961bd1cbb91592
GIT binary patch
literal 9310
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
Y0mJiXsCyH)76`atVPjr)#xv>v0GYp#bpQYW

literal 0
HcmV?d00001

diff --git a/mainwindow.ui b/mainwindow.ui
index 845a0c728..a197594bd 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>716</width>
-    <height>543</height>
+    <width>714</width>
+    <height>541</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -1452,32 +1452,20 @@ QSplitter:handle{
               <number>0</number>
              </property>
              <item>
-              <widget class="ClickableLabel" name="profilePicture">
-               <property name="minimumSize">
+              <spacer name="horizontalSpacer_4">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Maximum</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
                 <size>
-                 <width>40</width>
-                 <height>40</height>
+                 <width>5</width>
+                 <height>20</height>
                 </size>
                </property>
-               <property name="maximumSize">
-                <size>
-                 <width>40</width>
-                 <height>40</height>
-                </size>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="pixmap">
-                <pixmap resource="res.qrc">:/img/contact.png</pixmap>
-               </property>
-               <property name="scaledContents">
-                <bool>false</bool>
-               </property>
-               <property name="wordWrap">
-                <bool>true</bool>
-               </property>
-              </widget>
+              </spacer>
              </item>
              <item>
               <layout class="QVBoxLayout" name="verticalLayout" stretch="1,1">
@@ -2095,8 +2083,8 @@ QSplitter:handle{
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>263</width>
-             <height>378</height>
+             <width>262</width>
+             <height>375</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_5"/>
@@ -3230,8 +3218,8 @@ QSplitter:handle{
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>716</width>
-     <height>19</height>
+     <width>714</width>
+     <height>25</height>
     </rect>
    </property>
   </widget>
@@ -3257,11 +3245,6 @@ QSplitter:handle{
    <extends>QLabel</extends>
    <header>widget/croppinglabel.h</header>
   </customwidget>
-  <customwidget>
-   <class>ClickableLabel</class>
-   <extends>QLabel</extends>
-   <header>widget/tool/clickablelabel.h</header>
-  </customwidget>
  </customwidgets>
  <resources>
   <include location="res.qrc"/>
diff --git a/qtox.pro b/qtox.pro
index 6b63a9835..c5bf81c1b 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -117,7 +117,7 @@ HEADERS  += widget/form/addfriendform.h \
     widget/tool/chatactions/messageaction.h \
     widget/tool/chatactions/filetransferaction.h \
     widget/tool/chatactions/systemmessageaction.h \
-    widget/tool/clickablelabel.h
+    widget/maskablepixmapwidget.h
 
 SOURCES += \
     widget/form/addfriendform.cpp \
@@ -157,4 +157,5 @@ SOURCES += \
     widget/settingsdialog.cpp \
     widget/tool/chatactions/messageaction.cpp \
     widget/tool/chatactions/filetransferaction.cpp \
-    widget/tool/chatactions/systemmessageaction.cpp
+    widget/tool/chatactions/systemmessageaction.cpp \
+    widget/maskablepixmapwidget.cpp
diff --git a/res.qrc b/res.qrc
index b1b50df58..62b891ee6 100644
--- a/res.qrc
+++ b/res.qrc
@@ -142,5 +142,7 @@
         <file>translations/pl.qm</file>
         <file>translations/fi.qm</file>
         <file>translations/mannol.qm</file>
+        <file>img/avatar_mask.png</file>
+        <file>img/avatar_mask_circle.png</file>
     </qresource>
 </RCC>
diff --git a/widget/form/chatform.cpp b/widget/form/chatform.cpp
index 83f9a9892..f659240da 100644
--- a/widget/form/chatform.cpp
+++ b/widget/form/chatform.cpp
@@ -22,6 +22,7 @@
 #include <QMimeData>
 #include <QFileInfo>
 #include <QDragEnterEvent>
+#include <QBitmap>
 #include "chatform.h"
 #include "friend.h"
 #include "widget/friendwidget.h"
@@ -32,12 +33,13 @@
 #include "widget/tool/chattextedit.h"
 #include "core.h"
 #include "widget/widget.h"
+#include "widget/maskablepixmapwidget.h"
 
 ChatForm::ChatForm(Friend* chatFriend)
     : f(chatFriend)
 {
     nameLabel->setText(f->getName());
-    avatarLabel->setPixmap(QPixmap(":/img/contact_dark.png"));
+    avatar->setPixmap(QPixmap(":/img/contact_dark.png"));
 
     statusMessageLabel = new CroppingLabel();
     netcam = new NetCamView();
@@ -475,8 +477,7 @@ void ChatForm::onAvatarChange(int FriendId, const QPixmap &pic)
     if (FriendId != f->friendId)
         return;
 
-    QPixmap scaled = pic.scaled(40,40,Qt::KeepAspectRatio,Qt::SmoothTransformation);
-    avatarLabel->setPixmap(scaled);
+    avatar->setPixmap(pic);
 }
 
 void ChatForm::dragEnterEvent(QDragEnterEvent *ev)
diff --git a/widget/form/genericchatform.cpp b/widget/form/genericchatform.cpp
index cff9e3b50..1f7b827f7 100644
--- a/widget/form/genericchatform.cpp
+++ b/widget/form/genericchatform.cpp
@@ -26,6 +26,7 @@
 #include "widget/tool/chatactions/systemmessageaction.h"
 #include "widget/chatareawidget.h"
 #include "widget/tool/chattextedit.h"
+#include "widget/maskablepixmapwidget.h"
 
 GenericChatForm::GenericChatForm(QWidget *parent) :
     QWidget(parent)
@@ -35,7 +36,7 @@ GenericChatForm::GenericChatForm(QWidget *parent) :
     headWidget = new QWidget();
 
     nameLabel = new CroppingLabel();
-    avatarLabel = new QLabel();
+    avatar = new MaskablePixmapWidget(this, QSize(40,40), ":/img/avatar_mask_circle.png");
     QHBoxLayout *headLayout = new QHBoxLayout(), *mainFootLayout = new QHBoxLayout();
     headTextLayout = new QVBoxLayout();
     QVBoxLayout *mainLayout = new QVBoxLayout();
@@ -99,7 +100,7 @@ GenericChatForm::GenericChatForm(QWidget *parent) :
     mainFootLayout->setSpacing(0);
 
     headWidget->setLayout(headLayout);
-    headLayout->addWidget(avatarLabel);
+    headLayout->addWidget(avatar);
     headLayout->addLayout(headTextLayout);
     headLayout->addLayout(volMicLayout);
     headLayout->addWidget(callButton);
diff --git a/widget/form/genericchatform.h b/widget/form/genericchatform.h
index c824d5e85..d45bf1072 100644
--- a/widget/form/genericchatform.h
+++ b/widget/form/genericchatform.h
@@ -30,6 +30,7 @@ class QPushButton;
 class CroppingLabel;
 class ChatTextEdit;
 class ChatAreaWidget;
+class MaskablePixmapWidget;
 
 namespace Ui {
     class MainWindow;
@@ -60,7 +61,7 @@ protected slots:
 
 protected:
     CroppingLabel *nameLabel;
-    QLabel *avatarLabel;
+    MaskablePixmapWidget *avatar;
     QWidget *headWidget;
     QPushButton *fileButton, *emoteButton, *callButton, *videoButton, *volButton, *micButton;
     QVBoxLayout *headTextLayout;
diff --git a/widget/form/groupchatform.cpp b/widget/form/groupchatform.cpp
index 4dc6c7e0d..7622f2cf0 100644
--- a/widget/form/groupchatform.cpp
+++ b/widget/form/groupchatform.cpp
@@ -19,6 +19,7 @@
 #include "widget/groupwidget.h"
 #include "widget/tool/chattextedit.h"
 #include "widget/croppinglabel.h"
+#include "widget/maskablepixmapwidget.h"
 #include "core.h"
 #include <QPushButton>
 #include <QMimeData>
@@ -42,7 +43,7 @@ GroupChatForm::GroupChatForm(Group* chatGroup)
     nameLabel->setText(group->widget->name.text());
     nusersLabel->setFont(small);
     nusersLabel->setText(GroupChatForm::tr("%1 users in chat","Number of users in chat").arg(group->peers.size()));
-    avatarLabel->setPixmap(QPixmap(":/img/group_dark.png"));
+    avatar->setPixmap(QPixmap(":/img/group_dark.png"));
 
     QString names;
     for (QString& s : group->peers)
diff --git a/widget/friendwidget.cpp b/widget/friendwidget.cpp
index 869bc4192..c15ee03cc 100644
--- a/widget/friendwidget.cpp
+++ b/widget/friendwidget.cpp
@@ -22,11 +22,13 @@
 #include "friend.h"
 #include "core.h"
 #include "widget/form/chatform.h"
+#include "widget/maskablepixmapwidget.h"
 #include <QContextMenuEvent>
 #include <QMenu>
 #include <QDrag>
 #include <QMimeData>
 #include <QApplication>
+#include <QBitmap>
 
 FriendWidget::FriendWidget(int FriendId, QString id)
     : friendId(FriendId), isDefaultAvatar{true}
@@ -42,7 +44,8 @@ FriendWidget::FriendWidget(int FriendId, QString id)
     textLayout.setMargin(0);
     setLayoutDirection(Qt::LeftToRight); // parent might have set Qt::RightToLeft
 
-    avatar.setPixmap(QPixmap(":img/contact.png"));
+    avatar = new MaskablePixmapWidget(this, QSize(40,40), ":/img/avatar_mask.png");
+    avatar->setPixmap(QPixmap(":img/contact.png"));
     name.setText(id);
     //statusPic.setAlignment(Qt::AlignHCenter);
     statusPic.setPixmap(QPixmap(":img/status/dot_away.png"));
@@ -65,7 +68,7 @@ FriendWidget::FriendWidget(int FriendId, QString id)
     textLayout.addStretch();
 
     layout.addSpacing(20);
-    layout.addWidget(&avatar);
+    layout.addWidget(avatar);
     layout.addSpacing(5);
     layout.addLayout(&textLayout);
     layout.addSpacing(5);
@@ -138,7 +141,7 @@ void FriendWidget::setAsActiveChatroom()
     pal3.setColor(QPalette::Background, Qt::white);
     this->setPalette(pal3);
     if (isDefaultAvatar)
-       avatar.setPixmap(QPixmap(":img/contact_dark.png"));
+       avatar->setPixmap(QPixmap(":img/contact_dark.png"));
 }
 
 void FriendWidget::setAsInactiveChatroom()
@@ -159,7 +162,7 @@ void FriendWidget::setAsInactiveChatroom()
     this->setPalette(pal3);
 
     if (isDefaultAvatar)
-        avatar.setPixmap(QPixmap(":img/contact.png"));
+        avatar->setPixmap(QPixmap(":img/contact.png"));
 }
 
 void FriendWidget::updateStatusLight()
@@ -203,8 +206,7 @@ void FriendWidget::onAvatarChange(int FriendId, const QPixmap& pic)
         return;
 
     isDefaultAvatar = false;
-    QPixmap scaled = pic.scaled(40,40,Qt::KeepAspectRatio,Qt::SmoothTransformation);
-    avatar.setPixmap(scaled);
+    avatar->setPixmap(pic);
 }
 
 void FriendWidget::mousePressEvent(QMouseEvent *ev)
@@ -225,8 +227,7 @@ void FriendWidget::mouseMoveEvent(QMouseEvent *ev)
         mdata->setData("friend", QString::number(friendId).toLatin1());
 
         drag->setMimeData(mdata);
-        if (avatar.pixmap())
-            drag->setPixmap(*avatar.pixmap());
+        drag->setPixmap(avatar->getPixmap());
 
         drag->exec(Qt::CopyAction | Qt::MoveAction);
     }
diff --git a/widget/friendwidget.h b/widget/friendwidget.h
index aa225d533..4cfef368e 100644
--- a/widget/friendwidget.h
+++ b/widget/friendwidget.h
@@ -23,6 +23,7 @@
 #include "croppinglabel.h"
 
 class QPixmap;
+class MaskablePixmapWidget;
 
 struct FriendWidget : public GenericChatroomWidget
 {
@@ -50,7 +51,8 @@ protected:
 
 public:
     int friendId;
-    QLabel avatar, statusPic;
+    MaskablePixmapWidget* avatar;
+    QLabel statusPic;
     CroppingLabel name, statusMessage;
     bool isDefaultAvatar;
     QPoint dragStartPos;
diff --git a/widget/maskablepixmapwidget.cpp b/widget/maskablepixmapwidget.cpp
new file mode 100644
index 000000000..6fdd3f03b
--- /dev/null
+++ b/widget/maskablepixmapwidget.cpp
@@ -0,0 +1,61 @@
+/*
+    Copyright (C) 2014 by Project Tox <https://tox.im>
+
+    This file is part of qTox, a Qt-based graphical interface for Tox.
+
+    This program is libre software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+    See the COPYING file for more details.
+*/
+
+#include "maskablepixmapwidget.h"
+#include <QPainter>
+#include <QPaintEvent>
+
+MaskablePixmapWidget::MaskablePixmapWidget(QWidget *parent, QSize size, QString maskName)
+    : QWidget(parent)
+{
+    setMinimumSize(size);
+    setMaximumSize(size);
+
+    mask = QPixmap(maskName).scaled(maximumSize(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+}
+
+void MaskablePixmapWidget::setPixmap(const QPixmap &pmap)
+{
+    pixmap = pmap.scaled(maximumSize(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
+}
+
+QPixmap MaskablePixmapWidget::getPixmap() const
+{
+    return pixmap;
+}
+
+void MaskablePixmapWidget::paintEvent(QPaintEvent *ev)
+{
+    QPixmap tmp(ev->rect().size());
+    tmp.fill(Qt::transparent);
+
+    QPoint offset((ev->rect().size().width()-pixmap.size().width())/2,(ev->rect().size().height()-pixmap.size().height())/2);
+
+    QPainter painter(&tmp);
+    painter.setCompositionMode(QPainter::CompositionMode_Source);
+    painter.drawPixmap(offset,pixmap);
+    painter.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+    painter.drawPixmap(0,0,mask);
+
+    painter.end();
+    painter.begin(this);
+    painter.drawPixmap(0,0,tmp);
+}
+
+void MaskablePixmapWidget::mousePressEvent(QMouseEvent*)
+{
+    emit clicked();
+}
diff --git a/widget/maskablepixmapwidget.h b/widget/maskablepixmapwidget.h
new file mode 100644
index 000000000..359b1ab00
--- /dev/null
+++ b/widget/maskablepixmapwidget.h
@@ -0,0 +1,45 @@
+/*
+    Copyright (C) 2014 by Project Tox <https://tox.im>
+
+    This file is part of qTox, a Qt-based graphical interface for Tox.
+
+    This program is libre software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+    See the COPYING file for more details.
+*/
+
+#ifndef MASKABLEPIXMAPWIDGET_H
+#define MASKABLEPIXMAPWIDGET_H
+
+#include <QWidget>
+
+class MaskablePixmapWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    MaskablePixmapWidget(QWidget *parent, QSize size, QString maskName);
+
+    void setPixmap(const QPixmap &pmap);
+    QPixmap getPixmap() const;
+
+signals:
+    void clicked();
+
+protected:
+    virtual void paintEvent(QPaintEvent *ev);
+    virtual void mousePressEvent(QMouseEvent *);
+
+private:
+    QPixmap pixmap;
+    QPixmap mask;
+    QSize size;
+    QString maskName;
+};
+
+#endif // MASKABLEPIXMAPWIDGET_H
diff --git a/widget/tool/clickablelabel.h b/widget/tool/clickablelabel.h
deleted file mode 100644
index 99e523b20..000000000
--- a/widget/tool/clickablelabel.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef CLICKABLELABEL_H
-#define CLICKABLELABEL_H
-
-#include <QLabel>
-
-class QMouseEvent;
-class QWidget;
-
-class ClickableLabel : public QLabel
-{
-Q_OBJECT
-
-public:
-    explicit ClickableLabel(QWidget* parent = 0) : QLabel(parent) {}
-signals:
-    void clicked();
-protected:
-    void mousePressEvent (QMouseEvent*) {emit clicked();}
-};
-
-
-#endif // CLICKABLELABEL_H
diff --git a/widget/widget.cpp b/widget/widget.cpp
index 88128d8ac..da034ace2 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -32,6 +32,7 @@
 #include "camera.h"
 #include "widget/form/chatform.h"
 #include "widget/settingsdialog.h"
+#include "widget/maskablepixmapwidget.h"
 #include <QMessageBox>
 #include <QDebug>
 #include <QFile>
@@ -111,6 +112,10 @@ Widget::Widget(QWidget *parent)
 
     isWindowMinimized = 0;
 
+    profilePicture = new MaskablePixmapWidget(this, QSize(40,40), ":/img/avatar_mask.png");
+    profilePicture->setPixmap(QPixmap(":/img/avatar.png"));
+    ui->horizontalLayout_3->insertWidget(0,profilePicture);
+
     ui->mainContent->setLayout(new QVBoxLayout());
     ui->mainHead->setLayout(new QVBoxLayout());
     ui->mainHead->layout()->setMargin(0);
@@ -214,7 +219,7 @@ Widget::Widget(QWidget *parent)
     connect(ui->settingsButton, SIGNAL(clicked()), this, SLOT(onSettingsClicked()));
     connect(ui->nameLabel, SIGNAL(textChanged(QString,QString)), this, SLOT(onUsernameChanged(QString,QString)));
     connect(ui->statusLabel, SIGNAL(textChanged(QString,QString)), this, SLOT(onStatusMessageChanged(QString,QString)));
-    connect(ui->profilePicture, SIGNAL(clicked()), this, SLOT(onAvatarClicked()));
+    connect(profilePicture, SIGNAL(clicked()), this, SLOT(onAvatarClicked()));
     connect(setStatusOnline, SIGNAL(triggered()), this, SLOT(setStatusOnline()));
     connect(setStatusAway, SIGNAL(triggered()), this, SLOT(setStatusAway()));
     connect(setStatusBusy, SIGNAL(triggered()), this, SLOT(setStatusBusy()));
@@ -322,8 +327,7 @@ void Widget::onAvatarClicked()
 
 void Widget::onSelfAvatarLoaded(const QPixmap& pic)
 {
-    QPixmap scaled = pic.scaled(40,40, Qt::KeepAspectRatio,Qt::SmoothTransformation);
-    ui->profilePicture->setPixmap(scaled);
+    profilePicture->setPixmap(pic);
 }
 
 void Widget::onConnected()
diff --git a/widget/widget.h b/widget/widget.h
index 352e12cfa..dd6c8180e 100644
--- a/widget/widget.h
+++ b/widget/widget.h
@@ -38,6 +38,7 @@ class Core;
 class Camera;
 class FriendListWidget;
 class SettingsDialog;
+class MaskablePixmapWidget;
 
 class Widget : public QMainWindow
 {
@@ -144,6 +145,7 @@ private:
     GenericChatroomWidget* activeChatroomWidget;
     FriendListWidget* contactListWidget;
     Camera* camera;
+    MaskablePixmapWidget* profilePicture;
     bool notify(QObject *receiver, QEvent *event);
     bool eventFilter(QObject *, QEvent *event);
 };

From f9df1a1503f716163597940fae470f7c35a1f7c2 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Fri, 26 Sep 2014 19:16:27 +0200
Subject: [PATCH 02/18] ChatAreaWidget: removed frame

---
 widget/chatareawidget.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/widget/chatareawidget.cpp b/widget/chatareawidget.cpp
index 524039d20..e1e7e3447 100644
--- a/widget/chatareawidget.cpp
+++ b/widget/chatareawidget.cpp
@@ -34,6 +34,7 @@ ChatAreaWidget::ChatAreaWidget(QWidget *parent) :
     setOpenExternalLinks(false);
     setOpenLinks(false);
     setAcceptRichText(false);
+    setFrameStyle(QFrame::NoFrame);
 
     chatTextTable = textCursor().insertTable(1,3);
 

From 4d24bd53f26133a0fc4a7ffb68031eb92bca1ede Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Sat, 27 Sep 2014 13:23:00 +0200
Subject: [PATCH 03/18] fix #308

---
 widget/chatareawidget.cpp                     |  2 +-
 widget/tool/chatactions/chataction.h          |  3 ++-
 .../tool/chatactions/filetransferaction.cpp   | 21 +++++++++++++++----
 widget/tool/chatactions/filetransferaction.h  |  3 ++-
 widget/tool/chatactions/messageaction.cpp     |  2 +-
 widget/tool/chatactions/messageaction.h       |  2 +-
 .../tool/chatactions/systemmessageaction.cpp  |  2 +-
 widget/tool/chatactions/systemmessageaction.h |  2 +-
 8 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/widget/chatareawidget.cpp b/widget/chatareawidget.cpp
index e1e7e3447..765d9e96c 100644
--- a/widget/chatareawidget.cpp
+++ b/widget/chatareawidget.cpp
@@ -118,7 +118,7 @@ void ChatAreaWidget::insertMessage(ChatAction *msgAction)
     chatTextTable->cellAt(row,1).firstCursorPosition().insertHtml(msgAction->getMessage());
     chatTextTable->cellAt(row,2).firstCursorPosition().insertText(msgAction->getDate());
 
-    msgAction->setTextCursor(cur);
+    msgAction->setup(cur, this);
 
     messages.append(msgAction);
 }
diff --git a/widget/tool/chatactions/chataction.h b/widget/tool/chatactions/chataction.h
index 16c9f179b..5c3eed650 100644
--- a/widget/tool/chatactions/chataction.h
+++ b/widget/tool/chatactions/chataction.h
@@ -21,13 +21,14 @@
 #include <QTextCursor>
 
 class FileTransferInstance;
+class QTextEdit;
 
 class ChatAction : public QObject
 {
 public:
     ChatAction(const bool &me, const QString &author, const QString &date) : isMe(me), name(author), date(date) {;}
     virtual ~ChatAction(){;}
-    virtual void setTextCursor(QTextCursor cursor){(void)cursor;} ///< Call once, and then you MUST let the object update itself
+    virtual void setup(QTextCursor cursor, QTextEdit* textEdit) = 0; ///< Call once, and then you MUST let the object update itself
 
     virtual QString getName();
     virtual QString getMessage() = 0;
diff --git a/widget/tool/chatactions/filetransferaction.cpp b/widget/tool/chatactions/filetransferaction.cpp
index 12e2a1ac6..59f2c9250 100644
--- a/widget/tool/chatactions/filetransferaction.cpp
+++ b/widget/tool/chatactions/filetransferaction.cpp
@@ -17,8 +17,12 @@
 #include "filetransferaction.h"
 #include "filetransferinstance.h"
 
-FileTransferAction::FileTransferAction(FileTransferInstance *widget, const QString &author, const QString &date, const bool &me) :
-    ChatAction(me, author, date)
+#include <QTextEdit>
+#include <QScrollBar>
+
+FileTransferAction::FileTransferAction(FileTransferInstance *widget, const QString &author, const QString &date, const bool &me)
+  : ChatAction(me, author, date)
+  , edit(nullptr)
 {
     w = widget;
 
@@ -39,20 +43,26 @@ QString FileTransferAction::getMessage()
     return widgetHtml;
 }
 
-void FileTransferAction::setTextCursor(QTextCursor cursor)
+void FileTransferAction::setup(QTextCursor cursor, QTextEdit *textEdit)
 {
     cur = cursor;
     cur.setKeepPositionOnInsert(true);
     int end=cur.selectionEnd();
     cur.setPosition(cur.position());
     cur.setPosition(end, QTextCursor::KeepAnchor);
+
+    edit = textEdit;
 }
 
 void FileTransferAction::updateHtml()
 {
-    if (cur.isNull())
+    if (cur.isNull() || !edit)
         return;
 
+    // save old slider value
+    int vSliderVal = edit->verticalScrollBar()->value();
+
+    // update content
     int pos = cur.selectionStart();
     cur.removeSelectedText();
     cur.setKeepPositionOnInsert(false);
@@ -62,6 +72,9 @@ void FileTransferAction::updateHtml()
     cur.setPosition(pos);
     cur.setPosition(end, QTextCursor::KeepAnchor);
 
+    // restore old slider value
+    edit->verticalScrollBar()->setValue(vSliderVal);
+
     // Free our ressources if we'll never need to update again
     if (w->getState() == FileTransferInstance::TransfState::tsCanceled
             || w->getState() == FileTransferInstance::TransfState::tsFinished)
diff --git a/widget/tool/chatactions/filetransferaction.h b/widget/tool/chatactions/filetransferaction.h
index ee6d0e11c..31982cd45 100644
--- a/widget/tool/chatactions/filetransferaction.h
+++ b/widget/tool/chatactions/filetransferaction.h
@@ -26,7 +26,7 @@ public:
     FileTransferAction(FileTransferInstance *widget, const QString &author, const QString &date, const bool &me);
     virtual ~FileTransferAction();
     virtual QString getMessage();
-    virtual void setTextCursor(QTextCursor cursor) final;
+    virtual void setup(QTextCursor cursor, QTextEdit* textEdit) override;
 
 private slots:
     void updateHtml();
@@ -34,6 +34,7 @@ private slots:
 private:
     FileTransferInstance *w;
     QTextCursor cur;
+    QTextEdit* edit;
 };
 
 #endif // FILETRANSFERACTION_H
diff --git a/widget/tool/chatactions/messageaction.cpp b/widget/tool/chatactions/messageaction.cpp
index fa396468c..84ce86194 100644
--- a/widget/tool/chatactions/messageaction.cpp
+++ b/widget/tool/chatactions/messageaction.cpp
@@ -23,7 +23,7 @@ MessageAction::MessageAction(const QString &author, const QString &message, cons
 {
 }
 
-void MessageAction::setTextCursor(QTextCursor cursor)
+void MessageAction::setup(QTextCursor cursor, QTextEdit *)
 {
     // When this function is called, we're supposed to only update ourselve when needed
     // Nobody should ask us to do anything with our content, we're on our own
diff --git a/widget/tool/chatactions/messageaction.h b/widget/tool/chatactions/messageaction.h
index baa68898a..65f8e6465 100644
--- a/widget/tool/chatactions/messageaction.h
+++ b/widget/tool/chatactions/messageaction.h
@@ -25,7 +25,7 @@ public:
     MessageAction(const QString &author, const QString &message, const QString &date, const bool &me);
     virtual ~MessageAction(){;}
     virtual QString getMessage();
-    virtual void setTextCursor(QTextCursor cursor) final;
+    virtual void setup(QTextCursor cursor, QTextEdit*) override;
 
 private:
     QString message;
diff --git a/widget/tool/chatactions/systemmessageaction.cpp b/widget/tool/chatactions/systemmessageaction.cpp
index 32457c6ed..a50f55e47 100644
--- a/widget/tool/chatactions/systemmessageaction.cpp
+++ b/widget/tool/chatactions/systemmessageaction.cpp
@@ -28,7 +28,7 @@ QString SystemMessageAction::getMessage()
     return QString("<table width=100%><tr><td align=center><div class=" + type + ">" + message + "</td><tr></div></table>");
 }
 
-void SystemMessageAction::setTextCursor(QTextCursor cursor)
+void SystemMessageAction::setup(QTextCursor cursor, QTextEdit *)
 {
     // When this function is called, we're supposed to only update ourselve when needed
     // Nobody should ask us to do anything with our content, we're on our own
diff --git a/widget/tool/chatactions/systemmessageaction.h b/widget/tool/chatactions/systemmessageaction.h
index b628f7e04..6767a3f73 100644
--- a/widget/tool/chatactions/systemmessageaction.h
+++ b/widget/tool/chatactions/systemmessageaction.h
@@ -24,7 +24,7 @@ class SystemMessageAction : public ChatAction
 public:
     SystemMessageAction(const QString &message, const QString& type, const QString &date);
     virtual ~SystemMessageAction(){;}
-    virtual void setTextCursor(QTextCursor cursor) final;
+    virtual void setup(QTextCursor cursor, QTextEdit*) override;
 
     virtual QString getName() {return QString();}
     virtual QString getMessage();

From cd0f8d4d58116b76bca7045be07a6191f9dc7be6 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sat, 27 Sep 2014 14:37:51 +0200
Subject: [PATCH 04/18] Fix #326


From faf59cea9c72fa1774a3587029f51e9e6acd9e96 Mon Sep 17 00:00:00 2001
From: Joni Martikainen <joni@shade-fx.com>
Date: Sun, 21 Sep 2014 23:33:07 +0300
Subject: [PATCH 05/18] check if call is active before mute

check if call is active before mute. Prevents segfault.
---
 coreav.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/coreav.cpp b/coreav.cpp
index 9244fe433..fa4ce5cd8 100644
--- a/coreav.cpp
+++ b/coreav.cpp
@@ -273,7 +273,9 @@ void Core::decreaseVideoBusyness()
 
 void Core::micMuteToggle(int callId)
 {
-    calls[callId].muteMic = !calls[callId].muteMic;
+    if (calls[callId].active) {
+        calls[callId].muteMic = !calls[callId].muteMic;
+    }
 }
 
 void Core::onAvCancel(void* _toxav, int32_t callId, void* core)

From 97b5599651f7dd469f4f7dcf8b1fe4e50cf6e381 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Sat, 27 Sep 2014 15:39:17 +0200
Subject: [PATCH 06/18] MaskablePixmapWidget: fixed drawing routine

---
 widget/maskablepixmapwidget.cpp | 17 +++++++----------
 widget/maskablepixmapwidget.h   |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/widget/maskablepixmapwidget.cpp b/widget/maskablepixmapwidget.cpp
index 6fdd3f03b..0959a5a20 100644
--- a/widget/maskablepixmapwidget.cpp
+++ b/widget/maskablepixmapwidget.cpp
@@ -16,20 +16,17 @@
 
 #include "maskablepixmapwidget.h"
 #include <QPainter>
-#include <QPaintEvent>
 
 MaskablePixmapWidget::MaskablePixmapWidget(QWidget *parent, QSize size, QString maskName)
     : QWidget(parent)
 {
-    setMinimumSize(size);
-    setMaximumSize(size);
-
-    mask = QPixmap(maskName).scaled(maximumSize(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+    setFixedSize(size);
+    mask = QPixmap(maskName).scaled(size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
 }
 
 void MaskablePixmapWidget::setPixmap(const QPixmap &pmap)
 {
-    pixmap = pmap.scaled(maximumSize(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
+    pixmap = pmap.scaled(width(), height(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
 }
 
 QPixmap MaskablePixmapWidget::getPixmap() const
@@ -37,20 +34,20 @@ QPixmap MaskablePixmapWidget::getPixmap() const
     return pixmap;
 }
 
-void MaskablePixmapWidget::paintEvent(QPaintEvent *ev)
+void MaskablePixmapWidget::paintEvent(QPaintEvent *)
 {
-    QPixmap tmp(ev->rect().size());
+    QPixmap tmp(width(), height());
     tmp.fill(Qt::transparent);
 
-    QPoint offset((ev->rect().size().width()-pixmap.size().width())/2,(ev->rect().size().height()-pixmap.size().height())/2);
+    QPoint offset((width() - pixmap.size().width())/2,(height() - pixmap.size().height())/2); // centering the pixmap
 
     QPainter painter(&tmp);
     painter.setCompositionMode(QPainter::CompositionMode_Source);
     painter.drawPixmap(offset,pixmap);
     painter.setCompositionMode(QPainter::CompositionMode_DestinationIn);
     painter.drawPixmap(0,0,mask);
-
     painter.end();
+
     painter.begin(this);
     painter.drawPixmap(0,0,tmp);
 }
diff --git a/widget/maskablepixmapwidget.h b/widget/maskablepixmapwidget.h
index 359b1ab00..faaf4abf3 100644
--- a/widget/maskablepixmapwidget.h
+++ b/widget/maskablepixmapwidget.h
@@ -32,7 +32,7 @@ signals:
     void clicked();
 
 protected:
-    virtual void paintEvent(QPaintEvent *ev);
+    virtual void paintEvent(QPaintEvent *);
     virtual void mousePressEvent(QMouseEvent *);
 
 private:

From de7ade033a0eb60a0913f477062588837b60ac40 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Sat, 27 Sep 2014 16:37:16 +0200
Subject: [PATCH 07/18] MaskablePixmapWidget: white background, removed
 circular mask

---
 img/avatar_mask.png             | Bin 5766 -> 3602 bytes
 img/avatar_mask_circle.png      | Bin 9310 -> 0 bytes
 widget/form/genericchatform.cpp |   2 +-
 widget/maskablepixmapwidget.cpp |   3 ++-
 4 files changed, 3 insertions(+), 2 deletions(-)
 delete mode 100644 img/avatar_mask_circle.png

diff --git a/img/avatar_mask.png b/img/avatar_mask.png
index 508914f0425838a3c1b5496ff87ff6388115ace3..2527e336522e8c2014d399ee1e277b2ce3bc9cf1 100644
GIT binary patch
literal 3602
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
MboD;hcs4xuzeLs&2LJ#7

literal 5766
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%0D7#ii&y1dD
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

diff --git a/img/avatar_mask_circle.png b/img/avatar_mask_circle.png
deleted file mode 100644
index 83cb97dfc4e3874237965d1d0a961bd1cbb91592..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9310
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
Y0mJiXsCyH)76`atVPjr)#xv>v0GYp#bpQYW

diff --git a/widget/form/genericchatform.cpp b/widget/form/genericchatform.cpp
index 1f7b827f7..a10fe0c83 100644
--- a/widget/form/genericchatform.cpp
+++ b/widget/form/genericchatform.cpp
@@ -36,7 +36,7 @@ GenericChatForm::GenericChatForm(QWidget *parent) :
     headWidget = new QWidget();
 
     nameLabel = new CroppingLabel();
-    avatar = new MaskablePixmapWidget(this, QSize(40,40), ":/img/avatar_mask_circle.png");
+    avatar = new MaskablePixmapWidget(this, QSize(40,40), ":/img/avatar_mask.png");
     QHBoxLayout *headLayout = new QHBoxLayout(), *mainFootLayout = new QHBoxLayout();
     headTextLayout = new QVBoxLayout();
     QVBoxLayout *mainLayout = new QVBoxLayout();
diff --git a/widget/maskablepixmapwidget.cpp b/widget/maskablepixmapwidget.cpp
index 0959a5a20..cdbe5c9b9 100644
--- a/widget/maskablepixmapwidget.cpp
+++ b/widget/maskablepixmapwidget.cpp
@@ -42,7 +42,8 @@ void MaskablePixmapWidget::paintEvent(QPaintEvent *)
     QPoint offset((width() - pixmap.size().width())/2,(height() - pixmap.size().height())/2); // centering the pixmap
 
     QPainter painter(&tmp);
-    painter.setCompositionMode(QPainter::CompositionMode_Source);
+    painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
+    painter.fillRect(0,0,width(),height(),Qt::white);
     painter.drawPixmap(offset,pixmap);
     painter.setCompositionMode(QPainter::CompositionMode_DestinationIn);
     painter.drawPixmap(0,0,mask);

From a245255550fb8a331378f9b595a8dbb80b733278 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Sat, 27 Sep 2014 16:39:54 +0200
Subject: [PATCH 08/18] removed avatar_mask_circle.png from qrc

---
 res.qrc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/res.qrc b/res.qrc
index 62b891ee6..603fc8ba2 100644
--- a/res.qrc
+++ b/res.qrc
@@ -143,6 +143,5 @@
         <file>translations/fi.qm</file>
         <file>translations/mannol.qm</file>
         <file>img/avatar_mask.png</file>
-        <file>img/avatar_mask_circle.png</file>
     </qresource>
 </RCC>

From 329f57d33a0251df1f95c0ddf356adab55ac5478 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sat, 27 Sep 2014 17:01:31 +0200
Subject: [PATCH 09/18] debian: Shouldn't depend on metapackages

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index ef73726b7..7883115e6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: John Smith <barrdetwix@gmail.com>
 Section: misc
 Priority: optional
 Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 9), cdbs, qt5-qmake, qt5-default, libopenal-dev, libopencv-dev, libopus-dev
+Build-Depends: debhelper (>= 9), cdbs, qt5-qmake, libopenal-dev, libopencv-dev, libopus-dev
 
 Package: qtox
 Architecture: any

From 5411db5bec5b5899c2da4d19f7ddb9a189aca58c Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Sat, 27 Sep 2014 17:41:17 +0200
Subject: [PATCH 10/18] MaskablePixmapWidget: background-color argument

---
 widget/maskablepixmapwidget.cpp | 5 +++--
 widget/maskablepixmapwidget.h   | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/widget/maskablepixmapwidget.cpp b/widget/maskablepixmapwidget.cpp
index cdbe5c9b9..9257416fc 100644
--- a/widget/maskablepixmapwidget.cpp
+++ b/widget/maskablepixmapwidget.cpp
@@ -17,8 +17,9 @@
 #include "maskablepixmapwidget.h"
 #include <QPainter>
 
-MaskablePixmapWidget::MaskablePixmapWidget(QWidget *parent, QSize size, QString maskName)
+MaskablePixmapWidget::MaskablePixmapWidget(QWidget *parent, QSize size, QString maskName, QColor background)
     : QWidget(parent)
+    , backgroundColor(background)
 {
     setFixedSize(size);
     mask = QPixmap(maskName).scaled(size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
@@ -43,7 +44,7 @@ void MaskablePixmapWidget::paintEvent(QPaintEvent *)
 
     QPainter painter(&tmp);
     painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
-    painter.fillRect(0,0,width(),height(),Qt::white);
+    painter.fillRect(0,0,width(),height(),backgroundColor);
     painter.drawPixmap(offset,pixmap);
     painter.setCompositionMode(QPainter::CompositionMode_DestinationIn);
     painter.drawPixmap(0,0,mask);
diff --git a/widget/maskablepixmapwidget.h b/widget/maskablepixmapwidget.h
index faaf4abf3..72ae39b42 100644
--- a/widget/maskablepixmapwidget.h
+++ b/widget/maskablepixmapwidget.h
@@ -23,7 +23,7 @@ class MaskablePixmapWidget : public QWidget
 {
     Q_OBJECT
 public:
-    MaskablePixmapWidget(QWidget *parent, QSize size, QString maskName);
+    MaskablePixmapWidget(QWidget *parent, QSize size, QString maskName, QColor background = Qt::white);
 
     void setPixmap(const QPixmap &pmap);
     QPixmap getPixmap() const;
@@ -40,6 +40,7 @@ private:
     QPixmap mask;
     QSize size;
     QString maskName;
+    QColor backgroundColor;
 };
 
 #endif // MASKABLEPIXMAPWIDGET_H

From 76e5876f0ae9c735db8c49b15039a61286be15da Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Sat, 27 Sep 2014 17:45:38 +0200
Subject: [PATCH 11/18] set default avatar to contact_dark.png, removed
 active/inactive avatar switching

---
 widget/friendwidget.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/widget/friendwidget.cpp b/widget/friendwidget.cpp
index c15ee03cc..6cea7ad03 100644
--- a/widget/friendwidget.cpp
+++ b/widget/friendwidget.cpp
@@ -45,7 +45,7 @@ FriendWidget::FriendWidget(int FriendId, QString id)
     setLayoutDirection(Qt::LeftToRight); // parent might have set Qt::RightToLeft
 
     avatar = new MaskablePixmapWidget(this, QSize(40,40), ":/img/avatar_mask.png");
-    avatar->setPixmap(QPixmap(":img/contact.png"));
+    avatar->setPixmap(QPixmap(":img/contact_dark.png"));
     name.setText(id);
     //statusPic.setAlignment(Qt::AlignHCenter);
     statusPic.setPixmap(QPixmap(":img/status/dot_away.png"));
@@ -140,8 +140,6 @@ void FriendWidget::setAsActiveChatroom()
     QPalette pal3;
     pal3.setColor(QPalette::Background, Qt::white);
     this->setPalette(pal3);
-    if (isDefaultAvatar)
-       avatar->setPixmap(QPixmap(":img/contact_dark.png"));
 }
 
 void FriendWidget::setAsInactiveChatroom()
@@ -160,9 +158,6 @@ void FriendWidget::setAsInactiveChatroom()
     QPalette pal3;
     pal3.setColor(QPalette::Background, QColor(65,65,65,255));
     this->setPalette(pal3);
-
-    if (isDefaultAvatar)
-        avatar->setPixmap(QPixmap(":img/contact.png"));
 }
 
 void FriendWidget::updateStatusLight()

From bb214b53f7aa97069fd3c245b72f7a811978ff9f Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Sat, 27 Sep 2014 17:58:56 +0200
Subject: [PATCH 12/18] set profile picture to contact_dark.png

---
 widget/widget.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/widget/widget.cpp b/widget/widget.cpp
index da034ace2..8057c221f 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -113,7 +113,7 @@ Widget::Widget(QWidget *parent)
     isWindowMinimized = 0;
 
     profilePicture = new MaskablePixmapWidget(this, QSize(40,40), ":/img/avatar_mask.png");
-    profilePicture->setPixmap(QPixmap(":/img/avatar.png"));
+    profilePicture->setPixmap(QPixmap(":/img/contact_dark.png"));
     ui->horizontalLayout_3->insertWidget(0,profilePicture);
 
     ui->mainContent->setLayout(new QVBoxLayout());

From 18330f0928a07d01740cbc2fd76896d30afd0932 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Sat, 27 Sep 2014 18:00:13 +0200
Subject: [PATCH 13/18] MaskablePixmapWidget: set cursor to PointingHandCursor
 if clickable

---
 widget/maskablepixmapwidget.cpp | 14 +++++++++++++-
 widget/maskablepixmapwidget.h   |  2 ++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/widget/maskablepixmapwidget.cpp b/widget/maskablepixmapwidget.cpp
index 9257416fc..bc47f1154 100644
--- a/widget/maskablepixmapwidget.cpp
+++ b/widget/maskablepixmapwidget.cpp
@@ -20,11 +20,22 @@
 MaskablePixmapWidget::MaskablePixmapWidget(QWidget *parent, QSize size, QString maskName, QColor background)
     : QWidget(parent)
     , backgroundColor(background)
+    , clickable(false)
 {
     setFixedSize(size);
     mask = QPixmap(maskName).scaled(size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
 }
 
+void MaskablePixmapWidget::setClickable(bool clickable)
+{
+    this->clickable = clickable;
+
+    if (clickable)
+        setCursor(Qt::PointingHandCursor);
+    else
+        unsetCursor();
+}
+
 void MaskablePixmapWidget::setPixmap(const QPixmap &pmap)
 {
     pixmap = pmap.scaled(width(), height(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
@@ -56,5 +67,6 @@ void MaskablePixmapWidget::paintEvent(QPaintEvent *)
 
 void MaskablePixmapWidget::mousePressEvent(QMouseEvent*)
 {
-    emit clicked();
+    if(clickable)
+        emit clicked();
 }
diff --git a/widget/maskablepixmapwidget.h b/widget/maskablepixmapwidget.h
index 72ae39b42..c4601d227 100644
--- a/widget/maskablepixmapwidget.h
+++ b/widget/maskablepixmapwidget.h
@@ -25,6 +25,7 @@ class MaskablePixmapWidget : public QWidget
 public:
     MaskablePixmapWidget(QWidget *parent, QSize size, QString maskName, QColor background = Qt::white);
 
+    void setClickable(bool clickable);
     void setPixmap(const QPixmap &pmap);
     QPixmap getPixmap() const;
 
@@ -41,6 +42,7 @@ private:
     QSize size;
     QString maskName;
     QColor backgroundColor;
+    bool clickable;
 };
 
 #endif // MASKABLEPIXMAPWIDGET_H

From 2b58d45b73920808ce0843edd8aef42c8e5599ef Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Sat, 27 Sep 2014 19:13:27 +0200
Subject: [PATCH 14/18] MaskablePixmapWidget: use KeepAspectRatioByExpanding

---
 widget/maskablepixmapwidget.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/widget/maskablepixmapwidget.cpp b/widget/maskablepixmapwidget.cpp
index bc47f1154..305eb015c 100644
--- a/widget/maskablepixmapwidget.cpp
+++ b/widget/maskablepixmapwidget.cpp
@@ -38,7 +38,7 @@ void MaskablePixmapWidget::setClickable(bool clickable)
 
 void MaskablePixmapWidget::setPixmap(const QPixmap &pmap)
 {
-    pixmap = pmap.scaled(width(), height(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
+    pixmap = pmap.scaled(width(), height(), Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
 }
 
 QPixmap MaskablePixmapWidget::getPixmap() const

From 9b52d3174d69b2794d9a8ec322881bb27df185fc Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Sat, 27 Sep 2014 19:13:46 +0200
Subject: [PATCH 15/18] set clickable to true

---
 widget/widget.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/widget/widget.cpp b/widget/widget.cpp
index 8057c221f..22f65aa74 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -114,6 +114,7 @@ Widget::Widget(QWidget *parent)
 
     profilePicture = new MaskablePixmapWidget(this, QSize(40,40), ":/img/avatar_mask.png");
     profilePicture->setPixmap(QPixmap(":/img/contact_dark.png"));
+    profilePicture->setClickable(true);
     ui->horizontalLayout_3->insertWidget(0,profilePicture);
 
     ui->mainContent->setLayout(new QVBoxLayout());

From 63252d2fc0984b16aeee42fa54a3af26e61c1389 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sat, 27 Sep 2014 20:21:56 +0200
Subject: [PATCH 16/18] Fix merge

---
 widget/form/chatform.cpp | 2 +-
 widget/friendwidget.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/widget/form/chatform.cpp b/widget/form/chatform.cpp
index dc8b7bf05..a200eff08 100644
--- a/widget/form/chatform.cpp
+++ b/widget/form/chatform.cpp
@@ -505,5 +505,5 @@ void ChatForm::onAvatarRemoved(int FriendId)
     if (FriendId != f->friendId)
         return;
 
-    avatarLabel->setPixmap(QPixmap(":/img/contact_dark.png"));
+    avatar->setPixmap(QPixmap(":/img/contact_dark.png"));
 }
diff --git a/widget/friendwidget.cpp b/widget/friendwidget.cpp
index 7b09c2b95..5bce871f7 100644
--- a/widget/friendwidget.cpp
+++ b/widget/friendwidget.cpp
@@ -210,7 +210,7 @@ void FriendWidget::onAvatarRemoved(int FriendId)
         return;
 
     isDefaultAvatar = true;
-    avatar.setPixmap(QPixmap(":img/contact.png"));
+    avatar->setPixmap(QPixmap(":img/contact.png"));
 }
 
 void FriendWidget::mousePressEvent(QMouseEvent *ev)

From f6176e4a3cb522679a40fff790e6ef30da98f35f Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sat, 27 Sep 2014 21:07:13 +0200
Subject: [PATCH 17/18] buildPackages.sh shouldn't be interactive

---
 tools/buildPackages.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/buildPackages.sh b/tools/buildPackages.sh
index dc01f4a82..80117b281 100755
--- a/tools/buildPackages.sh
+++ b/tools/buildPackages.sh
@@ -56,9 +56,9 @@ done
 if [[ $OPT_APT = "true" ]]; then
     echo "Installing missing tools (if any)..."
     if [[ $EUID -ne 0 && $OPT_SUDO = "true" ]]; then
-        sudo apt-get install wget debhelper cdbs devscripts alien tar gzip build-essential
+        sudo apt-get install wget debhelper cdbs devscripts alien tar gzip build-essential -y
     else
-             apt-get install wget debhelper cdbs devscripts alien tar gzip build-essential
+             apt-get install wget debhelper cdbs devscripts alien tar gzip build-essential -y
     fi
 fi
 

From 702daa987b2eb252706d840cd6cda0406f03bb9e Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sat, 27 Sep 2014 21:25:42 +0200
Subject: [PATCH 18/18] Make buildPackages.sh install dependencies

---
 tools/buildPackages.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tools/buildPackages.sh b/tools/buildPackages.sh
index 80117b281..e028670e5 100755
--- a/tools/buildPackages.sh
+++ b/tools/buildPackages.sh
@@ -62,6 +62,16 @@ if [[ $OPT_APT = "true" ]]; then
     fi
 fi
 
+# Get the requried dependencies if needed
+if [[ $OPT_APT = "true" ]]; then
+    echo "Installing missing dependencies (if any)..."
+    if [[ $EUID -ne 0 && $OPT_SUDO = "true" ]]; then
+        sudo apt-get install qt5-qmake libopenal-dev libopencv-dev libopus-dev -y
+    else
+             apt-get install qt5-qmake libopenal-dev libopencv-dev libopus-dev -y
+    fi
+fi
+
 mkdir -p .packages
 cd .packages