fixing conflict

qtox.pro

@@ -29,8 +29,8 @@ FORMS    += \
     src/mainwindow.ui \
     src/widget/form/settings/generalsettings.ui \
     src/widget/form/settings/avsettings.ui \
-    src/widget/form/settings/identitysettings.ui \
     src/widget/form/settings/privacysettings.ui \
+    src/widget/form/profileform.ui \
     src/widget/form/loadhistorydialog.ui \
     src/widget/form/setpassworddialog.ui \
     src/chatlog/content/filetransferwidget.ui \
@@ -323,10 +323,10 @@ contains(ENABLE_SYSTRAY_GTK_BACKEND, NO) {
         src/widget/form/settingswidget.h \
         src/widget/form/settings/genericsettings.h \
         src/widget/form/settings/generalform.h \
-        src/widget/form/settings/identityform.h \
         src/widget/form/settings/privacyform.h \
         src/widget/form/settings/avform.h \
         src/widget/form/filesform.h \
+        src/widget/form/profileform.h \
         src/widget/tool/chattextedit.h \
         src/widget/tool/friendrequestdialog.h \
         src/widget/friendwidget.h \
@@ -351,9 +351,9 @@ contains(ENABLE_SYSTRAY_GTK_BACKEND, NO) {
         src/widget/form/addfriendform.cpp \
         src/widget/form/settingswidget.cpp \
         src/widget/form/settings/generalform.cpp \
-        src/widget/form/settings/identityform.cpp \
         src/widget/form/settings/privacyform.cpp \
         src/widget/form/settings/avform.cpp \
+        src/widget/form/profileform.cpp \
         src/widget/form/filesform.cpp \
         src/widget/tool/chattextedit.cpp \
         src/widget/tool/friendrequestdialog.cpp \

src/audio.cpp

@@ -242,11 +242,12 @@ void Audio::playMono16Sound(const QByteArray& data)
 }
 
 void Audio::playGroupAudioQueued(Tox*,int group, int peer, const int16_t* data,
-                        unsigned samples, uint8_t channels, unsigned sample_rate,void*)
+                        unsigned samples, uint8_t channels, unsigned sample_rate, void* core)
 {
     QMetaObject::invokeMethod(instance, "playGroupAudio", Qt::BlockingQueuedConnection,
                               Q_ARG(int,group), Q_ARG(int,peer), Q_ARG(const int16_t*,data),
                               Q_ARG(unsigned,samples), Q_ARG(uint8_t,channels), Q_ARG(unsigned,sample_rate));
+    emit static_cast<Core*>(core)->groupPeerAudioPlaying(group, peer);
 }
 
 void Audio::playGroupAudio(int group, int peer, const int16_t* data,

src/chatlog/content/filetransferwidget.cpp

@@ -24,6 +24,7 @@
 #include <QMouseEvent>
 #include <QFileDialog>
 #include <QFile>
+#include <QBuffer>
 #include <QMessageBox>
 #include <QDesktopServices>
 #include <QDesktopWidget>
@@ -435,7 +436,7 @@ void FileTransferWidget::handleButton(QPushButton *btn)
     else if (btn->objectName() == "dir")
     {
         QString dirPath = QFileInfo(fileInfo.filePath).dir().path();
-        QDesktopServices::openUrl(QUrl("file://" + dirPath, QUrl::TolerantMode));
+        QDesktopServices::openUrl(QUrl::fromLocalFile(dirPath));
     }
 
 }
@@ -451,22 +452,13 @@ void FileTransferWidget::showPreview(const QString &filename)
         ui->previewLabel->setPixmap(pmap);
         ui->previewLabel->show();
 
-        // Show preview, but make sure it's not larger than 50% of the screen width/height
+        // Show mouseover preview, but make sure it's not larger than 50% of the screen width/height
-        QRect maxSize = QApplication::desktop()->screenGeometry();
+        QRect desktopSize = QApplication::desktop()->screenGeometry();
-        maxSize.setWidth(0.5*maxSize.width());
+        QImage image = QImage(filename).scaled(0.5*desktopSize.width(), 0.5*desktopSize.height(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
-        maxSize.setHeight(0.5*maxSize.height());
+        QByteArray imageData;
-
+        QBuffer buffer(&imageData);
-        QImage image = QImage(filename);
+        image.save(&buffer, "PNG");
-        QSize imageSize(image.width(), image.height());
+        ui->previewLabel->setToolTip("<img src=data:image/png;base64," + imageData.toBase64() + "/>");
-        if (imageSize.width() > maxSize.width() || imageSize.height() > maxSize.height())
-        {
-            imageSize.scale(maxSize.width(), maxSize.height(), Qt::KeepAspectRatio);
-            ui->previewLabel->setToolTip("<html><img src="+QUrl::toPercentEncoding(filename)+" width="+QString::number(imageSize.width())+" height="+QString::number(imageSize.height())+"/></html>");
-        }
-        else
-        {
-            ui->previewLabel->setToolTip("<html><img src"+QUrl::toPercentEncoding(filename)+"/></html>");
-        }
     }
 }
 

src/chatlog/content/text.cpp

@@ -221,6 +221,9 @@ void Text::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
         setCursor(QCursor(Qt::PointingHandCursor));
     else
         setCursor(QCursor());
+
+    // tooltip
+    setToolTip(extractImgTooltip(cursorFromPos(event->scenePos(), false)));
 }
 
 QString Text::getText() const
@@ -287,10 +290,10 @@ QSizeF Text::idealSize()
     return size;
 }
 
-int Text::cursorFromPos(QPointF scenePos) const
+int Text::cursorFromPos(QPointF scenePos, bool fuzzy) const
 {
     if(doc)
-        return doc->documentLayout()->hitTest(mapFromScene(scenePos), Qt::FuzzyHit);
+        return doc->documentLayout()->hitTest(mapFromScene(scenePos), fuzzy ? Qt::FuzzyHit : Qt::ExactHit);
 
     return -1;
 }
@@ -348,3 +351,17 @@ QString Text::extractSanitizedText(int from, int to) const
 
     return txt;
 }
+
+QString Text::extractImgTooltip(int pos) const
+{
+    for(QTextBlock::Iterator itr = doc->firstBlock().begin(); itr!=doc->firstBlock().end(); ++itr)
+    {
+        if(itr.fragment().contains(pos) && itr.fragment().charFormat().isImageFormat())
+        {
+            QTextImageFormat imgFmt = itr.fragment().charFormat().toImageFormat();
+            return imgFmt.toolTip();
+        }
+    }
+
+    return QString();
+}

src/chatlog/content/text.h

@@ -61,11 +61,12 @@ protected:
     void freeResources();
 
     QSizeF idealSize();
-    int cursorFromPos(QPointF scenePos) const;
+    int cursorFromPos(QPointF scenePos, bool fuzzy = true) const;
     int getSelectionEnd() const;
     int getSelectionStart() const;
     bool hasSelection() const;
     QString extractSanitizedText(int from, int to) const;
+    QString extractImgTooltip(int pos) const;
 
 private:
     QTextDocument* doc = nullptr;

src/core.h

@@ -171,6 +171,7 @@ signals:
     void groupMessageReceived(int groupnumber, int peernumber, const QString& message, bool isAction);
     void groupNamelistChanged(int groupnumber, int peernumber, uint8_t change);
     void groupTitleChanged(int groupnumber, const QString& author, const QString& title);
+    void groupPeerAudioPlaying(int groupnumber, int peernumber);
 
     void usernameSet(const QString& username);
     void statusMessageSet(const QString& message);

src/coreav.cpp

@@ -76,7 +76,7 @@ void Core::prepareCall(int friendId, int callId, ToxAv* toxav, bool videoEnabled
 #ifdef QTOX_FILTER_AUDIO
     if (Settings::getInstance().getFilterAudio())
     {
-        Core::filterer[callId] = new AudioFilterer();
+        filterer[callId] = new AudioFilterer();
         filterer[callId]->startFilter(48000);
     }
     else
@@ -257,13 +257,23 @@ void Core::sendCallAudio(int callId, ToxAv* toxav)
     if (Audio::tryCaptureSamples(buf, framesize))
     {
 #ifdef QTOX_FILTER_AUDIO
-        if (filterer[callId])
+        if (Settings::getInstance().getFilterAudio())
         {
+            if (!filterer[callId])
+            {
+                filterer[callId] = new AudioFilterer();
+                filterer[callId]->startFilter(48000);
+            }
             // is a null op #ifndef ALC_LOOPBACK_CAPTURE_SAMPLES
             Audio::getEchoesToFilter(filterer[callId], framesize);
 
             filterer[callId]->filterAudio((int16_t*) buf, framesize);
         }
+        else if (filterer[callId])
+        {
+            delete filterer[callId];
+            filterer[callId] = nullptr;
+        }
 #endif
 
         uint8_t dest[bufsize];

src/coreencryption.cpp

@@ -303,7 +303,7 @@ void Core::saveConfiguration(const QString& path)
             if (!pwsaltedkeys[ptMain])
             {
                 // probably zero chance event
-                GUI::showWarning(tr("NO Password"), tr("Encryption is enabled, but there is no password! Encryption will be disabled."));
+                GUI::showWarning(tr("NO Password"), tr("Local file encryption is enabled, but there is no password! It will be disabled."));
                 Settings::getInstance().setEncryptTox(false);
                 tox_save(tox, data);
             }

src/group.cpp

@@ -72,7 +72,6 @@ void Group::updatePeer(int peerId, QString name)
     QString toxid = id.publicKey;
     peers[peerId] = name;
     toxids[toxid] = name;
-
     Friend *f = FriendList::findFriend(id);
     if (f)
     {
@@ -95,17 +94,16 @@ void Group::setName(const QString& name)
 
 void Group::regeneratePeerList()
 {
-    QList<QString> peerLst = Core::getInstance()->getGroupPeerNames(groupId);
+    peers = Core::getInstance()->getGroupPeerNames(groupId);
-    peers.clear();
     toxids.clear();
-    nPeers = peerLst.size();
+    nPeers = peers.size();
-    for (int i = 0; i < peerLst.size(); i++)
+    for (int i = 0; i < nPeers; i++)
     {
         ToxID id = Core::getInstance()->getGroupPeerToxID(groupId, i);
+        if (id.isMine())
+            selfPeerNum = i;
         QString toxid = id.publicKey;
-        peers[i] = peerLst.at(i);
+        toxids[toxid] = peers[i];
-        toxids[toxid] = peerLst.at(i);
-
         Friend *f = FriendList::findFriend(id);
         if (f)
         {
@@ -145,9 +143,12 @@ GroupWidget *Group::getGroupWidget()
 
 QStringList Group::getPeerList() const
 {
-    QStringList peerNames(peers.values());
+    return peers;
-    peerNames.sort(Qt::CaseInsensitive);
+}
-    return peerNames;
+
+bool Group::isSelfPeerNumber(int num) const
+{
+    return num == selfPeerNum;
 }
 
 void Group::setEventFlag(int f)

src/group.h

@@ -19,6 +19,7 @@
 
 #include <QMap>
 #include <QObject>
+#include <QStringList>
 
 #define RETRY_PEER_INFO_INTERVAL 500
 
@@ -39,6 +40,7 @@ public:
     int getPeersCount() const;
     void regeneratePeerList();
     QStringList getPeerList() const;
+    bool isSelfPeerNumber(int peernumber) const;
 
     GroupChatForm *getChatForm();
     GroupWidget *getGroupWidget();
@@ -62,11 +64,12 @@ public:
 private:
     GroupWidget* widget;
     GroupChatForm* chatForm;
-    QMap<int, QString> peers;
+    QStringList peers;
     QMap<QString, QString> toxids;
     int hasNewMessages, userWasMentioned;
     int groupId;
     int nPeers;
+    int selfPeerNum = -1;
     bool avGroupchat;
 
 };

src/mainwindow.ui

@@ -855,6 +855,9 @@ QSplitter:handle{
                    <bold>true</bold>
                   </font>
                  </property>
+                 <property name="cursor">
+                  <cursorShape>PointingHandCursor</cursorShape>
+                 </property>
                  <property name="text">
                   <string>Your name</string>
                  </property>
@@ -1037,8 +1040,8 @@ QSplitter:handle{
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>284</width>
+             <width>285</width>
-             <height>399</height>
+             <height>381</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_5"/>
@@ -1779,7 +1782,7 @@ QSplitter:handle{
      <x>0</x>
      <y>0</y>
      <width>775</width>
-     <height>20</height>
+     <height>22</height>
     </rect>
    </property>
   </widget>

src/misc/settings.h

@@ -293,7 +293,7 @@ private:
 
     bool enableLogging;
     bool encryptLogs;
-    bool encryptTox;
+    bool encryptTox = false;
 
     int autoAwayTime;
 

src/nexus.cpp

@@ -93,26 +93,27 @@ void Nexus::start()
     //connect(androidgui, &AndroidGUI::friendRequestAccepted, core, &Core::acceptFriendRequest);
     //connect(androidgui, &AndroidGUI::changeProfile, core, &Core::switchConfiguration);
 #else
-    connect(core, &Core::connected, widget, &Widget::onConnected);
+    connect(core, &Core::connected,                  widget, &Widget::onConnected);
-    connect(core, &Core::disconnected, widget, &Widget::onDisconnected);
+    connect(core, &Core::disconnected,               widget, &Widget::onDisconnected);
-    connect(core, &Core::failedToStart, widget, &Widget::onFailedToStartCore);
+    connect(core, &Core::failedToStart,              widget, &Widget::onFailedToStartCore);
-    connect(core, &Core::badProxy, widget, &Widget::onBadProxyCore);
+    connect(core, &Core::badProxy,                   widget, &Widget::onBadProxyCore);
-    connect(core, &Core::statusSet, widget, &Widget::onStatusSet);
+    connect(core, &Core::statusSet,                  widget, &Widget::onStatusSet);
-    connect(core, &Core::usernameSet, widget, &Widget::setUsername);
+    connect(core, &Core::usernameSet,                widget, &Widget::setUsername);
-    connect(core, &Core::statusMessageSet, widget, &Widget::setStatusMessage);
+    connect(core, &Core::statusMessageSet,           widget, &Widget::setStatusMessage);
-    connect(core, &Core::selfAvatarChanged, widget, &Widget::onSelfAvatarLoaded);
+    connect(core, &Core::selfAvatarChanged,          widget, &Widget::onSelfAvatarLoaded);
-    connect(core, &Core::friendAdded, widget, &Widget::addFriend);
+    connect(core, &Core::friendAdded,                widget, &Widget::addFriend);
-    connect(core, &Core::failedToAddFriend, widget, &Widget::addFriendFailed);
+    connect(core, &Core::failedToAddFriend,          widget, &Widget::addFriendFailed);
-    connect(core, &Core::friendUsernameChanged, widget, &Widget::onFriendUsernameChanged);
+    connect(core, &Core::friendUsernameChanged,      widget, &Widget::onFriendUsernameChanged);
-    connect(core, &Core::friendStatusChanged, widget, &Widget::onFriendStatusChanged);
+    connect(core, &Core::friendStatusChanged,        widget, &Widget::onFriendStatusChanged);
     connect(core, &Core::friendStatusMessageChanged, widget, &Widget::onFriendStatusMessageChanged);
-    connect(core, &Core::friendRequestReceived, widget, &Widget::onFriendRequestReceived);
+    connect(core, &Core::friendRequestReceived,      widget, &Widget::onFriendRequestReceived);
-    connect(core, &Core::friendMessageReceived, widget, &Widget::onFriendMessageReceived);
+    connect(core, &Core::friendMessageReceived,      widget, &Widget::onFriendMessageReceived);
-    connect(core, &Core::receiptRecieved, widget, &Widget::onReceiptRecieved);
+    connect(core, &Core::receiptRecieved,            widget, &Widget::onReceiptRecieved);
-    connect(core, &Core::groupInviteReceived, widget, &Widget::onGroupInviteReceived);
+    connect(core, &Core::groupInviteReceived,        widget, &Widget::onGroupInviteReceived);
-    connect(core, &Core::groupMessageReceived, widget, &Widget::onGroupMessageReceived);
+    connect(core, &Core::groupMessageReceived,       widget, &Widget::onGroupMessageReceived);
-    connect(core, &Core::groupNamelistChanged, widget, &Widget::onGroupNamelistChanged);
+    connect(core, &Core::groupNamelistChanged,       widget, &Widget::onGroupNamelistChanged);
-    connect(core, &Core::groupTitleChanged, widget, &Widget::onGroupTitleChanged);
+    connect(core, &Core::groupTitleChanged,          widget, &Widget::onGroupTitleChanged);
+    connect(core, &Core::groupPeerAudioPlaying,      widget, &Widget::onGroupPeerAudioPlaying);
     connect(core, &Core::emptyGroupCreated, widget, &Widget::onEmptyGroupCreated);
     connect(core, &Core::avInvite, widget, &Widget::playRingtone);
     connect(core, &Core::blockingClearContacts, widget, &Widget::clearContactsList, Qt::BlockingQueuedConnection);

src/widget/form/addfriendform.cpp

@@ -26,6 +26,7 @@
 #include "src/misc/cdata.h"
 #include "src/toxdns.h"
 #include "src/misc/settings.h"
+#include "src/widget/gui.h"
 
 AddFriendForm::AddFriendForm()
 {
@@ -73,15 +74,6 @@ QString AddFriendForm::getMessage() const
     return !msg.isEmpty() ? msg : message.placeholderText();
 }
 
-void AddFriendForm::showWarning(const QString &message) const
-{
-    QMessageBox warning(main);
-    warning.setWindowTitle("Tox");
-    warning.setText(message);
-    warning.setIcon(QMessageBox::Warning);
-    warning.exec();
-}
-
 void AddFriendForm::onUsernameSet(const QString& username)
 {
     message.setPlaceholderText(tr("%1 here! Tox me maybe?","Default message in friend requests if the field is left blank. Write something appropriate!").arg(username));
@@ -92,10 +84,10 @@ void AddFriendForm::onSendTriggered()
     QString id = toxId.text().trimmed();
 
     if (id.isEmpty()) {
-        showWarning(tr("Please fill in a valid Tox ID","Tox ID of the friend you're sending a friend request to"));
+        GUI::showWarning(tr("Couldn't add friend"), tr("Please fill in a valid Tox ID","Tox ID of the friend you're sending a friend request to"));
     } else if (ToxID::isToxId(id)) {
         if (id.toUpper() == Core::getInstance()->getSelfId().toString().toUpper())
-            showWarning(tr("You can't add yourself as a friend!","When trying to add your own Tox ID as friend"));
+            GUI::showWarning(tr("Couldn't add friend"), tr("You can't add yourself as a friend!","When trying to add your own Tox ID as friend"));
         else
             emit friendRequested(id, getMessage());
         this->toxId.clear();
@@ -113,7 +105,7 @@ Ignore the proxy and connect to the Internet directly?"), QMessageBox::Yes|QMess
 
         if (toxId.toString().isEmpty())
         {
-            showWarning(tr("This Tox ID does not exist","DNS error"));
+            GUI::showWarning(tr("Couldn't add friend"), tr("This Tox ID does not exist","DNS error"));
             return;
         }
 

src/widget/form/addfriendform.h

@@ -38,9 +38,6 @@ public:
 signals:
     void friendRequested(const QString& friendAddress, const QString& message);
 
-protected:
-    void showWarning(const QString& message) const;
-
 public slots:
     void onUsernameSet(const QString& userName);
 

src/widget/form/chatform.cpp

@@ -387,7 +387,6 @@ void ChatForm::onAvEnd(int FriendId, int)
 
     enableCallButtons();
     stopCounter();
-    
     netcam->hide();
 }
 
@@ -563,6 +562,12 @@ void ChatForm::onHangupCallTriggered()
 {
     qDebug() << "onHangupCallTriggered";
 
+    //Fixes an OS X bug with ending a call while in full screen
+    if(netcam->isFullScreen())
+    {
+        netcam->showNormal();
+    }
+    
     audioInputFlag = false;
     audioOutputFlag = false;
     emit hangupCall(callId);

src/widget/form/groupchatform.cpp

@@ -29,6 +29,7 @@
 #include "src/historykeeper.h"
 #include "src/misc/flowlayout.h"
 #include <QDebug>
+#include <QTimer>
 
 GroupChatForm::GroupChatForm(Group* chatGroup)
     : group(chatGroup), inCall{false}
@@ -98,15 +99,21 @@ void GroupChatForm::onSendTriggered()
     if (msg.isEmpty())
         return;
 
+    msgEdit->setLastMessage(msg);
     msgEdit->clear();
 
-    if (msg.startsWith("/me "))
+    if (group->getPeersCount() != 1)
     {
-        msg = msg.right(msg.length() - 4);
+        if (msg.startsWith("/me "))
-        emit sendAction(group->getGroupId(), msg);
+        {
-    } else {
+            msg = msg.right(msg.length() - 4);
-        emit sendMessage(group->getGroupId(), msg);
+            emit sendAction(group->getGroupId(), msg);
+        }
+        else
+            emit sendMessage(group->getGroupId(), msg);
     }
+    else
+        addSelfMessage(msg, msg.startsWith("/me "), QDateTime::currentDateTime(), true);
 }
 
 void GroupChatForm::onUserListChanged()
@@ -120,19 +127,45 @@ void GroupChatForm::onUserListChanged()
         delete child->widget();
         delete child;
     }
+    peerLabels.clear();
 
-    QStringList names(group->getPeerList());
+    // the list needs peers in peernumber order, nameLayout needs alphabetical
+    QMap<QString, QLabel*> orderizer;
+
+    // first traverse in peer number order, storing the QLabels as necessary
+    QStringList names = group->getPeerList();
     unsigned nNames = names.size();
     for (unsigned i=0; i<nNames; ++i)
     {
-        QString nameStr = names[i];
+        peerLabels.append(new QLabel(names[i]));
-        if (i!=nNames-1)
+        peerLabels[i]->setTextFormat(Qt::PlainText);
-            nameStr+=", ";
+        orderizer[names[i]] = peerLabels[i];
-        QLabel* nameLabel = new QLabel(nameStr);
+        if (group->isSelfPeerNumber(i))
-        nameLabel->setObjectName("peersLabel");
+            peerLabels[i]->setStyleSheet("QLabel {color : green;}");
-        nameLabel->setTextFormat(Qt::PlainText);
-        namesListLayout->addWidget(nameLabel);
     }
+    // now alphabetize and add to layout
+    names.sort(Qt::CaseInsensitive);
+    for (unsigned i=0; i<nNames; ++i)
+    {
+        QLabel* label = orderizer[names[i]];
+        if (i != nNames - 1)
+            label->setText(label->text() + ", ");
+        namesListLayout->addWidget(label);
+    }
+}
+
+void GroupChatForm::peerAudioPlaying(int peer)
+{
+    peerLabels[peer]->setStyleSheet("QLabel {color : red;}");
+    if (!peerAudioTimers[peer])
+    {
+        peerAudioTimers[peer] = new QTimer(this);
+        peerAudioTimers[peer]->setSingleShot(true);
+        connect(peerAudioTimers[peer], &QTimer::timeout, [=]{this->peerLabels[peer]->setStyleSheet("");
+                                                             delete this->peerAudioTimers[peer];
+                                                             this->peerAudioTimers[peer] = nullptr;});
+    }
+    peerAudioTimers[peer]->start(500);
 }
 
 void GroupChatForm::dragEnterEvent(QDragEnterEvent *ev)

src/widget/form/groupchatform.h

@@ -18,11 +18,13 @@
 #define GROUPCHATFORM_H
 
 #include "genericchatform.h"
+#include <QMap>
 
 namespace Ui {class MainWindow;}
 class Group;
 class TabCompleter;
 class FlowLayout;
+class QTimer;
 
 class GroupChatForm : public GenericChatForm
 {
@@ -31,6 +33,7 @@ public:
     GroupChatForm(Group* chatGroup);
 
     void onUserListChanged();
+    void peerAudioPlaying(int peer);
 
     void keyPressEvent(QKeyEvent* ev);
     void keyReleaseEvent(QKeyEvent* ev);
@@ -51,6 +54,8 @@ protected:
 
 private:
     Group* group;
+    QList<QLabel*> peerLabels; // maps peernumbers to the QLabels in namesListLayout
+    QMap<int, QTimer*> peerAudioTimers; // timeout = peer stopped sending audio
     FlowLayout* namesListLayout;
     QLabel *nusersLabel;
     TabCompleter* tabber;

src/widget/form/profileform.cpp

@@ -15,31 +15,64 @@
 */
 
 #include "src/core.h"
-#include "ui_identitysettings.h"
+#include "src/nexus.h"
-#include "identityform.h"
+#include "ui_profileform.h"
+#include "profileform.h"
+#include "ui_mainwindow.h"
 #include "src/widget/form/settingswidget.h"
+#include "src/widget/maskablepixmapwidget.h"
 #include "src/misc/settings.h"
 #include "src/widget/croppinglabel.h"
 #include "src/widget/widget.h"
 #include "src/widget/gui.h"
 #include "src/historykeeper.h"
 #include "src/misc/style.h"
+#include "src/misc/qrwidget.h"
+#include "qrencode.h"
 #include <QLabel>
 #include <QLineEdit>
+#include <QGroupBox>
 #include <QApplication>
 #include <QClipboard>
 #include <QInputDialog>
 #include <QFileDialog>
-#include "src/misc/qrwidget.h"
+#include <QBuffer>
-#include "qrencode.h"
 
-IdentityForm::IdentityForm() :
+
-    GenericForm(tr("Identity"), QPixmap(":/img/settings/identity.png"))
+void ProfileForm::refreshProfiles()
+{
+    bodyUI->profiles->clear();
+    for (QString profile : Settings::getInstance().searchProfiles())
+        bodyUI->profiles->addItem(profile);
+    QString current = Settings::getInstance().getCurrentProfile();
+    if (current != "")
+        bodyUI->profiles->setCurrentText(current);
+}
+
+ProfileForm::ProfileForm(QWidget *parent) :
+    QWidget(parent)
 {
     bodyUI = new Ui::IdentitySettings;
     bodyUI->setupUi(this);
     core = Core::getInstance();
 
+    head = new QWidget(this);
+    QHBoxLayout* headLayout = new QHBoxLayout();
+    head->setLayout(headLayout);
+
+    QLabel* imgLabel = new QLabel();
+    headLayout->addWidget(imgLabel);
+
+    QLabel* nameLabel = new QLabel();
+    QFont bold;
+    bold.setBold(true);
+    nameLabel->setFont(bold);
+    headLayout->addWidget(nameLabel);
+    headLayout->addStretch(1);
+
+    nameLabel->setText(tr("User Profile"));
+    imgLabel->setPixmap(QPixmap(":/img/settings/identity.png").scaledToHeight(40, Qt::SmoothTransformation));
+
     // tox
     toxId = new ClickableTE();
     toxId->setReadOnly(true);
@@ -48,42 +81,62 @@ IdentityForm::IdentityForm() :
     
     bodyUI->toxGroup->layout()->addWidget(toxId);
 
+    profilePicture = new MaskablePixmapWidget(this, QSize(64, 64), ":/img/avatar_mask.png");
+    profilePicture->setPixmap(QPixmap(":/img/contact_dark.png"));
+    profilePicture->setClickable(true);
+    connect(profilePicture, SIGNAL(clicked()), this, SLOT(onAvatarClicked()));
+    QHBoxLayout *publicGrouplayout = qobject_cast<QHBoxLayout*>(bodyUI->publicGroup->layout());
+    publicGrouplayout->insertWidget(0, profilePicture);
+    publicGrouplayout->insertSpacing(1, 7);
+
     timer.setInterval(750);
     timer.setSingleShot(true);
     connect(&timer, &QTimer::timeout, this, [=]() {bodyUI->toxIdLabel->setText(bodyUI->toxIdLabel->text().replace(" ✔", "")); hasCheck = false;});
     
     connect(bodyUI->toxIdLabel, SIGNAL(clicked()), this, SLOT(copyIdClicked()));
     connect(toxId, SIGNAL(clicked()), this, SLOT(copyIdClicked()));
-    connect(core, &Core::idSet, this, &IdentityForm::setToxId);
+    connect(core, &Core::idSet, this, &ProfileForm::setToxId);
+    connect(core, &Core::statusSet, this, &ProfileForm::onStatusSet);
     connect(bodyUI->userName, SIGNAL(editingFinished()), this, SLOT(onUserNameEdited()));
     connect(bodyUI->statusMessage, SIGNAL(editingFinished()), this, SLOT(onStatusMessageEdited()));
-    connect(bodyUI->loadButton, &QPushButton::clicked, this, &IdentityForm::onLoadClicked);
+    connect(bodyUI->loadButton, &QPushButton::clicked, this, &ProfileForm::onLoadClicked);
-    connect(bodyUI->renameButton, &QPushButton::clicked, this, &IdentityForm::onRenameClicked);
+    connect(bodyUI->renameButton, &QPushButton::clicked, this, &ProfileForm::onRenameClicked);
-    connect(bodyUI->exportButton, &QPushButton::clicked, this, &IdentityForm::onExportClicked);
+    connect(bodyUI->exportButton, &QPushButton::clicked, this, &ProfileForm::onExportClicked);
-    connect(bodyUI->deleteButton, &QPushButton::clicked, this, &IdentityForm::onDeleteClicked);
+    connect(bodyUI->deleteButton, &QPushButton::clicked, this, &ProfileForm::onDeleteClicked);
-    connect(bodyUI->importButton, &QPushButton::clicked, this, &IdentityForm::onImportClicked);
+    connect(bodyUI->importButton, &QPushButton::clicked, this, &ProfileForm::onImportClicked);
-    connect(bodyUI->newButton, &QPushButton::clicked, this, &IdentityForm::onNewClicked);
+    connect(bodyUI->newButton, &QPushButton::clicked, this, &ProfileForm::onNewClicked);
 
-    connect(core, &Core::avStart, this, &IdentityForm::disableSwitching);
+    connect(core, &Core::avStart, this, &ProfileForm::disableSwitching);
-    connect(core, &Core::avStarting, this, &IdentityForm::disableSwitching);
+    connect(core, &Core::avStarting, this, &ProfileForm::disableSwitching);
-    connect(core, &Core::avInvite, this, &IdentityForm::disableSwitching);
+    connect(core, &Core::avInvite, this, &ProfileForm::disableSwitching);
-    connect(core, &Core::avRinging, this, &IdentityForm::disableSwitching);
+    connect(core, &Core::avRinging, this, &ProfileForm::disableSwitching);
-    connect(core, &Core::avCancel, this, &IdentityForm::enableSwitching);
+    connect(core, &Core::avCancel, this, &ProfileForm::enableSwitching);
-    connect(core, &Core::avEnd, this, &IdentityForm::enableSwitching);
+    connect(core, &Core::avEnd, this, &ProfileForm::enableSwitching);
-    connect(core, &Core::avEnding, this, &IdentityForm::enableSwitching);
+    connect(core, &Core::avEnding, this, &ProfileForm::enableSwitching);
-    connect(core, &Core::avPeerTimeout, this, &IdentityForm::enableSwitching);
+    connect(core, &Core::avPeerTimeout, this, &ProfileForm::enableSwitching);
-    connect(core, &Core::avRequestTimeout, this, &IdentityForm::enableSwitching);
+    connect(core, &Core::avRequestTimeout, this, &ProfileForm::enableSwitching);
 
     connect(core, &Core::usernameSet, this, [=](const QString& val) { bodyUI->userName->setText(val); });
     connect(core, &Core::statusMessageSet, this, [=](const QString& val) { bodyUI->statusMessage->setText(val); });
 }
 
-IdentityForm::~IdentityForm()
+ProfileForm::~ProfileForm()
 {
     delete bodyUI;
+    head->deleteLater();
 }
 
-void IdentityForm::copyIdClicked()
+void ProfileForm::show(Ui::MainWindow &ui)
+{
+    ui.mainHead->layout()->addWidget(head);
+    ui.mainContent->layout()->addWidget(this);
+    head->show();
+    QWidget::show();
+    bodyUI->userName->setFocus(Qt::OtherFocusReason);
+    bodyUI->userName->selectAll();
+}
+
+void ProfileForm::copyIdClicked()
 {
     toxId->selectAll();
     QString txt = toxId->text();
@@ -99,32 +152,22 @@ void IdentityForm::copyIdClicked()
     timer.start();
 }
 
-void IdentityForm::onUserNameEdited()
+void ProfileForm::onUserNameEdited()
 {
     Core::getInstance()->setUsername(bodyUI->userName->text());
 }
 
-void IdentityForm::onStatusMessageEdited()
+void ProfileForm::onStatusMessageEdited()
 {
     Core::getInstance()->setStatusMessage(bodyUI->statusMessage->text());
 }
 
-void IdentityForm::present()
+void ProfileForm::onSelfAvatarLoaded(const QPixmap& pic)
 {
-    toxId->setText(Core::getInstance()->getSelfId().toString());
+    profilePicture->setPixmap(pic);
-    toxId->setCursorPosition(0);
-    bodyUI->profiles->clear();
-    for (QString profile : Settings::getInstance().searchProfiles())
-        bodyUI->profiles->addItem(profile);
-    QString current = Settings::getInstance().getCurrentProfile();
-    if (current != "")
-        bodyUI->profiles->setCurrentText(current);
-
-    bodyUI->userName->setText(Core::getInstance()->getUsername());
-    bodyUI->statusMessage->setText(Core::getInstance()->getStatusMessage());
 }
 
-void IdentityForm::setToxId(const QString& id)
+void ProfileForm::setToxId(const QString& id)
 {
     toxId->setText(id);
     toxId->setCursorPosition(0);
@@ -135,7 +178,54 @@ void IdentityForm::setToxId(const QString& id)
     toxId->setToolTip(qrcode->getImageAsText());
 }
 
-void IdentityForm::onLoadClicked()
+void ProfileForm::onAvatarClicked()
+{
+    QString filename = QFileDialog::getOpenFileName(this,
+        tr("Choose a profile picture"),
+        QDir::homePath(),
+        Nexus::getSupportedImageFilter());
+    if (filename.isEmpty())
+        return;
+    QFile file(filename);
+    file.open(QIODevice::ReadOnly);
+    if (!file.isOpen())
+    {
+        QMessageBox::critical(this, tr("Error"), tr("Unable to open this file"));
+        return;
+    }
+
+    QPixmap pic;
+    if (!pic.loadFromData(file.readAll()))
+    {
+        QMessageBox::critical(this, tr("Error"), tr("Unable to read this image"));
+        return;
+    }
+
+    QByteArray bytes;
+    QBuffer buffer(&bytes);
+    buffer.open(QIODevice::WriteOnly);
+    pic.save(&buffer, "PNG");
+    buffer.close();
+
+    if (bytes.size() >= TOX_AVATAR_MAX_DATA_LENGTH)
+    {
+        pic = pic.scaled(64,64, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+        bytes.clear();
+        buffer.open(QIODevice::WriteOnly);
+        pic.save(&buffer, "PNG");
+        buffer.close();
+    }
+
+    if (bytes.size() >= TOX_AVATAR_MAX_DATA_LENGTH)
+    {
+        QMessageBox::critical(this, tr("Error"), tr("This image is too big"));
+        return;
+    }
+
+    Nexus::getCore()->setAvatar(TOX_AVATAR_FORMAT_PNG, bytes);
+}
+
+void ProfileForm::onLoadClicked()
 {
     if (bodyUI->profiles->currentText() != Settings::getInstance().getCurrentProfile())
     {
@@ -148,7 +238,7 @@ void IdentityForm::onLoadClicked()
     }
 }
 
-void IdentityForm::onRenameClicked()
+void ProfileForm::onRenameClicked()
 {
     QString cur = bodyUI->profiles->currentText();
     QString title = tr("Rename \"%1\"", "renaming a profile").arg(cur);
@@ -176,7 +266,7 @@ void IdentityForm::onRenameClicked()
     } while (true);
 }
 
-void IdentityForm::onExportClicked()
+void ProfileForm::onExportClicked()
 {
     QString current = bodyUI->profiles->currentText() + Core::TOX_EXT;
     QString path = QFileDialog::getSaveFileName(this, tr("Export profile", "save dialog title"),
@@ -201,7 +291,7 @@ void IdentityForm::onExportClicked()
     }
 }
 
-void IdentityForm::onDeleteClicked()
+void ProfileForm::onDeleteClicked()
 {
     if (Settings::getInstance().getCurrentProfile() == bodyUI->profiles->currentText())
     {
@@ -226,7 +316,7 @@ void IdentityForm::onDeleteClicked()
     }
 }
 
-void IdentityForm::onImportClicked()
+void ProfileForm::onImportClicked()
 {
     QString path = QFileDialog::getOpenFileName(this,
                                                 tr("Import profile", "import dialog title"),
@@ -256,18 +346,23 @@ void IdentityForm::onImportClicked()
     bodyUI->profiles->addItem(profile);
 }
 
-void IdentityForm::onNewClicked()
+void ProfileForm::onStatusSet(Status)
+{
+    refreshProfiles();
+}
+
+void ProfileForm::onNewClicked()
 {
     emit Widget::getInstance()->changeProfile(QString());
 }
 
-void IdentityForm::disableSwitching()
+void ProfileForm::disableSwitching()
 {
     bodyUI->loadButton->setEnabled(false);
     bodyUI->newButton->setEnabled(false);
 }
 
-void IdentityForm::enableSwitching()
+void ProfileForm::enableSwitching()
 {
     if (!core->anyActiveCalls())
     {
@@ -275,3 +370,9 @@ void IdentityForm::enableSwitching()
         bodyUI->newButton->setEnabled(true);
     }
 }
+
+void ProfileForm::showEvent(QShowEvent *event)
+{
+    refreshProfiles();
+    QWidget::showEvent(event);
+}

src/widget/form/profileform.h

@@ -17,18 +17,19 @@
 #ifndef IDENTITYFORM_H
 #define IDENTITYFORM_H
 
-#include "genericsettings.h"
-#include <QGroupBox>
-#include <QTextEdit>
 #include <QLineEdit>
 #include <QLabel>
 #include <QTimer>
+#include <QVBoxLayout>
+#include "src/core.h"
 
 class CroppingLabel;
 class Core;
+class MaskablePixmapWidget;
 
 namespace Ui {
 class IdentitySettings;
+class MainWindow;
 }
 
 class ClickableTE : public QLineEdit
@@ -42,22 +43,26 @@ protected:
     void mouseReleaseEvent(QMouseEvent*) {emit clicked();}    
 };
 
-class IdentityForm : public GenericForm
+class ProfileForm : public QWidget
 {
     Q_OBJECT
 public:
-    IdentityForm();
+    ProfileForm(QWidget *parent = nullptr);
-    ~IdentityForm();
+    ~ProfileForm();
-
+    void show(Ui::MainWindow &ui);
-    virtual void present();
 
 signals:
     void userNameChanged(QString);
     void statusMessageChanged(QString);
 
+public slots:
+    void onSelfAvatarLoaded(const QPixmap &pic);
+    void onStatusSet(Status status);
+
 private slots:
     void setToxId(const QString& id);
     void copyIdClicked();
+    void onAvatarClicked();
     void onUserNameEdited();
     void onStatusMessageEdited();
     void onLoadClicked();
@@ -69,8 +74,14 @@ private slots:
     void disableSwitching();
     void enableSwitching();
 
+protected:
+    virtual void showEvent(QShowEvent *);
+
 private:
+    void refreshProfiles();
     Ui::IdentitySettings* bodyUI;
+    MaskablePixmapWidget* profilePicture;
+    QWidget *head;
     Core* core;
     QTimer timer;
     bool hasCheck = false;

src/widget/form/profileform.ui

@@ -47,44 +47,48 @@
        <property name="spacing">
         <number>9</number>
        </property>
-       <item alignment="Qt::AlignTop">
+       <item>
         <widget class="QGroupBox" name="publicGroup">
          <property name="title">
           <string>Public Information</string>
          </property>
-         <layout class="QVBoxLayout" name="verticalLayout_2">
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
           <item>
-           <widget class="QLabel" name="userNameLabel">
+           <layout class="QVBoxLayout" name="publicFieldsLayout">
-            <property name="text">
+            <item>
-             <string>Name</string>
+             <widget class="QLabel" name="userNameLabel">
-            </property>
+              <property name="text">
-           </widget>
+               <string>Name</string>
-          </item>
+              </property>
-          <item>
+             </widget>
-           <widget class="QLineEdit" name="userName"/>
+            </item>
-          </item>
+            <item>
-          <item>
+             <widget class="QLineEdit" name="userName"/>
-           <widget class="QLabel" name="statusMessageLabel">
+            </item>
-            <property name="text">
+            <item>
-             <string>Status</string>
+             <widget class="QLabel" name="statusMessageLabel">
-            </property>
+              <property name="text">
-           </widget>
+               <string>Status</string>
-          </item>
+              </property>
-          <item>
+             </widget>
-           <widget class="QLineEdit" name="statusMessage"/>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="statusMessage"/>
+            </item>
+           </layout>
           </item>
          </layout>
         </widget>
        </item>
        <item alignment="Qt::AlignTop">
         <widget class="QGroupBox" name="toxGroup">
-         <property name="title">
-          <string>Tox ID</string>
-         </property>
          <property name="toolTip">
           <string comment="Tox ID tooltip">This bunch of characters tells other Tox clients how to contact you.
 Share it with your friends to communicate.</string>
          </property>
+         <property name="title">
+          <string>Tox ID</string>
+         </property>
          <layout class="QVBoxLayout" name="verticalLayout_3">
           <item>
            <widget class="CroppingLabel" name="toxIdLabel">
@@ -113,15 +117,15 @@ Share it with your friends to communicate.</string>
             </item>
             <item>
              <widget class="QComboBox" name="profiles">
-              <property name="toolTip">
-               <string comment="toolTip for currently set profile">Currently selected profile.</string>
-              </property>
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
+              <property name="toolTip">
+               <string comment="toolTip for currently set profile">Currently selected profile.</string>
+              </property>
              </widget>
             </item>
            </layout>
@@ -140,23 +144,23 @@ Share it with your friends to communicate.</string>
             </item>
             <item>
              <widget class="QPushButton" name="renameButton">
-              <property name="text">
-               <string comment="rename profile button">Rename</string>
-              </property>
               <property name="toolTip">
                <string comment="tooltip for renaming profile button">Rename selected profile.</string>
               </property>
+              <property name="text">
+               <string comment="rename profile button">Rename</string>
+              </property>
              </widget>
             </item>
             <item>
              <widget class="QPushButton" name="exportButton">
-              <property name="text">
-               <string comment="export profile button">Export</string>
-              </property>
               <property name="toolTip">
                <string comment="tooltip for profile exporting button">Allows you to export your Tox profile to a file.
 Profile does not contain your history.</string>
               </property>
+              <property name="text">
+               <string comment="export profile button">Export</string>
+              </property>
              </widget>
             </item>
             <item>
@@ -175,12 +179,12 @@ Profile does not contain your history.</string>
            <layout class="QHBoxLayout" name="profilesButtonsLayout2">
             <item>
              <widget class="QPushButton" name="importButton">
-              <property name="text">
-               <string comment="import profile button">Import a profile</string>
-              </property>
               <property name="toolTip">
                <string comment="tooltip for importing profile button">Import Tox profile from a .tox file.</string>
               </property>
+              <property name="text">
+               <string comment="import profile button">Import a profile</string>
+              </property>
              </widget>
             </item>
             <item>

src/widget/form/settings/generalform.cpp

@@ -199,7 +199,7 @@ void GeneralForm::onSetCloseToTray()
 void GeneralForm::onSetLightTrayIcon()
 {
     Settings::getInstance().setLightTrayIcon(bodyUI->lightTrayIcon->isChecked());
-    Widget::getInstance()->updateTrayIcon();
+    Widget::getInstance()->updateIcons();
 }
 
 void GeneralForm::onSetMinimizeToTray()

src/widget/form/settingswidget.cpp

@@ -19,7 +19,6 @@
 #include "ui_mainwindow.h"
 #include "src/video/camera.h"
 #include "src/widget/form/settings/generalform.h"
-#include "src/widget/form/settings/identityform.h"
 #include "src/widget/form/settings/privacyform.h"
 #include "src/widget/form/settings/avform.h"
 #include "src/widget/form/settings/advancedform.h"
@@ -52,12 +51,11 @@ SettingsWidget::SettingsWidget(QWidget* parent)
     bodyLayout->addWidget(settingsWidgets);
 
     GeneralForm* gfrm = new GeneralForm(this);
-    IdentityForm* ifrm = new IdentityForm;
     PrivacyForm* pfrm = new PrivacyForm;
     AVForm* avfrm = new AVForm;
     AdvancedForm *expfrm = new AdvancedForm;
 
-    GenericForm* cfgForms[] = { gfrm, ifrm, pfrm, avfrm, expfrm };
+    GenericForm* cfgForms[] = { gfrm, pfrm, avfrm, expfrm };
     for (GenericForm* cfgForm : cfgForms)
         settingsWidgets->addTab(cfgForm, cfgForm->getFormIcon(), cfgForm->getFormName());
 

src/widget/form/settingswidget.h

@@ -24,7 +24,6 @@
 class Camera;
 class GenericForm;
 class GeneralForm;
-class IdentityForm;
 class PrivacyForm;
 class AVForm;
 class QLabel;

src/widget/groupwidget.cpp

@@ -51,7 +51,7 @@ void GroupWidget::contextMenuEvent(QContextMenuEvent * event)
 {
     QPoint pos = event->globalPos();
     QMenu menu;
-    QAction* setAlias = menu.addAction(tr("Set title..."));
+    QAction* setTitle = menu.addAction(tr("Set title..."));
     QAction* quitGroup = menu.addAction(tr("Quit group","Menu to quit a groupchat"));
 
     QAction* selectedItem = menu.exec(pos);
@@ -59,7 +59,7 @@ void GroupWidget::contextMenuEvent(QContextMenuEvent * event)
     {
         if (selectedItem == quitGroup)
             emit removeGroup(groupId);
-        else if (selectedItem == setAlias)
+        else if (selectedItem == setTitle)
         {
             bool ok;
             Group* g = GroupList::findGroup(groupId);
@@ -69,6 +69,13 @@ void GroupWidget::contextMenuEvent(QContextMenuEvent * event)
 
             if (ok && alias != nameLabel->fullText())
                 emit g->getChatForm()->groupTitleChanged(groupId, alias.left(128));
+            /* according to agilob:
+	     * “Moving mouse pointer over groupwidget results in CSS effect
+	     * mouse-over(?). Changing group title repaints only changed
+	     * element - title, the rest of the widget stays in the same CSS as it
+	     * was on mouse over. Repainting whole widget fixes style problem.”
+	     */
+            this->repaint();            
         }
     }
 }

src/widget/systemtrayicon.cpp

@@ -331,7 +331,7 @@ void SystemTrayIcon::setVisible(bool newState)
     }
 }
 
-void SystemTrayIcon::setIcon(QIcon &&icon)
+void SystemTrayIcon::setIcon(QIcon &icon)
 {
     if (false);
     #ifdef ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND

src/widget/systemtrayicon.h

@@ -17,7 +17,7 @@ public:
     void show();
     void hide();
     void setVisible(bool);
-    void setIcon(QIcon&& icon);
+    void setIcon(QIcon &icon);
 
 signals:
     void activated(QSystemTrayIcon::ActivationReason);

src/widget/widget.cpp

@@ -49,8 +49,6 @@
 #include <QMouseEvent>
 #include <QClipboard>
 #include <QThread>
-#include <QFileDialog>
-#include <QInputDialog>
 #include <QDialogButtonBox>
 #include <QTimer>
 #include <QStyleFactory>
@@ -149,7 +147,6 @@ void Widget::init()
     ui->friendList->setWidget(contactListWidget);
     ui->friendList->setLayoutDirection(Qt::RightToLeft);
 
-    ui->nameLabel->setEditable(true);
     ui->statusLabel->setEditable(true);
 
     ui->statusPanel->setStyleSheet(Style::getStylesheet(":/ui/window/statusPanel.css"));
@@ -172,23 +169,26 @@ void Widget::init()
 
     Style::setThemeColor(Settings::getInstance().getThemeColor());
     reloadTheme();
+    updateIcons();
     
     filesForm = new FilesForm();
     addFriendForm = new AddFriendForm;
+    profileForm = new ProfileForm();
     settingsWidget = new SettingsWidget();
 
     Core* core = Nexus::getCore();
     connect(core, SIGNAL(fileDownloadFinished(const QString&)), filesForm, SLOT(onFileDownloadComplete(const QString&)));
     connect(core, SIGNAL(fileUploadFinished(const QString&)), filesForm, SLOT(onFileUploadComplete(const QString&)));
     connect(settingsWidget, &SettingsWidget::setShowSystemTray, this, &Widget::onSetShowSystemTray);
+    connect(core, SIGNAL(selfAvatarChanged(QPixmap)), profileForm, SLOT(onSelfAvatarLoaded(QPixmap)));
     connect(ui->addButton, SIGNAL(clicked()), this, SLOT(onAddClicked()));
     connect(ui->groupButton, SIGNAL(clicked()), this, SLOT(onGroupClicked()));
     connect(ui->transferButton, SIGNAL(clicked()), this, SLOT(onTransferClicked()));
     connect(ui->settingsButton, SIGNAL(clicked()), this, SLOT(onSettingsClicked()));
-    connect(ui->nameLabel, SIGNAL(textChanged(QString, QString)), this, SLOT(onUsernameChanged(QString, QString)));
+    connect(profilePicture, &MaskablePixmapWidget::clicked, this, &Widget::showProfile);
+    connect(ui->nameLabel, &CroppingLabel::clicked, this, &Widget::showProfile);
     connect(ui->statusLabel, SIGNAL(textChanged(QString, QString)), this, SLOT(onStatusMessageChanged(QString, QString)));
     connect(ui->mainSplitter, &QSplitter::splitterMoved, this, &Widget::onSplitterMoved);
-    connect(profilePicture, SIGNAL(clicked()), this, SLOT(onAvatarClicked()));
     connect(addFriendForm, SIGNAL(friendRequested(QString, QString)), this, SIGNAL(friendRequested(QString, QString)));
     connect(timer, &QTimer::timeout, this, &Widget::onUserAwayCheck);
     connect(timer, &QTimer::timeout, this, &Widget::onEventIconTick);
@@ -223,7 +223,7 @@ void Widget::setTranslation()
     QCoreApplication::installTranslator(translator);
 }
 
-void Widget::updateTrayIcon()
+void Widget::updateIcons()
 {
     QString status;
     if (eventIcon)
@@ -234,10 +234,17 @@ void Widget::updateTrayIcon()
         if (!status.length())
             status = "offline";
     }
-    QString color = Settings::getInstance().getLightTrayIcon() ? "light" : "dark";
+
-    QString pic = ":img/taskbar/" + color + "/taskbar_" + status + ".svg";
+    QIcon ico = QIcon::fromTheme("qtox-" + status);
+    if (ico.isNull())
+    {
+        QString color = Settings::getInstance().getLightTrayIcon() ? "light" : "dark";
+        ico = QIcon(":img/taskbar/" + color + "/taskbar_" + status + ".svg");
+    }
+
+    setWindowIcon(ico);
     if (icon)
-        icon->setIcon(QIcon(pic));
+        icon->setIcon(ico);
 }
 
 Widget::~Widget()
@@ -247,6 +254,7 @@ Widget::~Widget()
     if (icon)
         icon->hide();
     hideMainForms();
+    delete profileForm;
     delete settingsWidget;
     delete addFriendForm;
     delete filesForm;
@@ -310,53 +318,6 @@ QString Widget::getUsername()
     return Nexus::getCore()->getUsername();
 }
 
-void Widget::onAvatarClicked()
-{
-    QString filename = QFileDialog::getOpenFileName(this,
-        tr("Choose a profile picture"),
-        QDir::homePath(),
-        Nexus::getSupportedImageFilter());
-    if (filename.isEmpty())
-        return;
-    QFile file(filename);
-    file.open(QIODevice::ReadOnly);
-    if (!file.isOpen())
-    {
-        QMessageBox::critical(this, tr("Error"), tr("Unable to open this file"));
-        return;
-    }
-
-    QPixmap pic;
-    if (!pic.loadFromData(file.readAll()))
-    {
-        QMessageBox::critical(this, tr("Error"), tr("Unable to read this image"));
-        return;
-    }
-
-    QByteArray bytes;
-    QBuffer buffer(&bytes);
-    buffer.open(QIODevice::WriteOnly);
-    pic.save(&buffer, "PNG");
-    buffer.close();
-
-    if (bytes.size() >= TOX_AVATAR_MAX_DATA_LENGTH)
-    {
-        pic = pic.scaled(64,64, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-        bytes.clear();
-        buffer.open(QIODevice::WriteOnly);
-        pic.save(&buffer, "PNG");
-        buffer.close();
-    }
-
-    if (bytes.size() >= TOX_AVATAR_MAX_DATA_LENGTH)
-    {
-        QMessageBox::critical(this, tr("Error"), tr("This image is too big"));
-        return;
-    }
-
-    Nexus::getCore()->setAvatar(TOX_AVATAR_FORMAT_PNG, bytes);
-}
-
 void Widget::onSelfAvatarLoaded(const QPixmap& pic)
 {
     profilePicture->setPixmap(pic);
@@ -429,7 +390,7 @@ void Widget::onStatusSet(Status status)
         ui->statusButton->setIcon(QIcon(":img/status/dot_away_2x.png"));
         break;
     }
-    updateTrayIcon();
+    updateIcons();
 }
 
 void Widget::setWindowTitle(const QString& title)
@@ -483,7 +444,7 @@ void Widget::confirmExecutableOpen(const QFileInfo file)
     }
     else
     {
-        QDesktopServices::openUrl(QUrl("file://" + file.filePath(), QUrl::TolerantMode));
+        QDesktopServices::openUrl(QUrl::fromLocalFile(file.filePath()));
     }
 }
 
@@ -532,6 +493,14 @@ void Widget::onSettingsClicked()
     activeChatroomWidget = nullptr;
 }
 
+void Widget::showProfile() // onAvatarClicked, onUsernameClicked
+{
+    hideMainForms();
+    profileForm->show(*ui);
+    setWindowTitle(tr("Profile"));
+    activeChatroomWidget = nullptr;
+}
+
 void Widget::hideMainForms()
 {
     QLayoutItem* item;
@@ -937,6 +906,15 @@ void Widget::onGroupTitleChanged(int groupnumber, const QString& author, const Q
         g->getChatForm()->addSystemInfoMessage(tr("%1 has set the title to %2").arg(author, title), ChatMessage::INFO, QDateTime::currentDateTime());
 }
 
+void Widget::onGroupPeerAudioPlaying(int groupnumber, int peernumber)
+{
+    Group* g = GroupList::findGroup(groupnumber);
+    if (!g)
+        return;
+
+    g->getChatForm()->peerAudioPlaying(peernumber);
+}
+
 void Widget::removeGroup(Group* g, bool fake)
 {
     g->getGroupWidget()->setAsInactiveChatroom();
@@ -1013,7 +991,7 @@ bool Widget::event(QEvent * e)
             {
                 eventFlag = false;
                 eventIcon = false;
-                updateTrayIcon();
+                updateIcons();
             }
         default:
             break;
@@ -1055,7 +1033,7 @@ void Widget::onEventIconTick()
     if (eventFlag)
     {
         eventIcon ^= true;
-        updateTrayIcon();
+        updateIcons();
     }
 }
 
@@ -1067,7 +1045,7 @@ void Widget::onTryCreateTrayIcon()
         if (QSystemTrayIcon::isSystemTrayAvailable())
         {
             icon = new SystemTrayIcon;
-            updateTrayIcon();
+            updateIcons();
             trayMenu = new QMenu;
 
             actionQuit = new QAction(tr("&Quit"), this);

src/widget/widget.h

@@ -23,7 +23,7 @@
 #include <QFileInfo>
 #include "form/addfriendform.h"
 #include "form/settingswidget.h"
-#include "form/settings/identityform.h"
+#include "form/profileform.h"
 #include "form/filesform.h"
 #include "src/corestructs.h"
 
@@ -63,7 +63,7 @@ public:
     bool getIsWindowMinimized();
     void clearContactsList();
     void setTranslation();
-    void updateTrayIcon();
+    void updateIcons();
     ~Widget();
 
     virtual void closeEvent(QCloseEvent *event);
@@ -102,6 +102,7 @@ public slots:
     void onGroupMessageReceived(int groupnumber, int peernumber, const QString& message, bool isAction);
     void onGroupNamelistChanged(int groupnumber, int peernumber, uint8_t change);
     void onGroupTitleChanged(int groupnumber, const QString& author, const QString& title);
+    void onGroupPeerAudioPlaying(int groupnumber, int peernumber);
     void playRingtone();
     void onFriendTypingChanged(int friendId, bool isTyping);
     void nextContact();
@@ -121,7 +122,7 @@ private slots:
     void onAddClicked();
     void onGroupClicked();
     void onTransferClicked();
-    void onAvatarClicked();
+    void showProfile();
     void onUsernameChanged(const QString& newUsername, const QString& oldUsername);
     void onStatusMessageChanged(const QString& newStatusMessage, const QString& oldStatusMessage);
     void onChatroomWidgetClicked(GenericChatroomWidget *);
@@ -160,6 +161,7 @@ private:
     QSplitter *centralLayout;
     QPoint dragPosition;
     AddFriendForm *addFriendForm;
+    ProfileForm *profileForm;
     SettingsWidget *settingsWidget;
     FilesForm *filesForm;
     static Widget *instance;