From 04657d2c1da2df8ee764adedf2e9656b48046bd4 Mon Sep 17 00:00:00 2001
From: Marcel <marcel@tzi.de>
Date: Fri, 12 Sep 2014 15:23:20 +0200
Subject: [PATCH 001/205] added ToxID struct

---
 corestructs.h | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/corestructs.h b/corestructs.h
index ebaab4534..a2bb6f31f 100644
--- a/corestructs.h
+++ b/corestructs.h
@@ -10,6 +10,32 @@ class QTimer;
 
 enum class Status : int {Online = 0, Away, Busy, Offline};
 
+#define TOX_ID_PUBLIC_KEY_LENGTH 64
+#define TOX_ID_NO_SPAM_LENGTH    8
+#define TOX_ID_CHECKSUM_LENGTH   4
+
+struct ToxID
+{
+    QString publicKey;
+    QString noSpam;
+    QString checkSum;
+
+    QString toString() const
+    {
+        return publicKey + noSpam + checkSum;
+    }
+
+    ToxID static fromString(QString id)
+    {
+        ToxID toxID;
+        toxID.publicKey = id.left(TOX_ID_PUBLIC_KEY_LENGTH);
+        toxID.noSpam    = id.mid(TOX_ID_PUBLIC_KEY_LENGTH, TOX_ID_NO_SPAM_LENGTH);
+        toxID.checkSum  = id.right(TOX_ID_CHECKSUM_LENGTH);
+        return toxID;
+    }
+
+};
+
 struct DhtServer
 {
     QString name;

From c3a8cd01f37e4b0530c3b0c1e541328d87ab9e4c Mon Sep 17 00:00:00 2001
From: Marcel <marcel@tzi.de>
Date: Fri, 12 Sep 2014 15:32:15 +0200
Subject: [PATCH 002/205] removed settingsform, removed selfcamview from widget

---
 qtox.pro                     |   2 -
 widget/form/settingsform.cpp | 142 -----------------------------------
 widget/form/settingsform.h   |  67 -----------------
 widget/widget.cpp            |  36 +--------
 widget/widget.h              |   6 --
 5 files changed, 1 insertion(+), 252 deletions(-)
 delete mode 100644 widget/form/settingsform.cpp
 delete mode 100644 widget/form/settingsform.h

diff --git a/qtox.pro b/qtox.pro
index 7b52d779c..4bc5bba89 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -79,7 +79,6 @@ win32 {
 HEADERS  += widget/form/addfriendform.h \
     widget/form/chatform.h \
     widget/form/groupchatform.h \
-    widget/form/settingsform.h \
     widget/form/filesform.h \
     widget/tool/chattextedit.h \
     widget/tool/friendrequestdialog.h \
@@ -116,7 +115,6 @@ SOURCES += \
     widget/form/addfriendform.cpp \
     widget/form/chatform.cpp \
     widget/form/groupchatform.cpp \
-    widget/form/settingsform.cpp \
     widget/form/filesform.cpp \
     widget/tool/chattextedit.cpp \
     widget/tool/friendrequestdialog.cpp \
diff --git a/widget/form/settingsform.cpp b/widget/form/settingsform.cpp
deleted file mode 100644
index 3d4a213da..000000000
--- a/widget/form/settingsform.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-    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 "settingsform.h"
-#include "widget/widget.h"
-#include "settings.h"
-#include "smileypack.h"
-#include "ui_mainwindow.h"
-#include <QFont>
-#include <QClipboard>
-#include <QApplication>
-#include <QFileDialog>
-#include <QDir>
-
-SettingsForm::SettingsForm()
-    : QObject()
-{
-    main = new QWidget(), head = new QWidget();
-    QFont bold, small;
-    bold.setBold(true);
-    small.setPixelSize(13);
-    small.setKerning(false);
-    headLabel.setText(tr("User Settings","\"Headline\" of the window"));
-    headLabel.setFont(bold);
-
-    nameLabel.setText(tr("Name","Username/nick"));
-    statusTextLabel.setText(tr("Status","Status message"));
-    idLabel.setText("Tox ID " + tr("(click here to copy)", "Click on this text to copy TID to clipboard"));
-    id.setFont(small);
-    id.setTextInteractionFlags(Qt::TextSelectableByMouse);
-    id.setReadOnly(true);
-    id.setFrameStyle(QFrame::NoFrame);
-    id.setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    id.setFixedHeight(id.document()->size().height()*2);
-
-    videoTest.setText(tr("Test video","Text on a button to test the video/webcam"));
-    enableIPv6.setText(tr("Enable IPv6 (recommended)","Text on a checkbox to enable IPv6"));
-    enableIPv6.setChecked(Settings::getInstance().getEnableIPv6());
-    useTranslations.setText(tr("Use translations","Text on a checkbox to enable translations"));
-    useTranslations.setChecked(Settings::getInstance().getUseTranslations());
-    makeToxPortable.setText(tr("Make Tox portable","Text on a checkbox to make qTox a portable application"));
-    makeToxPortable.setChecked(Settings::getInstance().getMakeToxPortable());
-    makeToxPortable.setToolTip(tr("Save settings to the working directory instead of the usual conf dir","describes makeToxPortable checkbox"));
-
-    smileyPackLabel.setText(tr("Smiley Pack", "Text on smiley pack label"));
-    for (auto entry : SmileyPack::listSmileyPacks())
-        smileyPackBrowser.addItem(entry.first, entry.second);
-    smileyPackBrowser.setCurrentIndex(smileyPackBrowser.findData(Settings::getInstance().getSmileyPack()));
-
-    main->setLayout(&layout);
-    layout.addWidget(&nameLabel);
-    layout.addWidget(&name);
-    layout.addWidget(&statusTextLabel);
-    layout.addWidget(&statusText);
-    layout.addWidget(&idLabel);
-    layout.addWidget(&id);
-    layout.addWidget(&videoTest);
-    layout.addWidget(&enableIPv6);
-    layout.addWidget(&useTranslations);
-    layout.addWidget(&makeToxPortable);
-    layout.addWidget(&smileyPackLabel);
-    layout.addWidget(&smileyPackBrowser);
-    layout.addStretch();
-
-    head->setLayout(&headLayout);
-    headLayout.addWidget(&headLabel);
-
-    connect(&videoTest, SIGNAL(clicked()), this, SLOT(onTestVideoClicked()));
-    connect(&enableIPv6, SIGNAL(stateChanged(int)), this, SLOT(onEnableIPv6Updated()));
-    connect(&useTranslations, SIGNAL(stateChanged(int)), this, SLOT(onUseTranslationUpdated()));
-    connect(&makeToxPortable, SIGNAL(stateChanged(int)), this, SLOT(onMakeToxPortableUpdated()));
-    connect(&idLabel, SIGNAL(clicked()), this, SLOT(copyIdClicked()));
-    connect(&smileyPackBrowser, SIGNAL(currentIndexChanged(int)), this, SLOT(onSmileyBrowserIndexChanged(int)));
-}
-
-SettingsForm::~SettingsForm()
-{
-}
-
-void SettingsForm::setFriendAddress(const QString& friendAddress)
-{
-    QString txt{friendAddress};
-    txt.insert(38,'\n');
-    id.setText(txt);
-}
-
-void SettingsForm::show(Ui::MainWindow &ui)
-{
-    name.setText(ui.nameLabel->text());
-    statusText.setText(ui.statusLabel->text());
-    ui.mainContent->layout()->addWidget(main);
-    ui.mainHead->layout()->addWidget(head);
-    main->show();
-    head->show();
-}
-
-void SettingsForm::onTestVideoClicked()
-{
-     Widget::getInstance()->showTestCamview();
-}
-
-void SettingsForm::onEnableIPv6Updated()
-{
-    Settings::getInstance().setEnableIPv6(enableIPv6.isChecked());
-}
-
-void SettingsForm::copyIdClicked()
-{
-    id.selectAll();
-    QString txt = id.toPlainText();
-    txt.replace('\n',"");
-    QApplication::clipboard()->setText(txt);
-}
-
-void SettingsForm::onUseTranslationUpdated()
-{
-    Settings::getInstance().setUseTranslations(useTranslations.isChecked());
-}
-
-void SettingsForm::onMakeToxPortableUpdated()
-{
-    Settings::getInstance().setMakeToxPortable(makeToxPortable.isChecked());
-}
-
-void SettingsForm::onSmileyBrowserIndexChanged(int index)
-{
-    QString filename = smileyPackBrowser.itemData(index).toString();
-    Settings::getInstance().setSmileyPack(filename);
-}
diff --git a/widget/form/settingsform.h b/widget/form/settingsform.h
deleted file mode 100644
index a081d01fb..000000000
--- a/widget/form/settingsform.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-    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 SETTINGSFORM_H
-#define SETTINGSFORM_H
-
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QObject>
-#include <QCheckBox>
-#include <QPushButton>
-#include <QTextEdit>
-#include <QComboBox>
-
-#include "widget/croppinglabel.h"
-
-namespace Ui {class MainWindow;}
-class QString;
-
-class SettingsForm : public QObject
-{
-    Q_OBJECT
-public:
-    SettingsForm();
-    ~SettingsForm();
-
-    void show(Ui::MainWindow &ui);
-
-public slots:
-    void setFriendAddress(const QString& friendAddress);
-
-private slots:
-    void onTestVideoClicked();
-    void onEnableIPv6Updated();
-    void onUseTranslationUpdated();
-    void onMakeToxPortableUpdated();
-    void onSmileyBrowserIndexChanged(int index);
-    void copyIdClicked();
-
-private:
-    QLabel headLabel, nameLabel, statusTextLabel, smileyPackLabel;
-    QTextEdit id;
-    CroppingLabel idLabel;
-    QPushButton videoTest;
-    QCheckBox enableIPv6, useTranslations, makeToxPortable;
-    QVBoxLayout layout, headLayout;
-    QWidget *main, *head;
-    QComboBox smileyPackBrowser;
-public:
-    QLineEdit name, statusText;
-};
-
-#endif // SETTINGSFORM_H
diff --git a/widget/widget.cpp b/widget/widget.cpp
index abe14460a..532a47664 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -155,7 +155,6 @@ Widget::Widget(QWidget *parent)
     ui->statusButton->style()->polish(ui->statusButton);
 
     camera = new Camera;
-    camview = new SelfCamView(camera);
 
     // Disable some widgets until we're connected to the DHT
     ui->statusButton->setEnabled(false);
@@ -179,7 +178,6 @@ Widget::Widget(QWidget *parent)
     connect(core, &Core::statusSet, this, &Widget::onStatusSet);
     connect(core, &Core::usernameSet, this, &Widget::setUsername);
     connect(core, &Core::statusMessageSet, this, &Widget::setStatusMessage);
-    connect(core, &Core::friendAddressGenerated, &settingsForm, &SettingsForm::setFriendAddress);
     connect(core, SIGNAL(fileDownloadFinished(const QString&)), &filesForm, SLOT(onFileDownloadComplete(const QString&)));
     connect(core, SIGNAL(fileUploadFinished(const QString&)), &filesForm, SLOT(onFileUploadComplete(const QString&)));
     connect(core, &Core::friendAdded, this, &Widget::addFriend);
@@ -210,8 +208,6 @@ Widget::Widget(QWidget *parent)
     connect(setStatusOnline, SIGNAL(triggered()), this, SLOT(setStatusOnline()));
     connect(setStatusAway, SIGNAL(triggered()), this, SLOT(setStatusAway()));
     connect(setStatusBusy, SIGNAL(triggered()), this, SLOT(setStatusBusy()));
-    connect(&settingsForm.name, SIGNAL(editingFinished()), this, SLOT(onUsernameChanged()));
-    connect(&settingsForm.statusText, SIGNAL(editingFinished()), this, SLOT(onStatusMessageChanged()));
     connect(&friendForm, SIGNAL(friendRequested(QString,QString)), this, SIGNAL(friendRequested(QString,QString)));
 
     coreThread->start();
@@ -228,7 +224,6 @@ Widget::~Widget()
     if (!coreThread->isFinished())
         coreThread->terminate();
     delete core;
-    delete camview;
 
     hideMainForms();
 
@@ -338,9 +333,7 @@ void Widget::onTransferClicked()
 
 void Widget::onSettingsClicked()
 {
-    hideMainForms();
-    settingsForm.show(*ui);
-    activeChatroomWidget = nullptr;
+
 }
 
 void Widget::hideMainForms()
@@ -357,20 +350,10 @@ void Widget::hideMainForms()
     }
 }
 
-void Widget::onUsernameChanged()
-{
-    const QString newUsername = settingsForm.name.text();
-    ui->nameLabel->setText(newUsername);
-    ui->nameLabel->setToolTip(newUsername); // for overlength names
-    settingsForm.name.setText(newUsername);
-    core->setUsername(newUsername);
-}
-
 void Widget::onUsernameChanged(const QString& newUsername, const QString& oldUsername)
 {
     ui->nameLabel->setText(oldUsername); // restore old username until Core tells us to set it
     ui->nameLabel->setToolTip(oldUsername); // for overlength names
-    settingsForm.name.setText(oldUsername);
     core->setUsername(newUsername);
 }
 
@@ -378,23 +361,12 @@ void Widget::setUsername(const QString& username)
 {
     ui->nameLabel->setText(username);
     ui->nameLabel->setToolTip(username); // for overlength names
-    settingsForm.name.setText(username);
-}
-
-void Widget::onStatusMessageChanged()
-{
-    const QString newStatusMessage = settingsForm.statusText.text();
-    ui->statusLabel->setText(newStatusMessage);
-    ui->statusLabel->setToolTip(newStatusMessage); // for overlength messsages
-    settingsForm.statusText.setText(newStatusMessage);
-    core->setStatusMessage(newStatusMessage);
 }
 
 void Widget::onStatusMessageChanged(const QString& newStatusMessage, const QString& oldStatusMessage)
 {
     ui->statusLabel->setText(oldStatusMessage); // restore old status message until Core tells us to set it
     ui->statusLabel->setToolTip(oldStatusMessage); // for overlength messsages
-    settingsForm.statusText.setText(oldStatusMessage);
     core->setStatusMessage(newStatusMessage);
 }
 
@@ -402,7 +374,6 @@ void Widget::setStatusMessage(const QString &statusMessage)
 {
     ui->statusLabel->setText(statusMessage);
     ui->statusLabel->setToolTip(statusMessage); // for overlength messsages
-    settingsForm.statusText.setText(statusMessage);
 }
 
 void Widget::addFriend(int friendId, const QString &userId)
@@ -677,11 +648,6 @@ Group *Widget::createGroup(int groupId)
     return newgroup;
 }
 
-void Widget::showTestCamview()
-{
-    camview->show();
-}
-
 void Widget::onEmptyGroupCreated(int groupId)
 {
     createGroup(groupId);
diff --git a/widget/widget.h b/widget/widget.h
index 1fbecb412..653d72f1f 100644
--- a/widget/widget.h
+++ b/widget/widget.h
@@ -19,7 +19,6 @@
 
 #include <QMainWindow>
 #include "widget/form/addfriendform.h"
-#include "widget/form/settingsform.h"
 #include "widget/form/filesform.h"
 #include "corestructs.h"
 
@@ -54,7 +53,6 @@ public:
     QThread* getCoreThread();
     Camera* getCamera();
     static Widget* getInstance();
-    void showTestCamview();
     void newMessageAlert();
     bool isFriendWidgetCurActiveWidget(Friend* f);
     bool getIsWindowMinimized();
@@ -83,8 +81,6 @@ private slots:
     void onFailedToStartCore();
     void onUsernameChanged(const QString& newUsername, const QString& oldUsername);
     void onStatusMessageChanged(const QString& newStatusMessage, const QString& oldStatusMessage);
-    void onUsernameChanged();
-    void onStatusMessageChanged();
     void setUsername(const QString& username);
     void setStatusMessage(const QString &statusMessage);
     void addFriend(int friendId, const QString& userId);
@@ -137,12 +133,10 @@ private:
     Core* core;
     QThread* coreThread;
     AddFriendForm friendForm;
-    SettingsForm settingsForm;
     FilesForm filesForm;
     static Widget* instance;
     GenericChatroomWidget* activeChatroomWidget;
     FriendListWidget* contactListWidget;
-    SelfCamView* camview;
     Camera* camera;
     bool notify(QObject *receiver, QEvent *event);
     bool eventFilter(QObject *, QEvent *event);

From 28e8406be9aaad2e3fd523ce356d95b0e5b34f71 Mon Sep 17 00:00:00 2001
From: Marcel <marcel@tzi.de>
Date: Fri, 12 Sep 2014 15:41:41 +0200
Subject: [PATCH 003/205] added settingsdialog

---
 core.cpp                      |   5 +-
 core.h                        |   2 +-
 qtox.pro                      |   6 +-
 widget/form/addfriendform.cpp |   2 +-
 widget/settingsdialog.cpp     | 355 ++++++++++++++++++++++++++++++++++
 widget/settingsdialog.h       |  64 ++++++
 6 files changed, 427 insertions(+), 7 deletions(-)
 create mode 100644 widget/settingsdialog.cpp
 create mode 100644 widget/settingsdialog.h

diff --git a/core.cpp b/core.cpp
index 876301a63..fe1e3187b 100644
--- a/core.cpp
+++ b/core.cpp
@@ -718,12 +718,11 @@ void Core::setUsername(const QString& username)
     }
 }
 
-QString Core::getSelfId()
+ToxID Core::getSelfId()
 {
     uint8_t friendAddress[TOX_FRIEND_ADDRESS_SIZE];
     tox_get_address(tox, friendAddress);
-
-    return CFriendAddress::toString(friendAddress);
+    return ToxID::fromString(CFriendAddress::toString(friendAddress));
 }
 
 QString Core::getStatusMessage()
diff --git a/core.h b/core.h
index 96ab86d2d..13d051017 100644
--- a/core.h
+++ b/core.h
@@ -49,7 +49,7 @@ public:
     
     QString getUsername();
     QString getStatusMessage();
-    QString getSelfId();
+    ToxID getSelfId();
 
     void increaseVideoBusyness();
     void decreaseVideoBusyness();
diff --git a/qtox.pro b/qtox.pro
index 4bc5bba89..96e609c33 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -109,7 +109,8 @@ HEADERS  += widget/form/addfriendform.h \
     filetransferinstance.h \
     corestructs.h \
     coredefines.h \
-    coreav.h
+    coreav.h \
+    widget/settingsdialog.h
 
 SOURCES += \
     widget/form/addfriendform.cpp \
@@ -145,4 +146,5 @@ SOURCES += \
     widget/tool/chataction.cpp \
     widget/chatareawidget.cpp \
     filetransferinstance.cpp \
-    corestructs.cpp
+    corestructs.cpp \
+    widget/settingsdialog.cpp
diff --git a/widget/form/addfriendform.cpp b/widget/form/addfriendform.cpp
index 3a44ae672..2c9b197b2 100644
--- a/widget/form/addfriendform.cpp
+++ b/widget/form/addfriendform.cpp
@@ -95,7 +95,7 @@ void AddFriendForm::onSendTriggered()
     if (id.isEmpty()) {
         showWarning(tr("Please fill in a valid Tox ID","Tox ID of the friend you're sending a friend request to"));
     } else if (isToxId(id)) {
-        if (id.toUpper() == Core::getInstance()->getSelfId().toUpper())
+        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"));
         else
             emit friendRequested(id, getMessage());
diff --git a/widget/settingsdialog.cpp b/widget/settingsdialog.cpp
new file mode 100644
index 000000000..09cb765c1
--- /dev/null
+++ b/widget/settingsdialog.cpp
@@ -0,0 +1,355 @@
+#include "settingsdialog.h"
+#include "settings.h"
+#include "widget.h"
+#include "camera.h"
+#include "selfcamview.h"
+#include "core.h"
+
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QStackedWidget>
+#include <QPushButton>
+#include <QBoxLayout>
+#include <QLabel>
+#include <QGroupBox>
+#include <QCheckBox>
+#include <QLineEdit>
+
+
+// =======================================
+// settings pages
+//========================================
+class GeneralPage : public QWidget
+{
+public:
+    GeneralPage(QWidget *parent = 0) :
+        QWidget(parent)
+    {
+        QGroupBox *group = new QGroupBox(tr("General Settings"), this);
+
+        enableIPv6 = new QCheckBox(this);
+        enableIPv6->setText(tr("Enable IPv6 (recommended)","Text on a checkbox to enable IPv6"));
+        useTranslations = new QCheckBox(this);
+        useTranslations->setText(tr("Use translations","Text on a checkbox to enable translations"));
+        makeToxPortable = new QCheckBox(this);
+        makeToxPortable->setText(tr("Make Tox portable","Text on a checkbox to make qTox a portable application"));
+        makeToxPortable->setToolTip(tr("Save settings to the working directory instead of the usual conf dir","describes makeToxPortable checkbox"));
+
+        QVBoxLayout *vLayout = new QVBoxLayout();
+        vLayout->addWidget(enableIPv6);
+        vLayout->addWidget(useTranslations);
+        vLayout->addWidget(makeToxPortable);
+        group->setLayout(vLayout);
+
+        QVBoxLayout *mainLayout = new QVBoxLayout();
+        mainLayout->addWidget(group);
+        mainLayout->addStretch(1);
+        setLayout(mainLayout);
+    }
+
+    QCheckBox* enableIPv6;
+    QCheckBox* useTranslations;
+    QCheckBox* makeToxPortable;
+};
+
+class IdentityPage : public QWidget
+{
+public:
+    IdentityPage(QWidget* parent = 0) :
+        QWidget(parent)
+    {
+        // public
+        QGroupBox *publicGroup = new QGroupBox(tr("Public Information"), this);
+        QLabel* userNameLabel = new QLabel(tr("Name","Username/nick"), this);
+        userName = new QLineEdit(this);
+        QLabel* statusMessageLabel = new QLabel(tr("Status","Status message"), this);
+        statusMessage = new QLineEdit(this);
+        QVBoxLayout *vLayout = new QVBoxLayout();
+        vLayout->addWidget(userNameLabel);
+        vLayout->addWidget(userName);
+        vLayout->addWidget(statusMessageLabel);
+        vLayout->addWidget(statusMessage);
+        publicGroup->setLayout(vLayout);
+
+        // tox
+        QGroupBox* toxGroup = new QGroupBox(tr("Tox ID"), this);
+        QLabel* toxIdLabel = new QLabel(tr("Your Tox ID"), this);
+        toxID = new QLineEdit(this);
+        toxID->setReadOnly(true);
+        QVBoxLayout* toxLayout = new QVBoxLayout();
+        toxLayout->addWidget(toxIdLabel);
+        toxLayout->addWidget(toxID);
+        toxGroup->setLayout(toxLayout);
+
+        QVBoxLayout *mainLayout = new QVBoxLayout();
+        mainLayout->setSpacing(30);
+        mainLayout->addWidget(publicGroup);
+        mainLayout->addWidget(toxGroup);
+        mainLayout->addStretch(1);
+        setLayout(mainLayout);
+    }
+
+    QLineEdit* userName;
+    QLineEdit* statusMessage;
+    QLineEdit* toxID;
+};
+
+class PrivacyPage : public QWidget
+{
+public:
+    PrivacyPage(QWidget* parent = 0) :
+        QWidget(parent)
+    {}
+};
+
+class AVPage : public QWidget
+{
+    Q_OBJECT
+public:
+    AVPage(SettingsDialog* parent = 0) :
+        QWidget(parent)
+    {
+        QGroupBox *group = new QGroupBox(tr("Video Settings"), this);
+
+        camView = new SelfCamView(Camera::getInstance());
+        camView->hide(); // hide by default
+        testVideo = new QPushButton("enable video");
+        connect(testVideo, SIGNAL(clicked()), this, SLOT(onTestVideoPressed()));
+
+        QVBoxLayout *vLayout = new QVBoxLayout();
+        vLayout->addWidget(testVideo);
+        vLayout->addWidget(camView);
+        group->setLayout(vLayout);
+
+        QVBoxLayout *mainLayout = new QVBoxLayout();
+        mainLayout->addWidget(group);
+        mainLayout->addStretch(1);
+        setLayout(mainLayout);
+    }
+
+    ~AVPage()
+    {
+        delete camView;
+    }
+
+    void showTestVideo()
+    {
+        testVideo->setText("disable video");
+        camView->show();
+    }
+
+    void closeTestVideo()
+    {
+        testVideo->setText("enable video");
+        camView->close();
+    }
+
+    QPushButton* testVideo;
+    SelfCamView* camView;
+
+public slots:
+    void onTestVideoPressed()
+    {
+        if (camView->isVisible()) {
+            closeTestVideo();
+        } else {
+            showTestVideo();
+        }
+    }
+};
+
+// allows Q_OBJECT macro inside cpp
+#include "settingsdialog.moc"
+
+
+
+// =======================================
+// settings dialog
+//========================================
+SettingsDialog::SettingsDialog(Widget *parent) :
+    QDialog(parent),
+    widget(parent)
+{
+    createPages();
+    createButtons();
+    createConnections();
+    createLayout();
+    setWindowTitle(tr("Settings Dialog"));
+}
+
+void SettingsDialog::createPages()
+{
+    generalPage  = new GeneralPage(this);
+    identityPage = new IdentityPage(this);
+    privacyPage  = new PrivacyPage(this);
+    avPage       = new AVPage(this);
+
+    contentsWidget = new QListWidget;
+    contentsWidget->setViewMode(QListView::IconMode);
+    contentsWidget->setIconSize(QSize(100, 73));
+    contentsWidget->setMovement(QListView::Static);
+    contentsWidget->setMaximumWidth(110);
+    contentsWidget->setMinimumWidth(110);
+    contentsWidget->setSpacing(0);
+    contentsWidget->setFlow(QListView::TopToBottom);
+
+    pagesWidget = new QStackedWidget;
+    pagesWidget->addWidget(generalPage);
+    pagesWidget->addWidget(identityPage);
+    pagesWidget->addWidget(privacyPage);
+    pagesWidget->addWidget(avPage);
+
+    QListWidgetItem *generalButton = new QListWidgetItem(contentsWidget);
+    generalButton->setIcon(QIcon(":/img/settings/general.png"));
+    generalButton->setText(tr("General"));
+    generalButton->setTextAlignment(Qt::AlignHCenter);
+    generalButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+
+    QListWidgetItem *identity = new QListWidgetItem(contentsWidget);
+    identity->setIcon(QIcon(":/img/settings/identity.png"));
+    identity->setText(tr("Identity"));
+    identity->setTextAlignment(Qt::AlignHCenter);
+    identity->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+
+    QListWidgetItem *privacy = new QListWidgetItem(contentsWidget);
+    privacy->setIcon(QIcon(":/img/settings/privacy.png"));
+    privacy->setText(tr("Privacy"));
+    privacy->setTextAlignment(Qt::AlignHCenter);
+    privacy->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+
+    QListWidgetItem *av = new QListWidgetItem(contentsWidget);
+    av->setIcon(QIcon(":/img/settings/av.png"));
+    av->setText(tr("Audio/Video"));
+    av->setTextAlignment(Qt::AlignHCenter);
+    av->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+
+    contentsWidget->setCurrentRow(0);
+}
+
+void SettingsDialog::createButtons()
+{
+    okButton     = new QPushButton(tr("Ok"), this);
+    cancelButton = new QPushButton(tr("Cancel"), this);
+    applyButton  = new QPushButton(tr("Apply"), this);
+}
+
+void SettingsDialog::createConnections()
+{
+    connect(okButton, SIGNAL(clicked()), this, SLOT(okPressed()));
+    connect(cancelButton, SIGNAL(clicked()), this, SLOT(close()));
+    connect(applyButton, SIGNAL(clicked()), this, SLOT(applyPressed()));
+    connect(
+        contentsWidget,
+        SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
+        this,
+        SLOT(changePage(QListWidgetItem*,QListWidgetItem*))
+    );
+}
+
+void SettingsDialog::createLayout()
+{
+    setMinimumSize(800, 500);
+
+    QHBoxLayout *buttonsLayout = new QHBoxLayout();
+    buttonsLayout->addStretch(1);
+    buttonsLayout->addWidget(okButton);
+    buttonsLayout->addWidget(cancelButton);
+    buttonsLayout->addWidget(applyButton);
+
+    QHBoxLayout *hLayout = new QHBoxLayout();
+    hLayout->addWidget(contentsWidget);
+    hLayout->addWidget(pagesWidget, 1);
+
+    QVBoxLayout *mainLayout = new QVBoxLayout();
+    mainLayout->addLayout(hLayout);
+    mainLayout->addLayout(buttonsLayout);
+    setLayout(mainLayout);
+}
+
+void SettingsDialog::changePage(QListWidgetItem *current, QListWidgetItem *previous)
+{
+    if (!current) {
+        current = previous;
+    }
+    pagesWidget->setCurrentIndex(contentsWidget->row(current));
+}
+
+void SettingsDialog::okPressed()
+{
+    writeConfig();
+    close();
+}
+
+void SettingsDialog::cancelPressed()
+{
+    close();
+}
+
+void SettingsDialog::applyPressed()
+{
+    writeConfig();
+}
+
+void SettingsDialog::readConfig()
+{
+    Settings& settings = Settings::getInstance();
+    Core* core = widget->getCore();
+
+    generalPage->enableIPv6->setChecked(settings.getEnableIPv6());
+    generalPage->useTranslations->setChecked(settings.getUseTranslations());
+    generalPage->makeToxPortable->setChecked(settings.getMakeToxPortable());
+
+    identityPage->userName->setText(core->getUsername());
+    identityPage->statusMessage->setText(core->getStatusMessage());
+    identityPage->toxID->setText(core->getSelfId().toString());
+}
+
+void SettingsDialog::writeConfig()
+{
+    Settings& settings = Settings::getInstance();
+    Core* core = widget->getCore();
+
+
+    // only save settings if something changed
+    bool saveSettings = false;
+    if (settings.getEnableIPv6() != generalPage->enableIPv6->isChecked()) {
+        settings.setEnableIPv6(generalPage->enableIPv6->isChecked());
+        saveSettings = true;
+    }
+
+    if (settings.getUseTranslations() != generalPage->useTranslations->isChecked()) {
+        settings.setUseTranslations(generalPage->useTranslations->isChecked());
+        saveSettings = true;
+    }
+
+    if (settings.getMakeToxPortable() != generalPage->makeToxPortable->isChecked()) {
+        settings.setMakeToxPortable(generalPage->makeToxPortable->isChecked());
+        saveSettings = true;
+    }
+
+    if (saveSettings) {
+        settings.save();
+    }
+
+
+    // changing core settings will automatically save them
+    QString userName = identityPage->userName->text();
+    if (core->getUsername() != userName) {
+        core->setUsername(userName);
+    }
+
+    QString statusMessage = identityPage->statusMessage->text();
+    if (core->getStatusMessage() != statusMessage) {
+        core->setStatusMessage(statusMessage);
+    }
+}
+
+Widget* SettingsDialog::getWidget()
+{
+    return widget;
+}
+
+void SettingsDialog::closeEvent(QCloseEvent* e){
+    avPage->closeTestVideo();
+    QDialog::closeEvent(e);
+}
diff --git a/widget/settingsdialog.h b/widget/settingsdialog.h
new file mode 100644
index 000000000..55575b447
--- /dev/null
+++ b/widget/settingsdialog.h
@@ -0,0 +1,64 @@
+#ifndef SETTINGSDIALOG_H
+#define SETTINGSDIALOG_H
+
+#include <QWidget>
+#include <QDialog>
+
+class Widget;
+class SelfCamView;
+class Camera;
+class GeneralPage;
+class IdentityPage;
+class PrivacyPage;
+class AVPage;
+
+class QListWidget;
+class QListWidgetItem;
+class QStackedWidget;
+class QPushButton;
+class QCheckBox;
+class QLineEdit;
+
+// =======================================
+// settings dialog
+//========================================
+class SettingsDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit SettingsDialog(Widget *parent);
+
+    void readConfig();
+    void writeConfig();
+    Widget* getWidget();
+    void closeEvent(QCloseEvent *);
+
+public slots:
+    void changePage(QListWidgetItem *current, QListWidgetItem *previous);
+    void okPressed();
+    void cancelPressed();
+    void applyPressed();
+
+private:
+    void createPages();
+    void createButtons();
+    void createConnections();
+    void createLayout();
+
+    Widget* widget;
+
+    // pages
+    GeneralPage*    generalPage;
+    IdentityPage*   identityPage;
+    PrivacyPage*    privacyPage;
+    AVPage*         avPage;
+    QListWidget*    contentsWidget;
+    QStackedWidget* pagesWidget;
+
+    // buttons
+    QPushButton* okButton;
+    QPushButton* cancelButton;
+    QPushButton* applyButton;
+};
+
+#endif // SETTINGSDIALOG_H

From 4e5d1c170b2aa4b2f02986c8ac7fe8fc7dead950 Mon Sep 17 00:00:00 2001
From: Marcel <marcel@tzi.de>
Date: Fri, 12 Sep 2014 15:45:02 +0200
Subject: [PATCH 004/205] do not use getInstance of camera

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

diff --git a/widget/settingsdialog.cpp b/widget/settingsdialog.cpp
index 09cb765c1..0f11ee67c 100644
--- a/widget/settingsdialog.cpp
+++ b/widget/settingsdialog.cpp
@@ -111,7 +111,7 @@ public:
     {
         QGroupBox *group = new QGroupBox(tr("Video Settings"), this);
 
-        camView = new SelfCamView(Camera::getInstance());
+        camView = new SelfCamView(parent->getWidget()->getCamera());
         camView->hide(); // hide by default
         testVideo = new QPushButton("enable video");
         connect(testVideo, SIGNAL(clicked()), this, SLOT(onTestVideoPressed()));

From 1b2855e05be699e123f9b220e93207085bf6bfbc Mon Sep 17 00:00:00 2001
From: Marcel <marcel@tzi.de>
Date: Fri, 12 Sep 2014 15:46:34 +0200
Subject: [PATCH 005/205] use settings dialog in widget

---
 widget/widget.cpp | 5 ++++-
 widget/widget.h   | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/widget/widget.cpp b/widget/widget.cpp
index 532a47664..36b2c33c1 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -31,6 +31,7 @@
 #include "widget/friendlistwidget.h"
 #include "camera.h"
 #include "widget/form/chatform.h"
+#include "widget/settingsdialog.h"
 #include <QMessageBox>
 #include <QDebug>
 #include <QFile>
@@ -155,6 +156,7 @@ Widget::Widget(QWidget *parent)
     ui->statusButton->style()->polish(ui->statusButton);
 
     camera = new Camera;
+    settingsDialog = new SettingsDialog(this);
 
     // Disable some widgets until we're connected to the DHT
     ui->statusButton->setEnabled(false);
@@ -333,7 +335,8 @@ void Widget::onTransferClicked()
 
 void Widget::onSettingsClicked()
 {
-
+    settingsDialog->readConfig();
+    settingsDialog->show();
 }
 
 void Widget::hideMainForms()
diff --git a/widget/widget.h b/widget/widget.h
index 653d72f1f..035ea2ae0 100644
--- a/widget/widget.h
+++ b/widget/widget.h
@@ -37,6 +37,7 @@ class QMenu;
 class Core;
 class Camera;
 class FriendListWidget;
+class SettingsDialog;
 
 class Widget : public QMainWindow
 {
@@ -134,6 +135,7 @@ private:
     QThread* coreThread;
     AddFriendForm friendForm;
     FilesForm filesForm;
+    SettingsDialog* settingsDialog;
     static Widget* instance;
     GenericChatroomWidget* activeChatroomWidget;
     FriendListWidget* contactListWidget;

From f3ecf4fa0f39b5b80e55b176a6c8e3f4fc5ad4e5 Mon Sep 17 00:00:00 2001
From: Marcel <marcel@tzi.de>
Date: Fri, 12 Sep 2014 15:50:39 +0200
Subject: [PATCH 006/205] added images

---
 img/settings/av.png       | Bin 0 -> 6360 bytes
 img/settings/general.png  | Bin 0 -> 2902 bytes
 img/settings/identity.png | Bin 0 -> 4771 bytes
 img/settings/privacy.png  | Bin 0 -> 1883 bytes
 res.qrc                   |   4 ++++
 5 files changed, 4 insertions(+)
 create mode 100644 img/settings/av.png
 create mode 100644 img/settings/general.png
 create mode 100644 img/settings/identity.png
 create mode 100644 img/settings/privacy.png

diff --git a/img/settings/av.png b/img/settings/av.png
new file mode 100644
index 0000000000000000000000000000000000000000..f96f88ea84299b2428780a15d29ae37db6601c90
GIT binary patch
literal 6360
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

literal 0
HcmV?d00001

diff --git a/img/settings/general.png b/img/settings/general.png
new file mode 100644
index 0000000000000000000000000000000000000000..61d9e2bf187b9574d83395b34bb9eaad4fd202f6
GIT binary patch
literal 2902
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
A^8f$<

literal 0
HcmV?d00001

diff --git a/img/settings/identity.png b/img/settings/identity.png
new file mode 100644
index 0000000000000000000000000000000000000000..806bb525efc2ea73d087891152331199cf543f99
GIT binary patch
literal 4771
zcmV;U5?t+xP)<h;3K|Lk000e1NJLTq003kF002n{1^@s6%g}?o00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY8?OKW8?OOg8j&0T000McNliru-U$m785%>pX+Z!05->?b
zK~#9!?OSP(T-9~{&b{}&*UNOzD$Qs#qXn(VnB5EDfCLh@g(4shE*m?pa!A=u;!2Dw
zq)5sOlpU&!9c)rm3cE;5oOr`Fp&XJ>#u(YbfDHj8EFmF~MiPTYGtz85-Tjt(&&iMX
zrZo}{h_b|@>2K;x_jFI+`}%(OtoJ;ii6)w8qKPJ&XrhTGnrNblCYorXi6)w8qKPJ&
zIL^?s@k<~2w-3>2on6Iw?LqhFuY7y_okyOtZ<K4J*+j$@XLc+SYd@_OHioPhl3xI`
z6Lvfxkb6XM+x@>8+0`WEHNbn%?EF*#^)Gejln?DA6dz+D!wP|jAOM`>hy{Oj-<ILq
znkMT6;<9)4enBX@sl6r8Iah~H>WHm_&J~d`0TAQ@AMBh_MC(`1Z=Kq)zw*fIajoiP
zC*#U@EnFLO_!*t|QH|?}NTb-=hPHAE6jwo<ptG|BN~L>~2!Qa-AGvt>*-b)D0BT9?
zvnC)UHU@G9NUng%${5_#A#}EtF|WG|>(*V2C{7xm5fL>xId%Q4_aWc@yH9pirzSTF
zu+C`Hoy+HS5adUdXEymk?%y|j;)cDiX1opO^)8HDeYY}9+IS##=qVP^-_eOh^ZU^`
ze=$~_a~?W6yYRsMKgADz@FUb})l5^UUda2M-}~j>`m7`5?pv<)M@9}^@2tHJA}xN9
zL!nqikjujl0%+}l2o^+NH`@Hox@-QnaxCMnJ-g!r%6H!-1rQNdtvmx~EL)0qoc#{;
z^eu+=e1K9TAuhpFPd<U${^2&%>nR6a9c^cQ^MM^t%_@`iFE@UoZTP^*Pi&IhC?YLN
zYxqF`Kgc1UFQQl~qukbxa$CE}=L>(%!jIl}#}`gHrZ1;y87V+(jdz{52Jc&UDK@UZ
z9K8!pf%bDC6M)S0V}LWyIvZDC{Q(fA`?OXM%d^Ud{P3%P?bT~jcLQ{h=ldWKh!m7k
z&|1TI20@TRu~b5-tpkN(3p_tq<q~`Ey|;h%6&K5x^y{5-<~wlZB^P7W%2T0?57HjU
z1W;Zs6%(YdDT50yx)4iFSquPZEw|WNMabyzfloW<)-XE&grHCWAYf)VW;n-i*1;wT
zY!ZWoQyVLCYFv+Qex>pIdV9T6OBuhvdNq1`=7E$3DU&XKMheX!14=;~gLP}yq$Y3e
z+SXY^$Xz#os%&j?y@+6JVhTeCMld=$1`&d@7B)!`g*DWw6;vk1F*!bpYNdiG3LyaE
zIJ)NhH~;0rmkoJ0T)wdo1X#Qv`!~|5&!CJL<v|%AP#Q#(YAAqJr!Ir>Je>WubJxAr
z>tbFnLMFz?-^0vp<C9gKfBxGszrPQILx-?s%hNb8xF2)p%t5KO4NMwV2;x#Lan?da
z0D+mRRQ?da-~WGeEMB<y(aYCda)wrv#xL|z5eOgxnIYwt7F_qqYd}N~%^E@+y9=jk
zA=X@U9#*bc0_Eq?)3*@kzVia?-aUXP9{V+>YE|TlEhx9Oqu5e_OA?HZ4B>@=0pxOd
zIOkTs93h_ZesaOt=YAZ_fD+6|GyrCZO8}RWEo>oT0dashEMC|j)qqX2h7bV##uzML
zx-c~(Dz)Q8z$r_YV(E&NjgS-~fH0UXB#E%C^>J+9`V0V>^YT;hy%uVpXOn(19v}=b
z1L7c@0GZ1cPBL;V#5urO5WDX!S@Yr1S>r>5CD+nYOl`N)sbn@jjXKjEO-g~Z29yGk
z0%?O4t5!j4f{3)e+#E|T{76iY4U&W`%z!XNT&fW^2HOy9Lx_zaE>2%}F~r8$vv1&s
zv#xYf$mdgAt`tb=tdKOFuclSlRC{zvMrQYwHkj8pA0i^JG{^kaf3ihv@?+Q-!WkJZ
z0oynwA_>9Ck)#X{AK)+C@eMbt2vLeEEiGx7OHdgZGl;-ZGVO@7=e_g$;QOBZ=HA=p
zy|OmCFLG29u$@6h2x(|YMu?5UQ62xW>1UK!8_gO*p8oOI)-7J#e`aq_=Wk!YBc4s0
z8kzA1p<F6p(Sn{+*+y5r(tLB*{>A@t5`CZJ5O4{^MGzZ-<1p0_8>O0)gm`x6GkEav
z#|S_?n>0lC_Vz4UylBDUMV9GbX&4HmAt+cfN6cx6n!TU*75aL+p^Se_q3NDIyKWCB
z4yDeUU1pwAGX-ZMNsRjVA$;rZyFu(=g!8k8kX)(tA?IvX?`DXk3x1dxX+%~c4kE7c
zH$))p0A@Imk<x<2Pae~p#g@vReS2Z2#vwMzNKYd;u`%MxD0b|84)tmk9t569>#QMU
z*_w||iSSREbi+%ezC@rX&6bJMzYhyHo<kf2499Zk!qYd%vCP@t(K%LX>%gADA;gm-
z;BX2O*TG>0;rIxi-#dtMM;G86j4%wi?e$oj*DViG+T0vgMlbbBWeu?aTL>p0MVYzc
z)Y&&SGS5inVmRk^lgWMYSm*P!YVGXoLM0OH85%~xjKb3jQQ}auK-atlFj+|KrCQoG
ztD>yaH-2i9@A)5PwrQ4}#s8^|w^@>wK(fa)Lb90?j-eIZ`Ihy6Hu)+tpY?vBgpRH`
zn7?2Va_!xaLOTkbJ?LMw7#&@6po0P=iC`cIv{^o@Gz0)jE%|SUQS^DS@e&~gAp%37
zj0c*|(x(lY2-rs8qz<-GOh(`FO5+c0{uZgp+L^G)1}J@<_KSd0P!QyDd5B1wm=Zx5
z57lZ2B^HVZftNe~g`a(8Zr{b97@jqRl;8G8Jp9l<eU)8u8z}`Qf`Wj>X4O~)fFR5e
zw%{bqt|9!L&T~HW;>@w`yYD_9z`9&6cbSNs+FpOYti~pmfOISQc_^;{GN~~FQJU7w
zJTN6-d~6gxDG&sjXvNU39R~*PyQQ)nt8zgQ?9f_0?2_c3HJ7aY?~{@c08shTom?CL
z4BMnfA=MBP2O^jGlT<szS%{5cqq;cguN<KX_ka1^Aw6|#{~2q}pFZt7xOEgt8$g@1
z3ZM)G)Cj3@M3PSsVN8x5MBo{?s18plY}@`kE?n}~(&;NsM=qB;4ZvyRFKqwV&`-Yf
zFlqmfyDzzR$4ON>0f4S^-d~Lp`69an>|#igi48Lo6@jzzhD$>1df~wCc^7<S>-6Uj
z-2dedgVZC2-1&t<0r`9$`FtLty)+1@*T7L7un{<#g4pmdDGgzWO>ppqT`*8EB9O{K
z3=Hf+J!Z@tm$V0!Z$BTxKR@umt&2}OLI7Z}9{lRS=p@+2sU#T@ad=pg5R;V(_KZ}w
zH8kUauboZW`)5<^GEm-;bzW%bmJaA*D~KIjWfX2=7;b6|5=Q_tl*vJv93TQ0*D<{J
zc^CpbFtj*S$A>YnYafg`Y)F_HDrkW&w0A??ohKzBbG!SVez8IlMhTpa;cNt#k>ZjN
zE{R~17*9Png#P|Tn`fB)8&$sDBkdtQ2A&a9iGY(3&>Fhj1=BGPy4aq!jm9CwCQx2l
z+>|6lG&zc~1A`zTKnMa2u`#wh_Hd)=Atl76d6LON`Na!Ie*TYVopgkpa_-t_;VH|)
ztuNLQA`hJ_gZv_(eLxvR3FBAW_F``DB6QB_ngD=<n{F>FzwmC-sb;Wqm|6T~(rKn|
zV@Q&kDe?nQt_YPcf{cN!je(;oNPDP;z*Mz@1R53!tUT1FCNMU<_lR+Y`LO5l3lPZ0
zlgg=2qoboUF)QAZ-}>x!OpcDAR;|D}3#|>jToFr`EytWWbD^|}0f5E6N0}B6B545_
za#Z5!WBNT20UW=yf+?<{YkQyH2@8S}z(PSQ57sj3lcN~ixdjVWp4A|JIv_~Ta?C~m
zH=a})0sx-p6*@XPaN22a#ge7V(9_e4?m0b}-`kIsD^{SZvkRUvP^1c3{eA;TL$V?y
z9o6!uyrA*kOXR2@7RJu)+h9e(GQo-hlYxao>>QqXY|{)LXZ`>neb(?VZtpv(2-&~w
zmlt}TZ$Jd2HGJQP?|JZiAD(ZZwT4pZVU^Z;?Z7X-u0Z;->Ea+nKuW<{+Ys^!S;_vD
zC5d9}etst`6r2cbX0{wOqS#{hwx=57rUBZF&nrV<xBjFd<oP|r3**wVI}%ZVWIb8V
zfittfoW91{?pCe+7v~pW`U~=cj+vn=AtfY95+q3i(SBy{<)uOd(k64(g5ej3Fgh^~
z3xn8NI8jKPz=}fb1ij18XpGB8h0NJ0=IS@K4;dUBDbyl&1u42l5mswsl%qM2Z~$=}
zA&Fyf<~-RsIGeyG7C~Ddg4TJ^p1wepuS7Ds7cxEo3P-^LB+20pcJ2AFmf?H)h-^IV
z$x4reSuBJFmB|XMq@^2ifIz`oM!D31-@EGLSpB|h8e=CmJ(rnjB8ANPZ#qIAeDFcl
z+qd$qEb{TGy8WQms!dZ`&7GQx;Bp@FZOfqC9+-R$xndeMX+MX2=X|vEE=5r4g4P;&
z--n0?)4d!#XBljD48hPKtaWKs7=Y*bs3i>F%T|t5qnV=7Fb4s%!_rfi;$wgMN$h%V
z7p%1?x0cb@*N>k0Js9se^9Z8r^$;}`qnPvHoM3d)4eX!rK6kv<>4bN`Z`-y_J5~Av
z0<JaMyfc^cDDX9m)=)}8X$74bPREihYUVyAjgYiX`+Wn?KpWM#=)<NwHEGT<;wVHI
z*5I7Q*b6)1AqH`Rbl*#MHlNnWI0@lgmRDr;EdfE40h9+v20`aS6pAg4+-B$IUm=*-
z$)$4lQ_t>=zyGcO8u`vsPjB1*;)_3UZ+Jo;dF<JXi0B)ILa@Bll0z==;F*jFMVX{+
zKOzF9)DelD$l-<h?G^Pb>dA<k_A_80ibGT;$6t~#zFIH~;wZ+%_;`HiP~|tfo_Y4+
z-8=T)^TZDQ<lbk8Ciac}>v8Q)Ibnos`sKFuVU*m{+uiPUv=?DAB8(zvqoI{LyentK
z^{*C^k;0s+3r`aXAWmXze)8!dBJq4rm9){G(wc|}ic}*<Vdhk<<v4azVeE#&S~xm6
zS=&81R@t+EXl(P=?Ug46_Z>R0|HXsV{UhH!VO{YjgpemT5A=+TPHt^)D|U3xX+=Kg
z!!g4cjleglR?OUmk{;duPCGd>S;EpFiHK0IMUP%}#Z6b0J6epdb-ty=%e9tGA@C7+
zn!F_8cyy8{$H&7uTTZG`QlC6jsfM-|O^t+hEDr7D<d68Z^0jn=Ow}z!bZu8>3BG5L
z%XttH<b1zz&&JVpC!*i|Qk-L0$BpC<naNXxOWWH^_v1}~<DQ2+^w`b<DSCgol!wW@
zwY7}E^PsePNmjtAqxfyv!mAc2YM3wPw1dc62g~xoZ$7x2W*s3n+;A7=JhNUaHQyMW
zMl2$5EYP0D^!d<CNe_o`TqNsPNePm}38iy<#oOmne%29k+2v;i%zU-)dr+hxoH<#Z
zUNvOTaYAIev5t9$FA;!Q+B-Vi*3LRYl7#z2WVL5fZQ!i9$CBQjMg&Aj0s)^G5rIRh
z6`akR77qnV(-n_D{y5DVLbh)g#e#Q}qIRvRktd{GplQNqw1&0((i7C<s3GFyu(o8)
zju1c*tsfj@Z`Kg9bKe%fUQaI9I=yl7i0DTIQQ`oVMnaAS3><fHEDf1%2?h~7PeU8s
zy<~aMx>-YrDQG)*V02d$CDt<vo;Tyh8xhzfE#&#0Mzt265EWr|aLf%auQcF$3R)}d
z-ZMP%_~t!>Z*)SATXFHd7o28q{pQa<_dk#B81I=|{@{wGy}dni+RSv6<(QEq7P*{<
z(eWx;3c*pS(6O}W9{ImA<73Q>BynlbKm@G_&avzo7_M%4X73ZVYIIX;SANSIosi@1
z<Zk-<w>{srEpyE4^Eq!#|NO4g=606mw70ed?QKPs&-<v?BWSJCd_e^4vfB@`xHwJh
z&`9oZR8w2yj9aE}x}ru+t1?x$;}g}&{^9X~fqe&m&5Zw43J<HgKYHDD@0M9d$l;vi
zK~?ObT%f~wPGltsPHidXSCvY^qGCSi4g#;$GrH(`+9M(@0u6wenH&owd(19UlqL|7
z0B{hnW3lWwbj+17Ob%7+(cr{HZAU#!wh>{w<7ii{f{D*xe`SI<5ni(}@RqyoqPD3e
zdLkLl6@o%O;ke9>+lf$QM%l3|iy+S|1`3)of`s6N;S|V{LQG0kG|{9|Q~~J<V8@N9
xn$f5a?iopLxZ!F>6HPSHL=#Ok(ZuVG{{unv?i}@|sk{IH002ovPDHLkV1ltS11|so

literal 0
HcmV?d00001

diff --git a/img/settings/privacy.png b/img/settings/privacy.png
new file mode 100644
index 0000000000000000000000000000000000000000..763478290b8b0592c3f155013ad7d4f4637608d1
GIT binary patch
literal 1883
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
VX$I$XHCO-u002ovPDHLkV1nZng~b2>

literal 0
HcmV?d00001

diff --git a/res.qrc b/res.qrc
index cbf038a58..6a121b0ad 100644
--- a/res.qrc
+++ b/res.qrc
@@ -135,5 +135,9 @@
         <file>ui/fileTransferInstance/emptyRGreenFileButton.png</file>
         <file>ui/fileTransferInstance/emptyRRedFileButton.png</file>
         <file>audio/notification.pcm</file>
+        <file>img/settings/general.png</file>
+        <file>img/settings/identity.png</file>
+        <file>img/settings/privacy.png</file>
+        <file>img/settings/av.png</file>
     </qresource>
 </RCC>

From 7e7cebf6b62f657f180d12ff87d573f90a1ea3b3 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Fri, 12 Sep 2014 19:09:05 +0200
Subject: [PATCH 007/205] added smiley selection to the new settings dialog,
 new default search-

---
 smileypack.cpp            | 36 +++++++++++++++++++++++++-----------
 smileypack.h              |  9 ++++++---
 widget/settingsdialog.cpp | 23 +++++++++++++++++++++++
 3 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/smileypack.cpp b/smileypack.cpp
index 5af07194f..57a754c76 100644
--- a/smileypack.cpp
+++ b/smileypack.cpp
@@ -40,24 +40,38 @@ SmileyPack& SmileyPack::getInstance()
     return smileyPack;
 }
 
-QList<QPair<QString, QString> > SmileyPack::listSmileyPacks(const QString &path)
+QList<QPair<QString, QString> > SmileyPack::listSmileyPacks(const QStringList &paths)
 {
     QList<QPair<QString, QString> > smileyPacks;
 
-    QDir dir(path);
-    foreach (const QString& subdirectory, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))
+    for (QString path : paths)
     {
-        dir.cd(subdirectory);
+        if (path.leftRef(1) == "~")
+            path.replace(0, 1, QDir::homePath());
 
-        QFileInfoList entries = dir.entryInfoList(QStringList() << "emoticons.xml", QDir::Files);
-        if (entries.size() > 0) // does it contain a file called emoticons.xml?
+        QDir dir(path);
+        if (!dir.exists())
+            continue;
+
+        for (const QString& subdirectory : dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))
         {
-            QString packageName = dir.dirName();
-            QString relPath = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(entries[0].absoluteFilePath());
-            smileyPacks << QPair<QString, QString>(packageName, relPath);
-        }
+            dir.cd(subdirectory);
 
-        dir.cdUp();
+            QFileInfoList entries = dir.entryInfoList(QStringList() << "emoticons.xml", QDir::Files);
+            if (entries.size() > 0) // does it contain a file called emoticons.xml?
+            {
+                QString packageName = dir.dirName();
+                QString absPath = entries[0].absoluteFilePath();
+                QString relPath = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(absPath);
+
+                if (relPath.leftRef(2) == "..")
+                    smileyPacks << QPair<QString, QString>(packageName, absPath);
+                else
+                    smileyPacks << QPair<QString, QString>(packageName, relPath); // use relative path for subdirectories
+            }
+
+            dir.cdUp();
+        }
     }
 
     return smileyPacks;
diff --git a/smileypack.h b/smileypack.h
index 9f4ea31ba..1d4c9ef30 100644
--- a/smileypack.h
+++ b/smileypack.h
@@ -22,7 +22,10 @@
 #include <QString>
 #include <QStringList>
 
-#define SMILEYPACK_DEFAULT_PATH "./smileys"
+#define SMILEYPACK_SEARCH_PATHS                                                                                             \
+    {                                                                                                                       \
+        "./smileys", "/usr/share/qtox/smileys", "/usr/share/emoticons", "~/.kde4/share/emoticons", "~/.kde/share/emoticons" \
+    }
 
 //maps emoticons to smileys
 class SmileyPack : public QObject
@@ -30,10 +33,10 @@ class SmileyPack : public QObject
     Q_OBJECT
 public:
     static SmileyPack& getInstance();
-    static QList<QPair<QString, QString>> listSmileyPacks(const QString& path = SMILEYPACK_DEFAULT_PATH);
+    static QList<QPair<QString, QString> > listSmileyPacks(const QStringList& paths = SMILEYPACK_SEARCH_PATHS);
     static bool isValid(const QString& filename);
 
-    bool load(const QString &filename);
+    bool load(const QString& filename);
     QString smileyfied(QString msg);
     QList<QStringList> getEmoticons() const;
     QString getAsRichText(const QString& key);
diff --git a/widget/settingsdialog.cpp b/widget/settingsdialog.cpp
index 0f11ee67c..4f9c26a9b 100644
--- a/widget/settingsdialog.cpp
+++ b/widget/settingsdialog.cpp
@@ -4,6 +4,7 @@
 #include "camera.h"
 #include "selfcamview.h"
 #include "core.h"
+#include "smileypack.h"
 
 #include <QListWidget>
 #include <QListWidgetItem>
@@ -14,6 +15,7 @@
 #include <QGroupBox>
 #include <QCheckBox>
 #include <QLineEdit>
+#include <QComboBox>
 
 
 // =======================================
@@ -41,8 +43,23 @@ public:
         vLayout->addWidget(makeToxPortable);
         group->setLayout(vLayout);
 
+        // theme
+        QGroupBox* themeGroup = new QGroupBox(tr("Theme"));
+        QLabel* smileyLabel = new QLabel(tr("Smiley Pack"));
+        smileyPack = new QComboBox(this);
+
+        auto smileyPacks = SmileyPack::listSmileyPacks();
+        for(auto pack : smileyPacks)
+            smileyPack->addItem(QString("%1 (%2)").arg(pack.first).arg(pack.second), pack.second);
+
+        QVBoxLayout* themeLayout = new QVBoxLayout();
+        themeLayout->addWidget(smileyLabel);
+        themeLayout->addWidget(smileyPack);
+        themeGroup->setLayout(themeLayout);
+
         QVBoxLayout *mainLayout = new QVBoxLayout();
         mainLayout->addWidget(group);
+        mainLayout->addWidget(themeGroup);
         mainLayout->addStretch(1);
         setLayout(mainLayout);
     }
@@ -50,6 +67,7 @@ public:
     QCheckBox* enableIPv6;
     QCheckBox* useTranslations;
     QCheckBox* makeToxPortable;
+    QComboBox* smileyPack;
 };
 
 class IdentityPage : public QWidget
@@ -327,6 +345,11 @@ void SettingsDialog::writeConfig()
         saveSettings = true;
     }
 
+    if (settings.getSmileyPack() != generalPage->smileyPack->currentData().toString()) {
+        settings.setSmileyPack(generalPage->smileyPack->currentData().toString());
+        saveSettings = true;
+    }
+
     if (saveSettings) {
         settings.save();
     }

From 968b46a86bfaa3b1ed86405be45d8af9a81d6bf8 Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Sat, 13 Sep 2014 01:54:03 +0700
Subject: [PATCH 008/205] get rid of .setBlockFormat(..) in
 ChatAreaWidget::insertMessage(..) function

---
 widget/chatareawidget.cpp  | 12 ++++++------
 widget/tool/chataction.cpp |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/widget/chatareawidget.cpp b/widget/chatareawidget.cpp
index 203633386..199420e9f 100644
--- a/widget/chatareawidget.cpp
+++ b/widget/chatareawidget.cpp
@@ -44,10 +44,10 @@ ChatAreaWidget::ChatAreaWidget(QWidget *parent) :
     chatTextTable->format().setCellSpacing(2);
     chatTextTable->format().setWidth(QTextLength(QTextLength::PercentageLength,100));
 
-    nameFormat.setAlignment(Qt::AlignRight);
-    nameFormat.setNonBreakableLines(true);
-    dateFormat.setAlignment(Qt::AlignLeft);
-    dateFormat.setNonBreakableLines(true);
+//    nameFormat.setAlignment(Qt::AlignRight);
+//    nameFormat.setNonBreakableLines(true);
+//    dateFormat.setAlignment(Qt::AlignLeft);
+//    dateFormat.setNonBreakableLines(true);
 
     connect(this, &ChatAreaWidget::anchorClicked, this, &ChatAreaWidget::onAnchorClicked);
     connect(verticalScrollBar(), SIGNAL(rangeChanged(int,int)), this, SLOT(onSliderRangeChanged()));
@@ -104,8 +104,8 @@ void ChatAreaWidget::insertMessage(ChatAction *msgAction)
     checkSlider();
 
     int row = chatTextTable->rows() - 1;
-    chatTextTable->cellAt(row,0).firstCursorPosition().setBlockFormat(nameFormat);
-    chatTextTable->cellAt(row,2).firstCursorPosition().setBlockFormat(dateFormat);
+//    chatTextTable->cellAt(row,0).firstCursorPosition().setBlockFormat(nameFormat);
+//    chatTextTable->cellAt(row,2).firstCursorPosition().setBlockFormat(dateFormat);
     QTextCursor cur = chatTextTable->cellAt(row,1).firstCursorPosition();
     cur.clearSelection();
     cur.setKeepPositionOnInsert(true);
diff --git a/widget/tool/chataction.cpp b/widget/tool/chataction.cpp
index 0847abdda..3587eb600 100644
--- a/widget/tool/chataction.cpp
+++ b/widget/tool/chataction.cpp
@@ -43,9 +43,9 @@ QString ChatAction::QImage2base64(const QImage &img)
 QString ChatAction::getName()
 {
     if (isMe)
-        return QString("<div class=name_me>" + toHtmlChars(name) + "</div>");
+        return QString("<table width=100% cellspacing=0><tr><td align=right><div class=name_me>" + toHtmlChars(name) + "</div></td></tr></table>");
     else
-        return QString("<div class=name>" + toHtmlChars(name) + "</div>");
+        return QString("<table width=100% cellspacing=0><tr><td align=right><div class=name>" + toHtmlChars(name) + "</div></td></tr></table>");
 }
 
 QString ChatAction::getDate()

From 77b44fde99f13c5dbc03e1699c06bb8a0132eaac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?=
 <suhr@i2pmail.org>
Date: Fri, 12 Sep 2014 23:32:31 +0400
Subject: [PATCH 009/205] update russian translation

---
 translations/ru.qm | Bin 5393 -> 6821 bytes
 translations/ru.ts | 338 ++++++++++++++++++++++++++++++++-------------
 2 files changed, 242 insertions(+), 96 deletions(-)

diff --git a/translations/ru.qm b/translations/ru.qm
index c772943133073ce31997eb21dd0a3a5bdfb10569..be9acca27be53db64295085b086a990c5702861b 100644
GIT binary patch
delta 2933
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
OIR5eFvnvY=ivI;q1%K-R

delta 1472
zcmZWoT})eL7=BB?(?8m>779yg#&P`XNQP?%6k4Fj&wz!<3d?4qmiDkVbUozsu+R%_
z7B|C!k!(lY6cYTIUg*V0Se9-6FrpWR>DA_i8a2@iz0!;MyTs{pPNB%iNzeD4_vd+^
z_j%vG<2(Oow(WXs_xi7k^ItsTS$+1+kG>5N>8=w!6(@2o5PLU6WVlaUpO2_0N;PYh
zM7t8?eZYuJ&r|1=Lc|Qze{i12@iPtizk>fZE&OvA`K7e<42QfT{h{*vi2p^ue(@|3
zeW3sH!aXA6D$8USWjI3Y(#$JFg-_>B>uvUW3%+gj?EN_%fKu#A`7t8<0{gJ)H==?!
z*q;kO0%(Y<ZupMK>f@UF-$r2z*B-Be{SWS?!plVFL)_flIpkGw@6CP!A}@2-F5e~6
zpEXRlZvp>;AuC$D(cv|N_{0bpwHPv^6$o52>UOJyJ~mpaFTx+soz`jN`cE%_&^?px
z^cfH-Fl7hdBH~8OGmBv;mo<Odcaz9cZvNf|qLvBEU$1(h&{CoA4o-cIwYLs+oU7LK
zQ8Zw(jo4z#lL)+Jldql!(7f%ly>}pGFHT4Vj_V6ZFrTw~F2z8o)IK~3$sM!y;n^zy
zykS4$LA-IszC3;v(O)NsiW^p5D>%kw-E0r*W6i9Q`PqKr)i-NnKGwkoOe(YizrwD_
zNkNM6f+R{t)t39#>2W{9s#p-wZO994&nKR$sS&mS^Woi&I4>R*`yeVljtpOxg;*yW
zqJ6nA7=x?{U_pcgSP<4`_|?=_HV98pOAE0<c($l^<*9l%sE&)$$%xEXH}WY_=F?M?
zlcFRGv3-0rlB$*YskFe$ae<HS(mMNJQ_5*aH)raKM`R^qI_xiDZq#fCi;k_@`D(07
zoXn`nPW2KQOA6h|L`)crj0s7l)!bTA+>=NOVJVVIj|-A~G!Z)?$SXH2-{_U!orjer
zXR*@iys5nC=veu|xmTwwmGx&sREN&@qyIKk4QbLfX|i={UH8Hk#JC2aKqoZV!H(+l
z{7UMg$wYL5j|&p|75OMw)~kH2M+8|;q)w!Jpp!O7KXU@Cl_`t%<F;*XWwfaGA<MtT
z7289eE2*v80l9}&Y^bJ=T<v90SuS&VEMXxn^QRz`xPyyQ=@>q+4O?U91=PbU;L}z@
zm7tmVl(nJ~WyxjE+D6iX#BXxhfv=(UKw`hTUKng{>mfMg^g{Lko&nZ^FLepke?map
zYwR$*el($Ot{T53b9vp^lq`!WK9TZ7qH^LC7Hdk9gp{1j$!*9@Ua52ijGOlf*J%F!
xxvMsRf8csDe?MMY^VmkbM%+MQ5@|X=Uwv4dR$JV}{JXRvpW9e=K$&&B{{sPmR$~AF

diff --git a/translations/ru.ts b/translations/ru.ts
index 1e2118770..6273249e8 100644
--- a/translations/ru.ts
+++ b/translations/ru.ts
@@ -1,77 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="ru_RU">
+<context>
+    <name>AVPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="130"/>
+        <source>Video Settings</source>
+        <translation>Настройки видео</translation>
+    </message>
+</context>
 <context>
     <name>AddFriendForm</name>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="32"/>
+        <location filename="../widget/form/addfriendform.cpp" line="34"/>
         <source>Add Friends</source>
         <translation>Добавление друзей</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="35"/>
+        <location filename="../widget/form/addfriendform.cpp" line="37"/>
         <source>Tox ID</source>
         <comment>Tox ID of the person you&apos;re sending a friend request to</comment>
         <translation>Tox ID</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="36"/>
+        <location filename="../widget/form/addfriendform.cpp" line="38"/>
         <source>Message</source>
         <comment>The message you send in friend requests</comment>
         <translation>Сообщение</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="37"/>
+        <location filename="../widget/form/addfriendform.cpp" line="39"/>
         <source>Send friend request</source>
         <translatorcomment>Мне не нравится, но другого не придумал, и фейсбук использует это</translatorcomment>
         <translation>Отправить запрос на добавление в друзья</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="38"/>
+        <location filename="../widget/form/addfriendform.cpp" line="40"/>
         <source>Tox me maybe?</source>
         <comment>Default message in friend requests if the field is left blank. Write something appropriate!</comment>
         <translatorcomment>Вот таким нехитрым и незамысловатым образом решаются сложные переводчиские проблемы</translatorcomment>
         <translation>Добавь меня, а?</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="93"/>
+        <location filename="../widget/form/addfriendform.cpp" line="96"/>
         <source>Please fill in a valid Tox ID</source>
         <comment>Tox ID of the friend you&apos;re sending a friend request to</comment>
         <translation>Пожалуйста, введите корректный Tox ID</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="110"/>
+        <location filename="../widget/form/addfriendform.cpp" line="99"/>
+        <source>You can&apos;t add yourself as a friend !</source>
+        <comment>When trying to add your own Tox ID as friend</comment>
+        <translation>Нельзя добавить самого себя в друзья!</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="116"/>
         <source>This address does not exist</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
         <translation>Нет такого адреса</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="114"/>
+        <location filename="../widget/form/addfriendform.cpp" line="120"/>
         <source>Error while looking up DNS</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
         <translation>Ошибка при просмотре DNS</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="120"/>
+        <location filename="../widget/form/addfriendform.cpp" line="126"/>
         <source>Unexpected number of text records</source>
         <comment>Error with the DNS</comment>
         <translation>Непредвиденное количество текстовых записей</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="126"/>
+        <location filename="../widget/form/addfriendform.cpp" line="132"/>
         <source>Unexpected number of values in text record</source>
         <comment>Error with the DNS</comment>
         <translation>Непредвиденное количество значений в текстовой записи</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="133"/>
+        <location filename="../widget/form/addfriendform.cpp" line="139"/>
         <source>The DNS lookup does not contain any Tox ID</source>
         <comment>Error with the DNS</comment>
         <translation>В ответе DNS ни одного Tox ID</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="139"/>
         <location filename="../widget/form/addfriendform.cpp" line="145"/>
+        <location filename="../widget/form/addfriendform.cpp" line="151"/>
         <source>The DNS lookup does not contain a valid Tox ID</source>
         <comment>Error with the DNS</comment>
         <translation>Ответ DNS не содержит корректных Tox ID</translation>
@@ -80,74 +94,87 @@
 <context>
     <name>Camera</name>
     <message>
-        <location filename="../widget/camera.cpp" line="161"/>
         <source>Camera eror</source>
-        <translation>Ошибка камеры</translation>
+        <translation type="obsolete">Ошибка камеры</translation>
     </message>
     <message>
-        <location filename="../widget/camera.cpp" line="162"/>
         <source>Camera format %1 not supported, can&apos;t use the camera</source>
-        <translation>Формат камеры %1 не поддерживается, невозможно использовать камеру</translation>
+        <translation type="obsolete">Формат камеры %1 не поддерживается, невозможно использовать камеру</translation>
     </message>
 </context>
 <context>
     <name>ChatForm</name>
     <message>
-        <location filename="../widget/form/chatform.cpp" line="283"/>
+        <location filename="../widget/form/chatform.cpp" line="80"/>
         <source>Send a file</source>
         <translation>Отправить файл</translation>
     </message>
     <message>
-        <location filename="../widget/form/chatform.cpp" line="620"/>
-        <location filename="../widget/form/chatform.cpp" line="626"/>
         <source>Save chat log</source>
-        <translation>Сохранить лог чата</translation>
+        <translation type="obsolete">Сохранить лог чата</translation>
     </message>
 </context>
 <context>
     <name>CopyableElideLabel</name>
     <message>
-        <location filename="../widget/tool/copyableelidelabel.cpp" line="29"/>
         <source>Copy</source>
-        <translation>Копировать</translation>
+        <translation type="obsolete">Копировать</translation>
     </message>
 </context>
 <context>
-    <name>FileTransfertWidget</name>
+    <name>FileTransferInstance</name>
     <message>
-        <location filename="../widget/filetransfertwidget.cpp" line="281"/>
+        <location filename="../filetransferinstance.cpp" line="191"/>
         <source>Save a file</source>
         <comment>Title of the file saving dialog</comment>
         <translation>Сохранить файл</translation>
     </message>
     <message>
-        <location filename="../widget/filetransfertwidget.cpp" line="292"/>
+        <location filename="../filetransferinstance.cpp" line="202"/>
         <source>Location not writable</source>
         <comment>Title of permissions popup</comment>
-        <translation type="unfinished"></translation>
+        <translation>Непригодная для записи локация</translation>
     </message>
     <message>
-        <location filename="../widget/filetransfertwidget.cpp" line="292"/>
+        <location filename="../filetransferinstance.cpp" line="202"/>
         <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
         <comment>text of permissions popup</comment>
-        <translation type="unfinished"></translation>
+        <translation>У вас нет прав записи в эту локацию. Выберете другую или закройте диалог сохранения.</translation>
+    </message>
+</context>
+<context>
+    <name>FileTransfertWidget</name>
+    <message>
+        <source>Save a file</source>
+        <comment>Title of the file saving dialog</comment>
+        <translation type="obsolete">Сохранить файл</translation>
+    </message>
+    <message>
+        <source>Location not writable</source>
+        <comment>Title of permissions popup</comment>
+        <translation type="obsolete">Непригодная для записи локация</translation>
+    </message>
+    <message>
+        <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
+        <comment>text of permissions popup</comment>
+        <translation type="obsolete">У вас нет прав записи в эту локацию. Выберете другую или закройте диалог сохранения.</translation>
     </message>
 </context>
 <context>
     <name>FilesForm</name>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="25"/>
+        <location filename="../widget/form/filesform.cpp" line="30"/>
         <source>Transfered Files</source>
         <comment>&quot;Headline&quot; of the window</comment>
         <translation>Переданные файлы</translation>
     </message>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="33"/>
+        <location filename="../widget/form/filesform.cpp" line="38"/>
         <source>Downloads</source>
         <translation>Загрузки</translation>
     </message>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="34"/>
+        <location filename="../widget/form/filesform.cpp" line="39"/>
         <source>Uploads</source>
         <translation>Выгрузки</translation>
     </message>
@@ -193,246 +220,365 @@
 <context>
     <name>FriendWidget</name>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="86"/>
+        <location filename="../widget/friendwidget.cpp" line="84"/>
         <source>Copy friend ID</source>
         <comment>Menu to copy the Tox ID of that friend</comment>
         <translation>Копировать ID друга</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="87"/>
+        <location filename="../widget/friendwidget.cpp" line="85"/>
         <source>Invite in group</source>
         <comment>Menu to invite a friend in a groupchat</comment>
         <translation>Пригласить в группу</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="97"/>
+        <location filename="../widget/friendwidget.cpp" line="95"/>
         <source>Remove friend</source>
         <comment>Menu to remove the friend from our friendlist</comment>
         <translation>Удалить друга</translation>
     </message>
 </context>
 <context>
-    <name>GroupChatForm</name>
+    <name>GeneralPage</name>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="49"/>
-        <source>%1 users in chat</source>
-        <comment>Number of users in chat</comment>
-        <translation>%1 пользователей в чате</translation>
+        <location filename="../widget/settingsdialog.cpp" line="30"/>
+        <source>General Settings</source>
+        <translation>Основные настройки</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="146"/>
-        <source>&lt;Unknown&gt;</source>
-        <translation>&lt;Неизвестно&gt;</translation>
+        <location filename="../widget/settingsdialog.cpp" line="33"/>
+        <source>Enable IPv6 (recommended)</source>
+        <comment>Text on a checkbox to enable IPv6</comment>
+        <translation>Включить IPv6 (рекомендуется)</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="215"/>
-        <source>%1 users in chat</source>
-        <translation>%1 пользователей в чате</translation>
+        <location filename="../widget/settingsdialog.cpp" line="35"/>
+        <source>Use translations</source>
+        <comment>Text on a checkbox to enable translations</comment>
+        <translation>Русскоязычный интерфейс</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="234"/>
+        <location filename="../widget/settingsdialog.cpp" line="37"/>
+        <source>Make Tox portable</source>
+        <comment>Text on a checkbox to make qTox a portable application</comment>
+        <translation>Портативный режим</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <source>Save settings to the working directory instead of the usual conf dir</source>
+        <comment>describes makeToxPortable checkbox</comment>
+        <translation>Сохранять настройки в рабочую директорию вместо страндартной директории настроек</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="47"/>
+        <source>Theme</source>
+        <translation>Тема</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <source>Smiley Pack</source>
+        <translation>Набор смайликов</translation>
+    </message>
+</context>
+<context>
+    <name>GenericChatForm</name>
+    <message>
+        <location filename="../widget/form/genericchatform.cpp" line="142"/>
+        <location filename="../widget/form/genericchatform.cpp" line="148"/>
         <source>Save chat log</source>
         <translation>Сохранить лог чата</translation>
     </message>
 </context>
+<context>
+    <name>GroupChatForm</name>
+    <message>
+        <location filename="../widget/form/groupchatform.cpp" line="41"/>
+        <source>%1 users in chat</source>
+        <comment>Number of users in chat</comment>
+        <translation>%1 пользователей в чате</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/groupchatform.cpp" line="83"/>
+        <source>&lt;Unknown&gt;</source>
+        <translation>&lt;Неизвестно&gt;</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/groupchatform.cpp" line="90"/>
+        <source>%1 users in chat</source>
+        <translation>%1 пользователей в чате</translation>
+    </message>
+    <message>
+        <source>Save chat log</source>
+        <translation type="obsolete">Сохранить лог чата</translation>
+    </message>
+</context>
 <context>
     <name>GroupWidget</name>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="84"/>
+        <location filename="../widget/groupwidget.cpp" line="83"/>
         <source>Quit group</source>
         <comment>Menu to quit a groupchat</comment>
         <translation>Покинуть группу</translation>
     </message>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="54"/>
-        <location filename="../widget/groupwidget.cpp" line="141"/>
+        <location filename="../widget/groupwidget.cpp" line="58"/>
+        <location filename="../widget/groupwidget.cpp" line="100"/>
         <source>%1 users in chat</source>
         <translation>%1 пользователей в чате</translation>
     </message>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="56"/>
-        <location filename="../widget/groupwidget.cpp" line="143"/>
+        <location filename="../widget/groupwidget.cpp" line="60"/>
+        <location filename="../widget/groupwidget.cpp" line="102"/>
         <source>0 users in chat</source>
         <translation>Ни одного пользователя в чате</translation>
     </message>
 </context>
+<context>
+    <name>IdentityPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="80"/>
+        <source>Public Information</source>
+        <translation>Публичные данные</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="81"/>
+        <source>Name</source>
+        <comment>Username/nick</comment>
+        <translation>Имя</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <source>Status</source>
+        <comment>Status message</comment>
+        <translation>Статус</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="93"/>
+        <source>Tox ID</source>
+        <translation>Tox ID</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="94"/>
+        <source>Your Tox ID</source>
+        <translation>Ваш Tox ID</translation>
+    </message>
+</context>
 <context>
     <name>MainWindow</name>
     <message>
         <location filename="../mainwindow.ui" line="20"/>
         <source>qTox</source>
-        <translation type="unfinished"></translation>
+        <translation>qTox</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="1918"/>
         <source>Your name</source>
-        <translation type="unfinished">Ваше имя</translation>
+        <translation>Ваше имя</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2000"/>
         <source>Your status</source>
-        <translation type="unfinished">Ваш статус</translation>
+        <translation>Ваш статус</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2566"/>
         <source>Add friends</source>
-        <translation type="unfinished">Добавить друзей</translation>
+        <translation>Добавить друзей</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2592"/>
         <source>Create a group chat</source>
-        <translation type="unfinished">Создать групповой чат</translation>
+        <translation>Создать групповой чат</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2624"/>
         <source>View completed file transfers</source>
-        <translation type="unfinished"></translation>
+        <translation>Завершённые файлопередачи</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2656"/>
         <source>Change your settings</source>
-        <translation type="unfinished">Изменить ваши настройки</translation>
+        <translation>Изменить ваши настройки</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="3238"/>
         <source>Close</source>
-        <translation type="unfinished">Закрыть</translation>
+        <translation>Закрыть</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="3241"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished">Ctrl+Q</translation>
+        <translation>Ctrl+Q</translation>
     </message>
 </context>
 <context>
     <name>SelfCamView</name>
     <message>
-        <location filename="../widget/selfcamview.cpp" line="32"/>
+        <location filename="../widget/selfcamview.cpp" line="33"/>
         <source>Tox video test</source>
         <comment>Title of the window to test the video/webcam</comment>
         <translation>Проверка видео</translation>
     </message>
 </context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <source>Settings Dialog</source>
+        <translation>Диалог настроек</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="222"/>
+        <source>General</source>
+        <translation>Основное</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="228"/>
+        <source>Identity</source>
+        <translation>Личные данные</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="234"/>
+        <source>Privacy</source>
+        <translation>Безопасность</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="240"/>
+        <source>Audio/Video</source>
+        <translation>Аудио и видео</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="249"/>
+        <source>Ok</source>
+        <translation>ОК</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="250"/>
+        <source>Cancel</source>
+        <translation>Отмена</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <source>Apply</source>
+        <translation>Применить</translation>
+    </message>
+</context>
 <context>
     <name>SettingsForm</name>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="34"/>
         <source>User Settings</source>
         <comment>&quot;Headline&quot; of the window</comment>
-        <translation>Пользовательские настройки</translation>
+        <translation type="obsolete">Пользовательские настройки</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="37"/>
         <source>Name</source>
         <comment>Username/nick</comment>
-        <translation>Имя</translation>
+        <translation type="obsolete">Имя</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="38"/>
         <source>Status</source>
         <comment>Status message</comment>
-        <translation>Статус</translation>
+        <translation type="obsolete">Статус</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="39"/>
         <source>(click here to copy)</source>
         <comment>Click on this text to copy TID to clipboard</comment>
-        <translation>(нажмите здесь чтобы скопировать)</translation>
+        <translation type="obsolete">(нажмите здесь чтобы скопировать)</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="47"/>
         <source>Test video</source>
         <comment>Text on a button to test the video/webcam</comment>
-        <translation>Проверить видео</translation>
+        <translation type="obsolete">Проверить видео</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="48"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
-        <translation>Включить IPv6 (рекомендуется)</translation>
+        <translation type="obsolete">Включить IPv6 (рекомендуется)</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="50"/>
         <source>Use translations</source>
         <comment>Text on a checkbox to enable translations</comment>
         <translatorcomment>Так гораздо понятнее, чем «использовать переводы»</translatorcomment>
-        <translation>Русскоязычный интерфейс</translation>
+        <translation type="obsolete">Русскоязычный интерфейс</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="52"/>
         <source>Make Tox portable</source>
         <comment>Text on a checkbox to make qTox a portable application</comment>
-        <translation>Портативный режим</translation>
+        <translation type="obsolete">Портативный режим</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="54"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <comment>describes makeToxPortable checkbox</comment>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Сохранять настройки в рабочую директорию вместо страндартной директории настроек</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="56"/>
         <source>Smiley Pack</source>
         <comment>Text on smiley pack label</comment>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Набор смайликов</translation>
     </message>
 </context>
 <context>
     <name>Widget</name>
     <message>
         <source>Tox</source>
-        <translation type="vanished">Tox</translation>
+        <translation type="obsolete">Tox</translation>
     </message>
     <message>
         <source>Your name</source>
-        <translation type="vanished">Ваше имя</translation>
+        <translation type="obsolete">Ваше имя</translation>
     </message>
     <message>
         <source>Your status</source>
-        <translation type="vanished">Ваш статус</translation>
+        <translation type="obsolete">Ваш статус</translation>
     </message>
     <message>
         <source>Add friends</source>
-        <translation type="vanished">Добавить друзей</translation>
+        <translation type="obsolete">Добавить друзей</translation>
     </message>
     <message>
         <source>Create a group chat</source>
-        <translation type="vanished">Создать групповой чат</translation>
+        <translation type="obsolete">Создать групповой чат</translation>
     </message>
     <message>
         <source>(button inactive currently)</source>
-        <translation type="vanished">(кнопка на данный момент неактивна)</translation>
+        <translation type="obsolete">(кнопка на данный момент неактивна)</translation>
     </message>
     <message>
         <source>Change your settings</source>
-        <translation type="vanished">Изменить ваши настройки</translation>
+        <translation type="obsolete">Изменить ваши настройки</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="vanished">Закрыть</translation>
+        <translation type="obsolete">Закрыть</translation>
     </message>
     <message>
         <source>Ctrl+Q</source>
-        <translation type="vanished">Ctrl+Q</translation>
+        <translation type="obsolete">Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="128"/>
+        <location filename="../widget/widget.cpp" line="133"/>
         <source>Online</source>
         <comment>Button to set your status to &apos;Online&apos;</comment>
-        <translation type="unfinished">В сети</translation>
+        <translation>В сети</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="130"/>
+        <location filename="../widget/widget.cpp" line="135"/>
         <source>Away</source>
         <comment>Button to set your status to &apos;Away&apos;</comment>
         <translatorcomment>Вероятно, это не столь долгое путешествие</translatorcomment>
-        <translation type="unfinished">Отошёл</translation>
+        <translation>Отошёл</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="132"/>
+        <location filename="../widget/widget.cpp" line="137"/>
         <source>Busy</source>
         <comment>Button to set your status to &apos;Busy&apos;</comment>
-        <translation type="unfinished">Занят</translation>
+        <translation>Занят</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="605"/>
+        <source>&lt;Unknown&gt;</source>
+        <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
+        <translation>&lt;Неизвестно&gt;</translation>
     </message>
 </context>
 </TS>

From 7e577359fd64d51983a22f36bf8ec91743875589 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Fri, 12 Sep 2014 21:38:38 +0200
Subject: [PATCH 010/205] Improve chat form performance

Should help with #266
---
 widget/chatareawidget.cpp  | 7 +++----
 widget/tool/chataction.cpp | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/widget/chatareawidget.cpp b/widget/chatareawidget.cpp
index 199420e9f..f06ec9534 100644
--- a/widget/chatareawidget.cpp
+++ b/widget/chatareawidget.cpp
@@ -20,6 +20,7 @@
 #include <QDesktopServices>
 #include <QTextTable>
 #include <QAbstractTextDocumentLayout>
+#include <QCoreApplication>
 
 ChatAreaWidget::ChatAreaWidget(QWidget *parent) :
     QTextBrowser(parent)
@@ -104,15 +105,13 @@ void ChatAreaWidget::insertMessage(ChatAction *msgAction)
     checkSlider();
 
     int row = chatTextTable->rows() - 1;
-//    chatTextTable->cellAt(row,0).firstCursorPosition().setBlockFormat(nameFormat);
-//    chatTextTable->cellAt(row,2).firstCursorPosition().setBlockFormat(dateFormat);
     QTextCursor cur = chatTextTable->cellAt(row,1).firstCursorPosition();
     cur.clearSelection();
     cur.setKeepPositionOnInsert(true);
+    chatTextTable->appendRows(1);
     chatTextTable->cellAt(row,0).firstCursorPosition().insertHtml(msgAction->getName());
     chatTextTable->cellAt(row,1).firstCursorPosition().insertHtml(msgAction->getMessage());
-    chatTextTable->cellAt(row,2).firstCursorPosition().insertHtml(msgAction->getDate());
-    chatTextTable->appendRows(1);
+    chatTextTable->cellAt(row,2).firstCursorPosition().insertText(msgAction->getDate());
 
     msgAction->setTextCursor(cur);
 
diff --git a/widget/tool/chataction.cpp b/widget/tool/chataction.cpp
index 3587eb600..6625b061f 100644
--- a/widget/tool/chataction.cpp
+++ b/widget/tool/chataction.cpp
@@ -43,14 +43,14 @@ QString ChatAction::QImage2base64(const QImage &img)
 QString ChatAction::getName()
 {
     if (isMe)
-        return QString("<table width=100% cellspacing=0><tr><td align=right><div class=name_me>" + toHtmlChars(name) + "</div></td></tr></table>");
+        return QString("<div class=name_me>" + toHtmlChars(name) + "</div>");
     else
-        return QString("<table width=100% cellspacing=0><tr><td align=right><div class=name>" + toHtmlChars(name) + "</div></td></tr></table>");
+        return QString("<div class=name>" + toHtmlChars(name) + "</div>");
 }
 
 QString ChatAction::getDate()
 {
-    QString res = "<div class=date>" + date + "</div>";
+    QString res = date;
     return res;
 }
 

From 70079015c73e1271eda3d14a78d18ddbdce2d1f4 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Fri, 12 Sep 2014 21:57:33 +0200
Subject: [PATCH 011/205] Update translations, add Polish

---
 translations/de.ts | 285 ++++++++++++++++++++---------
 translations/fr.ts | 285 ++++++++++++++++++++---------
 translations/it.ts | 227 +++++++++++++++++------
 translations/po.ts | 445 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 1017 insertions(+), 225 deletions(-)
 create mode 100644 translations/po.ts

diff --git a/translations/de.ts b/translations/de.ts
index ab61ba9ad..3c2a7284c 100644
--- a/translations/de.ts
+++ b/translations/de.ts
@@ -1,75 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="de_DE">
+<context>
+    <name>AVPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="130"/>
+        <source>Video Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AddFriendForm</name>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="32"/>
+        <location filename="../widget/form/addfriendform.cpp" line="34"/>
         <source>Add Friends</source>
         <translation>Freunde hinzufügen</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="35"/>
+        <location filename="../widget/form/addfriendform.cpp" line="37"/>
         <source>Tox ID</source>
         <comment>Tox ID of the person you&apos;re sending a friend request to</comment>
         <translation>Tox ID</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="36"/>
+        <location filename="../widget/form/addfriendform.cpp" line="38"/>
         <source>Message</source>
         <comment>The message you send in friend requests</comment>
         <translation>Nachricht</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="37"/>
+        <location filename="../widget/form/addfriendform.cpp" line="39"/>
         <source>Send friend request</source>
         <translation>Freundschaftseinladung versenden</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="38"/>
+        <location filename="../widget/form/addfriendform.cpp" line="40"/>
         <source>Tox me maybe?</source>
         <comment>Default message in friend requests if the field is left blank. Write something appropriate!</comment>
         <translation>Lass uns Toxen!</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="93"/>
+        <location filename="../widget/form/addfriendform.cpp" line="96"/>
         <source>Please fill in a valid Tox ID</source>
         <comment>Tox ID of the friend you&apos;re sending a friend request to</comment>
         <translation>Bitte gib eine gültige Tox ID ein</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="110"/>
+        <location filename="../widget/form/addfriendform.cpp" line="99"/>
+        <source>You can&apos;t add yourself as a friend !</source>
+        <comment>When trying to add your own Tox ID as friend</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="116"/>
         <source>This address does not exist</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="114"/>
+        <location filename="../widget/form/addfriendform.cpp" line="120"/>
         <source>Error while looking up DNS</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
         <translation>Fehler beim Auflösen des DNS</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="120"/>
+        <location filename="../widget/form/addfriendform.cpp" line="126"/>
         <source>Unexpected number of text records</source>
         <comment>Error with the DNS</comment>
         <translation>Unererwartete Anzahl von Texteinträgen</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="126"/>
+        <location filename="../widget/form/addfriendform.cpp" line="132"/>
         <source>Unexpected number of values in text record</source>
         <comment>Error with the DNS</comment>
         <translation>Unerwartete Anzahl von Werten innerhalb des Texteintrages</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="133"/>
+        <location filename="../widget/form/addfriendform.cpp" line="139"/>
         <source>The DNS lookup does not contain any Tox ID</source>
         <comment>Error with the DNS</comment>
         <translation>Der DNS Eintrag enthält keine gültige TOX ID</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="139"/>
         <location filename="../widget/form/addfriendform.cpp" line="145"/>
+        <location filename="../widget/form/addfriendform.cpp" line="151"/>
         <source>The DNS lookup does not contain a valid Tox ID</source>
         <comment>Error with the DNS</comment>
         <translation>Der DNS Eintrag enthält keine gültige TOX ID</translation>
@@ -78,74 +92,77 @@
 <context>
     <name>Camera</name>
     <message>
-        <location filename="../widget/camera.cpp" line="161"/>
         <source>Camera eror</source>
-        <translation>Kamerafehler</translation>
+        <translation type="vanished">Kamerafehler</translation>
     </message>
     <message>
-        <location filename="../widget/camera.cpp" line="162"/>
         <source>Camera format %1 not supported, can&apos;t use the camera</source>
-        <translation>Kameraformat %1 wird nicht unterstützt. Die Kamera kann nicht verwendet werden</translation>
+        <translation type="vanished">Kameraformat %1 wird nicht unterstützt. Die Kamera kann nicht verwendet werden</translation>
     </message>
 </context>
 <context>
     <name>ChatForm</name>
     <message>
-        <location filename="../widget/form/chatform.cpp" line="283"/>
+        <location filename="../widget/form/chatform.cpp" line="80"/>
         <source>Send a file</source>
         <translation>Datei versenden</translation>
     </message>
     <message>
-        <location filename="../widget/form/chatform.cpp" line="620"/>
-        <location filename="../widget/form/chatform.cpp" line="626"/>
         <source>Save chat log</source>
-        <translation>Chatverlauf speichern</translation>
+        <translation type="vanished">Chatverlauf speichern</translation>
     </message>
 </context>
 <context>
     <name>CopyableElideLabel</name>
     <message>
-        <location filename="../widget/tool/copyableelidelabel.cpp" line="29"/>
         <source>Copy</source>
-        <translation>Kopieren</translation>
+        <translation type="vanished">Kopieren</translation>
     </message>
 </context>
 <context>
-    <name>FileTransfertWidget</name>
+    <name>FileTransferInstance</name>
     <message>
-        <location filename="../widget/filetransfertwidget.cpp" line="281"/>
+        <location filename="../filetransferinstance.cpp" line="191"/>
         <source>Save a file</source>
         <comment>Title of the file saving dialog</comment>
-        <translation>Datei speichern</translation>
+        <translation type="unfinished">Datei speichern</translation>
     </message>
     <message>
-        <location filename="../widget/filetransfertwidget.cpp" line="292"/>
+        <location filename="../filetransferinstance.cpp" line="202"/>
         <source>Location not writable</source>
         <comment>Title of permissions popup</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/filetransfertwidget.cpp" line="292"/>
+        <location filename="../filetransferinstance.cpp" line="202"/>
         <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
         <comment>text of permissions popup</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>FileTransfertWidget</name>
+    <message>
+        <source>Save a file</source>
+        <comment>Title of the file saving dialog</comment>
+        <translation type="vanished">Datei speichern</translation>
+    </message>
+</context>
 <context>
     <name>FilesForm</name>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="25"/>
+        <location filename="../widget/form/filesform.cpp" line="30"/>
         <source>Transfered Files</source>
         <comment>&quot;Headline&quot; of the window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="33"/>
+        <location filename="../widget/form/filesform.cpp" line="38"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="34"/>
+        <location filename="../widget/form/filesform.cpp" line="39"/>
         <source>Uploads</source>
         <translation type="unfinished"></translation>
     </message>
@@ -189,69 +206,149 @@
 <context>
     <name>FriendWidget</name>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="86"/>
+        <location filename="../widget/friendwidget.cpp" line="84"/>
         <source>Copy friend ID</source>
         <comment>Menu to copy the Tox ID of that friend</comment>
         <translation>Tox ID kopieren</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="87"/>
+        <location filename="../widget/friendwidget.cpp" line="85"/>
         <source>Invite in group</source>
         <comment>Menu to invite a friend in a groupchat</comment>
         <translation>In Gruppe einladen</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="97"/>
+        <location filename="../widget/friendwidget.cpp" line="95"/>
         <source>Remove friend</source>
         <comment>Menu to remove the friend from our friendlist</comment>
         <translation>Freund entfernen</translation>
     </message>
 </context>
+<context>
+    <name>GeneralPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="30"/>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="33"/>
+        <source>Enable IPv6 (recommended)</source>
+        <comment>Text on a checkbox to enable IPv6</comment>
+        <translation type="unfinished">IPv6 aktivieren (empfohlen)</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="35"/>
+        <source>Use translations</source>
+        <comment>Text on a checkbox to enable translations</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="37"/>
+        <source>Make Tox portable</source>
+        <comment>Text on a checkbox to make qTox a portable application</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <source>Save settings to the working directory instead of the usual conf dir</source>
+        <comment>describes makeToxPortable checkbox</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="47"/>
+        <source>Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <source>Smiley Pack</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GenericChatForm</name>
+    <message>
+        <location filename="../widget/form/genericchatform.cpp" line="142"/>
+        <location filename="../widget/form/genericchatform.cpp" line="148"/>
+        <source>Save chat log</source>
+        <translation type="unfinished">Chatverlauf speichern</translation>
+    </message>
+</context>
 <context>
     <name>GroupChatForm</name>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="49"/>
+        <location filename="../widget/form/groupchatform.cpp" line="41"/>
         <source>%1 users in chat</source>
         <comment>Number of users in chat</comment>
         <translation>%1 Personen im Chat</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="146"/>
+        <location filename="../widget/form/groupchatform.cpp" line="83"/>
         <source>&lt;Unknown&gt;</source>
         <translation>&lt;Unbekannt&gt;</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="215"/>
+        <location filename="../widget/form/groupchatform.cpp" line="90"/>
         <source>%1 users in chat</source>
         <translation>%1 Personen im Chat</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="234"/>
         <source>Save chat log</source>
-        <translation>Chatverlauf speichern</translation>
+        <translation type="vanished">Chatverlauf speichern</translation>
     </message>
 </context>
 <context>
     <name>GroupWidget</name>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="54"/>
-        <location filename="../widget/groupwidget.cpp" line="141"/>
+        <location filename="../widget/groupwidget.cpp" line="58"/>
+        <location filename="../widget/groupwidget.cpp" line="100"/>
         <source>%1 users in chat</source>
         <translation>%1 Personen im Chat</translation>
     </message>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="56"/>
-        <location filename="../widget/groupwidget.cpp" line="143"/>
+        <location filename="../widget/groupwidget.cpp" line="60"/>
+        <location filename="../widget/groupwidget.cpp" line="102"/>
         <source>0 users in chat</source>
         <translation>0 Personen im Chat</translation>
     </message>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="84"/>
+        <location filename="../widget/groupwidget.cpp" line="83"/>
         <source>Quit group</source>
         <comment>Menu to quit a groupchat</comment>
         <translation>Gruppe verlassen</translation>
     </message>
 </context>
+<context>
+    <name>IdentityPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="80"/>
+        <source>Public Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="81"/>
+        <source>Name</source>
+        <comment>Username/nick</comment>
+        <translation type="unfinished">Benutzername</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <source>Status</source>
+        <comment>Status message</comment>
+        <translation type="unfinished">Status</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="93"/>
+        <source>Tox ID</source>
+        <translation type="unfinished">Tox ID</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="94"/>
+        <source>Your Tox ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainWindow</name>
     <message>
@@ -303,73 +400,81 @@
 <context>
     <name>SelfCamView</name>
     <message>
-        <location filename="../widget/selfcamview.cpp" line="32"/>
+        <location filename="../widget/selfcamview.cpp" line="33"/>
         <source>Tox video test</source>
         <comment>Title of the window to test the video/webcam</comment>
         <translation>Tox Video testen</translation>
     </message>
 </context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <source>Settings Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="222"/>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="228"/>
+        <source>Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="234"/>
+        <source>Privacy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="240"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="249"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="250"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>SettingsForm</name>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="34"/>
         <source>User Settings</source>
         <comment>&quot;Headline&quot; of the window</comment>
-        <translation>Einstellungen</translation>
+        <translation type="vanished">Einstellungen</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="37"/>
         <source>Name</source>
         <comment>Username/nick</comment>
-        <translation>Benutzername</translation>
+        <translation type="vanished">Benutzername</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="38"/>
         <source>Status</source>
         <comment>Status message</comment>
-        <translation>Status</translation>
+        <translation type="vanished">Status</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="39"/>
-        <source>(click here to copy)</source>
-        <comment>Click on this text to copy TID to clipboard</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widget/form/settingsform.cpp" line="47"/>
         <source>Test video</source>
         <comment>Text on a button to test the video/webcam</comment>
-        <translation>Video testen</translation>
+        <translation type="vanished">Video testen</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="48"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
-        <translation>IPv6 aktivieren (empfohlen)</translation>
-    </message>
-    <message>
-        <location filename="../widget/form/settingsform.cpp" line="50"/>
-        <source>Use translations</source>
-        <comment>Text on a checkbox to enable translations</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widget/form/settingsform.cpp" line="52"/>
-        <source>Make Tox portable</source>
-        <comment>Text on a checkbox to make qTox a portable application</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widget/form/settingsform.cpp" line="54"/>
-        <source>Save settings to the working directory instead of the usual conf dir</source>
-        <comment>describes makeToxPortable checkbox</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widget/form/settingsform.cpp" line="56"/>
-        <source>Smiley Pack</source>
-        <comment>Text on smiley pack label</comment>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">IPv6 aktivieren (empfohlen)</translation>
     </message>
 </context>
 <context>
@@ -395,22 +500,28 @@
         <translation type="vanished">Strg+Q</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="128"/>
+        <location filename="../widget/widget.cpp" line="133"/>
         <source>Online</source>
         <comment>Button to set your status to &apos;Online&apos;</comment>
         <translation type="unfinished">Online</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="130"/>
+        <location filename="../widget/widget.cpp" line="135"/>
         <source>Away</source>
         <comment>Button to set your status to &apos;Away&apos;</comment>
         <translation type="unfinished">Abwesend</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="132"/>
+        <location filename="../widget/widget.cpp" line="137"/>
         <source>Busy</source>
         <comment>Button to set your status to &apos;Busy&apos;</comment>
         <translation type="unfinished">Beschäftigt</translation>
     </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="605"/>
+        <source>&lt;Unknown&gt;</source>
+        <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
+        <translation type="unfinished">&lt;Unbekannt&gt;</translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/fr.ts b/translations/fr.ts
index 435d022c7..50d9b31e1 100644
--- a/translations/fr.ts
+++ b/translations/fr.ts
@@ -1,75 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="fr_FR">
+<context>
+    <name>AVPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="130"/>
+        <source>Video Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AddFriendForm</name>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="32"/>
+        <location filename="../widget/form/addfriendform.cpp" line="34"/>
         <source>Add Friends</source>
         <translation>Ajouter des amis</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="35"/>
+        <location filename="../widget/form/addfriendform.cpp" line="37"/>
         <source>Tox ID</source>
         <comment>Tox ID of the person you&apos;re sending a friend request to</comment>
         <translation>ID Tox</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="36"/>
+        <location filename="../widget/form/addfriendform.cpp" line="38"/>
         <source>Message</source>
         <comment>The message you send in friend requests</comment>
         <translation>Message</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="37"/>
+        <location filename="../widget/form/addfriendform.cpp" line="39"/>
         <source>Send friend request</source>
         <translation>Envoyer la demande d&apos;ami</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="38"/>
+        <location filename="../widget/form/addfriendform.cpp" line="40"/>
         <source>Tox me maybe?</source>
         <comment>Default message in friend requests if the field is left blank. Write something appropriate!</comment>
         <translation>Je souhaiterais vous ajouter à mes contacts</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="93"/>
+        <location filename="../widget/form/addfriendform.cpp" line="96"/>
         <source>Please fill in a valid Tox ID</source>
         <comment>Tox ID of the friend you&apos;re sending a friend request to</comment>
         <translation>Merci de remplir un ID Tox valide</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="110"/>
+        <location filename="../widget/form/addfriendform.cpp" line="99"/>
+        <source>You can&apos;t add yourself as a friend !</source>
+        <comment>When trying to add your own Tox ID as friend</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="116"/>
         <source>This address does not exist</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="114"/>
+        <location filename="../widget/form/addfriendform.cpp" line="120"/>
         <source>Error while looking up DNS</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
         <translation>Erreur en consultant le serveur DNS</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="120"/>
+        <location filename="../widget/form/addfriendform.cpp" line="126"/>
         <source>Unexpected number of text records</source>
         <comment>Error with the DNS</comment>
         <translation>Nombre d&apos;entrées texte innatendu</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="126"/>
+        <location filename="../widget/form/addfriendform.cpp" line="132"/>
         <source>Unexpected number of values in text record</source>
         <comment>Error with the DNS</comment>
         <translation>Nombre d&apos;entrées numériques dans l&apos;entrée texte innatendu</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="133"/>
+        <location filename="../widget/form/addfriendform.cpp" line="139"/>
         <source>The DNS lookup does not contain any Tox ID</source>
         <comment>Error with the DNS</comment>
         <translation>La réponse DNS ne contient aucun ID Tox</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="139"/>
         <location filename="../widget/form/addfriendform.cpp" line="145"/>
+        <location filename="../widget/form/addfriendform.cpp" line="151"/>
         <source>The DNS lookup does not contain a valid Tox ID</source>
         <comment>Error with the DNS</comment>
         <translation>La réponse DNS ne contient pas d&apos;ID Tox valide</translation>
@@ -78,74 +92,77 @@
 <context>
     <name>Camera</name>
     <message>
-        <location filename="../widget/camera.cpp" line="161"/>
         <source>Camera eror</source>
-        <translation>Erreur de caméra</translation>
+        <translation type="vanished">Erreur de caméra</translation>
     </message>
     <message>
-        <location filename="../widget/camera.cpp" line="162"/>
         <source>Camera format %1 not supported, can&apos;t use the camera</source>
-        <translation>Format %1 de la caméra non supporté, impossible de l&apos;utiliser</translation>
+        <translation type="vanished">Format %1 de la caméra non supporté, impossible de l&apos;utiliser</translation>
     </message>
 </context>
 <context>
     <name>ChatForm</name>
     <message>
-        <location filename="../widget/form/chatform.cpp" line="283"/>
+        <location filename="../widget/form/chatform.cpp" line="80"/>
         <source>Send a file</source>
         <translation>Envoyer un fichier</translation>
     </message>
     <message>
-        <location filename="../widget/form/chatform.cpp" line="620"/>
-        <location filename="../widget/form/chatform.cpp" line="626"/>
         <source>Save chat log</source>
-        <translation>Sauvegarder l&apos;historique de conversation</translation>
+        <translation type="vanished">Sauvegarder l&apos;historique de conversation</translation>
     </message>
 </context>
 <context>
     <name>CopyableElideLabel</name>
     <message>
-        <location filename="../widget/tool/copyableelidelabel.cpp" line="29"/>
         <source>Copy</source>
-        <translation>Copier</translation>
+        <translation type="vanished">Copier</translation>
     </message>
 </context>
 <context>
-    <name>FileTransfertWidget</name>
+    <name>FileTransferInstance</name>
     <message>
-        <location filename="../widget/filetransfertwidget.cpp" line="281"/>
+        <location filename="../filetransferinstance.cpp" line="191"/>
         <source>Save a file</source>
         <comment>Title of the file saving dialog</comment>
-        <translation>Sauvegarder un fichier</translation>
+        <translation type="unfinished">Sauvegarder un fichier</translation>
     </message>
     <message>
-        <location filename="../widget/filetransfertwidget.cpp" line="292"/>
+        <location filename="../filetransferinstance.cpp" line="202"/>
         <source>Location not writable</source>
         <comment>Title of permissions popup</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/filetransfertwidget.cpp" line="292"/>
+        <location filename="../filetransferinstance.cpp" line="202"/>
         <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
         <comment>text of permissions popup</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>FileTransfertWidget</name>
+    <message>
+        <source>Save a file</source>
+        <comment>Title of the file saving dialog</comment>
+        <translation type="vanished">Sauvegarder un fichier</translation>
+    </message>
+</context>
 <context>
     <name>FilesForm</name>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="25"/>
+        <location filename="../widget/form/filesform.cpp" line="30"/>
         <source>Transfered Files</source>
         <comment>&quot;Headline&quot; of the window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="33"/>
+        <location filename="../widget/form/filesform.cpp" line="38"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="34"/>
+        <location filename="../widget/form/filesform.cpp" line="39"/>
         <source>Uploads</source>
         <translation type="unfinished"></translation>
     </message>
@@ -189,69 +206,149 @@
 <context>
     <name>FriendWidget</name>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="86"/>
+        <location filename="../widget/friendwidget.cpp" line="84"/>
         <source>Copy friend ID</source>
         <comment>Menu to copy the Tox ID of that friend</comment>
         <translation>Copier l&apos;ID ami</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="87"/>
+        <location filename="../widget/friendwidget.cpp" line="85"/>
         <source>Invite in group</source>
         <comment>Menu to invite a friend in a groupchat</comment>
         <translation>Inviter dans un groupe</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="97"/>
+        <location filename="../widget/friendwidget.cpp" line="95"/>
         <source>Remove friend</source>
         <comment>Menu to remove the friend from our friendlist</comment>
         <translation>Supprimer ami</translation>
     </message>
 </context>
+<context>
+    <name>GeneralPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="30"/>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="33"/>
+        <source>Enable IPv6 (recommended)</source>
+        <comment>Text on a checkbox to enable IPv6</comment>
+        <translation type="unfinished">Activer IPv6 (recommandé)</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="35"/>
+        <source>Use translations</source>
+        <comment>Text on a checkbox to enable translations</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="37"/>
+        <source>Make Tox portable</source>
+        <comment>Text on a checkbox to make qTox a portable application</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <source>Save settings to the working directory instead of the usual conf dir</source>
+        <comment>describes makeToxPortable checkbox</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="47"/>
+        <source>Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <source>Smiley Pack</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GenericChatForm</name>
+    <message>
+        <location filename="../widget/form/genericchatform.cpp" line="142"/>
+        <location filename="../widget/form/genericchatform.cpp" line="148"/>
+        <source>Save chat log</source>
+        <translation type="unfinished">Sauvegarder l&apos;historique de conversation</translation>
+    </message>
+</context>
 <context>
     <name>GroupChatForm</name>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="49"/>
+        <location filename="../widget/form/groupchatform.cpp" line="41"/>
         <source>%1 users in chat</source>
         <comment>Number of users in chat</comment>
         <translation>%1 personnes</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="146"/>
+        <location filename="../widget/form/groupchatform.cpp" line="83"/>
         <source>&lt;Unknown&gt;</source>
         <translation>&lt;Inconnu&gt;</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="215"/>
+        <location filename="../widget/form/groupchatform.cpp" line="90"/>
         <source>%1 users in chat</source>
         <translation>%1 personnes</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="234"/>
         <source>Save chat log</source>
-        <translation>Sauvegarder l&apos;historique de conversation</translation>
+        <translation type="vanished">Sauvegarder l&apos;historique de conversation</translation>
     </message>
 </context>
 <context>
     <name>GroupWidget</name>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="54"/>
-        <location filename="../widget/groupwidget.cpp" line="141"/>
+        <location filename="../widget/groupwidget.cpp" line="58"/>
+        <location filename="../widget/groupwidget.cpp" line="100"/>
         <source>%1 users in chat</source>
         <translation>%1 personnes</translation>
     </message>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="56"/>
-        <location filename="../widget/groupwidget.cpp" line="143"/>
+        <location filename="../widget/groupwidget.cpp" line="60"/>
+        <location filename="../widget/groupwidget.cpp" line="102"/>
         <source>0 users in chat</source>
         <translation>0 personnes</translation>
     </message>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="84"/>
+        <location filename="../widget/groupwidget.cpp" line="83"/>
         <source>Quit group</source>
         <comment>Menu to quit a groupchat</comment>
         <translation>Quitter le groupe</translation>
     </message>
 </context>
+<context>
+    <name>IdentityPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="80"/>
+        <source>Public Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="81"/>
+        <source>Name</source>
+        <comment>Username/nick</comment>
+        <translation type="unfinished">Nom</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <source>Status</source>
+        <comment>Status message</comment>
+        <translation type="unfinished">Status</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="93"/>
+        <source>Tox ID</source>
+        <translation type="unfinished">ID Tox</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="94"/>
+        <source>Your Tox ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainWindow</name>
     <message>
@@ -303,73 +400,81 @@
 <context>
     <name>SelfCamView</name>
     <message>
-        <location filename="../widget/selfcamview.cpp" line="32"/>
+        <location filename="../widget/selfcamview.cpp" line="33"/>
         <source>Tox video test</source>
         <comment>Title of the window to test the video/webcam</comment>
         <translation>Test vidéo Tox</translation>
     </message>
 </context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <source>Settings Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="222"/>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="228"/>
+        <source>Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="234"/>
+        <source>Privacy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="240"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="249"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="250"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>SettingsForm</name>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="34"/>
         <source>User Settings</source>
         <comment>&quot;Headline&quot; of the window</comment>
-        <translation>Configuration</translation>
+        <translation type="vanished">Configuration</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="37"/>
         <source>Name</source>
         <comment>Username/nick</comment>
-        <translation>Nom</translation>
+        <translation type="vanished">Nom</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="38"/>
         <source>Status</source>
         <comment>Status message</comment>
-        <translation>Status</translation>
+        <translation type="vanished">Status</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="39"/>
-        <source>(click here to copy)</source>
-        <comment>Click on this text to copy TID to clipboard</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widget/form/settingsform.cpp" line="47"/>
         <source>Test video</source>
         <comment>Text on a button to test the video/webcam</comment>
-        <translation>Tester la vidéo</translation>
+        <translation type="vanished">Tester la vidéo</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="48"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
-        <translation>Activer IPv6 (recommandé)</translation>
-    </message>
-    <message>
-        <location filename="../widget/form/settingsform.cpp" line="50"/>
-        <source>Use translations</source>
-        <comment>Text on a checkbox to enable translations</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widget/form/settingsform.cpp" line="52"/>
-        <source>Make Tox portable</source>
-        <comment>Text on a checkbox to make qTox a portable application</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widget/form/settingsform.cpp" line="54"/>
-        <source>Save settings to the working directory instead of the usual conf dir</source>
-        <comment>describes makeToxPortable checkbox</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widget/form/settingsform.cpp" line="56"/>
-        <source>Smiley Pack</source>
-        <comment>Text on smiley pack label</comment>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Activer IPv6 (recommandé)</translation>
     </message>
 </context>
 <context>
@@ -395,22 +500,28 @@
         <translation type="vanished">Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="128"/>
+        <location filename="../widget/widget.cpp" line="133"/>
         <source>Online</source>
         <comment>Button to set your status to &apos;Online&apos;</comment>
         <translation type="unfinished">Connecté</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="130"/>
+        <location filename="../widget/widget.cpp" line="135"/>
         <source>Away</source>
         <comment>Button to set your status to &apos;Away&apos;</comment>
         <translation type="unfinished">Indisponnible</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="132"/>
+        <location filename="../widget/widget.cpp" line="137"/>
         <source>Busy</source>
         <comment>Button to set your status to &apos;Busy&apos;</comment>
         <translation type="unfinished">Occupé</translation>
     </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="605"/>
+        <source>&lt;Unknown&gt;</source>
+        <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
+        <translation type="unfinished">&lt;Inconnu&gt;</translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/it.ts b/translations/it.ts
index 65a34eb9f..dad9d73ca 100644
--- a/translations/it.ts
+++ b/translations/it.ts
@@ -1,75 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="it_IT">
+<context>
+    <name>AVPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="130"/>
+        <source>Video Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AddFriendForm</name>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="32"/>
+        <location filename="../widget/form/addfriendform.cpp" line="34"/>
         <source>Add Friends</source>
         <translation>Aggiungi Contatto</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="35"/>
+        <location filename="../widget/form/addfriendform.cpp" line="37"/>
         <source>Tox ID</source>
         <comment>Tox ID of the person you&apos;re sending a friend request to</comment>
         <translation>Tox ID</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="36"/>
+        <location filename="../widget/form/addfriendform.cpp" line="38"/>
         <source>Message</source>
         <comment>The message you send in friend requests</comment>
         <translation>Messaggio</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="37"/>
+        <location filename="../widget/form/addfriendform.cpp" line="39"/>
         <source>Send friend request</source>
         <translation>Invia richiesta d&apos;amicizia</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="38"/>
+        <location filename="../widget/form/addfriendform.cpp" line="40"/>
         <source>Tox me maybe?</source>
         <comment>Default message in friend requests if the field is left blank. Write something appropriate!</comment>
         <translation>Permettimi di aggiungerti alla mia lista contatti</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="93"/>
+        <location filename="../widget/form/addfriendform.cpp" line="96"/>
         <source>Please fill in a valid Tox ID</source>
         <comment>Tox ID of the friend you&apos;re sending a friend request to</comment>
         <translation>Inserisci un Tox ID valido</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="110"/>
+        <location filename="../widget/form/addfriendform.cpp" line="99"/>
+        <source>You can&apos;t add yourself as a friend !</source>
+        <comment>When trying to add your own Tox ID as friend</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="116"/>
         <source>This address does not exist</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
         <translation>Questo indirizzo non esiste</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="114"/>
+        <location filename="../widget/form/addfriendform.cpp" line="120"/>
         <source>Error while looking up DNS</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
         <translation>Errore nel consultare il server DNS</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="120"/>
+        <location filename="../widget/form/addfriendform.cpp" line="126"/>
         <source>Unexpected number of text records</source>
         <comment>Error with the DNS</comment>
         <translation>Numero inaspettato di text-records</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="126"/>
+        <location filename="../widget/form/addfriendform.cpp" line="132"/>
         <source>Unexpected number of values in text record</source>
         <comment>Error with the DNS</comment>
         <translation>Numero inaspettato di valori nel text-record</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="133"/>
+        <location filename="../widget/form/addfriendform.cpp" line="139"/>
         <source>The DNS lookup does not contain any Tox ID</source>
         <comment>Error with the DNS</comment>
         <translation>La risposta del server DNS non contiene nessun Tox ID</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="139"/>
         <location filename="../widget/form/addfriendform.cpp" line="145"/>
+        <location filename="../widget/form/addfriendform.cpp" line="151"/>
         <source>The DNS lookup does not contain a valid Tox ID</source>
         <comment>Error with the DNS</comment>
         <translation>La risposta del server DNS non contiene un Tox ID valido</translation>
@@ -78,7 +92,7 @@
 <context>
     <name>ChatForm</name>
     <message>
-        <location filename="../widget/form/chatform.cpp" line="73"/>
+        <location filename="../widget/form/chatform.cpp" line="80"/>
         <source>Send a file</source>
         <translation>Invia un file</translation>
     </message>
@@ -86,19 +100,19 @@
 <context>
     <name>FileTransferInstance</name>
     <message>
-        <location filename="../filetransferinstance.cpp" line="162"/>
+        <location filename="../filetransferinstance.cpp" line="191"/>
         <source>Save a file</source>
         <comment>Title of the file saving dialog</comment>
         <translation>Salva file</translation>
     </message>
     <message>
-        <location filename="../filetransferinstance.cpp" line="173"/>
+        <location filename="../filetransferinstance.cpp" line="202"/>
         <source>Location not writable</source>
         <comment>Title of permissions popup</comment>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="../filetransferinstance.cpp" line="173"/>
+        <location filename="../filetransferinstance.cpp" line="202"/>
         <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
         <comment>text of permissions popup</comment>
         <translation>Non hai sufficienti permessi per scrivere in questa locazione. Scegli un&apos;altra posizione, o annulla il salvataggio.</translation>
@@ -107,18 +121,18 @@
 <context>
     <name>FilesForm</name>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="25"/>
+        <location filename="../widget/form/filesform.cpp" line="30"/>
         <source>Transfered Files</source>
         <comment>&quot;Headline&quot; of the window</comment>
         <translation>Files Trasferiti</translation>
     </message>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="33"/>
+        <location filename="../widget/form/filesform.cpp" line="38"/>
         <source>Downloads</source>
         <translation>Ricevuti</translation>
     </message>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="34"/>
+        <location filename="../widget/form/filesform.cpp" line="39"/>
         <source>Uploads</source>
         <translation>Inviati</translation>
     </message>
@@ -162,29 +176,71 @@
 <context>
     <name>FriendWidget</name>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="83"/>
+        <location filename="../widget/friendwidget.cpp" line="84"/>
         <source>Copy friend ID</source>
         <comment>Menu to copy the Tox ID of that friend</comment>
         <translation>Copia Tox ID del contatto</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="84"/>
+        <location filename="../widget/friendwidget.cpp" line="85"/>
         <source>Invite in group</source>
         <comment>Menu to invite a friend in a groupchat</comment>
         <translation>Invita nel gruppo</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="94"/>
+        <location filename="../widget/friendwidget.cpp" line="95"/>
         <source>Remove friend</source>
         <comment>Menu to remove the friend from our friendlist</comment>
         <translation>Rimuovi contatto</translation>
     </message>
 </context>
+<context>
+    <name>GeneralPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="30"/>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="33"/>
+        <source>Enable IPv6 (recommended)</source>
+        <comment>Text on a checkbox to enable IPv6</comment>
+        <translation type="unfinished">Abilita IPv6 (consigliato)</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="35"/>
+        <source>Use translations</source>
+        <comment>Text on a checkbox to enable translations</comment>
+        <translation type="unfinished">Abilita traduzioni</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="37"/>
+        <source>Make Tox portable</source>
+        <comment>Text on a checkbox to make qTox a portable application</comment>
+        <translation type="unfinished">Rendi qTox portabile</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <source>Save settings to the working directory instead of the usual conf dir</source>
+        <comment>describes makeToxPortable checkbox</comment>
+        <translation type="unfinished">Slava le impostazioni nella directory di lavoro corrente, invece della directory di default</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="47"/>
+        <source>Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <source>Smiley Pack</source>
+        <translation type="unfinished">Emoticons</translation>
+    </message>
+</context>
 <context>
     <name>GenericChatForm</name>
     <message>
-        <location filename="../widget/form/genericchatform.cpp" line="158"/>
-        <location filename="../widget/form/genericchatform.cpp" line="164"/>
+        <location filename="../widget/form/genericchatform.cpp" line="142"/>
+        <location filename="../widget/form/genericchatform.cpp" line="148"/>
         <source>Save chat log</source>
         <translation>Salva il log della chat</translation>
     </message>
@@ -192,18 +248,18 @@
 <context>
     <name>GroupChatForm</name>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="39"/>
+        <location filename="../widget/form/groupchatform.cpp" line="41"/>
         <source>%1 users in chat</source>
         <comment>Number of users in chat</comment>
         <translation>%1 utenti in chat</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="81"/>
+        <location filename="../widget/form/groupchatform.cpp" line="83"/>
         <source>&lt;Unknown&gt;</source>
         <translation>&lt;Sconosciuto&gt;</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="88"/>
+        <location filename="../widget/form/groupchatform.cpp" line="90"/>
         <source>%1 users in chat</source>
         <translation>%1 utenti in chat</translation>
     </message>
@@ -229,6 +285,36 @@
         <translation>Esci dal gruppo</translation>
     </message>
 </context>
+<context>
+    <name>IdentityPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="80"/>
+        <source>Public Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="81"/>
+        <source>Name</source>
+        <comment>Username/nick</comment>
+        <translation type="unfinished">Nome</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <source>Status</source>
+        <comment>Status message</comment>
+        <translation type="unfinished">Stato</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="93"/>
+        <source>Tox ID</source>
+        <translation type="unfinished">Tox ID</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="94"/>
+        <source>Your Tox ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MainWindow</name>
     <message>
@@ -280,94 +366,133 @@
 <context>
     <name>SelfCamView</name>
     <message>
-        <location filename="../widget/selfcamview.cpp" line="30"/>
+        <location filename="../widget/selfcamview.cpp" line="33"/>
         <source>Tox video test</source>
         <comment>Title of the window to test the video/webcam</comment>
         <translation>qTox video test</translation>
     </message>
 </context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <source>Settings Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="222"/>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="228"/>
+        <source>Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="234"/>
+        <source>Privacy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="240"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="249"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="250"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>SettingsForm</name>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="34"/>
         <source>User Settings</source>
         <comment>&quot;Headline&quot; of the window</comment>
-        <translation>Impostazioni</translation>
+        <translation type="vanished">Impostazioni</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="37"/>
         <source>Name</source>
         <comment>Username/nick</comment>
-        <translation>Nome</translation>
+        <translation type="vanished">Nome</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="38"/>
         <source>Status</source>
         <comment>Status message</comment>
-        <translation>Stato</translation>
+        <translation type="vanished">Stato</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="39"/>
         <source>(click here to copy)</source>
         <comment>Click on this text to copy TID to clipboard</comment>
-        <translation>(clicca qui per copiare)</translation>
+        <translation type="vanished">(clicca qui per copiare)</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="47"/>
         <source>Test video</source>
         <comment>Text on a button to test the video/webcam</comment>
-        <translation>Prova la webcam</translation>
+        <translation type="vanished">Prova la webcam</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="48"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
-        <translation>Abilita IPv6 (consigliato)</translation>
+        <translation type="vanished">Abilita IPv6 (consigliato)</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="50"/>
         <source>Use translations</source>
         <comment>Text on a checkbox to enable translations</comment>
-        <translation>Abilita traduzioni</translation>
+        <translation type="vanished">Abilita traduzioni</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="52"/>
         <source>Make Tox portable</source>
         <comment>Text on a checkbox to make qTox a portable application</comment>
-        <translation>Rendi qTox portabile</translation>
+        <translation type="vanished">Rendi qTox portabile</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="54"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <comment>describes makeToxPortable checkbox</comment>
-        <translation>Slava le impostazioni nella directory di lavoro corrente, invece della directory di default</translation>
+        <translation type="vanished">Slava le impostazioni nella directory di lavoro corrente, invece della directory di default</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="56"/>
         <source>Smiley Pack</source>
         <comment>Text on smiley pack label</comment>
-        <translation>Emoticons</translation>
+        <translation type="vanished">Emoticons</translation>
     </message>
 </context>
 <context>
     <name>Widget</name>
     <message>
-        <location filename="../widget/widget.cpp" line="129"/>
+        <location filename="../widget/widget.cpp" line="133"/>
         <source>Online</source>
         <comment>Button to set your status to &apos;Online&apos;</comment>
         <translation>Online</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="131"/>
+        <location filename="../widget/widget.cpp" line="135"/>
         <source>Away</source>
         <comment>Button to set your status to &apos;Away&apos;</comment>
         <translation>Assente</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="133"/>
+        <location filename="../widget/widget.cpp" line="137"/>
         <source>Busy</source>
         <comment>Button to set your status to &apos;Busy&apos;</comment>
         <translation>Occupato</translation>
     </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="605"/>
+        <source>&lt;Unknown&gt;</source>
+        <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
+        <translation type="unfinished">&lt;Sconosciuto&gt;</translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/po.ts b/translations/po.ts
new file mode 100644
index 000000000..f3a5a3144
--- /dev/null
+++ b/translations/po.ts
@@ -0,0 +1,445 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>AVPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="130"/>
+        <source>Video Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AddFriendForm</name>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="34"/>
+        <source>Add Friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="37"/>
+        <source>Tox ID</source>
+        <comment>Tox ID of the person you&apos;re sending a friend request to</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="38"/>
+        <source>Message</source>
+        <comment>The message you send in friend requests</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="39"/>
+        <source>Send friend request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="40"/>
+        <source>Tox me maybe?</source>
+        <comment>Default message in friend requests if the field is left blank. Write something appropriate!</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="96"/>
+        <source>Please fill in a valid Tox ID</source>
+        <comment>Tox ID of the friend you&apos;re sending a friend request to</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="99"/>
+        <source>You can&apos;t add yourself as a friend !</source>
+        <comment>When trying to add your own Tox ID as friend</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="116"/>
+        <source>This address does not exist</source>
+        <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="120"/>
+        <source>Error while looking up DNS</source>
+        <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="126"/>
+        <source>Unexpected number of text records</source>
+        <comment>Error with the DNS</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="132"/>
+        <source>Unexpected number of values in text record</source>
+        <comment>Error with the DNS</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="139"/>
+        <source>The DNS lookup does not contain any Tox ID</source>
+        <comment>Error with the DNS</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="145"/>
+        <location filename="../widget/form/addfriendform.cpp" line="151"/>
+        <source>The DNS lookup does not contain a valid Tox ID</source>
+        <comment>Error with the DNS</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ChatForm</name>
+    <message>
+        <location filename="../widget/form/chatform.cpp" line="80"/>
+        <source>Send a file</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FileTransferInstance</name>
+    <message>
+        <location filename="../filetransferinstance.cpp" line="191"/>
+        <source>Save a file</source>
+        <comment>Title of the file saving dialog</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../filetransferinstance.cpp" line="202"/>
+        <source>Location not writable</source>
+        <comment>Title of permissions popup</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../filetransferinstance.cpp" line="202"/>
+        <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
+        <comment>text of permissions popup</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FilesForm</name>
+    <message>
+        <location filename="../widget/form/filesform.cpp" line="30"/>
+        <source>Transfered Files</source>
+        <comment>&quot;Headline&quot; of the window</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/filesform.cpp" line="38"/>
+        <source>Downloads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/filesform.cpp" line="39"/>
+        <source>Uploads</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FriendRequestDialog</name>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="30"/>
+        <source>Friend request</source>
+        <comment>Title of the window to aceept/deny a friend request</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="32"/>
+        <source>Someone wants to make friends with you</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="33"/>
+        <source>User ID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="37"/>
+        <source>Friend request message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="44"/>
+        <source>Accept</source>
+        <comment>Accept a friend request</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="45"/>
+        <source>Reject</source>
+        <comment>Reject a friend request</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FriendWidget</name>
+    <message>
+        <location filename="../widget/friendwidget.cpp" line="84"/>
+        <source>Copy friend ID</source>
+        <comment>Menu to copy the Tox ID of that friend</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/friendwidget.cpp" line="85"/>
+        <source>Invite in group</source>
+        <comment>Menu to invite a friend in a groupchat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/friendwidget.cpp" line="95"/>
+        <source>Remove friend</source>
+        <comment>Menu to remove the friend from our friendlist</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GeneralPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="30"/>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="33"/>
+        <source>Enable IPv6 (recommended)</source>
+        <comment>Text on a checkbox to enable IPv6</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="35"/>
+        <source>Use translations</source>
+        <comment>Text on a checkbox to enable translations</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="37"/>
+        <source>Make Tox portable</source>
+        <comment>Text on a checkbox to make qTox a portable application</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <source>Save settings to the working directory instead of the usual conf dir</source>
+        <comment>describes makeToxPortable checkbox</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="47"/>
+        <source>Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <source>Smiley Pack</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GenericChatForm</name>
+    <message>
+        <location filename="../widget/form/genericchatform.cpp" line="142"/>
+        <location filename="../widget/form/genericchatform.cpp" line="148"/>
+        <source>Save chat log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GroupChatForm</name>
+    <message>
+        <location filename="../widget/form/groupchatform.cpp" line="41"/>
+        <source>%1 users in chat</source>
+        <comment>Number of users in chat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/groupchatform.cpp" line="83"/>
+        <source>&lt;Unknown&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/groupchatform.cpp" line="90"/>
+        <source>%1 users in chat</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GroupWidget</name>
+    <message>
+        <location filename="../widget/groupwidget.cpp" line="58"/>
+        <location filename="../widget/groupwidget.cpp" line="100"/>
+        <source>%1 users in chat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/groupwidget.cpp" line="60"/>
+        <location filename="../widget/groupwidget.cpp" line="102"/>
+        <source>0 users in chat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/groupwidget.cpp" line="83"/>
+        <source>Quit group</source>
+        <comment>Menu to quit a groupchat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IdentityPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="80"/>
+        <source>Public Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="81"/>
+        <source>Name</source>
+        <comment>Username/nick</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <source>Status</source>
+        <comment>Status message</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="93"/>
+        <source>Tox ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="94"/>
+        <source>Your Tox ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../mainwindow.ui" line="20"/>
+        <source>qTox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="1918"/>
+        <source>Your name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2000"/>
+        <source>Your status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2566"/>
+        <source>Add friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2592"/>
+        <source>Create a group chat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2624"/>
+        <source>View completed file transfers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2656"/>
+        <source>Change your settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="3238"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="3241"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SelfCamView</name>
+    <message>
+        <location filename="../widget/selfcamview.cpp" line="33"/>
+        <source>Tox video test</source>
+        <comment>Title of the window to test the video/webcam</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <source>Settings Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="222"/>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="228"/>
+        <source>Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="234"/>
+        <source>Privacy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="240"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="249"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="250"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Widget</name>
+    <message>
+        <location filename="../widget/widget.cpp" line="133"/>
+        <source>Online</source>
+        <comment>Button to set your status to &apos;Online&apos;</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="135"/>
+        <source>Away</source>
+        <comment>Button to set your status to &apos;Away&apos;</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="137"/>
+        <source>Busy</source>
+        <comment>Button to set your status to &apos;Busy&apos;</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="605"/>
+        <source>&lt;Unknown&gt;</source>
+        <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>

From e9fa8de43d13555ea36531e362c5786ab4c48ece Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Fri, 12 Sep 2014 21:59:49 +0200
Subject: [PATCH 012/205] Enable Polish translation

---
 qtox.pro | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qtox.pro b/qtox.pro
index 96e609c33..19413ea0d 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -32,7 +32,8 @@ CONFIG   += c++11
 TRANSLATIONS = translations/de.ts \
                translations/fr.ts \
                translations/it.ts \
-               translations/ru.ts
+               translations/ru.ts \
+               translations/po.ts
 
 RESOURCES += res.qrc
 

From b6ccbfc62fffd19449114ab0e0f112d9bf6a8b60 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Fri, 12 Sep 2014 22:24:29 +0200
Subject: [PATCH 013/205] Fix greentext

Thanks to dewbasaur for reporting the bug
---
 ui/chatArea/innerStyle.css | 4 ++--
 widget/tool/chataction.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/chatArea/innerStyle.css b/ui/chatArea/innerStyle.css
index 61380b073..28bcb32c8 100644
--- a/ui/chatArea/innerStyle.css
+++ b/ui/chatArea/innerStyle.css
@@ -22,8 +22,8 @@ div.date {
   white-space: nowrap;
 }
 
-div.quote {
-  background-color: #6bc260;
+span.quote {
+  color: #6bc260;
 }
 
 div.green {
diff --git a/widget/tool/chataction.cpp b/widget/tool/chataction.cpp
index 6625b061f..bcd1f1080 100644
--- a/widget/tool/chataction.cpp
+++ b/widget/tool/chataction.cpp
@@ -102,9 +102,9 @@ QString MessageAction::getMessage()
     for (QString& s : messageLines)
     {
         if (QRegExp("^[ ]*&gt;.*").exactMatch(s))
-            message_ += "<div class=quote>" + s.right(s.length()-4) + "</div><br>";
+            message_ += "<span class=quote>>" + s.right(s.length()-4) + "</span><br/>";
         else
-            message_ += s + "<br>";
+            message_ += s + "<br/>";
     }
     message_ = message_.left(message_.length()-4);
 

From 904a584d75ec8d2abed1d3c10f2cf306ff881f1a Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Fri, 12 Sep 2014 23:35:44 +0200
Subject: [PATCH 014/205] Change video preview button text

---
 widget/settingsdialog.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/widget/settingsdialog.cpp b/widget/settingsdialog.cpp
index 4f9c26a9b..c4b764043 100644
--- a/widget/settingsdialog.cpp
+++ b/widget/settingsdialog.cpp
@@ -131,7 +131,7 @@ public:
 
         camView = new SelfCamView(parent->getWidget()->getCamera());
         camView->hide(); // hide by default
-        testVideo = new QPushButton("enable video");
+        testVideo = new QPushButton("Show video preview");
         connect(testVideo, SIGNAL(clicked()), this, SLOT(onTestVideoPressed()));
 
         QVBoxLayout *vLayout = new QVBoxLayout();
@@ -152,13 +152,13 @@ public:
 
     void showTestVideo()
     {
-        testVideo->setText("disable video");
+        testVideo->setText("Hide video preview");
         camView->show();
     }
 
     void closeTestVideo()
     {
-        testVideo->setText("enable video");
+        testVideo->setText("Show video preview");
         camView->close();
     }
 

From 627e5b178b1fe9bac3469b03f5f3136f2b36c3fc Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Fri, 12 Sep 2014 23:41:13 +0200
Subject: [PATCH 015/205] Change settings dialog title

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

diff --git a/widget/settingsdialog.cpp b/widget/settingsdialog.cpp
index c4b764043..05ce3c165 100644
--- a/widget/settingsdialog.cpp
+++ b/widget/settingsdialog.cpp
@@ -192,7 +192,7 @@ SettingsDialog::SettingsDialog(Widget *parent) :
     createButtons();
     createConnections();
     createLayout();
-    setWindowTitle(tr("Settings Dialog"));
+    setWindowTitle(tr("qTox – Settings"));
 }
 
 void SettingsDialog::createPages()

From 5c1ae49f81508dc5ed4daf7c47f63747239f77e8 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Fri, 12 Sep 2014 23:55:37 +0200
Subject: [PATCH 016/205] Typo

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

diff --git a/widget/form/addfriendform.cpp b/widget/form/addfriendform.cpp
index 2c9b197b2..55f5e80dd 100644
--- a/widget/form/addfriendform.cpp
+++ b/widget/form/addfriendform.cpp
@@ -96,7 +96,7 @@ void AddFriendForm::onSendTriggered()
         showWarning(tr("Please fill in a valid Tox ID","Tox ID of the friend you're sending a friend request to"));
     } else if (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"));
+            showWarning(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.setText("");

From 965c76a31545c61303d4485c4326887cc6ba4ba3 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sat, 13 Sep 2014 00:07:25 +0200
Subject: [PATCH 017/205] Add Manol translation

Ayy ! You have mothafucking friend request you little bitch !
---
 qtox.pro               |   3 +-
 translations/de.ts     |   4 +-
 translations/fr.ts     |   4 +-
 translations/it.ts     |   4 +-
 translations/mannol.ts | 445 +++++++++++++++++++++++++++++++++++++++++
 translations/po.ts     |   4 +-
 translations/ru.ts     |  15 +-
 7 files changed, 467 insertions(+), 12 deletions(-)
 create mode 100644 translations/mannol.ts

diff --git a/qtox.pro b/qtox.pro
index 19413ea0d..b733387b8 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -33,7 +33,8 @@ TRANSLATIONS = translations/de.ts \
                translations/fr.ts \
                translations/it.ts \
                translations/ru.ts \
-               translations/po.ts
+               translations/po.ts \
+               translations/mannol.ts
 
 RESOURCES += res.qrc
 
diff --git a/translations/de.ts b/translations/de.ts
index 3c2a7284c..42adc68f9 100644
--- a/translations/de.ts
+++ b/translations/de.ts
@@ -47,7 +47,7 @@
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="99"/>
-        <source>You can&apos;t add yourself as a friend !</source>
+        <source>You can&apos;t add yourself as a friend!</source>
         <comment>When trying to add your own Tox ID as friend</comment>
         <translation type="unfinished"></translation>
     </message>
@@ -410,7 +410,7 @@
     <name>SettingsDialog</name>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="195"/>
-        <source>Settings Dialog</source>
+        <source>qTox – Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/translations/fr.ts b/translations/fr.ts
index 50d9b31e1..2f61287cb 100644
--- a/translations/fr.ts
+++ b/translations/fr.ts
@@ -47,7 +47,7 @@
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="99"/>
-        <source>You can&apos;t add yourself as a friend !</source>
+        <source>You can&apos;t add yourself as a friend!</source>
         <comment>When trying to add your own Tox ID as friend</comment>
         <translation type="unfinished"></translation>
     </message>
@@ -410,7 +410,7 @@
     <name>SettingsDialog</name>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="195"/>
-        <source>Settings Dialog</source>
+        <source>qTox – Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/translations/it.ts b/translations/it.ts
index dad9d73ca..a7c3f39c0 100644
--- a/translations/it.ts
+++ b/translations/it.ts
@@ -47,7 +47,7 @@
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="99"/>
-        <source>You can&apos;t add yourself as a friend !</source>
+        <source>You can&apos;t add yourself as a friend!</source>
         <comment>When trying to add your own Tox ID as friend</comment>
         <translation type="unfinished"></translation>
     </message>
@@ -376,7 +376,7 @@
     <name>SettingsDialog</name>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="195"/>
-        <source>Settings Dialog</source>
+        <source>qTox – Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/translations/mannol.ts b/translations/mannol.ts
new file mode 100644
index 000000000..93b9d0c3c
--- /dev/null
+++ b/translations/mannol.ts
@@ -0,0 +1,445 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>AVPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="130"/>
+        <source>Video Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AddFriendForm</name>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="34"/>
+        <source>Add Friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="37"/>
+        <source>Tox ID</source>
+        <comment>Tox ID of the person you&apos;re sending a friend request to</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="38"/>
+        <source>Message</source>
+        <comment>The message you send in friend requests</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="39"/>
+        <source>Send friend request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="40"/>
+        <source>Tox me maybe?</source>
+        <comment>Default message in friend requests if the field is left blank. Write something appropriate!</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="96"/>
+        <source>Please fill in a valid Tox ID</source>
+        <comment>Tox ID of the friend you&apos;re sending a friend request to</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="99"/>
+        <source>You can&apos;t add yourself as a friend!</source>
+        <comment>When trying to add your own Tox ID as friend</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="116"/>
+        <source>This address does not exist</source>
+        <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="120"/>
+        <source>Error while looking up DNS</source>
+        <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="126"/>
+        <source>Unexpected number of text records</source>
+        <comment>Error with the DNS</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="132"/>
+        <source>Unexpected number of values in text record</source>
+        <comment>Error with the DNS</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="139"/>
+        <source>The DNS lookup does not contain any Tox ID</source>
+        <comment>Error with the DNS</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="145"/>
+        <location filename="../widget/form/addfriendform.cpp" line="151"/>
+        <source>The DNS lookup does not contain a valid Tox ID</source>
+        <comment>Error with the DNS</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ChatForm</name>
+    <message>
+        <location filename="../widget/form/chatform.cpp" line="80"/>
+        <source>Send a file</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FileTransferInstance</name>
+    <message>
+        <location filename="../filetransferinstance.cpp" line="191"/>
+        <source>Save a file</source>
+        <comment>Title of the file saving dialog</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../filetransferinstance.cpp" line="202"/>
+        <source>Location not writable</source>
+        <comment>Title of permissions popup</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../filetransferinstance.cpp" line="202"/>
+        <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
+        <comment>text of permissions popup</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FilesForm</name>
+    <message>
+        <location filename="../widget/form/filesform.cpp" line="30"/>
+        <source>Transfered Files</source>
+        <comment>&quot;Headline&quot; of the window</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/filesform.cpp" line="38"/>
+        <source>Downloads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/filesform.cpp" line="39"/>
+        <source>Uploads</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FriendRequestDialog</name>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="30"/>
+        <source>Friend request</source>
+        <comment>Title of the window to aceept/deny a friend request</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="32"/>
+        <source>Someone wants to make friends with you</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="33"/>
+        <source>User ID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="37"/>
+        <source>Friend request message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="44"/>
+        <source>Accept</source>
+        <comment>Accept a friend request</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="45"/>
+        <source>Reject</source>
+        <comment>Reject a friend request</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FriendWidget</name>
+    <message>
+        <location filename="../widget/friendwidget.cpp" line="84"/>
+        <source>Copy friend ID</source>
+        <comment>Menu to copy the Tox ID of that friend</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/friendwidget.cpp" line="85"/>
+        <source>Invite in group</source>
+        <comment>Menu to invite a friend in a groupchat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/friendwidget.cpp" line="95"/>
+        <source>Remove friend</source>
+        <comment>Menu to remove the friend from our friendlist</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GeneralPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="30"/>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="33"/>
+        <source>Enable IPv6 (recommended)</source>
+        <comment>Text on a checkbox to enable IPv6</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="35"/>
+        <source>Use translations</source>
+        <comment>Text on a checkbox to enable translations</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="37"/>
+        <source>Make Tox portable</source>
+        <comment>Text on a checkbox to make qTox a portable application</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <source>Save settings to the working directory instead of the usual conf dir</source>
+        <comment>describes makeToxPortable checkbox</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="47"/>
+        <source>Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <source>Smiley Pack</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GenericChatForm</name>
+    <message>
+        <location filename="../widget/form/genericchatform.cpp" line="142"/>
+        <location filename="../widget/form/genericchatform.cpp" line="148"/>
+        <source>Save chat log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GroupChatForm</name>
+    <message>
+        <location filename="../widget/form/groupchatform.cpp" line="41"/>
+        <source>%1 users in chat</source>
+        <comment>Number of users in chat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/groupchatform.cpp" line="83"/>
+        <source>&lt;Unknown&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/groupchatform.cpp" line="90"/>
+        <source>%1 users in chat</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GroupWidget</name>
+    <message>
+        <location filename="../widget/groupwidget.cpp" line="58"/>
+        <location filename="../widget/groupwidget.cpp" line="100"/>
+        <source>%1 users in chat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/groupwidget.cpp" line="60"/>
+        <location filename="../widget/groupwidget.cpp" line="102"/>
+        <source>0 users in chat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/groupwidget.cpp" line="83"/>
+        <source>Quit group</source>
+        <comment>Menu to quit a groupchat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IdentityPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="80"/>
+        <source>Public Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="81"/>
+        <source>Name</source>
+        <comment>Username/nick</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <source>Status</source>
+        <comment>Status message</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="93"/>
+        <source>Tox ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="94"/>
+        <source>Your Tox ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../mainwindow.ui" line="20"/>
+        <source>qTox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="1918"/>
+        <source>Your name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2000"/>
+        <source>Your status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2566"/>
+        <source>Add friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2592"/>
+        <source>Create a group chat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2624"/>
+        <source>View completed file transfers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2656"/>
+        <source>Change your settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="3238"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="3241"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SelfCamView</name>
+    <message>
+        <location filename="../widget/selfcamview.cpp" line="33"/>
+        <source>Tox video test</source>
+        <comment>Title of the window to test the video/webcam</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <source>qTox – Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="222"/>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="228"/>
+        <source>Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="234"/>
+        <source>Privacy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="240"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="249"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="250"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Widget</name>
+    <message>
+        <location filename="../widget/widget.cpp" line="133"/>
+        <source>Online</source>
+        <comment>Button to set your status to &apos;Online&apos;</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="135"/>
+        <source>Away</source>
+        <comment>Button to set your status to &apos;Away&apos;</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="137"/>
+        <source>Busy</source>
+        <comment>Button to set your status to &apos;Busy&apos;</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="605"/>
+        <source>&lt;Unknown&gt;</source>
+        <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/translations/po.ts b/translations/po.ts
index f3a5a3144..93b9d0c3c 100644
--- a/translations/po.ts
+++ b/translations/po.ts
@@ -47,7 +47,7 @@
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="99"/>
-        <source>You can&apos;t add yourself as a friend !</source>
+        <source>You can&apos;t add yourself as a friend!</source>
         <comment>When trying to add your own Tox ID as friend</comment>
         <translation type="unfinished"></translation>
     </message>
@@ -376,7 +376,7 @@
     <name>SettingsDialog</name>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="195"/>
-        <source>Settings Dialog</source>
+        <source>qTox – Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/translations/ru.ts b/translations/ru.ts
index 6273249e8..87c52b238 100644
--- a/translations/ru.ts
+++ b/translations/ru.ts
@@ -49,9 +49,14 @@
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="99"/>
+        <source>You can&apos;t add yourself as a friend!</source>
+        <comment>When trying to add your own Tox ID as friend</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>You can&apos;t add yourself as a friend !</source>
         <comment>When trying to add your own Tox ID as friend</comment>
-        <translation>Нельзя добавить самого себя в друзья!</translation>
+        <translation type="vanished">Нельзя добавить самого себя в друзья!</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="116"/>
@@ -423,9 +428,13 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="195"/>
         <source>Settings Dialog</source>
-        <translation>Диалог настроек</translation>
+        <translation type="vanished">Диалог настроек</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <source>qTox – Settings</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="222"/>

From b2c75dbc5116c0299f0e03badd4411671d6831b6 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sat, 13 Sep 2014 00:12:00 +0200
Subject: [PATCH 018/205] Update Mannol translation

---
 translations/mannol.qm | Bin 0 -> 234 bytes
 translations/mannol.ts |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 translations/mannol.qm

diff --git a/translations/mannol.qm b/translations/mannol.qm
new file mode 100644
index 0000000000000000000000000000000000000000..1d4f6d7b644a1b48cc36ba7cefb5673c02d7c4a0
GIT binary patch
literal 234
zcmX9&F%E)25L{!TG*&hi7DwYNY&6CPXe{hRSl|NO1vn)54=Zi_g^jT_BtF46_yxx^
zo4K9YotwMqEf}?*%jxBgAG_=QJtrb((4IHwB!Ooa$B|~#pai+VmNZr9F?n<#2Foxp
zR)^U5l;EnO2%C@!aE1z?3a}gwrV@UE#D7u>k3pq2ZEuy2JiO=pKGFjwYn`!HENV}g
lQWz~VFJTcDl2uTOTAEliy6VF^T-xD^^NLHekY1{z&KDe4II;i$

literal 0
HcmV?d00001

diff --git a/translations/mannol.ts b/translations/mannol.ts
index 93b9d0c3c..a1856348e 100644
--- a/translations/mannol.ts
+++ b/translations/mannol.ts
@@ -148,7 +148,7 @@
     <message>
         <location filename="../widget/tool/friendrequestdialog.cpp" line="32"/>
         <source>Someone wants to make friends with you</source>
-        <translation type="unfinished"></translation>
+        <translation>Ayy ! You have mothafucking friend request you little bitch !</translation>
     </message>
     <message>
         <location filename="../widget/tool/friendrequestdialog.cpp" line="33"/>

From 1a6d2d925e804d5c6c718db791369ed989287d7d Mon Sep 17 00:00:00 2001
From: Zetok Zalbavar <zexavexxe@gmail.com>
Date: Fri, 12 Sep 2014 23:21:02 +0100
Subject: [PATCH 019/205] Add Polish translation

---
 translations/{po.ts => pl.ts} | 148 +++++++++++++++++-----------------
 1 file changed, 76 insertions(+), 72 deletions(-)
 rename translations/{po.ts => pl.ts} (75%)

diff --git a/translations/po.ts b/translations/pl.ts
similarity index 75%
rename from translations/po.ts
rename to translations/pl.ts
index 93b9d0c3c..6aaa4e6d6 100644
--- a/translations/po.ts
+++ b/translations/pl.ts
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.0" language="pl_PL">
 <context>
     <name>AVPage</name>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="130"/>
         <source>Video Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia wideo</translation>
     </message>
 </context>
 <context>
@@ -14,79 +14,79 @@
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="34"/>
         <source>Add Friends</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj znajomych</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="37"/>
         <source>Tox ID</source>
         <comment>Tox ID of the person you&apos;re sending a friend request to</comment>
-        <translation type="unfinished"></translation>
+        <translation>Tox ID</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="38"/>
         <source>Message</source>
         <comment>The message you send in friend requests</comment>
-        <translation type="unfinished"></translation>
+        <translation>Wiadomość</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="39"/>
         <source>Send friend request</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyślij zapytanie do znajomego</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="40"/>
         <source>Tox me maybe?</source>
         <comment>Default message in friend requests if the field is left blank. Write something appropriate!</comment>
-        <translation type="unfinished"></translation>
+        <translation>Może Tox ze mną?</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="96"/>
         <source>Please fill in a valid Tox ID</source>
         <comment>Tox ID of the friend you&apos;re sending a friend request to</comment>
-        <translation type="unfinished"></translation>
+        <translation>Proszę wpisać poprawny Tox ID</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="99"/>
         <source>You can&apos;t add yourself as a friend!</source>
         <comment>When trying to add your own Tox ID as friend</comment>
-        <translation type="unfinished"></translation>
+        <translation>Nie możesz dodać siebie jako znajomego!</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="116"/>
         <source>This address does not exist</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ten adres nie istnieje</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="120"/>
         <source>Error while looking up DNS</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
-        <translation type="unfinished"></translation>
+        <translation>Błąd podczas sprawdzania DNS</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="126"/>
         <source>Unexpected number of text records</source>
         <comment>Error with the DNS</comment>
-        <translation type="unfinished"></translation>
+        <translation>Nieoczekiwana liczba wpisów tekstowych</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="132"/>
         <source>Unexpected number of values in text record</source>
         <comment>Error with the DNS</comment>
-        <translation type="unfinished"></translation>
+        <translation>Nieoczekiwana liczba wartości we wpisie tekstowym</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="139"/>
         <source>The DNS lookup does not contain any Tox ID</source>
         <comment>Error with the DNS</comment>
-        <translation type="unfinished"></translation>
+        <translation>DNS nie zawiera żadnego Tox ID</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="145"/>
         <location filename="../widget/form/addfriendform.cpp" line="151"/>
         <source>The DNS lookup does not contain a valid Tox ID</source>
         <comment>Error with the DNS</comment>
-        <translation type="unfinished"></translation>
+        <translation>DNS nie zawiera poprawnego Tox ID</translation>
     </message>
 </context>
 <context>
@@ -94,7 +94,7 @@
     <message>
         <location filename="../widget/form/chatform.cpp" line="80"/>
         <source>Send a file</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyślij plik</translation>
     </message>
 </context>
 <context>
@@ -103,19 +103,19 @@
         <location filename="../filetransferinstance.cpp" line="191"/>
         <source>Save a file</source>
         <comment>Title of the file saving dialog</comment>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz plik</translation>
     </message>
     <message>
         <location filename="../filetransferinstance.cpp" line="202"/>
         <source>Location not writable</source>
         <comment>Title of permissions popup</comment>
-        <translation type="unfinished"></translation>
+        <translation>Nie można zapisać w lokacji</translation>
     </message>
     <message>
         <location filename="../filetransferinstance.cpp" line="202"/>
         <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
         <comment>text of permissions popup</comment>
-        <translation type="unfinished"></translation>
+        <translation>Nie masz uprawnienia by zapisać w tej lokacji. Wybierz inną lub anuluj zapis.</translation>
     </message>
 </context>
 <context>
@@ -124,17 +124,17 @@
         <location filename="../widget/form/filesform.cpp" line="30"/>
         <source>Transfered Files</source>
         <comment>&quot;Headline&quot; of the window</comment>
-        <translation type="unfinished"></translation>
+        <translation>Przesłane pliki</translation>
     </message>
     <message>
         <location filename="../widget/form/filesform.cpp" line="38"/>
         <source>Downloads</source>
-        <translation type="unfinished"></translation>
+        <translation>Pobrane</translation>
     </message>
     <message>
         <location filename="../widget/form/filesform.cpp" line="39"/>
         <source>Uploads</source>
-        <translation type="unfinished"></translation>
+        <translation>Wysłane</translation>
     </message>
 </context>
 <context>
@@ -143,34 +143,36 @@
         <location filename="../widget/tool/friendrequestdialog.cpp" line="30"/>
         <source>Friend request</source>
         <comment>Title of the window to aceept/deny a friend request</comment>
-        <translation type="unfinished"></translation>
+        <translatorcomment>no idea how it shoule be translated</translatorcomment>
+        <translation>Zapytanie znajomego</translation>
     </message>
     <message>
         <location filename="../widget/tool/friendrequestdialog.cpp" line="32"/>
         <source>Someone wants to make friends with you</source>
-        <translation type="unfinished"></translation>
+        <translation>Ktoś chce być twoim znajomym</translation>
     </message>
     <message>
         <location filename="../widget/tool/friendrequestdialog.cpp" line="33"/>
         <source>User ID:</source>
-        <translation type="unfinished"></translation>
+        <translation>ID użytkownika:</translation>
     </message>
     <message>
         <location filename="../widget/tool/friendrequestdialog.cpp" line="37"/>
         <source>Friend request message:</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>better wording needed?</translatorcomment>
+        <translation>Wiadomość w zapytaniu do znajomej/go:</translation>
     </message>
     <message>
         <location filename="../widget/tool/friendrequestdialog.cpp" line="44"/>
         <source>Accept</source>
         <comment>Accept a friend request</comment>
-        <translation type="unfinished"></translation>
+        <translation>Zaakceptuj</translation>
     </message>
     <message>
         <location filename="../widget/tool/friendrequestdialog.cpp" line="45"/>
         <source>Reject</source>
         <comment>Reject a friend request</comment>
-        <translation type="unfinished"></translation>
+        <translation>Odrzuć</translation>
     </message>
 </context>
 <context>
@@ -179,19 +181,19 @@
         <location filename="../widget/friendwidget.cpp" line="84"/>
         <source>Copy friend ID</source>
         <comment>Menu to copy the Tox ID of that friend</comment>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj ID znajomej/go</translation>
     </message>
     <message>
         <location filename="../widget/friendwidget.cpp" line="85"/>
         <source>Invite in group</source>
         <comment>Menu to invite a friend in a groupchat</comment>
-        <translation type="unfinished"></translation>
+        <translation>Zaproś do grupy</translation>
     </message>
     <message>
         <location filename="../widget/friendwidget.cpp" line="95"/>
         <source>Remove friend</source>
         <comment>Menu to remove the friend from our friendlist</comment>
-        <translation type="unfinished"></translation>
+        <translation>Usuń znajomego</translation>
     </message>
 </context>
 <context>
@@ -199,41 +201,42 @@
     <message>
         <location filename="../widget/settingsdialog.cpp" line="30"/>
         <source>General Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Główne ustawienia</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="33"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
-        <translation type="unfinished"></translation>
+        <translation>Użyj IPv6 (rekomendowane)</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="35"/>
         <source>Use translations</source>
         <comment>Text on a checkbox to enable translations</comment>
-        <translation type="unfinished"></translation>
+        <translation>Użyj tłumaczenia</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="37"/>
         <source>Make Tox portable</source>
         <comment>Text on a checkbox to make qTox a portable application</comment>
-        <translation type="unfinished"></translation>
+        <translation>Zrób Tox przenośnym</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="38"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <comment>describes makeToxPortable checkbox</comment>
-        <translation type="unfinished"></translation>
+        <translation>Zamiast domyślnego katalogu użyj obecnego do zapisania ustawień</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="47"/>
         <source>Theme</source>
-        <translation type="unfinished"></translation>
+        <translation>Motyw</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="48"/>
         <source>Smiley Pack</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>needs better translation</translatorcomment>
+        <translation>Paczka uśmiechów</translation>
     </message>
 </context>
 <context>
@@ -242,7 +245,7 @@
         <location filename="../widget/form/genericchatform.cpp" line="142"/>
         <location filename="../widget/form/genericchatform.cpp" line="148"/>
         <source>Save chat log</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz historię rozmowy</translation>
     </message>
 </context>
 <context>
@@ -251,17 +254,17 @@
         <location filename="../widget/form/groupchatform.cpp" line="41"/>
         <source>%1 users in chat</source>
         <comment>Number of users in chat</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 użytkowników w czacie</translation>
     </message>
     <message>
         <location filename="../widget/form/groupchatform.cpp" line="83"/>
         <source>&lt;Unknown&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;Nieznany/a&gt;</translation>
     </message>
     <message>
         <location filename="../widget/form/groupchatform.cpp" line="90"/>
         <source>%1 users in chat</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 użytkowników w czacie</translation>
     </message>
 </context>
 <context>
@@ -270,19 +273,19 @@
         <location filename="../widget/groupwidget.cpp" line="58"/>
         <location filename="../widget/groupwidget.cpp" line="100"/>
         <source>%1 users in chat</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 użytkowników w czacie</translation>
     </message>
     <message>
         <location filename="../widget/groupwidget.cpp" line="60"/>
         <location filename="../widget/groupwidget.cpp" line="102"/>
         <source>0 users in chat</source>
-        <translation type="unfinished"></translation>
+        <translation>0 użytkowników w czacie</translation>
     </message>
     <message>
         <location filename="../widget/groupwidget.cpp" line="83"/>
         <source>Quit group</source>
         <comment>Menu to quit a groupchat</comment>
-        <translation type="unfinished"></translation>
+        <translation>Opuść grupę</translation>
     </message>
 </context>
 <context>
@@ -290,29 +293,29 @@
     <message>
         <location filename="../widget/settingsdialog.cpp" line="80"/>
         <source>Public Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informacja publiczna</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="81"/>
         <source>Name</source>
         <comment>Username/nick</comment>
-        <translation type="unfinished"></translation>
+        <translation>Nick</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="83"/>
         <source>Status</source>
         <comment>Status message</comment>
-        <translation type="unfinished"></translation>
+        <translation>Status</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="93"/>
         <source>Tox ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Tox ID</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="94"/>
         <source>Your Tox ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Twój Tox ID</translation>
     </message>
 </context>
 <context>
@@ -320,47 +323,48 @@
     <message>
         <location filename="../mainwindow.ui" line="20"/>
         <source>qTox</source>
-        <translation type="unfinished"></translation>
+        <translation>qTox</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="1918"/>
         <source>Your name</source>
-        <translation type="unfinished"></translation>
+        <translation>Twój nick</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2000"/>
         <source>Your status</source>
-        <translation type="unfinished"></translation>
+        <translation>Twój status</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2566"/>
         <source>Add friends</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj znajomych</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2592"/>
         <source>Create a group chat</source>
-        <translation type="unfinished"></translation>
+        <translation>Utwórz czat grupowy</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2624"/>
         <source>View completed file transfers</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobacz zakończone transfery plików</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2656"/>
         <source>Change your settings</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>translated as &quot;change settings&quot;;  seems to be simpler this way</translatorcomment>
+        <translation>Zmień ustawienia</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="3238"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Zamknij</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="3241"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Q</translation>
     </message>
 </context>
 <context>
@@ -369,7 +373,7 @@
         <location filename="../widget/selfcamview.cpp" line="33"/>
         <source>Tox video test</source>
         <comment>Title of the window to test the video/webcam</comment>
-        <translation type="unfinished"></translation>
+        <translation>Tox test wideo</translation>
     </message>
 </context>
 <context>
@@ -377,42 +381,42 @@
     <message>
         <location filename="../widget/settingsdialog.cpp" line="195"/>
         <source>qTox – Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>qTox – Ustawienia</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="222"/>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>Główne</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="228"/>
         <source>Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Tożsamość</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="234"/>
         <source>Privacy</source>
-        <translation type="unfinished"></translation>
+        <translation>Prywatność</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="240"/>
         <source>Audio/Video</source>
-        <translation type="unfinished"></translation>
+        <translation>Audio/Wideo</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="249"/>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="250"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Anuluj</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="251"/>
         <source>Apply</source>
-        <translation type="unfinished"></translation>
+        <translation>Zastosuj</translation>
     </message>
 </context>
 <context>
@@ -421,25 +425,25 @@
         <location filename="../widget/widget.cpp" line="133"/>
         <source>Online</source>
         <comment>Button to set your status to &apos;Online&apos;</comment>
-        <translation type="unfinished"></translation>
+        <translation>Online</translation>
     </message>
     <message>
         <location filename="../widget/widget.cpp" line="135"/>
         <source>Away</source>
         <comment>Button to set your status to &apos;Away&apos;</comment>
-        <translation type="unfinished"></translation>
+        <translation>Nieobecny/a</translation>
     </message>
     <message>
         <location filename="../widget/widget.cpp" line="137"/>
         <source>Busy</source>
         <comment>Button to set your status to &apos;Busy&apos;</comment>
-        <translation type="unfinished"></translation>
+        <translation>Zajęty/a</translation>
     </message>
     <message>
         <location filename="../widget/widget.cpp" line="605"/>
         <source>&lt;Unknown&gt;</source>
         <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;Nieznany/a&gt;</translation>
     </message>
 </context>
 </TS>

From 4c89233656ef46a30858d80ba6c93b06a20f4369 Mon Sep 17 00:00:00 2001
From: dubslow <bill@mint>
Date: Sat, 13 Sep 2014 00:55:21 -0500
Subject: [PATCH 020/205] first thing's first, gotta placate the ocd

---
 mainwindow.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mainwindow.ui b/mainwindow.ui
index 7f9cd12c5..20e8269cf 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -3124,13 +3124,13 @@ QSplitter:handle{
           <property name="minimumSize">
            <size>
             <width>0</width>
-            <height>60</height>
+            <height>57</height>
            </size>
           </property>
           <property name="maximumSize">
            <size>
             <width>16777215</width>
-            <height>60</height>
+            <height>57</height>
            </size>
           </property>
           <property name="mouseTracking">

From 55437df210aaad12710bfe60e81731b0c158be7f Mon Sep 17 00:00:00 2001
From: dubslow <bill@mint>
Date: Sat, 13 Sep 2014 03:32:24 -0500
Subject: [PATCH 021/205] initial new settings widget, subforms not started
 also "filing" some files under misc

---
 core.cpp                                      |   6 +-
 main.cpp                                      |   2 +-
 cdata.cpp => misc/cdata.cpp                   |   0
 cdata.h => misc/cdata.h                       |   0
 cstring.cpp => misc/cstring.cpp               |   0
 cstring.h => misc/cstring.h                   |   0
 settings.cpp => misc/settings.cpp             |   0
 settings.h => misc/settings.h                 |   0
 smileypack.cpp => misc/smileypack.cpp         |   0
 smileypack.h => misc/smileypack.h             |   0
 style.cpp => misc/style.cpp                   |   0
 style.h => misc/style.h                       |   0
 qtox.pro                                      |  24 +--
 widget/emoticonswidget.cpp                    |   4 +-
 widget/form/genericchatform.cpp               |   6 +-
 widget/form/settingsform.cpp                  | 142 ---------------
 widget/form/settingswidget.cpp                | 164 ++++++++++++++++++
 .../form/{settingsform.h => settingswidget.h} |  35 ++--
 widget/groupwidget.cpp                        |   2 +-
 widget/tool/chataction.cpp                    |   2 +-
 widget/widget.cpp                             |  32 +---
 widget/widget.h                               |   6 +-
 22 files changed, 208 insertions(+), 217 deletions(-)
 rename cdata.cpp => misc/cdata.cpp (100%)
 rename cdata.h => misc/cdata.h (100%)
 rename cstring.cpp => misc/cstring.cpp (100%)
 rename cstring.h => misc/cstring.h (100%)
 rename settings.cpp => misc/settings.cpp (100%)
 rename settings.h => misc/settings.h (100%)
 rename smileypack.cpp => misc/smileypack.cpp (100%)
 rename smileypack.h => misc/smileypack.h (100%)
 rename style.cpp => misc/style.cpp (100%)
 rename style.h => misc/style.h (100%)
 delete mode 100644 widget/form/settingsform.cpp
 create mode 100644 widget/form/settingswidget.cpp
 rename widget/form/{settingsform.h => settingswidget.h} (60%)

diff --git a/core.cpp b/core.cpp
index 876301a63..4b081000a 100644
--- a/core.cpp
+++ b/core.cpp
@@ -15,9 +15,9 @@
 */
 
 #include "core.h"
-#include "cdata.h"
-#include "cstring.h"
-#include "settings.h"
+#include "misc/cdata.h"
+#include "misc/cstring.h"
+#include "misc/settings.h"
 #include "widget/widget.h"
 
 #include <tox/tox.h>
diff --git a/main.cpp b/main.cpp
index 1cdac827e..8e981baa5 100644
--- a/main.cpp
+++ b/main.cpp
@@ -15,7 +15,7 @@
 */
 
 #include "widget/widget.h"
-#include "settings.h"
+#include "misc/settings.h"
 #include <QApplication>
 #include <QFontDatabase>
 #include <QTranslator>
diff --git a/cdata.cpp b/misc/cdata.cpp
similarity index 100%
rename from cdata.cpp
rename to misc/cdata.cpp
diff --git a/cdata.h b/misc/cdata.h
similarity index 100%
rename from cdata.h
rename to misc/cdata.h
diff --git a/cstring.cpp b/misc/cstring.cpp
similarity index 100%
rename from cstring.cpp
rename to misc/cstring.cpp
diff --git a/cstring.h b/misc/cstring.h
similarity index 100%
rename from cstring.h
rename to misc/cstring.h
diff --git a/settings.cpp b/misc/settings.cpp
similarity index 100%
rename from settings.cpp
rename to misc/settings.cpp
diff --git a/settings.h b/misc/settings.h
similarity index 100%
rename from settings.h
rename to misc/settings.h
diff --git a/smileypack.cpp b/misc/smileypack.cpp
similarity index 100%
rename from smileypack.cpp
rename to misc/smileypack.cpp
diff --git a/smileypack.h b/misc/smileypack.h
similarity index 100%
rename from smileypack.h
rename to misc/smileypack.h
diff --git a/style.cpp b/misc/style.cpp
similarity index 100%
rename from style.cpp
rename to misc/style.cpp
diff --git a/style.h b/misc/style.h
similarity index 100%
rename from style.h
rename to misc/style.h
diff --git a/qtox.pro b/qtox.pro
index 7b52d779c..ce7762e79 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -79,7 +79,7 @@ win32 {
 HEADERS  += widget/form/addfriendform.h \
     widget/form/chatform.h \
     widget/form/groupchatform.h \
-    widget/form/settingsform.h \
+    widget/form/settingswidget.h \
     widget/form/filesform.h \
     widget/tool/chattextedit.h \
     widget/tool/friendrequestdialog.h \
@@ -89,17 +89,17 @@ HEADERS  += widget/form/addfriendform.h \
     friend.h \
     group.h \
     grouplist.h \
-    settings.h \
+    misc/settings.h \
     core.h \
     friendlist.h \
-    cdata.h \
-    cstring.h \
+    misc/cdata.h \
+    misc/cstring.h \
     widget/selfcamview.h \
     widget/camera.h \
     widget/netcamview.h \
-    smileypack.h \
+    misc/smileypack.h \
     widget/emoticonswidget.h \
-    style.h \
+    misc/style.h \
     widget/adjustingscrollarea.h \
     widget/croppinglabel.h \
     widget/friendlistwidget.h \
@@ -116,7 +116,7 @@ SOURCES += \
     widget/form/addfriendform.cpp \
     widget/form/chatform.cpp \
     widget/form/groupchatform.cpp \
-    widget/form/settingsform.cpp \
+    widget/form/settingswidget.cpp \
     widget/form/filesform.cpp \
     widget/tool/chattextedit.cpp \
     widget/tool/friendrequestdialog.cpp \
@@ -129,15 +129,15 @@ SOURCES += \
     group.cpp \
     grouplist.cpp \
     main.cpp \
-    settings.cpp \
-    cdata.cpp \
-    cstring.cpp \
+    misc/settings.cpp \
+    misc/cdata.cpp \
+    misc/cstring.cpp \
     widget/selfcamview.cpp \
     widget/camera.cpp \
     widget/netcamview.cpp \
-    smileypack.cpp \
+    misc/smileypack.cpp \
     widget/emoticonswidget.cpp \
-    style.cpp \
+    misc/style.cpp \
     widget/adjustingscrollarea.cpp \
     widget/croppinglabel.cpp \
     widget/friendlistwidget.cpp \
diff --git a/widget/emoticonswidget.cpp b/widget/emoticonswidget.cpp
index bab7abe8d..b0ffb6028 100644
--- a/widget/emoticonswidget.cpp
+++ b/widget/emoticonswidget.cpp
@@ -15,8 +15,8 @@
 */
 
 #include "emoticonswidget.h"
-#include "smileypack.h"
-#include "style.h"
+#include "misc/smileypack.h"
+#include "misc/style.h"
 
 #include <QPushButton>
 #include <QRadioButton>
diff --git a/widget/form/genericchatform.cpp b/widget/form/genericchatform.cpp
index f5681f1c6..2aff5d2a7 100644
--- a/widget/form/genericchatform.cpp
+++ b/widget/form/genericchatform.cpp
@@ -17,11 +17,11 @@
 #include "genericchatform.h"
 #include "ui_mainwindow.h"
 #include <QFileDialog>
-#include "smileypack.h"
+#include "misc/smileypack.h"
 #include "widget/emoticonswidget.h"
-#include "style.h"
+#include "misc/style.h"
 #include "widget/widget.h"
-#include "settings.h"
+#include "misc/settings.h"
 #include "widget/tool/chataction.h"
 #include "widget/chatareawidget.h"
 #include "widget/tool/chattextedit.h"
diff --git a/widget/form/settingsform.cpp b/widget/form/settingsform.cpp
deleted file mode 100644
index 3d4a213da..000000000
--- a/widget/form/settingsform.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-    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 "settingsform.h"
-#include "widget/widget.h"
-#include "settings.h"
-#include "smileypack.h"
-#include "ui_mainwindow.h"
-#include <QFont>
-#include <QClipboard>
-#include <QApplication>
-#include <QFileDialog>
-#include <QDir>
-
-SettingsForm::SettingsForm()
-    : QObject()
-{
-    main = new QWidget(), head = new QWidget();
-    QFont bold, small;
-    bold.setBold(true);
-    small.setPixelSize(13);
-    small.setKerning(false);
-    headLabel.setText(tr("User Settings","\"Headline\" of the window"));
-    headLabel.setFont(bold);
-
-    nameLabel.setText(tr("Name","Username/nick"));
-    statusTextLabel.setText(tr("Status","Status message"));
-    idLabel.setText("Tox ID " + tr("(click here to copy)", "Click on this text to copy TID to clipboard"));
-    id.setFont(small);
-    id.setTextInteractionFlags(Qt::TextSelectableByMouse);
-    id.setReadOnly(true);
-    id.setFrameStyle(QFrame::NoFrame);
-    id.setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    id.setFixedHeight(id.document()->size().height()*2);
-
-    videoTest.setText(tr("Test video","Text on a button to test the video/webcam"));
-    enableIPv6.setText(tr("Enable IPv6 (recommended)","Text on a checkbox to enable IPv6"));
-    enableIPv6.setChecked(Settings::getInstance().getEnableIPv6());
-    useTranslations.setText(tr("Use translations","Text on a checkbox to enable translations"));
-    useTranslations.setChecked(Settings::getInstance().getUseTranslations());
-    makeToxPortable.setText(tr("Make Tox portable","Text on a checkbox to make qTox a portable application"));
-    makeToxPortable.setChecked(Settings::getInstance().getMakeToxPortable());
-    makeToxPortable.setToolTip(tr("Save settings to the working directory instead of the usual conf dir","describes makeToxPortable checkbox"));
-
-    smileyPackLabel.setText(tr("Smiley Pack", "Text on smiley pack label"));
-    for (auto entry : SmileyPack::listSmileyPacks())
-        smileyPackBrowser.addItem(entry.first, entry.second);
-    smileyPackBrowser.setCurrentIndex(smileyPackBrowser.findData(Settings::getInstance().getSmileyPack()));
-
-    main->setLayout(&layout);
-    layout.addWidget(&nameLabel);
-    layout.addWidget(&name);
-    layout.addWidget(&statusTextLabel);
-    layout.addWidget(&statusText);
-    layout.addWidget(&idLabel);
-    layout.addWidget(&id);
-    layout.addWidget(&videoTest);
-    layout.addWidget(&enableIPv6);
-    layout.addWidget(&useTranslations);
-    layout.addWidget(&makeToxPortable);
-    layout.addWidget(&smileyPackLabel);
-    layout.addWidget(&smileyPackBrowser);
-    layout.addStretch();
-
-    head->setLayout(&headLayout);
-    headLayout.addWidget(&headLabel);
-
-    connect(&videoTest, SIGNAL(clicked()), this, SLOT(onTestVideoClicked()));
-    connect(&enableIPv6, SIGNAL(stateChanged(int)), this, SLOT(onEnableIPv6Updated()));
-    connect(&useTranslations, SIGNAL(stateChanged(int)), this, SLOT(onUseTranslationUpdated()));
-    connect(&makeToxPortable, SIGNAL(stateChanged(int)), this, SLOT(onMakeToxPortableUpdated()));
-    connect(&idLabel, SIGNAL(clicked()), this, SLOT(copyIdClicked()));
-    connect(&smileyPackBrowser, SIGNAL(currentIndexChanged(int)), this, SLOT(onSmileyBrowserIndexChanged(int)));
-}
-
-SettingsForm::~SettingsForm()
-{
-}
-
-void SettingsForm::setFriendAddress(const QString& friendAddress)
-{
-    QString txt{friendAddress};
-    txt.insert(38,'\n');
-    id.setText(txt);
-}
-
-void SettingsForm::show(Ui::MainWindow &ui)
-{
-    name.setText(ui.nameLabel->text());
-    statusText.setText(ui.statusLabel->text());
-    ui.mainContent->layout()->addWidget(main);
-    ui.mainHead->layout()->addWidget(head);
-    main->show();
-    head->show();
-}
-
-void SettingsForm::onTestVideoClicked()
-{
-     Widget::getInstance()->showTestCamview();
-}
-
-void SettingsForm::onEnableIPv6Updated()
-{
-    Settings::getInstance().setEnableIPv6(enableIPv6.isChecked());
-}
-
-void SettingsForm::copyIdClicked()
-{
-    id.selectAll();
-    QString txt = id.toPlainText();
-    txt.replace('\n',"");
-    QApplication::clipboard()->setText(txt);
-}
-
-void SettingsForm::onUseTranslationUpdated()
-{
-    Settings::getInstance().setUseTranslations(useTranslations.isChecked());
-}
-
-void SettingsForm::onMakeToxPortableUpdated()
-{
-    Settings::getInstance().setMakeToxPortable(makeToxPortable.isChecked());
-}
-
-void SettingsForm::onSmileyBrowserIndexChanged(int index)
-{
-    QString filename = smileyPackBrowser.itemData(index).toString();
-    Settings::getInstance().setSmileyPack(filename);
-}
diff --git a/widget/form/settingswidget.cpp b/widget/form/settingswidget.cpp
new file mode 100644
index 000000000..6e2778de8
--- /dev/null
+++ b/widget/form/settingswidget.cpp
@@ -0,0 +1,164 @@
+/*
+    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 "settingswidget.h"
+#include "widget/widget.h"
+#include "ui_mainwindow.h"
+
+SettingsWidget::SettingsWidget()
+    : QObject()
+{
+    main = new QWidget();
+    // this crap is copied from ui_mainwindow.h... there's no easy way around
+    // just straight up copying it like this... oh well
+    // the layout/icons obviously need to be improved, but it's a working model,
+    // not a pretty one
+    QSizePolicy sizePolicy3(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+    sizePolicy3.setHorizontalStretch(0);
+    sizePolicy3.setVerticalStretch(0);
+    head = new QWidget();
+    head->setObjectName(QStringLiteral("head"));
+    head->setEnabled(true);
+    sizePolicy3.setHeightForWidth(head->sizePolicy().hasHeightForWidth());
+    head->setSizePolicy(sizePolicy3);
+    QPalette palette5;
+    QBrush brush(QColor(255, 255, 255, 255));
+    brush.setStyle(Qt::SolidPattern);
+    QBrush brush1(QColor(28, 28, 28, 255));
+    brush1.setStyle(Qt::SolidPattern);
+    QBrush brush2(QColor(42, 42, 42, 255));
+    brush2.setStyle(Qt::SolidPattern);
+    QBrush brush3(QColor(35, 35, 35, 255));
+    brush3.setStyle(Qt::SolidPattern);
+    QBrush brush4(QColor(14, 14, 14, 255));
+    brush4.setStyle(Qt::SolidPattern);
+    QBrush brush5(QColor(18, 18, 18, 255));
+    brush5.setStyle(Qt::SolidPattern);
+    QBrush brush6(QColor(0, 0, 0, 255));
+    brush6.setStyle(Qt::SolidPattern);
+    QBrush brush7(QColor(255, 255, 220, 255));
+    brush7.setStyle(Qt::SolidPattern);
+    palette5.setBrush(QPalette::Active, QPalette::WindowText, brush);
+    palette5.setBrush(QPalette::Active, QPalette::Button, brush1);
+    palette5.setBrush(QPalette::Active, QPalette::Light, brush2);
+    palette5.setBrush(QPalette::Active, QPalette::Midlight, brush3);
+    palette5.setBrush(QPalette::Active, QPalette::Dark, brush4);
+    palette5.setBrush(QPalette::Active, QPalette::Mid, brush5);
+    palette5.setBrush(QPalette::Active, QPalette::Text, brush);
+    palette5.setBrush(QPalette::Active, QPalette::BrightText, brush);
+    palette5.setBrush(QPalette::Active, QPalette::ButtonText, brush);
+    palette5.setBrush(QPalette::Active, QPalette::Base, brush6);
+    palette5.setBrush(QPalette::Active, QPalette::Window, brush1);
+    palette5.setBrush(QPalette::Active, QPalette::Shadow, brush6);
+    palette5.setBrush(QPalette::Active, QPalette::AlternateBase, brush4);
+    palette5.setBrush(QPalette::Active, QPalette::ToolTipBase, brush7);
+    palette5.setBrush(QPalette::Active, QPalette::ToolTipText, brush6);
+    palette5.setBrush(QPalette::Inactive, QPalette::WindowText, brush);
+    palette5.setBrush(QPalette::Inactive, QPalette::Button, brush1);
+    palette5.setBrush(QPalette::Inactive, QPalette::Light, brush2);
+    palette5.setBrush(QPalette::Inactive, QPalette::Midlight, brush3);
+    palette5.setBrush(QPalette::Inactive, QPalette::Dark, brush4);
+    palette5.setBrush(QPalette::Inactive, QPalette::Mid, brush5);
+    palette5.setBrush(QPalette::Inactive, QPalette::Text, brush);
+    palette5.setBrush(QPalette::Inactive, QPalette::BrightText, brush);
+    palette5.setBrush(QPalette::Inactive, QPalette::ButtonText, brush);
+    palette5.setBrush(QPalette::Inactive, QPalette::Base, brush6);
+    palette5.setBrush(QPalette::Inactive, QPalette::Window, brush1);
+    palette5.setBrush(QPalette::Inactive, QPalette::Shadow, brush6);
+    palette5.setBrush(QPalette::Inactive, QPalette::AlternateBase, brush4);
+    palette5.setBrush(QPalette::Inactive, QPalette::ToolTipBase, brush7);
+    palette5.setBrush(QPalette::Inactive, QPalette::ToolTipText, brush6);
+    palette5.setBrush(QPalette::Disabled, QPalette::WindowText, brush4);
+    palette5.setBrush(QPalette::Disabled, QPalette::Button, brush1);
+    palette5.setBrush(QPalette::Disabled, QPalette::Light, brush2);
+    palette5.setBrush(QPalette::Disabled, QPalette::Midlight, brush3);
+    palette5.setBrush(QPalette::Disabled, QPalette::Dark, brush4);
+    palette5.setBrush(QPalette::Disabled, QPalette::Mid, brush5);
+    palette5.setBrush(QPalette::Disabled, QPalette::Text, brush4);
+    palette5.setBrush(QPalette::Disabled, QPalette::BrightText, brush);
+    palette5.setBrush(QPalette::Disabled, QPalette::ButtonText, brush4);
+    palette5.setBrush(QPalette::Disabled, QPalette::Base, brush1);
+    palette5.setBrush(QPalette::Disabled, QPalette::Window, brush1);
+    palette5.setBrush(QPalette::Disabled, QPalette::Shadow, brush6);
+    palette5.setBrush(QPalette::Disabled, QPalette::AlternateBase, brush1);
+    palette5.setBrush(QPalette::Disabled, QPalette::ToolTipBase, brush7);
+    palette5.setBrush(QPalette::Disabled, QPalette::ToolTipText, brush6);
+    head->setPalette(palette5);
+    head->setAutoFillBackground(true);
+    iconsLayout = new QHBoxLayout(head);
+    iconsLayout->setSpacing(0);
+    iconsLayout->setObjectName(QStringLiteral("iconsLayout"));
+    iconsLayout->setContentsMargins(0, 0, 0, 0);
+
+    generalButton = new QPushButton(head);
+    generalButton->setObjectName(QStringLiteral("generalButton"));
+    generalButton->setMinimumSize(QSize(55, 35));
+    generalButton->setMaximumSize(QSize(55, 35));
+    generalButton->setFocusPolicy(Qt::NoFocus);
+    QIcon icon1;
+    icon1.addFile(QStringLiteral(":/img/add.png"), QSize(), QIcon::Normal, QIcon::Off);
+    generalButton->setIcon(icon1);
+    generalButton->setFlat(true);
+    iconsLayout->addWidget(generalButton);
+    
+    identityButton = new QPushButton(head);
+    identityButton->setObjectName(QStringLiteral("identityButton"));
+    identityButton->setMinimumSize(QSize(55, 35));
+    identityButton->setMaximumSize(QSize(55, 35));
+    identityButton->setFocusPolicy(Qt::NoFocus);
+    QIcon icon2;
+    icon2.addFile(QStringLiteral(":/img/group.png"), QSize(), QIcon::Normal, QIcon::Off);
+    identityButton->setIcon(icon2);
+    identityButton->setFlat(true);
+    iconsLayout->addWidget(identityButton);
+    
+    privacyButton = new QPushButton(head);
+    privacyButton->setObjectName(QStringLiteral("privacyButton"));
+    privacyButton->setMinimumSize(QSize(55, 35));
+    privacyButton->setMaximumSize(QSize(55, 35));
+    privacyButton->setFocusPolicy(Qt::NoFocus);
+    QIcon icon3;
+    icon3.addFile(QStringLiteral(":/img/transfer.png"), QSize(), QIcon::Normal, QIcon::Off);
+    privacyButton->setIcon(icon3);
+    privacyButton->setFlat(true);
+    iconsLayout->addWidget(privacyButton);
+    
+    avButton = new QPushButton(head);
+    avButton->setObjectName(QStringLiteral("avButton"));
+    avButton->setMinimumSize(QSize(55, 35));
+    avButton->setMaximumSize(QSize(55, 35));
+    avButton->setFocusPolicy(Qt::NoFocus);
+    QIcon icon4;
+    icon4.addFile(QStringLiteral(":/img/settings.png"), QSize(), QIcon::Normal, QIcon::Off);
+    avButton->setIcon(icon4);
+    avButton->setFlat(true);
+    iconsLayout->addWidget(avButton);
+    
+    head->setLayout(iconsLayout);
+
+}
+
+SettingsWidget::~SettingsWidget()
+{
+}
+
+void SettingsWidget::show(Ui::MainWindow& ui)
+{
+    ui.mainContent->layout()->addWidget(main);
+    ui.mainHead->layout()->addWidget(head);
+    main->show();
+    head->show();
+}
diff --git a/widget/form/settingsform.h b/widget/form/settingswidget.h
similarity index 60%
rename from widget/form/settingsform.h
rename to widget/form/settingswidget.h
index a081d01fb..a1cee909f 100644
--- a/widget/form/settingsform.h
+++ b/widget/form/settingswidget.h
@@ -14,8 +14,8 @@
     See the COPYING file for more details.
 */
 
-#ifndef SETTINGSFORM_H
-#define SETTINGSFORM_H
+#ifndef SETTINGSWIDGET_H
+#define SETTINGSWIDGET_H
 
 #include <QVBoxLayout>
 #include <QLabel>
@@ -31,37 +31,32 @@
 namespace Ui {class MainWindow;}
 class QString;
 
-class SettingsForm : public QObject
+class SettingsWidget : public QObject
 {
     Q_OBJECT
 public:
-    SettingsForm();
-    ~SettingsForm();
+    SettingsWidget();
+    ~SettingsWidget();
 
     void show(Ui::MainWindow &ui);
 
 public slots:
-    void setFriendAddress(const QString& friendAddress);
+    //void setFriendAddress(const QString& friendAddress);
 
 private slots:
-    void onTestVideoClicked();
-    void onEnableIPv6Updated();
-    void onUseTranslationUpdated();
-    void onMakeToxPortableUpdated();
-    void onSmileyBrowserIndexChanged(int index);
-    void copyIdClicked();
 
 private:
-    QLabel headLabel, nameLabel, statusTextLabel, smileyPackLabel;
-    QTextEdit id;
-    CroppingLabel idLabel;
-    QPushButton videoTest;
-    QCheckBox enableIPv6, useTranslations, makeToxPortable;
-    QVBoxLayout layout, headLayout;
     QWidget *main, *head;
-    QComboBox smileyPackBrowser;
+    // the code pertaining to the icons is mostly copied from ui_mainwindow.h
+    QHBoxLayout *iconsLayout;
+    QPushButton *generalButton;
+    QPushButton *identityButton;
+    QPushButton *privacyButton;
+    QPushButton *avButton;
+    
+    // now the actual pages and stuff
+    // ...
 public:
-    QLineEdit name, statusText;
 };
 
 #endif // SETTINGSFORM_H
diff --git a/widget/groupwidget.cpp b/widget/groupwidget.cpp
index b8c1cbcc0..0c02db3d2 100644
--- a/widget/groupwidget.cpp
+++ b/widget/groupwidget.cpp
@@ -17,7 +17,7 @@
 #include "groupwidget.h"
 #include "grouplist.h"
 #include "group.h"
-#include "settings.h"
+#include "misc/settings.h"
 #include "widget/form/groupchatform.h"
 #include <QPalette>
 #include <QMenu>
diff --git a/widget/tool/chataction.cpp b/widget/tool/chataction.cpp
index 0847abdda..dacde43ee 100644
--- a/widget/tool/chataction.cpp
+++ b/widget/tool/chataction.cpp
@@ -15,7 +15,7 @@
 */
 
 #include "chataction.h"
-#include "smileypack.h"
+#include "misc/smileypack.h"
 #include <QStringList>
 #include <QBuffer>
 #include "filetransferinstance.h"
diff --git a/widget/widget.cpp b/widget/widget.cpp
index abe14460a..29aef03be 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -17,7 +17,7 @@
 #include "widget.h"
 #include "ui_mainwindow.h"
 #include "core.h"
-#include "settings.h"
+#include "misc/settings.h"
 #include "friend.h"
 #include "friendlist.h"
 #include "widget/tool/friendrequestdialog.h"
@@ -26,7 +26,7 @@
 #include "group.h"
 #include "widget/groupwidget.h"
 #include "widget/form/groupchatform.h"
-#include "style.h"
+#include "misc/style.h"
 #include "selfcamview.h"
 #include "widget/friendlistwidget.h"
 #include "camera.h"
@@ -179,7 +179,7 @@ Widget::Widget(QWidget *parent)
     connect(core, &Core::statusSet, this, &Widget::onStatusSet);
     connect(core, &Core::usernameSet, this, &Widget::setUsername);
     connect(core, &Core::statusMessageSet, this, &Widget::setStatusMessage);
-    connect(core, &Core::friendAddressGenerated, &settingsForm, &SettingsForm::setFriendAddress);
+    //connect(core, &Core::friendAddressGenerated, &settingsWidget, &SettingsWidget::setFriendAddress);
     connect(core, SIGNAL(fileDownloadFinished(const QString&)), &filesForm, SLOT(onFileDownloadComplete(const QString&)));
     connect(core, SIGNAL(fileUploadFinished(const QString&)), &filesForm, SLOT(onFileUploadComplete(const QString&)));
     connect(core, &Core::friendAdded, this, &Widget::addFriend);
@@ -210,8 +210,6 @@ Widget::Widget(QWidget *parent)
     connect(setStatusOnline, SIGNAL(triggered()), this, SLOT(setStatusOnline()));
     connect(setStatusAway, SIGNAL(triggered()), this, SLOT(setStatusAway()));
     connect(setStatusBusy, SIGNAL(triggered()), this, SLOT(setStatusBusy()));
-    connect(&settingsForm.name, SIGNAL(editingFinished()), this, SLOT(onUsernameChanged()));
-    connect(&settingsForm.statusText, SIGNAL(editingFinished()), this, SLOT(onStatusMessageChanged()));
     connect(&friendForm, SIGNAL(friendRequested(QString,QString)), this, SIGNAL(friendRequested(QString,QString)));
 
     coreThread->start();
@@ -339,7 +337,7 @@ void Widget::onTransferClicked()
 void Widget::onSettingsClicked()
 {
     hideMainForms();
-    settingsForm.show(*ui);
+    settingsWidget.show(*ui);
     activeChatroomWidget = nullptr;
 }
 
@@ -357,20 +355,10 @@ void Widget::hideMainForms()
     }
 }
 
-void Widget::onUsernameChanged()
-{
-    const QString newUsername = settingsForm.name.text();
-    ui->nameLabel->setText(newUsername);
-    ui->nameLabel->setToolTip(newUsername); // for overlength names
-    settingsForm.name.setText(newUsername);
-    core->setUsername(newUsername);
-}
-
 void Widget::onUsernameChanged(const QString& newUsername, const QString& oldUsername)
 {
     ui->nameLabel->setText(oldUsername); // restore old username until Core tells us to set it
     ui->nameLabel->setToolTip(oldUsername); // for overlength names
-    settingsForm.name.setText(oldUsername);
     core->setUsername(newUsername);
 }
 
@@ -378,23 +366,12 @@ void Widget::setUsername(const QString& username)
 {
     ui->nameLabel->setText(username);
     ui->nameLabel->setToolTip(username); // for overlength names
-    settingsForm.name.setText(username);
-}
-
-void Widget::onStatusMessageChanged()
-{
-    const QString newStatusMessage = settingsForm.statusText.text();
-    ui->statusLabel->setText(newStatusMessage);
-    ui->statusLabel->setToolTip(newStatusMessage); // for overlength messsages
-    settingsForm.statusText.setText(newStatusMessage);
-    core->setStatusMessage(newStatusMessage);
 }
 
 void Widget::onStatusMessageChanged(const QString& newStatusMessage, const QString& oldStatusMessage)
 {
     ui->statusLabel->setText(oldStatusMessage); // restore old status message until Core tells us to set it
     ui->statusLabel->setToolTip(oldStatusMessage); // for overlength messsages
-    settingsForm.statusText.setText(oldStatusMessage);
     core->setStatusMessage(newStatusMessage);
 }
 
@@ -402,7 +379,6 @@ void Widget::setStatusMessage(const QString &statusMessage)
 {
     ui->statusLabel->setText(statusMessage);
     ui->statusLabel->setToolTip(statusMessage); // for overlength messsages
-    settingsForm.statusText.setText(statusMessage);
 }
 
 void Widget::addFriend(int friendId, const QString &userId)
diff --git a/widget/widget.h b/widget/widget.h
index 1fbecb412..ec054863c 100644
--- a/widget/widget.h
+++ b/widget/widget.h
@@ -19,7 +19,7 @@
 
 #include <QMainWindow>
 #include "widget/form/addfriendform.h"
-#include "widget/form/settingsform.h"
+#include "widget/form/settingswidget.h"
 #include "widget/form/filesform.h"
 #include "corestructs.h"
 
@@ -83,8 +83,6 @@ private slots:
     void onFailedToStartCore();
     void onUsernameChanged(const QString& newUsername, const QString& oldUsername);
     void onStatusMessageChanged(const QString& newStatusMessage, const QString& oldStatusMessage);
-    void onUsernameChanged();
-    void onStatusMessageChanged();
     void setUsername(const QString& username);
     void setStatusMessage(const QString &statusMessage);
     void addFriend(int friendId, const QString& userId);
@@ -137,7 +135,7 @@ private:
     Core* core;
     QThread* coreThread;
     AddFriendForm friendForm;
-    SettingsForm settingsForm;
+    SettingsWidget settingsWidget;
     FilesForm filesForm;
     static Widget* instance;
     GenericChatroomWidget* activeChatroomWidget;

From 5e12a5fa3e14c3c2c80a619ffa69875a49894ea6 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sat, 13 Sep 2014 11:49:58 +0200
Subject: [PATCH 022/205] Update translations

---
 qtox.pro           |   2 +-
 translations/de.qm | Bin 4328 -> 3969 bytes
 translations/fr.qm | Bin 4515 -> 3969 bytes
 translations/it.qm | Bin 5964 -> 5820 bytes
 translations/pl.qm | Bin 0 -> 6709 bytes
 translations/ru.qm | Bin 6821 -> 6581 bytes
 6 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 translations/pl.qm

diff --git a/qtox.pro b/qtox.pro
index b733387b8..250d3abc8 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -33,7 +33,7 @@ TRANSLATIONS = translations/de.ts \
                translations/fr.ts \
                translations/it.ts \
                translations/ru.ts \
-               translations/po.ts \
+               translations/pl.ts \
                translations/mannol.ts
 
 RESOURCES += res.qrc
diff --git a/translations/de.qm b/translations/de.qm
index c5132443ed394bc90ef30d8bba13ec0870e60e15..8a6769d20ef422e9932aed64235f71b97cd1ba2b 100644
GIT binary patch
delta 731
zcmZWlOK1~O6g|_tnM^Wordh-ytwkzrt=3kNRumT{!G2X*Yqh!&V=_qx!$gv)F@nUP
zg-8{JQCr&LDhsX97AguVC{&?z<w8U^x`?QtJ3kc{;%y?>;No)LIq%$i&wHP0GV8B-
z(|ur9E&*y9Z0Zi-48*QhKuMtGHv_~k@D1C5V*x!oZUDT((OvZmka`?TV<P~bv(%JD
zzT0d(dmV6{DWdy4o7hF%{fgbaDp21(Hd}QRkZ0KA+HXMFEw((F2huno)-}B)V_Ol`
zcCl@!77!rn+uA8mUc9X2XyK$dJ-R@_=EVECmlVifL?thstb9uPCMm|rFM6cdo<oF(
zox<9cKrfu`x-r6P=hDXu6y$*{WG>SDAFk}w0FFS&xSn-A1e{6NJC%|-pSXYCYynt5
z?`)t!{G1w^J4MO4y13yhy%_4!B<a!{ZQXc?^y6Cp=qv>~t<8n+k$>3$G|&85!7JK|
z+(D(;6Y}OY-VP(G55xmzBCN-|&4d*&gZlhyS#j7S+A*$l>ZTqKMEe2}-TuJ$%H;*Y
z2-?kjryWx(?FPPJ@8*qkUbMe!TX=U!H!Z_T6*`*AH<k*ISiM@Rd@gTP-1`HDIcS)n
zSkkWc)R%D6v$cfhJgp^syLQl?=FMqo&<I6zOK{L%c;LecB%vcgWg;Z6{E$S&e91t{
zxk6UiE8s6!gBZelgkixz1lGSM|8U~JCXQa393`s>T}I8{1yZjWHB5c=iY#4~3Bn&H
C;=F4B

delta 1043
zcmZuuTSyd982-ndnVp^88O;nummJHrNV5bDe5fcdS&EUaMFiF8p1tJm&N6d$b$eN)
z3xY+)R7y$@B|X%G!dg%i6;_0AQEx#7f%a}UBBFnGRkUI_^WVSk`_CCD{aiL&kU9x)
zEC?XK2KIImfPVvAOC5mJ2NlmYVtxzM{$>H}w_s1)1hCD(fgM*duiN&Q`~(mf+w90W
z0C>SB$0_!mU`Ge90Ei@OoiEwz^%%R{?A=QY&P}kBB}Wn8&OR#t0+7nN!G0h6gaC&)
z&(`+<&MIzqupEE^?t*gy2|BntLo+xq&E21PivsrYy~R%vP~$aM6AHe_YmHq<Ec403
zrPw!bXNoKVkL{vo1nc!#>x|fE=g$D-Rtn6(S;YS)q}pym5V$<Y;J6nP1CHk{4*?w2
zjt>$lb0owc*J=US4%fcTNFaZed{Z&Z&q#FoG62^uz1pyV!a<rH!@4jmyGMOUTqt)8
zO`_0*JmsH8p$|gH8c3gF3b<4ew1Nr|AfTi5qYXmXiUbRY$Kz~JBScpfqHDU{%4K85
zhW_|p(;A{g5Ql;S9;m^8AA~UHLobS6529POI7ZZBNr8dRFFdF5RAZ?T+X&i~vJ~h=
z&?tVZVG<SuQV^{8@NYp|kwu8P<rQidSMY0kM5T(SMu}=vG2*dUg{D*Dt5SN@=q9Sf
z4WiH>!N}Tp#j@skv6T}Vf+{uR{6SkDw3@pdg>JS%izThLe9KY0!=x!3@{u;Rn}p3L
z{LX^4&7m;y>T1;R6P+Fj`2vKd*Vvu5^qeR#=8)K&e&^&FlgRC+TRbkgItitrXuxPj
zrRGPW&|Gj8=dVm=uH9vBm)EW5JE=<JhQ+^XF4IzEM&&Y}=p_bK5~xZ0e_Js$;eAIl
zuR!qO!<nZEthzm^%OJY4B;p?&GbL5p`Rs1yJ*lE{(a*@>!3!GnFTaG%tMyw5OZ{`w
Sw&htxuFGAT9mJj-hWP`r)cl74

diff --git a/translations/fr.qm b/translations/fr.qm
index e3d68b2e1a1bf5114c201fee7de16d73986ac815..98e9e1aaa0abc0d733d08a78db17bff6152751da 100644
GIT binary patch
delta 603
zcmZ3i+$cXmq&|RwrMHuTfw!80WzI?<y@i3*!<2!6yO+V_9}5Emn;3&*>0|~5=GP2f
zW>Xm$c;uKprGEj%)0j_9Z)IR$IL}f!r-Xrl^#;p~jwuWboM#|3*A|vpmOwt&AC}eq
zj6i*UEbFBs85lSou<TL!!oa{ZgXR0|#|#Yh48E+Yy7zzz%ONzcE318m3IhWp8*8e8
zE6_prS$nvb04==Ex~lsy&|y1Rw=KB>bdV8*=6=nVEp-4W?#PzU160qd!<O$73ZyI8
z86`jt5M$?3oep%EH~XpQ%|M6j<X~)U0h<4Yvtv#OLj(h3JLeIPT?`ED3pwxe0$s-b
zp6kan69xvBJRWxqpg}zKyeS(BfG)S;J)!g&=wk-nQ?r5M?81C9Gg5%!Gx&nK*8?4t
z#<wAD3sC*<Oa=x%fz6W`4Ol08bNEa?$KfU_;+C0{8d8*)SDcnw<e67ol9-pAx><vh
zmwEDjz9=4U_td=9qQsnl#Prn3XV?ol_`w31$&>qeT_&I95uRMnGY^PmC;#VVoxG2C
z`($l?DIU+1)Vz|+l1i|yKz?;0WC2EIpi6ls7qW;>zQ@ANi>kO%K$V-zH!(9WJTosP
zzkKpi0W}o9x}ZJ^KUUBjg<rtuKluTV7CT#bW=eW$$z)N1%*odUblE$Ab}}(D0suqf
Bs-*w`

delta 1078
zcmZWnT}TvB6h70=%>K>nR{9Y3<CJa|7^&EQAYxis`A}<8y)?SBIy&xbGh=8ki)3h2
zl-*J(Df%I(pn|L@3XFOP2?D9tBnm3(&8R4dzS*@!iObBr=ey_o&UemCcm9=vQ@N>5
zqJ1qyVT<?^M~Ol`#1CJ`{)G5zT|{1vge|Lx<g>K&X#wz!RQ`tt{)Q?$7?I}-)vi7Z
z{F7(v{9i=Ah-Yl@2ob&FyM`U)4e~>MXNUq9GrJ`6=hh*X>iC-{IigfJm%lxK4+<>j
z9~XWjnl;4#IR733JA}xJw?x5Op`xXbh!X{^q#8ymh2z1iC^R74IQ9&@QQ`j8*Dz8h
zw&jgNn2Dx@Jn^1rZmNfYwPM%qeB@1fxp}UU&)z^}5ceC>dy0a+-m#B|A^g(Eb@!mq
zS6^!TWg?;2-!~jZ-0Oe7<q?s8zkfo8LI175&w+9xJ|S&hh63RMId&%r{I~3k^n+)~
zFP2QA0g}hg<K8zOS}+tt;fB!8W4B>69=a1Bfzb(_Xf_wP+sc&)DTS)Z!qTV%Z-rtw
zDbz$NwbN%Hs?Svv@dT^XcFj^1%`z>oi)CWYgYzM(Arsl{;5pz&s5Gl(0GpwRD1qz*
zb~}Z#Ni3J_pkOgT9WpLrW9igLM%q%wm_bEgIKT}&Hg2q}!SX4Canov79VJq#Buq!K
zJCaG$a<o{n(xfJe9Hqn76sJW)gmxr#S}SZMa6s@?wWtp37wgL;s)CCo>P)Y~SDDE!
zmo(QssEvkJZRjy=yV|H3?47tRH>XB7w5X*f?6_t*4SK9ubM97pWe@8KE@Tx_9vctl
zu=O}!3U;%H0b?p&!!Ag3SgX{}^iVCU3+$DpU7F+QiDtV79kK6H{!C!8T+}u_BmE^7
zQ51G<j0mPN%*^x;qKO#BYi5TPh-$W@9E5YzZDxjYS|~5weS+ekHoHH^>0s`ndRw!U
ze>MN(u@51g9hVianCY55ke9N`@VWx`7ZG91q|U4XPt@#8&weWRle{v^TM}9mp3>m@
Jz@6pc{sJaL3BUjV

diff --git a/translations/it.qm b/translations/it.qm
index 890aaaea2f5951d4070983c7a9ca61a7acc417b1..2523c49cbbb5ce0bc93e6891af285cbe0d984d2e 100644
GIT binary patch
delta 568
zcmX@3w?}t^NZ<(umflVV1`#g?mN_edbU6d7hbaStz!C=b><k75;i(KJ|5z9pIKDDC
zmQH41V423?Wj2+8LGS^??7vqS7=#2E=Et)#Fz|#h@n<Ci`TY}f)#~}Sv&`t2!oa}4
zn`M?IkQU%&S>4YFl#OFqFCEFi!2O(MkIEMY2BsA(-)BE&U|{fPRn@%*R9^<6MR-`v
zy%sYt@UgJkXQ(hRF!Hdb8n^;ow~V!idkF&r=N;Bn-G_nZUS!?21n3H8C@sjumMwLF
zL7PD!hAp25sDbq$TfR#u0|T2cJEH{1LEP+Is?&i6N3frI-VF4f|72T6yLw?!p5kzz
zJ2={S-mC9sVBkH@o3fz*=uUUu6H1qXzBL8XpMmaV;5{`PXdIUWpNzf|(AR7EWM-rQ
z)y?EHo*xIaW-4D$0Wg#V8~K8|*8@X~l`mKZsGoz8Z$sJ^pmhf_fu6X`3^YiI!I2>y
z2s0T<87AuraBOB`y39Q}Ryc--+dVZewJ0$sATd34@-bmw6oJjYB7BS}B9k*j4N(OY
z#5_<0HecWkWSXohBE#dElA2eNSyBl$dYPyys=zK*HC_~v%`yUam?nSbGh$~8&rC^A
KEt$MqY$5;?5tuXp

delta 761
zcmZXQOH30{6o&sPbK6>GZcAHCBaPHb5kf!=R^kRjB8ZJd1EL`s6{jN|3r=kdhK*eq
zjRp`&MUj%QkOk@jVvQToNZb(O!dK!#Wn&Br6HR=?m5<XV8e4KRb7s!@&pF?J=c}LA
zTyb_jgE)K%aK3;zd5hw2uogdHuZJld0&Gc?FKndz5Vrmj0rPh>_9X%F8UowK0KSaW
z&sTtzW9ldairyKlCl&f19#zW|QnNUI@hTt(#EI>hI4Ry45vY1toGs}jwJy$=eFF?L
z;*ZpO0DGCQdYN>L)dz0U)_S%hR0aqVQ)`=m;u<zoI1Q|M%SJ|sy2!$A4?Y1L583@`
zq9}N746l1k{U43G)PyRq1*5*R12DE42M&~y@RLb!5r{NlviPn8g)63|m2+gXHR%@`
z5;lhvJ4hVn3)1IJ4@jPngL4s*?UEP0FUf5k#jnH(c_~F>EiUff?4{cZa`$+UbT@e2
z)Dc=Y#@ixvOFY5b250HE7;kq|zgggOC+^X@M;e(qR6v8gXhb(14Sh&|5#AK08*F<F
z=@Q3l!?9XaKtT`H6gpk-;54Z;iV>)YQdFSRw??%nWh%`XG$TFE3Z+L=!k&;CRXuUt
zqv(-=N)r{Nb~PT?PIbqc^=NN$QSOp+Gk)HhmpO0WkRwT7=3L0r%viVNW$xO29sjQq
zGG5nXA93pF&wA;}zRwW%@vOVvfAp69YAo*Q*Mh3Pn)!pZr8oyDJKBZa$+M2qQn@3h
OMm>KwukNl|JNgF{>BDpY

diff --git a/translations/pl.qm b/translations/pl.qm
new file mode 100644
index 0000000000000000000000000000000000000000..d05682dd157ed6c4cdf4f6a3a40d7171139dab1b
GIT binary patch
literal 6709
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

literal 0
HcmV?d00001

diff --git a/translations/ru.qm b/translations/ru.qm
index be9acca27be53db64295085b086a990c5702861b..50ef1c79f7626d2a63376a1e2b030909131555d6 100644
GIT binary patch
delta 573
zcmX9*T}YEr7=E_zoPGPYecv|IX*q>tQa6z>Ee2UAMVk<WC6Q85nOGw<O2Vtrk6_u4
zxN55n44M}%NI?x!qadrXhFxT%f=cMZi-Im%L_yI5yLve1Jn!@Kp0S1*|8Qw!Js>*(
zPXOZTCE_wfavUhPLk1fFcQw>-H&A*F_5TE5T}0rcA8@QiQ(qJiyAV7Z0Lm1!Y`O`Q
zd`0^=&KYG${9OW8RbljyB)`urnx2r?Xm*}B%KNn9DNF$oKnYd;0ko}3HZ}m5%*xx5
zA2f1`{^S|rh=_;gIXEEVgEuJrvxqLIxD(*nbyD2FZlYknn5f(j*dK^_UjZ<$h+l~>
z0B*_J4W9sKu85wL+}v`HI?Zxhw~zj&MtQ7m2OHPREA|wF+?MH~XKbF74^vBwmn)+C
zwajN|SYoz>*F2?h-qPdXoJ?AJwzmP6cGXnDcW0YwtBuj%t~&hkH#d4j&8}SF26tOc
z=Poi>NYhU(Qa_{(CinW-_=UC*oCR!QEk8a+!Da2U&IYzQ+w<uVn-`*wP34ga$LW3S
zV?E&bzHScCb9(1wFZ;Umh0GSRX7x<X8^&uUa(~#VXA_L2y*IoYYxn^f!yE4;zsvBC
z9%S6K(b^j&|FY3KG{KLAvB%4K^_?-<HO;t>j&mo66)IJWDp5DpVUEeE^H!@n`eF5}
E|6D7NYXATM

delta 770
zcmX9+Ye-XJ7=E^WXJ?x`XKGWInjJ;4z-T#_m&}?Ox@81flqJe=n=Z|nmqPk6A_c=D
zaix;RgcP#K3tB%)NXXJg`9n?UM;D3`vIt7LV)Uj54iE3;d7tOJ@3~{@H@E4%X#jT&
z2!8^0@jMVQ0oF4>xCAcG41^4VudD#VVvzEe0qPQ@zcc~b5m*|00Nane)9F<A!M6Ph
zu<i_wej=XOkM5Ouif_YT$^il=D;gXjtsXhEJfQw(a^3MVz^l(tgfEYR9)&gPHwnxr
z0-eo(Os;s|{tZz1Sz}K<<>OeFb)1Zbv96ZOfUbEBgZ=DkI>o^&?A9e2pjWe@s3J0$
z#m3{80r?{P(fy9bcW?<?UQu818b&m6skZCzLY(DxRm79vPR?oE3mEj=g`hq_vzfcu
z`Va_B;_mj%lf9>F7+T6LOp{<}yRtHJf;Qw*dbGq-CMi8RhX_CNG6U6h?|Dr^C!vvV
zoBBn@zw&{_b7b(1N_Mu1j9Jyf$r&#Vc%g3TIY<T`t0(jBk?<e&!azR_s!_idmVuys
znnz<+8qlQq*^xpk{}5!JBUGHw=58WE{S9s1VfsSVXYH57`?UIE!7*Gzyk22)I+J)d
zVLEP(49^nMMv*H7x{0T8i_u%N<LEX=#ON*u5x$Eie+j^6hy^u1x?QAL&^knd5DTMe
zfT}_qc8$^Pth$Y-rsy9@anrgiquKIa&TC^En3?Th`7D(kfW%T*7Td;*ESaUTY?e<M
z3q_ffHL<MK$V~PBoyn`+yV)LM=2IqCMIND~H@?WzAeGsx6YC|r!yz?#8fxpDRW8Y1
zC)p)et=n1ckYagi6fC|}Mabw|UKJw5Fg-~c$qGsNuIZwJb%oCQdUthsos{FYS9!{P
LZHD!}B}3pJHVnEi


From 0ea0d3681a800de4611ac0244ba4bdeea9bce321 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <tux3@users.noreply.github.com>
Date: Sat, 13 Sep 2014 14:00:37 +0200
Subject: [PATCH 023/205] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d6358283e..dd7c45fdb 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ However, it is not a fork.
 - Group chats
 - File transfers, with previewing of images
 - Audio calls
-- Video calls (alpha)
+- Video calls
 - Tox DNS
 - Translations in various languages
 

From 54ab54543465aca7948f1c3fae9519b90007d0dd Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sat, 13 Sep 2014 15:03:41 +0200
Subject: [PATCH 024/205] Embed new translations

---
 res.qrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/res.qrc b/res.qrc
index 6a121b0ad..f258db6f5 100644
--- a/res.qrc
+++ b/res.qrc
@@ -139,5 +139,7 @@
         <file>img/settings/identity.png</file>
         <file>img/settings/privacy.png</file>
         <file>img/settings/av.png</file>
+        <file>translations/pl.qm</file>
+        <file>translations/mannol.qm</file>
     </qresource>
 </RCC>

From 41261c5379975bc6577c79bfd36e4c9565fca6ef Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sat, 13 Sep 2014 15:15:35 +0200
Subject: [PATCH 025/205] Update translations

---
 translations/de.ts        | 55 ++++++++++++++++++++++---------------
 translations/fr.ts        | 55 ++++++++++++++++++++++---------------
 translations/it.ts        | 55 ++++++++++++++++++++++---------------
 translations/mannol.ts    | 55 ++++++++++++++++++++++---------------
 translations/pl.ts        | 57 ++++++++++++++++++++++++---------------
 translations/ru.ts        | 55 ++++++++++++++++++++++---------------
 widget/settingsdialog.cpp |  8 +++---
 7 files changed, 210 insertions(+), 130 deletions(-)

diff --git a/translations/de.ts b/translations/de.ts
index 42adc68f9..f8b790182 100644
--- a/translations/de.ts
+++ b/translations/de.ts
@@ -4,10 +4,23 @@
 <context>
     <name>AVPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="130"/>
+        <location filename="../widget/settingsdialog.cpp" line="132"/>
         <source>Video Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="136"/>
+        <location filename="../widget/settingsdialog.cpp" line="163"/>
+        <source>Show video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="157"/>
+        <source>Hide video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AddFriendForm</name>
@@ -227,41 +240,41 @@
 <context>
     <name>GeneralPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="30"/>
+        <location filename="../widget/settingsdialog.cpp" line="31"/>
         <source>General Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="33"/>
+        <location filename="../widget/settingsdialog.cpp" line="34"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
         <translation type="unfinished">IPv6 aktivieren (empfohlen)</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="35"/>
+        <location filename="../widget/settingsdialog.cpp" line="36"/>
         <source>Use translations</source>
         <comment>Text on a checkbox to enable translations</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="37"/>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
         <source>Make Tox portable</source>
         <comment>Text on a checkbox to make qTox a portable application</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <location filename="../widget/settingsdialog.cpp" line="39"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <comment>describes makeToxPortable checkbox</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="47"/>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
         <source>Theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <location filename="../widget/settingsdialog.cpp" line="49"/>
         <source>Smiley Pack</source>
         <translation type="unfinished"></translation>
     </message>
@@ -322,29 +335,29 @@
 <context>
     <name>IdentityPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="80"/>
+        <location filename="../widget/settingsdialog.cpp" line="82"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="81"/>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
         <source>Name</source>
         <comment>Username/nick</comment>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <location filename="../widget/settingsdialog.cpp" line="85"/>
         <source>Status</source>
         <comment>Status message</comment>
         <translation type="unfinished">Status</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="93"/>
+        <location filename="../widget/settingsdialog.cpp" line="95"/>
         <source>Tox ID</source>
         <translation type="unfinished">Tox ID</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="94"/>
+        <location filename="../widget/settingsdialog.cpp" line="96"/>
         <source>Your Tox ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -409,42 +422,42 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <location filename="../widget/settingsdialog.cpp" line="197"/>
         <source>qTox – Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="222"/>
+        <location filename="../widget/settingsdialog.cpp" line="224"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="228"/>
+        <location filename="../widget/settingsdialog.cpp" line="230"/>
         <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="234"/>
+        <location filename="../widget/settingsdialog.cpp" line="236"/>
         <source>Privacy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="240"/>
+        <location filename="../widget/settingsdialog.cpp" line="242"/>
         <source>Audio/Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="249"/>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="250"/>
+        <location filename="../widget/settingsdialog.cpp" line="252"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <location filename="../widget/settingsdialog.cpp" line="253"/>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/fr.ts b/translations/fr.ts
index 2f61287cb..53b39e179 100644
--- a/translations/fr.ts
+++ b/translations/fr.ts
@@ -4,10 +4,23 @@
 <context>
     <name>AVPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="130"/>
+        <location filename="../widget/settingsdialog.cpp" line="132"/>
         <source>Video Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="136"/>
+        <location filename="../widget/settingsdialog.cpp" line="163"/>
+        <source>Show video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="157"/>
+        <source>Hide video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AddFriendForm</name>
@@ -227,41 +240,41 @@
 <context>
     <name>GeneralPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="30"/>
+        <location filename="../widget/settingsdialog.cpp" line="31"/>
         <source>General Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="33"/>
+        <location filename="../widget/settingsdialog.cpp" line="34"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
         <translation type="unfinished">Activer IPv6 (recommandé)</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="35"/>
+        <location filename="../widget/settingsdialog.cpp" line="36"/>
         <source>Use translations</source>
         <comment>Text on a checkbox to enable translations</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="37"/>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
         <source>Make Tox portable</source>
         <comment>Text on a checkbox to make qTox a portable application</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <location filename="../widget/settingsdialog.cpp" line="39"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <comment>describes makeToxPortable checkbox</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="47"/>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
         <source>Theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <location filename="../widget/settingsdialog.cpp" line="49"/>
         <source>Smiley Pack</source>
         <translation type="unfinished"></translation>
     </message>
@@ -322,29 +335,29 @@
 <context>
     <name>IdentityPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="80"/>
+        <location filename="../widget/settingsdialog.cpp" line="82"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="81"/>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
         <source>Name</source>
         <comment>Username/nick</comment>
         <translation type="unfinished">Nom</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <location filename="../widget/settingsdialog.cpp" line="85"/>
         <source>Status</source>
         <comment>Status message</comment>
         <translation type="unfinished">Status</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="93"/>
+        <location filename="../widget/settingsdialog.cpp" line="95"/>
         <source>Tox ID</source>
         <translation type="unfinished">ID Tox</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="94"/>
+        <location filename="../widget/settingsdialog.cpp" line="96"/>
         <source>Your Tox ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -409,42 +422,42 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <location filename="../widget/settingsdialog.cpp" line="197"/>
         <source>qTox – Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="222"/>
+        <location filename="../widget/settingsdialog.cpp" line="224"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="228"/>
+        <location filename="../widget/settingsdialog.cpp" line="230"/>
         <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="234"/>
+        <location filename="../widget/settingsdialog.cpp" line="236"/>
         <source>Privacy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="240"/>
+        <location filename="../widget/settingsdialog.cpp" line="242"/>
         <source>Audio/Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="249"/>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="250"/>
+        <location filename="../widget/settingsdialog.cpp" line="252"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <location filename="../widget/settingsdialog.cpp" line="253"/>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/it.ts b/translations/it.ts
index a7c3f39c0..35b4c928d 100644
--- a/translations/it.ts
+++ b/translations/it.ts
@@ -4,10 +4,23 @@
 <context>
     <name>AVPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="130"/>
+        <location filename="../widget/settingsdialog.cpp" line="132"/>
         <source>Video Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="136"/>
+        <location filename="../widget/settingsdialog.cpp" line="163"/>
+        <source>Show video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="157"/>
+        <source>Hide video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AddFriendForm</name>
@@ -197,41 +210,41 @@
 <context>
     <name>GeneralPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="30"/>
+        <location filename="../widget/settingsdialog.cpp" line="31"/>
         <source>General Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="33"/>
+        <location filename="../widget/settingsdialog.cpp" line="34"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
         <translation type="unfinished">Abilita IPv6 (consigliato)</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="35"/>
+        <location filename="../widget/settingsdialog.cpp" line="36"/>
         <source>Use translations</source>
         <comment>Text on a checkbox to enable translations</comment>
         <translation type="unfinished">Abilita traduzioni</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="37"/>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
         <source>Make Tox portable</source>
         <comment>Text on a checkbox to make qTox a portable application</comment>
         <translation type="unfinished">Rendi qTox portabile</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <location filename="../widget/settingsdialog.cpp" line="39"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <comment>describes makeToxPortable checkbox</comment>
         <translation type="unfinished">Slava le impostazioni nella directory di lavoro corrente, invece della directory di default</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="47"/>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
         <source>Theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <location filename="../widget/settingsdialog.cpp" line="49"/>
         <source>Smiley Pack</source>
         <translation type="unfinished">Emoticons</translation>
     </message>
@@ -288,29 +301,29 @@
 <context>
     <name>IdentityPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="80"/>
+        <location filename="../widget/settingsdialog.cpp" line="82"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="81"/>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
         <source>Name</source>
         <comment>Username/nick</comment>
         <translation type="unfinished">Nome</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <location filename="../widget/settingsdialog.cpp" line="85"/>
         <source>Status</source>
         <comment>Status message</comment>
         <translation type="unfinished">Stato</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="93"/>
+        <location filename="../widget/settingsdialog.cpp" line="95"/>
         <source>Tox ID</source>
         <translation type="unfinished">Tox ID</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="94"/>
+        <location filename="../widget/settingsdialog.cpp" line="96"/>
         <source>Your Tox ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -375,42 +388,42 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <location filename="../widget/settingsdialog.cpp" line="197"/>
         <source>qTox – Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="222"/>
+        <location filename="../widget/settingsdialog.cpp" line="224"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="228"/>
+        <location filename="../widget/settingsdialog.cpp" line="230"/>
         <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="234"/>
+        <location filename="../widget/settingsdialog.cpp" line="236"/>
         <source>Privacy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="240"/>
+        <location filename="../widget/settingsdialog.cpp" line="242"/>
         <source>Audio/Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="249"/>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="250"/>
+        <location filename="../widget/settingsdialog.cpp" line="252"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <location filename="../widget/settingsdialog.cpp" line="253"/>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/mannol.ts b/translations/mannol.ts
index a1856348e..ccc08ff82 100644
--- a/translations/mannol.ts
+++ b/translations/mannol.ts
@@ -4,10 +4,23 @@
 <context>
     <name>AVPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="130"/>
+        <location filename="../widget/settingsdialog.cpp" line="132"/>
         <source>Video Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="136"/>
+        <location filename="../widget/settingsdialog.cpp" line="163"/>
+        <source>Show video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="157"/>
+        <source>Hide video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AddFriendForm</name>
@@ -197,41 +210,41 @@
 <context>
     <name>GeneralPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="30"/>
+        <location filename="../widget/settingsdialog.cpp" line="31"/>
         <source>General Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="33"/>
+        <location filename="../widget/settingsdialog.cpp" line="34"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="35"/>
+        <location filename="../widget/settingsdialog.cpp" line="36"/>
         <source>Use translations</source>
         <comment>Text on a checkbox to enable translations</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="37"/>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
         <source>Make Tox portable</source>
         <comment>Text on a checkbox to make qTox a portable application</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <location filename="../widget/settingsdialog.cpp" line="39"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <comment>describes makeToxPortable checkbox</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="47"/>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
         <source>Theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <location filename="../widget/settingsdialog.cpp" line="49"/>
         <source>Smiley Pack</source>
         <translation type="unfinished"></translation>
     </message>
@@ -288,29 +301,29 @@
 <context>
     <name>IdentityPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="80"/>
+        <location filename="../widget/settingsdialog.cpp" line="82"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="81"/>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
         <source>Name</source>
         <comment>Username/nick</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <location filename="../widget/settingsdialog.cpp" line="85"/>
         <source>Status</source>
         <comment>Status message</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="93"/>
+        <location filename="../widget/settingsdialog.cpp" line="95"/>
         <source>Tox ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="94"/>
+        <location filename="../widget/settingsdialog.cpp" line="96"/>
         <source>Your Tox ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -375,42 +388,42 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <location filename="../widget/settingsdialog.cpp" line="197"/>
         <source>qTox – Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="222"/>
+        <location filename="../widget/settingsdialog.cpp" line="224"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="228"/>
+        <location filename="../widget/settingsdialog.cpp" line="230"/>
         <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="234"/>
+        <location filename="../widget/settingsdialog.cpp" line="236"/>
         <source>Privacy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="240"/>
+        <location filename="../widget/settingsdialog.cpp" line="242"/>
         <source>Audio/Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="249"/>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="250"/>
+        <location filename="../widget/settingsdialog.cpp" line="252"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <location filename="../widget/settingsdialog.cpp" line="253"/>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/pl.ts b/translations/pl.ts
index 6aaa4e6d6..edff773c3 100644
--- a/translations/pl.ts
+++ b/translations/pl.ts
@@ -1,13 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pl_PL">
+<TS version="2.1" language="pl_PL">
 <context>
     <name>AVPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="130"/>
+        <location filename="../widget/settingsdialog.cpp" line="132"/>
         <source>Video Settings</source>
         <translation>Ustawienia wideo</translation>
     </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="136"/>
+        <location filename="../widget/settingsdialog.cpp" line="163"/>
+        <source>Show video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="157"/>
+        <source>Hide video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AddFriendForm</name>
@@ -199,41 +212,41 @@
 <context>
     <name>GeneralPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="30"/>
+        <location filename="../widget/settingsdialog.cpp" line="31"/>
         <source>General Settings</source>
         <translation>Główne ustawienia</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="33"/>
+        <location filename="../widget/settingsdialog.cpp" line="34"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
         <translation>Użyj IPv6 (rekomendowane)</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="35"/>
+        <location filename="../widget/settingsdialog.cpp" line="36"/>
         <source>Use translations</source>
         <comment>Text on a checkbox to enable translations</comment>
         <translation>Użyj tłumaczenia</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="37"/>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
         <source>Make Tox portable</source>
         <comment>Text on a checkbox to make qTox a portable application</comment>
         <translation>Zrób Tox przenośnym</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <location filename="../widget/settingsdialog.cpp" line="39"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <comment>describes makeToxPortable checkbox</comment>
         <translation>Zamiast domyślnego katalogu użyj obecnego do zapisania ustawień</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="47"/>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
         <source>Theme</source>
         <translation>Motyw</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <location filename="../widget/settingsdialog.cpp" line="49"/>
         <source>Smiley Pack</source>
         <translatorcomment>needs better translation</translatorcomment>
         <translation>Paczka uśmiechów</translation>
@@ -291,29 +304,29 @@
 <context>
     <name>IdentityPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="80"/>
+        <location filename="../widget/settingsdialog.cpp" line="82"/>
         <source>Public Information</source>
         <translation>Informacja publiczna</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="81"/>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
         <source>Name</source>
         <comment>Username/nick</comment>
         <translation>Nick</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <location filename="../widget/settingsdialog.cpp" line="85"/>
         <source>Status</source>
         <comment>Status message</comment>
         <translation>Status</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="93"/>
+        <location filename="../widget/settingsdialog.cpp" line="95"/>
         <source>Tox ID</source>
         <translation>Tox ID</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="94"/>
+        <location filename="../widget/settingsdialog.cpp" line="96"/>
         <source>Your Tox ID</source>
         <translation>Twój Tox ID</translation>
     </message>
@@ -379,42 +392,42 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <location filename="../widget/settingsdialog.cpp" line="197"/>
         <source>qTox – Settings</source>
         <translation>qTox – Ustawienia</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="222"/>
+        <location filename="../widget/settingsdialog.cpp" line="224"/>
         <source>General</source>
         <translation>Główne</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="228"/>
+        <location filename="../widget/settingsdialog.cpp" line="230"/>
         <source>Identity</source>
         <translation>Tożsamość</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="234"/>
+        <location filename="../widget/settingsdialog.cpp" line="236"/>
         <source>Privacy</source>
         <translation>Prywatność</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="240"/>
+        <location filename="../widget/settingsdialog.cpp" line="242"/>
         <source>Audio/Video</source>
         <translation>Audio/Wideo</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="249"/>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="250"/>
+        <location filename="../widget/settingsdialog.cpp" line="252"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <location filename="../widget/settingsdialog.cpp" line="253"/>
         <source>Apply</source>
         <translation>Zastosuj</translation>
     </message>
diff --git a/translations/ru.ts b/translations/ru.ts
index 87c52b238..56c4aaebf 100644
--- a/translations/ru.ts
+++ b/translations/ru.ts
@@ -4,10 +4,23 @@
 <context>
     <name>AVPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="130"/>
+        <location filename="../widget/settingsdialog.cpp" line="132"/>
         <source>Video Settings</source>
         <translation>Настройки видео</translation>
     </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="136"/>
+        <location filename="../widget/settingsdialog.cpp" line="163"/>
+        <source>Show video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="157"/>
+        <source>Hide video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AddFriendForm</name>
@@ -246,41 +259,41 @@
 <context>
     <name>GeneralPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="30"/>
+        <location filename="../widget/settingsdialog.cpp" line="31"/>
         <source>General Settings</source>
         <translation>Основные настройки</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="33"/>
+        <location filename="../widget/settingsdialog.cpp" line="34"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
         <translation>Включить IPv6 (рекомендуется)</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="35"/>
+        <location filename="../widget/settingsdialog.cpp" line="36"/>
         <source>Use translations</source>
         <comment>Text on a checkbox to enable translations</comment>
         <translation>Русскоязычный интерфейс</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="37"/>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
         <source>Make Tox portable</source>
         <comment>Text on a checkbox to make qTox a portable application</comment>
         <translation>Портативный режим</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <location filename="../widget/settingsdialog.cpp" line="39"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <comment>describes makeToxPortable checkbox</comment>
         <translation>Сохранять настройки в рабочую директорию вместо страндартной директории настроек</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="47"/>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
         <source>Theme</source>
         <translation>Тема</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <location filename="../widget/settingsdialog.cpp" line="49"/>
         <source>Smiley Pack</source>
         <translation>Набор смайликов</translation>
     </message>
@@ -341,29 +354,29 @@
 <context>
     <name>IdentityPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="80"/>
+        <location filename="../widget/settingsdialog.cpp" line="82"/>
         <source>Public Information</source>
         <translation>Публичные данные</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="81"/>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
         <source>Name</source>
         <comment>Username/nick</comment>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <location filename="../widget/settingsdialog.cpp" line="85"/>
         <source>Status</source>
         <comment>Status message</comment>
         <translation>Статус</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="93"/>
+        <location filename="../widget/settingsdialog.cpp" line="95"/>
         <source>Tox ID</source>
         <translation>Tox ID</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="94"/>
+        <location filename="../widget/settingsdialog.cpp" line="96"/>
         <source>Your Tox ID</source>
         <translation>Ваш Tox ID</translation>
     </message>
@@ -432,42 +445,42 @@
         <translation type="vanished">Диалог настроек</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="195"/>
+        <location filename="../widget/settingsdialog.cpp" line="197"/>
         <source>qTox – Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="222"/>
+        <location filename="../widget/settingsdialog.cpp" line="224"/>
         <source>General</source>
         <translation>Основное</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="228"/>
+        <location filename="../widget/settingsdialog.cpp" line="230"/>
         <source>Identity</source>
         <translation>Личные данные</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="234"/>
+        <location filename="../widget/settingsdialog.cpp" line="236"/>
         <source>Privacy</source>
         <translation>Безопасность</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="240"/>
+        <location filename="../widget/settingsdialog.cpp" line="242"/>
         <source>Audio/Video</source>
         <translation>Аудио и видео</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="249"/>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
         <source>Ok</source>
         <translation>ОК</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="250"/>
+        <location filename="../widget/settingsdialog.cpp" line="252"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <location filename="../widget/settingsdialog.cpp" line="253"/>
         <source>Apply</source>
         <translation>Применить</translation>
     </message>
diff --git a/widget/settingsdialog.cpp b/widget/settingsdialog.cpp
index 05ce3c165..d81973286 100644
--- a/widget/settingsdialog.cpp
+++ b/widget/settingsdialog.cpp
@@ -23,6 +23,7 @@
 //========================================
 class GeneralPage : public QWidget
 {
+    Q_OBJECT
 public:
     GeneralPage(QWidget *parent = 0) :
         QWidget(parent)
@@ -72,6 +73,7 @@ public:
 
 class IdentityPage : public QWidget
 {
+    Q_OBJECT
 public:
     IdentityPage(QWidget* parent = 0) :
         QWidget(parent)
@@ -131,7 +133,7 @@ public:
 
         camView = new SelfCamView(parent->getWidget()->getCamera());
         camView->hide(); // hide by default
-        testVideo = new QPushButton("Show video preview");
+        testVideo = new QPushButton(tr("Show video preview","On a button"));
         connect(testVideo, SIGNAL(clicked()), this, SLOT(onTestVideoPressed()));
 
         QVBoxLayout *vLayout = new QVBoxLayout();
@@ -152,13 +154,13 @@ public:
 
     void showTestVideo()
     {
-        testVideo->setText("Hide video preview");
+        testVideo->setText(tr("Hide video preview","On a button"));
         camView->show();
     }
 
     void closeTestVideo()
     {
-        testVideo->setText("Show video preview");
+        testVideo->setText(tr("Show video preview","On a button"));
         camView->close();
     }
 

From 1225a513c7cca7ff8aee5a52883331de76b55e34 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sat, 13 Sep 2014 15:24:53 +0200
Subject: [PATCH 026/205] Update French translation

---
 translations/fr.qm | Bin 3969 -> 7085 bytes
 translations/fr.ts |  90 ++++++++++++++++++++++-----------------------
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/translations/fr.qm b/translations/fr.qm
index 98e9e1aaa0abc0d733d08a78db17bff6152751da..278415266881501d4faa330eddeeb5386c01c6cc 100644
GIT binary patch
literal 7085
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
LpF|GU*46wUWTN^K

delta 450
zcmZ2$-Y8#hvm-^~)cZM8&nn97PguD3t`h?TV*mq7Zzlr-Z#4tUoRvU&3j?c%DFXv{
zFN4WH76t}3F$Txd$qWq4uNl0|rZO<_$T53L{{o7qF`t^=%D}*Io~3e52?GP`4VD=l
zQy3UH&p>FdEiAJvfqbq%EUWt&f%^Pd*4Il%GB9vFVA-Scg@J)-2Fv%^kAVjGva0Id
z11c<s(7dj!_8BTbhq1Ay8n^--bf2|{dkN6O>#VD~4+9;xgLT`ID?kSsL1^yRY}rx=
zfZ~p9`8+`NtU7G@E}=lWf}K$U<Nz^tF4gHkhk3KtpL*U5bjeN*#>N()1#dVz=7a$0
zcFrRnyBHYQ7joX`1v-rVJ=c$ECJYQLc|7hKK!bSdc~dqN03B|_dqU|m(7_D6r)C4i
z*@gLJW~2bcXYd7euLn9Pjc-HR7NGjynG6hk0?a^#3Ji`6Sq%9Mr3@tusSHJv9mEti
zcQ7+EZ~n*ji*fQsP9H{{$$Nw(CpUAsZC=Y$%)EKGP%hKtcG0xSSHuh^hlm?a=9j3M
MyiLMq@<XXJ0Gc{_VgLXD

diff --git a/translations/fr.ts b/translations/fr.ts
index 53b39e179..2057d56da 100644
--- a/translations/fr.ts
+++ b/translations/fr.ts
@@ -6,20 +6,20 @@
     <message>
         <location filename="../widget/settingsdialog.cpp" line="132"/>
         <source>Video Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Options vidéo</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="136"/>
         <location filename="../widget/settingsdialog.cpp" line="163"/>
         <source>Show video preview</source>
         <comment>On a button</comment>
-        <translation type="unfinished"></translation>
+        <translation>Montrer l&apos;aperçu vidéo</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="157"/>
         <source>Hide video preview</source>
         <comment>On a button</comment>
-        <translation type="unfinished"></translation>
+        <translation>Cacher l&apos;aperçu vidéo</translation>
     </message>
 </context>
 <context>
@@ -62,13 +62,13 @@
         <location filename="../widget/form/addfriendform.cpp" line="99"/>
         <source>You can&apos;t add yourself as a friend!</source>
         <comment>When trying to add your own Tox ID as friend</comment>
-        <translation type="unfinished"></translation>
+        <translation>Vous ne pouvez pas vous ajouter vous même en temps qu&apos;ami!</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="116"/>
         <source>This address does not exist</source>
         <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
-        <translation type="unfinished"></translation>
+        <translation>Cette addresse n&apos;existe pas</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="120"/>
@@ -138,19 +138,19 @@
         <location filename="../filetransferinstance.cpp" line="191"/>
         <source>Save a file</source>
         <comment>Title of the file saving dialog</comment>
-        <translation type="unfinished">Sauvegarder un fichier</translation>
+        <translation>Sauvegarder un fichier</translation>
     </message>
     <message>
         <location filename="../filetransferinstance.cpp" line="202"/>
         <source>Location not writable</source>
         <comment>Title of permissions popup</comment>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d&apos;écrire ici</translation>
     </message>
     <message>
         <location filename="../filetransferinstance.cpp" line="202"/>
         <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
         <comment>text of permissions popup</comment>
-        <translation type="unfinished"></translation>
+        <translation>Vous n&apos;avez pas la permission d&apos;écrire ici. Choisissez un audre endroit, ou annulez.</translation>
     </message>
 </context>
 <context>
@@ -167,17 +167,17 @@
         <location filename="../widget/form/filesform.cpp" line="30"/>
         <source>Transfered Files</source>
         <comment>&quot;Headline&quot; of the window</comment>
-        <translation type="unfinished"></translation>
+        <translation>Transfers</translation>
     </message>
     <message>
         <location filename="../widget/form/filesform.cpp" line="38"/>
         <source>Downloads</source>
-        <translation type="unfinished"></translation>
+        <translation>Téléchargements</translation>
     </message>
     <message>
         <location filename="../widget/form/filesform.cpp" line="39"/>
         <source>Uploads</source>
-        <translation type="unfinished"></translation>
+        <translation>Envois</translation>
     </message>
 </context>
 <context>
@@ -242,41 +242,41 @@
     <message>
         <location filename="../widget/settingsdialog.cpp" line="31"/>
         <source>General Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Options Générales</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="34"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
-        <translation type="unfinished">Activer IPv6 (recommandé)</translation>
+        <translation>Activer IPv6 (recommandé)</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="36"/>
         <source>Use translations</source>
         <comment>Text on a checkbox to enable translations</comment>
-        <translation type="unfinished"></translation>
+        <translation>Utiliser les traductions</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="38"/>
         <source>Make Tox portable</source>
         <comment>Text on a checkbox to make qTox a portable application</comment>
-        <translation type="unfinished"></translation>
+        <translation>Rendre Tox portable</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="39"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <comment>describes makeToxPortable checkbox</comment>
-        <translation type="unfinished"></translation>
+        <translation>Sauvegarde les options dans le dossier courant au lieu du dossier de configuration habituel</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="48"/>
         <source>Theme</source>
-        <translation type="unfinished"></translation>
+        <translation>Thème</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="49"/>
         <source>Smiley Pack</source>
-        <translation type="unfinished"></translation>
+        <translation>Pack de smileys</translation>
     </message>
 </context>
 <context>
@@ -285,7 +285,7 @@
         <location filename="../widget/form/genericchatform.cpp" line="142"/>
         <location filename="../widget/form/genericchatform.cpp" line="148"/>
         <source>Save chat log</source>
-        <translation type="unfinished">Sauvegarder l&apos;historique de conversation</translation>
+        <translation>Sauvegarder l&apos;historique de conversation</translation>
     </message>
 </context>
 <context>
@@ -337,29 +337,29 @@
     <message>
         <location filename="../widget/settingsdialog.cpp" line="82"/>
         <source>Public Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informations Publiques</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="83"/>
         <source>Name</source>
         <comment>Username/nick</comment>
-        <translation type="unfinished">Nom</translation>
+        <translation>Nom</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="85"/>
         <source>Status</source>
         <comment>Status message</comment>
-        <translation type="unfinished">Status</translation>
+        <translation>Status</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="95"/>
         <source>Tox ID</source>
-        <translation type="unfinished">ID Tox</translation>
+        <translation>ID Tox</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="96"/>
         <source>Your Tox ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Votre ID Tox</translation>
     </message>
 </context>
 <context>
@@ -367,47 +367,47 @@
     <message>
         <location filename="../mainwindow.ui" line="20"/>
         <source>qTox</source>
-        <translation type="unfinished"></translation>
+        <translation>qTox</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="1918"/>
         <source>Your name</source>
-        <translation type="unfinished">Votre nom</translation>
+        <translation>Votre nom</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2000"/>
         <source>Your status</source>
-        <translation type="unfinished">Votre status</translation>
+        <translation>Votre status</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2566"/>
         <source>Add friends</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajouter des amis</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2592"/>
         <source>Create a group chat</source>
-        <translation type="unfinished"></translation>
+        <translation>Creer un groupe</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2624"/>
         <source>View completed file transfers</source>
-        <translation type="unfinished"></translation>
+        <translation>Voir les transfers de fichiers terminés</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="2656"/>
         <source>Change your settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Changer les options</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="3238"/>
         <source>Close</source>
-        <translation type="unfinished">Fermer</translation>
+        <translation>Fermer</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="3241"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished">Ctrl+Q</translation>
+        <translation>Ctrl+Q</translation>
     </message>
 </context>
 <context>
@@ -424,42 +424,42 @@
     <message>
         <location filename="../widget/settingsdialog.cpp" line="197"/>
         <source>qTox – Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>qTox — Options</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="224"/>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>General</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="230"/>
         <source>Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Identité</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="236"/>
         <source>Privacy</source>
-        <translation type="unfinished"></translation>
+        <translation>Vie Privée</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="242"/>
         <source>Audio/Video</source>
-        <translation type="unfinished"></translation>
+        <translation>Audio/Vidéo</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="251"/>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="252"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Annuler</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="253"/>
         <source>Apply</source>
-        <translation type="unfinished"></translation>
+        <translation>Appliquer</translation>
     </message>
 </context>
 <context>
@@ -516,25 +516,25 @@
         <location filename="../widget/widget.cpp" line="133"/>
         <source>Online</source>
         <comment>Button to set your status to &apos;Online&apos;</comment>
-        <translation type="unfinished">Connecté</translation>
+        <translation>Connecté</translation>
     </message>
     <message>
         <location filename="../widget/widget.cpp" line="135"/>
         <source>Away</source>
         <comment>Button to set your status to &apos;Away&apos;</comment>
-        <translation type="unfinished">Indisponnible</translation>
+        <translation>Indisponnible</translation>
     </message>
     <message>
         <location filename="../widget/widget.cpp" line="137"/>
         <source>Busy</source>
         <comment>Button to set your status to &apos;Busy&apos;</comment>
-        <translation type="unfinished">Occupé</translation>
+        <translation>Occupé</translation>
     </message>
     <message>
         <location filename="../widget/widget.cpp" line="605"/>
         <source>&lt;Unknown&gt;</source>
         <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
-        <translation type="unfinished">&lt;Inconnu&gt;</translation>
+        <translation>&lt;Inconnu&gt;</translation>
     </message>
 </context>
 </TS>

From aaecc9ba7c46c5ca9ed21421a5825c4c2405fede Mon Sep 17 00:00:00 2001
From: Zetok Zalbavar <zexavexxe@gmail.com>
Date: Sat, 13 Sep 2014 16:38:50 +0100
Subject: [PATCH 027/205] Update Polish translation

---
 translations/pl.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/translations/pl.ts b/translations/pl.ts
index edff773c3..481762e0e 100644
--- a/translations/pl.ts
+++ b/translations/pl.ts
@@ -13,13 +13,13 @@
         <location filename="../widget/settingsdialog.cpp" line="163"/>
         <source>Show video preview</source>
         <comment>On a button</comment>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż podgląd wideo</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="157"/>
         <source>Hide video preview</source>
         <comment>On a button</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ukryj podgląd wideo</translation>
     </message>
 </context>
 <context>

From 741824c019604a919f958bf9443055b7c099c085 Mon Sep 17 00:00:00 2001
From: bill <bill@mint>
Date: Sun, 14 Sep 2014 13:42:27 -0500
Subject: [PATCH 028/205] move buttons to bottom

---
 widget/form/settingswidget.cpp | 66 +++++++++++++++++++---------------
 widget/form/settingswidget.h   | 20 +++++------
 2 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/widget/form/settingswidget.cpp b/widget/form/settingswidget.cpp
index 6e2778de8..fcbd2a981 100644
--- a/widget/form/settingswidget.cpp
+++ b/widget/form/settingswidget.cpp
@@ -19,9 +19,35 @@
 #include "ui_mainwindow.h"
 
 SettingsWidget::SettingsWidget()
-    : QObject()
+    : QWidget()
 {
+    _main = new QWidget();
     main = new QWidget();
+    head = new QWidget();
+    foot = new QWidget();
+    prepButtons();    
+    foot->setLayout(iconsLayout);
+    _mainLayout = new QVBoxLayout(_main);
+    _mainLayout->addWidget(main);
+    _mainLayout->addWidget(foot);
+    // something something foot size
+    _main->setLayout(_mainLayout);
+}
+
+SettingsWidget::~SettingsWidget()
+{
+}
+
+void SettingsWidget::show(Ui::MainWindow& ui)
+{
+    ui.mainContent->layout()->addWidget(_main);
+    ui.mainHead->layout()->addWidget(head);
+    _main->show();
+    head->show();
+}
+
+void SettingsWidget::prepButtons()
+{
     // this crap is copied from ui_mainwindow.h... there's no easy way around
     // just straight up copying it like this... oh well
     // the layout/icons obviously need to be improved, but it's a working model,
@@ -29,11 +55,9 @@ SettingsWidget::SettingsWidget()
     QSizePolicy sizePolicy3(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
     sizePolicy3.setHorizontalStretch(0);
     sizePolicy3.setVerticalStretch(0);
-    head = new QWidget();
-    head->setObjectName(QStringLiteral("head"));
-    head->setEnabled(true);
-    sizePolicy3.setHeightForWidth(head->sizePolicy().hasHeightForWidth());
-    head->setSizePolicy(sizePolicy3);
+    foot->setObjectName(QStringLiteral("foot"));
+    foot->setEnabled(true);
+    foot->setSizePolicy(sizePolicy3);
     QPalette palette5;
     QBrush brush(QColor(255, 255, 255, 255));
     brush.setStyle(Qt::SolidPattern);
@@ -96,14 +120,15 @@ SettingsWidget::SettingsWidget()
     palette5.setBrush(QPalette::Disabled, QPalette::AlternateBase, brush1);
     palette5.setBrush(QPalette::Disabled, QPalette::ToolTipBase, brush7);
     palette5.setBrush(QPalette::Disabled, QPalette::ToolTipText, brush6);
-    head->setPalette(palette5);
-    head->setAutoFillBackground(true);
-    iconsLayout = new QHBoxLayout(head);
+    foot->setPalette(palette5);
+    foot->setAutoFillBackground(true);
+    
+    iconsLayout = new QHBoxLayout(foot);
     iconsLayout->setSpacing(0);
     iconsLayout->setObjectName(QStringLiteral("iconsLayout"));
     iconsLayout->setContentsMargins(0, 0, 0, 0);
 
-    generalButton = new QPushButton(head);
+    generalButton = new QPushButton(foot);
     generalButton->setObjectName(QStringLiteral("generalButton"));
     generalButton->setMinimumSize(QSize(55, 35));
     generalButton->setMaximumSize(QSize(55, 35));
@@ -114,7 +139,7 @@ SettingsWidget::SettingsWidget()
     generalButton->setFlat(true);
     iconsLayout->addWidget(generalButton);
     
-    identityButton = new QPushButton(head);
+    identityButton = new QPushButton(foot);
     identityButton->setObjectName(QStringLiteral("identityButton"));
     identityButton->setMinimumSize(QSize(55, 35));
     identityButton->setMaximumSize(QSize(55, 35));
@@ -125,7 +150,7 @@ SettingsWidget::SettingsWidget()
     identityButton->setFlat(true);
     iconsLayout->addWidget(identityButton);
     
-    privacyButton = new QPushButton(head);
+    privacyButton = new QPushButton(foot);
     privacyButton->setObjectName(QStringLiteral("privacyButton"));
     privacyButton->setMinimumSize(QSize(55, 35));
     privacyButton->setMaximumSize(QSize(55, 35));
@@ -136,7 +161,7 @@ SettingsWidget::SettingsWidget()
     privacyButton->setFlat(true);
     iconsLayout->addWidget(privacyButton);
     
-    avButton = new QPushButton(head);
+    avButton = new QPushButton(foot);
     avButton->setObjectName(QStringLiteral("avButton"));
     avButton->setMinimumSize(QSize(55, 35));
     avButton->setMaximumSize(QSize(55, 35));
@@ -146,19 +171,4 @@ SettingsWidget::SettingsWidget()
     avButton->setIcon(icon4);
     avButton->setFlat(true);
     iconsLayout->addWidget(avButton);
-    
-    head->setLayout(iconsLayout);
-
-}
-
-SettingsWidget::~SettingsWidget()
-{
-}
-
-void SettingsWidget::show(Ui::MainWindow& ui)
-{
-    ui.mainContent->layout()->addWidget(main);
-    ui.mainHead->layout()->addWidget(head);
-    main->show();
-    head->show();
 }
diff --git a/widget/form/settingswidget.h b/widget/form/settingswidget.h
index a1cee909f..c901ce906 100644
--- a/widget/form/settingswidget.h
+++ b/widget/form/settingswidget.h
@@ -17,21 +17,15 @@
 #ifndef SETTINGSWIDGET_H
 #define SETTINGSWIDGET_H
 
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QObject>
-#include <QCheckBox>
+#include <QHBoxLayout>
 #include <QPushButton>
-#include <QTextEdit>
-#include <QComboBox>
-
+#include <QObject>
 #include "widget/croppinglabel.h"
 
 namespace Ui {class MainWindow;}
 class QString;
 
-class SettingsWidget : public QObject
+class SettingsWidget : public QWidget
 {
     Q_OBJECT
 public:
@@ -46,7 +40,9 @@ public slots:
 private slots:
 
 private:
-    QWidget *main, *head;
+    QWidget *_main, *main, *head, *foot;
+    // _main consists of main+foot
+    QVBoxLayout *_mainLayout;
     // the code pertaining to the icons is mostly copied from ui_mainwindow.h
     QHBoxLayout *iconsLayout;
     QPushButton *generalButton;
@@ -56,6 +52,10 @@ private:
     
     // now the actual pages and stuff
     // ...
+
+
+
+    void prepButtons(); // just so I can move the crap to the bottom of the file
 public:
 };
 

From aa801f9615ecb052129c512861c42c69de4f6a86 Mon Sep 17 00:00:00 2001
From: bill <bill@mint>
Date: Mon, 15 Sep 2014 05:45:59 -0500
Subject: [PATCH 029/205] new settings infrastructure done, though there's a
 double free or something in ~Widget()

---
 qtox.pro                               |  9 ++++
 widget/form/settings/avform.cpp        | 26 ++++++++++
 widget/form/settings/avform.h          | 33 ++++++++++++
 widget/form/settings/generalform.cpp   | 46 ++++++++++++++++
 widget/form/settings/generalform.h     | 41 +++++++++++++++
 widget/form/settings/genericsettings.h | 46 ++++++++++++++++
 widget/form/settings/identityform.cpp  | 38 ++++++++++++++
 widget/form/settings/identityform.h    | 34 ++++++++++++
 widget/form/settings/privacyform.cpp   | 27 ++++++++++
 widget/form/settings/privacyform.h     | 33 ++++++++++++
 widget/form/settingswidget.cpp         | 72 +++++++++++++++++++++++---
 widget/form/settingswidget.h           | 41 +++++++++------
 12 files changed, 423 insertions(+), 23 deletions(-)
 create mode 100644 widget/form/settings/avform.cpp
 create mode 100644 widget/form/settings/avform.h
 create mode 100644 widget/form/settings/generalform.cpp
 create mode 100644 widget/form/settings/generalform.h
 create mode 100644 widget/form/settings/genericsettings.h
 create mode 100644 widget/form/settings/identityform.cpp
 create mode 100644 widget/form/settings/identityform.h
 create mode 100644 widget/form/settings/privacyform.cpp
 create mode 100644 widget/form/settings/privacyform.h

diff --git a/qtox.pro b/qtox.pro
index ce7762e79..7399e260f 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -80,6 +80,11 @@ HEADERS  += widget/form/addfriendform.h \
     widget/form/chatform.h \
     widget/form/groupchatform.h \
     widget/form/settingswidget.h \
+    widget/form/settings/genericsettings.h \
+    widget/form/settings/generalform.h \
+    widget/form/settings/identityform.h \
+    widget/form/settings/privacyform.h \
+    widget/form/settings/avform.h \
     widget/form/filesform.h \
     widget/tool/chattextedit.h \
     widget/tool/friendrequestdialog.h \
@@ -117,6 +122,10 @@ SOURCES += \
     widget/form/chatform.cpp \
     widget/form/groupchatform.cpp \
     widget/form/settingswidget.cpp \
+    widget/form/settings/generalform.cpp \
+    widget/form/settings/identityform.cpp \
+    widget/form/settings/privacyform.cpp \
+    widget/form/settings/avform.cpp \
     widget/form/filesform.cpp \
     widget/tool/chattextedit.cpp \
     widget/tool/friendrequestdialog.cpp \
diff --git a/widget/form/settings/avform.cpp b/widget/form/settings/avform.cpp
new file mode 100644
index 000000000..347a1cfbb
--- /dev/null
+++ b/widget/form/settings/avform.cpp
@@ -0,0 +1,26 @@
+/*
+    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 "avform.h"
+
+AVForm::AVForm()
+{
+    prep();
+}
+
+AVForm::~AVForm()
+{
+}
diff --git a/widget/form/settings/avform.h b/widget/form/settings/avform.h
new file mode 100644
index 000000000..e214e133e
--- /dev/null
+++ b/widget/form/settings/avform.h
@@ -0,0 +1,33 @@
+/*
+    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 AVFORM_H
+#define AVFORM_H
+
+#include "genericsettings.h"
+
+class AVForm : public GenericForm
+{
+    Q_OBJECT
+public:
+    AVForm();
+    ~AVForm();
+
+private:
+    
+};
+
+#endif
diff --git a/widget/form/settings/generalform.cpp b/widget/form/settings/generalform.cpp
new file mode 100644
index 000000000..050d4f7eb
--- /dev/null
+++ b/widget/form/settings/generalform.cpp
@@ -0,0 +1,46 @@
+/*
+    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 "generalform.h"
+#include "widget/form/settingswidget.h"
+
+GeneralForm::GeneralForm()
+{
+    prep();
+    group = new QGroupBox(tr("General Settings"));
+    enableIPv6 = new QCheckBox();
+    enableIPv6->setText(tr("Enable IPv6 (recommended)","Text on a checkbox to enable IPv6"));
+    useTranslations = new QCheckBox();
+    useTranslations->setText(tr("Use translations","Text on a checkbox to enable translations"));
+    makeToxPortable = new QCheckBox();
+    makeToxPortable->setText(tr("Make Tox portable","Text on a checkbox to make qTox a portable application"));
+    makeToxPortable->setToolTip(tr("Save settings to the working directory instead of the usual conf dir","describes makeToxPortable checkbox"));
+
+    QVBoxLayout *vLayout = new QVBoxLayout();
+    vLayout->addWidget(enableIPv6);
+    vLayout->addWidget(useTranslations);
+    vLayout->addWidget(makeToxPortable);
+    group->setLayout(vLayout);
+    
+    label.setText(tr("General Settings"));
+    
+    headLayout.addWidget(&label);
+    layout.addWidget(group);
+}
+
+GeneralForm::~GeneralForm()
+{
+}
diff --git a/widget/form/settings/generalform.h b/widget/form/settings/generalform.h
new file mode 100644
index 000000000..c484a436d
--- /dev/null
+++ b/widget/form/settings/generalform.h
@@ -0,0 +1,41 @@
+/*
+    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 GENERALFORM_H
+#define GENERALFORM_H
+
+#include "genericsettings.h"
+#include <QGroupBox>
+#include <QCheckBox>
+#include <QLabel>
+
+
+class GeneralForm : public GenericForm
+{
+    Q_OBJECT
+public:
+    GeneralForm();
+    ~GeneralForm();
+
+private:
+    QGroupBox *group;
+    QCheckBox* enableIPv6;
+    QCheckBox* useTranslations;
+    QCheckBox* makeToxPortable;
+    QLabel label;
+};
+
+#endif
diff --git a/widget/form/settings/genericsettings.h b/widget/form/settings/genericsettings.h
new file mode 100644
index 000000000..9353d21df
--- /dev/null
+++ b/widget/form/settings/genericsettings.h
@@ -0,0 +1,46 @@
+/*
+    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 GENERICFORM_H
+#define GENERICFORM_H
+
+#include <QObject>
+#include <QVBoxLayout>
+#include "widget/form/settingswidget.h"
+
+class GenericForm : public QObject
+{
+    Q_OBJECT
+public:
+    virtual void show(SettingsWidget& sw)
+    {
+        sw.body->layout()->addWidget(&body);
+        body.show();
+        sw.head->layout()->addWidget(&head);
+        head.show();
+    }
+
+protected:
+    QVBoxLayout layout, headLayout;
+    QWidget head, body;
+    void prep() // call in subclass constructor
+    {
+        head.setLayout(&headLayout);
+        body.setLayout(&layout);
+    }
+};
+
+#endif
diff --git a/widget/form/settings/identityform.cpp b/widget/form/settings/identityform.cpp
new file mode 100644
index 000000000..dbd5574c5
--- /dev/null
+++ b/widget/form/settings/identityform.cpp
@@ -0,0 +1,38 @@
+/*
+    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 "identityform.h"
+#include "widget/form/settingswidget.h"
+#include <QLabel>
+#include <QLineEdit>
+
+IdentityForm::IdentityForm()
+{
+    prep();
+    toxGroup = new QGroupBox(tr("Tox ID"));
+    QLabel* toxIdLabel = new QLabel(tr("Your Tox ID"));
+    QLineEdit* toxID = new QLineEdit();
+    toxID->setReadOnly(true);
+    QVBoxLayout* toxLayout = new QVBoxLayout();
+    toxLayout->addWidget(toxIdLabel);
+    toxLayout->addWidget(toxID);
+    toxGroup->setLayout(toxLayout);
+    layout.addWidget(toxGroup);
+}
+
+IdentityForm::~IdentityForm()
+{
+}
diff --git a/widget/form/settings/identityform.h b/widget/form/settings/identityform.h
new file mode 100644
index 000000000..dc616d75e
--- /dev/null
+++ b/widget/form/settings/identityform.h
@@ -0,0 +1,34 @@
+/*
+    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 IDENTITYFORM_H
+#define IDENTITYFORM_H
+
+#include "genericsettings.h"
+#include <QGroupBox>
+
+class IdentityForm : public GenericForm
+{
+    Q_OBJECT
+public:
+    IdentityForm();
+    ~IdentityForm();
+
+private:
+    QGroupBox* toxGroup;
+};
+
+#endif
diff --git a/widget/form/settings/privacyform.cpp b/widget/form/settings/privacyform.cpp
new file mode 100644
index 000000000..856f64954
--- /dev/null
+++ b/widget/form/settings/privacyform.cpp
@@ -0,0 +1,27 @@
+/*
+    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 "privacyform.h"
+#include "widget/form/settingswidget.h"
+
+PrivacyForm::PrivacyForm()
+{
+    prep();
+}
+
+PrivacyForm::~PrivacyForm()
+{
+}
diff --git a/widget/form/settings/privacyform.h b/widget/form/settings/privacyform.h
new file mode 100644
index 000000000..ae1e61956
--- /dev/null
+++ b/widget/form/settings/privacyform.h
@@ -0,0 +1,33 @@
+/*
+    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 PRIVACYFORM_H
+#define PRIVACYFORM_H
+
+#include "genericsettings.h"
+
+class PrivacyForm : public GenericForm
+{
+    Q_OBJECT
+public:
+    PrivacyForm();
+    ~PrivacyForm();
+
+private:
+    
+};
+
+#endif
diff --git a/widget/form/settingswidget.cpp b/widget/form/settingswidget.cpp
index fcbd2a981..3a13c1cdb 100644
--- a/widget/form/settingswidget.cpp
+++ b/widget/form/settingswidget.cpp
@@ -17,21 +17,41 @@
 #include "settingswidget.h"
 #include "widget/widget.h"
 #include "ui_mainwindow.h"
+#include "widget/form/settings/generalform.h"
+#include "widget/form/settings/identityform.h"
+#include "widget/form/settings/privacyform.h"
+#include "widget/form/settings/avform.h"
 
 SettingsWidget::SettingsWidget()
     : QWidget()
 {
-    _main = new QWidget();
+    generalForm  = new GeneralForm();
+    identityForm = new IdentityForm();
+    privacyForm  = new PrivacyForm();
+    avForm       = new AVForm();
+
     main = new QWidget();
+    body = new QWidget();
     head = new QWidget();
     foot = new QWidget();
+    
+    head->setLayout(new QVBoxLayout());
+    body->setLayout(new QVBoxLayout());
+    
     prepButtons();    
     foot->setLayout(iconsLayout);
-    _mainLayout = new QVBoxLayout(_main);
-    _mainLayout->addWidget(main);
-    _mainLayout->addWidget(foot);
+    mainLayout = new QVBoxLayout(main);
+    mainLayout->addWidget(body);
+    mainLayout->addWidget(foot);
     // something something foot size
-    _main->setLayout(_mainLayout);
+    main->setLayout(mainLayout);
+    
+    connect(generalButton,  &QPushButton::clicked, this, &SettingsWidget::onGeneralClicked);
+    connect(identityButton, &QPushButton::clicked, this, &SettingsWidget::onIdentityClicked);
+    connect(privacyButton,  &QPushButton::clicked, this, &SettingsWidget::onPrivacyClicked);
+    connect(avButton,  &QPushButton::clicked, this, &SettingsWidget::onAVClicked);
+    
+    active = generalForm;
 }
 
 SettingsWidget::~SettingsWidget()
@@ -40,12 +60,50 @@ SettingsWidget::~SettingsWidget()
 
 void SettingsWidget::show(Ui::MainWindow& ui)
 {
-    ui.mainContent->layout()->addWidget(_main);
+    active->show(*this);
+    ui.mainContent->layout()->addWidget(main);
     ui.mainHead->layout()->addWidget(head);
-    _main->show();
+    main->show();
     head->show();
 }
 
+void SettingsWidget::onGeneralClicked()
+{
+    hideSettingsForms();
+    active = generalForm;
+    generalForm->show(*this);
+}
+
+void SettingsWidget::onIdentityClicked()
+{
+    hideSettingsForms();
+    active = identityForm;
+    identityForm->show(*this);
+}
+
+void SettingsWidget::onPrivacyClicked()
+{
+    hideSettingsForms();
+    active = privacyForm;
+    privacyForm->show(*this);
+}
+
+void SettingsWidget::onAVClicked()
+{
+    hideSettingsForms();
+    active = avForm;
+    avForm->show(*this);
+}
+
+void SettingsWidget::hideSettingsForms()
+{
+    QLayoutItem *item;
+    while ((item = head->layout()->takeAt(0)) != 0)
+        item->widget()->hide();
+    while ((item = body->layout()->takeAt(0)) != 0)
+        item->widget()->hide();
+}
+
 void SettingsWidget::prepButtons()
 {
     // this crap is copied from ui_mainwindow.h... there's no easy way around
diff --git a/widget/form/settingswidget.h b/widget/form/settingswidget.h
index c901ce906..6ee45f90d 100644
--- a/widget/form/settingswidget.h
+++ b/widget/form/settingswidget.h
@@ -19,11 +19,12 @@
 
 #include <QHBoxLayout>
 #include <QPushButton>
-#include <QObject>
-#include "widget/croppinglabel.h"
-
-namespace Ui {class MainWindow;}
-class QString;
+class GenericForm;
+class GeneralForm;
+class IdentityForm;
+class PrivacyForm;
+class AVForm;
+namespace Ui {class MainWindow;};
 
 class SettingsWidget : public QWidget
 {
@@ -33,30 +34,38 @@ public:
     ~SettingsWidget();
 
     void show(Ui::MainWindow &ui);
+    
+    QWidget *head, *body; // keep the others private
 
 public slots:
     //void setFriendAddress(const QString& friendAddress);
 
 private slots:
+    void onGeneralClicked();
+    void onIdentityClicked();
+    void onPrivacyClicked();
+    void onAVClicked();
 
 private:
-    QWidget *_main, *main, *head, *foot;
-    // _main consists of main+foot
-    QVBoxLayout *_mainLayout;
+    QWidget *main, *foot;
+    // main consists of body+foot for Ui::MainWindow
+    QVBoxLayout *mainLayout;
+    
+    GenericForm* active;
+    GeneralForm* generalForm;
+    IdentityForm* identityForm;
+    PrivacyForm* privacyForm;
+    AVForm* avForm;
+    void hideSettingsForms();
+    
+    
     // the code pertaining to the icons is mostly copied from ui_mainwindow.h
     QHBoxLayout *iconsLayout;
     QPushButton *generalButton;
     QPushButton *identityButton;
     QPushButton *privacyButton;
     QPushButton *avButton;
-    
-    // now the actual pages and stuff
-    // ...
-
-
-
     void prepButtons(); // just so I can move the crap to the bottom of the file
-public:
 };
 
-#endif // SETTINGSFORM_H
+#endif // SETTINGSWIDGET_H

From d7df703b87dd8547f96e951cdb230d8b2992dec6 Mon Sep 17 00:00:00 2001
From: Ansa89 <ansalonistefano@gmail.com>
Date: Mon, 15 Sep 2014 15:17:20 +0200
Subject: [PATCH 030/205] Italian translation: update

---
 translations/it.qm | Bin 5820 -> 7125 bytes
 translations/it.ts | 103 +++++++++++----------------------------------
 2 files changed, 25 insertions(+), 78 deletions(-)

diff --git a/translations/it.qm b/translations/it.qm
index 2523c49cbbb5ce0bc93e6891af285cbe0d984d2e..b61df4ac4e148c46c9e020b5a5d38bbd1a45673e 100644
GIT binary patch
delta 1661
zcmaJ=eM}p57=GK{^(fE-+JR*w@nA5_GQ#3E7b3}4WkR<^a3FJ<s7LP#H?DW3y_Ufr
zRx^z=Xf~}l1|-XLGhzP0w2ScrGc(6Vh&q#vCB{rMmS|>Xh#B!KPJQk=I-J8??%v<m
z`#kUSy!V@^nc0}E|3LCh&y5a#QC@cP>BFB~dVt8@M8rNpbk~o>yz&x}?+P)aV??Ee
z#5Qdp@_a~KcNbAfGp+xNA<ErDb(hu=xo62APa*e3YU-`S{u$bO-yqSlVS4-;@(Qle
z$c+n_Pt&2NSR%gO&LsUOaqv%j!LA@talkHDp9kSKN6CDeh~9JrR{Q~i%Z}*-FA&*I
zIc8qFPUJen^o<%=Z)Ao76DV{uGqm@0qQcKJvFIyixDInq1@q268*qKh_==q<FwRU=
z&J#HfGQW;o0p4adSyl5bQPBWvMc+|&<JPwTRLXAZs>FdCth{y$ly72R&O1Vsw~IYC
z@EMVJ3;X_&3q;JRO!Ow$i&G%<jyb!Re+uFrr=E{IuGy(KJc{@YXY*mdNZ@j-4gf#Q
z?LYfFgnE<Q^bdRBfGfxL-1D&hYnQv{O8|WDDjvQ}<b2PyceD-b5!dOakBIWux-O0#
z1>mc$@7(j48@ZDw0&w8n+~3|<kMn%qhVzI_bAIDJATB<aAKL+?xy$nBsy{{x#@*8K
z2=Zp!r>E+Xm+W;<RlsuZ93rfxpWV|VNX&biFRQIUj|Ta&Aqm!1^Xm>hNtCma-yTV!
zhxhZ_2gX743*TCXeAhnyc<2O#^z&D%&jRO>f`eDhNDAyz9T-&7LnKp_!X%PF5sY+7
zB&|s=HaaMXaX81!apLtfDUvKC@X>`xR8A;zFK2G~+grp=*_J`{Qv#2&7;$O9)-JvG
zcEF;4Bd(%A>KSjzy(n<U9ctp+t#Vpr!%(!&*y4K9v$jb#`4~M6Rhp$Qj*)_qNS$~T
zietUgazMtafssHlE5;CY%!2rat#xyxVNb+sU|gQHW#vviE(Arb+7LuZ68iLbG$yMd
zL5vBaz=fiUtV!kR{oFC9V|7N%8Xz|URkOH7Qc2086*kJ692HezK~lPkpS1aMs11kF
zsO&+utxFEe>6wCAdteO(02V@7nP&DwoLR0Zwgoaf@PGtzx=79<cv|8esuC0eT1bzE
zMMKfG)L~Em>g7OFk!c{)G@%XO-G~8d$mZrjbW}+H?YVAG^5n<Q6S>K-s6u}vqV}0B
z;TOa-D59!&TE9vOvf?CJmDW-_q6CHdEe3yFQuJD@ze{15%vusc;~-ZTnd5v=)Pl0Q
zR9@k2_TTb^yJ`PYnLPY7uSp2?s+nq&*5$|vNU~-q#*%s&YNl;jb@t}&|EExJi$pZ6
xFPp-(M3saX{0~9tf}^XbC)=wUvtPJ4cUKklwCTHr*=JMPKk5#|sh^6^{R6Z0gVz86

delta 535
zcmX9*T}YE*7(L&<_uckw-@a{b%4q8%QS3&Fa#>JBQD}pZ)UZHS&<t%C3jNX5hxCJC
zA@ns}Z6Mi-OvJ(Z*T^tP240M5SN%bd-APmwLD3<v&hzrT=RD6j&r;(|y}A8KB2-+-
zrWV#kUL3vk{M~LqnTNP~83@K8vg5?Fkj+uRmxCkO4FpnX_$vVC59~T^0b&@jEh)hN
z5t%=WK!p#ZM<k%P+q@@^@jayO3;zbRHnli%5kN^@y7rCyt>T=SJ;mawNDo{GjK{0!
zofbE@@$K`7i6MmoaWNG>47iuYOwD(|c2E4we4<c`tgU|!c+ae2P?wFd+td+qXLk*a
z=(20$UK+S7ueftu;H|trI7i)*e3V-R)RHv+7k-;Pxn`D)PJ6FTf_!Q3-E$DI?{_F6
zF5-1NT(u(<KIAAapJxIsPNn|>2Yk^6vh74ud)535aE)ni#_y1)Y9BmY)b-i*Yq)`W
zYu(W@QH|?O>!};4)K7NMfb&w9zEU?0cwT!F`93;q^2}G48D*5nh}bD+NN|OW$cAc0
zI%!1G3I4lbY#xnsP|9fS;|cuzM(f}dPa%!A2>DLM$RB^eL9;!yU$zcZg$hY^QWhR+
imc20M%PR%5V!>ujR3@wrHCX7WnzLD71DmWJ;q*TOIgTO#

diff --git a/translations/it.ts b/translations/it.ts
index 35b4c928d..c7abbc341 100644
--- a/translations/it.ts
+++ b/translations/it.ts
@@ -6,20 +6,20 @@
     <message>
         <location filename="../widget/settingsdialog.cpp" line="132"/>
         <source>Video Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Impostazioni Webcam</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="136"/>
         <location filename="../widget/settingsdialog.cpp" line="163"/>
         <source>Show video preview</source>
         <comment>On a button</comment>
-        <translation type="unfinished"></translation>
+        <translation>Avvia prova webcam</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="157"/>
         <source>Hide video preview</source>
         <comment>On a button</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ferma prova webcam</translation>
     </message>
 </context>
 <context>
@@ -62,7 +62,7 @@
         <location filename="../widget/form/addfriendform.cpp" line="99"/>
         <source>You can&apos;t add yourself as a friend!</source>
         <comment>When trying to add your own Tox ID as friend</comment>
-        <translation type="unfinished"></translation>
+        <translation>Non puoi aggiungere te stesso come contatto!</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="116"/>
@@ -212,41 +212,41 @@
     <message>
         <location filename="../widget/settingsdialog.cpp" line="31"/>
         <source>General Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Impostazioni Generali</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="34"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
-        <translation type="unfinished">Abilita IPv6 (consigliato)</translation>
+        <translation>Abilita IPv6 (consigliato)</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="36"/>
         <source>Use translations</source>
         <comment>Text on a checkbox to enable translations</comment>
-        <translation type="unfinished">Abilita traduzioni</translation>
+        <translation>Abilita traduzioni</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="38"/>
         <source>Make Tox portable</source>
         <comment>Text on a checkbox to make qTox a portable application</comment>
-        <translation type="unfinished">Rendi qTox portabile</translation>
+        <translation>Rendi qTox portabile</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="39"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <comment>describes makeToxPortable checkbox</comment>
-        <translation type="unfinished">Slava le impostazioni nella directory di lavoro corrente, invece della directory di default</translation>
+        <translation>Slava le impostazioni nella directory di lavoro corrente, invece della directory di default</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="48"/>
         <source>Theme</source>
-        <translation type="unfinished"></translation>
+        <translation>Tema</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="49"/>
         <source>Smiley Pack</source>
-        <translation type="unfinished">Emoticons</translation>
+        <translation>Emoticons</translation>
     </message>
 </context>
 <context>
@@ -303,29 +303,29 @@
     <message>
         <location filename="../widget/settingsdialog.cpp" line="82"/>
         <source>Public Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informazioni Pubbliche</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="83"/>
         <source>Name</source>
         <comment>Username/nick</comment>
-        <translation type="unfinished">Nome</translation>
+        <translation>Nome</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="85"/>
         <source>Status</source>
         <comment>Status message</comment>
-        <translation type="unfinished">Stato</translation>
+        <translation>Stato</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="95"/>
         <source>Tox ID</source>
-        <translation type="unfinished">Tox ID</translation>
+        <translation>Tox ID</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="96"/>
         <source>Your Tox ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Il tuo Tox ID</translation>
     </message>
 </context>
 <context>
@@ -390,95 +390,42 @@
     <message>
         <location filename="../widget/settingsdialog.cpp" line="197"/>
         <source>qTox – Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>qTox - Impostazioni</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="224"/>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>Generale</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="230"/>
         <source>Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Profilo</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="236"/>
         <source>Privacy</source>
-        <translation type="unfinished"></translation>
+        <translation>Privacy</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="242"/>
         <source>Audio/Video</source>
-        <translation type="unfinished"></translation>
+        <translation>Audio/Video</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="251"/>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="252"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Annulla</translation>
     </message>
     <message>
         <location filename="../widget/settingsdialog.cpp" line="253"/>
         <source>Apply</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SettingsForm</name>
-    <message>
-        <source>User Settings</source>
-        <comment>&quot;Headline&quot; of the window</comment>
-        <translation type="vanished">Impostazioni</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <comment>Username/nick</comment>
-        <translation type="vanished">Nome</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <comment>Status message</comment>
-        <translation type="vanished">Stato</translation>
-    </message>
-    <message>
-        <source>(click here to copy)</source>
-        <comment>Click on this text to copy TID to clipboard</comment>
-        <translation type="vanished">(clicca qui per copiare)</translation>
-    </message>
-    <message>
-        <source>Test video</source>
-        <comment>Text on a button to test the video/webcam</comment>
-        <translation type="vanished">Prova la webcam</translation>
-    </message>
-    <message>
-        <source>Enable IPv6 (recommended)</source>
-        <comment>Text on a checkbox to enable IPv6</comment>
-        <translation type="vanished">Abilita IPv6 (consigliato)</translation>
-    </message>
-    <message>
-        <source>Use translations</source>
-        <comment>Text on a checkbox to enable translations</comment>
-        <translation type="vanished">Abilita traduzioni</translation>
-    </message>
-    <message>
-        <source>Make Tox portable</source>
-        <comment>Text on a checkbox to make qTox a portable application</comment>
-        <translation type="vanished">Rendi qTox portabile</translation>
-    </message>
-    <message>
-        <source>Save settings to the working directory instead of the usual conf dir</source>
-        <comment>describes makeToxPortable checkbox</comment>
-        <translation type="vanished">Slava le impostazioni nella directory di lavoro corrente, invece della directory di default</translation>
-    </message>
-    <message>
-        <source>Smiley Pack</source>
-        <comment>Text on smiley pack label</comment>
-        <translation type="vanished">Emoticons</translation>
+        <translation>Applica</translation>
     </message>
 </context>
 <context>
@@ -505,7 +452,7 @@
         <location filename="../widget/widget.cpp" line="605"/>
         <source>&lt;Unknown&gt;</source>
         <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
-        <translation type="unfinished">&lt;Sconosciuto&gt;</translation>
+        <translation>&lt;Sconosciuto&gt;</translation>
     </message>
 </context>
 </TS>

From 5dc41282156f0d83c03f314c937d7688aeb1ca53 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Mon, 15 Sep 2014 08:31:42 -0500
Subject: [PATCH 031/205] cosmetics

---
 widget/form/settings/avform.cpp        | 2 ++
 widget/form/settings/generalform.cpp   | 2 ++
 widget/form/settings/genericsettings.h | 8 +++++++-
 widget/form/settings/identityform.cpp  | 2 ++
 widget/form/settings/privacyform.cpp   | 2 ++
 widget/form/settingswidget.cpp         | 2 +-
 6 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/widget/form/settings/avform.cpp b/widget/form/settings/avform.cpp
index 347a1cfbb..5c0b38da3 100644
--- a/widget/form/settings/avform.cpp
+++ b/widget/form/settings/avform.cpp
@@ -19,6 +19,8 @@
 AVForm::AVForm()
 {
     prep();
+    icon.addFile(":/img/settings/av.png");
+    label.setText(tr("Audio/Video settings"));
 }
 
 AVForm::~AVForm()
diff --git a/widget/form/settings/generalform.cpp b/widget/form/settings/generalform.cpp
index 050d4f7eb..a9810c1ae 100644
--- a/widget/form/settings/generalform.cpp
+++ b/widget/form/settings/generalform.cpp
@@ -20,6 +20,8 @@
 GeneralForm::GeneralForm()
 {
     prep();
+    icon.addFile(":/img/settings/general.png");
+    label.setText(tr("General settings"));
     group = new QGroupBox(tr("General Settings"));
     enableIPv6 = new QCheckBox();
     enableIPv6->setText(tr("Enable IPv6 (recommended)","Text on a checkbox to enable IPv6"));
diff --git a/widget/form/settings/genericsettings.h b/widget/form/settings/genericsettings.h
index 9353d21df..94f8fe90f 100644
--- a/widget/form/settings/genericsettings.h
+++ b/widget/form/settings/genericsettings.h
@@ -34,13 +34,19 @@ public:
     }
 
 protected:
-    QVBoxLayout layout, headLayout;
+    QVBoxLayout layout;
+    QHBoxLayout headLayout;
+    QIcon icon;
+    QLabel label;
     QWidget head, body;
     void prep() // call in subclass constructor
     {
         head.setLayout(&headLayout);
+        headLayout.addWidget(&icon);
+        headLayout.addWidget(&label);
         body.setLayout(&layout);
     }
+
 };
 
 #endif
diff --git a/widget/form/settings/identityform.cpp b/widget/form/settings/identityform.cpp
index dbd5574c5..ac89257a9 100644
--- a/widget/form/settings/identityform.cpp
+++ b/widget/form/settings/identityform.cpp
@@ -22,6 +22,8 @@
 IdentityForm::IdentityForm()
 {
     prep();
+    icon.addFile(":/img/settings/identity.png");
+    label.setText(tr("Your identity"));
     toxGroup = new QGroupBox(tr("Tox ID"));
     QLabel* toxIdLabel = new QLabel(tr("Your Tox ID"));
     QLineEdit* toxID = new QLineEdit();
diff --git a/widget/form/settings/privacyform.cpp b/widget/form/settings/privacyform.cpp
index 856f64954..ef7c54c4b 100644
--- a/widget/form/settings/privacyform.cpp
+++ b/widget/form/settings/privacyform.cpp
@@ -20,6 +20,8 @@
 PrivacyForm::PrivacyForm()
 {
     prep();
+    icon.addFile(":/img/settings/privacy.png");
+    label.setText(tr("Privacy settings"));
 }
 
 PrivacyForm::~PrivacyForm()
diff --git a/widget/form/settingswidget.cpp b/widget/form/settingswidget.cpp
index 3a13c1cdb..9b5dc7856 100644
--- a/widget/form/settingswidget.cpp
+++ b/widget/form/settingswidget.cpp
@@ -110,7 +110,7 @@ void SettingsWidget::prepButtons()
     // just straight up copying it like this... oh well
     // the layout/icons obviously need to be improved, but it's a working model,
     // not a pretty one
-    QSizePolicy sizePolicy3(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+    QSizePolicy sizePolicy3(QSizePolicy::Fixed, QSizePolicy::Fixed);
     sizePolicy3.setHorizontalStretch(0);
     sizePolicy3.setVerticalStretch(0);
     foot->setObjectName(QStringLiteral("foot"));

From b56739264985d35b0fbb1201e67cf954a5ccf638 Mon Sep 17 00:00:00 2001
From: Marcel <marcel@tzi.de>
Date: Fri, 12 Sep 2014 15:50:39 +0200
Subject: [PATCH 032/205] added images

---
 img/settings/av.png       | Bin 0 -> 6360 bytes
 img/settings/general.png  | Bin 0 -> 2902 bytes
 img/settings/identity.png | Bin 0 -> 4771 bytes
 img/settings/privacy.png  | Bin 0 -> 1883 bytes
 res.qrc                   |   4 ++++
 5 files changed, 4 insertions(+)
 create mode 100644 img/settings/av.png
 create mode 100644 img/settings/general.png
 create mode 100644 img/settings/identity.png
 create mode 100644 img/settings/privacy.png

diff --git a/img/settings/av.png b/img/settings/av.png
new file mode 100644
index 0000000000000000000000000000000000000000..f96f88ea84299b2428780a15d29ae37db6601c90
GIT binary patch
literal 6360
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

literal 0
HcmV?d00001

diff --git a/img/settings/general.png b/img/settings/general.png
new file mode 100644
index 0000000000000000000000000000000000000000..61d9e2bf187b9574d83395b34bb9eaad4fd202f6
GIT binary patch
literal 2902
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
A^8f$<

literal 0
HcmV?d00001

diff --git a/img/settings/identity.png b/img/settings/identity.png
new file mode 100644
index 0000000000000000000000000000000000000000..806bb525efc2ea73d087891152331199cf543f99
GIT binary patch
literal 4771
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

literal 0
HcmV?d00001

diff --git a/img/settings/privacy.png b/img/settings/privacy.png
new file mode 100644
index 0000000000000000000000000000000000000000..763478290b8b0592c3f155013ad7d4f4637608d1
GIT binary patch
literal 1883
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
VX$I$XHCO-u002ovPDHLkV1nZng~b2>

literal 0
HcmV?d00001

diff --git a/res.qrc b/res.qrc
index cbf038a58..6a121b0ad 100644
--- a/res.qrc
+++ b/res.qrc
@@ -135,5 +135,9 @@
         <file>ui/fileTransferInstance/emptyRGreenFileButton.png</file>
         <file>ui/fileTransferInstance/emptyRRedFileButton.png</file>
         <file>audio/notification.pcm</file>
+        <file>img/settings/general.png</file>
+        <file>img/settings/identity.png</file>
+        <file>img/settings/privacy.png</file>
+        <file>img/settings/av.png</file>
     </qresource>
 </RCC>

From d971d7e6477741b9a7859f793a49c317cf5ec545 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Mon, 15 Sep 2014 08:48:17 -0500
Subject: [PATCH 033/205] scaling still isn't quite right...

---
 widget/form/settings/avform.cpp        | 2 +-
 widget/form/settings/generalform.cpp   | 2 +-
 widget/form/settings/genericsettings.h | 4 ++--
 widget/form/settings/identityform.cpp  | 2 +-
 widget/form/settings/privacyform.cpp   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/widget/form/settings/avform.cpp b/widget/form/settings/avform.cpp
index 5c0b38da3..e0b0773f9 100644
--- a/widget/form/settings/avform.cpp
+++ b/widget/form/settings/avform.cpp
@@ -19,7 +19,7 @@
 AVForm::AVForm()
 {
     prep();
-    icon.addFile(":/img/settings/av.png");
+    icon.setPixmap(QPixmap(":/img/settings/av.png").scaledToHeight(headLayout.sizeHint().height(), Qt::SmoothTransformation));
     label.setText(tr("Audio/Video settings"));
 }
 
diff --git a/widget/form/settings/generalform.cpp b/widget/form/settings/generalform.cpp
index a9810c1ae..7a6734383 100644
--- a/widget/form/settings/generalform.cpp
+++ b/widget/form/settings/generalform.cpp
@@ -20,7 +20,7 @@
 GeneralForm::GeneralForm()
 {
     prep();
-    icon.addFile(":/img/settings/general.png");
+    icon.setPixmap(QPixmap(":/img/settings/general.png").scaledToHeight(headLayout.sizeHint().height(), Qt::SmoothTransformation));
     label.setText(tr("General settings"));
     group = new QGroupBox(tr("General Settings"));
     enableIPv6 = new QCheckBox();
diff --git a/widget/form/settings/genericsettings.h b/widget/form/settings/genericsettings.h
index 94f8fe90f..760d39cb0 100644
--- a/widget/form/settings/genericsettings.h
+++ b/widget/form/settings/genericsettings.h
@@ -19,6 +19,7 @@
 
 #include <QObject>
 #include <QVBoxLayout>
+#include <QLabel>
 #include "widget/form/settingswidget.h"
 
 class GenericForm : public QObject
@@ -36,8 +37,7 @@ public:
 protected:
     QVBoxLayout layout;
     QHBoxLayout headLayout;
-    QIcon icon;
-    QLabel label;
+    QLabel label, icon;
     QWidget head, body;
     void prep() // call in subclass constructor
     {
diff --git a/widget/form/settings/identityform.cpp b/widget/form/settings/identityform.cpp
index ac89257a9..696b2141a 100644
--- a/widget/form/settings/identityform.cpp
+++ b/widget/form/settings/identityform.cpp
@@ -22,7 +22,7 @@
 IdentityForm::IdentityForm()
 {
     prep();
-    icon.addFile(":/img/settings/identity.png");
+    icon.setPixmap(QPixmap(":/img/settings/identity.png").scaledToHeight(headLayout.sizeHint().height(), Qt::SmoothTransformation));
     label.setText(tr("Your identity"));
     toxGroup = new QGroupBox(tr("Tox ID"));
     QLabel* toxIdLabel = new QLabel(tr("Your Tox ID"));
diff --git a/widget/form/settings/privacyform.cpp b/widget/form/settings/privacyform.cpp
index ef7c54c4b..e1f737975 100644
--- a/widget/form/settings/privacyform.cpp
+++ b/widget/form/settings/privacyform.cpp
@@ -20,7 +20,7 @@
 PrivacyForm::PrivacyForm()
 {
     prep();
-    icon.addFile(":/img/settings/privacy.png");
+    icon.setPixmap(QPixmap(":/img/settings/privacy.png").scaledToHeight(headLayout.sizeHint().height(), Qt::SmoothTransformation));
     label.setText(tr("Privacy settings"));
 }
 

From ecd922c72dec2c1b1ed63028644f9f4cf004d639 Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Tue, 16 Sep 2014 00:51:25 +0700
Subject: [PATCH 034/205] fix: Force video output to follow aspect ratio #130

---
 widget/netcamview.cpp  | 12 +++++++++---
 widget/netcamview.h    |  5 +++++
 widget/selfcamview.cpp |  9 +++++++--
 widget/selfcamview.h   |  3 +++
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/widget/netcamview.cpp b/widget/netcamview.cpp
index 4268ea8dd..fc94393d5 100644
--- a/widget/netcamview.cpp
+++ b/widget/netcamview.cpp
@@ -59,7 +59,7 @@ NetCamView::NetCamView(QWidget* parent)
     setWindowTitle("Tox video");
     setMinimumSize(320,240);
 
-    displayLabel->setScaledContents(true);
+    displayLabel->setAlignment(Qt::AlignCenter);
 
     mainLayout->addWidget(displayLabel);
 }
@@ -73,10 +73,10 @@ void NetCamView::updateDisplay(vpx_image* frame)
 
     core->increaseVideoBusyness();
 
-    QImage img = convert(*frame);
+    img = convert(*frame);
 
     vpx_img_free(frame);
-    displayLabel->setPixmap(QPixmap::fromImage(img));
+    displayLabel->setPixmap(QPixmap::fromImage(img).scaled(displayLabel->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation));
 
     core->decreaseVideoBusyness();
 }
@@ -108,3 +108,9 @@ QImage NetCamView::convert(vpx_image& frame)
 
     return img;
 }
+
+void NetCamView::resizeEvent(QResizeEvent *e)
+{
+    Q_UNUSED(e)
+    displayLabel->setPixmap(QPixmap::fromImage(img).scaled(displayLabel->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation));
+}
diff --git a/widget/netcamview.h b/widget/netcamview.h
index 0aba0edd9..a8698eaa3 100644
--- a/widget/netcamview.h
+++ b/widget/netcamview.h
@@ -24,6 +24,7 @@ class QShowEvent;
 class QPainter;
 class QLabel;
 class QHBoxLayout;
+class QImage;
 class vpx_image;
 
 class NetCamView : public QWidget
@@ -39,10 +40,14 @@ public slots:
 private:
     static QImage convert(vpx_image& frame);
 
+protected:
+    void resizeEvent(QResizeEvent *e);
+
 private:
     QLabel *displayLabel;
     QImage lastFrame;
     QHBoxLayout* mainLayout;
+    QImage img;
 };
 
 #endif // NETCAMVIEW_H
diff --git a/widget/selfcamview.cpp b/widget/selfcamview.cpp
index 6436e24d9..7e9c3d252 100644
--- a/widget/selfcamview.cpp
+++ b/widget/selfcamview.cpp
@@ -36,7 +36,7 @@ SelfCamView::SelfCamView(Camera* Cam, QWidget* parent)
     updateDisplayTimer->setInterval(5);
     updateDisplayTimer->setSingleShot(false);
 
-    displayLabel->setScaledContents(true);
+    displayLabel->setAlignment(Qt::AlignCenter);
 
     mainLayout->addWidget(displayLabel);
 
@@ -59,6 +59,11 @@ void SelfCamView::showEvent(QShowEvent* event)
 
 void SelfCamView::updateDisplay()
 {
-    displayLabel->setPixmap(QPixmap::fromImage(cam->getLastImage()));
+    displayLabel->setPixmap(QPixmap::fromImage(cam->getLastImage()).scaled(displayLabel->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation));
 }
 
+void SelfCamView::resizeEvent(QResizeEvent *e)
+{
+    Q_UNUSED(e)
+    updateDisplay();
+}
diff --git a/widget/selfcamview.h b/widget/selfcamview.h
index a8cc29679..26a8b315c 100644
--- a/widget/selfcamview.h
+++ b/widget/selfcamview.h
@@ -42,6 +42,9 @@ private:
     void showEvent(QShowEvent*);
     void paint(QPainter *painter);
 
+protected:
+    void resizeEvent(QResizeEvent *e);
+
 private:
     QLabel *displayLabel;
     QHBoxLayout* mainLayout;

From 59869b4a8771b3ddf14f789a67a544660bfdbf2a Mon Sep 17 00:00:00 2001
From: dubslow <bill@mint>
Date: Sat, 13 Sep 2014 00:55:21 -0500
Subject: [PATCH 035/205] first thing's first, gotta placate the ocd

---
 mainwindow.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mainwindow.ui b/mainwindow.ui
index 7f9cd12c5..20e8269cf 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -3124,13 +3124,13 @@ QSplitter:handle{
           <property name="minimumSize">
            <size>
             <width>0</width>
-            <height>60</height>
+            <height>57</height>
            </size>
           </property>
           <property name="maximumSize">
            <size>
             <width>16777215</width>
-            <height>60</height>
+            <height>57</height>
            </size>
           </property>
           <property name="mouseTracking">

From e4e36dc946027b603fcb60ff3791e7d6a6625907 Mon Sep 17 00:00:00 2001
From: dubslow <bill@mint>
Date: Sat, 13 Sep 2014 03:32:24 -0500
Subject: [PATCH 036/205] initial new settings widget, subforms not started
 also "filing" some files under misc

---
 core.cpp                              |   6 +-
 main.cpp                              |   2 +-
 cdata.cpp => misc/cdata.cpp           |   0
 cdata.h => misc/cdata.h               |   0
 cstring.cpp => misc/cstring.cpp       |   0
 cstring.h => misc/cstring.h           |   0
 settings.cpp => misc/settings.cpp     |   0
 settings.h => misc/settings.h         |   0
 smileypack.cpp => misc/smileypack.cpp |   0
 smileypack.h => misc/smileypack.h     |   0
 style.cpp => misc/style.cpp           |   0
 style.h => misc/style.h               |   0
 qtox.pro                              |  28 ++---
 widget/emoticonswidget.cpp            |   4 +-
 widget/form/genericchatform.cpp       |   6 +-
 widget/form/settingswidget.cpp        | 164 ++++++++++++++++++++++++++
 widget/form/settingswidget.h          |  62 ++++++++++
 widget/groupwidget.cpp                |   2 +-
 widget/tool/chataction.cpp            |   2 +-
 widget/widget.cpp                     |  11 +-
 widget/widget.h                       |   4 +-
 21 files changed, 258 insertions(+), 33 deletions(-)
 rename cdata.cpp => misc/cdata.cpp (100%)
 rename cdata.h => misc/cdata.h (100%)
 rename cstring.cpp => misc/cstring.cpp (100%)
 rename cstring.h => misc/cstring.h (100%)
 rename settings.cpp => misc/settings.cpp (100%)
 rename settings.h => misc/settings.h (100%)
 rename smileypack.cpp => misc/smileypack.cpp (100%)
 rename smileypack.h => misc/smileypack.h (100%)
 rename style.cpp => misc/style.cpp (100%)
 rename style.h => misc/style.h (100%)
 create mode 100644 widget/form/settingswidget.cpp
 create mode 100644 widget/form/settingswidget.h

diff --git a/core.cpp b/core.cpp
index fe1e3187b..81d022588 100644
--- a/core.cpp
+++ b/core.cpp
@@ -15,9 +15,9 @@
 */
 
 #include "core.h"
-#include "cdata.h"
-#include "cstring.h"
-#include "settings.h"
+#include "misc/cdata.h"
+#include "misc/cstring.h"
+#include "misc/settings.h"
 #include "widget/widget.h"
 
 #include <tox/tox.h>
diff --git a/main.cpp b/main.cpp
index 1cdac827e..8e981baa5 100644
--- a/main.cpp
+++ b/main.cpp
@@ -15,7 +15,7 @@
 */
 
 #include "widget/widget.h"
-#include "settings.h"
+#include "misc/settings.h"
 #include <QApplication>
 #include <QFontDatabase>
 #include <QTranslator>
diff --git a/cdata.cpp b/misc/cdata.cpp
similarity index 100%
rename from cdata.cpp
rename to misc/cdata.cpp
diff --git a/cdata.h b/misc/cdata.h
similarity index 100%
rename from cdata.h
rename to misc/cdata.h
diff --git a/cstring.cpp b/misc/cstring.cpp
similarity index 100%
rename from cstring.cpp
rename to misc/cstring.cpp
diff --git a/cstring.h b/misc/cstring.h
similarity index 100%
rename from cstring.h
rename to misc/cstring.h
diff --git a/settings.cpp b/misc/settings.cpp
similarity index 100%
rename from settings.cpp
rename to misc/settings.cpp
diff --git a/settings.h b/misc/settings.h
similarity index 100%
rename from settings.h
rename to misc/settings.h
diff --git a/smileypack.cpp b/misc/smileypack.cpp
similarity index 100%
rename from smileypack.cpp
rename to misc/smileypack.cpp
diff --git a/smileypack.h b/misc/smileypack.h
similarity index 100%
rename from smileypack.h
rename to misc/smileypack.h
diff --git a/style.cpp b/misc/style.cpp
similarity index 100%
rename from style.cpp
rename to misc/style.cpp
diff --git a/style.h b/misc/style.h
similarity index 100%
rename from style.h
rename to misc/style.h
diff --git a/qtox.pro b/qtox.pro
index 250d3abc8..9112e95c0 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -81,6 +81,7 @@ win32 {
 HEADERS  += widget/form/addfriendform.h \
     widget/form/chatform.h \
     widget/form/groupchatform.h \
+    widget/form/settingswidget.h \
     widget/form/filesform.h \
     widget/tool/chattextedit.h \
     widget/tool/friendrequestdialog.h \
@@ -90,17 +91,17 @@ HEADERS  += widget/form/addfriendform.h \
     friend.h \
     group.h \
     grouplist.h \
-    settings.h \
+    misc/settings.h \
     core.h \
     friendlist.h \
-    cdata.h \
-    cstring.h \
+    misc/cdata.h \
+    misc/cstring.h \
     widget/selfcamview.h \
     widget/camera.h \
     widget/netcamview.h \
-    smileypack.h \
+    misc/smileypack.h \
     widget/emoticonswidget.h \
-    style.h \
+    misc/style.h \
     widget/adjustingscrollarea.h \
     widget/croppinglabel.h \
     widget/friendlistwidget.h \
@@ -111,13 +112,13 @@ HEADERS  += widget/form/addfriendform.h \
     filetransferinstance.h \
     corestructs.h \
     coredefines.h \
-    coreav.h \
-    widget/settingsdialog.h
+    coreav.h
 
 SOURCES += \
     widget/form/addfriendform.cpp \
     widget/form/chatform.cpp \
     widget/form/groupchatform.cpp \
+    widget/form/settingswidget.cpp \
     widget/form/filesform.cpp \
     widget/tool/chattextedit.cpp \
     widget/tool/friendrequestdialog.cpp \
@@ -130,15 +131,15 @@ SOURCES += \
     group.cpp \
     grouplist.cpp \
     main.cpp \
-    settings.cpp \
-    cdata.cpp \
-    cstring.cpp \
+    misc/settings.cpp \
+    misc/cdata.cpp \
+    misc/cstring.cpp \
     widget/selfcamview.cpp \
     widget/camera.cpp \
     widget/netcamview.cpp \
-    smileypack.cpp \
+    misc/smileypack.cpp \
     widget/emoticonswidget.cpp \
-    style.cpp \
+    misc/style.cpp \
     widget/adjustingscrollarea.cpp \
     widget/croppinglabel.cpp \
     widget/friendlistwidget.cpp \
@@ -148,5 +149,4 @@ SOURCES += \
     widget/tool/chataction.cpp \
     widget/chatareawidget.cpp \
     filetransferinstance.cpp \
-    corestructs.cpp \
-    widget/settingsdialog.cpp
+    corestructs.cpp
diff --git a/widget/emoticonswidget.cpp b/widget/emoticonswidget.cpp
index bab7abe8d..b0ffb6028 100644
--- a/widget/emoticonswidget.cpp
+++ b/widget/emoticonswidget.cpp
@@ -15,8 +15,8 @@
 */
 
 #include "emoticonswidget.h"
-#include "smileypack.h"
-#include "style.h"
+#include "misc/smileypack.h"
+#include "misc/style.h"
 
 #include <QPushButton>
 #include <QRadioButton>
diff --git a/widget/form/genericchatform.cpp b/widget/form/genericchatform.cpp
index f5681f1c6..2aff5d2a7 100644
--- a/widget/form/genericchatform.cpp
+++ b/widget/form/genericchatform.cpp
@@ -17,11 +17,11 @@
 #include "genericchatform.h"
 #include "ui_mainwindow.h"
 #include <QFileDialog>
-#include "smileypack.h"
+#include "misc/smileypack.h"
 #include "widget/emoticonswidget.h"
-#include "style.h"
+#include "misc/style.h"
 #include "widget/widget.h"
-#include "settings.h"
+#include "misc/settings.h"
 #include "widget/tool/chataction.h"
 #include "widget/chatareawidget.h"
 #include "widget/tool/chattextedit.h"
diff --git a/widget/form/settingswidget.cpp b/widget/form/settingswidget.cpp
new file mode 100644
index 000000000..6e2778de8
--- /dev/null
+++ b/widget/form/settingswidget.cpp
@@ -0,0 +1,164 @@
+/*
+    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 "settingswidget.h"
+#include "widget/widget.h"
+#include "ui_mainwindow.h"
+
+SettingsWidget::SettingsWidget()
+    : QObject()
+{
+    main = new QWidget();
+    // this crap is copied from ui_mainwindow.h... there's no easy way around
+    // just straight up copying it like this... oh well
+    // the layout/icons obviously need to be improved, but it's a working model,
+    // not a pretty one
+    QSizePolicy sizePolicy3(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+    sizePolicy3.setHorizontalStretch(0);
+    sizePolicy3.setVerticalStretch(0);
+    head = new QWidget();
+    head->setObjectName(QStringLiteral("head"));
+    head->setEnabled(true);
+    sizePolicy3.setHeightForWidth(head->sizePolicy().hasHeightForWidth());
+    head->setSizePolicy(sizePolicy3);
+    QPalette palette5;
+    QBrush brush(QColor(255, 255, 255, 255));
+    brush.setStyle(Qt::SolidPattern);
+    QBrush brush1(QColor(28, 28, 28, 255));
+    brush1.setStyle(Qt::SolidPattern);
+    QBrush brush2(QColor(42, 42, 42, 255));
+    brush2.setStyle(Qt::SolidPattern);
+    QBrush brush3(QColor(35, 35, 35, 255));
+    brush3.setStyle(Qt::SolidPattern);
+    QBrush brush4(QColor(14, 14, 14, 255));
+    brush4.setStyle(Qt::SolidPattern);
+    QBrush brush5(QColor(18, 18, 18, 255));
+    brush5.setStyle(Qt::SolidPattern);
+    QBrush brush6(QColor(0, 0, 0, 255));
+    brush6.setStyle(Qt::SolidPattern);
+    QBrush brush7(QColor(255, 255, 220, 255));
+    brush7.setStyle(Qt::SolidPattern);
+    palette5.setBrush(QPalette::Active, QPalette::WindowText, brush);
+    palette5.setBrush(QPalette::Active, QPalette::Button, brush1);
+    palette5.setBrush(QPalette::Active, QPalette::Light, brush2);
+    palette5.setBrush(QPalette::Active, QPalette::Midlight, brush3);
+    palette5.setBrush(QPalette::Active, QPalette::Dark, brush4);
+    palette5.setBrush(QPalette::Active, QPalette::Mid, brush5);
+    palette5.setBrush(QPalette::Active, QPalette::Text, brush);
+    palette5.setBrush(QPalette::Active, QPalette::BrightText, brush);
+    palette5.setBrush(QPalette::Active, QPalette::ButtonText, brush);
+    palette5.setBrush(QPalette::Active, QPalette::Base, brush6);
+    palette5.setBrush(QPalette::Active, QPalette::Window, brush1);
+    palette5.setBrush(QPalette::Active, QPalette::Shadow, brush6);
+    palette5.setBrush(QPalette::Active, QPalette::AlternateBase, brush4);
+    palette5.setBrush(QPalette::Active, QPalette::ToolTipBase, brush7);
+    palette5.setBrush(QPalette::Active, QPalette::ToolTipText, brush6);
+    palette5.setBrush(QPalette::Inactive, QPalette::WindowText, brush);
+    palette5.setBrush(QPalette::Inactive, QPalette::Button, brush1);
+    palette5.setBrush(QPalette::Inactive, QPalette::Light, brush2);
+    palette5.setBrush(QPalette::Inactive, QPalette::Midlight, brush3);
+    palette5.setBrush(QPalette::Inactive, QPalette::Dark, brush4);
+    palette5.setBrush(QPalette::Inactive, QPalette::Mid, brush5);
+    palette5.setBrush(QPalette::Inactive, QPalette::Text, brush);
+    palette5.setBrush(QPalette::Inactive, QPalette::BrightText, brush);
+    palette5.setBrush(QPalette::Inactive, QPalette::ButtonText, brush);
+    palette5.setBrush(QPalette::Inactive, QPalette::Base, brush6);
+    palette5.setBrush(QPalette::Inactive, QPalette::Window, brush1);
+    palette5.setBrush(QPalette::Inactive, QPalette::Shadow, brush6);
+    palette5.setBrush(QPalette::Inactive, QPalette::AlternateBase, brush4);
+    palette5.setBrush(QPalette::Inactive, QPalette::ToolTipBase, brush7);
+    palette5.setBrush(QPalette::Inactive, QPalette::ToolTipText, brush6);
+    palette5.setBrush(QPalette::Disabled, QPalette::WindowText, brush4);
+    palette5.setBrush(QPalette::Disabled, QPalette::Button, brush1);
+    palette5.setBrush(QPalette::Disabled, QPalette::Light, brush2);
+    palette5.setBrush(QPalette::Disabled, QPalette::Midlight, brush3);
+    palette5.setBrush(QPalette::Disabled, QPalette::Dark, brush4);
+    palette5.setBrush(QPalette::Disabled, QPalette::Mid, brush5);
+    palette5.setBrush(QPalette::Disabled, QPalette::Text, brush4);
+    palette5.setBrush(QPalette::Disabled, QPalette::BrightText, brush);
+    palette5.setBrush(QPalette::Disabled, QPalette::ButtonText, brush4);
+    palette5.setBrush(QPalette::Disabled, QPalette::Base, brush1);
+    palette5.setBrush(QPalette::Disabled, QPalette::Window, brush1);
+    palette5.setBrush(QPalette::Disabled, QPalette::Shadow, brush6);
+    palette5.setBrush(QPalette::Disabled, QPalette::AlternateBase, brush1);
+    palette5.setBrush(QPalette::Disabled, QPalette::ToolTipBase, brush7);
+    palette5.setBrush(QPalette::Disabled, QPalette::ToolTipText, brush6);
+    head->setPalette(palette5);
+    head->setAutoFillBackground(true);
+    iconsLayout = new QHBoxLayout(head);
+    iconsLayout->setSpacing(0);
+    iconsLayout->setObjectName(QStringLiteral("iconsLayout"));
+    iconsLayout->setContentsMargins(0, 0, 0, 0);
+
+    generalButton = new QPushButton(head);
+    generalButton->setObjectName(QStringLiteral("generalButton"));
+    generalButton->setMinimumSize(QSize(55, 35));
+    generalButton->setMaximumSize(QSize(55, 35));
+    generalButton->setFocusPolicy(Qt::NoFocus);
+    QIcon icon1;
+    icon1.addFile(QStringLiteral(":/img/add.png"), QSize(), QIcon::Normal, QIcon::Off);
+    generalButton->setIcon(icon1);
+    generalButton->setFlat(true);
+    iconsLayout->addWidget(generalButton);
+    
+    identityButton = new QPushButton(head);
+    identityButton->setObjectName(QStringLiteral("identityButton"));
+    identityButton->setMinimumSize(QSize(55, 35));
+    identityButton->setMaximumSize(QSize(55, 35));
+    identityButton->setFocusPolicy(Qt::NoFocus);
+    QIcon icon2;
+    icon2.addFile(QStringLiteral(":/img/group.png"), QSize(), QIcon::Normal, QIcon::Off);
+    identityButton->setIcon(icon2);
+    identityButton->setFlat(true);
+    iconsLayout->addWidget(identityButton);
+    
+    privacyButton = new QPushButton(head);
+    privacyButton->setObjectName(QStringLiteral("privacyButton"));
+    privacyButton->setMinimumSize(QSize(55, 35));
+    privacyButton->setMaximumSize(QSize(55, 35));
+    privacyButton->setFocusPolicy(Qt::NoFocus);
+    QIcon icon3;
+    icon3.addFile(QStringLiteral(":/img/transfer.png"), QSize(), QIcon::Normal, QIcon::Off);
+    privacyButton->setIcon(icon3);
+    privacyButton->setFlat(true);
+    iconsLayout->addWidget(privacyButton);
+    
+    avButton = new QPushButton(head);
+    avButton->setObjectName(QStringLiteral("avButton"));
+    avButton->setMinimumSize(QSize(55, 35));
+    avButton->setMaximumSize(QSize(55, 35));
+    avButton->setFocusPolicy(Qt::NoFocus);
+    QIcon icon4;
+    icon4.addFile(QStringLiteral(":/img/settings.png"), QSize(), QIcon::Normal, QIcon::Off);
+    avButton->setIcon(icon4);
+    avButton->setFlat(true);
+    iconsLayout->addWidget(avButton);
+    
+    head->setLayout(iconsLayout);
+
+}
+
+SettingsWidget::~SettingsWidget()
+{
+}
+
+void SettingsWidget::show(Ui::MainWindow& ui)
+{
+    ui.mainContent->layout()->addWidget(main);
+    ui.mainHead->layout()->addWidget(head);
+    main->show();
+    head->show();
+}
diff --git a/widget/form/settingswidget.h b/widget/form/settingswidget.h
new file mode 100644
index 000000000..a1cee909f
--- /dev/null
+++ b/widget/form/settingswidget.h
@@ -0,0 +1,62 @@
+/*
+    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 SETTINGSWIDGET_H
+#define SETTINGSWIDGET_H
+
+#include <QVBoxLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QObject>
+#include <QCheckBox>
+#include <QPushButton>
+#include <QTextEdit>
+#include <QComboBox>
+
+#include "widget/croppinglabel.h"
+
+namespace Ui {class MainWindow;}
+class QString;
+
+class SettingsWidget : public QObject
+{
+    Q_OBJECT
+public:
+    SettingsWidget();
+    ~SettingsWidget();
+
+    void show(Ui::MainWindow &ui);
+
+public slots:
+    //void setFriendAddress(const QString& friendAddress);
+
+private slots:
+
+private:
+    QWidget *main, *head;
+    // the code pertaining to the icons is mostly copied from ui_mainwindow.h
+    QHBoxLayout *iconsLayout;
+    QPushButton *generalButton;
+    QPushButton *identityButton;
+    QPushButton *privacyButton;
+    QPushButton *avButton;
+    
+    // now the actual pages and stuff
+    // ...
+public:
+};
+
+#endif // SETTINGSFORM_H
diff --git a/widget/groupwidget.cpp b/widget/groupwidget.cpp
index b8c1cbcc0..0c02db3d2 100644
--- a/widget/groupwidget.cpp
+++ b/widget/groupwidget.cpp
@@ -17,7 +17,7 @@
 #include "groupwidget.h"
 #include "grouplist.h"
 #include "group.h"
-#include "settings.h"
+#include "misc/settings.h"
 #include "widget/form/groupchatform.h"
 #include <QPalette>
 #include <QMenu>
diff --git a/widget/tool/chataction.cpp b/widget/tool/chataction.cpp
index bcd1f1080..c05fd36b9 100644
--- a/widget/tool/chataction.cpp
+++ b/widget/tool/chataction.cpp
@@ -15,7 +15,7 @@
 */
 
 #include "chataction.h"
-#include "smileypack.h"
+#include "misc/smileypack.h"
 #include <QStringList>
 #include <QBuffer>
 #include "filetransferinstance.h"
diff --git a/widget/widget.cpp b/widget/widget.cpp
index 36b2c33c1..f1472bcd6 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -17,7 +17,7 @@
 #include "widget.h"
 #include "ui_mainwindow.h"
 #include "core.h"
-#include "settings.h"
+#include "misc/settings.h"
 #include "friend.h"
 #include "friendlist.h"
 #include "widget/tool/friendrequestdialog.h"
@@ -26,12 +26,11 @@
 #include "group.h"
 #include "widget/groupwidget.h"
 #include "widget/form/groupchatform.h"
-#include "style.h"
+#include "misc/style.h"
 #include "selfcamview.h"
 #include "widget/friendlistwidget.h"
 #include "camera.h"
 #include "widget/form/chatform.h"
-#include "widget/settingsdialog.h"
 #include <QMessageBox>
 #include <QDebug>
 #include <QFile>
@@ -156,7 +155,6 @@ Widget::Widget(QWidget *parent)
     ui->statusButton->style()->polish(ui->statusButton);
 
     camera = new Camera;
-    settingsDialog = new SettingsDialog(this);
 
     // Disable some widgets until we're connected to the DHT
     ui->statusButton->setEnabled(false);
@@ -335,8 +333,9 @@ void Widget::onTransferClicked()
 
 void Widget::onSettingsClicked()
 {
-    settingsDialog->readConfig();
-    settingsDialog->show();
+    hideMainForms();
+    settingsWidget.show(*ui);
+    activeChatroomWidget = nullptr;
 }
 
 void Widget::hideMainForms()
diff --git a/widget/widget.h b/widget/widget.h
index 035ea2ae0..9512f00e9 100644
--- a/widget/widget.h
+++ b/widget/widget.h
@@ -19,6 +19,7 @@
 
 #include <QMainWindow>
 #include "widget/form/addfriendform.h"
+#include "widget/form/settingswidget.h"
 #include "widget/form/filesform.h"
 #include "corestructs.h"
 
@@ -37,7 +38,6 @@ class QMenu;
 class Core;
 class Camera;
 class FriendListWidget;
-class SettingsDialog;
 
 class Widget : public QMainWindow
 {
@@ -134,8 +134,8 @@ private:
     Core* core;
     QThread* coreThread;
     AddFriendForm friendForm;
+    SettingsWidget settingsWidget;
     FilesForm filesForm;
-    SettingsDialog* settingsDialog;
     static Widget* instance;
     GenericChatroomWidget* activeChatroomWidget;
     FriendListWidget* contactListWidget;

From e55f15725ec9558bdca588c8a2cfe80f40fef5b7 Mon Sep 17 00:00:00 2001
From: bill <bill@mint>
Date: Sun, 14 Sep 2014 13:42:27 -0500
Subject: [PATCH 037/205] move buttons to bottom

---
 widget/form/settingswidget.cpp | 66 +++++++++++++++++++---------------
 widget/form/settingswidget.h   | 20 +++++------
 2 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/widget/form/settingswidget.cpp b/widget/form/settingswidget.cpp
index 6e2778de8..fcbd2a981 100644
--- a/widget/form/settingswidget.cpp
+++ b/widget/form/settingswidget.cpp
@@ -19,9 +19,35 @@
 #include "ui_mainwindow.h"
 
 SettingsWidget::SettingsWidget()
-    : QObject()
+    : QWidget()
 {
+    _main = new QWidget();
     main = new QWidget();
+    head = new QWidget();
+    foot = new QWidget();
+    prepButtons();    
+    foot->setLayout(iconsLayout);
+    _mainLayout = new QVBoxLayout(_main);
+    _mainLayout->addWidget(main);
+    _mainLayout->addWidget(foot);
+    // something something foot size
+    _main->setLayout(_mainLayout);
+}
+
+SettingsWidget::~SettingsWidget()
+{
+}
+
+void SettingsWidget::show(Ui::MainWindow& ui)
+{
+    ui.mainContent->layout()->addWidget(_main);
+    ui.mainHead->layout()->addWidget(head);
+    _main->show();
+    head->show();
+}
+
+void SettingsWidget::prepButtons()
+{
     // this crap is copied from ui_mainwindow.h... there's no easy way around
     // just straight up copying it like this... oh well
     // the layout/icons obviously need to be improved, but it's a working model,
@@ -29,11 +55,9 @@ SettingsWidget::SettingsWidget()
     QSizePolicy sizePolicy3(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
     sizePolicy3.setHorizontalStretch(0);
     sizePolicy3.setVerticalStretch(0);
-    head = new QWidget();
-    head->setObjectName(QStringLiteral("head"));
-    head->setEnabled(true);
-    sizePolicy3.setHeightForWidth(head->sizePolicy().hasHeightForWidth());
-    head->setSizePolicy(sizePolicy3);
+    foot->setObjectName(QStringLiteral("foot"));
+    foot->setEnabled(true);
+    foot->setSizePolicy(sizePolicy3);
     QPalette palette5;
     QBrush brush(QColor(255, 255, 255, 255));
     brush.setStyle(Qt::SolidPattern);
@@ -96,14 +120,15 @@ SettingsWidget::SettingsWidget()
     palette5.setBrush(QPalette::Disabled, QPalette::AlternateBase, brush1);
     palette5.setBrush(QPalette::Disabled, QPalette::ToolTipBase, brush7);
     palette5.setBrush(QPalette::Disabled, QPalette::ToolTipText, brush6);
-    head->setPalette(palette5);
-    head->setAutoFillBackground(true);
-    iconsLayout = new QHBoxLayout(head);
+    foot->setPalette(palette5);
+    foot->setAutoFillBackground(true);
+    
+    iconsLayout = new QHBoxLayout(foot);
     iconsLayout->setSpacing(0);
     iconsLayout->setObjectName(QStringLiteral("iconsLayout"));
     iconsLayout->setContentsMargins(0, 0, 0, 0);
 
-    generalButton = new QPushButton(head);
+    generalButton = new QPushButton(foot);
     generalButton->setObjectName(QStringLiteral("generalButton"));
     generalButton->setMinimumSize(QSize(55, 35));
     generalButton->setMaximumSize(QSize(55, 35));
@@ -114,7 +139,7 @@ SettingsWidget::SettingsWidget()
     generalButton->setFlat(true);
     iconsLayout->addWidget(generalButton);
     
-    identityButton = new QPushButton(head);
+    identityButton = new QPushButton(foot);
     identityButton->setObjectName(QStringLiteral("identityButton"));
     identityButton->setMinimumSize(QSize(55, 35));
     identityButton->setMaximumSize(QSize(55, 35));
@@ -125,7 +150,7 @@ SettingsWidget::SettingsWidget()
     identityButton->setFlat(true);
     iconsLayout->addWidget(identityButton);
     
-    privacyButton = new QPushButton(head);
+    privacyButton = new QPushButton(foot);
     privacyButton->setObjectName(QStringLiteral("privacyButton"));
     privacyButton->setMinimumSize(QSize(55, 35));
     privacyButton->setMaximumSize(QSize(55, 35));
@@ -136,7 +161,7 @@ SettingsWidget::SettingsWidget()
     privacyButton->setFlat(true);
     iconsLayout->addWidget(privacyButton);
     
-    avButton = new QPushButton(head);
+    avButton = new QPushButton(foot);
     avButton->setObjectName(QStringLiteral("avButton"));
     avButton->setMinimumSize(QSize(55, 35));
     avButton->setMaximumSize(QSize(55, 35));
@@ -146,19 +171,4 @@ SettingsWidget::SettingsWidget()
     avButton->setIcon(icon4);
     avButton->setFlat(true);
     iconsLayout->addWidget(avButton);
-    
-    head->setLayout(iconsLayout);
-
-}
-
-SettingsWidget::~SettingsWidget()
-{
-}
-
-void SettingsWidget::show(Ui::MainWindow& ui)
-{
-    ui.mainContent->layout()->addWidget(main);
-    ui.mainHead->layout()->addWidget(head);
-    main->show();
-    head->show();
 }
diff --git a/widget/form/settingswidget.h b/widget/form/settingswidget.h
index a1cee909f..c901ce906 100644
--- a/widget/form/settingswidget.h
+++ b/widget/form/settingswidget.h
@@ -17,21 +17,15 @@
 #ifndef SETTINGSWIDGET_H
 #define SETTINGSWIDGET_H
 
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QObject>
-#include <QCheckBox>
+#include <QHBoxLayout>
 #include <QPushButton>
-#include <QTextEdit>
-#include <QComboBox>
-
+#include <QObject>
 #include "widget/croppinglabel.h"
 
 namespace Ui {class MainWindow;}
 class QString;
 
-class SettingsWidget : public QObject
+class SettingsWidget : public QWidget
 {
     Q_OBJECT
 public:
@@ -46,7 +40,9 @@ public slots:
 private slots:
 
 private:
-    QWidget *main, *head;
+    QWidget *_main, *main, *head, *foot;
+    // _main consists of main+foot
+    QVBoxLayout *_mainLayout;
     // the code pertaining to the icons is mostly copied from ui_mainwindow.h
     QHBoxLayout *iconsLayout;
     QPushButton *generalButton;
@@ -56,6 +52,10 @@ private:
     
     // now the actual pages and stuff
     // ...
+
+
+
+    void prepButtons(); // just so I can move the crap to the bottom of the file
 public:
 };
 

From 5ec79fc26080eae03350877686336d1caba223a2 Mon Sep 17 00:00:00 2001
From: bill <bill@mint>
Date: Mon, 15 Sep 2014 05:45:59 -0500
Subject: [PATCH 038/205] new settings infrastructure done, though there's a
 double free or something in ~Widget()

---
 qtox.pro                               |  9 ++++
 widget/form/settings/avform.cpp        | 26 ++++++++++
 widget/form/settings/avform.h          | 33 ++++++++++++
 widget/form/settings/generalform.cpp   | 46 ++++++++++++++++
 widget/form/settings/generalform.h     | 41 +++++++++++++++
 widget/form/settings/genericsettings.h | 46 ++++++++++++++++
 widget/form/settings/identityform.cpp  | 38 ++++++++++++++
 widget/form/settings/identityform.h    | 34 ++++++++++++
 widget/form/settings/privacyform.cpp   | 27 ++++++++++
 widget/form/settings/privacyform.h     | 33 ++++++++++++
 widget/form/settingswidget.cpp         | 72 +++++++++++++++++++++++---
 widget/form/settingswidget.h           | 41 +++++++++------
 12 files changed, 423 insertions(+), 23 deletions(-)
 create mode 100644 widget/form/settings/avform.cpp
 create mode 100644 widget/form/settings/avform.h
 create mode 100644 widget/form/settings/generalform.cpp
 create mode 100644 widget/form/settings/generalform.h
 create mode 100644 widget/form/settings/genericsettings.h
 create mode 100644 widget/form/settings/identityform.cpp
 create mode 100644 widget/form/settings/identityform.h
 create mode 100644 widget/form/settings/privacyform.cpp
 create mode 100644 widget/form/settings/privacyform.h

diff --git a/qtox.pro b/qtox.pro
index 9112e95c0..5c550cd1f 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -82,6 +82,11 @@ HEADERS  += widget/form/addfriendform.h \
     widget/form/chatform.h \
     widget/form/groupchatform.h \
     widget/form/settingswidget.h \
+    widget/form/settings/genericsettings.h \
+    widget/form/settings/generalform.h \
+    widget/form/settings/identityform.h \
+    widget/form/settings/privacyform.h \
+    widget/form/settings/avform.h \
     widget/form/filesform.h \
     widget/tool/chattextedit.h \
     widget/tool/friendrequestdialog.h \
@@ -119,6 +124,10 @@ SOURCES += \
     widget/form/chatform.cpp \
     widget/form/groupchatform.cpp \
     widget/form/settingswidget.cpp \
+    widget/form/settings/generalform.cpp \
+    widget/form/settings/identityform.cpp \
+    widget/form/settings/privacyform.cpp \
+    widget/form/settings/avform.cpp \
     widget/form/filesform.cpp \
     widget/tool/chattextedit.cpp \
     widget/tool/friendrequestdialog.cpp \
diff --git a/widget/form/settings/avform.cpp b/widget/form/settings/avform.cpp
new file mode 100644
index 000000000..347a1cfbb
--- /dev/null
+++ b/widget/form/settings/avform.cpp
@@ -0,0 +1,26 @@
+/*
+    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 "avform.h"
+
+AVForm::AVForm()
+{
+    prep();
+}
+
+AVForm::~AVForm()
+{
+}
diff --git a/widget/form/settings/avform.h b/widget/form/settings/avform.h
new file mode 100644
index 000000000..e214e133e
--- /dev/null
+++ b/widget/form/settings/avform.h
@@ -0,0 +1,33 @@
+/*
+    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 AVFORM_H
+#define AVFORM_H
+
+#include "genericsettings.h"
+
+class AVForm : public GenericForm
+{
+    Q_OBJECT
+public:
+    AVForm();
+    ~AVForm();
+
+private:
+    
+};
+
+#endif
diff --git a/widget/form/settings/generalform.cpp b/widget/form/settings/generalform.cpp
new file mode 100644
index 000000000..050d4f7eb
--- /dev/null
+++ b/widget/form/settings/generalform.cpp
@@ -0,0 +1,46 @@
+/*
+    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 "generalform.h"
+#include "widget/form/settingswidget.h"
+
+GeneralForm::GeneralForm()
+{
+    prep();
+    group = new QGroupBox(tr("General Settings"));
+    enableIPv6 = new QCheckBox();
+    enableIPv6->setText(tr("Enable IPv6 (recommended)","Text on a checkbox to enable IPv6"));
+    useTranslations = new QCheckBox();
+    useTranslations->setText(tr("Use translations","Text on a checkbox to enable translations"));
+    makeToxPortable = new QCheckBox();
+    makeToxPortable->setText(tr("Make Tox portable","Text on a checkbox to make qTox a portable application"));
+    makeToxPortable->setToolTip(tr("Save settings to the working directory instead of the usual conf dir","describes makeToxPortable checkbox"));
+
+    QVBoxLayout *vLayout = new QVBoxLayout();
+    vLayout->addWidget(enableIPv6);
+    vLayout->addWidget(useTranslations);
+    vLayout->addWidget(makeToxPortable);
+    group->setLayout(vLayout);
+    
+    label.setText(tr("General Settings"));
+    
+    headLayout.addWidget(&label);
+    layout.addWidget(group);
+}
+
+GeneralForm::~GeneralForm()
+{
+}
diff --git a/widget/form/settings/generalform.h b/widget/form/settings/generalform.h
new file mode 100644
index 000000000..c484a436d
--- /dev/null
+++ b/widget/form/settings/generalform.h
@@ -0,0 +1,41 @@
+/*
+    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 GENERALFORM_H
+#define GENERALFORM_H
+
+#include "genericsettings.h"
+#include <QGroupBox>
+#include <QCheckBox>
+#include <QLabel>
+
+
+class GeneralForm : public GenericForm
+{
+    Q_OBJECT
+public:
+    GeneralForm();
+    ~GeneralForm();
+
+private:
+    QGroupBox *group;
+    QCheckBox* enableIPv6;
+    QCheckBox* useTranslations;
+    QCheckBox* makeToxPortable;
+    QLabel label;
+};
+
+#endif
diff --git a/widget/form/settings/genericsettings.h b/widget/form/settings/genericsettings.h
new file mode 100644
index 000000000..9353d21df
--- /dev/null
+++ b/widget/form/settings/genericsettings.h
@@ -0,0 +1,46 @@
+/*
+    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 GENERICFORM_H
+#define GENERICFORM_H
+
+#include <QObject>
+#include <QVBoxLayout>
+#include "widget/form/settingswidget.h"
+
+class GenericForm : public QObject
+{
+    Q_OBJECT
+public:
+    virtual void show(SettingsWidget& sw)
+    {
+        sw.body->layout()->addWidget(&body);
+        body.show();
+        sw.head->layout()->addWidget(&head);
+        head.show();
+    }
+
+protected:
+    QVBoxLayout layout, headLayout;
+    QWidget head, body;
+    void prep() // call in subclass constructor
+    {
+        head.setLayout(&headLayout);
+        body.setLayout(&layout);
+    }
+};
+
+#endif
diff --git a/widget/form/settings/identityform.cpp b/widget/form/settings/identityform.cpp
new file mode 100644
index 000000000..dbd5574c5
--- /dev/null
+++ b/widget/form/settings/identityform.cpp
@@ -0,0 +1,38 @@
+/*
+    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 "identityform.h"
+#include "widget/form/settingswidget.h"
+#include <QLabel>
+#include <QLineEdit>
+
+IdentityForm::IdentityForm()
+{
+    prep();
+    toxGroup = new QGroupBox(tr("Tox ID"));
+    QLabel* toxIdLabel = new QLabel(tr("Your Tox ID"));
+    QLineEdit* toxID = new QLineEdit();
+    toxID->setReadOnly(true);
+    QVBoxLayout* toxLayout = new QVBoxLayout();
+    toxLayout->addWidget(toxIdLabel);
+    toxLayout->addWidget(toxID);
+    toxGroup->setLayout(toxLayout);
+    layout.addWidget(toxGroup);
+}
+
+IdentityForm::~IdentityForm()
+{
+}
diff --git a/widget/form/settings/identityform.h b/widget/form/settings/identityform.h
new file mode 100644
index 000000000..dc616d75e
--- /dev/null
+++ b/widget/form/settings/identityform.h
@@ -0,0 +1,34 @@
+/*
+    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 IDENTITYFORM_H
+#define IDENTITYFORM_H
+
+#include "genericsettings.h"
+#include <QGroupBox>
+
+class IdentityForm : public GenericForm
+{
+    Q_OBJECT
+public:
+    IdentityForm();
+    ~IdentityForm();
+
+private:
+    QGroupBox* toxGroup;
+};
+
+#endif
diff --git a/widget/form/settings/privacyform.cpp b/widget/form/settings/privacyform.cpp
new file mode 100644
index 000000000..856f64954
--- /dev/null
+++ b/widget/form/settings/privacyform.cpp
@@ -0,0 +1,27 @@
+/*
+    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 "privacyform.h"
+#include "widget/form/settingswidget.h"
+
+PrivacyForm::PrivacyForm()
+{
+    prep();
+}
+
+PrivacyForm::~PrivacyForm()
+{
+}
diff --git a/widget/form/settings/privacyform.h b/widget/form/settings/privacyform.h
new file mode 100644
index 000000000..ae1e61956
--- /dev/null
+++ b/widget/form/settings/privacyform.h
@@ -0,0 +1,33 @@
+/*
+    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 PRIVACYFORM_H
+#define PRIVACYFORM_H
+
+#include "genericsettings.h"
+
+class PrivacyForm : public GenericForm
+{
+    Q_OBJECT
+public:
+    PrivacyForm();
+    ~PrivacyForm();
+
+private:
+    
+};
+
+#endif
diff --git a/widget/form/settingswidget.cpp b/widget/form/settingswidget.cpp
index fcbd2a981..3a13c1cdb 100644
--- a/widget/form/settingswidget.cpp
+++ b/widget/form/settingswidget.cpp
@@ -17,21 +17,41 @@
 #include "settingswidget.h"
 #include "widget/widget.h"
 #include "ui_mainwindow.h"
+#include "widget/form/settings/generalform.h"
+#include "widget/form/settings/identityform.h"
+#include "widget/form/settings/privacyform.h"
+#include "widget/form/settings/avform.h"
 
 SettingsWidget::SettingsWidget()
     : QWidget()
 {
-    _main = new QWidget();
+    generalForm  = new GeneralForm();
+    identityForm = new IdentityForm();
+    privacyForm  = new PrivacyForm();
+    avForm       = new AVForm();
+
     main = new QWidget();
+    body = new QWidget();
     head = new QWidget();
     foot = new QWidget();
+    
+    head->setLayout(new QVBoxLayout());
+    body->setLayout(new QVBoxLayout());
+    
     prepButtons();    
     foot->setLayout(iconsLayout);
-    _mainLayout = new QVBoxLayout(_main);
-    _mainLayout->addWidget(main);
-    _mainLayout->addWidget(foot);
+    mainLayout = new QVBoxLayout(main);
+    mainLayout->addWidget(body);
+    mainLayout->addWidget(foot);
     // something something foot size
-    _main->setLayout(_mainLayout);
+    main->setLayout(mainLayout);
+    
+    connect(generalButton,  &QPushButton::clicked, this, &SettingsWidget::onGeneralClicked);
+    connect(identityButton, &QPushButton::clicked, this, &SettingsWidget::onIdentityClicked);
+    connect(privacyButton,  &QPushButton::clicked, this, &SettingsWidget::onPrivacyClicked);
+    connect(avButton,  &QPushButton::clicked, this, &SettingsWidget::onAVClicked);
+    
+    active = generalForm;
 }
 
 SettingsWidget::~SettingsWidget()
@@ -40,12 +60,50 @@ SettingsWidget::~SettingsWidget()
 
 void SettingsWidget::show(Ui::MainWindow& ui)
 {
-    ui.mainContent->layout()->addWidget(_main);
+    active->show(*this);
+    ui.mainContent->layout()->addWidget(main);
     ui.mainHead->layout()->addWidget(head);
-    _main->show();
+    main->show();
     head->show();
 }
 
+void SettingsWidget::onGeneralClicked()
+{
+    hideSettingsForms();
+    active = generalForm;
+    generalForm->show(*this);
+}
+
+void SettingsWidget::onIdentityClicked()
+{
+    hideSettingsForms();
+    active = identityForm;
+    identityForm->show(*this);
+}
+
+void SettingsWidget::onPrivacyClicked()
+{
+    hideSettingsForms();
+    active = privacyForm;
+    privacyForm->show(*this);
+}
+
+void SettingsWidget::onAVClicked()
+{
+    hideSettingsForms();
+    active = avForm;
+    avForm->show(*this);
+}
+
+void SettingsWidget::hideSettingsForms()
+{
+    QLayoutItem *item;
+    while ((item = head->layout()->takeAt(0)) != 0)
+        item->widget()->hide();
+    while ((item = body->layout()->takeAt(0)) != 0)
+        item->widget()->hide();
+}
+
 void SettingsWidget::prepButtons()
 {
     // this crap is copied from ui_mainwindow.h... there's no easy way around
diff --git a/widget/form/settingswidget.h b/widget/form/settingswidget.h
index c901ce906..6ee45f90d 100644
--- a/widget/form/settingswidget.h
+++ b/widget/form/settingswidget.h
@@ -19,11 +19,12 @@
 
 #include <QHBoxLayout>
 #include <QPushButton>
-#include <QObject>
-#include "widget/croppinglabel.h"
-
-namespace Ui {class MainWindow;}
-class QString;
+class GenericForm;
+class GeneralForm;
+class IdentityForm;
+class PrivacyForm;
+class AVForm;
+namespace Ui {class MainWindow;};
 
 class SettingsWidget : public QWidget
 {
@@ -33,30 +34,38 @@ public:
     ~SettingsWidget();
 
     void show(Ui::MainWindow &ui);
+    
+    QWidget *head, *body; // keep the others private
 
 public slots:
     //void setFriendAddress(const QString& friendAddress);
 
 private slots:
+    void onGeneralClicked();
+    void onIdentityClicked();
+    void onPrivacyClicked();
+    void onAVClicked();
 
 private:
-    QWidget *_main, *main, *head, *foot;
-    // _main consists of main+foot
-    QVBoxLayout *_mainLayout;
+    QWidget *main, *foot;
+    // main consists of body+foot for Ui::MainWindow
+    QVBoxLayout *mainLayout;
+    
+    GenericForm* active;
+    GeneralForm* generalForm;
+    IdentityForm* identityForm;
+    PrivacyForm* privacyForm;
+    AVForm* avForm;
+    void hideSettingsForms();
+    
+    
     // the code pertaining to the icons is mostly copied from ui_mainwindow.h
     QHBoxLayout *iconsLayout;
     QPushButton *generalButton;
     QPushButton *identityButton;
     QPushButton *privacyButton;
     QPushButton *avButton;
-    
-    // now the actual pages and stuff
-    // ...
-
-
-
     void prepButtons(); // just so I can move the crap to the bottom of the file
-public:
 };
 
-#endif // SETTINGSFORM_H
+#endif // SETTINGSWIDGET_H

From 575862f25f1b0f5b18ff4c2698c572a590d26277 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Mon, 15 Sep 2014 08:31:42 -0500
Subject: [PATCH 039/205] cosmetics

---
 widget/form/settings/avform.cpp        | 2 ++
 widget/form/settings/generalform.cpp   | 2 ++
 widget/form/settings/genericsettings.h | 8 +++++++-
 widget/form/settings/identityform.cpp  | 2 ++
 widget/form/settings/privacyform.cpp   | 2 ++
 widget/form/settingswidget.cpp         | 2 +-
 6 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/widget/form/settings/avform.cpp b/widget/form/settings/avform.cpp
index 347a1cfbb..5c0b38da3 100644
--- a/widget/form/settings/avform.cpp
+++ b/widget/form/settings/avform.cpp
@@ -19,6 +19,8 @@
 AVForm::AVForm()
 {
     prep();
+    icon.addFile(":/img/settings/av.png");
+    label.setText(tr("Audio/Video settings"));
 }
 
 AVForm::~AVForm()
diff --git a/widget/form/settings/generalform.cpp b/widget/form/settings/generalform.cpp
index 050d4f7eb..a9810c1ae 100644
--- a/widget/form/settings/generalform.cpp
+++ b/widget/form/settings/generalform.cpp
@@ -20,6 +20,8 @@
 GeneralForm::GeneralForm()
 {
     prep();
+    icon.addFile(":/img/settings/general.png");
+    label.setText(tr("General settings"));
     group = new QGroupBox(tr("General Settings"));
     enableIPv6 = new QCheckBox();
     enableIPv6->setText(tr("Enable IPv6 (recommended)","Text on a checkbox to enable IPv6"));
diff --git a/widget/form/settings/genericsettings.h b/widget/form/settings/genericsettings.h
index 9353d21df..94f8fe90f 100644
--- a/widget/form/settings/genericsettings.h
+++ b/widget/form/settings/genericsettings.h
@@ -34,13 +34,19 @@ public:
     }
 
 protected:
-    QVBoxLayout layout, headLayout;
+    QVBoxLayout layout;
+    QHBoxLayout headLayout;
+    QIcon icon;
+    QLabel label;
     QWidget head, body;
     void prep() // call in subclass constructor
     {
         head.setLayout(&headLayout);
+        headLayout.addWidget(&icon);
+        headLayout.addWidget(&label);
         body.setLayout(&layout);
     }
+
 };
 
 #endif
diff --git a/widget/form/settings/identityform.cpp b/widget/form/settings/identityform.cpp
index dbd5574c5..ac89257a9 100644
--- a/widget/form/settings/identityform.cpp
+++ b/widget/form/settings/identityform.cpp
@@ -22,6 +22,8 @@
 IdentityForm::IdentityForm()
 {
     prep();
+    icon.addFile(":/img/settings/identity.png");
+    label.setText(tr("Your identity"));
     toxGroup = new QGroupBox(tr("Tox ID"));
     QLabel* toxIdLabel = new QLabel(tr("Your Tox ID"));
     QLineEdit* toxID = new QLineEdit();
diff --git a/widget/form/settings/privacyform.cpp b/widget/form/settings/privacyform.cpp
index 856f64954..ef7c54c4b 100644
--- a/widget/form/settings/privacyform.cpp
+++ b/widget/form/settings/privacyform.cpp
@@ -20,6 +20,8 @@
 PrivacyForm::PrivacyForm()
 {
     prep();
+    icon.addFile(":/img/settings/privacy.png");
+    label.setText(tr("Privacy settings"));
 }
 
 PrivacyForm::~PrivacyForm()
diff --git a/widget/form/settingswidget.cpp b/widget/form/settingswidget.cpp
index 3a13c1cdb..9b5dc7856 100644
--- a/widget/form/settingswidget.cpp
+++ b/widget/form/settingswidget.cpp
@@ -110,7 +110,7 @@ void SettingsWidget::prepButtons()
     // just straight up copying it like this... oh well
     // the layout/icons obviously need to be improved, but it's a working model,
     // not a pretty one
-    QSizePolicy sizePolicy3(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+    QSizePolicy sizePolicy3(QSizePolicy::Fixed, QSizePolicy::Fixed);
     sizePolicy3.setHorizontalStretch(0);
     sizePolicy3.setVerticalStretch(0);
     foot->setObjectName(QStringLiteral("foot"));

From 9d36833a8ba0aea01bd0d615ff1e19cf2b62b81a Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Mon, 15 Sep 2014 08:48:17 -0500
Subject: [PATCH 040/205] scaling still isn't quite right...

---
 widget/form/settings/avform.cpp        | 2 +-
 widget/form/settings/generalform.cpp   | 2 +-
 widget/form/settings/genericsettings.h | 4 ++--
 widget/form/settings/identityform.cpp  | 2 +-
 widget/form/settings/privacyform.cpp   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/widget/form/settings/avform.cpp b/widget/form/settings/avform.cpp
index 5c0b38da3..e0b0773f9 100644
--- a/widget/form/settings/avform.cpp
+++ b/widget/form/settings/avform.cpp
@@ -19,7 +19,7 @@
 AVForm::AVForm()
 {
     prep();
-    icon.addFile(":/img/settings/av.png");
+    icon.setPixmap(QPixmap(":/img/settings/av.png").scaledToHeight(headLayout.sizeHint().height(), Qt::SmoothTransformation));
     label.setText(tr("Audio/Video settings"));
 }
 
diff --git a/widget/form/settings/generalform.cpp b/widget/form/settings/generalform.cpp
index a9810c1ae..7a6734383 100644
--- a/widget/form/settings/generalform.cpp
+++ b/widget/form/settings/generalform.cpp
@@ -20,7 +20,7 @@
 GeneralForm::GeneralForm()
 {
     prep();
-    icon.addFile(":/img/settings/general.png");
+    icon.setPixmap(QPixmap(":/img/settings/general.png").scaledToHeight(headLayout.sizeHint().height(), Qt::SmoothTransformation));
     label.setText(tr("General settings"));
     group = new QGroupBox(tr("General Settings"));
     enableIPv6 = new QCheckBox();
diff --git a/widget/form/settings/genericsettings.h b/widget/form/settings/genericsettings.h
index 94f8fe90f..760d39cb0 100644
--- a/widget/form/settings/genericsettings.h
+++ b/widget/form/settings/genericsettings.h
@@ -19,6 +19,7 @@
 
 #include <QObject>
 #include <QVBoxLayout>
+#include <QLabel>
 #include "widget/form/settingswidget.h"
 
 class GenericForm : public QObject
@@ -36,8 +37,7 @@ public:
 protected:
     QVBoxLayout layout;
     QHBoxLayout headLayout;
-    QIcon icon;
-    QLabel label;
+    QLabel label, icon;
     QWidget head, body;
     void prep() // call in subclass constructor
     {
diff --git a/widget/form/settings/identityform.cpp b/widget/form/settings/identityform.cpp
index ac89257a9..696b2141a 100644
--- a/widget/form/settings/identityform.cpp
+++ b/widget/form/settings/identityform.cpp
@@ -22,7 +22,7 @@
 IdentityForm::IdentityForm()
 {
     prep();
-    icon.addFile(":/img/settings/identity.png");
+    icon.setPixmap(QPixmap(":/img/settings/identity.png").scaledToHeight(headLayout.sizeHint().height(), Qt::SmoothTransformation));
     label.setText(tr("Your identity"));
     toxGroup = new QGroupBox(tr("Tox ID"));
     QLabel* toxIdLabel = new QLabel(tr("Your Tox ID"));
diff --git a/widget/form/settings/privacyform.cpp b/widget/form/settings/privacyform.cpp
index ef7c54c4b..e1f737975 100644
--- a/widget/form/settings/privacyform.cpp
+++ b/widget/form/settings/privacyform.cpp
@@ -20,7 +20,7 @@
 PrivacyForm::PrivacyForm()
 {
     prep();
-    icon.addFile(":/img/settings/privacy.png");
+    icon.setPixmap(QPixmap(":/img/settings/privacy.png").scaledToHeight(headLayout.sizeHint().height(), Qt::SmoothTransformation));
     label.setText(tr("Privacy settings"));
 }
 

From 35128e5048b2e05e0dca790d743c3249ee9e7e23 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Tue, 16 Sep 2014 12:13:21 -0500
Subject: [PATCH 041/205] cleanup

---
 widget/settingsdialog.cpp | 380 --------------------------------------
 widget/settingsdialog.h   |  64 -------
 2 files changed, 444 deletions(-)
 delete mode 100644 widget/settingsdialog.cpp
 delete mode 100644 widget/settingsdialog.h

diff --git a/widget/settingsdialog.cpp b/widget/settingsdialog.cpp
deleted file mode 100644
index d81973286..000000000
--- a/widget/settingsdialog.cpp
+++ /dev/null
@@ -1,380 +0,0 @@
-#include "settingsdialog.h"
-#include "settings.h"
-#include "widget.h"
-#include "camera.h"
-#include "selfcamview.h"
-#include "core.h"
-#include "smileypack.h"
-
-#include <QListWidget>
-#include <QListWidgetItem>
-#include <QStackedWidget>
-#include <QPushButton>
-#include <QBoxLayout>
-#include <QLabel>
-#include <QGroupBox>
-#include <QCheckBox>
-#include <QLineEdit>
-#include <QComboBox>
-
-
-// =======================================
-// settings pages
-//========================================
-class GeneralPage : public QWidget
-{
-    Q_OBJECT
-public:
-    GeneralPage(QWidget *parent = 0) :
-        QWidget(parent)
-    {
-        QGroupBox *group = new QGroupBox(tr("General Settings"), this);
-
-        enableIPv6 = new QCheckBox(this);
-        enableIPv6->setText(tr("Enable IPv6 (recommended)","Text on a checkbox to enable IPv6"));
-        useTranslations = new QCheckBox(this);
-        useTranslations->setText(tr("Use translations","Text on a checkbox to enable translations"));
-        makeToxPortable = new QCheckBox(this);
-        makeToxPortable->setText(tr("Make Tox portable","Text on a checkbox to make qTox a portable application"));
-        makeToxPortable->setToolTip(tr("Save settings to the working directory instead of the usual conf dir","describes makeToxPortable checkbox"));
-
-        QVBoxLayout *vLayout = new QVBoxLayout();
-        vLayout->addWidget(enableIPv6);
-        vLayout->addWidget(useTranslations);
-        vLayout->addWidget(makeToxPortable);
-        group->setLayout(vLayout);
-
-        // theme
-        QGroupBox* themeGroup = new QGroupBox(tr("Theme"));
-        QLabel* smileyLabel = new QLabel(tr("Smiley Pack"));
-        smileyPack = new QComboBox(this);
-
-        auto smileyPacks = SmileyPack::listSmileyPacks();
-        for(auto pack : smileyPacks)
-            smileyPack->addItem(QString("%1 (%2)").arg(pack.first).arg(pack.second), pack.second);
-
-        QVBoxLayout* themeLayout = new QVBoxLayout();
-        themeLayout->addWidget(smileyLabel);
-        themeLayout->addWidget(smileyPack);
-        themeGroup->setLayout(themeLayout);
-
-        QVBoxLayout *mainLayout = new QVBoxLayout();
-        mainLayout->addWidget(group);
-        mainLayout->addWidget(themeGroup);
-        mainLayout->addStretch(1);
-        setLayout(mainLayout);
-    }
-
-    QCheckBox* enableIPv6;
-    QCheckBox* useTranslations;
-    QCheckBox* makeToxPortable;
-    QComboBox* smileyPack;
-};
-
-class IdentityPage : public QWidget
-{
-    Q_OBJECT
-public:
-    IdentityPage(QWidget* parent = 0) :
-        QWidget(parent)
-    {
-        // public
-        QGroupBox *publicGroup = new QGroupBox(tr("Public Information"), this);
-        QLabel* userNameLabel = new QLabel(tr("Name","Username/nick"), this);
-        userName = new QLineEdit(this);
-        QLabel* statusMessageLabel = new QLabel(tr("Status","Status message"), this);
-        statusMessage = new QLineEdit(this);
-        QVBoxLayout *vLayout = new QVBoxLayout();
-        vLayout->addWidget(userNameLabel);
-        vLayout->addWidget(userName);
-        vLayout->addWidget(statusMessageLabel);
-        vLayout->addWidget(statusMessage);
-        publicGroup->setLayout(vLayout);
-
-        // tox
-        QGroupBox* toxGroup = new QGroupBox(tr("Tox ID"), this);
-        QLabel* toxIdLabel = new QLabel(tr("Your Tox ID"), this);
-        toxID = new QLineEdit(this);
-        toxID->setReadOnly(true);
-        QVBoxLayout* toxLayout = new QVBoxLayout();
-        toxLayout->addWidget(toxIdLabel);
-        toxLayout->addWidget(toxID);
-        toxGroup->setLayout(toxLayout);
-
-        QVBoxLayout *mainLayout = new QVBoxLayout();
-        mainLayout->setSpacing(30);
-        mainLayout->addWidget(publicGroup);
-        mainLayout->addWidget(toxGroup);
-        mainLayout->addStretch(1);
-        setLayout(mainLayout);
-    }
-
-    QLineEdit* userName;
-    QLineEdit* statusMessage;
-    QLineEdit* toxID;
-};
-
-class PrivacyPage : public QWidget
-{
-public:
-    PrivacyPage(QWidget* parent = 0) :
-        QWidget(parent)
-    {}
-};
-
-class AVPage : public QWidget
-{
-    Q_OBJECT
-public:
-    AVPage(SettingsDialog* parent = 0) :
-        QWidget(parent)
-    {
-        QGroupBox *group = new QGroupBox(tr("Video Settings"), this);
-
-        camView = new SelfCamView(parent->getWidget()->getCamera());
-        camView->hide(); // hide by default
-        testVideo = new QPushButton(tr("Show video preview","On a button"));
-        connect(testVideo, SIGNAL(clicked()), this, SLOT(onTestVideoPressed()));
-
-        QVBoxLayout *vLayout = new QVBoxLayout();
-        vLayout->addWidget(testVideo);
-        vLayout->addWidget(camView);
-        group->setLayout(vLayout);
-
-        QVBoxLayout *mainLayout = new QVBoxLayout();
-        mainLayout->addWidget(group);
-        mainLayout->addStretch(1);
-        setLayout(mainLayout);
-    }
-
-    ~AVPage()
-    {
-        delete camView;
-    }
-
-    void showTestVideo()
-    {
-        testVideo->setText(tr("Hide video preview","On a button"));
-        camView->show();
-    }
-
-    void closeTestVideo()
-    {
-        testVideo->setText(tr("Show video preview","On a button"));
-        camView->close();
-    }
-
-    QPushButton* testVideo;
-    SelfCamView* camView;
-
-public slots:
-    void onTestVideoPressed()
-    {
-        if (camView->isVisible()) {
-            closeTestVideo();
-        } else {
-            showTestVideo();
-        }
-    }
-};
-
-// allows Q_OBJECT macro inside cpp
-#include "settingsdialog.moc"
-
-
-
-// =======================================
-// settings dialog
-//========================================
-SettingsDialog::SettingsDialog(Widget *parent) :
-    QDialog(parent),
-    widget(parent)
-{
-    createPages();
-    createButtons();
-    createConnections();
-    createLayout();
-    setWindowTitle(tr("qTox – Settings"));
-}
-
-void SettingsDialog::createPages()
-{
-    generalPage  = new GeneralPage(this);
-    identityPage = new IdentityPage(this);
-    privacyPage  = new PrivacyPage(this);
-    avPage       = new AVPage(this);
-
-    contentsWidget = new QListWidget;
-    contentsWidget->setViewMode(QListView::IconMode);
-    contentsWidget->setIconSize(QSize(100, 73));
-    contentsWidget->setMovement(QListView::Static);
-    contentsWidget->setMaximumWidth(110);
-    contentsWidget->setMinimumWidth(110);
-    contentsWidget->setSpacing(0);
-    contentsWidget->setFlow(QListView::TopToBottom);
-
-    pagesWidget = new QStackedWidget;
-    pagesWidget->addWidget(generalPage);
-    pagesWidget->addWidget(identityPage);
-    pagesWidget->addWidget(privacyPage);
-    pagesWidget->addWidget(avPage);
-
-    QListWidgetItem *generalButton = new QListWidgetItem(contentsWidget);
-    generalButton->setIcon(QIcon(":/img/settings/general.png"));
-    generalButton->setText(tr("General"));
-    generalButton->setTextAlignment(Qt::AlignHCenter);
-    generalButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-
-    QListWidgetItem *identity = new QListWidgetItem(contentsWidget);
-    identity->setIcon(QIcon(":/img/settings/identity.png"));
-    identity->setText(tr("Identity"));
-    identity->setTextAlignment(Qt::AlignHCenter);
-    identity->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-
-    QListWidgetItem *privacy = new QListWidgetItem(contentsWidget);
-    privacy->setIcon(QIcon(":/img/settings/privacy.png"));
-    privacy->setText(tr("Privacy"));
-    privacy->setTextAlignment(Qt::AlignHCenter);
-    privacy->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-
-    QListWidgetItem *av = new QListWidgetItem(contentsWidget);
-    av->setIcon(QIcon(":/img/settings/av.png"));
-    av->setText(tr("Audio/Video"));
-    av->setTextAlignment(Qt::AlignHCenter);
-    av->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-
-    contentsWidget->setCurrentRow(0);
-}
-
-void SettingsDialog::createButtons()
-{
-    okButton     = new QPushButton(tr("Ok"), this);
-    cancelButton = new QPushButton(tr("Cancel"), this);
-    applyButton  = new QPushButton(tr("Apply"), this);
-}
-
-void SettingsDialog::createConnections()
-{
-    connect(okButton, SIGNAL(clicked()), this, SLOT(okPressed()));
-    connect(cancelButton, SIGNAL(clicked()), this, SLOT(close()));
-    connect(applyButton, SIGNAL(clicked()), this, SLOT(applyPressed()));
-    connect(
-        contentsWidget,
-        SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
-        this,
-        SLOT(changePage(QListWidgetItem*,QListWidgetItem*))
-    );
-}
-
-void SettingsDialog::createLayout()
-{
-    setMinimumSize(800, 500);
-
-    QHBoxLayout *buttonsLayout = new QHBoxLayout();
-    buttonsLayout->addStretch(1);
-    buttonsLayout->addWidget(okButton);
-    buttonsLayout->addWidget(cancelButton);
-    buttonsLayout->addWidget(applyButton);
-
-    QHBoxLayout *hLayout = new QHBoxLayout();
-    hLayout->addWidget(contentsWidget);
-    hLayout->addWidget(pagesWidget, 1);
-
-    QVBoxLayout *mainLayout = new QVBoxLayout();
-    mainLayout->addLayout(hLayout);
-    mainLayout->addLayout(buttonsLayout);
-    setLayout(mainLayout);
-}
-
-void SettingsDialog::changePage(QListWidgetItem *current, QListWidgetItem *previous)
-{
-    if (!current) {
-        current = previous;
-    }
-    pagesWidget->setCurrentIndex(contentsWidget->row(current));
-}
-
-void SettingsDialog::okPressed()
-{
-    writeConfig();
-    close();
-}
-
-void SettingsDialog::cancelPressed()
-{
-    close();
-}
-
-void SettingsDialog::applyPressed()
-{
-    writeConfig();
-}
-
-void SettingsDialog::readConfig()
-{
-    Settings& settings = Settings::getInstance();
-    Core* core = widget->getCore();
-
-    generalPage->enableIPv6->setChecked(settings.getEnableIPv6());
-    generalPage->useTranslations->setChecked(settings.getUseTranslations());
-    generalPage->makeToxPortable->setChecked(settings.getMakeToxPortable());
-
-    identityPage->userName->setText(core->getUsername());
-    identityPage->statusMessage->setText(core->getStatusMessage());
-    identityPage->toxID->setText(core->getSelfId().toString());
-}
-
-void SettingsDialog::writeConfig()
-{
-    Settings& settings = Settings::getInstance();
-    Core* core = widget->getCore();
-
-
-    // only save settings if something changed
-    bool saveSettings = false;
-    if (settings.getEnableIPv6() != generalPage->enableIPv6->isChecked()) {
-        settings.setEnableIPv6(generalPage->enableIPv6->isChecked());
-        saveSettings = true;
-    }
-
-    if (settings.getUseTranslations() != generalPage->useTranslations->isChecked()) {
-        settings.setUseTranslations(generalPage->useTranslations->isChecked());
-        saveSettings = true;
-    }
-
-    if (settings.getMakeToxPortable() != generalPage->makeToxPortable->isChecked()) {
-        settings.setMakeToxPortable(generalPage->makeToxPortable->isChecked());
-        saveSettings = true;
-    }
-
-    if (settings.getSmileyPack() != generalPage->smileyPack->currentData().toString()) {
-        settings.setSmileyPack(generalPage->smileyPack->currentData().toString());
-        saveSettings = true;
-    }
-
-    if (saveSettings) {
-        settings.save();
-    }
-
-
-    // changing core settings will automatically save them
-    QString userName = identityPage->userName->text();
-    if (core->getUsername() != userName) {
-        core->setUsername(userName);
-    }
-
-    QString statusMessage = identityPage->statusMessage->text();
-    if (core->getStatusMessage() != statusMessage) {
-        core->setStatusMessage(statusMessage);
-    }
-}
-
-Widget* SettingsDialog::getWidget()
-{
-    return widget;
-}
-
-void SettingsDialog::closeEvent(QCloseEvent* e){
-    avPage->closeTestVideo();
-    QDialog::closeEvent(e);
-}
diff --git a/widget/settingsdialog.h b/widget/settingsdialog.h
deleted file mode 100644
index 55575b447..000000000
--- a/widget/settingsdialog.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef SETTINGSDIALOG_H
-#define SETTINGSDIALOG_H
-
-#include <QWidget>
-#include <QDialog>
-
-class Widget;
-class SelfCamView;
-class Camera;
-class GeneralPage;
-class IdentityPage;
-class PrivacyPage;
-class AVPage;
-
-class QListWidget;
-class QListWidgetItem;
-class QStackedWidget;
-class QPushButton;
-class QCheckBox;
-class QLineEdit;
-
-// =======================================
-// settings dialog
-//========================================
-class SettingsDialog : public QDialog
-{
-    Q_OBJECT
-public:
-    explicit SettingsDialog(Widget *parent);
-
-    void readConfig();
-    void writeConfig();
-    Widget* getWidget();
-    void closeEvent(QCloseEvent *);
-
-public slots:
-    void changePage(QListWidgetItem *current, QListWidgetItem *previous);
-    void okPressed();
-    void cancelPressed();
-    void applyPressed();
-
-private:
-    void createPages();
-    void createButtons();
-    void createConnections();
-    void createLayout();
-
-    Widget* widget;
-
-    // pages
-    GeneralPage*    generalPage;
-    IdentityPage*   identityPage;
-    PrivacyPage*    privacyPage;
-    AVPage*         avPage;
-    QListWidget*    contentsWidget;
-    QStackedWidget* pagesWidget;
-
-    // buttons
-    QPushButton* okButton;
-    QPushButton* cancelButton;
-    QPushButton* applyButton;
-};
-
-#endif // SETTINGSDIALOG_H

From 9d3bcaa3877b9f94173f08d71d256ad185124a1b Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Thu, 18 Sep 2014 00:55:43 +0700
Subject: [PATCH 042/205] bug fix in ChatAreaWidget: absolute coordinates
 should be used to detect clicks on a FileTransferInstance's buttons

---
 widget/chatareawidget.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/widget/chatareawidget.cpp b/widget/chatareawidget.cpp
index f06ec9534..f52262e5d 100644
--- a/widget/chatareawidget.cpp
+++ b/widget/chatareawidget.cpp
@@ -21,6 +21,7 @@
 #include <QTextTable>
 #include <QAbstractTextDocumentLayout>
 #include <QCoreApplication>
+#include <QDebug>
 
 ChatAreaWidget::ChatAreaWidget(QWidget *parent) :
     QTextBrowser(parent)
@@ -64,12 +65,14 @@ ChatAreaWidget::~ChatAreaWidget()
 void ChatAreaWidget::mouseReleaseEvent(QMouseEvent * event)
 {
     QTextEdit::mouseReleaseEvent(event);
-    int pos = this->document()->documentLayout()->hitTest(event->pos(), Qt::ExactHit);
+    QPointF documentHitPost(event->pos().x() + horizontalScrollBar()->value(), event->pos().y() + verticalScrollBar()->value());
+    int pos = this->document()->documentLayout()->hitTest(documentHitPost, Qt::ExactHit);
     if (pos > 0)
     {
         QTextCursor cursor(document());
-            cursor.setPosition(pos);
-        if( ! cursor.atEnd() )
+        cursor.setPosition(pos);
+
+        if(!cursor.atEnd())
         {
             cursor.setPosition(pos+1);
 
@@ -85,6 +88,7 @@ void ChatAreaWidget::mouseReleaseEvent(QMouseEvent * event)
                     int middlepos = data.indexOf(".");
                     QString widgetID = data.left(middlepos);
                     QString widgetBtn = data.right(data.length() - middlepos - 1);
+                    qDebug() << "ChatAreaWidget::mouseReleaseEvent:" << widgetID << widgetBtn;
                     emit onFileTranfertInterract(widgetID, widgetBtn);
                 }
             }

From d0c42533ac57ccd6331a185a1035a4333d888045 Mon Sep 17 00:00:00 2001
From: Zetok Zalbavar <zexavexxe@gmail.com>
Date: Sat, 20 Sep 2014 20:56:06 +0100
Subject: [PATCH 043/205] Try fix jenkins windows builds

---
 qtox.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qtox.pro b/qtox.pro
index 250d3abc8..9b7b4a3f8 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -46,7 +46,7 @@ contains(JENKINS,YES) {
 
 # Rules for Windows, Mac OSX, and Linux
 win32 {
-    LIBS += -L$$PWD/libs/lib -llibopencv_core249 -llibopencv_highgui249 -llibopencv_imgproc249 -lOpenAL32
+    LIBS += -L$$PWD/libs/lib -lopencv_core249 -lopencv_highgui249 -lopencv_imgproc249 -lOpenAL32
     LIBS += $$PWD/libs/lib/libtoxav.a $$PWD/libs/lib/libopus.a $$PWD/libs/lib/libvpx.a $$PWD/libs/lib/libtoxcore.a -lws2_32 $$PWD/libs/lib/libsodium.a -lpthread -liphlpapi
 } else {
     macx {

From 68654179e99645198b24e78b00676ff0ada7dc63 Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Sun, 21 Sep 2014 17:30:10 +0700
Subject: [PATCH 044/205] Split message

---
 core.cpp    | 46 +++++++++++++++++++++++++++++++++++++++++-----
 core.h      |  3 +++
 cstring.cpp | 19 ++++++++++++++++---
 cstring.h   |  3 +++
 4 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/core.cpp b/core.cpp
index fe1e3187b..c37c78146 100644
--- a/core.cpp
+++ b/core.cpp
@@ -34,6 +34,7 @@
 #include <QTimer>
 #include <QCoreApplication>
 #include <QDateTime>
+#include <QList>
 
 const QString Core::CONFIG_FILE_NAME = "data";
 QList<ToxFile> Core::fileSendQueue;
@@ -473,10 +474,13 @@ void Core::requestFriendship(const QString& friendAddress, const QString& messag
 
 void Core::sendMessage(int friendId, const QString& message)
 {
-    CString cMessage(message);
+    QList<CString> cMessages = splitMessage(message);
 
-    int messageId = tox_send_message(tox, friendId, cMessage.data(), cMessage.size());
-    emit messageSentResult(friendId, message, messageId);
+    for (auto &cMsg :cMessages)
+    {
+        int messageId = tox_send_message(tox, friendId, cMsg.data(), cMsg.size());
+        emit messageSentResult(friendId, message, messageId);
+    }
 }
 
 void Core::sendAction(int friendId, const QString &action)
@@ -495,9 +499,12 @@ void Core::sendTyping(int friendId, bool typing)
 
 void Core::sendGroupMessage(int groupId, const QString& message)
 {
-    CString cMessage(message);
+    QList<CString> cMessages = splitMessage(message);
 
-    tox_group_message_send(tox, groupId, cMessage.data(), cMessage.size());
+    for (auto &cMsg :cMessages)
+    {
+        tox_group_message_send(tox, groupId, cMsg.data(), cMsg.size());
+    }
 }
 
 void Core::sendFile(int32_t friendId, QString Filename, QString FilePath, long long filesize)
@@ -1159,3 +1166,32 @@ QString Core::getFriendAddress(int friendNumber) const
 
     return id;
 }
+
+QList<CString> Core::splitMessage(const QString &message)
+{
+    QList<CString> splittedMsgs;
+    QByteArray ba_message(message.toUtf8());
+
+    while (ba_message.size() > TOX_MAX_MESSAGE_LENGTH)
+    {
+        int splitPos = ba_message.lastIndexOf(' ', TOX_MAX_MESSAGE_LENGTH - 1);
+        if (splitPos <= 0)
+        {
+            splitPos = TOX_MAX_MESSAGE_LENGTH;
+            if (ba_message[splitPos] & 0x80)
+            {
+                do {
+                    splitPos--;
+                } while (!(ba_message[splitPos] & 0x40));
+            }
+            splitPos--;
+        }
+
+        splittedMsgs.push_back(CString(ba_message.left(splitPos + 1)));
+        ba_message = ba_message.mid(splitPos + 1);
+    }
+
+    splittedMsgs.push_back(CString(ba_message));
+
+    return splittedMsgs;
+}
diff --git a/core.h b/core.h
index 13d051017..706f448a3 100644
--- a/core.h
+++ b/core.h
@@ -28,6 +28,7 @@ template <typename T> class QList;
 class Camera;
 class QTimer;
 class QString;
+class CString;
 
 class Core : public QObject
 {
@@ -210,6 +211,8 @@ private:
 
     void checkLastOnline(int friendId);
 
+    QList<CString> splitMessage(const QString &message);
+
 private slots:
      void onFileTransferFinished(ToxFile file);
 
diff --git a/cstring.cpp b/cstring.cpp
index 6d7815e9c..b9217fbc8 100644
--- a/cstring.cpp
+++ b/cstring.cpp
@@ -17,10 +17,23 @@
 #include "cstring.h"
 #include <QString>
 
-CString::CString(const QString& string)
+CString::CString(const QString& string) :
+    CString(string.toUtf8())
 {
-    cString = new uint8_t[string.length() * MAX_SIZE_OF_UTF8_ENCODED_CHARACTER]();
-    cStringSize = fromString(string, cString);
+}
+
+CString::CString(const QByteArray& ba_string)
+{
+    cString = new uint8_t[ba_string.size()]();
+    cStringSize = ba_string.size();
+    memcpy(cString, reinterpret_cast<const uint8_t*>(ba_string.data()), cStringSize);
+}
+
+CString::CString(const CString &cstr)
+{
+    cStringSize = cstr.cStringSize;
+    cString = new uint8_t[cStringSize]();
+    memcpy(cString, cstr.cString, cStringSize);
 }
 
 CString::~CString()
diff --git a/cstring.h b/cstring.h
index a75ed6468..818c79bc8 100644
--- a/cstring.h
+++ b/cstring.h
@@ -20,11 +20,14 @@
 #include <cstdint>
 
 class QString;
+class QByteArray;
 
 class CString
 {
 public:
     explicit CString(const QString& string);
+    explicit CString(const QByteArray& ba_string);
+    explicit CString(const CString& cstr);
     ~CString();
 
     uint8_t* data();

From 5445746babc5a47f161d7c8e8edf084e584977e1 Mon Sep 17 00:00:00 2001
From: Joni Martikainen <joni@shade-fx.com>
Date: Sun, 21 Sep 2014 23:28:04 +0300
Subject: [PATCH 045/205] Finnish translation to qTox

Finnish translation to qTox
---
 qtox.pro           |   1 +
 res.qrc            |   1 +
 translations/fi.qm | Bin 0 -> 6809 bytes
 translations/fi.ts | 540 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 542 insertions(+)
 create mode 100644 translations/fi.qm
 create mode 100644 translations/fi.ts

diff --git a/qtox.pro b/qtox.pro
index 9b7b4a3f8..d22a406da 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -34,6 +34,7 @@ TRANSLATIONS = translations/de.ts \
                translations/it.ts \
                translations/ru.ts \
                translations/pl.ts \
+               translations/fi.ts \
                translations/mannol.ts
 
 RESOURCES += res.qrc
diff --git a/res.qrc b/res.qrc
index f258db6f5..b1b50df58 100644
--- a/res.qrc
+++ b/res.qrc
@@ -140,6 +140,7 @@
         <file>img/settings/privacy.png</file>
         <file>img/settings/av.png</file>
         <file>translations/pl.qm</file>
+        <file>translations/fi.qm</file>
         <file>translations/mannol.qm</file>
     </qresource>
 </RCC>
diff --git a/translations/fi.qm b/translations/fi.qm
new file mode 100644
index 0000000000000000000000000000000000000000..5d27bcc6d5c3b80822b48de838540dbc6051da8d
GIT binary patch
literal 6809
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
GhW`Q%@$F^+

literal 0
HcmV?d00001

diff --git a/translations/fi.ts b/translations/fi.ts
new file mode 100644
index 000000000..ccd2f7272
--- /dev/null
+++ b/translations/fi.ts
@@ -0,0 +1,540 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="fi_FI">
+<context>
+    <name>AVPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="132"/>
+        <source>Video Settings</source>
+        <translation>Videoasetukset</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="136"/>
+        <location filename="../widget/settingsdialog.cpp" line="163"/>
+        <source>Show video preview</source>
+        <comment>On a button</comment>
+        <translation>Videon esikatselu</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="157"/>
+        <source>Hide video preview</source>
+        <comment>On a button</comment>
+        <translation>Lopeta esikatselu</translation>
+    </message>
+</context>
+<context>
+    <name>AddFriendForm</name>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="34"/>
+        <source>Add Friends</source>
+        <translation>Lisää kontakti</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="37"/>
+        <source>Tox ID</source>
+        <comment>Tox ID of the person you&apos;re sending a friend request to</comment>
+        <translation>Tox ID</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="38"/>
+        <source>Message</source>
+        <comment>The message you send in friend requests</comment>
+        <translation>Viesti</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="39"/>
+        <source>Send friend request</source>
+        <translation>Lähetä kontaktipyyntö</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="40"/>
+        <source>Tox me maybe?</source>
+        <comment>Default message in friend requests if the field is left blank. Write something appropriate!</comment>
+        <translation>Lisää kontakteihin?</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="96"/>
+        <source>Please fill in a valid Tox ID</source>
+        <comment>Tox ID of the friend you&apos;re sending a friend request to</comment>
+        <translation>Anna kelvollinen Tox ID</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="99"/>
+        <source>You can&apos;t add yourself as a friend!</source>
+        <comment>When trying to add your own Tox ID as friend</comment>
+        <translation>Et voi lisätä itseäsi kontaktiksi</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="116"/>
+        <source>This address does not exist</source>
+        <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
+        <translation>Osoitetta ei ole olemassa</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="120"/>
+        <source>Error while looking up DNS</source>
+        <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
+        <translation>Virhe DNS pyynnössä</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="126"/>
+        <source>Unexpected number of text records</source>
+        <comment>Error with the DNS</comment>
+        <translation>Virheellinen määrä tekstitietueita</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="132"/>
+        <source>Unexpected number of values in text record</source>
+        <comment>Error with the DNS</comment>
+        <translation>Odottamaton määrä tekstitietueita</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="139"/>
+        <source>The DNS lookup does not contain any Tox ID</source>
+        <comment>Error with the DNS</comment>
+        <translation>DNS vastaus ei sisällä Tox ID:tä</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="145"/>
+        <location filename="../widget/form/addfriendform.cpp" line="151"/>
+        <source>The DNS lookup does not contain a valid Tox ID</source>
+        <comment>Error with the DNS</comment>
+        <translation>DNS vastaus ei sisällä kelvollista Tox ID:tä</translation>
+    </message>
+</context>
+<context>
+    <name>Camera</name>
+    <message>
+        <source>Camera eror</source>
+        <translation type="vanished">Kamerafehler</translation>
+    </message>
+    <message>
+        <source>Camera format %1 not supported, can&apos;t use the camera</source>
+        <translation type="vanished">Kameraformat %1 wird nicht unterstützt. Die Kamera kann nicht verwendet werden</translation>
+    </message>
+</context>
+<context>
+    <name>ChatForm</name>
+    <message>
+        <location filename="../widget/form/chatform.cpp" line="80"/>
+        <source>Send a file</source>
+        <translation>Lähetä tiedosto</translation>
+    </message>
+    <message>
+        <source>Save chat log</source>
+        <translation type="vanished">Chatverlauf speichern</translation>
+    </message>
+</context>
+<context>
+    <name>CopyableElideLabel</name>
+    <message>
+        <source>Copy</source>
+        <translation type="vanished">Kopieren</translation>
+    </message>
+</context>
+<context>
+    <name>FileTransferInstance</name>
+    <message>
+        <location filename="../filetransferinstance.cpp" line="191"/>
+        <source>Save a file</source>
+        <comment>Title of the file saving dialog</comment>
+        <translation>Tallenna tiedosto</translation>
+    </message>
+    <message>
+        <location filename="../filetransferinstance.cpp" line="202"/>
+        <source>Location not writable</source>
+        <comment>Title of permissions popup</comment>
+        <translation>Kohteeseen ei voi tallentaa</translation>
+    </message>
+    <message>
+        <location filename="../filetransferinstance.cpp" line="202"/>
+        <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
+        <comment>text of permissions popup</comment>
+        <translation>Käyttöoikeudet eivät riitä kohteeseen tallentamiseen. Valitse toinen kohde tai peru.</translation>
+    </message>
+</context>
+<context>
+    <name>FileTransfertWidget</name>
+    <message>
+        <source>Save a file</source>
+        <comment>Title of the file saving dialog</comment>
+        <translation type="vanished">Datei speichern</translation>
+    </message>
+</context>
+<context>
+    <name>FilesForm</name>
+    <message>
+        <location filename="../widget/form/filesform.cpp" line="30"/>
+        <source>Transfered Files</source>
+        <comment>&quot;Headline&quot; of the window</comment>
+        <translation>Tiedostojen siirrot</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/filesform.cpp" line="38"/>
+        <source>Downloads</source>
+        <translation>Ladatut</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/filesform.cpp" line="39"/>
+        <source>Uploads</source>
+        <translation>Lähetetyt</translation>
+    </message>
+</context>
+<context>
+    <name>FriendRequestDialog</name>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="30"/>
+        <source>Friend request</source>
+        <comment>Title of the window to aceept/deny a friend request</comment>
+        <translation>Kontaktipyyntö</translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="32"/>
+        <source>Someone wants to make friends with you</source>
+        <translation>Sinulle on lähetetty kontaktipyyntö</translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="33"/>
+        <source>User ID:</source>
+        <translation>Käyttäjän ID:</translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="37"/>
+        <source>Friend request message:</source>
+        <translation>Kontaktipyynnön viesti:</translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="44"/>
+        <source>Accept</source>
+        <comment>Accept a friend request</comment>
+        <translation>Hyväksy</translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="45"/>
+        <source>Reject</source>
+        <comment>Reject a friend request</comment>
+        <translation>Hylkää</translation>
+    </message>
+</context>
+<context>
+    <name>FriendWidget</name>
+    <message>
+        <location filename="../widget/friendwidget.cpp" line="84"/>
+        <source>Copy friend ID</source>
+        <comment>Menu to copy the Tox ID of that friend</comment>
+        <translation>Kopioi kontaktin ID</translation>
+    </message>
+    <message>
+        <location filename="../widget/friendwidget.cpp" line="85"/>
+        <source>Invite in group</source>
+        <comment>Menu to invite a friend in a groupchat</comment>
+        <translation>Kutsu ryhmään</translation>
+    </message>
+    <message>
+        <location filename="../widget/friendwidget.cpp" line="95"/>
+        <source>Remove friend</source>
+        <comment>Menu to remove the friend from our friendlist</comment>
+        <translation>Poista kontakti</translation>
+    </message>
+</context>
+<context>
+    <name>GeneralPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="31"/>
+        <source>General Settings</source>
+        <translation>Yleiset asetukset</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="34"/>
+        <source>Enable IPv6 (recommended)</source>
+        <comment>Text on a checkbox to enable IPv6</comment>
+        <translation>Aktivoi IPv6 (suositeltu)</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="36"/>
+        <source>Use translations</source>
+        <comment>Text on a checkbox to enable translations</comment>
+        <translation>Käytä käännöksiä</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <source>Make Tox portable</source>
+        <comment>Text on a checkbox to make qTox a portable application</comment>
+        <translation>Tee ohjelmasta siirrettävä</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="39"/>
+        <source>Save settings to the working directory instead of the usual conf dir</source>
+        <comment>describes makeToxPortable checkbox</comment>
+        <translation>Tallenna asetukset työhakemistoon normaalin asetushakemiston sijaan.</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <source>Theme</source>
+        <translation>Teema</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="49"/>
+        <source>Smiley Pack</source>
+        <translation>Hymiö-paketti</translation>
+    </message>
+</context>
+<context>
+    <name>GenericChatForm</name>
+    <message>
+        <location filename="../widget/form/genericchatform.cpp" line="142"/>
+        <location filename="../widget/form/genericchatform.cpp" line="148"/>
+        <source>Save chat log</source>
+        <translation>Tallenna keskustelu</translation>
+    </message>
+</context>
+<context>
+    <name>GroupChatForm</name>
+    <message>
+        <location filename="../widget/form/groupchatform.cpp" line="41"/>
+        <source>%1 users in chat</source>
+        <comment>Number of users in chat</comment>
+        <translation>%1 henkilö keskustelussa</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/groupchatform.cpp" line="83"/>
+        <source>&lt;Unknown&gt;</source>
+        <translation>&lt;Tuntematon&gt;</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/groupchatform.cpp" line="90"/>
+        <source>%1 users in chat</source>
+        <translation>%1 henkilöä keskustelussa</translation>
+    </message>
+    <message>
+        <source>Save chat log</source>
+        <translation type="vanished">Chatverlauf speichern</translation>
+    </message>
+</context>
+<context>
+    <name>GroupWidget</name>
+    <message>
+        <location filename="../widget/groupwidget.cpp" line="58"/>
+        <location filename="../widget/groupwidget.cpp" line="100"/>
+        <source>%1 users in chat</source>
+        <translation>%1 henkilöä keskustelussa</translation>
+    </message>
+    <message>
+        <location filename="../widget/groupwidget.cpp" line="60"/>
+        <location filename="../widget/groupwidget.cpp" line="102"/>
+        <source>0 users in chat</source>
+        <translation>0 henkilöä keskustelussa</translation>
+    </message>
+    <message>
+        <location filename="../widget/groupwidget.cpp" line="83"/>
+        <source>Quit group</source>
+        <comment>Menu to quit a groupchat</comment>
+        <translation>Sulje ryhmä</translation>
+    </message>
+</context>
+<context>
+    <name>IdentityPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="82"/>
+        <source>Public Information</source>
+        <translation>Julkiset tiedot</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <source>Name</source>
+        <comment>Username/nick</comment>
+        <translation>Nimi</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="85"/>
+        <source>Status</source>
+        <comment>Status message</comment>
+        <translation>Tila</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="95"/>
+        <source>Tox ID</source>
+        <translation>Tox ID</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="96"/>
+        <source>Your Tox ID</source>
+        <translation>Sinun Tox ID</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../mainwindow.ui" line="20"/>
+        <source>qTox</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="1918"/>
+        <source>Your name</source>
+        <translation>Sinun nimesi</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2000"/>
+        <source>Your status</source>
+        <translation>Sinun tilasi</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2566"/>
+        <source>Add friends</source>
+        <translation>Lisää kontakti</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2592"/>
+        <source>Create a group chat</source>
+        <translation>Luo keskusteluryhmä</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2624"/>
+        <source>View completed file transfers</source>
+        <translation>Näytä valmiit tiedostojensiirrot</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2656"/>
+        <source>Change your settings</source>
+        <translation>Muuta asetuksiasi</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="3238"/>
+        <source>Close</source>
+        <translation>Sulje</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="3241"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+</context>
+<context>
+    <name>SelfCamView</name>
+    <message>
+        <location filename="../widget/selfcamview.cpp" line="33"/>
+        <source>Tox video test</source>
+        <comment>Title of the window to test the video/webcam</comment>
+        <translation>Tox videotesti</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="197"/>
+        <source>qTox – Settings</source>
+        <translation>qTox - Asetukset</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="224"/>
+        <source>General</source>
+        <translation>Yleiset</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="230"/>
+        <source>Identity</source>
+        <translation>Identiteetti</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="236"/>
+        <source>Privacy</source>
+        <translation>Yksityisyys</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="242"/>
+        <source>Audio/Video</source>
+        <translation>Audio/Video</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="252"/>
+        <source>Cancel</source>
+        <translation>Peru</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="253"/>
+        <source>Apply</source>
+        <translation>Ota käyttöön</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsForm</name>
+    <message>
+        <source>User Settings</source>
+        <comment>&quot;Headline&quot; of the window</comment>
+        <translation type="vanished">Einstellungen</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <comment>Username/nick</comment>
+        <translation type="vanished">Benutzername</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <comment>Status message</comment>
+        <translation type="vanished">Status</translation>
+    </message>
+    <message>
+        <source>Test video</source>
+        <comment>Text on a button to test the video/webcam</comment>
+        <translation type="vanished">Video testen</translation>
+    </message>
+    <message>
+        <source>Enable IPv6 (recommended)</source>
+        <comment>Text on a checkbox to enable IPv6</comment>
+        <translation type="vanished">IPv6 aktivieren (empfohlen)</translation>
+    </message>
+</context>
+<context>
+    <name>Widget</name>
+    <message>
+        <source>Tox</source>
+        <translation type="vanished">Tox</translation>
+    </message>
+    <message>
+        <source>Your name</source>
+        <translation type="vanished">Dein Name</translation>
+    </message>
+    <message>
+        <source>Your status</source>
+        <translation type="vanished">Dein Status</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="vanished">Schließen</translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation type="vanished">Strg+Q</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="133"/>
+        <source>Online</source>
+        <comment>Button to set your status to &apos;Online&apos;</comment>
+        <translation>Online</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="135"/>
+        <source>Away</source>
+        <comment>Button to set your status to &apos;Away&apos;</comment>
+        <translation>Poissa</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="137"/>
+        <source>Busy</source>
+        <comment>Button to set your status to &apos;Busy&apos;</comment>
+        <translation>Kiireinen</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="605"/>
+        <source>&lt;Unknown&gt;</source>
+        <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
+        <translation>&lt;tuntematon&gt;</translation>
+    </message>
+</context>
+</TS>

From 4c18f6184e42401169d05c9c80599c338c547a4b Mon Sep 17 00:00:00 2001
From: Urras <urras@tox.im>
Date: Mon, 22 Sep 2014 09:31:44 -0400
Subject: [PATCH 046/205] Update Screenshot

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index dd7c45fdb..6f13e095a 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ This client runs on Windows, Linux and Mac natively.<br/>
 
 <h3>Screenshots</h3>
 <h5>Note: The screenshots may not always be up to date, but they should give a good idea of the general look and features</h5>
-<img src="https://i.imgur.com/7Jg5tQa.png">/
+<img src="https://wiki.tox.im/images/5/5d/ToxGUI_tux3.png">
 
 ##Documentation:
 

From 15516140704469c09ec5e6f17671ec99f8b7eef4 Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Tue, 23 Sep 2014 23:35:06 +0700
Subject: [PATCH 047/205] Error messages in the case of message sending
 problems

---
 core.cpp                                      |   7 +-
 core.h                                        |   1 +
 qtox.pro                                      |  14 +-
 widget/chatareawidget.cpp                     |   2 +-
 widget/form/chatform.cpp                      |   2 +-
 widget/form/genericchatform.cpp               |  11 +-
 widget/form/genericchatform.h                 |   1 +
 widget/tool/chataction.cpp                    | 169 ------------------
 widget/tool/chatactions/chataction.cpp        |  53 ++++++
 widget/tool/{ => chatactions}/chataction.h    |  29 ---
 .../tool/chatactions/filetransferaction.cpp   |  75 ++++++++
 widget/tool/chatactions/filetransferaction.h  |  39 ++++
 widget/tool/chatactions/messageaction.cpp     |  75 ++++++++
 widget/tool/chatactions/messageaction.h       |  34 ++++
 .../tool/chatactions/systemmessageaction.cpp  |  46 +++++
 widget/tool/chatactions/systemmessageaction.h |  37 ++++
 widget/widget.cpp                             |  25 +++
 widget/widget.h                               |   2 +
 18 files changed, 415 insertions(+), 207 deletions(-)
 delete mode 100644 widget/tool/chataction.cpp
 create mode 100644 widget/tool/chatactions/chataction.cpp
 rename widget/tool/{ => chatactions}/chataction.h (64%)
 create mode 100644 widget/tool/chatactions/filetransferaction.cpp
 create mode 100644 widget/tool/chatactions/filetransferaction.h
 create mode 100644 widget/tool/chatactions/messageaction.cpp
 create mode 100644 widget/tool/chatactions/messageaction.h
 create mode 100644 widget/tool/chatactions/systemmessageaction.cpp
 create mode 100644 widget/tool/chatactions/systemmessageaction.h

diff --git a/core.cpp b/core.cpp
index c37c78146..e44988d56 100644
--- a/core.cpp
+++ b/core.cpp
@@ -479,7 +479,8 @@ void Core::sendMessage(int friendId, const QString& message)
     for (auto &cMsg :cMessages)
     {
         int messageId = tox_send_message(tox, friendId, cMsg.data(), cMsg.size());
-        emit messageSentResult(friendId, message, messageId);
+        if (messageId == 0)
+            emit messageSentResult(friendId, message, messageId);
     }
 }
 
@@ -503,7 +504,9 @@ void Core::sendGroupMessage(int groupId, const QString& message)
 
     for (auto &cMsg :cMessages)
     {
-        tox_group_message_send(tox, groupId, cMsg.data(), cMsg.size());
+        int ret = tox_group_message_send(tox, groupId, cMsg.data(), cMsg.size());
+        if (ret == -1)
+            emit groupSentResult(groupId, message, ret);
     }
 }
 
diff --git a/core.h b/core.h
index 706f448a3..ed1606331 100644
--- a/core.h
+++ b/core.h
@@ -125,6 +125,7 @@ signals:
     void statusSet(Status status);
 
     void messageSentResult(int friendId, const QString& message, int messageId);
+    void groupSentResult(int groupId, const QString& message, int result);
     void actionSentResult(int friendId, const QString& action, int success);
 
     void failedToAddFriend(const QString& userId);
diff --git a/qtox.pro b/qtox.pro
index d22a406da..68845488e 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -107,13 +107,16 @@ HEADERS  += widget/form/addfriendform.h \
     widget/friendlistwidget.h \
     widget/genericchatroomwidget.h \
     widget/form/genericchatform.h \
-    widget/tool/chataction.h \
+    widget/tool/chatactions/chataction.h \
     widget/chatareawidget.h \
     filetransferinstance.h \
     corestructs.h \
     coredefines.h \
     coreav.h \
-    widget/settingsdialog.h
+    widget/settingsdialog.h \
+    widget/tool/chatactions/messageaction.h \
+    widget/tool/chatactions/filetransferaction.h \
+    widget/tool/chatactions/systemmessageaction.h
 
 SOURCES += \
     widget/form/addfriendform.cpp \
@@ -146,8 +149,11 @@ SOURCES += \
     coreav.cpp \
     widget/genericchatroomwidget.cpp \
     widget/form/genericchatform.cpp \
-    widget/tool/chataction.cpp \
+    widget/tool/chatactions/chataction.cpp \
     widget/chatareawidget.cpp \
     filetransferinstance.cpp \
     corestructs.cpp \
-    widget/settingsdialog.cpp
+    widget/settingsdialog.cpp \
+    widget/tool/chatactions/messageaction.cpp \
+    widget/tool/chatactions/filetransferaction.cpp \
+    widget/tool/chatactions/systemmessageaction.cpp
diff --git a/widget/chatareawidget.cpp b/widget/chatareawidget.cpp
index f52262e5d..524039d20 100644
--- a/widget/chatareawidget.cpp
+++ b/widget/chatareawidget.cpp
@@ -15,7 +15,7 @@
 */
 
 #include "chatareawidget.h"
-#include "widget/tool/chataction.h"
+#include "widget/tool/chatactions/chataction.h"
 #include <QScrollBar>
 #include <QDesktopServices>
 #include <QTextTable>
diff --git a/widget/form/chatform.cpp b/widget/form/chatform.cpp
index 0114a92db..33e32879a 100644
--- a/widget/form/chatform.cpp
+++ b/widget/form/chatform.cpp
@@ -23,7 +23,7 @@
 #include "friend.h"
 #include "widget/friendwidget.h"
 #include "filetransferinstance.h"
-#include "widget/tool/chataction.h"
+#include "widget/tool/chatactions/filetransferaction.h"
 #include "widget/netcamview.h"
 #include "widget/chatareawidget.h"
 #include "widget/tool/chattextedit.h"
diff --git a/widget/form/genericchatform.cpp b/widget/form/genericchatform.cpp
index f5681f1c6..0e765b397 100644
--- a/widget/form/genericchatform.cpp
+++ b/widget/form/genericchatform.cpp
@@ -22,7 +22,8 @@
 #include "style.h"
 #include "widget/widget.h"
 #include "settings.h"
-#include "widget/tool/chataction.h"
+#include "widget/tool/chatactions/messageaction.h"
+#include "widget/tool/chatactions/systemmessageaction.h"
 #include "widget/chatareawidget.h"
 #include "widget/tool/chattextedit.h"
 
@@ -208,3 +209,11 @@ void GenericChatForm::focusInput()
 {
     msgEdit->setFocus();
 }
+
+void GenericChatForm::addSystemInfoMessage(const QString &message, const QString &type, const QDateTime &datetime)
+{
+    previousName = "";
+    QString date = datetime.toString(Settings::getInstance().getTimestampFormat());
+
+    chatWidget->insertMessage(new SystemMessageAction(message, type, date));
+}
diff --git a/widget/form/genericchatform.h b/widget/form/genericchatform.h
index 95940cda5..72dc94fd9 100644
--- a/widget/form/genericchatform.h
+++ b/widget/form/genericchatform.h
@@ -45,6 +45,7 @@ public:
     virtual void setName(const QString &newName);
     virtual void show(Ui::MainWindow &ui);
     void addMessage(QString author, QString message, QDateTime datetime=QDateTime::currentDateTime());
+    void addSystemInfoMessage(const QString &message, const QString &type, const QDateTime &datetime=QDateTime::currentDateTime());
 
 signals:
     void sendMessage(int, QString);
diff --git a/widget/tool/chataction.cpp b/widget/tool/chataction.cpp
deleted file mode 100644
index bcd1f1080..000000000
--- a/widget/tool/chataction.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
-    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 "chataction.h"
-#include "smileypack.h"
-#include <QStringList>
-#include <QBuffer>
-#include "filetransferinstance.h"
-
-QString ChatAction::toHtmlChars(const QString &str)
-{
-    static QList<QPair<QString, QString>> replaceList = {{"&","&amp;"}, {">","&gt;"}, {"<","&lt;"}};
-    QString res = str;
-
-    for (auto &it : replaceList)
-        res = res.replace(it.first,it.second);
-
-    return res;
-}
-
-QString ChatAction::QImage2base64(const QImage &img)
-{
-    QByteArray ba;
-    QBuffer buffer(&ba);
-    buffer.open(QIODevice::WriteOnly);
-    img.save(&buffer, "PNG"); // writes image into ba in PNG format
-    return ba.toBase64();
-}
-
-QString ChatAction::getName()
-{
-    if (isMe)
-        return QString("<div class=name_me>" + toHtmlChars(name) + "</div>");
-    else
-        return QString("<div class=name>" + toHtmlChars(name) + "</div>");
-}
-
-QString ChatAction::getDate()
-{
-    QString res = date;
-    return res;
-}
-
-MessageAction::MessageAction(const QString &author, const QString &message, const QString &date, const bool &me) :
-    ChatAction(me, author, date),
-    message(message)
-{
-}
-
-void MessageAction::setTextCursor(QTextCursor cursor)
-{
-    // 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
-    // Except we never udpate on our own, so we can safely free our resources
-
-    (void) cursor;
-    message.clear();
-    message.squeeze();
-    name.clear();
-    name.squeeze();
-    date.clear();
-    date.squeeze();
-}
-
-QString MessageAction::getMessage()
-{
-    QString message_ = SmileyPack::getInstance().smileyfied(toHtmlChars(message));
-
-    // detect urls
-    QRegExp exp("(www\\.|http[s]?:\\/\\/|ftp:\\/\\/)\\S+");
-    int offset = 0;
-    while ((offset = exp.indexIn(message_, offset)) != -1)
-    {
-        QString url = exp.cap();
-
-        // add scheme if not specified
-        if (exp.cap(1) == "www.")
-            url.prepend("http://");
-
-        QString htmledUrl = QString("<a href=\"%1\">%1</a>").arg(url);
-        message_.replace(offset, exp.cap().length(), htmledUrl);
-
-        offset += htmledUrl.length();
-    }
-
-    // detect text quotes
-    QStringList messageLines = message_.split("\n");
-    message_ = "";
-    for (QString& s : messageLines)
-    {
-        if (QRegExp("^[ ]*&gt;.*").exactMatch(s))
-            message_ += "<span class=quote>>" + s.right(s.length()-4) + "</span><br/>";
-        else
-            message_ += s + "<br/>";
-    }
-    message_ = message_.left(message_.length()-4);
-
-    return QString("<div class=message>" + message_ + "</div>");
-}
-
-FileTransferAction::FileTransferAction(FileTransferInstance *widget, const QString &author, const QString &date, const bool &me) :
-    ChatAction(me, author, date)
-{
-    w = widget;
-
-    connect(w, &FileTransferInstance::stateUpdated, this, &FileTransferAction::updateHtml);
-}
-
-FileTransferAction::~FileTransferAction()
-{
-}
-
-QString FileTransferAction::getMessage()
-{
-    QString widgetHtml;
-    if (w != nullptr)
-        widgetHtml = w->getHtmlImage();
-    else
-        widgetHtml = "<div class=quote>EMPTY CONTENT</div>";
-    return widgetHtml;
-}
-
-void FileTransferAction::setTextCursor(QTextCursor cursor)
-{
-    cur = cursor;
-    cur.setKeepPositionOnInsert(true);
-    int end=cur.selectionEnd();
-    cur.setPosition(cur.position());
-    cur.setPosition(end, QTextCursor::KeepAnchor);
-}
-
-void FileTransferAction::updateHtml()
-{
-    if (cur.isNull())
-        return;
-
-    int pos = cur.selectionStart();
-    cur.removeSelectedText();
-    cur.setKeepPositionOnInsert(false);
-    cur.insertHtml(getMessage());
-    cur.setKeepPositionOnInsert(true);
-    int end = cur.position();
-    cur.setPosition(pos);
-    cur.setPosition(end, QTextCursor::KeepAnchor);
-
-    // Free our ressources if we'll never need to update again
-    if (w->getState() == FileTransferInstance::TransfState::tsCanceled
-            || w->getState() == FileTransferInstance::TransfState::tsFinished)
-    {
-        name.clear();
-        name.squeeze();
-        date.clear();
-        date.squeeze();
-        cur = QTextCursor();
-    }
-}
diff --git a/widget/tool/chatactions/chataction.cpp b/widget/tool/chatactions/chataction.cpp
new file mode 100644
index 000000000..7758aae33
--- /dev/null
+++ b/widget/tool/chatactions/chataction.cpp
@@ -0,0 +1,53 @@
+/*
+    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 "chataction.h"
+#include <QStringList>
+#include <QBuffer>
+
+QString ChatAction::toHtmlChars(const QString &str)
+{
+    static QList<QPair<QString, QString>> replaceList = {{"&","&amp;"}, {">","&gt;"}, {"<","&lt;"}};
+    QString res = str;
+
+    for (auto &it : replaceList)
+        res = res.replace(it.first,it.second);
+
+    return res;
+}
+
+QString ChatAction::QImage2base64(const QImage &img)
+{
+    QByteArray ba;
+    QBuffer buffer(&ba);
+    buffer.open(QIODevice::WriteOnly);
+    img.save(&buffer, "PNG"); // writes image into ba in PNG format
+    return ba.toBase64();
+}
+
+QString ChatAction::getName()
+{
+    if (isMe)
+        return QString("<div class=name_me>" + toHtmlChars(name) + "</div>");
+    else
+        return QString("<div class=name>" + toHtmlChars(name) + "</div>");
+}
+
+QString ChatAction::getDate()
+{
+    QString res = date;
+    return res;
+}
diff --git a/widget/tool/chataction.h b/widget/tool/chatactions/chataction.h
similarity index 64%
rename from widget/tool/chataction.h
rename to widget/tool/chatactions/chataction.h
index a324a41c6..16c9f179b 100644
--- a/widget/tool/chataction.h
+++ b/widget/tool/chatactions/chataction.h
@@ -42,33 +42,4 @@ protected:
     QString name, date;
 };
 
-class MessageAction : public ChatAction
-{
-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;
-
-private:
-    QString message;
-};
-
-class FileTransferAction : public ChatAction
-{
-    Q_OBJECT
-public:
-    FileTransferAction(FileTransferInstance *widget, const QString &author, const QString &date, const bool &me);
-    virtual ~FileTransferAction();
-    virtual QString getMessage();
-    virtual void setTextCursor(QTextCursor cursor) final;
-
-private slots:
-    void updateHtml();
-
-private:
-    FileTransferInstance *w;
-    QTextCursor cur;
-};
-
 #endif // CHATACTION_H
diff --git a/widget/tool/chatactions/filetransferaction.cpp b/widget/tool/chatactions/filetransferaction.cpp
new file mode 100644
index 000000000..12e2a1ac6
--- /dev/null
+++ b/widget/tool/chatactions/filetransferaction.cpp
@@ -0,0 +1,75 @@
+/*
+    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 "filetransferaction.h"
+#include "filetransferinstance.h"
+
+FileTransferAction::FileTransferAction(FileTransferInstance *widget, const QString &author, const QString &date, const bool &me) :
+    ChatAction(me, author, date)
+{
+    w = widget;
+
+    connect(w, &FileTransferInstance::stateUpdated, this, &FileTransferAction::updateHtml);
+}
+
+FileTransferAction::~FileTransferAction()
+{
+}
+
+QString FileTransferAction::getMessage()
+{
+    QString widgetHtml;
+    if (w != nullptr)
+        widgetHtml = w->getHtmlImage();
+    else
+        widgetHtml = "<div class=quote>EMPTY CONTENT</div>";
+    return widgetHtml;
+}
+
+void FileTransferAction::setTextCursor(QTextCursor cursor)
+{
+    cur = cursor;
+    cur.setKeepPositionOnInsert(true);
+    int end=cur.selectionEnd();
+    cur.setPosition(cur.position());
+    cur.setPosition(end, QTextCursor::KeepAnchor);
+}
+
+void FileTransferAction::updateHtml()
+{
+    if (cur.isNull())
+        return;
+
+    int pos = cur.selectionStart();
+    cur.removeSelectedText();
+    cur.setKeepPositionOnInsert(false);
+    cur.insertHtml(getMessage());
+    cur.setKeepPositionOnInsert(true);
+    int end = cur.position();
+    cur.setPosition(pos);
+    cur.setPosition(end, QTextCursor::KeepAnchor);
+
+    // Free our ressources if we'll never need to update again
+    if (w->getState() == FileTransferInstance::TransfState::tsCanceled
+            || w->getState() == FileTransferInstance::TransfState::tsFinished)
+    {
+        name.clear();
+        name.squeeze();
+        date.clear();
+        date.squeeze();
+        cur = QTextCursor();
+    }
+}
diff --git a/widget/tool/chatactions/filetransferaction.h b/widget/tool/chatactions/filetransferaction.h
new file mode 100644
index 000000000..ee6d0e11c
--- /dev/null
+++ b/widget/tool/chatactions/filetransferaction.h
@@ -0,0 +1,39 @@
+/*
+    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 FILETRANSFERACTION_H
+#define FILETRANSFERACTION_H
+
+#include "widget/tool/chatactions/chataction.h"
+
+class FileTransferAction : public ChatAction
+{
+    Q_OBJECT
+public:
+    FileTransferAction(FileTransferInstance *widget, const QString &author, const QString &date, const bool &me);
+    virtual ~FileTransferAction();
+    virtual QString getMessage();
+    virtual void setTextCursor(QTextCursor cursor) final;
+
+private slots:
+    void updateHtml();
+
+private:
+    FileTransferInstance *w;
+    QTextCursor cur;
+};
+
+#endif // FILETRANSFERACTION_H
diff --git a/widget/tool/chatactions/messageaction.cpp b/widget/tool/chatactions/messageaction.cpp
new file mode 100644
index 000000000..fa396468c
--- /dev/null
+++ b/widget/tool/chatactions/messageaction.cpp
@@ -0,0 +1,75 @@
+/*
+    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 "messageaction.h"
+#include "smileypack.h"
+
+MessageAction::MessageAction(const QString &author, const QString &message, const QString &date, const bool &me) :
+    ChatAction(me, author, date),
+    message(message)
+{
+}
+
+void MessageAction::setTextCursor(QTextCursor cursor)
+{
+    // 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
+    // Except we never udpate on our own, so we can safely free our resources
+
+    (void) cursor;
+    message.clear();
+    message.squeeze();
+    name.clear();
+    name.squeeze();
+    date.clear();
+    date.squeeze();
+}
+
+QString MessageAction::getMessage()
+{
+    QString message_ = SmileyPack::getInstance().smileyfied(toHtmlChars(message));
+
+    // detect urls
+    QRegExp exp("(www\\.|http[s]?:\\/\\/|ftp:\\/\\/)\\S+");
+    int offset = 0;
+    while ((offset = exp.indexIn(message_, offset)) != -1)
+    {
+        QString url = exp.cap();
+
+        // add scheme if not specified
+        if (exp.cap(1) == "www.")
+            url.prepend("http://");
+
+        QString htmledUrl = QString("<a href=\"%1\">%1</a>").arg(url);
+        message_.replace(offset, exp.cap().length(), htmledUrl);
+
+        offset += htmledUrl.length();
+    }
+
+    // detect text quotes
+    QStringList messageLines = message_.split("\n");
+    message_ = "";
+    for (QString& s : messageLines)
+    {
+        if (QRegExp("^[ ]*&gt;.*").exactMatch(s))
+            message_ += "<span class=quote>>" + s.right(s.length()-4) + "</span><br/>";
+        else
+            message_ += s + "<br/>";
+    }
+    message_ = message_.left(message_.length()-4);
+
+    return QString("<div class=message>" + message_ + "</div>");
+}
diff --git a/widget/tool/chatactions/messageaction.h b/widget/tool/chatactions/messageaction.h
new file mode 100644
index 000000000..baa68898a
--- /dev/null
+++ b/widget/tool/chatactions/messageaction.h
@@ -0,0 +1,34 @@
+/*
+    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 MESSAGEACTION_H
+#define MESSAGEACTION_H
+
+#include "widget/tool/chatactions/chataction.h"
+
+class MessageAction : public ChatAction
+{
+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;
+
+private:
+    QString message;
+};
+
+#endif // MESSAGEACTION_H
diff --git a/widget/tool/chatactions/systemmessageaction.cpp b/widget/tool/chatactions/systemmessageaction.cpp
new file mode 100644
index 000000000..32457c6ed
--- /dev/null
+++ b/widget/tool/chatactions/systemmessageaction.cpp
@@ -0,0 +1,46 @@
+/*
+    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 "systemmessageaction.h"
+
+SystemMessageAction::SystemMessageAction(const QString &message, const QString &type, const QString &date) :
+    ChatAction(false, QString(), date),
+    message(message),
+    type(type)
+{
+}
+
+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)
+{
+    // 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
+    // Except we never udpate on our own, so we can safely free our resources
+
+    (void) cursor;
+    message.clear();
+    message.squeeze();
+    name.clear();
+    name.squeeze();
+    date.clear();
+    date.squeeze();
+    type.clear();
+    type.squeeze();
+}
diff --git a/widget/tool/chatactions/systemmessageaction.h b/widget/tool/chatactions/systemmessageaction.h
new file mode 100644
index 000000000..b628f7e04
--- /dev/null
+++ b/widget/tool/chatactions/systemmessageaction.h
@@ -0,0 +1,37 @@
+/*
+    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 SYSTEMMESSAGEACTION_H
+#define SYSTEMMESSAGEACTION_H
+
+#include "widget/tool/chatactions/chataction.h"
+
+class SystemMessageAction : public ChatAction
+{
+public:
+    SystemMessageAction(const QString &message, const QString& type, const QString &date);
+    virtual ~SystemMessageAction(){;}
+    virtual void setTextCursor(QTextCursor cursor) final;
+
+    virtual QString getName() {return QString();}
+    virtual QString getMessage();
+
+private:
+    QString message;
+    QString type;
+};
+
+#endif // SYSTEMMESSAGEACTION_H
diff --git a/widget/widget.cpp b/widget/widget.cpp
index 36b2c33c1..64b09de80 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -197,6 +197,9 @@ Widget::Widget(QWidget *parent)
     connect(core, &Core::groupNamelistChanged, this, &Widget::onGroupNamelistChanged);
     connect(core, &Core::emptyGroupCreated, this, &Widget::onEmptyGroupCreated);
 
+    connect(core, SIGNAL(messageSentResult(int,QString,int)), this, SLOT(onMessageSendResult(int,QString,int)));
+    connect(core, SIGNAL(groupSentResult(int,QString,int)), this, SLOT(onGroupSendResult(int,QString,int)));
+
     connect(this, &Widget::statusSet, core, &Core::setStatus);
     connect(this, &Widget::friendRequested, core, &Core::requestFriendship);
     connect(this, &Widget::friendRequestAccepted, core, &Core::acceptFriendRequest);
@@ -1060,3 +1063,25 @@ bool Widget::getIsWindowMinimized()
 {
     return static_cast<bool>(isWindowMinimized);
 }
+
+void Widget::onMessageSendResult(int friendId, const QString& message, int messageId)
+{
+    Q_UNUSED(message)
+    Friend* f = FriendList::findFriend(friendId);
+    if (!f)
+        return;
+
+    if (!messageId)
+        f->chatForm->addSystemInfoMessage("Message failed to send", "red");
+}
+
+void Widget::onGroupSendResult(int groupId, const QString& message, int result)
+{
+    Q_UNUSED(message)
+    Group* g = GroupList::findGroup(groupId);
+    if (!g)
+        return;
+
+    if (result == -1)
+        g->chatForm->addSystemInfoMessage("Message failed to send", "red");
+}
diff --git a/widget/widget.h b/widget/widget.h
index 035ea2ae0..e85701a55 100644
--- a/widget/widget.h
+++ b/widget/widget.h
@@ -104,6 +104,8 @@ private slots:
     void setStatusOnline();
     void setStatusAway();
     void setStatusBusy();
+    void onMessageSendResult(int friendId, const QString& message, int messageId);
+    void onGroupSendResult(int groupId, const QString& message, int result);
 
 protected slots:
     void moveWindow(QMouseEvent *e);

From 06178f00d99398213094b70290a626a5b8aa4f28 Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Tue, 23 Sep 2014 23:52:06 +0700
Subject: [PATCH 048/205] File send error message

---
 core.cpp                 | 1 +
 core.h                   | 2 ++
 widget/form/chatform.cpp | 9 +++++++++
 widget/form/chatform.h   | 1 +
 4 files changed, 13 insertions(+)

diff --git a/core.cpp b/core.cpp
index e44988d56..a9b0843c3 100644
--- a/core.cpp
+++ b/core.cpp
@@ -517,6 +517,7 @@ void Core::sendFile(int32_t friendId, QString Filename, QString FilePath, long l
     if (fileNum == -1)
     {
         qWarning() << "Core::sendFile: Can't create the Tox file sender";
+        emit fileSendFailed(friendId, Filename);
         return;
     }
     qDebug() << QString("Core::sendFile: Created file sender %1 with friend %2").arg(fileNum).arg(friendId);
diff --git a/core.h b/core.h
index ed1606331..0ae48f688 100644
--- a/core.h
+++ b/core.h
@@ -150,6 +150,8 @@ signals:
     void fileTransferInfo(int FriendId, int FileNum, int64_t Filesize, int64_t BytesSent, ToxFile::FileDirection direction);
     void fileTransferRemotePausedUnpaused(ToxFile file, bool paused);
 
+    void fileSendFailed(int FriendId, const QString& fname);
+
     void avInvite(int friendId, int callIndex, bool video);
     void avStart(int friendId, int callIndex, bool video);
     void avCancel(int friendId, int callIndex);
diff --git a/widget/form/chatform.cpp b/widget/form/chatform.cpp
index 33e32879a..f8b950b7b 100644
--- a/widget/form/chatform.cpp
+++ b/widget/form/chatform.cpp
@@ -51,6 +51,7 @@ ChatForm::ChatForm(Friend* chatFriend)
     connect(msgEdit, &ChatTextEdit::enterPressed, this, &ChatForm::onSendTriggered);
     connect(micButton, SIGNAL(clicked()), this, SLOT(onMicMuteToggle()));
     connect(chatWidget, &ChatAreaWidget::onFileTranfertInterract, this, &ChatForm::onFileTansBtnClicked);
+    connect(Core::getInstance(), &Core::fileSendFailed, this, &ChatForm::onFileSendFailed);
 }
 
 ChatForm::~ChatForm()
@@ -455,3 +456,11 @@ void ChatForm::onFileTansBtnClicked(QString widgetName, QString buttonName)
     else
         qDebug() << "no filetransferwidget: " << id;
 }
+
+void ChatForm::onFileSendFailed(int FriendId, const QString &fname)
+{
+    if (FriendId != f->friendId)
+        return;
+
+    addSystemInfoMessage("File: \"" + fname + "\" failed to send.", "red");
+}
diff --git a/widget/form/chatform.h b/widget/form/chatform.h
index 93bc2d6b4..43681562c 100644
--- a/widget/form/chatform.h
+++ b/widget/form/chatform.h
@@ -65,6 +65,7 @@ private slots:
     void onHangupCallTriggered();
     void onCancelCallTriggered();
     void onFileTansBtnClicked(QString widgetName, QString buttonName);
+    void onFileSendFailed(int FriendId, const QString &fname);
 
 private:
     Friend* f;

From 7ad6ad2731680632c7d21af330c0e62ce56b8d4c Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Wed, 24 Sep 2014 16:51:16 +0200
Subject: [PATCH 049/205] Avatar support for ourselves

---
 core.cpp                     | 46 +++++++++++++++++++++++++++++++-
 core.h                       |  4 +++
 mainwindow.ui                | 11 +++++---
 qtox.pro                     |  3 ++-
 settings.cpp                 | 15 +++++++++++
 settings.h                   |  5 ++++
 widget/tool/clickablelabel.h | 22 ++++++++++++++++
 widget/widget.cpp            | 51 ++++++++++++++++++++++++++++++++++++
 widget/widget.h              |  2 ++
 9 files changed, 154 insertions(+), 5 deletions(-)
 create mode 100644 widget/tool/clickablelabel.h

diff --git a/core.cpp b/core.cpp
index a9b0843c3..d63461c07 100644
--- a/core.cpp
+++ b/core.cpp
@@ -35,6 +35,7 @@
 #include <QCoreApplication>
 #include <QDateTime>
 #include <QList>
+#include <QBuffer>
 
 const QString Core::CONFIG_FILE_NAME = "data";
 QList<ToxFile> Core::fileSendQueue;
@@ -187,6 +188,8 @@ void Core::start()
     tox_callback_file_send_request(tox, onFileSendRequestCallback, this);
     tox_callback_file_control(tox, onFileControlCallback, this);
     tox_callback_file_data(tox, onFileDataCallback, this);
+    tox_callback_avatar_info(tox, onAvatarInfoCallback, this);
+    tox_callback_avatar_data(tox, onAvatarDataCallback, this);
 
     toxav_register_callstate_callback(toxav, onAvInvite, av_OnInvite, this);
     toxav_register_callstate_callback(toxav, onAvStart, av_OnStart, this);
@@ -205,9 +208,22 @@ void Core::start()
 
     uint8_t friendAddress[TOX_FRIEND_ADDRESS_SIZE];
     tox_get_address(tox, friendAddress);
-
     emit friendAddressGenerated(CFriendAddress::toString(friendAddress));
 
+    QPixmap pic = Settings::getInstance().getSavedAvatar();
+    if (!pic.isNull() && !pic.size().isEmpty())
+    {
+        QByteArray data;
+        QBuffer buffer(&data);
+        buffer.open(QIODevice::WriteOnly);
+        pic.save(&buffer);
+        buffer.close();
+        tox_set_avatar(tox, TOX_AVATARFORMAT_PNG, (uint8_t*)data.constData(), data.size());
+        emit selfAvatarChanged(pic);
+    }
+    else
+        qDebug() << "Core: Error loading self avatar";
+
     bootstrapDht();
 
     toxTimer->start(tox_do_interval(tox));
@@ -433,6 +449,18 @@ void Core::onFileDataCallback(Tox*, int32_t friendnumber, uint8_t filenumber, co
                                             file->filesize, file->bytesSent, ToxFile::RECEIVING);
 }
 
+void Core::onAvatarInfoCallback(Tox* tox, int32_t friendnumber, uint8_t format,
+                                uint8_t *hash, void *userdata)
+{
+    qDebug() << "Core: Got avatar info from "<<friendnumber;
+}
+
+void Core::onAvatarDataCallback(Tox* tox, int32_t friendnumber, uint8_t format,
+                        uint8_t *hash, uint8_t *data, uint32_t datalen, void *userdata)
+{
+    qDebug() << "Core: Got avatar data from "<<friendnumber;
+}
+
 void Core::acceptFriendRequest(const QString& userId)
 {
     int friendId = tox_add_friend_norequest(tox, CUserId(userId).data());
@@ -729,6 +757,22 @@ void Core::setUsername(const QString& username)
     }
 }
 
+void Core::setAvatar(uint8_t format, const QByteArray& data)
+{
+    if (tox_set_avatar(tox, format, (uint8_t*)data.constData(), data.size()) != 0)
+    {
+        qWarning() << "Core: Failed to set self avatar";
+        return;
+    }
+    else
+        qDebug() << "Core: Set avatar, format:"<<format<<", size:"<<data.size();
+
+    QPixmap pic;
+    pic.loadFromData(data);
+    Settings::getInstance().saveAvatar(pic);
+    emit selfAvatarChanged(pic);
+}
+
 ToxID Core::getSelfId()
 {
     uint8_t friendAddress[TOX_FRIEND_ADDRESS_SIZE];
diff --git a/core.h b/core.h
index 0ae48f688..7c3a49a93 100644
--- a/core.h
+++ b/core.h
@@ -71,6 +71,7 @@ public slots:
     void setStatus(Status status);
     void setUsername(const QString& username);
     void setStatusMessage(const QString& message);
+    void setAvatar(uint8_t format, const QByteArray& data);
 
     void sendMessage(int friendId, const QString& message);
     void sendGroupMessage(int groupId, const QString& message);
@@ -123,6 +124,7 @@ signals:
     void usernameSet(const QString& username);
     void statusMessageSet(const QString& message);
     void statusSet(Status status);
+    void selfAvatarChanged(const QPixmap& pic);
 
     void messageSentResult(int friendId, const QString& message, int messageId);
     void groupSentResult(int groupId, const QString& message, int result);
@@ -182,6 +184,8 @@ private:
     static void onFileControlCallback(Tox *tox, int32_t friendnumber, uint8_t receive_send, uint8_t filenumber,
                                       uint8_t control_type, const uint8_t *data, uint16_t length, void *core);
     static void onFileDataCallback(Tox *tox, int32_t friendnumber, uint8_t filenumber, const uint8_t *data, uint16_t length, void *userdata);
+    static void onAvatarInfoCallback(Tox* tox, int32_t friendnumber, uint8_t format, uint8_t *hash, void *userdata);
+    static void onAvatarDataCallback(Tox* tox, int32_t friendnumber, uint8_t format, uint8_t *hash, uint8_t *data, uint32_t datalen, void *userdata);
 
     static void onAvInvite(void* toxav, int32_t call_index, void* core);
     static void onAvStart(void* toxav, int32_t call_index, void* core);
diff --git a/mainwindow.ui b/mainwindow.ui
index 7f9cd12c5..83139cb6c 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -1452,7 +1452,7 @@ QSplitter:handle{
               <number>0</number>
              </property>
              <item>
-              <widget class="QLabel" name="profilePicture">
+              <widget class="ClickableLabel" name="profilePicture">
                <property name="minimumSize">
                 <size>
                  <width>40</width>
@@ -2093,7 +2093,7 @@ QSplitter:handle{
              <x>0</x>
              <y>0</y>
              <width>263</width>
-             <height>373</height>
+             <height>378</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_5"/>
@@ -3228,7 +3228,7 @@ QSplitter:handle{
      <x>0</x>
      <y>0</y>
      <width>716</width>
-     <height>23</height>
+     <height>19</height>
     </rect>
    </property>
   </widget>
@@ -3254,6 +3254,11 @@ 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 68845488e..6b63a9835 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -116,7 +116,8 @@ HEADERS  += widget/form/addfriendform.h \
     widget/settingsdialog.h \
     widget/tool/chatactions/messageaction.h \
     widget/tool/chatactions/filetransferaction.h \
-    widget/tool/chatactions/systemmessageaction.h
+    widget/tool/chatactions/systemmessageaction.h \
+    widget/tool/clickablelabel.h
 
 SOURCES += \
     widget/form/addfriendform.cpp \
diff --git a/settings.cpp b/settings.cpp
index 6c039c6d2..f3a9e0d8b 100644
--- a/settings.cpp
+++ b/settings.cpp
@@ -27,6 +27,7 @@
 #include <QList>
 
 const QString Settings::FILENAME = "settings.ini";
+const QString Settings::AVATAR_FILENAME = "avatar.dat";
 bool Settings::makeToxPortable{false};
 
 Settings::Settings() :
@@ -257,6 +258,20 @@ QString Settings::getSettingsDirPath()
 #endif
 }
 
+QPixmap Settings::getSavedAvatar()
+{
+    QString filePath = QDir(getSettingsDirPath()).filePath(AVATAR_FILENAME);
+    QPixmap pic;
+    pic.load(filePath);
+    return pic;
+}
+
+void Settings::saveAvatar(QPixmap& pic)
+{
+    QString filePath = QDir(getSettingsDirPath()).filePath(AVATAR_FILENAME);
+    pic.save(filePath, "png");
+}
+
 const QList<Settings::DhtServer>& Settings::getDhtServerList() const
 {
     return dhtServerList;
diff --git a/settings.h b/settings.h
index 88811deb7..eb8f0e23c 100644
--- a/settings.h
+++ b/settings.h
@@ -19,6 +19,7 @@
 
 #include <QHash>
 #include <QObject>
+#include <QPixmap>
 
 class Settings : public QObject
 {
@@ -57,6 +58,9 @@ public:
     bool getEncryptLogs() const;
     void setEncryptLogs(bool newValue);
 
+    QPixmap getSavedAvatar();
+    void saveAvatar(QPixmap& pic);
+
     // Assume all widgets have unique names
     // Don't use it to save every single thing you want to save, use it
     // for some general purpose widgets, such as MainWindows or Splitters,
@@ -138,6 +142,7 @@ private:
     Settings& operator=(const Settings&) = delete;
 
     static const QString FILENAME;
+    static const QString AVATAR_FILENAME;
 
     bool loaded;
 
diff --git a/widget/tool/clickablelabel.h b/widget/tool/clickablelabel.h
new file mode 100644
index 000000000..99e523b20
--- /dev/null
+++ b/widget/tool/clickablelabel.h
@@ -0,0 +1,22 @@
+#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 64b09de80..5b5ba6c87 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -36,10 +36,12 @@
 #include <QDebug>
 #include <QFile>
 #include <QString>
+#include <QBuffer>
 #include <QPainter>
 #include <QMouseEvent>
 #include <QClipboard>
 #include <QThread>
+#include <QFileDialog>
 #include <tox/tox.h>
 
 Widget *Widget::instance{nullptr};
@@ -180,6 +182,7 @@ Widget::Widget(QWidget *parent)
     connect(core, &Core::statusSet, this, &Widget::onStatusSet);
     connect(core, &Core::usernameSet, this, &Widget::setUsername);
     connect(core, &Core::statusMessageSet, this, &Widget::setStatusMessage);
+    connect(core, &Core::selfAvatarChanged, this, &Widget::onSelfAvatarLoaded);
     connect(core, SIGNAL(fileDownloadFinished(const QString&)), &filesForm, SLOT(onFileDownloadComplete(const QString&)));
     connect(core, SIGNAL(fileUploadFinished(const QString&)), &filesForm, SLOT(onFileUploadComplete(const QString&)));
     connect(core, &Core::friendAdded, this, &Widget::addFriend);
@@ -210,6 +213,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(setStatusOnline, SIGNAL(triggered()), this, SLOT(setStatusOnline()));
     connect(setStatusAway, SIGNAL(triggered()), this, SLOT(setStatusAway()));
     connect(setStatusBusy, SIGNAL(triggered()), this, SLOT(setStatusBusy()));
@@ -271,6 +275,53 @@ Camera* Widget::getCamera()
     return camera;
 }
 
+void Widget::onAvatarClicked()
+{
+    QString filename = QFileDialog::getOpenFileName(this, "Choose a profile picture");
+    QFile file(filename);
+    file.open(QIODevice::ReadOnly);
+    if (!file.isOpen())
+    {
+        QMessageBox::critical(this, "Error", "Unable to open this file");
+        return;
+    }
+
+    QPixmap pic;
+    if (!pic.loadFromData(file.readAll()))
+    {
+        QMessageBox::critical(this, "Error", "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_MAX_AVATAR_DATA_LENGTH)
+    {
+        pic = pic.scaledToWidth(64, Qt::SmoothTransformation);
+        bytes.clear();
+        buffer.open(QIODevice::WriteOnly);
+        pic.save(&buffer, "PNG");
+        buffer.close();
+    }
+
+    if (bytes.size() >= TOX_MAX_AVATAR_DATA_LENGTH)
+    {
+        QMessageBox::critical(this, "Error", "This image is too big");
+        return;
+    }
+
+    core->setAvatar(TOX_AVATARFORMAT_PNG, bytes);
+}
+
+void Widget::onSelfAvatarLoaded(const QPixmap& pic)
+{
+    ui->profilePicture->setPixmap(pic);
+}
+
 void Widget::onConnected()
 {
     ui->statusButton->setEnabled(true);
diff --git a/widget/widget.h b/widget/widget.h
index e85701a55..352e12cfa 100644
--- a/widget/widget.h
+++ b/widget/widget.h
@@ -80,6 +80,8 @@ private slots:
     void onTransferClicked();
     void onSettingsClicked();
     void onFailedToStartCore();
+    void onAvatarClicked();
+    void onSelfAvatarLoaded(const QPixmap &pic);
     void onUsernameChanged(const QString& newUsername, const QString& oldUsername);
     void onStatusMessageChanged(const QString& newStatusMessage, const QString& oldStatusMessage);
     void setUsername(const QString& username);

From 8de71c19ed3f4a0dfb248ae78898fc148aa1abe1 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Wed, 24 Sep 2014 17:28:38 +0200
Subject: [PATCH 050/205] Initial avatars support

---
 README.md                 |  1 +
 core.cpp                  | 30 ++++++++++++++++++++++--------
 core.h                    |  1 +
 widget/form/chatform.cpp  |  8 ++++++++
 widget/form/chatform.h    |  2 ++
 widget/friendlistwidget.h |  1 +
 widget/friendwidget.cpp   |  8 ++++++++
 widget/friendwidget.h     |  5 +++++
 widget/widget.cpp         |  4 +++-
 9 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 6f13e095a..39317b54a 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ However, it is not a fork.
 - Video calls
 - Tox DNS
 - Translations in various languages
+- Avatars
 
 <h2>Downloads</h2>
 
diff --git a/core.cpp b/core.cpp
index d63461c07..e63ec890b 100644
--- a/core.cpp
+++ b/core.cpp
@@ -216,9 +216,10 @@ void Core::start()
         QByteArray data;
         QBuffer buffer(&data);
         buffer.open(QIODevice::WriteOnly);
-        pic.save(&buffer);
+        pic.save(&buffer, "PNG");
         buffer.close();
-        tox_set_avatar(tox, TOX_AVATARFORMAT_PNG, (uint8_t*)data.constData(), data.size());
+        if (tox_set_avatar(tox, TOX_AVATARFORMAT_PNG, (uint8_t*)data.constData(), data.size()) != 0)
+            qWarning() << "Core:start: Error setting avatar, size:"<<data.size();
         emit selfAvatarChanged(pic);
     }
     else
@@ -279,6 +280,10 @@ void Core::onUserStatusChanged(Tox*/* tox*/, int friendId, uint8_t userstatus, v
             status = Status::Online;
             break;
     }
+
+    if (status == Status::Online || status == Status::Away)
+        tox_request_avatar_data(static_cast<Core*>(core)->tox, friendId);
+
     emit static_cast<Core*>(core)->friendStatusChanged(friendId, status);
 }
 
@@ -449,16 +454,25 @@ void Core::onFileDataCallback(Tox*, int32_t friendnumber, uint8_t filenumber, co
                                             file->filesize, file->bytesSent, ToxFile::RECEIVING);
 }
 
-void Core::onAvatarInfoCallback(Tox* tox, int32_t friendnumber, uint8_t format,
-                                uint8_t *hash, void *userdata)
+void Core::onAvatarInfoCallback(Tox*, int32_t friendnumber, uint8_t format,
+                                uint8_t *, void *)
 {
-    qDebug() << "Core: Got avatar info from "<<friendnumber;
+    qDebug() << "Core: Got avatar info from "<<friendnumber
+             <<": format "<<format;
 }
 
-void Core::onAvatarDataCallback(Tox* tox, int32_t friendnumber, uint8_t format,
-                        uint8_t *hash, uint8_t *data, uint32_t datalen, void *userdata)
+void Core::onAvatarDataCallback(Tox*, int32_t friendnumber, uint8_t,
+                        uint8_t *, uint8_t *data, uint32_t datalen, void *core)
 {
-    qDebug() << "Core: Got avatar data from "<<friendnumber;
+    QPixmap pic;
+    pic.loadFromData((uchar*)data, datalen);
+    if (pic.isNull())
+        qDebug() << "Core: Got invalid avatar data from "<<friendnumber;
+    else
+    {
+        qDebug() << "Core: Got avatar data from "<<friendnumber<<", size:"<<pic.size();
+        emit static_cast<Core*>(core)->friendAvatarChanged(friendnumber, pic);
+    }
 }
 
 void Core::acceptFriendRequest(const QString& userId)
diff --git a/core.h b/core.h
index 7c3a49a93..fb9207195 100644
--- a/core.h
+++ b/core.h
@@ -106,6 +106,7 @@ signals:
     void friendStatusMessageChanged(int friendId, const QString& message);
     void friendUsernameChanged(int friendId, const QString& username);
     void friendTypingChanged(int friendId, bool isTyping);
+    void friendAvatarChanged(int friendId, const QPixmap& pic);
 
     void friendStatusMessageLoaded(int friendId, const QString& message);
     void friendUsernameLoaded(int friendId, const QString& username);
diff --git a/widget/form/chatform.cpp b/widget/form/chatform.cpp
index f8b950b7b..6863107bb 100644
--- a/widget/form/chatform.cpp
+++ b/widget/form/chatform.cpp
@@ -464,3 +464,11 @@ void ChatForm::onFileSendFailed(int FriendId, const QString &fname)
 
     addSystemInfoMessage("File: \"" + fname + "\" failed to send.", "red");
 }
+
+void ChatForm::onAvatarChange(int FriendId, const QPixmap &pic)
+{
+    if (FriendId != f->friendId)
+        return;
+
+    avatarLabel->setPixmap(pic);
+}
diff --git a/widget/form/chatform.h b/widget/form/chatform.h
index 43681562c..fd270fd64 100644
--- a/widget/form/chatform.h
+++ b/widget/form/chatform.h
@@ -23,6 +23,7 @@
 struct Friend;
 class FileTransferInstance;
 class NetCamView;
+class QPixmap;
 
 class ChatForm : public GenericChatForm
 {
@@ -55,6 +56,7 @@ public slots:
     void onAvPeerTimeout(int FriendId, int CallId);
     void onAvMediaChange(int FriendId, int CallId, bool video);
     void onMicMuteToggle();
+    void onAvatarChange(int FriendId, const QPixmap& pic);
 
 private slots:
     void onSendTriggered();
diff --git a/widget/friendlistwidget.h b/widget/friendlistwidget.h
index dae6b1c61..f8c3adf8c 100644
--- a/widget/friendlistwidget.h
+++ b/widget/friendlistwidget.h
@@ -23,6 +23,7 @@
 
 class QLayout;
 class QGridLayout;
+class QPixmap;
 
 class FriendListWidget : public QWidget
 {
diff --git a/widget/friendwidget.cpp b/widget/friendwidget.cpp
index e1744002d..60b655c96 100644
--- a/widget/friendwidget.cpp
+++ b/widget/friendwidget.cpp
@@ -190,3 +190,11 @@ void FriendWidget::resetEventFlags()
     Friend* f = FriendList::findFriend(friendId);
     f->hasNewEvents = 0;
 }
+
+void FriendWidget::onAvatarChange(int FriendId, const QPixmap& pic)
+{
+    if (FriendId != friendId)
+        return;
+
+    avatar.setPixmap(pic);
+}
diff --git a/widget/friendwidget.h b/widget/friendwidget.h
index da158e68d..c693c6199 100644
--- a/widget/friendwidget.h
+++ b/widget/friendwidget.h
@@ -22,6 +22,8 @@
 #include "genericchatroomwidget.h"
 #include "croppinglabel.h"
 
+class QPixmap;
+
 struct FriendWidget : public GenericChatroomWidget
 {
     Q_OBJECT
@@ -39,6 +41,9 @@ signals:
     void removeFriend(int friendId);
     void copyFriendIdToClipboard(int friendId);
 
+public slots:
+    void onAvatarChange(int FriendId, const QPixmap& pic);
+
 public:
     int friendId;
     QLabel avatar, statusPic;
diff --git a/widget/widget.cpp b/widget/widget.cpp
index 5b5ba6c87..834a68412 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -168,6 +168,7 @@ Widget::Widget(QWidget *parent)
     qRegisterMetaType<uint8_t>("uint8_t");
     qRegisterMetaType<int32_t>("int32_t");
     qRegisterMetaType<int64_t>("int64_t");
+    qRegisterMetaType<QPixmap>("QPixmap");
     qRegisterMetaType<ToxFile>("ToxFile");
     qRegisterMetaType<ToxFile::FileDirection>("ToxFile::FileDirection");
 
@@ -435,7 +436,6 @@ void Widget::setStatusMessage(const QString &statusMessage)
 
 void Widget::addFriend(int friendId, const QString &userId)
 {
-
     qDebug() << "Widget: Adding friend with id "+userId;
     Friend* newfriend = FriendList::addFriend(friendId, userId);
     QLayout* layout = contactListWidget->getFriendLayout(Status::Offline);
@@ -463,6 +463,8 @@ void Widget::addFriend(int friendId, const QString &userId)
     connect(core, &Core::avRequestTimeout, newfriend->chatForm, &ChatForm::onAvRequestTimeout);
     connect(core, &Core::avPeerTimeout, newfriend->chatForm, &ChatForm::onAvPeerTimeout);
     connect(core, &Core::avMediaChange, newfriend->chatForm, &ChatForm::onAvMediaChange);
+    connect(core, &Core::friendAvatarChanged, newfriend->chatForm, &ChatForm::onAvatarChange);
+    connect(core, &Core::friendAvatarChanged, newfriend->widget, &FriendWidget::onAvatarChange);
 }
 
 void Widget::addFriendFailed(const QString&)

From 3cb1d280bc2e2f6ca2082cd9ab22264da6010d8b Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Wed, 24 Sep 2014 17:35:24 +0200
Subject: [PATCH 051/205] Fix avatars resetting after friend clicked on

---
 widget/friendwidget.cpp | 10 +++++++---
 widget/friendwidget.h   |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/widget/friendwidget.cpp b/widget/friendwidget.cpp
index 60b655c96..b9d134878 100644
--- a/widget/friendwidget.cpp
+++ b/widget/friendwidget.cpp
@@ -26,7 +26,7 @@
 #include <QMenu>
 
 FriendWidget::FriendWidget(int FriendId, QString id)
-    : friendId(FriendId)
+    : friendId(FriendId), isDefaultAvatar{true}
 {
     setMouseTracking(true);
     setAutoFillBackground(true);
@@ -134,7 +134,8 @@ void FriendWidget::setAsActiveChatroom()
     QPalette pal3;
     pal3.setColor(QPalette::Background, Qt::white);
     this->setPalette(pal3);
-    avatar.setPixmap(QPixmap(":img/contact_dark.png"));
+    if (isDefaultAvatar)
+       avatar.setPixmap(QPixmap(":img/contact_dark.png"));
 }
 
 void FriendWidget::setAsInactiveChatroom()
@@ -153,7 +154,9 @@ void FriendWidget::setAsInactiveChatroom()
     QPalette pal3;
     pal3.setColor(QPalette::Background, QColor(65,65,65,255));
     this->setPalette(pal3);
-    avatar.setPixmap(QPixmap(":img/contact.png"));
+
+    if (isDefaultAvatar)
+        avatar.setPixmap(QPixmap(":img/contact.png"));
 }
 
 void FriendWidget::updateStatusLight()
@@ -196,5 +199,6 @@ void FriendWidget::onAvatarChange(int FriendId, const QPixmap& pic)
     if (FriendId != friendId)
         return;
 
+    isDefaultAvatar = false;
     avatar.setPixmap(pic);
 }
diff --git a/widget/friendwidget.h b/widget/friendwidget.h
index c693c6199..a1bae68a1 100644
--- a/widget/friendwidget.h
+++ b/widget/friendwidget.h
@@ -48,6 +48,7 @@ public:
     int friendId;
     QLabel avatar, statusPic;
     CroppingLabel name, statusMessage;
+    bool isDefaultAvatar;
 };
 
 #endif // FRIENDWIDGET_H

From ab3f2e2950de8dd45baf0e70607ad033e200cf18 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Wed, 24 Sep 2014 17:42:10 +0200
Subject: [PATCH 052/205] Rescale avatars in the friend widget

---
 widget/friendwidget.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/widget/friendwidget.cpp b/widget/friendwidget.cpp
index b9d134878..fcb6a416f 100644
--- a/widget/friendwidget.cpp
+++ b/widget/friendwidget.cpp
@@ -200,5 +200,6 @@ void FriendWidget::onAvatarChange(int FriendId, const QPixmap& pic)
         return;
 
     isDefaultAvatar = false;
-    avatar.setPixmap(pic);
+    QPixmap scaled = pic.scaled(40,40,Qt::KeepAspectRatio,Qt::SmoothTransformation);
+    avatar.setPixmap(scaled);
 }

From ff2994a0fd472e1008fdd39cfeb881d1d578d43d Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Wed, 24 Sep 2014 17:55:54 +0200
Subject: [PATCH 053/205] Cache avatars

---
 core.cpp          | 5 +++--
 settings.cpp      | 8 ++++----
 settings.h        | 4 ++--
 widget/widget.cpp | 8 ++++++++
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/core.cpp b/core.cpp
index e63ec890b..e0e4e2c43 100644
--- a/core.cpp
+++ b/core.cpp
@@ -210,7 +210,7 @@ void Core::start()
     tox_get_address(tox, friendAddress);
     emit friendAddressGenerated(CFriendAddress::toString(friendAddress));
 
-    QPixmap pic = Settings::getInstance().getSavedAvatar();
+    QPixmap pic = Settings::getInstance().getSavedAvatar(getSelfId().toString());
     if (!pic.isNull() && !pic.size().isEmpty())
     {
         QByteArray data;
@@ -471,6 +471,7 @@ void Core::onAvatarDataCallback(Tox*, int32_t friendnumber, uint8_t,
     else
     {
         qDebug() << "Core: Got avatar data from "<<friendnumber<<", size:"<<pic.size();
+        Settings::getInstance().saveAvatar(pic, static_cast<Core*>(core)->getFriendAddress(friendnumber));
         emit static_cast<Core*>(core)->friendAvatarChanged(friendnumber, pic);
     }
 }
@@ -783,7 +784,7 @@ void Core::setAvatar(uint8_t format, const QByteArray& data)
 
     QPixmap pic;
     pic.loadFromData(data);
-    Settings::getInstance().saveAvatar(pic);
+    Settings::getInstance().saveAvatar(pic, getSelfId().toString());
     emit selfAvatarChanged(pic);
 }
 
diff --git a/settings.cpp b/settings.cpp
index f3a9e0d8b..0748cd0ff 100644
--- a/settings.cpp
+++ b/settings.cpp
@@ -258,17 +258,17 @@ QString Settings::getSettingsDirPath()
 #endif
 }
 
-QPixmap Settings::getSavedAvatar()
+QPixmap Settings::getSavedAvatar(const QString &ownerId)
 {
-    QString filePath = QDir(getSettingsDirPath()).filePath(AVATAR_FILENAME);
+    QString filePath = QDir(getSettingsDirPath()).filePath("avatar_"+ownerId);
     QPixmap pic;
     pic.load(filePath);
     return pic;
 }
 
-void Settings::saveAvatar(QPixmap& pic)
+void Settings::saveAvatar(QPixmap& pic, const QString& ownerId)
 {
-    QString filePath = QDir(getSettingsDirPath()).filePath(AVATAR_FILENAME);
+    QString filePath = QDir(getSettingsDirPath()).filePath("avatar_"+ownerId);
     pic.save(filePath, "png");
 }
 
diff --git a/settings.h b/settings.h
index eb8f0e23c..882a31f0f 100644
--- a/settings.h
+++ b/settings.h
@@ -58,8 +58,8 @@ public:
     bool getEncryptLogs() const;
     void setEncryptLogs(bool newValue);
 
-    QPixmap getSavedAvatar();
-    void saveAvatar(QPixmap& pic);
+    QPixmap getSavedAvatar(const QString& ownerId);
+    void saveAvatar(QPixmap& pic, const QString& ownerId);
 
     // Assume all widgets have unique names
     // Don't use it to save every single thing you want to save, use it
diff --git a/widget/widget.cpp b/widget/widget.cpp
index 834a68412..73b6946a2 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -465,6 +465,14 @@ void Widget::addFriend(int friendId, const QString &userId)
     connect(core, &Core::avMediaChange, newfriend->chatForm, &ChatForm::onAvMediaChange);
     connect(core, &Core::friendAvatarChanged, newfriend->chatForm, &ChatForm::onAvatarChange);
     connect(core, &Core::friendAvatarChanged, newfriend->widget, &FriendWidget::onAvatarChange);
+
+    // Try to get the avatar from the cache
+    QPixmap avatar = Settings::getInstance().getSavedAvatar(userId);
+    if (!avatar.isNull())
+    {
+        newfriend->chatForm->onAvatarChange(friendId, avatar);
+        newfriend->widget->onAvatarChange(friendId, avatar);
+    }
 }
 
 void Widget::addFriendFailed(const QString&)

From 86e483303fe0ad6a2cab962b0582813180a7f004 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Wed, 24 Sep 2014 18:22:09 +0200
Subject: [PATCH 054/205] Broadcast new avatars when changed

---
 core.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/core.cpp b/core.cpp
index e0e4e2c43..2d0423a86 100644
--- a/core.cpp
+++ b/core.cpp
@@ -455,10 +455,12 @@ void Core::onFileDataCallback(Tox*, int32_t friendnumber, uint8_t filenumber, co
 }
 
 void Core::onAvatarInfoCallback(Tox*, int32_t friendnumber, uint8_t format,
-                                uint8_t *, void *)
+                                uint8_t *, void* core)
 {
     qDebug() << "Core: Got avatar info from "<<friendnumber
              <<": format "<<format;
+
+    tox_request_avatar_data(static_cast<Core*>(core)->tox, friendnumber);
 }
 
 void Core::onAvatarDataCallback(Tox*, int32_t friendnumber, uint8_t,
@@ -786,6 +788,11 @@ void Core::setAvatar(uint8_t format, const QByteArray& data)
     pic.loadFromData(data);
     Settings::getInstance().saveAvatar(pic, getSelfId().toString());
     emit selfAvatarChanged(pic);
+
+    // Broadcast our new avatar!
+    const uint32_t friendCount = tox_count_friendlist(tox);;
+    for (unsigned i=0; i<friendCount; i++)
+        tox_send_avatar_info(tox, i);
 }
 
 ToxID Core::getSelfId()

From c1f24b27ba0d1289b9e7ab6afd5cede5bac26256 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Wed, 24 Sep 2014 18:25:09 +0200
Subject: [PATCH 055/205] Fix self avatar being cropped

---
 mainwindow.ui     | 3 +++
 widget/widget.cpp | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mainwindow.ui b/mainwindow.ui
index 83139cb6c..ff345391b 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -1471,6 +1471,9 @@ QSplitter:handle{
                <property name="pixmap">
                 <pixmap resource="res.qrc">:/img/contact.png</pixmap>
                </property>
+               <property name="scaledContents">
+                <bool>true</bool>
+               </property>
                <property name="wordWrap">
                 <bool>true</bool>
                </property>
diff --git a/widget/widget.cpp b/widget/widget.cpp
index 73b6946a2..b2e1de6b5 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -320,7 +320,8 @@ void Widget::onAvatarClicked()
 
 void Widget::onSelfAvatarLoaded(const QPixmap& pic)
 {
-    ui->profilePicture->setPixmap(pic);
+    QPixmap scaled = pic.scaledToWidth(40, Qt::SmoothTransformation);
+    ui->profilePicture->setPixmap(scaled);
 }
 
 void Widget::onConnected()

From 81e6d8323a8ad955ee998bb88e9167310f93ca64 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Wed, 24 Sep 2014 18:32:20 +0200
Subject: [PATCH 056/205] Keep avatar aspect ratio

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

diff --git a/widget/widget.cpp b/widget/widget.cpp
index b2e1de6b5..21f02feec 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -320,7 +320,7 @@ void Widget::onAvatarClicked()
 
 void Widget::onSelfAvatarLoaded(const QPixmap& pic)
 {
-    QPixmap scaled = pic.scaledToWidth(40, Qt::SmoothTransformation);
+    QPixmap scaled = pic.scaled(40,40, Qt::KeepAspectRatio,Qt::SmoothTransformation);
     ui->profilePicture->setPixmap(scaled);
 }
 

From 52d18f9f18fc15dd70693d958c6db574bba2e1de Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Wed, 24 Sep 2014 18:40:40 +0200
Subject: [PATCH 057/205] Keep avatar aspect ratio (for real)

---
 mainwindow.ui     | 2 +-
 widget/widget.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mainwindow.ui b/mainwindow.ui
index ff345391b..845a0c728 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -1472,7 +1472,7 @@ QSplitter:handle{
                 <pixmap resource="res.qrc">:/img/contact.png</pixmap>
                </property>
                <property name="scaledContents">
-                <bool>true</bool>
+                <bool>false</bool>
                </property>
                <property name="wordWrap">
                 <bool>true</bool>
diff --git a/widget/widget.cpp b/widget/widget.cpp
index 21f02feec..49e4fb10d 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -302,7 +302,7 @@ void Widget::onAvatarClicked()
 
     if (bytes.size() >= TOX_MAX_AVATAR_DATA_LENGTH)
     {
-        pic = pic.scaledToWidth(64, Qt::SmoothTransformation);
+        pic = pic.scaled(64,64, Qt::KeepAspectRatio, Qt::SmoothTransformation);
         bytes.clear();
         buffer.open(QIODevice::WriteOnly);
         pic.save(&buffer, "PNG");

From be7c39d69ac7734ed32d156e0bb14a0221e88280 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Thu, 25 Sep 2014 09:55:36 -0500
Subject: [PATCH 058/205] api update

---
 core.cpp          | 2 +-
 widget/widget.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core.cpp b/core.cpp
index 2d0423a86..b2718ef5f 100644
--- a/core.cpp
+++ b/core.cpp
@@ -218,7 +218,7 @@ void Core::start()
         buffer.open(QIODevice::WriteOnly);
         pic.save(&buffer, "PNG");
         buffer.close();
-        if (tox_set_avatar(tox, TOX_AVATARFORMAT_PNG, (uint8_t*)data.constData(), data.size()) != 0)
+        if (tox_set_avatar(tox, TOX_AVATAR_FORMAT_PNG, (uint8_t*)data.constData(), data.size()) != 0)
             qWarning() << "Core:start: Error setting avatar, size:"<<data.size();
         emit selfAvatarChanged(pic);
     }
diff --git a/widget/widget.cpp b/widget/widget.cpp
index 49e4fb10d..aa4a5cff0 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -300,7 +300,7 @@ void Widget::onAvatarClicked()
     pic.save(&buffer, "PNG");
     buffer.close();
 
-    if (bytes.size() >= TOX_MAX_AVATAR_DATA_LENGTH)
+    if (bytes.size() >= TOX_AVATAR_MAX_DATA_LENGTH)
     {
         pic = pic.scaled(64,64, Qt::KeepAspectRatio, Qt::SmoothTransformation);
         bytes.clear();
@@ -309,13 +309,13 @@ void Widget::onAvatarClicked()
         buffer.close();
     }
 
-    if (bytes.size() >= TOX_MAX_AVATAR_DATA_LENGTH)
+    if (bytes.size() >= TOX_AVATAR_MAX_DATA_LENGTH)
     {
         QMessageBox::critical(this, "Error", "This image is too big");
         return;
     }
 
-    core->setAvatar(TOX_AVATARFORMAT_PNG, bytes);
+    core->setAvatar(TOX_AVATAR_FORMAT_PNG, bytes);
 }
 
 void Widget::onSelfAvatarLoaded(const QPixmap& pic)

From e32ad7236825384eed7b97ccfa3992f8ee0d8de2 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Thu, 25 Sep 2014 10:16:36 -0500
Subject: [PATCH 059/205] slight improvements to avatars

---
 widget/widget.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/widget/widget.cpp b/widget/widget.cpp
index aa4a5cff0..88128d8ac 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -278,19 +278,21 @@ Camera* Widget::getCamera()
 
 void Widget::onAvatarClicked()
 {
-    QString filename = QFileDialog::getOpenFileName(this, "Choose a profile picture");
+    QString filename = QFileDialog::getOpenFileName(this, tr("Choose a profile picture"), QDir::homePath(), "*.png");
+    if (filename == "")
+        return;
     QFile file(filename);
     file.open(QIODevice::ReadOnly);
     if (!file.isOpen())
     {
-        QMessageBox::critical(this, "Error", "Unable to open this file");
+        QMessageBox::critical(this, tr("Error"), tr("Unable to open this file"));
         return;
     }
 
     QPixmap pic;
     if (!pic.loadFromData(file.readAll()))
     {
-        QMessageBox::critical(this, "Error", "Unable to read this image");
+        QMessageBox::critical(this, tr("Error"), tr("Unable to read this image"));
         return;
     }
 
@@ -311,7 +313,7 @@ void Widget::onAvatarClicked()
 
     if (bytes.size() >= TOX_AVATAR_MAX_DATA_LENGTH)
     {
-        QMessageBox::critical(this, "Error", "This image is too big");
+        QMessageBox::critical(this, tr("Error"), tr("This image is too big"));
         return;
     }
 

From 458636e6d6bcb48c8ac914df6050578fe9db0cbb Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Thu, 25 Sep 2014 15:38:47 +0200
Subject: [PATCH 060/205] EmoticonsWidget: use HandCursor

---
 widget/emoticonswidget.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/widget/emoticonswidget.cpp b/widget/emoticonswidget.cpp
index bab7abe8d..f471e8729 100644
--- a/widget/emoticonswidget.cpp
+++ b/widget/emoticonswidget.cpp
@@ -66,6 +66,7 @@ EmoticonsWidget::EmoticonsWidget(QWidget *parent) :
         {
             QRadioButton* pageButton = new QRadioButton;
             pageButton->setProperty("pageIndex", i);
+            pageButton->setCursor(Qt::PointingHandCursor);
             pageButton->setChecked(i == 0);
             buttonLayout->addWidget(pageButton);
 
@@ -80,6 +81,7 @@ EmoticonsWidget::EmoticonsWidget(QWidget *parent) :
         button->setIcon(SmileyPack::getInstance().getAsIcon(set[0]));
         button->setToolTip(set.join(" "));
         button->setProperty("sequence", set[0]);
+        button->setCursor(Qt::PointingHandCursor);
         button->setFlat(true);
 
         connect(button, &QPushButton::clicked, this, &EmoticonsWidget::onSmileyClicked);

From ad5a175f7d0c1c8294dc0ce311e8b2c63256e0b7 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Thu, 25 Sep 2014 18:03:25 +0200
Subject: [PATCH 061/205] drag&drop support

---
 widget/form/chatform.cpp        | 25 +++++++++++++++++++++++++
 widget/form/chatform.h          |  5 +++++
 widget/form/genericchatform.cpp | 18 ++++++------------
 widget/form/genericchatform.h   |  9 ++++-----
 widget/form/groupchatform.cpp   | 24 ++++++++++++++++++++----
 widget/form/groupchatform.h     |  7 ++++++-
 widget/friendwidget.cpp         | 28 ++++++++++++++++++++++++++++
 widget/friendwidget.h           |  5 +++++
 8 files changed, 99 insertions(+), 22 deletions(-)

diff --git a/widget/form/chatform.cpp b/widget/form/chatform.cpp
index 6863107bb..788596dd6 100644
--- a/widget/form/chatform.cpp
+++ b/widget/form/chatform.cpp
@@ -19,6 +19,9 @@
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QPushButton>
+#include <QMimeData>
+#include <QFileInfo>
+#include <QDragEnterEvent>
 #include "chatform.h"
 #include "friend.h"
 #include "widget/friendwidget.h"
@@ -52,6 +55,8 @@ ChatForm::ChatForm(Friend* chatFriend)
     connect(micButton, SIGNAL(clicked()), this, SLOT(onMicMuteToggle()));
     connect(chatWidget, &ChatAreaWidget::onFileTranfertInterract, this, &ChatForm::onFileTansBtnClicked);
     connect(Core::getInstance(), &Core::fileSendFailed, this, &ChatForm::onFileSendFailed);
+
+    setAcceptDrops(true);
 }
 
 ChatForm::~ChatForm()
@@ -472,3 +477,23 @@ void ChatForm::onAvatarChange(int FriendId, const QPixmap &pic)
 
     avatarLabel->setPixmap(pic);
 }
+
+void ChatForm::dragEnterEvent(QDragEnterEvent *ev)
+{
+    if (ev->mimeData()->hasUrls())
+        ev->acceptProposedAction();
+}
+
+void ChatForm::dropEvent(QDropEvent *ev)
+{
+    if (ev->mimeData()->hasUrls())
+    {
+        for (QUrl url : ev->mimeData()->urls())
+        {
+            QFileInfo info(url.path());
+
+            if (info.exists())
+                Core::getInstance()->sendFile(f->friendId, info.fileName(), info.absoluteFilePath(), info.size());
+        }
+    }
+}
diff --git a/widget/form/chatform.h b/widget/form/chatform.h
index fd270fd64..4604d54e3 100644
--- a/widget/form/chatform.h
+++ b/widget/form/chatform.h
@@ -69,6 +69,11 @@ private slots:
     void onFileTansBtnClicked(QString widgetName, QString buttonName);
     void onFileSendFailed(int FriendId, const QString &fname);
 
+protected:
+    // drag & drop
+    void dragEnterEvent(QDragEnterEvent* ev);
+    void dropEvent(QDropEvent* ev);
+
 private:
     Friend* f;
     CroppingLabel *statusMessageLabel;
diff --git a/widget/form/genericchatform.cpp b/widget/form/genericchatform.cpp
index 0e765b397..cff9e3b50 100644
--- a/widget/form/genericchatform.cpp
+++ b/widget/form/genericchatform.cpp
@@ -27,12 +27,12 @@
 #include "widget/chatareawidget.h"
 #include "widget/tool/chattextedit.h"
 
-GenericChatForm::GenericChatForm(QObject *parent) :
-    QObject(parent)
+GenericChatForm::GenericChatForm(QWidget *parent) :
+    QWidget(parent)
 {
     curRow = 0;
 
-    mainWidget = new QWidget(); headWidget = new QWidget();
+    headWidget = new QWidget();
 
     nameLabel = new CroppingLabel();
     avatarLabel = new QLabel();
@@ -84,7 +84,7 @@ GenericChatForm::GenericChatForm(QObject *parent) :
     micButton->setObjectName("green");
     micButton->setStyleSheet(micButtonStylesheet);
 
-    mainWidget->setLayout(mainLayout);
+    setLayout(mainLayout);
     mainLayout->addWidget(chatWidget);
     mainLayout->addLayout(mainFootLayout);
     mainLayout->setMargin(0);
@@ -129,10 +129,10 @@ void GenericChatForm::setName(const QString &newName)
 
 void GenericChatForm::show(Ui::MainWindow &ui)
 {
-    ui.mainContent->layout()->addWidget(mainWidget);
+    ui.mainContent->layout()->addWidget(this);
     ui.mainHead->layout()->addWidget(headWidget);
-    mainWidget->show();
     headWidget->show();
+    QWidget::show();
 }
 
 void GenericChatForm::onChatContextMenuRequested(QPoint pos)
@@ -172,12 +172,6 @@ void GenericChatForm::addMessage(QString author, QString message, QDateTime date
     previousName = author;
 }
 
-GenericChatForm::~GenericChatForm()
-{
-    delete mainWidget;
-    delete headWidget;
-}
-
 void GenericChatForm::onEmoteButtonClicked()
 {
     // don't show the smiley selection widget if there are no smileys available
diff --git a/widget/form/genericchatform.h b/widget/form/genericchatform.h
index 72dc94fd9..c824d5e85 100644
--- a/widget/form/genericchatform.h
+++ b/widget/form/genericchatform.h
@@ -17,7 +17,7 @@
 #ifndef GENERICCHATFORM_H
 #define GENERICCHATFORM_H
 
-#include <QObject>
+#include <QWidget>
 #include <QPoint>
 #include <QDateTime>
 
@@ -35,12 +35,11 @@ namespace Ui {
     class MainWindow;
 }
 
-class GenericChatForm : public QObject
+class GenericChatForm : public QWidget
 {
     Q_OBJECT
 public:
-    GenericChatForm(QObject *parent = 0);
-    virtual ~GenericChatForm();
+    GenericChatForm(QWidget *parent = 0);
 
     virtual void setName(const QString &newName);
     virtual void show(Ui::MainWindow &ui);
@@ -62,7 +61,7 @@ protected slots:
 protected:
     CroppingLabel *nameLabel;
     QLabel *avatarLabel;
-    QWidget *mainWidget, *headWidget;
+    QWidget *headWidget;
     QPushButton *fileButton, *emoteButton, *callButton, *videoButton, *volButton, *micButton;
     QVBoxLayout *headTextLayout;
     ChatTextEdit *msgEdit;
diff --git a/widget/form/groupchatform.cpp b/widget/form/groupchatform.cpp
index 907787fd3..4dc6c7e0d 100644
--- a/widget/form/groupchatform.cpp
+++ b/widget/form/groupchatform.cpp
@@ -19,7 +19,10 @@
 #include "widget/groupwidget.h"
 #include "widget/tool/chattextedit.h"
 #include "widget/croppinglabel.h"
+#include "core.h"
 #include <QPushButton>
+#include <QMimeData>
+#include <QDragEnterEvent>
 
 GroupChatForm::GroupChatForm(Group* chatGroup)
     : group(chatGroup)
@@ -58,11 +61,8 @@ GroupChatForm::GroupChatForm(Group* chatGroup)
 
     connect(sendButton, SIGNAL(clicked()), this, SLOT(onSendTriggered()));
     connect(msgEdit, SIGNAL(enterPressed()), this, SLOT(onSendTriggered()));
-}
-
-GroupChatForm::~GroupChatForm()
-{
 
+    setAcceptDrops(true);
 }
 
 void GroupChatForm::onSendTriggered()
@@ -94,3 +94,19 @@ void GroupChatForm::onUserListChanged()
     names.chop(2);
     namesList->setText(names);
 }
+
+void GroupChatForm::dragEnterEvent(QDragEnterEvent *ev)
+{
+    if (ev->mimeData()->hasFormat("friend"))
+        ev->acceptProposedAction();
+}
+
+void GroupChatForm::dropEvent(QDropEvent *ev)
+{
+    if (ev->mimeData()->hasFormat("friend"))
+    {
+        int friendId = ev->mimeData()->data("friend").toInt();
+        Core::getInstance()->groupInviteFriend(friendId, group->groupId);
+    }
+}
+
diff --git a/widget/form/groupchatform.h b/widget/form/groupchatform.h
index cdf20a113..a544034de 100644
--- a/widget/form/groupchatform.h
+++ b/widget/form/groupchatform.h
@@ -27,13 +27,18 @@ class GroupChatForm : public GenericChatForm
     Q_OBJECT
 public:
     GroupChatForm(Group* chatGroup);
-    ~GroupChatForm();
+
     void addGroupMessage(QString message, int peerId);
     void onUserListChanged();
 
 private slots:
     void onSendTriggered();
 
+protected:
+    // drag & drop
+    void dragEnterEvent(QDragEnterEvent* ev);
+    void dropEvent(QDropEvent* ev);
+
 private:
     Group* group;
     QLabel *nusersLabel, *namesList;
diff --git a/widget/friendwidget.cpp b/widget/friendwidget.cpp
index fcb6a416f..869bc4192 100644
--- a/widget/friendwidget.cpp
+++ b/widget/friendwidget.cpp
@@ -24,6 +24,9 @@
 #include "widget/form/chatform.h"
 #include <QContextMenuEvent>
 #include <QMenu>
+#include <QDrag>
+#include <QMimeData>
+#include <QApplication>
 
 FriendWidget::FriendWidget(int FriendId, QString id)
     : friendId(FriendId), isDefaultAvatar{true}
@@ -203,3 +206,28 @@ void FriendWidget::onAvatarChange(int FriendId, const QPixmap& pic)
     QPixmap scaled = pic.scaled(40,40,Qt::KeepAspectRatio,Qt::SmoothTransformation);
     avatar.setPixmap(scaled);
 }
+
+void FriendWidget::mousePressEvent(QMouseEvent *ev)
+{
+    if (ev->button() == Qt::LeftButton)
+        dragStartPos = ev->pos();
+}
+
+void FriendWidget::mouseMoveEvent(QMouseEvent *ev)
+{
+    if (!(ev->buttons() & Qt::LeftButton))
+        return;
+
+    if ((dragStartPos - ev->pos()).manhattanLength() > QApplication::startDragDistance())
+    {
+        QDrag* drag = new QDrag(this);
+        QMimeData* mdata = new QMimeData;
+        mdata->setData("friend", QString::number(friendId).toLatin1());
+
+        drag->setMimeData(mdata);
+        if (avatar.pixmap())
+            drag->setPixmap(*avatar.pixmap());
+
+        drag->exec(Qt::CopyAction | Qt::MoveAction);
+    }
+}
diff --git a/widget/friendwidget.h b/widget/friendwidget.h
index a1bae68a1..aa225d533 100644
--- a/widget/friendwidget.h
+++ b/widget/friendwidget.h
@@ -44,11 +44,16 @@ signals:
 public slots:
     void onAvatarChange(int FriendId, const QPixmap& pic);
 
+protected:
+    void mousePressEvent(QMouseEvent* ev);
+    void mouseMoveEvent(QMouseEvent* ev);
+
 public:
     int friendId;
     QLabel avatar, statusPic;
     CroppingLabel name, statusMessage;
     bool isDefaultAvatar;
+    QPoint dragStartPos;
 };
 
 #endif // FRIENDWIDGET_H

From 46ffc883df94b2fb664e3bed1644cfe53b890bf8 Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Fri, 26 Sep 2014 00:30:23 +0700
Subject: [PATCH 062/205] Progress bar in file transfers (fix #309)

---
 filetransferinstance.cpp | 34 ++++++++++++++++++++++++++++++----
 filetransferinstance.h   |  3 ++-
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/filetransferinstance.cpp b/filetransferinstance.cpp
index 9bcc7b6e1..6167bfac3 100644
--- a/filetransferinstance.cpp
+++ b/filetransferinstance.cpp
@@ -21,6 +21,7 @@
 #include <QMessageBox>
 #include <QBuffer>
 #include <QDebug>
+#include <QPainter>
 
 uint FileTransferInstance::Idconter = 0;
 
@@ -76,6 +77,7 @@ void FileTransferInstance::onFileTransferInfo(int FriendId, int FileNum, int64_t
     long rawspeed = diff / timediff;
     speed = getHumanReadableSize(rawspeed)+"/s";
     size = getHumanReadableSize(Filesize);
+    totalBytes = Filesize;
     if (!rawspeed)
         return;
     int etaSecs = (Filesize - BytesSent) / rawspeed;
@@ -352,8 +354,16 @@ QString FileTransferInstance::draw2ButtonsForm(const QString &type, const QImage
     QString imgBstr = "<img src=\"data:ftrans." + widgetId + ".btnB/png;base64," + QImage2base64(imgB) + "\">";
 
     QString content;
-    content += "<p>" + filename + "</p>";
-    content += "<p>" + getHumanReadableSize(lastBytesSent) + " / " + size + "&nbsp;(" + speed + " ETA: " + eta + ")</p>\n";
+    QString progrBar = "<img src=\"data:progressbar." + widgetId + "/png;base64," + QImage2base64(drawProgressBarImg(double(lastBytesSent)/totalBytes, 250, 9)) + "\">";
+
+    content  = "<p>" + filename + "</p>";
+    content += "<table cellspacing=\"0\"><tr>";
+    content += "<td>" + size + "</td>";
+    content += "<td align=center>" + speed + "</td>";
+    content += "<td align=right>ETA: " + eta + "</td>";
+    content += "</tr><tr><td colspan=3>";
+    content += progrBar;
+    content += "</td></tr></table>";
 
     return wrapIntoForm(content, type, imgAstr, imgBstr);
 }
@@ -362,10 +372,10 @@ QString FileTransferInstance::wrapIntoForm(const QString& content, const QString
 {
     QString res;
 
-    res =  "<table widht=100% cellspacing=\"0\">\n";
+    res =  "<table cellspacing=\"0\">\n";
     res += "<tr valign=middle>\n";
     res += insertMiniature(type);
-    res += "<td width=100%>\n";
+    res += "<td width=280>\n";
     res += "<div class=" + type + ">";
     res += content;
     res += "</div>\n";
@@ -378,3 +388,19 @@ QString FileTransferInstance::wrapIntoForm(const QString& content, const QString
 
     return res;
 }
+
+QImage FileTransferInstance::drawProgressBarImg(const double &part, int w, int h)
+{
+    QImage progressBar(w, h, QImage::Format_Mono);
+
+    QPainter qPainter(&progressBar);
+    qPainter.setBrush(Qt::NoBrush);
+    qPainter.setPen(Qt::black);
+    qPainter.drawRect(0, 0, w - 1, h - 1);
+
+    qPainter.setBrush(Qt::SolidPattern);
+    qPainter.setPen(Qt::black);
+    qPainter.drawRect(1, 0, (w - 2) * (part), h - 1);
+
+    return progressBar;
+}
diff --git a/filetransferinstance.h b/filetransferinstance.h
index b81b03102..d1c9062d9 100644
--- a/filetransferinstance.h
+++ b/filetransferinstance.h
@@ -62,6 +62,7 @@ private:
     QString draw2ButtonsForm(const QString &type, const QImage &imgA, const QImage &imgB);
     QString insertMiniature(const QString &type);
     QString wrapIntoForm(const QString &content, const QString &type, const QString &imgAstr, const QString &imgBstr);
+    QImage drawProgressBarImg(const double &part, int w, int h);
 
 private:
     static uint Idconter;
@@ -72,7 +73,7 @@ private:
     QImage pic;
     QString filename, size, speed, eta;
     QDateTime lastUpdate;
-    long long lastBytesSent;
+    long long lastBytesSent, totalBytes;
     int fileNum;
     int friendId;
     QString savePath;

From ca05c2a024cd3c705477132be6fa7d6ccbf3a10f Mon Sep 17 00:00:00 2001
From: Ansa89 <ansalonistefano@gmail.com>
Date: Fri, 26 Sep 2014 10:38:18 +0200
Subject: [PATCH 063/205] Italian translation: update

---
 translations/it.qm | Bin 7125 -> 7641 bytes
 translations/it.ts |  71 +++++++++++++++++++++++++++++++--------------
 2 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/translations/it.qm b/translations/it.qm
index b61df4ac4e148c46c9e020b5a5d38bbd1a45673e..179823b08a782188749dffc9c18478eb15acdf03 100644
GIT binary patch
delta 582
zcmZutJxjwt7=EI(ji6Sfh1M=N__21Vh$sk3MZrZ>1Q$u{H9bgs@ft^|vmjVP2XS!l
zC#a*Ki-Utx3%WTv^e>3MmqM$h90&J2$@_e~t%Z-J%Y@<8liPD!S2mEo$3c4@h_`Y5
z-2@V^xH*gf<I8wEZ_)Ra`sre9^Q8ey9oHYE@fpk*CDS}>#)ugUE{v=>@}u$u-h)Tu
zHlEoS1~83va43|6r=i)q#?VB%wu&7b5$V8%0K*9?n4?#jjzz2>%!&8HK}OgOk%B}q
zMA9T>MCqp1N>WxivzVu3QMjCW;>bTyoI)YGFA5I#4V_~Yc}k%rCKY&hK9W~Ts-Tfs
ztm(gU*cuq+ivsxJv`4WdA%~DfK?{GxlDj2QWuk03oYBLVlG(!PPm;qX71b(LIs$fB
ziPuQfB3coogoHZ1JB@pZQ+pN5rk=iJ(&H88Yfs(0-)DKS4+*>B@||$K+Q`+Nv;X(s
T-B7ycr?^$<`00+pb0+Z%`^<x&

delta 54
zcmV-60LlN^JJmOk6ah$)6;Y9H7m<xQk<M-bKa)KHXp^l0Fq7p0qXHRhvx)*k8Ix`t
MDF=uE000630Vi1zKmY&$

diff --git a/translations/it.ts b/translations/it.ts
index c7abbc341..96f3de1de 100644
--- a/translations/it.ts
+++ b/translations/it.ts
@@ -105,7 +105,7 @@
 <context>
     <name>ChatForm</name>
     <message>
-        <location filename="../widget/form/chatform.cpp" line="80"/>
+        <location filename="../widget/form/chatform.cpp" line="86"/>
         <source>Send a file</source>
         <translation>Invia un file</translation>
     </message>
@@ -113,19 +113,19 @@
 <context>
     <name>FileTransferInstance</name>
     <message>
-        <location filename="../filetransferinstance.cpp" line="191"/>
+        <location filename="../filetransferinstance.cpp" line="193"/>
         <source>Save a file</source>
         <comment>Title of the file saving dialog</comment>
         <translation>Salva file</translation>
     </message>
     <message>
-        <location filename="../filetransferinstance.cpp" line="202"/>
+        <location filename="../filetransferinstance.cpp" line="204"/>
         <source>Location not writable</source>
         <comment>Title of permissions popup</comment>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="../filetransferinstance.cpp" line="202"/>
+        <location filename="../filetransferinstance.cpp" line="204"/>
         <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
         <comment>text of permissions popup</comment>
         <translation>Non hai sufficienti permessi per scrivere in questa locazione. Scegli un&apos;altra posizione, o annulla il salvataggio.</translation>
@@ -189,19 +189,19 @@
 <context>
     <name>FriendWidget</name>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="84"/>
+        <location filename="../widget/friendwidget.cpp" line="87"/>
         <source>Copy friend ID</source>
         <comment>Menu to copy the Tox ID of that friend</comment>
         <translation>Copia Tox ID del contatto</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="85"/>
+        <location filename="../widget/friendwidget.cpp" line="88"/>
         <source>Invite in group</source>
         <comment>Menu to invite a friend in a groupchat</comment>
         <translation>Invita nel gruppo</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="95"/>
+        <location filename="../widget/friendwidget.cpp" line="98"/>
         <source>Remove friend</source>
         <comment>Menu to remove the friend from our friendlist</comment>
         <translation>Rimuovi contatto</translation>
@@ -252,8 +252,8 @@
 <context>
     <name>GenericChatForm</name>
     <message>
-        <location filename="../widget/form/genericchatform.cpp" line="142"/>
-        <location filename="../widget/form/genericchatform.cpp" line="148"/>
+        <location filename="../widget/form/genericchatform.cpp" line="143"/>
+        <location filename="../widget/form/genericchatform.cpp" line="149"/>
         <source>Save chat log</source>
         <translation>Salva il log della chat</translation>
     </message>
@@ -261,7 +261,7 @@
 <context>
     <name>GroupChatForm</name>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="41"/>
+        <location filename="../widget/form/groupchatform.cpp" line="44"/>
         <source>%1 users in chat</source>
         <comment>Number of users in chat</comment>
         <translation>%1 utenti in chat</translation>
@@ -336,42 +336,42 @@
         <translation>qTox</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1918"/>
+        <location filename="../mainwindow.ui" line="1921"/>
         <source>Your name</source>
         <translation>qTox User</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2000"/>
+        <location filename="../mainwindow.ui" line="2003"/>
         <source>Your status</source>
         <translation>Toxing on qTox</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2566"/>
+        <location filename="../mainwindow.ui" line="2569"/>
         <source>Add friends</source>
         <translation>Aggiungi contatto</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2592"/>
+        <location filename="../mainwindow.ui" line="2595"/>
         <source>Create a group chat</source>
         <translation>Crea un gruppo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2624"/>
+        <location filename="../mainwindow.ui" line="2627"/>
         <source>View completed file transfers</source>
         <translation>Visualizza i trasferimenti completati</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2656"/>
+        <location filename="../mainwindow.ui" line="2659"/>
         <source>Change your settings</source>
         <translation>Cambia le impostazioni</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3238"/>
+        <location filename="../mainwindow.ui" line="3241"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3241"/>
+        <location filename="../mainwindow.ui" line="3244"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
@@ -431,25 +431,52 @@
 <context>
     <name>Widget</name>
     <message>
-        <location filename="../widget/widget.cpp" line="133"/>
+        <location filename="../widget/widget.cpp" line="135"/>
         <source>Online</source>
         <comment>Button to set your status to &apos;Online&apos;</comment>
         <translation>Online</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="135"/>
+        <location filename="../widget/widget.cpp" line="137"/>
         <source>Away</source>
         <comment>Button to set your status to &apos;Away&apos;</comment>
         <translation>Assente</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="137"/>
+        <location filename="../widget/widget.cpp" line="139"/>
         <source>Busy</source>
         <comment>Button to set your status to &apos;Busy&apos;</comment>
         <translation>Occupato</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="605"/>
+        <location filename="../widget/widget.cpp" line="281"/>
+        <source>Choose a profile picture</source>
+        <translation>Scegli un&apos;immagine per il profilo</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="288"/>
+        <location filename="../widget/widget.cpp" line="295"/>
+        <location filename="../widget/widget.cpp" line="316"/>
+        <source>Error</source>
+        <translation>Errore</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="288"/>
+        <source>Unable to open this file</source>
+        <translation>Impossibile aprire il file</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="295"/>
+        <source>Unable to read this image</source>
+        <translation>Impossibile leggere l&apos;immagine</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="316"/>
+        <source>This image is too big</source>
+        <translation>L&apos;immagine è troppo grande</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="672"/>
         <source>&lt;Unknown&gt;</source>
         <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
         <translation>&lt;Sconosciuto&gt;</translation>

From 5e90955e7d12125e5ffb18e5556036f70456b61c Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Fri, 26 Sep 2014 19:17:27 +0700
Subject: [PATCH 064/205] ChatForm: avatar scale

---
 widget/form/chatform.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/widget/form/chatform.cpp b/widget/form/chatform.cpp
index 788596dd6..83f9a9892 100644
--- a/widget/form/chatform.cpp
+++ b/widget/form/chatform.cpp
@@ -475,7 +475,8 @@ void ChatForm::onAvatarChange(int FriendId, const QPixmap &pic)
     if (FriendId != f->friendId)
         return;
 
-    avatarLabel->setPixmap(pic);
+    QPixmap scaled = pic.scaled(40,40,Qt::KeepAspectRatio,Qt::SmoothTransformation);
+    avatarLabel->setPixmap(scaled);
 }
 
 void ChatForm::dragEnterEvent(QDragEnterEvent *ev)

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 065/205] 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 066/205] 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 d684fca868034e1a8123ef0ea7b131631e07565a Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Fri, 26 Sep 2014 21:23:20 +0200
Subject: [PATCH 067/205] Fix #322

---
 core.cpp                 | 5 ++++-
 core.h                   | 1 +
 widget/form/chatform.cpp | 8 ++++++++
 widget/form/chatform.h   | 1 +
 widget/friendwidget.cpp  | 9 +++++++++
 widget/friendwidget.h    | 1 +
 widget/widget.cpp        | 2 ++
 7 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/core.cpp b/core.cpp
index b2718ef5f..ebe4c4d6a 100644
--- a/core.cpp
+++ b/core.cpp
@@ -460,7 +460,10 @@ void Core::onAvatarInfoCallback(Tox*, int32_t friendnumber, uint8_t format,
     qDebug() << "Core: Got avatar info from "<<friendnumber
              <<": format "<<format;
 
-    tox_request_avatar_data(static_cast<Core*>(core)->tox, friendnumber);
+    if (format == TOX_AVATARFORMAT_NONE)
+        emit static_cast<Core*>(core)->friendAvatarRemoved(friendnumber);
+    else
+        tox_request_avatar_data(static_cast<Core*>(core)->tox, friendnumber);
 }
 
 void Core::onAvatarDataCallback(Tox*, int32_t friendnumber, uint8_t,
diff --git a/core.h b/core.h
index fb9207195..6704628b1 100644
--- a/core.h
+++ b/core.h
@@ -107,6 +107,7 @@ signals:
     void friendUsernameChanged(int friendId, const QString& username);
     void friendTypingChanged(int friendId, bool isTyping);
     void friendAvatarChanged(int friendId, const QPixmap& pic);
+    void friendAvatarRemoved(int friendId);
 
     void friendStatusMessageLoaded(int friendId, const QString& message);
     void friendUsernameLoaded(int friendId, const QString& username);
diff --git a/widget/form/chatform.cpp b/widget/form/chatform.cpp
index 83f9a9892..8d29c9b2d 100644
--- a/widget/form/chatform.cpp
+++ b/widget/form/chatform.cpp
@@ -498,3 +498,11 @@ void ChatForm::dropEvent(QDropEvent *ev)
         }
     }
 }
+
+void ChatForm::onAvatarRemoved(int FriendId)
+{
+    if (FriendId != f->friendId)
+        return;
+
+    avatarLabel->setPixmap(QPixmap(":/img/contact_dark.png"));
+}
diff --git a/widget/form/chatform.h b/widget/form/chatform.h
index 4604d54e3..13eba9b7d 100644
--- a/widget/form/chatform.h
+++ b/widget/form/chatform.h
@@ -57,6 +57,7 @@ public slots:
     void onAvMediaChange(int FriendId, int CallId, bool video);
     void onMicMuteToggle();
     void onAvatarChange(int FriendId, const QPixmap& pic);
+    void onAvatarRemoved(int FriendId);
 
 private slots:
     void onSendTriggered();
diff --git a/widget/friendwidget.cpp b/widget/friendwidget.cpp
index 869bc4192..b4ddc2c93 100644
--- a/widget/friendwidget.cpp
+++ b/widget/friendwidget.cpp
@@ -207,6 +207,15 @@ void FriendWidget::onAvatarChange(int FriendId, const QPixmap& pic)
     avatar.setPixmap(scaled);
 }
 
+void FriendWidget::onAvatarRemoved(int FriendId)
+{
+    if (FriendId != friendId)
+        return;
+
+    isDefaultAvatar = true;
+    avatar.setPixmap(QPixmap(":img/contact.png"));
+}
+
 void FriendWidget::mousePressEvent(QMouseEvent *ev)
 {
     if (ev->button() == Qt::LeftButton)
diff --git a/widget/friendwidget.h b/widget/friendwidget.h
index aa225d533..2f94229ee 100644
--- a/widget/friendwidget.h
+++ b/widget/friendwidget.h
@@ -43,6 +43,7 @@ signals:
 
 public slots:
     void onAvatarChange(int FriendId, const QPixmap& pic);
+    void onAvatarRemoved(int FriendId);
 
 protected:
     void mousePressEvent(QMouseEvent* ev);
diff --git a/widget/widget.cpp b/widget/widget.cpp
index 88128d8ac..3f3137717 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -468,6 +468,8 @@ void Widget::addFriend(int friendId, const QString &userId)
     connect(core, &Core::avMediaChange, newfriend->chatForm, &ChatForm::onAvMediaChange);
     connect(core, &Core::friendAvatarChanged, newfriend->chatForm, &ChatForm::onAvatarChange);
     connect(core, &Core::friendAvatarChanged, newfriend->widget, &FriendWidget::onAvatarChange);
+    connect(core, &Core::friendAvatarRemoved, newfriend->chatForm, &ChatForm::onAvatarRemoved);
+    connect(core, &Core::friendAvatarRemoved, newfriend->widget, &FriendWidget::onAvatarRemoved);
 
     // Try to get the avatar from the cache
     QPixmap avatar = Settings::getInstance().getSavedAvatar(userId);

From 0f7cb138258f4b236bfa5051bb30e8cb98835cad Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Fri, 26 Sep 2014 21:56:51 +0200
Subject: [PATCH 068/205] Typo when fixing #322

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

diff --git a/core.cpp b/core.cpp
index ebe4c4d6a..5e96e1a29 100644
--- a/core.cpp
+++ b/core.cpp
@@ -460,7 +460,7 @@ void Core::onAvatarInfoCallback(Tox*, int32_t friendnumber, uint8_t format,
     qDebug() << "Core: Got avatar info from "<<friendnumber
              <<": format "<<format;
 
-    if (format == TOX_AVATARFORMAT_NONE)
+    if (format == TOX_AVATAR_FORMAT_NONE)
         emit static_cast<Core*>(core)->friendAvatarRemoved(friendnumber);
     else
         tox_request_avatar_data(static_cast<Core*>(core)->tox, friendnumber);

From aff0f915d0ea6df1608f785da9476c81c88de7ca Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Fri, 26 Sep 2014 17:04:01 -0500
Subject: [PATCH 069/205] incomplete os x instructions

---
 INSTALL.md | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/INSTALL.md b/INSTALL.md
index b5b2d5f11..9f4738b12 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -69,7 +69,7 @@ make install
 Copy the dll "OpenAL32.dll" located at "C:\qTox\libs\openal-build\install\bin" to "C:\qTox\libs\lib". Finally, copy the directory "AL" located at "C:\qTox\libs\openal-build\install\include" to "C:\qTox\libs\include". Unlike OpenCV you don't need to patch any files. Feel free to delete the directories "openal-soft-x.y.z" and "openal-build", but you don't need to.
 
 ##Linux
-Most of the dependencies should be available through your package manger.
+Most of the dependencies should be available through your package manger. You may either follow the directions below, or simply run `./simple_make.sh` which will attempt to automatically download dependencies.
 
 ###Cloning the Repository
 In order to clone the qTox repository you need Git.
@@ -164,3 +164,59 @@ form natively, and .rpm form with <a href="http://joeyh.name/code/alien/">alien<
 After installing the required dependencies, run `bootstrap.sh` and then run the
 `buildPackages.sh` script, found in the tools folder. It will automatically get the
 packages necessary for building .debs, so be prepared to type your password for sudo.
+
+##OS X
+
+###OSX Easy Install
+
+Since https://github.com/ReDetection/homebrew-qtox you can easily install qtox with homebrew 
+```bash
+brew install --HEAD ReDetection/qtox/qtox
+```
+
+###OSX Full Install Guide
+
+This guide is intended for people who wish to use an existing or new ProjectTox-Core installation separate to the bundled installation with qTox, if you do not wish to use a separate installation you can skip to the section titled 'Final Steps'.
+
+Installation on OSX, isn't quite straight forward, here is a quick guide on how to install;
+
+The first thing you need to do is install ProjectTox-Core with a/v support. Refer to the INSTALL guide in the PrjectTox-Core github repo.
+
+Next you need to download QtTools (http://qt-project.org/downloads), at the time of writing this is at version .3.0.
+Make sure you deselect all the unnecessary components from the 5.3 checkbox (iOS/Android libs) otherwise you will end up with a very large download.
+
+Once that is installed you will most likely need to set the path for qmake. To do this, open up terminal and paste in the following;
+
+```bash
+export PATH=/location/to/qmake/binary:$PATH
+```
+
+For myself, the qmake binary was located in /Users/mouseym/Qt/5.3/clang_64/bin/.
+
+This is not a permanent change, it will revert when you close the terminal window, to add it permanently you will need to add echo the above line to your .profile/.bash_profile.
+
+Once this is installed, do the following;
+
+```bash
+git clone https://github.com/tux3/qTox
+cd toxgui
+qmake
+```
+
+Now, we need to create a symlink to /usr/local/lib/ and /usr/local/include/
+```
+mkdir -p $HOME/qTox/libs
+sudo ln -s /usr/local/lib $HOME/qTox/libs/lib
+sudo ln -s /usr/local/include  $HOME/qTox/libs/include
+```
+####Final Steps
+
+The final step is to run 
+```bash
+make
+``` 
+in the qTox directory, or if you are using the bundled tox core installation, you can use 
+```bash
+./bootstrap.sh
+```
+Assuming all went well you should now have a qTox.app file within the directory. Double click and it should open!

From 8bc439decc4f9833fbaad47f56fd61865b1cebfd Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Fri, 26 Sep 2014 17:06:33 -0500
Subject: [PATCH 070/205] minor fixes

---
 INSTALL.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/INSTALL.md b/INSTALL.md
index 9f4738b12..74fdc2683 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -156,7 +156,7 @@ cd /home/user/qTox
 ./bootstrap.sh # use -h or --help for more information
 ```
 
-##Building packages
+###Building packages
 
 qTox now has the experimental and probably-dodgy ability to package itself (in .deb
 form natively, and .rpm form with <a href="http://joeyh.name/code/alien/">alien</a>).
@@ -180,6 +180,8 @@ This guide is intended for people who wish to use an existing or new ProjectTox-
 
 Installation on OSX, isn't quite straight forward, here is a quick guide on how to install;
 
+Note that qTox now requires OpenCV and OpenAL for audio and video.
+
 The first thing you need to do is install ProjectTox-Core with a/v support. Refer to the INSTALL guide in the PrjectTox-Core github repo.
 
 Next you need to download QtTools (http://qt-project.org/downloads), at the time of writing this is at version .3.0.

From 25b2c76f4bdcec67deec576272520e877b6672b2 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Fri, 26 Sep 2014 17:11:13 -0500
Subject: [PATCH 071/205] minor fixes

---
 INSTALL.md | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index 74fdc2683..3cb777597 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -69,7 +69,7 @@ make install
 Copy the dll "OpenAL32.dll" located at "C:\qTox\libs\openal-build\install\bin" to "C:\qTox\libs\lib". Finally, copy the directory "AL" located at "C:\qTox\libs\openal-build\install\include" to "C:\qTox\libs\include". Unlike OpenCV you don't need to patch any files. Feel free to delete the directories "openal-soft-x.y.z" and "openal-build", but you don't need to.
 
 ##Linux
-Most of the dependencies should be available through your package manger. You may either follow the directions below, or simply run `./simple_make.sh` which will attempt to automatically download dependencies.
+Most of the dependencies should be available through your package manger. You may either follow the directions below, or simply run `./simple_make.sh` after cloning, which will attempt to automatically download dependencies followed by compilation.
 
 ###Cloning the Repository
 In order to clone the qTox repository you need Git.
@@ -156,9 +156,15 @@ cd /home/user/qTox
 ./bootstrap.sh # use -h or --help for more information
 ```
 
+After all the dependencies are thus reeady to go, compiling should be as simple as 
+```bash
+qmake
+make
+```
+
 ###Building packages
 
-qTox now has the experimental and probably-dodgy ability to package itself (in .deb
+Alternately, qTox now has the experimental and probably-dodgy ability to package itself (in .deb
 form natively, and .rpm form with <a href="http://joeyh.name/code/alien/">alien</a>).
 
 After installing the required dependencies, run `bootstrap.sh` and then run the
@@ -180,7 +186,7 @@ This guide is intended for people who wish to use an existing or new ProjectTox-
 
 Installation on OSX, isn't quite straight forward, here is a quick guide on how to install;
 
-Note that qTox now requires OpenCV and OpenAL for audio and video.
+Note that qTox now requires OpenCV and OpenAL for video and audio.
 
 The first thing you need to do is install ProjectTox-Core with a/v support. Refer to the INSTALL guide in the PrjectTox-Core github repo.
 
@@ -220,5 +226,6 @@ make
 in the qTox directory, or if you are using the bundled tox core installation, you can use 
 ```bash
 ./bootstrap.sh
+make
 ```
 Assuming all went well you should now have a qTox.app file within the directory. Double click and it should open!

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 072/205] 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 073/205] 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 074/205] 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 075/205] 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 076/205] 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 077/205] 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 078/205] 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 079/205] 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 080/205] 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 081/205] 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 082/205] 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 083/205] 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 084/205] 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 085/205] 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 086/205] 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 087/205] 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
 

From db1413387564f78eabc0f03f5fc80962263ef537 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sat, 27 Sep 2014 23:26:43 +0200
Subject: [PATCH 088/205] update debian packages

---
 debian/control | 2 +-
 debian/rules   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 7883115e6..093a912a2 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, libopenal-dev, libopencv-dev, libopus-dev
+Build-Depends: debhelper (>= 9), cdbs, qt5-qmake, libopenal-dev, libopencv-dev, libopus-dev, qtbase5-dev
 
 Package: qtox
 Architecture: any
diff --git a/debian/rules b/debian/rules
index 6815966a4..6222f176d 100644
--- a/debian/rules
+++ b/debian/rules
@@ -3,4 +3,4 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/qmake.mk
 
-QMAKE=qmake STATICPKG=YES
+QMAKE=qmake STATICPKG=YES -qt=5

From 547181ec48ea766663d21a9de03af0143622dcbc Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sat, 27 Sep 2014 23:31:34 +0200
Subject: [PATCH 089/205] update debian packages

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

diff --git a/debian/rules b/debian/rules
index 6222f176d..5d17ec7e7 100644
--- a/debian/rules
+++ b/debian/rules
@@ -3,4 +3,4 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/qmake.mk
 
-QMAKE=qmake STATICPKG=YES -qt=5
+QMAKE=qmake -qt=5 STATICPKG=YES

From 28d2680fec53bfd162999e003f2fa069221ea3b8 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Sat, 27 Sep 2014 16:37:39 -0500
Subject: [PATCH 090/205] conform to standard, fix bug related to nospam in ID

---
 core.cpp          | 36 ++++++++++++++++++++++++------------
 settings.cpp      | 19 +++++++++++++++----
 settings.h        |  1 -
 widget/widget.cpp |  2 +-
 4 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/core.cpp b/core.cpp
index 5e96e1a29..32f614721 100644
--- a/core.cpp
+++ b/core.cpp
@@ -210,7 +210,8 @@ void Core::start()
     tox_get_address(tox, friendAddress);
     emit friendAddressGenerated(CFriendAddress::toString(friendAddress));
 
-    QPixmap pic = Settings::getInstance().getSavedAvatar(getSelfId().toString());
+    QPixmap pic;
+    pic.load(QDir(Settings::getInstance().getSettingsDirPath()).filePath("avatar.png"));
     if (!pic.isNull() && !pic.size().isEmpty())
     {
         QByteArray data;
@@ -218,12 +219,25 @@ void Core::start()
         buffer.open(QIODevice::WriteOnly);
         pic.save(&buffer, "PNG");
         buffer.close();
-        if (tox_set_avatar(tox, TOX_AVATAR_FORMAT_PNG, (uint8_t*)data.constData(), data.size()) != 0)
-            qWarning() << "Core:start: Error setting avatar, size:"<<data.size();
-        emit selfAvatarChanged(pic);
+        setAvatar(TOX_AVATAR_FORMAT_PNG, data);
     }
     else
-        qDebug() << "Core: Error loading self avatar";
+    {
+        QPixmap pic = Settings::getInstance().getSavedAvatar(getSelfId().toString());
+        qDebug() << "self avatar missing, trying by id";
+        // this will leave a avatars/<selfid>.png duplicate of avatar.png, but whatever
+        if (!pic.isNull() && !pic.size().isEmpty())
+        {
+            QByteArray data;
+            QBuffer buffer(&data);
+            buffer.open(QIODevice::WriteOnly);
+            pic.save(&buffer, "PNG");
+            buffer.close();
+            setAvatar(TOX_AVATAR_FORMAT_PNG, data);
+        }
+        else
+            qDebug() << "Core: Error loading self avatar";
+    }
 
     bootstrapDht();
 
@@ -476,7 +490,8 @@ void Core::onAvatarDataCallback(Tox*, int32_t friendnumber, uint8_t,
     else
     {
         qDebug() << "Core: Got avatar data from "<<friendnumber<<", size:"<<pic.size();
-        Settings::getInstance().saveAvatar(pic, static_cast<Core*>(core)->getFriendAddress(friendnumber));
+        Settings::getInstance().saveAvatar(pic, static_cast<Core*>(core)->getFriendAddress(friendnumber).left(64));
+        // ignore nospam (good idea, and also the addFriend funcs which call getAvatar don't have it)
         emit static_cast<Core*>(core)->friendAvatarChanged(friendnumber, pic);
     }
 }
@@ -789,13 +804,10 @@ void Core::setAvatar(uint8_t format, const QByteArray& data)
 
     QPixmap pic;
     pic.loadFromData(data);
-    Settings::getInstance().saveAvatar(pic, getSelfId().toString());
+    QString path = QDir(Settings::getInstance().getSettingsDirPath()).filePath("avatar.png");
+    pic.save(path, "png");
     emit selfAvatarChanged(pic);
-
-    // Broadcast our new avatar!
-    const uint32_t friendCount = tox_count_friendlist(tox);;
-    for (unsigned i=0; i<friendCount; i++)
-        tox_send_avatar_info(tox, i);
+    // according to tox.h, we need not broadcast ourselves, that's done in tox_set_avatar
 }
 
 ToxID Core::getSelfId()
diff --git a/settings.cpp b/settings.cpp
index 0748cd0ff..56785a7e6 100644
--- a/settings.cpp
+++ b/settings.cpp
@@ -27,7 +27,6 @@
 #include <QList>
 
 const QString Settings::FILENAME = "settings.ini";
-const QString Settings::AVATAR_FILENAME = "avatar.dat";
 bool Settings::makeToxPortable{false};
 
 Settings::Settings() :
@@ -260,15 +259,27 @@ QString Settings::getSettingsDirPath()
 
 QPixmap Settings::getSavedAvatar(const QString &ownerId)
 {
-    QString filePath = QDir(getSettingsDirPath()).filePath("avatar_"+ownerId);
+    QDir dir(getSettingsDirPath());
+    QString filePath = dir.filePath("avatars/"+ownerId+".png");
+    QFileInfo info(filePath);
     QPixmap pic;
-    pic.load(filePath);
+    if (!info.exists())
+    {
+        QString filePath = dir.filePath("avatar_"+ownerId);
+        pic.load(filePath);
+        saveAvatar(pic, ownerId);
+        QFile::remove(filePath);
+    }
+    else
+        pic.load(filePath);
     return pic;
 }
 
 void Settings::saveAvatar(QPixmap& pic, const QString& ownerId)
 {
-    QString filePath = QDir(getSettingsDirPath()).filePath("avatar_"+ownerId);
+    QDir dir(getSettingsDirPath());
+    dir.mkdir("avatars/"); // remove this in a week or two hopefully
+    QString filePath = dir.filePath("avatars/"+ownerId+".png");
     pic.save(filePath, "png");
 }
 
diff --git a/settings.h b/settings.h
index 882a31f0f..b796211cb 100644
--- a/settings.h
+++ b/settings.h
@@ -142,7 +142,6 @@ private:
     Settings& operator=(const Settings&) = delete;
 
     static const QString FILENAME;
-    static const QString AVATAR_FILENAME;
 
     bool loaded;
 
diff --git a/widget/widget.cpp b/widget/widget.cpp
index a8f2ab683..3134b2ee6 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -477,7 +477,7 @@ void Widget::addFriend(int friendId, const QString &userId)
     connect(core, &Core::friendAvatarRemoved, newfriend->widget, &FriendWidget::onAvatarRemoved);
 
     // Try to get the avatar from the cache
-    QPixmap avatar = Settings::getInstance().getSavedAvatar(userId);
+    QPixmap avatar = Settings::getInstance().getSavedAvatar(userId.left(64)); // just to be safe
     if (!avatar.isNull())
     {
         newfriend->chatForm->onAvatarChange(friendId, avatar);

From f4c2bf9f345c62e0e577aab8f64cf91e2747c7df Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sat, 27 Sep 2014 23:43:21 +0200
Subject: [PATCH 091/205] Update build scripts

---
 bootstrap.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 9c67a7af9..d9bf32fe4 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -103,7 +103,7 @@ rm -rf ${BASE_DIR}/${TOX_CORE_DIR}
 # afterwards install libsodium to INSTALL_DIR
 # skip the installation if TOX_ONLY is true
 if [[ $TOX_ONLY = "false" ]]; then
-    git clone git://github.com/jedisct1/libsodium.git ${BASE_DIR}/${SODIUM_DIR}
+    git clone git://github.com/jedisct1/libsodium.git ${BASE_DIR}/${SODIUM_DIR} --depth 1
     pushd ${BASE_DIR}/${SODIUM_DIR}
     git checkout tags/$SODIUM_VER
     ./autogen.sh
@@ -116,7 +116,7 @@ if [[ $TOX_ONLY = "false" ]]; then
 
     make -j2 check
     
-    if [[ $GLOBAL = "false" ]]; then
+    if [[ $GLOBAL = "false" || $EUID -e 0 ]]; then
         make install
     else
         sudo make install
@@ -128,7 +128,7 @@ fi
 # clone current master of libtoxcore
 # make sure to compile with libsodium we just installed to INSTALL_DIR
 # afterwards install libtoxcore to INSTALL_DIR
-git clone https://github.com/irungentoo/toxcore.git ${BASE_DIR}/${TOX_CORE_DIR}
+git clone https://github.com/irungentoo/toxcore.git ${BASE_DIR}/${TOX_CORE_DIR} --depth 1
 pushd ${BASE_DIR}/${TOX_CORE_DIR}
 ./autogen.sh
 if [[ $GLOBAL = "false" ]]; then
@@ -139,7 +139,7 @@ fi
 
 make -j2
 
-if [[ $GLOBAL = "false" ]]; then
+if [[ $GLOBAL = "false" || $EUID -e 0 ]]; then
     make install
 else
     sudo make install

From b1b89ac1f43a23065862e04ab0046349a4e7ae6d Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Sat, 27 Sep 2014 16:44:08 -0500
Subject: [PATCH 092/205] minor

---
 core.cpp          | 4 ++--
 widget/widget.cpp | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core.cpp b/core.cpp
index 32f614721..11a27b612 100644
--- a/core.cpp
+++ b/core.cpp
@@ -223,9 +223,9 @@ void Core::start()
     }
     else
     {
-        QPixmap pic = Settings::getInstance().getSavedAvatar(getSelfId().toString());
-        qDebug() << "self avatar missing, trying by id";
+        qDebug() << "Core: self avatar missing, trying by id";
         // this will leave a avatars/<selfid>.png duplicate of avatar.png, but whatever
+        QPixmap pic = Settings::getInstance().getSavedAvatar(getSelfId().toString());
         if (!pic.isNull() && !pic.size().isEmpty())
         {
             QByteArray data;
diff --git a/widget/widget.cpp b/widget/widget.cpp
index 3134b2ee6..40239a701 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -444,7 +444,7 @@ void Widget::setStatusMessage(const QString &statusMessage)
 
 void Widget::addFriend(int friendId, const QString &userId)
 {
-    qDebug() << "Widget: Adding friend with id "+userId;
+    qDebug() << "Widget: Adding friend with id" << userId;
     Friend* newfriend = FriendList::addFriend(friendId, userId);
     QLayout* layout = contactListWidget->getFriendLayout(Status::Offline);
     layout->addWidget(newfriend->widget);
@@ -480,6 +480,7 @@ void Widget::addFriend(int friendId, const QString &userId)
     QPixmap avatar = Settings::getInstance().getSavedAvatar(userId.left(64)); // just to be safe
     if (!avatar.isNull())
     {
+        qWarning() << "Widget: loadded avatar for id" << userId;
         newfriend->chatForm->onAvatarChange(friendId, avatar);
         newfriend->widget->onAvatarChange(friendId, avatar);
     }

From 78b9553f4f3a7451d3fe7ae91b849ac89e8f20ac Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sat, 27 Sep 2014 23:51:02 +0200
Subject: [PATCH 093/205] Update build scripts

---
 bootstrap.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index d9bf32fe4..95a11febe 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -116,7 +116,7 @@ if [[ $TOX_ONLY = "false" ]]; then
 
     make -j2 check
     
-    if [[ $GLOBAL = "false" || $EUID -e 0 ]]; then
+    if [[ $GLOBAL = "false" || $EUID -eq 0 ]]; then
         make install
     else
         sudo make install
@@ -139,7 +139,7 @@ fi
 
 make -j2
 
-if [[ $GLOBAL = "false" || $EUID -e 0 ]]; then
+if [[ $GLOBAL = "false" || $EUID -eq 0 ]]; then
     make install
 else
     sudo make install

From 766bd6e929cf1a351107e3149f1feb6239695a12 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sun, 28 Sep 2014 00:09:40 +0200
Subject: [PATCH 094/205] Update build scripts

---
 debian/control         | 2 +-
 tools/buildPackages.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 093a912a2..1ac14b28c 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, libopenal-dev, libopencv-dev, libopus-dev, qtbase5-dev
+Build-Depends: debhelper (>= 9), cdbs, qt5-qmake, libopenal-dev, libopencv-dev, libopus-dev, qtbase5-dev, sudo, autoconf
 
 Package: qtox
 Architecture: any
diff --git a/tools/buildPackages.sh b/tools/buildPackages.sh
index e028670e5..81ec614d5 100755
--- a/tools/buildPackages.sh
+++ b/tools/buildPackages.sh
@@ -87,6 +87,7 @@ mv qTox-master $VERNAME
 
 # Build packages
 cd $VERNAME
+./bootstrap.sh
 debuild -us -uc
 cd ..
 

From 2047f8dc8ddee004a2465e79069b2fd92913249a Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sun, 28 Sep 2014 00:14:49 +0200
Subject: [PATCH 095/205] Update build scripts

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

diff --git a/tools/buildPackages.sh b/tools/buildPackages.sh
index 81ec614d5..365cfd81d 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 -y
+        sudo apt-get install wget debhelper cdbs devscripts alien tar gzip build-essential sudo autoconf -y
     else
-             apt-get install wget debhelper cdbs devscripts alien tar gzip build-essential -y
+             apt-get install wget debhelper cdbs devscripts alien tar gzip build-essential sudo autoconf -y
     fi
 fi
 

From eb67f9b3dd90f745f050d09658fdb98ce883bb9d Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Sat, 27 Sep 2014 17:19:30 -0500
Subject: [PATCH 096/205] revert special self avatar

---
 core.cpp          | 33 ++++++++++-----------------------
 settings.cpp      |  9 ++++++---
 widget/widget.cpp |  2 +-
 3 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/core.cpp b/core.cpp
index 11a27b612..9b7f7913c 100644
--- a/core.cpp
+++ b/core.cpp
@@ -210,8 +210,7 @@ void Core::start()
     tox_get_address(tox, friendAddress);
     emit friendAddressGenerated(CFriendAddress::toString(friendAddress));
 
-    QPixmap pic;
-    pic.load(QDir(Settings::getInstance().getSettingsDirPath()).filePath("avatar.png"));
+    QPixmap pic = Settings::getInstance().getSavedAvatar(getSelfId().toString());
     if (!pic.isNull() && !pic.size().isEmpty())
     {
         QByteArray data;
@@ -222,22 +221,7 @@ void Core::start()
         setAvatar(TOX_AVATAR_FORMAT_PNG, data);
     }
     else
-    {
-        qDebug() << "Core: self avatar missing, trying by id";
-        // this will leave a avatars/<selfid>.png duplicate of avatar.png, but whatever
-        QPixmap pic = Settings::getInstance().getSavedAvatar(getSelfId().toString());
-        if (!pic.isNull() && !pic.size().isEmpty())
-        {
-            QByteArray data;
-            QBuffer buffer(&data);
-            buffer.open(QIODevice::WriteOnly);
-            pic.save(&buffer, "PNG");
-            buffer.close();
-            setAvatar(TOX_AVATAR_FORMAT_PNG, data);
-        }
-        else
-            qDebug() << "Core: Error loading self avatar";
-    }
+        qDebug() << "Core: Error loading self avatar";
 
     bootstrapDht();
 
@@ -490,8 +474,7 @@ void Core::onAvatarDataCallback(Tox*, int32_t friendnumber, uint8_t,
     else
     {
         qDebug() << "Core: Got avatar data from "<<friendnumber<<", size:"<<pic.size();
-        Settings::getInstance().saveAvatar(pic, static_cast<Core*>(core)->getFriendAddress(friendnumber).left(64));
-        // ignore nospam (good idea, and also the addFriend funcs which call getAvatar don't have it)
+        Settings::getInstance().saveAvatar(pic, static_cast<Core*>(core)->getFriendAddress(friendnumber));
         emit static_cast<Core*>(core)->friendAvatarChanged(friendnumber, pic);
     }
 }
@@ -804,10 +787,14 @@ void Core::setAvatar(uint8_t format, const QByteArray& data)
 
     QPixmap pic;
     pic.loadFromData(data);
-    QString path = QDir(Settings::getInstance().getSettingsDirPath()).filePath("avatar.png");
-    pic.save(path, "png");
+    Settings::getInstance().saveAvatar(pic, getSelfId().toString());
     emit selfAvatarChanged(pic);
-    // according to tox.h, we need not broadcast ourselves, that's done in tox_set_avatar
+    
+    // Broadcast our new avatar!
+    // according to tox.h, we need not broadcast this ourselves, but initial testing indicated elsewise
+    const uint32_t friendCount = tox_count_friendlist(tox);;
+    for (unsigned i=0; i<friendCount; i++)
+        tox_send_avatar_info(tox, i);
 }
 
 ToxID Core::getSelfId()
diff --git a/settings.cpp b/settings.cpp
index 56785a7e6..16e9332b8 100644
--- a/settings.cpp
+++ b/settings.cpp
@@ -260,12 +260,14 @@ QString Settings::getSettingsDirPath()
 QPixmap Settings::getSavedAvatar(const QString &ownerId)
 {
     QDir dir(getSettingsDirPath());
-    QString filePath = dir.filePath("avatars/"+ownerId+".png");
+    QString filePath = dir.filePath("avatars/"+ownerId.left(64)+".png");
     QFileInfo info(filePath);
     QPixmap pic;
     if (!info.exists())
     {
-        QString filePath = dir.filePath("avatar_"+ownerId);
+        QString filePath = dir.filePath("avatar_"+ownerId.left(64));
+        if (!QFileInfo(filePath).exists()) // try without truncation, for old self avatars
+            QString filePath = dir.filePath("avatar_"+ownerId);
         pic.load(filePath);
         saveAvatar(pic, ownerId);
         QFile::remove(filePath);
@@ -279,7 +281,8 @@ void Settings::saveAvatar(QPixmap& pic, const QString& ownerId)
 {
     QDir dir(getSettingsDirPath());
     dir.mkdir("avatars/"); // remove this in a week or two hopefully
-    QString filePath = dir.filePath("avatars/"+ownerId+".png");
+    // ignore nospam (good idea, and also the addFriend funcs which call getAvatar don't have it)
+    QString filePath = dir.filePath("avatars/"+ownerId.left(64)+".png");
     pic.save(filePath, "png");
 }
 
diff --git a/widget/widget.cpp b/widget/widget.cpp
index 40239a701..af1d33034 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -477,7 +477,7 @@ void Widget::addFriend(int friendId, const QString &userId)
     connect(core, &Core::friendAvatarRemoved, newfriend->widget, &FriendWidget::onAvatarRemoved);
 
     // Try to get the avatar from the cache
-    QPixmap avatar = Settings::getInstance().getSavedAvatar(userId.left(64)); // just to be safe
+    QPixmap avatar = Settings::getInstance().getSavedAvatar(userId);
     if (!avatar.isNull())
     {
         qWarning() << "Widget: loadded avatar for id" << userId;

From 2c224b6f3a535668060711fa2864397e95f8d1cc Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sun, 28 Sep 2014 00:19:40 +0200
Subject: [PATCH 097/205] Update build scripts

---
 debian/control         | 2 +-
 tools/buildPackages.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 1ac14b28c..78fb30e54 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, libopenal-dev, libopencv-dev, libopus-dev, qtbase5-dev, sudo, autoconf
+Build-Depends: debhelper (>= 9), cdbs, qt5-qmake, libopenal-dev, libopencv-dev, libopus-dev, qtbase5-dev, sudo, autoconf, libtool, pkg-config
 
 Package: qtox
 Architecture: any
diff --git a/tools/buildPackages.sh b/tools/buildPackages.sh
index 365cfd81d..49f4eecbd 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 autoconf -y
+        sudo apt-get install wget debhelper cdbs devscripts alien tar gzip build-essential sudo autoconf libtool pkg-config -y
     else
-             apt-get install wget debhelper cdbs devscripts alien tar gzip build-essential sudo autoconf -y
+             apt-get install wget debhelper cdbs devscripts alien tar gzip build-essential sudo autoconf libtool pkg-config -y
     fi
 fi
 

From 8abcc3b77dd0eb0d48f500c98c51be96908f9153 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Sat, 27 Sep 2014 17:36:19 -0500
Subject: [PATCH 098/205] blasted scoping issue

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

diff --git a/settings.cpp b/settings.cpp
index 16e9332b8..3e9f33426 100644
--- a/settings.cpp
+++ b/settings.cpp
@@ -267,7 +267,7 @@ QPixmap Settings::getSavedAvatar(const QString &ownerId)
     {
         QString filePath = dir.filePath("avatar_"+ownerId.left(64));
         if (!QFileInfo(filePath).exists()) // try without truncation, for old self avatars
-            QString filePath = dir.filePath("avatar_"+ownerId);
+            filePath = dir.filePath("avatar_"+ownerId);
         pic.load(filePath);
         saveAvatar(pic, ownerId);
         QFile::remove(filePath);

From 35f548c3a1b66278079aabc64698bfeeb11701dc Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sun, 28 Sep 2014 00:43:01 +0200
Subject: [PATCH 099/205] Update build scripts

---
 debian/control         | 2 +-
 tools/buildPackages.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 78fb30e54..7fa0cc2b4 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, libopenal-dev, libopencv-dev, libopus-dev, qtbase5-dev, sudo, autoconf, libtool, pkg-config
+Build-Depends: debhelper (>= 9), cdbs, qt5-qmake, libopenal-dev, libopencv-dev, libopus-dev, qtbase5-dev, sudo, autoconf, libtool, pkg-config, libvpx-dev
 
 Package: qtox
 Architecture: any
diff --git a/tools/buildPackages.sh b/tools/buildPackages.sh
index 49f4eecbd..4e6b6e144 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 autoconf libtool pkg-config -y
+        sudo apt-get install wget debhelper cdbs devscripts alien tar gzip build-essential sudo autoconf libtool pkg-config libvpx-dev -y
     else
-             apt-get install wget debhelper cdbs devscripts alien tar gzip build-essential sudo autoconf libtool pkg-config -y
+             apt-get install wget debhelper cdbs devscripts alien tar gzip build-essential sudo autoconf libtool pkg-config libvpx-dev -y
     fi
 fi
 

From 21d084e258e37421c76b3a0eb36135534c0aa16e Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sun, 28 Sep 2014 10:56:02 +0200
Subject: [PATCH 100/205] Compat with toxcore

---
 core.cpp          | 8 ++++----
 core.h            | 6 +++---
 widget/widget.cpp | 4 ++--
 widget/widget.h   | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core.cpp b/core.cpp
index 9b7f7913c..1b04c16ac 100644
--- a/core.cpp
+++ b/core.cpp
@@ -299,10 +299,10 @@ void Core::onAction(Tox*/* tox*/, int friendId, const uint8_t *cMessage, uint16_
     emit static_cast<Core*>(core)->actionReceived(friendId, CString::toString(cMessage, cMessageSize));
 }
 
-void Core::onGroupInvite(Tox*, int friendnumber, const uint8_t *group_public_key, void *core)
+void Core::onGroupInvite(Tox*, int friendnumber, const uint8_t *group_public_key, uint16_t length,void *core)
 {
     qDebug() << QString("Core: Group invite by %1").arg(friendnumber);
-    emit static_cast<Core*>(core)->groupInviteReceived(friendnumber, group_public_key);
+    emit static_cast<Core*>(core)->groupInviteReceived(friendnumber, group_public_key,length);
 }
 
 void Core::onGroupMessage(Tox*, int groupnumber, int friendgroupnumber, const uint8_t * message, uint16_t length, void *core)
@@ -1084,10 +1084,10 @@ QList<QString> Core::getGroupPeerNames(int groupId) const
     return names;
 }
 
-int Core::joinGroupchat(int32_t friendnumber, const uint8_t* friend_group_public_key) const
+int Core::joinGroupchat(int32_t friendnumber, const uint8_t* friend_group_public_key,uint16_t length) const
 {
     qDebug() << QString("Trying to join groupchat invite by friend %1").arg(friendnumber);
-    return tox_join_groupchat(tox, friendnumber, friend_group_public_key);
+    return tox_join_groupchat(tox, friendnumber, friend_group_public_key,length);
 }
 
 void Core::quitGroupChat(int groupId) const
diff --git a/core.h b/core.h
index 6704628b1..253ccb401 100644
--- a/core.h
+++ b/core.h
@@ -42,7 +42,7 @@ public:
     QString getGroupPeerName(int groupId, int peerId) const;
     QList<QString> getGroupPeerNames(int groupId) const;
     QString getFriendAddress(int friendNumber) const;
-    int joinGroupchat(int32_t friendnumber, const uint8_t* friend_group_public_key) const;
+    int joinGroupchat(int32_t friendnumber, const uint8_t* friend_group_public_key,uint16_t length) const;
     void quitGroupChat(int groupId) const;
     void dispatchVideoFrame(vpx_image img) const;
 
@@ -119,7 +119,7 @@ signals:
     void friendLastSeenChanged(int friendId, const QDateTime& dateTime);
 
     void emptyGroupCreated(int groupnumber);
-    void groupInviteReceived(int friendnumber, const uint8_t *group_public_key);
+    void groupInviteReceived(int friendnumber, const uint8_t *group_public_key,uint16_t length);
     void groupMessageReceived(int groupnumber, int friendgroupnumber, const QString& message);
     void groupNamelistChanged(int groupnumber, int peernumber, uint8_t change);
 
@@ -178,7 +178,7 @@ private:
     static void onUserStatusChanged(Tox* tox, int friendId, uint8_t userstatus, void* core);
     static void onConnectionStatusChanged(Tox* tox, int friendId, uint8_t status, void* core);
     static void onAction(Tox* tox, int friendId, const uint8_t* cMessage, uint16_t cMessageSize, void* core);
-    static void onGroupInvite(Tox *tox, int friendnumber, const uint8_t *group_public_key, void *userdata);
+    static void onGroupInvite(Tox *tox, int friendnumber, const uint8_t *group_public_key, uint16_t length,void *userdata);
     static void onGroupMessage(Tox *tox, int groupnumber, int friendgroupnumber, const uint8_t * message, uint16_t length, void *userdata);
     static void onGroupNamelistChange(Tox *tox, int groupnumber, int peernumber, uint8_t change, void *userdata);
     static void onFileSendRequestCallback(Tox *tox, int32_t friendnumber, uint8_t filenumber, uint64_t filesize,
diff --git a/widget/widget.cpp b/widget/widget.cpp
index af1d33034..c8c24187d 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -633,9 +633,9 @@ void Widget::copyFriendIdToClipboard(int friendId)
     }
 }
 
-void Widget::onGroupInviteReceived(int32_t friendId, const uint8_t* publicKey)
+void Widget::onGroupInviteReceived(int32_t friendId, const uint8_t* publicKey,uint16_t length)
 {
-    int groupId = core->joinGroupchat(friendId, publicKey);
+    int groupId = core->joinGroupchat(friendId, publicKey,length);
     if (groupId == -1)
     {
         qWarning() << "Widget::onGroupInviteReceived: Unable to accept invitation";
diff --git a/widget/widget.h b/widget/widget.h
index dd6c8180e..5ec25b501 100644
--- a/widget/widget.h
+++ b/widget/widget.h
@@ -98,7 +98,7 @@ private slots:
     void onFriendMessageReceived(int friendId, const QString& message);
     void onFriendRequestReceived(const QString& userId, const QString& message);
     void onEmptyGroupCreated(int groupId);
-    void onGroupInviteReceived(int32_t friendId, const uint8_t *publicKey);
+    void onGroupInviteReceived(int32_t friendId, const uint8_t *publicKey,uint16_t length);
     void onGroupMessageReceived(int groupnumber, int friendgroupnumber, const QString& message);
     void onGroupNamelistChanged(int groupnumber, int peernumber, uint8_t change);
     void removeFriend(int friendId);

From 12380bc39776569b394f463bd811738c2bbf7514 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sun, 28 Sep 2014 10:59:49 +0200
Subject: [PATCH 101/205] Allow non-png avatars, convert them on the fly

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

diff --git a/widget/widget.cpp b/widget/widget.cpp
index c8c24187d..7c38847a6 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -284,7 +284,7 @@ Camera* Widget::getCamera()
 
 void Widget::onAvatarClicked()
 {
-    QString filename = QFileDialog::getOpenFileName(this, tr("Choose a profile picture"), QDir::homePath(), "*.png");
+    QString filename = QFileDialog::getOpenFileName(this, tr("Choose a profile picture"), QDir::homePath());
     if (filename == "")
         return;
     QFile file(filename);

From aa6fbc9e284ea904b598133470bf8b5b3d0fa273 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sun, 28 Sep 2014 11:19:58 +0200
Subject: [PATCH 102/205] MaskablePixmapWidget should update() on setPixmap

Fixes our own avatar apparently not changing until qTox restarted
---
 widget/maskablepixmapwidget.cpp | 1 +
 1 file changed, 1 insertion(+)

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

From 87c9bbf1e6f7565bcf8aba7cb1f61dea004912e9 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Sun, 28 Sep 2014 17:30:00 +0200
Subject: [PATCH 103/205] fixes #332, #334 and other visual glitches

---
 img/contact.png                 | Bin 790 -> 1170 bytes
 img/contact_dark.png            | Bin 744 -> 1532 bytes
 img/group.png                   | Bin 512 -> 1639 bytes
 img/group_2x.png                | Bin 0 -> 512 bytes
 img/group_dark.png              | Bin 671 -> 2262 bytes
 mainwindow.ui                   |  12 ++++++------
 res.qrc                         |   1 +
 ui/friendList/friendList.css    |  12 +++++-------
 widget/adjustingscrollarea.cpp  |  22 ++++++++++++++++++++--
 widget/adjustingscrollarea.h    |   7 ++-----
 widget/groupwidget.cpp          |  10 ++++++----
 widget/groupwidget.h            |   5 ++++-
 widget/maskablepixmapwidget.cpp |   6 +++++-
 13 files changed, 49 insertions(+), 26 deletions(-)
 create mode 100644 img/group_2x.png

diff --git a/img/contact.png b/img/contact.png
index e98b4d7ec1c2aa9f2e25edebbb6e128cec17a8b3..3b495014424e134fd93eba1b275f2419f96c4038 100644
GIT binary patch
literal 1170
zcmV;D1a13?P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004b3#c}2nYxW
zd<bNS00009a7bBm000&x000&x0ZCFM@Bjb+8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11P@6>K~#90<(f^1Rb?2*e{-EQz0IgGewBiS;zvd5xM^b`Ntlap
z1Q!z$=t3cIW1+KXBS=`J2(FZ2R^q~Fp@j5-5iN=`6jU5PQpzv<AkoPZ(ffDtUgFN3
zd(WIR=XuV#clyKGoR8mmp8tJ6&VApfMH2sK74i-sZ{=;k6ySBBBd-8jGkn)9U=#2v
z@KX7BuHyPV;39AVI1TIvZn;M#$@`cusZY`)CDY%Mc1r5-jL$pyosvok6R%~&=4LaX
zAZcI9#H;n8N31Q9%QScZ=yu?40d`peJq+k37~rMl!1q=#YXjPWeqe?rv`Qy{PQWB^
z>+gUbe3J)Q46L()S+;-za1EGl1&q)+V7>*&vIQ(Bo8$rJ5k9C=%hG_=hO9VRV*#-=
zpwo~QM=LELR%1W`7yu?%z+&nF&_>GHz^VmIB-`WxionZhAyx*o8F7+oR$73S0eLMe
zO-u{0GT=J!*oc)x#k2q`1D*g^jaW%^EiJ%u8a!{v%Iuw%1{^bF#nFA>Mp}ra0pA$1
z;^<ooh@}B1f!l_>;dI0TVrhVY?+kfSDgj?vfUMU8vg!su0e37w&1!&2^9Oqat`o)r
zZymM*d2Ee+=D@7fZ@^hAn8&K{7(#$^t-)ozjbT^wXaP@vPaL=qmcvcQ8Ly3zR^V4)
zks-4LyaD`T$aLEte++a1cMX}_FiswP>jN$W?-72vwCclYaP=;bI7-+oNz>1MAk-DO
zD2ob_Pl309KNCLp5cn8a0X(t}>OVPckJmcdCH2PK3O^=kZWeKQ%>q%H3M{QS766wB
zo1Q1jM}Jnq<Y7QV$#V=S0vmztz_=8g4qy-P4$xu{*I+sHt2vT(OS)Upr%y{-E2%Xh
z>s?7VD>!E)t(P>`DqgFk3zAkzI;!ZRs6QlqBxzCvt5wnpNe3f1Hzf5)nw&Ovi!op&
zu$N@pRR0nNy;H#Ngf3D9W)hnE^D#LOfL`Epl25Zhx<POpVUFKCQh=cb2;<Gcqz{hN
zfLF>ddu=2SJF1uPgZvZsfsxDt9{|T`yyO8k5dMY6t{zEhKo6n6Kb!EmEVYpEukrmj
zHz(-=UBDN3%*8$`5eC$+qi%|8z!Km`vM+*2tG@`J+n4Lz5T^^wAgsbRTk;U5(=UPX
z^=^n`zz*O=tB7*YBEq;;Q^R$E*@P|VXKZ82TqQy-SE?@z*8;ZE{K-Seb3?5QQ7zyF
z!r(F1DX6S<h0qEHtx-m`fK`m1<RMg)Evr5mWx$($vE-)N)hD717~<9_(2!#8dIn6x
zpa`)6HLdzYJp(2=2a=Zts!!B2pxrr;yfoyKxSj!HoCC>AL+T3a8IZdEt^suu___LI
klmVk{!{891c43g70&mlUPqG|57ytkO07*qoM6N<$g0JQQCjbBd

literal 790
zcmV+x1L^#UP)<h;3K|Lk000e1NJLTq0015U001Be1^@s61whDu00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4#WTe4#WYKD-Ig~000McNliru-Ub&4Boo~$ytx1X0;5Sp
zK~zY`z1F>JB0(4j;NPgQMG)2{Ho+ixU=b{YG_f>bp&)FPX0=-IYKs&>L?i?YL2D0U
zrOo~U2|>0KHid$fV&Q=(v4}_rL=e=u%AARDzf63~*?H%g&*de-U=T)v<G6(1?=Kx4
z9RUEIo}SQZwSG?~lRrkrA$nns;}W7Mmcrrim*4O2?{Ry3t9t^v;FFURn#p9~bUIc0
zJwHDqo6Vx#ZWFCBEqYd}2L%A9(}_$b1CHYoJHw(Vmh_<OxG0LHonVgR65GyHEyCfj
z=Bia;zu#Yi$<WGGg;!6;Olak*!h{ghuvV@r{QCN88rI5Hg@?nTX;>>)74CF8WVu`#
zMwiPaI-L$N4Ns?2)a!M_aJ^o~bUNMb2lDXnU>MeuqX{dDLS$LijmokNMNxMDR|7z~
zTt>Is)$G^pc2O>ubxlwgJQ|Hip-@1h(b(Fj(P*GhC}1=i>3aOcNFi`=aDYf8LQhXm
zv0ex?n@!x^-I2Gqx9=+itX3;*HXCNM*@yPS!$S!G#^dqDdOO1~n9t`}EEeXsn&){c
zNfH$Vfqwor9*-|RqW~ZX0+l3*@;pxsub5?7&*kN1FAxa4x8-s<)M_==^9zMS^y=zr
z{Y4<3&;NRPdHJgeyId}MeSHnL+r2SxrBXq)S|y*ionaUVf<R-j*hWsj-$y!~#&9?!
zTVa-EJ;h?N_Z7N|*=&Z#$43kX0|3DB@iETM&cHCt)|`I7k7P3WVdWp-o0}WDzP;ZW
zilQKuN|BAr#q<1+p#TsF1h9VLEUPCIkH_)T5s$}VwOaqf(P)%99F8A{9S#Sg(I|a~
z&(F`XuUJ_YmSsIYpKoul&*uZnvL1`q>+NCB;q`iZmR(BNT}oez-EQAIY`5F-5B#0`
UTOjxRz5oCK07*qoM6N<$g6!UGM*si-

diff --git a/img/contact_dark.png b/img/contact_dark.png
index 584a4669e5fc03f8021187a32de68d72dceeb8ca..a1c77479a56b7a5d63b2e534d5cd8bff8a638209 100644
GIT binary patch
literal 1532
zcmV<Y1q1qtP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004b3#c}2nYxW
zd<bNS00009a7bBm000&x000&x0ZCFM@Bjb+8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11$jwCK~#90<(ge=6jc<*|7UhvR$GC<N(ID#G4Tr%Kl;SOHuo-J
z!}?&v2MuU67y}807en|+d{`4=5YU9wgh&VvN{H3)P$Q%tv(srGGz3Ev5e=v$DBxGr
zO0es0=N=zeOuOA>cRFXLZTvmnz4O~M|K6FM-Z{j~_&;M!cLCE)d^*28l}g<ikH?oV
z^JT|zew&UOD5^`KqoZS4EEd}gU?mZ)VCEG7TE|Tp0q`vmT`<O+ZEkKp)YH@ROW1XV
z9)MEn0n4(sGxG)jO+F624&Ys8-W%rX2sHq$^&SA*08jwUbpX5a`TPNyswNUj0J&Vw
za$WZzfLElPM6}Je?R`?d|GZ%YptU{<V7<5)crBmLzbz>g4?t_Z9>7si={PLQ(*6DY
zj+jqM1OVA=b}j(%WjY>a-cLk9?kN)x4PbP1bSHqtlFmw)`7x!`3sOF@0CKsUMMN)2
z`RcGsN+cG*z`%e8aF>*?4)-giR!WG(0wAKNrCbg2jD$q;9`J;qt1d*eR>C6^KrWZF
z06Ze$^1(`pUjvZ<`uqFm0k~bl<%1Tj^}RtQA^{{4i8~}belf-@3+fOFpja$U%eE2`
z%?s)f381a5?FxV~371b=f(k?e=<4e70Q@N7^2z0(0?D7j^MbC17#kZ4{GDO}FmqnY
z)gXTj4h~)oDiI677}G1|YLGq&iC6%GgM-5WewFgogPA{(@JL<)44_}iR|f;&Qwfpi
zegHE^bs2mnwNoq_KvPpwBmqb*e?T~Z-rn9T0EQ)<)iB0%OS!^$H@G(h=XkzwUH5A#
znRo!nWb#8Ix*+Yn2@#2HhXEl3P<||aQ`!pv%<R~<Eqb2`<@LBR=6%TD3yfu1JA|F#
z1mHN%nCE%x0Q@1S-C^7IDM25A5E~?1*S$zY8*t;HB`8Po`Ftoh*HAk|Y}-BwU?+ee
z8zyctncOT?(j+2jkVvP~nwgIPxW~s~1tQu#GBUE~^y$;3uxg8}LnNEc&Mg!Q?*Q0X
zZ!R-C#+Xg6>xTAodXvZkxJf3HSyU>O+5xmPb2|||2;h4nI%A9(1~BY6&Norj6L|nL
zjnKNpGMP+Eu~>Ybh?XW2iQOkoocL!d9;H;0h+YTK<2cSq7XFKguK=ageE_zU-xSX;
z4}S&V4Q4*>I8MX6$6D*B0K5laQF-Vbfc?p2@`J9fuA)S}A_0_pg4P0f6+i~Ho1!iO
z=w#+Yj^q4UZGuuN9*e~kGjC+(=W2L<0&t*IDjgge8VdBV6*z!&I=z;eI|2B4O*IPO
z41g~Id`Cocj4>^iW!=rpSpW+f^jrsUI2McT@9XQk<gfA@OgVsTHan+KD7*z=>y!kt
zTqB}QwrwBtd*GA;&{{uCM8}vp>NmpmINaLWy0yEz`|m~%@Ew3sY6}tV1Ca1rT|}H?
z=4TzpIorr&U;hhet#=YpCuZ)+1HeN>bV@1pVk46qUIAL`bpSp_u(sDIF#xjpe7@&a
zlNt&jolZZ_%tMI22_h)Jd!E<sy6(kV6Y5?9sZ?q)Gk0V5ojd?6h{a;ZSFKugTdfIo
z1Bl1ty8$c}Eh}0cO(YVXwLZM%C7_gAPDJP7ug`xbVm!}V?z-*|l^@hw0oyVAPaXiQ
zcs%}c)emYNv1ZMhB}7zr^J2EZ%p1$?d=sb{faiHn0%#7ks%Tj@Fffp+9IP1tGk1hr
z&$O_-a^P0?fJtf1b}Y-9)XZHqfYqy4w*d&;ggDbM#<W$ARSm!xGr!vSY=?-hRgP5+
zz_P5l;g=IVL^SD<xM~2N=f%P=CwiE9QeR=M6%e@pZU*vmGMW6ma<FOu3l}cDieT^a
iW*p4?QMq?v0{;TL3h#8&e8PqR0000<MNUMnLSTZW^r962

literal 744
zcmV<E0vG*>P)<h;3K|Lk000e1NJLTq0015U001Be1^@s61whDu00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4#WTe4#WYKD-Ig~000McNliru-Ub{L00kN<HCq4x0(D75
zK~zY`#g;K>;$RfV|H++8mk!#{!O1HD!6jfvU8Kd97BZDWD0C2yPR@=uWiAB7!=aF+
zWa>~_Xe~(6%^OOWfT%b)MH~X5K{9+dDLJb760P3blJC9u%l~`d`|=n>G+o!r-EOx&
z9*+S4@pv42dwW0g`TXxFd6+1`$H&KdyWO6<zQ4bZqobqH9}o(BcXvlrRfTQafqvWD
z+qk&6fGCR8ylfbyVW0qD+cs2Hg|6#mn(sH7!|v|xpMJj|x^|Pv1RozCr?0QCzm`_4
z>w0-nO@pl6Zc|kUg1g;r9ZMQ5HV`~*nPrR?%i=#-Ab4wQYw5(a*g$Y1kysi`i={UD
z!NCC`ghYZe41?$AXJ(}uXEK?{YQw}(!P#s!GB`{O6)Z^-BM3rhs2~WCBx&`#8UTvL
zB9h4@)i0S$qF5|`?Qik^{+>KMJfPF*%w6Ys9>>SWI5|0Cz7#yQ>+5UM>2%;91bCiD
zrBY!wa`UuWEv?mRX=_QYC<+lpk;t+fx{+mBCZZ@3MNvrPtu_oJrD<BvG|kz&^Ye3*
zN~OT<Y&06=_V#x6oKB~4c6Rn7m&^63;HRf2a&vP7%d$QtE))u=R;$b+r7tfppWbsE
zhs(=L93CDr3&DnAq-wQVZyt1Nu~-c0bQ(K5I{<*uXav(V;d$P|7>?s`b#?WR^6!2J
zP16FQ0N{BZ-rwINofXTnplMpqFO>BkB!5l6+Dy}g|G>?_&1Q4$E$C;kQ?-uctR3t)
z&P+860B>(^8yk71EY>iL)L<~!7<e!kz%YyyI~)#sn;!Ir!(oqIWrSU2^krSw-8k5F
aUHk<)n+&5t;<-%#0000<MNUMnLSTZA4NU9+

diff --git a/img/group.png b/img/group.png
index eadc7487b5b87b9d1326a121b8bbbcfd905740b2..3afec19c07c777f2ac595fa5097ab76ead3404cb 100644
GIT binary patch
literal 1639
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

literal 512
zcmV+b0{{JqP)<h;3K|Lk000e1NJLTq0015U001Be1^@s61whDu0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzqDe$SRCwCNSBq_fFc39N;BMe<;BLSM
zWrLDU=mZ&oZa^{t*??{U8^8wcAvw}<_;Y}xKFLZH-}%}1d3J;#Fvdt2jag%WQ3wXW
zuC(?~OfYJWV{6=47ElaQAL@{!Heoao;y&UppSC&i)scXdk$KIXr^GViD8)G_AMtO%
zX@qf!Ec^{)j;!I$lM5}*PbAOU7Gf~RnZt1@pbAGJ%d!vLZZ_A7*xWEVd~_r=KVWkS
z?O2f=D>PRHPBU0SY|Cy%Dgq7qtuS#+IGlD3w)prq(-|J>qXbKFlnxo?V(>&zg$O&>
z0?aUPs@GBB&1wUr5K<5qf%aTBqH}BH(%{+ior5`|eqFW*yH8`G?=rk|E-ARZ#r*P+
zu#<wgF^L}@{|#{nxc}}<;=9Lx9nDB{j}W#I3j&c!m;F0Au@Yy&sP00%3RVoJqi-_r
z?ZhOPxF{jK5AjOan@jDTJDb~<NMC^nYZU%ANv>g$t2u@%_toNh*!Sif`rYIwPP!pa
z*{^$1aV7IBaYKA^iFIOP`Cr8B+i6V9v-yYeC%^!KLv%PHHb*f40000<MNUMnLSTZ_
C&fiS{

diff --git a/img/group_2x.png b/img/group_2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..eadc7487b5b87b9d1326a121b8bbbcfd905740b2
GIT binary patch
literal 512
zcmV+b0{{JqP)<h;3K|Lk000e1NJLTq0015U001Be1^@s61whDu0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzqDe$SRCwCNSBq_fFc39N;BMe<;BLSM
zWrLDU=mZ&oZa^{t*??{U8^8wcAvw}<_;Y}xKFLZH-}%}1d3J;#Fvdt2jag%WQ3wXW
zuC(?~OfYJWV{6=47ElaQAL@{!Heoao;y&UppSC&i)scXdk$KIXr^GViD8)G_AMtO%
zX@qf!Ec^{)j;!I$lM5}*PbAOU7Gf~RnZt1@pbAGJ%d!vLZZ_A7*xWEVd~_r=KVWkS
z?O2f=D>PRHPBU0SY|Cy%Dgq7qtuS#+IGlD3w)prq(-|J>qXbKFlnxo?V(>&zg$O&>
z0?aUPs@GBB&1wUr5K<5qf%aTBqH}BH(%{+ior5`|eqFW*yH8`G?=rk|E-ARZ#r*P+
zu#<wgF^L}@{|#{nxc}}<;=9Lx9nDB{j}W#I3j&c!m;F0Au@Yy&sP00%3RVoJqi-_r
z?ZhOPxF{jK5AjOan@jDTJDb~<NMC^nYZU%ANv>g$t2u@%_toNh*!Sif`rYIwPP!pa
z*{^$1aV7IBaYKA^iFIOP`Cr8B+i6V9v-yYeC%^!KLv%PHHb*f40000<MNUMnLSTZ_
C&fiS{

literal 0
HcmV?d00001

diff --git a/img/group_dark.png b/img/group_dark.png
index 55147f6c977f1e168d8cf1c802bfc7ac8fd0355f..b5875a23446d2087ffac5e68f8e566f231f18262 100644
GIT binary patch
literal 2262
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

literal 671
zcmV;Q0$}}#P)<h;3K|Lk000e1NJLTq0015U001Be1^@s61whDu00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-Uk5!4mewRE%X2Y0xU^H
zK~zY`#a1zP+b|6MQaW^0w~o%hUA}>{Vu`YKi+zIj25wH^X6t5k%Ij2T!D`*W+BsCc
zfsW7x%3~>tgc7}1OnL;sPk<kv%HSCh6#xzZw$5?~V8_f25=KOo<ga9@2k^+uU){JX
zKhYTT1mKgmTmYzyF+Z)feFF5C#1Hl!z{VJpS!-Voo_mQUfNEmj0>C~|aLm7#ZjONg
zl!=Y2gum4K^FUQGOZii_ngVVkNgaS)V&exPQ*4hhaD=rd0BdHhW2nO1n+W(zVOfBg
zM{kr`W?p;aR=I7Hn3G4+vv)N$Gw))+D*zWK>6)24@oi;Bi-|VgF>~w09-UcU5Bmgx
zJrQVzQxefes)$)H2kj;2x2%uEC)3iAh|T~uiqHpNr9zem07|LYm(h*#jQ61q$`y_)
z7D5~xfR353XSCV156s*LNLEWny4)ecWkyxdD3lP*CE^yqg^0>rsyR*&CG@SaKB0c+
zT-qDe)nP=mpo;h+j|sa+h?5eynaGc`+B5ggpOwJR6Z!wxJJHsps55g-M0-yvNAaGX
zH&gp(a~Pu-s~gSlk*3uMyk2(!)^>A1XIJbgS*dtVmoXw*O))j*dv(Qfx1XJVt{T7(
zW^M#*EB->p?lIMcOaXcT@Z}W^`X;*E&jOZvJS+YjW7Z1k`Z=uLzY%nh-Qf6LMeg+b
zLY(|)jQL}&Z8a6&FFX*p+E$kf0~h}bSS^{|!Z@S%`7cs@)KY|h+z9{x002ovPDHLk
FV1k2$D3$;K

diff --git a/mainwindow.ui b/mainwindow.ui
index a197594bd..385ecb489 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>714</width>
-    <height>541</height>
+    <width>712</width>
+    <height>539</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -2083,8 +2083,8 @@ QSplitter:handle{
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>262</width>
-             <height>375</height>
+             <width>261</width>
+             <height>373</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_5"/>
@@ -2587,7 +2587,7 @@ QSplitter:handle{
              </property>
              <property name="icon">
               <iconset resource="res.qrc">
-               <normaloff>:/img/group.png</normaloff>:/img/group.png</iconset>
+               <normaloff>:/img/group_2x.png</normaloff>:/img/group_2x.png</iconset>
              </property>
              <property name="flat">
               <bool>true</bool>
@@ -3218,7 +3218,7 @@ QSplitter:handle{
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>714</width>
+     <width>712</width>
      <height>25</height>
     </rect>
    </property>
diff --git a/res.qrc b/res.qrc
index 603fc8ba2..d085ca820 100644
--- a/res.qrc
+++ b/res.qrc
@@ -143,5 +143,6 @@
         <file>translations/fi.qm</file>
         <file>translations/mannol.qm</file>
         <file>img/avatar_mask.png</file>
+        <file>img/group_2x.png</file>
     </qresource>
 </RCC>
diff --git a/ui/friendList/friendList.css b/ui/friendList/friendList.css
index 55b39e1e6..8358f5a04 100644
--- a/ui/friendList/friendList.css
+++ b/ui/friendList/friendList.css
@@ -3,18 +3,16 @@ QScrollArea {
 }
 
 QScrollBar:vertical  {
-    background: transparent;
-    width: 14px;
-    margin-top: 2px;
-    margin-bottom: 2px;
+    background: rgb(65,65,65);
+    width: 16px;
+    padding: 0px 3px 0px 3px; 
 }
 
 QScrollBar:handle:vertical  {
     background: rgba(18, 18, 18, 204);
     min-height: 20px;
-    border-radius: 3px;
-    margin-left: 3px;
-    margin-right: 1px;
+    border-radius: 5px;
+    margin: 3px 0px 3px 0px;
 }
 
 QScrollBar:handle:vertical:hover  {
diff --git a/widget/adjustingscrollarea.cpp b/widget/adjustingscrollarea.cpp
index bb273fa90..2bd9cd3e8 100644
--- a/widget/adjustingscrollarea.cpp
+++ b/widget/adjustingscrollarea.cpp
@@ -21,14 +21,19 @@
 #include <QScrollBar>
 #include <QDebug>
 
-AdjustingScrollArea::AdjustingScrollArea(QWidget *parent) :
-    QScrollArea(parent)
+AdjustingScrollArea::AdjustingScrollArea(QWidget *parent)
+    : QScrollArea(parent)
 {
 
 }
 
 void AdjustingScrollArea::resizeEvent(QResizeEvent *ev)
 {
+    int scrollBarWidth = verticalScrollBar()->isVisible() ? verticalScrollBar()->sizeHint().width() : 0;
+
+    if (layoutDirection() == Qt::RightToLeft)
+        setViewportMargins(-scrollBarWidth, 0, 0, 0);
+
     updateGeometry();
     QScrollArea::resizeEvent(ev);
 }
@@ -43,3 +48,16 @@ QSize AdjustingScrollArea::sizeHint() const
 
     return QScrollArea::sizeHint();
 }
+
+bool AdjustingScrollArea::eventFilter(QObject *obj, QEvent *ev)
+{
+    if (ev->type() == QEvent::Paint)
+    {
+        // workaround: sometimes a child widget gets drawn on top of the scrollbar
+        // so we trigger a repaint afterwards
+        verticalScrollBar()->update();
+        horizontalScrollBar()->update();
+    }
+
+    return QObject::eventFilter(obj, ev);
+}
diff --git a/widget/adjustingscrollarea.h b/widget/adjustingscrollarea.h
index a1645cbba..380ac5df8 100644
--- a/widget/adjustingscrollarea.h
+++ b/widget/adjustingscrollarea.h
@@ -25,12 +25,9 @@ class AdjustingScrollArea : public QScrollArea
 public:
     explicit AdjustingScrollArea(QWidget *parent = 0);
 
-    virtual void resizeEvent(QResizeEvent *ev);
+    virtual void resizeEvent(QResizeEvent *ev) override;
     virtual QSize sizeHint() const override;
-signals:
-
-public slots:
-
+    virtual bool eventFilter(QObject *obj, QEvent *ev) override;
 };
 
 #endif // ADJUSTINGSCROLLAREA_H
diff --git a/widget/groupwidget.cpp b/widget/groupwidget.cpp
index b8c1cbcc0..7bd1683c9 100644
--- a/widget/groupwidget.cpp
+++ b/widget/groupwidget.cpp
@@ -19,6 +19,7 @@
 #include "group.h"
 #include "settings.h"
 #include "widget/form/groupchatform.h"
+#include "widget/maskablepixmapwidget.h"
 #include <QPalette>
 #include <QMenu>
 #include <QContextMenuEvent>
@@ -38,7 +39,8 @@ GroupWidget::GroupWidget(int GroupId, QString Name)
     textLayout.setMargin(0);
     setLayoutDirection(Qt::LeftToRight); // parent might have set Qt::RightToLeft
 
-    avatar.setPixmap(QPixmap(":img/group.png"));
+    avatar = new MaskablePixmapWidget(this, QSize(40,40), QString(), Qt::transparent);
+    avatar->setPixmap(QPixmap(":img/group.png"));
     statusPic.setPixmap(QPixmap(":img/status/dot_online.png"));
     name.setText(Name);
     QFont small;
@@ -65,7 +67,7 @@ GroupWidget::GroupWidget(int GroupId, QString Name)
     textLayout.addStretch();
 
     layout.addSpacing(20);
-    layout.addWidget(&avatar);
+    layout.addWidget(avatar);
     layout.addSpacing(5);
     layout.addLayout(&textLayout);
     layout.addStretch();
@@ -118,7 +120,7 @@ void GroupWidget::setAsActiveChatroom()
     QPalette pal3;
     pal3.setColor(QPalette::Background, Qt::white);
     this->setPalette(pal3);
-    avatar.setPixmap(QPixmap(":img/group_dark.png"));
+    avatar->setPixmap(QPixmap(":img/group_dark.png"));
 }
 
 void GroupWidget::setAsInactiveChatroom()
@@ -137,7 +139,7 @@ void GroupWidget::setAsInactiveChatroom()
     QPalette pal3;
     pal3.setColor(QPalette::Background, QColor(65,65,65,255));
     this->setPalette(pal3);
-    avatar.setPixmap(QPixmap(":img/group.png"));
+    avatar->setPixmap(QPixmap(":img/group.png"));
 }
 
 void GroupWidget::updateStatusLight()
diff --git a/widget/groupwidget.h b/widget/groupwidget.h
index 54d1ee533..960ab9cb7 100644
--- a/widget/groupwidget.h
+++ b/widget/groupwidget.h
@@ -20,6 +20,8 @@
 #include <QLabel>
 #include "genericchatroomwidget.h"
 
+class MaskablePixmapWidget;
+
 class GroupWidget : public GenericChatroomWidget
 {
     Q_OBJECT
@@ -39,7 +41,8 @@ signals:
 
 public:
     int groupId;
-    QLabel avatar, name, nusers, statusPic;
+    QLabel name, nusers, statusPic;
+    MaskablePixmapWidget* avatar;
 };
 
 #endif // GROUPWIDGET_H
diff --git a/widget/maskablepixmapwidget.cpp b/widget/maskablepixmapwidget.cpp
index 966143a0a..90eaf9552 100644
--- a/widget/maskablepixmapwidget.cpp
+++ b/widget/maskablepixmapwidget.cpp
@@ -23,7 +23,11 @@ MaskablePixmapWidget::MaskablePixmapWidget(QWidget *parent, QSize size, QString
     , clickable(false)
 {
     setFixedSize(size);
-    mask = QPixmap(maskName).scaled(size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+
+    QPixmap pmapMask = QPixmap(maskName);
+
+    if (!pmapMask.isNull())
+        mask = QPixmap(maskName).scaled(size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
 }
 
 void MaskablePixmapWidget::setClickable(bool clickable)

From 4ccfd8350533f0e3bcf45d944f732c73f9bb6ddf Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Sun, 28 Sep 2014 22:57:17 +0700
Subject: [PATCH 104/205] long name in file transfer widget fix

---
 filetransferinstance.cpp | 15 +++++++++++----
 filetransferinstance.h   |  1 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/filetransferinstance.cpp b/filetransferinstance.cpp
index 6167bfac3..f8b10ecc8 100644
--- a/filetransferinstance.cpp
+++ b/filetransferinstance.cpp
@@ -23,6 +23,8 @@
 #include <QDebug>
 #include <QPainter>
 
+#define CONTENT_WIDTH 250
+
 uint FileTransferInstance::Idconter = 0;
 
 FileTransferInstance::FileTransferInstance(ToxFile File)
@@ -34,6 +36,11 @@ FileTransferInstance::FileTransferInstance(ToxFile File)
     remotePaused = false;
 
     filename = File.fileName;
+    QFont font;
+    font.setPixelSize(10);
+    QFontMetrics fm(font);
+    filenameElided = fm.elidedText(filename, Qt::ElideRight, CONTENT_WIDTH);
+
     size = getHumanReadableSize(File.filesize);
     speed = "0B/s";
     eta = "00:00";
@@ -328,7 +335,7 @@ QString FileTransferInstance::drawButtonlessForm(const QString &type)
         imgBStr = "<img src=\"data:placeholder/png;base64," + QImage2base64(QImage(":/ui/fileTransferInstance/emptyRGreenFileButton.png")) + "\">";
     }
 
-    QString content = "<p>" + filename + "</p><p>" + size + "</p>";
+    QString content = "<p>" + filenameElided + "</p><p>" + size + "</p>";
 
     return wrapIntoForm(content, type, imgAStr, imgBStr);
 }
@@ -354,9 +361,9 @@ QString FileTransferInstance::draw2ButtonsForm(const QString &type, const QImage
     QString imgBstr = "<img src=\"data:ftrans." + widgetId + ".btnB/png;base64," + QImage2base64(imgB) + "\">";
 
     QString content;
-    QString progrBar = "<img src=\"data:progressbar." + widgetId + "/png;base64," + QImage2base64(drawProgressBarImg(double(lastBytesSent)/totalBytes, 250, 9)) + "\">";
+    QString progrBar = "<img src=\"data:progressbar." + widgetId + "/png;base64," + QImage2base64(drawProgressBarImg(double(lastBytesSent)/totalBytes, CONTENT_WIDTH, 9)) + "\">";
 
-    content  = "<p>" + filename + "</p>";
+    content  = "<p>" + filenameElided + "</p>";
     content += "<table cellspacing=\"0\"><tr>";
     content += "<td>" + size + "</td>";
     content += "<td align=center>" + speed + "</td>";
@@ -375,7 +382,7 @@ QString FileTransferInstance::wrapIntoForm(const QString& content, const QString
     res =  "<table cellspacing=\"0\">\n";
     res += "<tr valign=middle>\n";
     res += insertMiniature(type);
-    res += "<td width=280>\n";
+    res += "<td width=" + QString::number(CONTENT_WIDTH + 30) + ">\n";
     res += "<div class=" + type + ">";
     res += content;
     res += "</div>\n";
diff --git a/filetransferinstance.h b/filetransferinstance.h
index d1c9062d9..fb54fd8f6 100644
--- a/filetransferinstance.h
+++ b/filetransferinstance.h
@@ -72,6 +72,7 @@ private:
     bool remotePaused;
     QImage pic;
     QString filename, size, speed, eta;
+    QString filenameElided;
     QDateTime lastUpdate;
     long long lastBytesSent, totalBytes;
     int fileNum;

From a18070d7c58a334b43615e65c38787a351461008 Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Sun, 28 Sep 2014 23:39:26 +0700
Subject: [PATCH 105/205] Wrap name and date fix

---
 widget/chatareawidget.cpp       | 19 ++++++++++++++-----
 widget/chatareawidget.h         |  4 ++++
 widget/form/chatform.cpp        |  4 ++--
 widget/form/genericchatform.cpp | 11 ++++++++++-
 widget/form/genericchatform.h   |  2 ++
 5 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/widget/chatareawidget.cpp b/widget/chatareawidget.cpp
index 765d9e96c..c2e7a90b6 100644
--- a/widget/chatareawidget.cpp
+++ b/widget/chatareawidget.cpp
@@ -39,13 +39,11 @@ ChatAreaWidget::ChatAreaWidget(QWidget *parent) :
     chatTextTable = textCursor().insertTable(1,3);
 
     QTextTableFormat tableFormat;
-    tableFormat.setColumnWidthConstraints({QTextLength(QTextLength::VariableLength,0),
-                                           QTextLength(QTextLength::PercentageLength,100),
-                                           QTextLength(QTextLength::VariableLength,0)});
     tableFormat.setBorderStyle(QTextFrameFormat::BorderStyle_None);
+    tableFormat.setCellSpacing(2);
+    tableFormat.setWidth(QTextLength(QTextLength::PercentageLength,100));
     chatTextTable->setFormat(tableFormat);
-    chatTextTable->format().setCellSpacing(2);
-    chatTextTable->format().setWidth(QTextLength(QTextLength::PercentageLength,100));
+    setNameColWidth(100);
 
 //    nameFormat.setAlignment(Qt::AlignRight);
 //    nameFormat.setNonBreakableLines(true);
@@ -135,3 +133,14 @@ void ChatAreaWidget::checkSlider()
     QScrollBar* scroll = verticalScrollBar();
     lockSliderToBottom = scroll && scroll->value() == scroll->maximum();
 }
+
+void ChatAreaWidget::setNameColWidth(int w)
+{
+    nameWidth = w;
+
+    QTextTableFormat tableFormat = chatTextTable->format();
+    tableFormat.setColumnWidthConstraints({QTextLength(QTextLength::FixedLength, 100),
+                                           QTextLength(QTextLength::PercentageLength, 100),
+                                           QTextLength(QTextLength::FixedLength, 40)});
+    chatTextTable->setFormat(tableFormat);
+}
diff --git a/widget/chatareawidget.h b/widget/chatareawidget.h
index c30b12c61..05d41de4e 100644
--- a/widget/chatareawidget.h
+++ b/widget/chatareawidget.h
@@ -31,6 +31,9 @@ public:
     virtual ~ChatAreaWidget();
     void insertMessage(ChatAction *msgAction);
 
+    int nameColWidth() {return nameWidth;}
+    void setNameColWidth(int w);
+
 signals:
     void onFileTranfertInterract(QString widgetName, QString buttonName);
 
@@ -47,6 +50,7 @@ private:
     QList<ChatAction*> messages;
     bool lockSliderToBottom;
     int sliderPosition;
+    int nameWidth;
     QTextTable *chatTextTable;
     QTextBlockFormat nameFormat, dateFormat;
 };
diff --git a/widget/form/chatform.cpp b/widget/form/chatform.cpp
index a200eff08..9c57f0d88 100644
--- a/widget/form/chatform.cpp
+++ b/widget/form/chatform.cpp
@@ -125,7 +125,7 @@ void ChatForm::startFileSend(ToxFile file)
         name = "";
     previousName = Widget::getInstance()->getUsername();
 
-    chatWidget->insertMessage(new FileTransferAction(fileTrans, name, QTime::currentTime().toString("hh:mm"), true));
+    chatWidget->insertMessage(new FileTransferAction(fileTrans, getElidedName(name), QTime::currentTime().toString("hh:mm"), true));
 }
 
 void ChatForm::onFileRecvRequest(ToxFile file)
@@ -156,7 +156,7 @@ void ChatForm::onFileRecvRequest(ToxFile file)
         name = "";
     previousName = f->getName();
 
-    chatWidget->insertMessage(new FileTransferAction(fileTrans, name, QTime::currentTime().toString("hh:mm"), false));
+    chatWidget->insertMessage(new FileTransferAction(fileTrans, getElidedName(name), QTime::currentTime().toString("hh:mm"), false));
 }
 
 void ChatForm::onAvInvite(int FriendId, int CallId, bool video)
diff --git a/widget/form/genericchatform.cpp b/widget/form/genericchatform.cpp
index a10fe0c83..c992ba563 100644
--- a/widget/form/genericchatform.cpp
+++ b/widget/form/genericchatform.cpp
@@ -169,7 +169,7 @@ void GenericChatForm::addMessage(QString author, QString message, QDateTime date
 
     if (previousName == author)
         chatWidget->insertMessage(new MessageAction("", message, date, isMe));
-    else chatWidget->insertMessage(new MessageAction(author , message, date, isMe));
+    else chatWidget->insertMessage(new MessageAction(getElidedName(author) , message, date, isMe));
     previousName = author;
 }
 
@@ -212,3 +212,12 @@ void GenericChatForm::addSystemInfoMessage(const QString &message, const QString
 
     chatWidget->insertMessage(new SystemMessageAction(message, type, date));
 }
+
+QString GenericChatForm::getElidedName(const QString& name)
+{
+    QFont font;
+    font.setBold(true);
+    QFontMetrics fm(font);
+
+    return fm.elidedText(name, Qt::ElideRight, chatWidget->nameColWidth());
+}
diff --git a/widget/form/genericchatform.h b/widget/form/genericchatform.h
index d45bf1072..2111bcdf9 100644
--- a/widget/form/genericchatform.h
+++ b/widget/form/genericchatform.h
@@ -60,6 +60,8 @@ protected slots:
     void onEmoteInsertRequested(QString str);
 
 protected:
+    QString getElidedName(const QString& name);
+
     CroppingLabel *nameLabel;
     MaskablePixmapWidget *avatar;
     QWidget *headWidget;

From 7735973d9467c6d95dd6fbd28ab487350396b84e Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Sun, 28 Sep 2014 12:57:27 -0500
Subject: [PATCH 106/205] remove duplicate code

---
 core.cpp          |  4 ++--
 core.h            |  3 ---
 widget/widget.cpp | 20 --------------------
 widget/widget.h   |  2 --
 4 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/core.cpp b/core.cpp
index 1b04c16ac..1b3eb4fc4 100644
--- a/core.cpp
+++ b/core.cpp
@@ -1014,7 +1014,7 @@ void Core::loadFriends()
                 if (nameSize > 0) {
                     uint8_t *name = new uint8_t[nameSize];
                     if (tox_get_name(tox, ids[i], name) == nameSize) {
-                        emit friendUsernameLoaded(ids[i], CString::toString(name, nameSize));
+                        emit friendUsernameChanged(ids[i], CString::toString(name, nameSize));
                     }
                     delete[] name;
                 }
@@ -1023,7 +1023,7 @@ void Core::loadFriends()
                 if (statusMessageSize > 0) {
                     uint8_t *statusMessage = new uint8_t[statusMessageSize];
                     if (tox_get_status_message(tox, ids[i], statusMessage, statusMessageSize) == statusMessageSize) {
-                        emit friendStatusMessageLoaded(ids[i], CString::toString(statusMessage, statusMessageSize));
+                        emit friendStatusMessageChanged(ids[i], CString::toString(statusMessage, statusMessageSize));
                     }
                     delete[] statusMessage;
                 }
diff --git a/core.h b/core.h
index 253ccb401..b1425c59e 100644
--- a/core.h
+++ b/core.h
@@ -109,9 +109,6 @@ signals:
     void friendAvatarChanged(int friendId, const QPixmap& pic);
     void friendAvatarRemoved(int friendId);
 
-    void friendStatusMessageLoaded(int friendId, const QString& message);
-    void friendUsernameLoaded(int friendId, const QString& username);
-
     void friendAddressGenerated(const QString& friendAddress);
 
     void friendRemoved(int friendId);
diff --git a/widget/widget.cpp b/widget/widget.cpp
index 7c38847a6..5ee81d758 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -198,8 +198,6 @@ Widget::Widget(QWidget *parent)
     connect(core, &Core::friendUsernameChanged, this, &Widget::onFriendUsernameChanged);
     connect(core, &Core::friendStatusChanged, this, &Widget::onFriendStatusChanged);
     connect(core, &Core::friendStatusMessageChanged, this, &Widget::onFriendStatusMessageChanged);
-    connect(core, &Core::friendUsernameLoaded, this, &Widget::onFriendUsernameLoaded);
-    connect(core, &Core::friendStatusMessageLoaded, this, &Widget::onFriendStatusMessageLoaded);
     connect(core, &Core::friendRequestReceived, this, &Widget::onFriendRequestReceived);
     connect(core, &Core::friendMessageReceived, this, &Widget::onFriendMessageReceived);
     connect(core, &Core::groupInviteReceived, this, &Widget::onGroupInviteReceived);
@@ -525,24 +523,6 @@ void Widget::onFriendUsernameChanged(int friendId, const QString& username)
     f->setName(username);
 }
 
-void Widget::onFriendStatusMessageLoaded(int friendId, const QString& message)
-{
-    Friend* f = FriendList::findFriend(friendId);
-    if (!f)
-        return;
-
-    f->setStatusMessage(message);
-}
-
-void Widget::onFriendUsernameLoaded(int friendId, const QString& username)
-{
-    Friend* f = FriendList::findFriend(friendId);
-    if (!f)
-        return;
-
-    f->setName(username);
-}
-
 void Widget::onChatroomWidgetClicked(GenericChatroomWidget *widget)
 {
     hideMainForms();
diff --git a/widget/widget.h b/widget/widget.h
index 5ec25b501..5141e49f0 100644
--- a/widget/widget.h
+++ b/widget/widget.h
@@ -92,8 +92,6 @@ private slots:
     void onFriendStatusChanged(int friendId, Status status);
     void onFriendStatusMessageChanged(int friendId, const QString& message);
     void onFriendUsernameChanged(int friendId, const QString& username);
-    void onFriendStatusMessageLoaded(int friendId, const QString& message);
-    void onFriendUsernameLoaded(int friendId, const QString& username);
     void onChatroomWidgetClicked(GenericChatroomWidget *);
     void onFriendMessageReceived(int friendId, const QString& message);
     void onFriendRequestReceived(const QString& userId, const QString& message);

From 84f56b81a728effcfa9531704194a79c53336252 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Sun, 28 Sep 2014 13:09:10 -0500
Subject: [PATCH 107/205] fixes #331, remove special chars

---
 widget/widget.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/widget/widget.cpp b/widget/widget.cpp
index 5ee81d758..2b322eecd 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -511,7 +511,9 @@ void Widget::onFriendStatusMessageChanged(int friendId, const QString& message)
     if (!f)
         return;
 
-    f->setStatusMessage(message);
+    QString str = message; str.replace('\n', ' ');
+    str.remove('\r'); str.remove(QChar((char)0)); // null terminator...
+    f->setStatusMessage(str);
 }
 
 void Widget::onFriendUsernameChanged(int friendId, const QString& username)
@@ -520,7 +522,9 @@ void Widget::onFriendUsernameChanged(int friendId, const QString& username)
     if (!f)
         return;
 
-    f->setName(username);
+    QString str = username; str.replace('\n', ' ');
+    str.remove('\r'); str.remove(QChar((char)0)); // null terminator...
+    f->setName(str);
 }
 
 void Widget::onChatroomWidgetClicked(GenericChatroomWidget *widget)

From c037edd033cfc654b3dcb00930c74d5aa489d25f Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Sun, 28 Sep 2014 18:08:07 -0500
Subject: [PATCH 108/205] work torwards #340, CAUTION spams bootstrapDht()
 until connection is confirmed, so it's not quite right...

---
 core.cpp      | 132 ++++++++++++++++++++++----------------------------
 core.h        |   4 +-
 coredefines.h |   2 -
 3 files changed, 59 insertions(+), 79 deletions(-)

diff --git a/core.cpp b/core.cpp
index 1b3eb4fc4..8693d77de 100644
--- a/core.cpp
+++ b/core.cpp
@@ -49,15 +49,9 @@ Core::Core(Camera* cam, QThread *coreThread) :
 
     toxTimer = new QTimer(this);
     toxTimer->setSingleShot(true);
-    //saveTimer = new QTimer(this);
-    //saveTimer->start(TOX_SAVE_INTERVAL);
-    bootstrapTimer = new QTimer(this);
-    bootstrapTimer->start(TOX_BOOTSTRAP_INTERVAL);
     connect(toxTimer, &QTimer::timeout, this, &Core::process);
-    //connect(saveTimer, &QTimer::timeout, this, &Core::saveConfiguration); //Disable save timer in favor of saving on events
     //connect(fileTimer, &QTimer::timeout, this, &Core::fileHeartbeat);
-    connect(bootstrapTimer, &QTimer::timeout, this, &Core::onBootstrapTimer);
-    connect(&Settings::getInstance(), &Settings::dhtServerListChanged, this, &Core::bootstrapDht);
+    connect(&Settings::getInstance(), &Settings::dhtServerListChanged, this, &Core::process);
     connect(this, SIGNAL(fileTransferFinished(ToxFile)), this, SLOT(onFileTransferFinished(ToxFile)));
 
     for (int i=0; i<TOXAV_MAX_CALLS;i++)
@@ -223,17 +217,68 @@ void Core::start()
     else
         qDebug() << "Core: Error loading self avatar";
 
-    bootstrapDht();
-
-    toxTimer->start(tox_do_interval(tox));
+    TOX_DO_INTERVAL = tox_do_interval(tox);
+    
+    process(); // starts its own timer
 }
 
-void Core::onBootstrapTimer()
+void Core::process()
 {
     if (!tox)
         return;
-    if(!tox_isconnected(tox))
+
+    tox_do(tox);
+#ifdef DEBUG
+    //we want to see the debug messages immediately
+    fflush(stdout);
+#endif
+    if (!checkConnection())
         bootstrapDht();
+
+    toxTimer->start(TOX_DO_INTERVAL);
+}
+
+bool Core::checkConnection()
+{
+    static bool isConnected = false;
+    bool toxConnected = tox_isconnected(tox);
+
+    if (toxConnected && !isConnected) {
+        qDebug() << "Core: Connected to DHT";
+        emit connected();
+        isConnected = true;
+    } else if (!toxConnected && isConnected) {
+        qDebug() << "Core: Disconnected to DHT";
+        emit disconnected();
+        isConnected = false;
+    }
+    return isConnected;
+}
+
+void Core::bootstrapDht()
+{
+    const Settings& s = Settings::getInstance();
+    QList<Settings::DhtServer> dhtServerList = s.getDhtServerList();
+
+    int listSize = dhtServerList.size();
+    static int j = qrand() % listSize;
+
+    qDebug() << "Core: Bootstraping to the DHT ...";
+
+    int i=0;
+    while (i < 3)
+    {
+        const Settings::DhtServer& dhtServer = dhtServerList[j % listSize];
+        if (tox_bootstrap_from_address(tox, dhtServer.address.toLatin1().data(),
+            dhtServer.port, CUserId(dhtServer.userId).data()) == 1)
+            qDebug() << QString("Core: Bootstraping from ")+dhtServer.name+QString(", addr ")+dhtServer.address.toLatin1().data()
+                        +QString(", port ")+QString().setNum(dhtServer.port);
+        else
+            qDebug() << "Core: Error bootstraping from "+dhtServer.name;
+
+        j++;
+        i++;
+    }
 }
 
 void Core::onFriendRequest(Tox*/* tox*/, const uint8_t* cUserId, const uint8_t* cMessage, uint16_t cMessageSize, void* core)
@@ -861,69 +906,6 @@ void Core::onFileTransferFinished(ToxFile file)
           emit fileDownloadFinished(file.filePath);
 }
 
-void Core::bootstrapDht()
-{
-    const Settings& s = Settings::getInstance();
-    QList<Settings::DhtServer> dhtServerList = s.getDhtServerList();
-
-    int listSize = dhtServerList.size();
-    static int j = qrand() % listSize, n=0;
-
-    // We couldn't connect after trying 6 different nodes, let's try something else
-    if (n>3)
-    {
-        qDebug() << "Core: We're having trouble connecting to the DHT, slowing down";
-        bootstrapTimer->setInterval(TOX_BOOTSTRAP_INTERVAL*(n-1));
-    }
-    else
-        qDebug() << "Core: Connecting to the DHT ...";
-
-    int i=0;
-    while (i < (2 - (n>3)))
-    {
-        const Settings::DhtServer& dhtServer = dhtServerList[j % listSize];
-        if (tox_bootstrap_from_address(tox, dhtServer.address.toLatin1().data(),
-            dhtServer.port, CUserId(dhtServer.userId).data()) == 1)
-            qDebug() << QString("Core: Bootstraping from ")+dhtServer.name+QString(", addr ")+dhtServer.address.toLatin1().data()
-                        +QString(", port ")+QString().setNum(dhtServer.port);
-        else
-            qDebug() << "Core: Error bootstraping from "+dhtServer.name;
-
-        tox_do(tox);
-        j++;
-        i++;
-        n++;
-    }
-}
-
-void Core::process()
-{
-    tox_do(tox);
-#ifdef DEBUG
-    //we want to see the debug messages immediately
-    fflush(stdout);
-#endif
-    checkConnection();
-    //int toxInterval = tox_do_interval(tox);
-    //qDebug() << QString("Tox interval %1").arg(toxInterval);
-    toxTimer->start(50);
-}
-
-void Core::checkConnection()
-{
-    static bool isConnected = false;
-
-    if (tox_isconnected(tox) && !isConnected) {
-        qDebug() << "Core: Connected to DHT";
-        emit connected();
-        isConnected = true;
-    } else if (!tox_isconnected(tox) && isConnected) {
-        qDebug() << "Core: Disconnected to DHT";
-        emit disconnected();
-        isConnected = false;
-    }
-}
-
 void Core::loadConfiguration()
 {
     QString path = QDir(Settings::getSettingsDirPath()).filePath(CONFIG_FILE_NAME);
diff --git a/core.h b/core.h
index b1425c59e..f247dd59b 100644
--- a/core.h
+++ b/core.h
@@ -206,8 +206,7 @@ private:
     static void playCallVideo(ToxAv* toxav, int32_t callId, vpx_image_t* img, void *user_data);
     void sendCallVideo(int callId);
 
-    void checkConnection();
-    void onBootstrapTimer();
+    bool checkConnection();
 
     void loadConfiguration();
     void loadFriends();
@@ -236,6 +235,7 @@ private:
     static const int videobufsize;
     static uint8_t* videobuf;
     static int videoBusyness; // Used to know when to drop frames
+    int TOX_DO_INTERVAL;
 
     static ALCdevice* alOutDev, *alInDev;
     static ALCcontext* alContext;
diff --git a/coredefines.h b/coredefines.h
index cb6fcffed..e2c71b8d4 100644
--- a/coredefines.h
+++ b/coredefines.h
@@ -3,9 +3,7 @@
 
 #define TOXAV_MAX_CALLS 16
 #define GROUPCHAT_MAX_SIZE 32
-#define TOX_SAVE_INTERVAL 30*1000
 #define TOX_FILE_INTERVAL 0
-#define TOX_BOOTSTRAP_INTERVAL 5*1000
 #define TOXAV_RINGING_TIME 15
 
 // TODO: Put that in the settings

From d9a315c5896e5d8951dc675aededb278bc17ddc4 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Sun, 28 Sep 2014 18:21:08 -0500
Subject: [PATCH 109/205] fix #340

---
 core.cpp | 18 ++++++++++++------
 core.h   |  1 -
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/core.cpp b/core.cpp
index 8693d77de..84265dd10 100644
--- a/core.cpp
+++ b/core.cpp
@@ -216,8 +216,6 @@ void Core::start()
     }
     else
         qDebug() << "Core: Error loading self avatar";
-
-    TOX_DO_INTERVAL = tox_do_interval(tox);
     
     process(); // starts its own timer
 }
@@ -227,15 +225,23 @@ void Core::process()
     if (!tox)
         return;
 
+    static int retries = 0;
     tox_do(tox);
+
 #ifdef DEBUG
     //we want to see the debug messages immediately
     fflush(stdout);
 #endif
-    if (!checkConnection())
-        bootstrapDht();
 
-    toxTimer->start(TOX_DO_INTERVAL);
+    if (checkConnection())
+        retries = 0;
+    else if (retries < 2)
+    {
+        retries++;
+        bootstrapDht();
+    }
+
+    toxTimer->start(tox_do_interval(tox));
 }
 
 bool Core::checkConnection()
@@ -266,7 +272,7 @@ void Core::bootstrapDht()
     qDebug() << "Core: Bootstraping to the DHT ...";
 
     int i=0;
-    while (i < 3)
+    while (i < 2)
     {
         const Settings::DhtServer& dhtServer = dhtServerList[j % listSize];
         if (tox_bootstrap_from_address(tox, dhtServer.address.toLatin1().data(),
diff --git a/core.h b/core.h
index f247dd59b..c7227831e 100644
--- a/core.h
+++ b/core.h
@@ -235,7 +235,6 @@ private:
     static const int videobufsize;
     static uint8_t* videobuf;
     static int videoBusyness; // Used to know when to drop frames
-    int TOX_DO_INTERVAL;
 
     static ALCdevice* alOutDev, *alInDev;
     static ALCcontext* alContext;

From 940cdfebba3c48d421808534cd9dfbb739175a07 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Sun, 28 Sep 2014 20:54:28 -0500
Subject: [PATCH 110/205] implement avatar hash caching instead of getting full
 avatar each time

---
 core.cpp     | 28 ++++++++++++++++++++--------
 settings.cpp | 25 ++++++++++++++++++++++++-
 settings.h   |  3 +++
 3 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/core.cpp b/core.cpp
index 1b3eb4fc4..403b3e8b9 100644
--- a/core.cpp
+++ b/core.cpp
@@ -280,7 +280,7 @@ void Core::onUserStatusChanged(Tox*/* tox*/, int friendId, uint8_t userstatus, v
     }
 
     if (status == Status::Online || status == Status::Away)
-        tox_request_avatar_data(static_cast<Core*>(core)->tox, friendId);
+        tox_request_avatar_info(static_cast<Core*>(core)->tox, friendId);
 
     emit static_cast<Core*>(core)->friendStatusChanged(friendId, status);
 }
@@ -453,28 +453,40 @@ void Core::onFileDataCallback(Tox*, int32_t friendnumber, uint8_t filenumber, co
 }
 
 void Core::onAvatarInfoCallback(Tox*, int32_t friendnumber, uint8_t format,
-                                uint8_t *, void* core)
+                                uint8_t* hash, void* _core)
 {
-    qDebug() << "Core: Got avatar info from "<<friendnumber
-             <<": format "<<format;
+    Core* core = static_cast<Core*>(_core);
 
     if (format == TOX_AVATAR_FORMAT_NONE)
-        emit static_cast<Core*>(core)->friendAvatarRemoved(friendnumber);
+    {
+        qDebug() << "Core: Got null avatar info from" << friendnumber;
+        emit core->friendAvatarRemoved(friendnumber);
+    }
     else
-        tox_request_avatar_data(static_cast<Core*>(core)->tox, friendnumber);
+    {
+        QByteArray oldHash = Settings::getInstance().getAvatarHash(core->getFriendAddress(friendnumber));
+        if (QByteArray((char*)hash, TOX_HASH_LENGTH) != oldHash) // comparison failed miserably if I didn't convert hash to QByteArray
+        {
+            qDebug() << "Core: got different avatar hash from" << friendnumber;
+            tox_request_avatar_data(core->tox, friendnumber);
+        } 
+        else
+            qDebug() << "Core: Got old avatar info from" << friendnumber;
+    }
 }
 
 void Core::onAvatarDataCallback(Tox*, int32_t friendnumber, uint8_t,
-                        uint8_t *, uint8_t *data, uint32_t datalen, void *core)
+                        uint8_t *hash, uint8_t *data, uint32_t datalen, void *core)
 {
     QPixmap pic;
     pic.loadFromData((uchar*)data, datalen);
     if (pic.isNull())
-        qDebug() << "Core: Got invalid avatar data from "<<friendnumber;
+        qDebug() << "Core: Got null avatar from "<<friendnumber;
     else
     {
         qDebug() << "Core: Got avatar data from "<<friendnumber<<", size:"<<pic.size();
         Settings::getInstance().saveAvatar(pic, static_cast<Core*>(core)->getFriendAddress(friendnumber));
+        Settings::getInstance().saveAvatarHash(QByteArray((char*)hash, TOX_HASH_LENGTH), static_cast<Core*>(core)->getFriendAddress(friendnumber));
         emit static_cast<Core*>(core)->friendAvatarChanged(friendnumber, pic);
     }
 }
diff --git a/settings.cpp b/settings.cpp
index 3e9f33426..31cbd158e 100644
--- a/settings.cpp
+++ b/settings.cpp
@@ -280,12 +280,35 @@ QPixmap Settings::getSavedAvatar(const QString &ownerId)
 void Settings::saveAvatar(QPixmap& pic, const QString& ownerId)
 {
     QDir dir(getSettingsDirPath());
-    dir.mkdir("avatars/"); // remove this in a week or two hopefully
+    dir.mkdir("avatars/");
     // ignore nospam (good idea, and also the addFriend funcs which call getAvatar don't have it)
     QString filePath = dir.filePath("avatars/"+ownerId.left(64)+".png");
     pic.save(filePath, "png");
 }
 
+void Settings::saveAvatarHash(const QByteArray& hash, const QString& ownerId)
+{
+    QDir dir(getSettingsDirPath());
+    dir.mkdir("avatars/");
+    QFile file(dir.filePath("avatars/"+ownerId.left(64)+".hash"));
+    if (!file.open(QIODevice::WriteOnly))
+        return;
+    file.write(hash);
+    file.close();
+}
+
+QByteArray Settings::getAvatarHash(const QString& ownerId)
+{
+    QDir dir(getSettingsDirPath());
+    dir.mkdir("avatars/");
+    QFile file(dir.filePath("avatars/"+ownerId.left(64)+".hash"));
+    if (!file.open(QIODevice::ReadOnly))
+        return QByteArray();
+    QByteArray out = file.readAll();
+    file.close();
+    return out;
+}
+
 const QList<Settings::DhtServer>& Settings::getDhtServerList() const
 {
     return dhtServerList;
diff --git a/settings.h b/settings.h
index b796211cb..9f379e886 100644
--- a/settings.h
+++ b/settings.h
@@ -61,6 +61,9 @@ public:
     QPixmap getSavedAvatar(const QString& ownerId);
     void saveAvatar(QPixmap& pic, const QString& ownerId);
 
+    QByteArray getAvatarHash(const QString& ownerId);
+    void saveAvatarHash(const QByteArray& hash, const QString& ownerId);
+
     // Assume all widgets have unique names
     // Don't use it to save every single thing you want to save, use it
     // for some general purpose widgets, such as MainWindows or Splitters,

From a4d42a713621344a58b1cd2aad02aface0dd422d Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Sun, 28 Sep 2014 23:10:04 -0500
Subject: [PATCH 111/205] change file eta to be overall average handles jitter
 much better

---
 filetransferinstance.cpp | 19 ++++++++++---------
 filetransferinstance.h   |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/filetransferinstance.cpp b/filetransferinstance.cpp
index f8b10ecc8..d55de0bf4 100644
--- a/filetransferinstance.cpp
+++ b/filetransferinstance.cpp
@@ -28,7 +28,7 @@
 uint FileTransferInstance::Idconter = 0;
 
 FileTransferInstance::FileTransferInstance(ToxFile File)
-    : lastUpdate{QDateTime::currentDateTime()}, lastBytesSent{0},
+    : lastBytesSent{0},
       fileNum{File.fileNum}, friendId{File.friendId}, direction{File.direction}
 {
     id = Idconter++;
@@ -72,16 +72,16 @@ void FileTransferInstance::onFileTransferInfo(int FriendId, int FileNum, int64_t
 
 //    state = tsProcessing;
     QDateTime newtime = QDateTime::currentDateTime();
-    int timediff = lastUpdate.secsTo(newtime);
+    int timediff = started.secsTo(newtime);
     if (timediff <= 0)
         return;
-    qint64 diff = BytesSent - lastBytesSent;
-    if (diff < 0)
+    qint64 totalbytes = BytesSent + lastBytesSent; // bytes sent so far
+    if (totalbytes < 0)
     {
         qWarning() << "FileTransferInstance::onFileTransferInfo: Negative transfer speed !";
-        diff = 0;
+        totalbytes = 0;
     }
-    long rawspeed = diff / timediff;
+    long rawspeed = totalbytes / timediff;
     speed = getHumanReadableSize(rawspeed)+"/s";
     size = getHumanReadableSize(Filesize);
     totalBytes = Filesize;
@@ -91,8 +91,7 @@ void FileTransferInstance::onFileTransferInfo(int FriendId, int FileNum, int64_t
     QTime etaTime(0,0);
     etaTime = etaTime.addSecs(etaSecs);
     eta = etaTime.toString("mm:ss");
-    lastUpdate = newtime;
-    lastBytesSent = BytesSent;
+    lastBytesSent = totalbytes;
     emit stateUpdated();
 }
 
@@ -197,7 +196,7 @@ void FileTransferInstance::acceptRecvRequest()
     QString path;
     while (true)
     {
-        path = QFileDialog::getSaveFileName(0, tr("Save a file","Title of the file saving dialog"), QDir::current().filePath(filename));
+        path = QFileDialog::getSaveFileName(0, tr("Save a file","Title of the file saving dialog"), QDir::home().filePath(filename));
         if (path.isEmpty())
             return;
         else
@@ -217,6 +216,8 @@ void FileTransferInstance::acceptRecvRequest()
     Core::getInstance()->acceptFileRecvRequest(friendId, fileNum, path);
     state = tsProcessing;
 
+    started = QDateTime::currentDateTime();
+
     emit stateUpdated();
 }
 
diff --git a/filetransferinstance.h b/filetransferinstance.h
index fb54fd8f6..d0b766a13 100644
--- a/filetransferinstance.h
+++ b/filetransferinstance.h
@@ -73,7 +73,7 @@ private:
     QImage pic;
     QString filename, size, speed, eta;
     QString filenameElided;
-    QDateTime lastUpdate;
+    QDateTime started;
     long long lastBytesSent, totalBytes;
     int fileNum;
     int friendId;

From 8a1c912da3850d4aad42b40ff68d5f827f5e3471 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Sun, 28 Sep 2014 23:16:11 -0500
Subject: [PATCH 112/205] mv some files, clean up top level folder

---
 cdata.cpp => misc/cdata.cpp           | 0
 cdata.h => misc/cdata.h               | 0
 cstring.cpp => misc/cstring.cpp       | 0
 cstring.h => misc/cstring.h           | 0
 settings.cpp => misc/settings.cpp     | 0
 settings.h => misc/settings.h         | 0
 smileypack.cpp => misc/smileypack.cpp | 0
 smileypack.h => misc/smileypack.h     | 0
 style.cpp => misc/style.cpp           | 0
 style.h => misc/style.h               | 0
 10 files changed, 0 insertions(+), 0 deletions(-)
 rename cdata.cpp => misc/cdata.cpp (100%)
 rename cdata.h => misc/cdata.h (100%)
 rename cstring.cpp => misc/cstring.cpp (100%)
 rename cstring.h => misc/cstring.h (100%)
 rename settings.cpp => misc/settings.cpp (100%)
 rename settings.h => misc/settings.h (100%)
 rename smileypack.cpp => misc/smileypack.cpp (100%)
 rename smileypack.h => misc/smileypack.h (100%)
 rename style.cpp => misc/style.cpp (100%)
 rename style.h => misc/style.h (100%)

diff --git a/cdata.cpp b/misc/cdata.cpp
similarity index 100%
rename from cdata.cpp
rename to misc/cdata.cpp
diff --git a/cdata.h b/misc/cdata.h
similarity index 100%
rename from cdata.h
rename to misc/cdata.h
diff --git a/cstring.cpp b/misc/cstring.cpp
similarity index 100%
rename from cstring.cpp
rename to misc/cstring.cpp
diff --git a/cstring.h b/misc/cstring.h
similarity index 100%
rename from cstring.h
rename to misc/cstring.h
diff --git a/settings.cpp b/misc/settings.cpp
similarity index 100%
rename from settings.cpp
rename to misc/settings.cpp
diff --git a/settings.h b/misc/settings.h
similarity index 100%
rename from settings.h
rename to misc/settings.h
diff --git a/smileypack.cpp b/misc/smileypack.cpp
similarity index 100%
rename from smileypack.cpp
rename to misc/smileypack.cpp
diff --git a/smileypack.h b/misc/smileypack.h
similarity index 100%
rename from smileypack.h
rename to misc/smileypack.h
diff --git a/style.cpp b/misc/style.cpp
similarity index 100%
rename from style.cpp
rename to misc/style.cpp
diff --git a/style.h b/misc/style.h
similarity index 100%
rename from style.h
rename to misc/style.h

From 25a0a90cf73e05aabe32b6b9edb1801a166efe3f Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Mon, 29 Sep 2014 10:38:31 +0200
Subject: [PATCH 113/205] fix #334

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

diff --git a/widget/friendwidget.cpp b/widget/friendwidget.cpp
index 5bce871f7..ad16ac75c 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_dark.png"));
 }
 
 void FriendWidget::mousePressEvent(QMouseEvent *ev)

From dbeccd36f9d185946464edc676ca9f235f6bfaa7 Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Mon, 29 Sep 2014 19:43:14 +0700
Subject: [PATCH 114/205] FileTransferInstance: unification of preview images
 function

---
 filetransferinstance.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/filetransferinstance.cpp b/filetransferinstance.cpp
index f8b10ecc8..0799c9615 100644
--- a/filetransferinstance.cpp
+++ b/filetransferinstance.cpp
@@ -24,6 +24,7 @@
 #include <QPainter>
 
 #define CONTENT_WIDTH 250
+#define MAX_PREVIEW_SIZE 25*1024*1024
 
 uint FileTransferInstance::Idconter = 0;
 
@@ -44,13 +45,17 @@ FileTransferInstance::FileTransferInstance(ToxFile File)
     size = getHumanReadableSize(File.filesize);
     speed = "0B/s";
     eta = "00:00";
+
     if (File.direction == ToxFile::SENDING)
     {
-        QImage preview;
-        File.file->seek(0);
-        if (preview.loadFromData(File.file->readAll()))
+        if (File.file->size() <= MAX_PREVIEW_SIZE)
         {
-            pic = preview.scaledToHeight(50);
+            QImage preview;
+            File.file->seek(0);
+            if (preview.loadFromData(File.file->readAll()))
+            {
+                pic = preview.scaledToHeight(50);
+            }
         }
         File.file->seek(0);
     }
@@ -116,7 +121,7 @@ void FileTransferInstance::onFileTransferFinished(ToxFile File)
     {
         QImage preview;
         QFile previewFile(File.filePath);
-        if (previewFile.open(QIODevice::ReadOnly) && previewFile.size() <= 1024*1024*25) // Don't preview big (>25MiB) images
+        if (previewFile.open(QIODevice::ReadOnly) && previewFile.size() <= MAX_PREVIEW_SIZE) // Don't preview big (>25MiB) images
         {
             if (preview.loadFromData(previewFile.readAll()))
             {

From 4dfa5a45c4b3973f47803a36f7f78e54c1eb8972 Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Mon, 29 Sep 2014 20:59:07 +0700
Subject: [PATCH 115/205] Core::onFileControlCallback: handle
 TOX_FILECONTROL_RESUME_BROKEN request

---
 core.cpp | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/core.cpp b/core.cpp
index 1b3eb4fc4..0361535a9 100644
--- a/core.cpp
+++ b/core.cpp
@@ -328,7 +328,7 @@ void Core::onFileSendRequestCallback(Tox*, int32_t friendnumber, uint8_t filenum
     emit static_cast<Core*>(core)->fileReceiveRequested(fileRecvQueue.last());
 }
 void Core::onFileControlCallback(Tox* tox, int32_t friendnumber, uint8_t receive_send, uint8_t filenumber,
-                                      uint8_t control_type, const uint8_t*, uint16_t, void *core)
+                                      uint8_t control_type, const uint8_t* data, uint16_t, void *core)
 {
     ToxFile* file{nullptr};
     if (receive_send == 1)
@@ -421,6 +421,21 @@ void Core::onFileControlCallback(Tox* tox, int32_t friendnumber, uint8_t receive
     {
         emit static_cast<Core*>(core)->fileTransferRemotePausedUnpaused(*file, true);
     }
+    else if (receive_send == 1 && control_type == TOX_FILECONTROL_RESUME_BROKEN)
+    {
+        qDebug() << "Core::onFileControlCallback: TOX_FILECONTROL_RESUME_BROKEN";
+        uint64_t resumePos = *(uint64_t*)data;
+
+        if (resumePos >= file->filesize)
+        {
+            qWarning() << "Core::onFileControlCallback: invalid resume position";
+            tox_file_send_control(tox, file->friendId, 0, file->fileNum, TOX_FILECONTROL_KILL, nullptr, 0); // don't sure about it
+            return;
+        }
+
+        file->bytesSent = resumePos;
+        tox_file_send_control(tox, file->friendId, 0, file->fileNum, TOX_FILECONTROL_ACCEPT, nullptr, 0);
+    }
     else
     {
         qDebug() << QString("Core: File control callback, receive_send=%1, control_type=%2")

From 575cac1fc70449d888e1ea4dcc8c692d8012f222 Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Mon, 29 Sep 2014 23:14:19 +0700
Subject: [PATCH 116/205] Core: emit TOX_FILECONTROL_RESUME_BROKEN request
 (base functionality)

---
 core.cpp               | 32 ++++++++++++++++++++++++++++++--
 core.h                 |  1 +
 corestructs.h          |  3 ++-
 filetransferinstance.h |  2 +-
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/core.cpp b/core.cpp
index 0361535a9..2662b4fd8 100644
--- a/core.cpp
+++ b/core.cpp
@@ -291,6 +291,34 @@ void Core::onConnectionStatusChanged(Tox*/* tox*/, int friendId, uint8_t status,
     emit static_cast<Core*>(core)->friendStatusChanged(friendId, friendStatus);
     if (friendStatus == Status::Offline) {
         static_cast<Core*>(core)->checkLastOnline(friendId);
+
+        for (ToxFile& f : fileSendQueue)
+        {
+            if (f.friendId == friendId && f.status == ToxFile::TRANSMITTING)
+            {
+                qDebug() << "friendId: set broken";
+                f.status = ToxFile::BROKEN;
+                emit static_cast<Core*>(core)->fileTransferBrokenUnbroken(f, true);
+            }
+        }
+        for (ToxFile& f : fileRecvQueue)
+        {
+            if (f.friendId == friendId && f.status == ToxFile::TRANSMITTING)
+            {
+                qDebug() << "friendId: set broken";
+                f.status = ToxFile::BROKEN;
+                emit static_cast<Core*>(core)->fileTransferBrokenUnbroken(f, true);
+            }
+        }
+    } else {
+        for (ToxFile& f : fileRecvQueue)
+        {
+            if (f.friendId == friendId && f.status == ToxFile::BROKEN)
+            {
+                tox_file_send_control(static_cast<Core*>(core)->tox, friendId, 1, f.fileNum, TOX_FILECONTROL_RESUME_BROKEN, (const uint8_t*)(&f.bytesSent), sizeof(uint64_t));
+                emit static_cast<Core*>(core)->fileTransferBrokenUnbroken(f, false);
+            }
+        }
     }
 }
 
@@ -424,7 +452,7 @@ void Core::onFileControlCallback(Tox* tox, int32_t friendnumber, uint8_t receive
     else if (receive_send == 1 && control_type == TOX_FILECONTROL_RESUME_BROKEN)
     {
         qDebug() << "Core::onFileControlCallback: TOX_FILECONTROL_RESUME_BROKEN";
-        uint64_t resumePos = *(uint64_t*)data;
+        uint64_t resumePos = *(const uint64_t*)(data);
 
         if (resumePos >= file->filesize)
         {
@@ -655,7 +683,7 @@ void Core::pauseResumeFileRecv(int friendId, int fileNum)
         tox_file_send_control(tox, file->friendId, 1, file->fileNum, TOX_FILECONTROL_ACCEPT, nullptr, 0);
     }
     else
-        qWarning() << "Core::pauseResumeFileRecv: File is stopped";
+        qWarning() << "Core::pauseResumeFileRecv: File is stopped or broken";
 }
 
 void Core::cancelFileSend(int friendId, int fileNum)
diff --git a/core.h b/core.h
index b1425c59e..fbaca60da 100644
--- a/core.h
+++ b/core.h
@@ -150,6 +150,7 @@ signals:
     void fileTransferPaused(int FriendId, int FileNum, ToxFile::FileDirection direction);
     void fileTransferInfo(int FriendId, int FileNum, int64_t Filesize, int64_t BytesSent, ToxFile::FileDirection direction);
     void fileTransferRemotePausedUnpaused(ToxFile file, bool paused);
+    void fileTransferBrokenUnbroken(ToxFile file, bool broken);
 
     void fileSendFailed(int FriendId, const QString& fname);
 
diff --git a/corestructs.h b/corestructs.h
index a2bb6f31f..00da8a6a5 100644
--- a/corestructs.h
+++ b/corestructs.h
@@ -50,7 +50,8 @@ struct ToxFile
     {
         STOPPED,
         PAUSED,
-        TRANSMITTING
+        TRANSMITTING,
+        BROKEN
     };
 
     enum FileDirection : bool
diff --git a/filetransferinstance.h b/filetransferinstance.h
index fb54fd8f6..23f75f282 100644
--- a/filetransferinstance.h
+++ b/filetransferinstance.h
@@ -28,7 +28,7 @@ class FileTransferInstance : public QObject
 {
     Q_OBJECT
 public:
-    enum TransfState {tsPending, tsProcessing, tsPaused, tsFinished, tsCanceled};
+    enum TransfState {tsPending, tsProcessing, tsPaused, tsFinished, tsCanceled, tsBroken};
 
 public:
     explicit FileTransferInstance(ToxFile File);

From 76f7df313543730e736bfd2cc2ebacb22dbcacac Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Mon, 29 Sep 2014 23:36:42 +0700
Subject: [PATCH 117/205] cleanup

---
 core.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/core.cpp b/core.cpp
index 2662b4fd8..f1de8614f 100644
--- a/core.cpp
+++ b/core.cpp
@@ -296,7 +296,6 @@ void Core::onConnectionStatusChanged(Tox*/* tox*/, int friendId, uint8_t status,
         {
             if (f.friendId == friendId && f.status == ToxFile::TRANSMITTING)
             {
-                qDebug() << "friendId: set broken";
                 f.status = ToxFile::BROKEN;
                 emit static_cast<Core*>(core)->fileTransferBrokenUnbroken(f, true);
             }
@@ -305,7 +304,6 @@ void Core::onConnectionStatusChanged(Tox*/* tox*/, int friendId, uint8_t status,
         {
             if (f.friendId == friendId && f.status == ToxFile::TRANSMITTING)
             {
-                qDebug() << "friendId: set broken";
                 f.status = ToxFile::BROKEN;
                 emit static_cast<Core*>(core)->fileTransferBrokenUnbroken(f, true);
             }
@@ -315,7 +313,8 @@ void Core::onConnectionStatusChanged(Tox*/* tox*/, int friendId, uint8_t status,
         {
             if (f.friendId == friendId && f.status == ToxFile::BROKEN)
             {
-                tox_file_send_control(static_cast<Core*>(core)->tox, friendId, 1, f.fileNum, TOX_FILECONTROL_RESUME_BROKEN, (const uint8_t*)(&f.bytesSent), sizeof(uint64_t));
+                qDebug() << QString("Core::onConnectionStatusChanged: %1: resuming broken filetransfer from position: %2").arg(f.file->fileName()).arg(f.bytesSent);
+                tox_file_send_control(static_cast<Core*>(core)->tox, friendId, 1, f.fileNum, TOX_FILECONTROL_RESUME_BROKEN, reinterpret_cast<const uint8_t*>(&f.bytesSent), sizeof(uint64_t));
                 emit static_cast<Core*>(core)->fileTransferBrokenUnbroken(f, false);
             }
         }
@@ -356,7 +355,7 @@ void Core::onFileSendRequestCallback(Tox*, int32_t friendnumber, uint8_t filenum
     emit static_cast<Core*>(core)->fileReceiveRequested(fileRecvQueue.last());
 }
 void Core::onFileControlCallback(Tox* tox, int32_t friendnumber, uint8_t receive_send, uint8_t filenumber,
-                                      uint8_t control_type, const uint8_t* data, uint16_t, void *core)
+                                      uint8_t control_type, const uint8_t* data, uint16_t length, void *core)
 {
     ToxFile* file{nullptr};
     if (receive_send == 1)
@@ -451,8 +450,12 @@ void Core::onFileControlCallback(Tox* tox, int32_t friendnumber, uint8_t receive
     }
     else if (receive_send == 1 && control_type == TOX_FILECONTROL_RESUME_BROKEN)
     {
+        if (length != sizeof(uint64_t))
+            return;
+
         qDebug() << "Core::onFileControlCallback: TOX_FILECONTROL_RESUME_BROKEN";
-        uint64_t resumePos = *(const uint64_t*)(data);
+
+        uint64_t resumePos = *reinterpret_cast<const uint64_t*>(data);
 
         if (resumePos >= file->filesize)
         {

From 904de559e55c2c726ef89ac4366a4ba15d6b5787 Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Tue, 30 Sep 2014 00:22:19 +0700
Subject: [PATCH 118/205] FileTransferInstance responce on broken filetransfer
 state

---
 core.cpp                 |  8 ++++++++
 filetransferinstance.cpp | 19 +++++++++++++++++++
 filetransferinstance.h   |  1 +
 widget/form/chatform.cpp |  2 ++
 4 files changed, 30 insertions(+)

diff --git a/core.cpp b/core.cpp
index f1de8614f..ad0d943a3 100644
--- a/core.cpp
+++ b/core.cpp
@@ -442,6 +442,11 @@ void Core::onFileControlCallback(Tox* tox, int32_t friendnumber, uint8_t receive
     }
     else if (receive_send == 0 && control_type == TOX_FILECONTROL_ACCEPT)
     {
+        if (file->status == ToxFile::BROKEN)
+        {
+            emit static_cast<Core*>(core)->fileTransferBrokenUnbroken(*file, false);
+            file->status = ToxFile::TRANSMITTING;
+        }
         emit static_cast<Core*>(core)->fileTransferRemotePausedUnpaused(*file, false);
     }
     else if ((receive_send == 0 || receive_send == 1) && control_type == TOX_FILECONTROL_PAUSE)
@@ -464,6 +469,9 @@ void Core::onFileControlCallback(Tox* tox, int32_t friendnumber, uint8_t receive
             return;
         }
 
+        file->status = ToxFile::TRANSMITTING;
+        emit static_cast<Core*>(core)->fileTransferBrokenUnbroken(*file, false);
+
         file->bytesSent = resumePos;
         tox_file_send_control(tox, file->friendId, 0, file->fileNum, TOX_FILECONTROL_ACCEPT, nullptr, 0);
     }
diff --git a/filetransferinstance.cpp b/filetransferinstance.cpp
index 0799c9615..75ab36d3e 100644
--- a/filetransferinstance.cpp
+++ b/filetransferinstance.cpp
@@ -291,6 +291,12 @@ QString FileTransferInstance::getHtmlImage()
             rightBtnImg = QImage(":/ui/fileTransferInstance/pauseGreyFileButton.png");
 
         res = draw2ButtonsForm("silver", leftBtnImg, rightBtnImg);
+    } else if (state == tsBroken)
+    {
+        QImage leftBtnImg(":/ui/fileTransferInstance/stopFileButton.png");
+        QImage rightBtnImg(":/ui/fileTransferInstance/pauseGreyFileButton.png");
+
+        res = draw2ButtonsForm("red", leftBtnImg, rightBtnImg);
     } else if (state == tsCanceled)
     {
         res = drawButtonlessForm("red");
@@ -416,3 +422,16 @@ QImage FileTransferInstance::drawProgressBarImg(const double &part, int w, int h
 
     return progressBar;
 }
+
+void FileTransferInstance::onFileTransferBrokenUnbroken(ToxFile File, bool broken)
+{
+    if (File.fileNum != fileNum || File.friendId != friendId || File.direction != direction)
+        return;
+
+    if (broken)
+        state = tsBroken;
+    else
+        state = tsProcessing;
+
+    emit stateUpdated();
+}
diff --git a/filetransferinstance.h b/filetransferinstance.h
index 23f75f282..c627fb3ee 100644
--- a/filetransferinstance.h
+++ b/filetransferinstance.h
@@ -43,6 +43,7 @@ public slots:
     void onFileTransferAccepted(ToxFile File);
     void onFileTransferPaused(int FriendId, int FileNum, ToxFile::FileDirection Direction);
     void onFileTransferRemotePausedUnpaused(ToxFile File, bool paused);
+    void onFileTransferBrokenUnbroken(ToxFile File, bool broken);
     void pressFromHtml(QString);
 
 signals:
diff --git a/widget/form/chatform.cpp b/widget/form/chatform.cpp
index 9c57f0d88..ed307bc89 100644
--- a/widget/form/chatform.cpp
+++ b/widget/form/chatform.cpp
@@ -119,6 +119,7 @@ void ChatForm::startFileSend(ToxFile file)
     connect(Core::getInstance(), SIGNAL(fileTransferAccepted(ToxFile)), fileTrans, SLOT(onFileTransferAccepted(ToxFile)));
     connect(Core::getInstance(), SIGNAL(fileTransferPaused(int,int,ToxFile::FileDirection)), fileTrans, SLOT(onFileTransferPaused(int,int,ToxFile::FileDirection)));
     connect(Core::getInstance(), SIGNAL(fileTransferRemotePausedUnpaused(ToxFile,bool)), fileTrans, SLOT(onFileTransferRemotePausedUnpaused(ToxFile,bool)));
+    connect(Core::getInstance(), SIGNAL(fileTransferBrokenUnbroken(ToxFile, bool)), fileTrans, SLOT(onFileTransferBrokenUnbroken(ToxFile, bool)));
 
     QString name = Widget::getInstance()->getUsername();
     if (name == previousName)
@@ -142,6 +143,7 @@ void ChatForm::onFileRecvRequest(ToxFile file)
     connect(Core::getInstance(), SIGNAL(fileTransferAccepted(ToxFile)), fileTrans, SLOT(onFileTransferAccepted(ToxFile)));
     connect(Core::getInstance(), SIGNAL(fileTransferPaused(int,int,ToxFile::FileDirection)), fileTrans, SLOT(onFileTransferPaused(int,int,ToxFile::FileDirection)));
     connect(Core::getInstance(), SIGNAL(fileTransferRemotePausedUnpaused(ToxFile,bool)), fileTrans, SLOT(onFileTransferRemotePausedUnpaused(ToxFile,bool)));
+    connect(Core::getInstance(), SIGNAL(fileTransferBrokenUnbroken(ToxFile, bool)), fileTrans, SLOT(onFileTransferBrokenUnbroken(ToxFile, bool)));
 
     Widget* w = Widget::getInstance();
     if (!w->isFriendWidgetCurActiveWidget(f)|| w->getIsWindowMinimized() || !w->isActiveWindow())

From 67ffbfcb6ef6f3c52103f8fbdabbf35f21fb9d2c Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Mon, 29 Sep 2014 10:38:31 +0200
Subject: [PATCH 119/205] fix #334

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

diff --git a/widget/friendwidget.cpp b/widget/friendwidget.cpp
index 5bce871f7..ad16ac75c 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_dark.png"));
 }
 
 void FriendWidget::mousePressEvent(QMouseEvent *ev)

From 767f164a14c97163abfe7b8639e7acae3b691534 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Mon, 29 Sep 2014 13:28:59 -0500
Subject: [PATCH 120/205] fix file mvs

---
 core.cpp                                  |  6 +++---
 main.cpp                                  |  2 +-
 qtox.pro                                  | 20 ++++++++++----------
 widget/emoticonswidget.cpp                |  4 ++--
 widget/form/genericchatform.cpp           |  6 +++---
 widget/groupwidget.cpp                    |  2 +-
 widget/settingsdialog.cpp                 |  4 ++--
 widget/tool/chatactions/messageaction.cpp |  2 +-
 widget/widget.cpp                         |  4 ++--
 9 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/core.cpp b/core.cpp
index 403b3e8b9..2657f716e 100644
--- a/core.cpp
+++ b/core.cpp
@@ -15,9 +15,9 @@
 */
 
 #include "core.h"
-#include "cdata.h"
-#include "cstring.h"
-#include "settings.h"
+#include "misc/cdata.h"
+#include "misc/cstring.h"
+#include "misc/settings.h"
 #include "widget/widget.h"
 
 #include <tox/tox.h>
diff --git a/main.cpp b/main.cpp
index 1cdac827e..8e981baa5 100644
--- a/main.cpp
+++ b/main.cpp
@@ -15,7 +15,7 @@
 */
 
 #include "widget/widget.h"
-#include "settings.h"
+#include "misc/settings.h"
 #include <QApplication>
 #include <QFontDatabase>
 #include <QTranslator>
diff --git a/qtox.pro b/qtox.pro
index c5bf81c1b..f7bd7bf3a 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -91,17 +91,17 @@ HEADERS  += widget/form/addfriendform.h \
     friend.h \
     group.h \
     grouplist.h \
-    settings.h \
+    misc/settings.h \
     core.h \
     friendlist.h \
-    cdata.h \
-    cstring.h \
+    misc/cdata.h \
+    misc/cstring.h \
     widget/selfcamview.h \
     widget/camera.h \
     widget/netcamview.h \
-    smileypack.h \
+    misc/smileypack.h \
     widget/emoticonswidget.h \
-    style.h \
+    misc/style.h \
     widget/adjustingscrollarea.h \
     widget/croppinglabel.h \
     widget/friendlistwidget.h \
@@ -135,15 +135,15 @@ SOURCES += \
     group.cpp \
     grouplist.cpp \
     main.cpp \
-    settings.cpp \
-    cdata.cpp \
-    cstring.cpp \
+    misc/settings.cpp \
+    misc/cdata.cpp \
+    misc/cstring.cpp \
     widget/selfcamview.cpp \
     widget/camera.cpp \
     widget/netcamview.cpp \
-    smileypack.cpp \
+    misc/smileypack.cpp \
     widget/emoticonswidget.cpp \
-    style.cpp \
+    misc/style.cpp \
     widget/adjustingscrollarea.cpp \
     widget/croppinglabel.cpp \
     widget/friendlistwidget.cpp \
diff --git a/widget/emoticonswidget.cpp b/widget/emoticonswidget.cpp
index f471e8729..1e3d0ea4e 100644
--- a/widget/emoticonswidget.cpp
+++ b/widget/emoticonswidget.cpp
@@ -15,8 +15,8 @@
 */
 
 #include "emoticonswidget.h"
-#include "smileypack.h"
-#include "style.h"
+#include "misc/smileypack.h"
+#include "misc/style.h"
 
 #include <QPushButton>
 #include <QRadioButton>
diff --git a/widget/form/genericchatform.cpp b/widget/form/genericchatform.cpp
index c992ba563..26bd958ba 100644
--- a/widget/form/genericchatform.cpp
+++ b/widget/form/genericchatform.cpp
@@ -17,11 +17,11 @@
 #include "genericchatform.h"
 #include "ui_mainwindow.h"
 #include <QFileDialog>
-#include "smileypack.h"
+#include "misc/smileypack.h"
 #include "widget/emoticonswidget.h"
-#include "style.h"
+#include "misc/style.h"
 #include "widget/widget.h"
-#include "settings.h"
+#include "misc/settings.h"
 #include "widget/tool/chatactions/messageaction.h"
 #include "widget/tool/chatactions/systemmessageaction.h"
 #include "widget/chatareawidget.h"
diff --git a/widget/groupwidget.cpp b/widget/groupwidget.cpp
index 7bd1683c9..d803063ce 100644
--- a/widget/groupwidget.cpp
+++ b/widget/groupwidget.cpp
@@ -17,7 +17,7 @@
 #include "groupwidget.h"
 #include "grouplist.h"
 #include "group.h"
-#include "settings.h"
+#include "misc/settings.h"
 #include "widget/form/groupchatform.h"
 #include "widget/maskablepixmapwidget.h"
 #include <QPalette>
diff --git a/widget/settingsdialog.cpp b/widget/settingsdialog.cpp
index d81973286..947395350 100644
--- a/widget/settingsdialog.cpp
+++ b/widget/settingsdialog.cpp
@@ -1,10 +1,10 @@
 #include "settingsdialog.h"
-#include "settings.h"
+#include "misc/settings.h"
 #include "widget.h"
 #include "camera.h"
 #include "selfcamview.h"
 #include "core.h"
-#include "smileypack.h"
+#include "misc/smileypack.h"
 
 #include <QListWidget>
 #include <QListWidgetItem>
diff --git a/widget/tool/chatactions/messageaction.cpp b/widget/tool/chatactions/messageaction.cpp
index 84ce86194..9904be470 100644
--- a/widget/tool/chatactions/messageaction.cpp
+++ b/widget/tool/chatactions/messageaction.cpp
@@ -15,7 +15,7 @@
 */
 
 #include "messageaction.h"
-#include "smileypack.h"
+#include "misc/smileypack.h"
 
 MessageAction::MessageAction(const QString &author, const QString &message, const QString &date, const bool &me) :
     ChatAction(me, author, date),
diff --git a/widget/widget.cpp b/widget/widget.cpp
index 2b322eecd..a70fac605 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -17,7 +17,7 @@
 #include "widget.h"
 #include "ui_mainwindow.h"
 #include "core.h"
-#include "settings.h"
+#include "misc/settings.h"
 #include "friend.h"
 #include "friendlist.h"
 #include "widget/tool/friendrequestdialog.h"
@@ -26,7 +26,7 @@
 #include "group.h"
 #include "widget/groupwidget.h"
 #include "widget/form/groupchatform.h"
-#include "style.h"
+#include "misc/style.h"
 #include "selfcamview.h"
 #include "widget/friendlistwidget.h"
 #include "camera.h"

From 12c265aa9ba3cb6096efab2c73e1e20a3e934431 Mon Sep 17 00:00:00 2001
From: Olexandr Nesterenko <olexn@ukr.net>
Date: Mon, 29 Sep 2014 22:05:48 +0300
Subject: [PATCH 121/205] Add Ukrainian translation

---
 qtox.pro           |   3 +-
 res.qrc            |   1 +
 translations/uk.qm | Bin 0 -> 7608 bytes
 translations/uk.ts | 485 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 488 insertions(+), 1 deletion(-)
 create mode 100644 translations/uk.qm
 create mode 100644 translations/uk.ts

diff --git a/qtox.pro b/qtox.pro
index f7bd7bf3a..aa45650fd 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -35,7 +35,8 @@ TRANSLATIONS = translations/de.ts \
                translations/ru.ts \
                translations/pl.ts \
                translations/fi.ts \
-               translations/mannol.ts
+               translations/mannol.ts \
+               translations/uk.ts
 
 RESOURCES += res.qrc
 
diff --git a/res.qrc b/res.qrc
index d085ca820..c4719df01 100644
--- a/res.qrc
+++ b/res.qrc
@@ -142,6 +142,7 @@
         <file>translations/pl.qm</file>
         <file>translations/fi.qm</file>
         <file>translations/mannol.qm</file>
+        <file>translations/uk.qm</file>
         <file>img/avatar_mask.png</file>
         <file>img/group_2x.png</file>
     </qresource>
diff --git a/translations/uk.qm b/translations/uk.qm
new file mode 100644
index 0000000000000000000000000000000000000000..53c004e9b1071fd0a8f894794c4f253219be7de8
GIT binary patch
literal 7608
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

literal 0
HcmV?d00001

diff --git a/translations/uk.ts b/translations/uk.ts
new file mode 100644
index 000000000..70d143cdc
--- /dev/null
+++ b/translations/uk.ts
@@ -0,0 +1,485 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="uk_UA">
+<context>
+    <name>AVPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="132"/>
+        <source>Video Settings</source>
+        <translation>Параметри відео</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="136"/>
+        <location filename="../widget/settingsdialog.cpp" line="163"/>
+        <source>Show video preview</source>
+        <comment>On a button</comment>
+        <translation>Показати вікно попереднього перегляду</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="157"/>
+        <source>Hide video preview</source>
+        <comment>On a button</comment>
+        <translation>Приховати вікно попереднього перегляду</translation>
+    </message>
+</context>
+<context>
+    <name>AddFriendForm</name>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="34"/>
+        <source>Add Friends</source>
+        <translation>Додати друзів</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="37"/>
+        <source>Tox ID</source>
+        <comment>Tox ID of the person you&apos;re sending a friend request to</comment>
+        <translation>Tox ID</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="38"/>
+        <source>Message</source>
+        <comment>The message you send in friend requests</comment>
+        <translation>Повідомлення</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="39"/>
+        <source>Send friend request</source>
+        <translation>Надіслати запит на дружбу</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="40"/>
+        <source>Tox me maybe?</source>
+        <comment>Default message in friend requests if the field is left blank. Write something appropriate!</comment>
+        <translation>Може поспілкуємось?</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="96"/>
+        <source>Please fill in a valid Tox ID</source>
+        <comment>Tox ID of the friend you&apos;re sending a friend request to</comment>
+        <translation>Заповніть коректним Tox ID</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="99"/>
+        <source>You can&apos;t add yourself as a friend!</source>
+        <comment>When trying to add your own Tox ID as friend</comment>
+        <translation>Ви не можете додати самого себе до друзів!</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="116"/>
+        <source>This address does not exist</source>
+        <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
+        <translation>Цієї адреси не існує</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="120"/>
+        <source>Error while looking up DNS</source>
+        <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
+        <translation>Помилка під час перегляду DNS</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="126"/>
+        <source>Unexpected number of text records</source>
+        <comment>Error with the DNS</comment>
+        <translation>Неочікуване число текстових записів</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="132"/>
+        <source>Unexpected number of values in text record</source>
+        <comment>Error with the DNS</comment>
+        <translation>Неочікуване число значень в текстових записах</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="139"/>
+        <source>The DNS lookup does not contain any Tox ID</source>
+        <comment>Error with the DNS</comment>
+        <translation>Відповідь DNS не містить жодного Tox ID</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="145"/>
+        <location filename="../widget/form/addfriendform.cpp" line="151"/>
+        <source>The DNS lookup does not contain a valid Tox ID</source>
+        <comment>Error with the DNS</comment>
+        <translation>Відповідь DNS не містить жодного коректного Tox ID</translation>
+    </message>
+</context>
+<context>
+    <name>ChatForm</name>
+    <message>
+        <location filename="../widget/form/chatform.cpp" line="88"/>
+        <source>Send a file</source>
+        <translation>Надіслати файл</translation>
+    </message>
+</context>
+<context>
+    <name>FileTransferInstance</name>
+    <message>
+        <location filename="../filetransferinstance.cpp" line="205"/>
+        <source>Save a file</source>
+        <comment>Title of the file saving dialog</comment>
+        <translation>Зберегти файл</translation>
+    </message>
+    <message>
+        <location filename="../filetransferinstance.cpp" line="216"/>
+        <source>Location not writable</source>
+        <comment>Title of permissions popup</comment>
+        <translation>Немає прав на запис</translation>
+    </message>
+    <message>
+        <location filename="../filetransferinstance.cpp" line="216"/>
+        <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
+        <comment>text of permissions popup</comment>
+        <translation>Ви не маєте прав на запис за цим розташуванням. Оберіть інше місце призначення, або скасуйте передачу.</translation>
+    </message>
+</context>
+<context>
+    <name>FilesForm</name>
+    <message>
+        <location filename="../widget/form/filesform.cpp" line="30"/>
+        <source>Transfered Files</source>
+        <comment>&quot;Headline&quot; of the window</comment>
+        <translation>Передані файли</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/filesform.cpp" line="38"/>
+        <source>Downloads</source>
+        <translation>Завантажені</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/filesform.cpp" line="39"/>
+        <source>Uploads</source>
+        <translation>Вивантажені</translation>
+    </message>
+</context>
+<context>
+    <name>FriendRequestDialog</name>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="30"/>
+        <source>Friend request</source>
+        <comment>Title of the window to aceept/deny a friend request</comment>
+        <translation>Запит на дружбу</translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="32"/>
+        <source>Someone wants to make friends with you</source>
+        <translation>Дехто хоче долучитися до переліку друзів з вами</translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="33"/>
+        <source>User ID:</source>
+        <translation>ID користувача:</translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="37"/>
+        <source>Friend request message:</source>
+        <translation>Повідомлення запиту:</translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="44"/>
+        <source>Accept</source>
+        <comment>Accept a friend request</comment>
+        <translation>Прийняти</translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="45"/>
+        <source>Reject</source>
+        <comment>Reject a friend request</comment>
+        <translation>Відхилити</translation>
+    </message>
+</context>
+<context>
+    <name>FriendWidget</name>
+    <message>
+        <location filename="../widget/friendwidget.cpp" line="90"/>
+        <source>Copy friend ID</source>
+        <comment>Menu to copy the Tox ID of that friend</comment>
+        <translation>Копіювати дружній ID</translation>
+    </message>
+    <message>
+        <location filename="../widget/friendwidget.cpp" line="91"/>
+        <source>Invite in group</source>
+        <comment>Menu to invite a friend in a groupchat</comment>
+        <translation>Запросити до групи</translation>
+    </message>
+    <message>
+        <location filename="../widget/friendwidget.cpp" line="101"/>
+        <source>Remove friend</source>
+        <comment>Menu to remove the friend from our friendlist</comment>
+        <translation>Вилучити з друзів</translation>
+    </message>
+</context>
+<context>
+    <name>GeneralPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="31"/>
+        <source>General Settings</source>
+        <translation>Основні параметри</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="34"/>
+        <source>Enable IPv6 (recommended)</source>
+        <comment>Text on a checkbox to enable IPv6</comment>
+        <translation>Дозволити IPv6 (рекомендовано)</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="36"/>
+        <source>Use translations</source>
+        <comment>Text on a checkbox to enable translations</comment>
+        <translation>Використовувати мову системи</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <source>Make Tox portable</source>
+        <comment>Text on a checkbox to make qTox a portable application</comment>
+        <translation>Портативний запуск</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="39"/>
+        <source>Save settings to the working directory instead of the usual conf dir</source>
+        <comment>describes makeToxPortable checkbox</comment>
+        <translation>Зберігати налаштування в робочий теці</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <source>Theme</source>
+        <translation>Графічна тема</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="49"/>
+        <source>Smiley Pack</source>
+        <translation>Графічний пакунок емоційних картинок</translation>
+    </message>
+</context>
+<context>
+    <name>GenericChatForm</name>
+    <message>
+        <location filename="../widget/form/genericchatform.cpp" line="144"/>
+        <location filename="../widget/form/genericchatform.cpp" line="150"/>
+        <source>Save chat log</source>
+        <translation>Зберегти чат</translation>
+    </message>
+</context>
+<context>
+    <name>GroupChatForm</name>
+    <message>
+        <location filename="../widget/form/groupchatform.cpp" line="45"/>
+        <source>%1 users in chat</source>
+        <comment>Number of users in chat</comment>
+        <translation>Користувачів у чаті: %1</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/groupchatform.cpp" line="84"/>
+        <source>&lt;Unknown&gt;</source>
+        <translation>&lt;Невідомо&gt;</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/groupchatform.cpp" line="91"/>
+        <source>%1 users in chat</source>
+        <translation>Користувачів у чаті: %1</translation>
+    </message>
+</context>
+<context>
+    <name>GroupWidget</name>
+    <message>
+        <location filename="../widget/groupwidget.cpp" line="60"/>
+        <location filename="../widget/groupwidget.cpp" line="102"/>
+        <source>%1 users in chat</source>
+        <translation>Користувачів у чаті: %1</translation>
+    </message>
+    <message>
+        <location filename="../widget/groupwidget.cpp" line="62"/>
+        <location filename="../widget/groupwidget.cpp" line="104"/>
+        <source>0 users in chat</source>
+        <translation>Немає користувачів</translation>
+    </message>
+    <message>
+        <location filename="../widget/groupwidget.cpp" line="85"/>
+        <source>Quit group</source>
+        <comment>Menu to quit a groupchat</comment>
+        <translation>Вийти з групи</translation>
+    </message>
+</context>
+<context>
+    <name>IdentityPage</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="82"/>
+        <source>Public Information</source>
+        <translation>Публічна інформація</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <source>Name</source>
+        <comment>Username/nick</comment>
+        <translation>Ім&apos;я</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="85"/>
+        <source>Status</source>
+        <comment>Status message</comment>
+        <translation>Статус</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="95"/>
+        <source>Tox ID</source>
+        <translation>Tox ID</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="96"/>
+        <source>Your Tox ID</source>
+        <translation>Ваш Tox ID</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../mainwindow.ui" line="20"/>
+        <source>qTox</source>
+        <translation>qTox</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="1909"/>
+        <source>Your name</source>
+        <translation>Ваше ім&apos;я</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="1991"/>
+        <source>Your status</source>
+        <translation>Ваш статус</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2557"/>
+        <source>Add friends</source>
+        <translation>Додати друзів</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2583"/>
+        <source>Create a group chat</source>
+        <translation>Створити груповий чат</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2615"/>
+        <source>View completed file transfers</source>
+        <translation>Переглянути завершені передачі файлів</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="2647"/>
+        <source>Change your settings</source>
+        <translation>Змінити параметри</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="3229"/>
+        <source>Close</source>
+        <translation>Закрити</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="3232"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+</context>
+<context>
+    <name>SelfCamView</name>
+    <message>
+        <location filename="../widget/selfcamview.cpp" line="33"/>
+        <source>Tox video test</source>
+        <comment>Title of the window to test the video/webcam</comment>
+        <translation>Перевірка відео tox</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="197"/>
+        <source>qTox – Settings</source>
+        <translation>qTox - Параметри</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="224"/>
+        <source>General</source>
+        <translation>Основні</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="230"/>
+        <source>Identity</source>
+        <translation>Ідентифікація</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="236"/>
+        <source>Privacy</source>
+        <translation>Приватність</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="242"/>
+        <source>Audio/Video</source>
+        <translation>Аудіо/Відео</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="251"/>
+        <source>Ok</source>
+        <translation>Гаразд</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="252"/>
+        <source>Cancel</source>
+        <translation>Скасувати</translation>
+    </message>
+    <message>
+        <location filename="../widget/settingsdialog.cpp" line="253"/>
+        <source>Apply</source>
+        <translation>Застосувати</translation>
+    </message>
+</context>
+<context>
+    <name>Widget</name>
+    <message>
+        <location filename="../widget/widget.cpp" line="141"/>
+        <source>Online</source>
+        <comment>Button to set your status to &apos;Online&apos;</comment>
+        <translation>В мережі</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="143"/>
+        <source>Away</source>
+        <comment>Button to set your status to &apos;Away&apos;</comment>
+        <translation>Відійшов</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="145"/>
+        <source>Busy</source>
+        <comment>Button to set your status to &apos;Busy&apos;</comment>
+        <translation>Зайнятий</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="285"/>
+        <source>Choose a profile picture</source>
+        <translation>Оберіть зображення для профілю</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="292"/>
+        <location filename="../widget/widget.cpp" line="299"/>
+        <location filename="../widget/widget.cpp" line="320"/>
+        <source>Error</source>
+        <translation>Помилка</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="292"/>
+        <source>Unable to open this file</source>
+        <translation>Неможливо відкрити цей файл</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="299"/>
+        <source>Unable to read this image</source>
+        <translation>Неможливо прочитати це зображення</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="320"/>
+        <source>This image is too big</source>
+        <translation>Зображення завелике</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="664"/>
+        <source>&lt;Unknown&gt;</source>
+        <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
+        <translation>&lt;Невідомо&gt;</translation>
+    </message>
+</context>
+</TS>

From 39abf83b2e890c490f54b5a2cbee32c5bdf10a05 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Mon, 29 Sep 2014 16:36:23 -0500
Subject: [PATCH 122/205] remove avatar debug prints

---
 core.cpp | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/core.cpp b/core.cpp
index 154087d60..94f76c318 100644
--- a/core.cpp
+++ b/core.cpp
@@ -563,20 +563,13 @@ void Core::onAvatarInfoCallback(Tox*, int32_t friendnumber, uint8_t format,
     Core* core = static_cast<Core*>(_core);
 
     if (format == TOX_AVATAR_FORMAT_NONE)
-    {
-        qDebug() << "Core: Got null avatar info from" << friendnumber;
         emit core->friendAvatarRemoved(friendnumber);
-    }
     else
     {
         QByteArray oldHash = Settings::getInstance().getAvatarHash(core->getFriendAddress(friendnumber));
-        if (QByteArray((char*)hash, TOX_HASH_LENGTH) != oldHash) // comparison failed miserably if I didn't convert hash to QByteArray
-        {
-            qDebug() << "Core: got different avatar hash from" << friendnumber;
+        if (QByteArray((char*)hash, TOX_HASH_LENGTH) != oldHash) 
+        // comparison failed miserably if I didn't convert hash to QByteArray
             tox_request_avatar_data(core->tox, friendnumber);
-        } 
-        else
-            qDebug() << "Core: Got old avatar info from" << friendnumber;
     }
 }
 
@@ -585,11 +578,8 @@ void Core::onAvatarDataCallback(Tox*, int32_t friendnumber, uint8_t,
 {
     QPixmap pic;
     pic.loadFromData((uchar*)data, datalen);
-    if (pic.isNull())
-        qDebug() << "Core: Got null avatar from "<<friendnumber;
-    else
+    if (!pic.isNull())
     {
-        qDebug() << "Core: Got avatar data from "<<friendnumber<<", size:"<<pic.size();
         Settings::getInstance().saveAvatar(pic, static_cast<Core*>(core)->getFriendAddress(friendnumber));
         Settings::getInstance().saveAvatarHash(QByteArray((char*)hash, TOX_HASH_LENGTH), static_cast<Core*>(core)->getFriendAddress(friendnumber));
         emit static_cast<Core*>(core)->friendAvatarChanged(friendnumber, pic);

From d1919658e1a6f4eb5245862763e23810fe6374a7 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Mon, 29 Sep 2014 21:24:31 -0500
Subject: [PATCH 123/205] tweak #340 dht connecting, remove dropped avatars
 from cache

---
 core.cpp | 43 +++++++++++++++++++++++++++++++++++++------
 core.h   |  1 +
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/core.cpp b/core.cpp
index 94f76c318..4744fda90 100644
--- a/core.cpp
+++ b/core.cpp
@@ -220,12 +220,21 @@ void Core::start()
     process(); // starts its own timer
 }
 
+/* Using the now commented out statements in checkConnection(), I watched how
+ * many ticks disconnects-after-initial-connect lasted. Out of roughly 15 trials,
+ * 5 disconnected; 4 were DCd for less than 20 ticks, while the 5th was ~50 ticks.
+ * So I set the tolerance here at 25, and initial DCs should be very rare now.
+ * This should be able to go to 50 or 100 without affecting legitimate disconnects'
+ * downtime, but lets be conservative for now.
+ */
+#define CORE_DISCONNECT_TOLERANCE 25
+
 void Core::process()
 {
     if (!tox)
         return;
 
-    static int retries = 0;
+    static int tolerance = CORE_DISCONNECT_TOLERANCE;
     tox_do(tox);
 
 #ifdef DEBUG
@@ -234,10 +243,10 @@ void Core::process()
 #endif
 
     if (checkConnection())
-        retries = 0;
-    else if (retries < 2)
+        tolerance = CORE_DISCONNECT_TOLERANCE;
+    else if (--tolerance)
     {
-        retries++;
+        tolerance = CORE_DISCONNECT_TOLERANCE;
         bootstrapDht();
     }
 
@@ -247,17 +256,21 @@ void Core::process()
 bool Core::checkConnection()
 {
     static bool isConnected = false;
+    //static int count = 0;
     bool toxConnected = tox_isconnected(tox);
 
     if (toxConnected && !isConnected) {
         qDebug() << "Core: Connected to DHT";
         emit connected();
         isConnected = true;
+        //if (count) qDebug() << "Core: disconnect count:" << count;
+        //count = 0;
     } else if (!toxConnected && isConnected) {
         qDebug() << "Core: Disconnected to DHT";
         emit disconnected();
         isConnected = false;
-    }
+        //count++;
+    } //else if (!toxConnected) count++;
     return isConnected;
 }
 
@@ -272,7 +285,7 @@ void Core::bootstrapDht()
     qDebug() << "Core: Bootstraping to the DHT ...";
 
     int i=0;
-    while (i < 2)
+    while (i < 3)
     {
         const Settings::DhtServer& dhtServer = dhtServerList[j % listSize];
         if (tox_bootstrap_from_address(tox, dhtServer.address.toLatin1().data(),
@@ -563,13 +576,23 @@ void Core::onAvatarInfoCallback(Tox*, int32_t friendnumber, uint8_t format,
     Core* core = static_cast<Core*>(_core);
 
     if (format == TOX_AVATAR_FORMAT_NONE)
+    {
+        qDebug() << "Core: Got null avatar info from" << core->getFriendUsername(friendnumber);
         emit core->friendAvatarRemoved(friendnumber);
+        QFile::remove(QDir(Settings::getInstance().getSettingsDirPath()).filePath("avatars/"+core->getFriendAddress(friendnumber).left(64)+".png"));
+        QFile::remove(QDir(Settings::getInstance().getSettingsDirPath()).filePath("avatars/"+core->getFriendAddress(friendnumber).left(64)+".hash"));
+    }
     else
     {
         QByteArray oldHash = Settings::getInstance().getAvatarHash(core->getFriendAddress(friendnumber));
         if (QByteArray((char*)hash, TOX_HASH_LENGTH) != oldHash) 
         // comparison failed miserably if I didn't convert hash to QByteArray
+        {
+            qDebug() << "Core: Got new avatar info from" << core->getFriendUsername(friendnumber);
             tox_request_avatar_data(core->tox, friendnumber);
+        }
+        else
+            qDebug() << "Core: Got same avatar info from" << core->getFriendUsername(friendnumber);
     }
 }
 
@@ -580,6 +603,7 @@ void Core::onAvatarDataCallback(Tox*, int32_t friendnumber, uint8_t,
     pic.loadFromData((uchar*)data, datalen);
     if (!pic.isNull())
     {
+        qDebug() << "Core: Got avatar data from" << static_cast<Core*>(core)->getFriendUsername(friendnumber);
         Settings::getInstance().saveAvatar(pic, static_cast<Core*>(core)->getFriendAddress(friendnumber));
         Settings::getInstance().saveAvatarHash(QByteArray((char*)hash, TOX_HASH_LENGTH), static_cast<Core*>(core)->getFriendAddress(friendnumber));
         emit static_cast<Core*>(core)->friendAvatarChanged(friendnumber, pic);
@@ -1283,6 +1307,13 @@ QString Core::getFriendAddress(int friendNumber) const
     return id;
 }
 
+QString Core::getFriendUsername(int friendnumber) const
+{
+    uint8_t name[TOX_MAX_NAME_LENGTH];
+    tox_get_name(tox, friendnumber, name);
+    return CString::toString(name, tox_get_name_size(tox, friendnumber));
+}
+
 QList<CString> Core::splitMessage(const QString &message)
 {
     QList<CString> splittedMsgs;
diff --git a/core.h b/core.h
index 4b5aa7a86..2419bb6c3 100644
--- a/core.h
+++ b/core.h
@@ -42,6 +42,7 @@ public:
     QString getGroupPeerName(int groupId, int peerId) const;
     QList<QString> getGroupPeerNames(int groupId) const;
     QString getFriendAddress(int friendNumber) const;
+    QString getFriendUsername(int friendNumber) const;
     int joinGroupchat(int32_t friendnumber, const uint8_t* friend_group_public_key,uint16_t length) const;
     void quitGroupChat(int groupId) const;
     void dispatchVideoFrame(vpx_image img) const;

From 4719ea28a8ce04278981473a9d3d775a4a464a58 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Mon, 29 Sep 2014 21:29:39 -0500
Subject: [PATCH 124/205] oops, don't reset tolerance upon bootstrap

---
 core.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/core.cpp b/core.cpp
index 4744fda90..d73b17683 100644
--- a/core.cpp
+++ b/core.cpp
@@ -244,9 +244,8 @@ void Core::process()
 
     if (checkConnection())
         tolerance = CORE_DISCONNECT_TOLERANCE;
-    else if (--tolerance)
+    else if (!(--tolerance))
     {
-        tolerance = CORE_DISCONNECT_TOLERANCE;
         bootstrapDht();
     }
 
@@ -285,7 +284,7 @@ void Core::bootstrapDht()
     qDebug() << "Core: Bootstraping to the DHT ...";
 
     int i=0;
-    while (i < 3)
+    while (i < 4)
     {
         const Settings::DhtServer& dhtServer = dhtServerList[j % listSize];
         if (tox_bootstrap_from_address(tox, dhtServer.address.toLatin1().data(),

From da8f83943dd81106ab72e25f731acf44cba29016 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sun, 28 Sep 2014 10:56:02 +0200
Subject: [PATCH 125/205] Compat with toxcore

---
 core.cpp          | 8 ++++----
 core.h            | 6 +++---
 widget/widget.cpp | 4 ++--
 widget/widget.h   | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core.cpp b/core.cpp
index 81d022588..da1d24b70 100644
--- a/core.cpp
+++ b/core.cpp
@@ -279,10 +279,10 @@ void Core::onAction(Tox*/* tox*/, int friendId, const uint8_t *cMessage, uint16_
     emit static_cast<Core*>(core)->actionReceived(friendId, CString::toString(cMessage, cMessageSize));
 }
 
-void Core::onGroupInvite(Tox*, int friendnumber, const uint8_t *group_public_key, void *core)
+void Core::onGroupInvite(Tox*, int friendnumber, const uint8_t *group_public_key, uint16_t length,void *core)
 {
     qDebug() << QString("Core: Group invite by %1").arg(friendnumber);
-    emit static_cast<Core*>(core)->groupInviteReceived(friendnumber, group_public_key);
+    emit static_cast<Core*>(core)->groupInviteReceived(friendnumber, group_public_key,length);
 }
 
 void Core::onGroupMessage(Tox*, int groupnumber, int friendgroupnumber, const uint8_t * message, uint16_t length, void *core)
@@ -1005,10 +1005,10 @@ QList<QString> Core::getGroupPeerNames(int groupId) const
     return names;
 }
 
-int Core::joinGroupchat(int32_t friendnumber, const uint8_t* friend_group_public_key) const
+int Core::joinGroupchat(int32_t friendnumber, const uint8_t* friend_group_public_key,uint16_t length) const
 {
     qDebug() << QString("Trying to join groupchat invite by friend %1").arg(friendnumber);
-    return tox_join_groupchat(tox, friendnumber, friend_group_public_key);
+    return tox_join_groupchat(tox, friendnumber, friend_group_public_key,length);
 }
 
 void Core::quitGroupChat(int groupId) const
diff --git a/core.h b/core.h
index 13d051017..129b0cf8f 100644
--- a/core.h
+++ b/core.h
@@ -41,7 +41,7 @@ public:
     QString getGroupPeerName(int groupId, int peerId) const;
     QList<QString> getGroupPeerNames(int groupId) const;
     QString getFriendAddress(int friendNumber) const;
-    int joinGroupchat(int32_t friendnumber, const uint8_t* friend_group_public_key) const;
+    int joinGroupchat(int32_t friendnumber, const uint8_t* friend_group_public_key,uint16_t length) const;
     void quitGroupChat(int groupId) const;
     void dispatchVideoFrame(vpx_image img) const;
 
@@ -115,7 +115,7 @@ signals:
     void friendLastSeenChanged(int friendId, const QDateTime& dateTime);
 
     void emptyGroupCreated(int groupnumber);
-    void groupInviteReceived(int friendnumber, const uint8_t *group_public_key);
+    void groupInviteReceived(int friendnumber, const uint8_t *group_public_key,uint16_t length);
     void groupMessageReceived(int groupnumber, int friendgroupnumber, const QString& message);
     void groupNamelistChanged(int groupnumber, int peernumber, uint8_t change);
 
@@ -170,7 +170,7 @@ private:
     static void onUserStatusChanged(Tox* tox, int friendId, uint8_t userstatus, void* core);
     static void onConnectionStatusChanged(Tox* tox, int friendId, uint8_t status, void* core);
     static void onAction(Tox* tox, int friendId, const uint8_t* cMessage, uint16_t cMessageSize, void* core);
-    static void onGroupInvite(Tox *tox, int friendnumber, const uint8_t *group_public_key, void *userdata);
+    static void onGroupInvite(Tox *tox, int friendnumber, const uint8_t *group_public_key, uint16_t length,void *userdata);
     static void onGroupMessage(Tox *tox, int groupnumber, int friendgroupnumber, const uint8_t * message, uint16_t length, void *userdata);
     static void onGroupNamelistChange(Tox *tox, int groupnumber, int peernumber, uint8_t change, void *userdata);
     static void onFileSendRequestCallback(Tox *tox, int32_t friendnumber, uint8_t filenumber, uint64_t filesize,
diff --git a/widget/widget.cpp b/widget/widget.cpp
index 62e362f00..a0d5049b3 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -558,9 +558,9 @@ void Widget::copyFriendIdToClipboard(int friendId)
     }
 }
 
-void Widget::onGroupInviteReceived(int32_t friendId, const uint8_t* publicKey)
+void Widget::onGroupInviteReceived(int32_t friendId, const uint8_t* publicKey,uint16_t length)
 {
-    int groupId = core->joinGroupchat(friendId, publicKey);
+    int groupId = core->joinGroupchat(friendId, publicKey,length);
     if (groupId == -1)
     {
         qWarning() << "Widget::onGroupInviteReceived: Unable to accept invitation";
diff --git a/widget/widget.h b/widget/widget.h
index 9512f00e9..e94435fbb 100644
--- a/widget/widget.h
+++ b/widget/widget.h
@@ -95,7 +95,7 @@ private slots:
     void onFriendMessageReceived(int friendId, const QString& message);
     void onFriendRequestReceived(const QString& userId, const QString& message);
     void onEmptyGroupCreated(int groupId);
-    void onGroupInviteReceived(int32_t friendId, const uint8_t *publicKey);
+    void onGroupInviteReceived(int32_t friendId, const uint8_t *publicKey,uint16_t length);
     void onGroupMessageReceived(int groupnumber, int friendgroupnumber, const QString& message);
     void onGroupNamelistChanged(int groupnumber, int peernumber, uint8_t change);
     void removeFriend(int friendId);

From 8212a3dad0bd28008d46b4df0aa7326218dc67d0 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Tue, 30 Sep 2014 04:44:27 -0500
Subject: [PATCH 126/205] Added all current settings except cam test, which
 segfaults on init...

---
 widget/form/settings/avform.cpp        | 39 +++++++++++++-
 widget/form/settings/avform.h          | 16 +++++-
 widget/form/settings/generalform.cpp   | 66 ++++++++++++++++-------
 widget/form/settings/generalform.h     | 18 ++++---
 widget/form/settings/genericsettings.h | 17 +++---
 widget/form/settings/identityform.cpp  | 75 ++++++++++++++++++++++++--
 widget/form/settings/identityform.h    | 33 +++++++++++-
 widget/form/settings/privacyform.cpp   |  1 -
 widget/form/settingswidget.cpp         |  5 +-
 widget/form/settingswidget.h           | 16 +++---
 widget/widget.cpp                      | 12 +++--
 widget/widget.h                        |  3 +-
 12 files changed, 243 insertions(+), 58 deletions(-)

diff --git a/widget/form/settings/avform.cpp b/widget/form/settings/avform.cpp
index e0b0773f9..3a4c86f0a 100644
--- a/widget/form/settings/avform.cpp
+++ b/widget/form/settings/avform.cpp
@@ -15,14 +15,49 @@
 */
 
 #include "avform.h"
+#include "widget/camera.h"
 
-AVForm::AVForm()
+AVForm::AVForm(Camera* cam)
 {
-    prep();
     icon.setPixmap(QPixmap(":/img/settings/av.png").scaledToHeight(headLayout.sizeHint().height(), Qt::SmoothTransformation));
     label.setText(tr("Audio/Video settings"));
+    
+    QGroupBox *group = new QGroupBox(tr("Video Settings"));
+
+    camView = new SelfCamView(cam);
+    camView->hide(); // hide by default
+    testVideo = new QPushButton(tr("Show video preview","On a button"));
+    connect(testVideo, &QPushButton::clicked, this, &AVForm::onTestVideoPressed);
+
+    videoLayout = new QVBoxLayout();
+    videoLayout->addWidget(testVideo);
+    videoLayout->addWidget(camView);
+    //videoGroup->setLayout(videoLayout); // strangely enough, this causes a segfault....
+
+    layout.addWidget(group);
+    layout.addStretch(1);
 }
 
 AVForm::~AVForm()
 {
 }
+
+void AVForm::showTestVideo()
+{
+    testVideo->setText(tr("Hide video preview","On a button"));
+    camView->show();
+}
+
+void AVForm::closeTestVideo()
+{
+    testVideo->setText(tr("Show video preview","On a button"));
+    camView->close();
+}
+
+void AVForm::onTestVideoPressed()
+{
+    if (camView->isVisible())
+        closeTestVideo();
+    else
+        showTestVideo();
+}
diff --git a/widget/form/settings/avform.h b/widget/form/settings/avform.h
index e214e133e..be7c97dae 100644
--- a/widget/form/settings/avform.h
+++ b/widget/form/settings/avform.h
@@ -18,16 +18,30 @@
 #define AVFORM_H
 
 #include "genericsettings.h"
+#include "widget/selfcamview.h"
+#include <QGroupBox>
+#include <QVBoxLayout>
+#include <QPushButton>
+class Camera;
 
 class AVForm : public GenericForm
 {
     Q_OBJECT
 public:
-    AVForm();
+    AVForm(Camera* cam);
     ~AVForm();
 
+private slots:
+    void onTestVideoPressed();
 private:
+    QGroupBox* videoGroup;
+    QVBoxLayout* videoLayout;
+    QPushButton* testVideo;
+    SelfCamView* camView;
     
+    void showTestVideo();
+    void closeTestVideo();
+       
 };
 
 #endif
diff --git a/widget/form/settings/generalform.cpp b/widget/form/settings/generalform.cpp
index 7a6734383..1c7ed8bff 100644
--- a/widget/form/settings/generalform.cpp
+++ b/widget/form/settings/generalform.cpp
@@ -16,33 +16,63 @@
 
 #include "generalform.h"
 #include "widget/form/settingswidget.h"
+#include "widget/widget.h"
+#include "misc/settings.h"
+#include "misc/smileypack.h"
 
 GeneralForm::GeneralForm()
 {
-    prep();
     icon.setPixmap(QPixmap(":/img/settings/general.png").scaledToHeight(headLayout.sizeHint().height(), Qt::SmoothTransformation));
-    label.setText(tr("General settings"));
-    group = new QGroupBox(tr("General Settings"));
-    enableIPv6 = new QCheckBox();
-    enableIPv6->setText(tr("Enable IPv6 (recommended)","Text on a checkbox to enable IPv6"));
-    useTranslations = new QCheckBox();
-    useTranslations->setText(tr("Use translations","Text on a checkbox to enable translations"));
-    makeToxPortable = new QCheckBox();
-    makeToxPortable->setText(tr("Make Tox portable","Text on a checkbox to make qTox a portable application"));
-    makeToxPortable->setToolTip(tr("Save settings to the working directory instead of the usual conf dir","describes makeToxPortable checkbox"));
-
-    QVBoxLayout *vLayout = new QVBoxLayout();
-    vLayout->addWidget(enableIPv6);
-    vLayout->addWidget(useTranslations);
-    vLayout->addWidget(makeToxPortable);
-    group->setLayout(vLayout);
-    
     label.setText(tr("General Settings"));
     
+    enableIPv6.setText(tr("Enable IPv6 (recommended)","Text on a checkbox to enable IPv6"));
+    enableIPv6.setChecked(Settings::getInstance().getEnableIPv6());
+    useTranslations.setText(tr("Use translations","Text on a checkbox to enable translations"));
+    useTranslations.setChecked(Settings::getInstance().getUseTranslations());
+    makeToxPortable.setText(tr("Make Tox portable","Text on a checkbox to make qTox a portable application"));
+    makeToxPortable.setChecked(Settings::getInstance().getMakeToxPortable());
+    makeToxPortable.setToolTip(tr("Save settings to the working directory instead of the usual conf dir","describes makeToxPortable checkbox"));
+
+    smileyPackLabel.setText(tr("Smiley Pack", "Text on smiley pack label"));
+    for (auto entry : SmileyPack::listSmileyPacks())
+        smileyPackBrowser.addItem(entry.first, entry.second);
+    smileyPackBrowser.setCurrentIndex(smileyPackBrowser.findData(Settings::getInstance().getSmileyPack()));
+    
     headLayout.addWidget(&label);
-    layout.addWidget(group);
+    layout.addWidget(&enableIPv6);
+    layout.addWidget(&useTranslations);
+    layout.addWidget(&makeToxPortable);
+    layout.addWidget(&smileyPackLabel);
+    layout.addWidget(&smileyPackBrowser);
+    layout.addStretch();
+    
+    connect(&enableIPv6, SIGNAL(stateChanged(int)), this, SLOT(onEnableIPv6Updated()));
+    connect(&useTranslations, SIGNAL(stateChanged(int)), this, SLOT(onUseTranslationUpdated()));
+    connect(&makeToxPortable, SIGNAL(stateChanged(int)), this, SLOT(onMakeToxPortableUpdated()));
+    connect(&smileyPackBrowser, SIGNAL(currentIndexChanged(int)), this, SLOT(onSmileyBrowserIndexChanged(int)));
 }
 
 GeneralForm::~GeneralForm()
 {
 }
+
+void GeneralForm::onEnableIPv6Updated()
+{
+    Settings::getInstance().setEnableIPv6(enableIPv6.isChecked());
+}
+
+void GeneralForm::onUseTranslationUpdated()
+{
+    Settings::getInstance().setUseTranslations(useTranslations.isChecked());
+}
+
+void GeneralForm::onMakeToxPortableUpdated()
+{
+    Settings::getInstance().setMakeToxPortable(makeToxPortable.isChecked());
+}
+
+void GeneralForm::onSmileyBrowserIndexChanged(int index)
+{
+    QString filename = smileyPackBrowser.itemData(index).toString();
+    Settings::getInstance().setSmileyPack(filename);
+}
diff --git a/widget/form/settings/generalform.h b/widget/form/settings/generalform.h
index c484a436d..b33b7ffcb 100644
--- a/widget/form/settings/generalform.h
+++ b/widget/form/settings/generalform.h
@@ -18,10 +18,8 @@
 #define GENERALFORM_H
 
 #include "genericsettings.h"
-#include <QGroupBox>
+#include <QComboBox>
 #include <QCheckBox>
-#include <QLabel>
-
 
 class GeneralForm : public GenericForm
 {
@@ -30,12 +28,16 @@ public:
     GeneralForm();
     ~GeneralForm();
 
+private slots:
+    void onEnableIPv6Updated();
+    void onUseTranslationUpdated();
+    void onMakeToxPortableUpdated();
+    void onSmileyBrowserIndexChanged(int index);
+
 private:
-    QGroupBox *group;
-    QCheckBox* enableIPv6;
-    QCheckBox* useTranslations;
-    QCheckBox* makeToxPortable;
-    QLabel label;
+    QCheckBox enableIPv6, useTranslations, makeToxPortable;
+    QLabel label, smileyPackLabel;
+    QComboBox smileyPackBrowser;
 };
 
 #endif
diff --git a/widget/form/settings/genericsettings.h b/widget/form/settings/genericsettings.h
index 760d39cb0..8d6d4e9bb 100644
--- a/widget/form/settings/genericsettings.h
+++ b/widget/form/settings/genericsettings.h
@@ -26,6 +26,15 @@ class GenericForm : public QObject
 {
     Q_OBJECT
 public:
+    GenericForm()
+    {
+        head.setLayout(&headLayout);
+        headLayout.addWidget(&icon);
+        headLayout.addWidget(&label);
+        body.setLayout(&layout);
+    }
+    ~GenericForm() {};
+
     virtual void show(SettingsWidget& sw)
     {
         sw.body->layout()->addWidget(&body);
@@ -39,14 +48,6 @@ protected:
     QHBoxLayout headLayout;
     QLabel label, icon;
     QWidget head, body;
-    void prep() // call in subclass constructor
-    {
-        head.setLayout(&headLayout);
-        headLayout.addWidget(&icon);
-        headLayout.addWidget(&label);
-        body.setLayout(&layout);
-    }
-
 };
 
 #endif
diff --git a/widget/form/settings/identityform.cpp b/widget/form/settings/identityform.cpp
index 696b2141a..57a69a759 100644
--- a/widget/form/settings/identityform.cpp
+++ b/widget/form/settings/identityform.cpp
@@ -16,25 +16,90 @@
 
 #include "identityform.h"
 #include "widget/form/settingswidget.h"
+#include "widget/croppinglabel.h"
+#include "core.h"
 #include <QLabel>
 #include <QLineEdit>
+#include <QApplication>
+#include <QClipboard>
 
 IdentityForm::IdentityForm()
 {
-    prep();
     icon.setPixmap(QPixmap(":/img/settings/identity.png").scaledToHeight(headLayout.sizeHint().height(), Qt::SmoothTransformation));
     label.setText(tr("Your identity"));
+
+    // public
+    publicGroup = new QGroupBox(tr("Public Information"));
+    userNameLabel = new QLabel(tr("Name","Username/nick"));
+    userName = new QLineEdit();
+    
+    statusMessageLabel = new QLabel(tr("Status","Status message"));
+    statusMessage = new QLineEdit();
+    
+    vLayout = new QVBoxLayout();
+    vLayout->addWidget(userNameLabel);
+    vLayout->addWidget(userName);
+    vLayout->addWidget(statusMessageLabel);
+    vLayout->addWidget(statusMessage);
+    publicGroup->setLayout(vLayout);
+    
+    // tox
     toxGroup = new QGroupBox(tr("Tox ID"));
-    QLabel* toxIdLabel = new QLabel(tr("Your Tox ID"));
-    QLineEdit* toxID = new QLineEdit();
-    toxID->setReadOnly(true);
+    toxIdLabel = new CroppingLabel();
+    toxIdLabel->setText(tr("Your Tox ID (click to copy)"));
+    toxId = new ClickableTE();
+    QFont small;
+    small.setPixelSize(13);
+    small.setKerning(false);
+    toxId->setTextInteractionFlags(Qt::TextSelectableByMouse);
+    toxId->setReadOnly(true);
+    toxId->setFrameStyle(QFrame::NoFrame);
+    toxId->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    toxId->setFixedHeight(toxId->document()->size().height()*2);
+    toxId->setFont(small);
+    
     QVBoxLayout* toxLayout = new QVBoxLayout();
     toxLayout->addWidget(toxIdLabel);
-    toxLayout->addWidget(toxID);
+    toxLayout->addWidget(toxId);
     toxGroup->setLayout(toxLayout);
+    
+    layout.setSpacing(30);
+    layout.addWidget(publicGroup);
     layout.addWidget(toxGroup);
+    layout.addStretch(1);
+    
+    connect(toxIdLabel, SIGNAL(clicked()), this, SLOT(copyIdClicked()));
+    connect(toxId, SIGNAL(clicked()), this, SLOT(copyIdClicked()));
+    connect(userName, SIGNAL(editingFinished()), this, SLOT(onUserNameEdited()));
+    connect(statusMessage, SIGNAL(editingFinished()), this, SLOT(onStatusMessageEdited()));
 }
 
 IdentityForm::~IdentityForm()
 {
 }
+
+void IdentityForm::copyIdClicked()
+{
+    toxId->selectAll();
+    QString txt = toxId->toPlainText();
+    txt.replace('\n',"");
+    QApplication::clipboard()->setText(txt);
+}
+
+void IdentityForm::onUserNameEdited()
+{
+    emit userNameChanged(userName->text());
+}
+
+void IdentityForm::onStatusMessageEdited()
+{
+    emit statusMessageChanged(statusMessage->text());
+}
+
+void IdentityForm::show(SettingsWidget& sw)
+{
+    userName->setText(Core::getInstance()->getUsername());
+    statusMessage->setText(Core::getInstance()->getStatusMessage());
+    toxId->setText(Core::getInstance()->getSelfId().toString());
+    GenericForm::show(sw);
+}
diff --git a/widget/form/settings/identityform.h b/widget/form/settings/identityform.h
index dc616d75e..8e80e0aaf 100644
--- a/widget/form/settings/identityform.h
+++ b/widget/form/settings/identityform.h
@@ -19,6 +19,20 @@
 
 #include "genericsettings.h"
 #include <QGroupBox>
+#include <QTextEdit>
+#include <QLineEdit>
+class CroppingLabel;
+
+class ClickableTE : public QTextEdit
+{
+    Q_OBJECT
+public:
+    
+signals:
+    void clicked();
+protected:
+    void mouseReleaseEvent(QMouseEvent*) {emit clicked();}    
+};
 
 class IdentityForm : public GenericForm
 {
@@ -27,8 +41,25 @@ public:
     IdentityForm();
     ~IdentityForm();
 
+    QLineEdit* userName, * statusMessage;
+
+    void show(SettingsWidget& sw);
+
+signals:
+    void userNameChanged(QString);
+    void statusMessageChanged(QString);
+
+private slots:
+    void copyIdClicked();
+    void onUserNameEdited();
+    void onStatusMessageEdited();
+
 private:
-    QGroupBox* toxGroup;
+    QGroupBox* toxGroup, * publicGroup;
+    ClickableTE* toxId;
+    QLabel* userNameLabel, * statusMessageLabel;
+    CroppingLabel* toxIdLabel;
+    QVBoxLayout* vLayout, * toxLayout;
 };
 
 #endif
diff --git a/widget/form/settings/privacyform.cpp b/widget/form/settings/privacyform.cpp
index e1f737975..683bdff4b 100644
--- a/widget/form/settings/privacyform.cpp
+++ b/widget/form/settings/privacyform.cpp
@@ -19,7 +19,6 @@
 
 PrivacyForm::PrivacyForm()
 {
-    prep();
     icon.setPixmap(QPixmap(":/img/settings/privacy.png").scaledToHeight(headLayout.sizeHint().height(), Qt::SmoothTransformation));
     label.setText(tr("Privacy settings"));
 }
diff --git a/widget/form/settingswidget.cpp b/widget/form/settingswidget.cpp
index 9b5dc7856..dddce56e0 100644
--- a/widget/form/settingswidget.cpp
+++ b/widget/form/settingswidget.cpp
@@ -17,18 +17,19 @@
 #include "settingswidget.h"
 #include "widget/widget.h"
 #include "ui_mainwindow.h"
+#include "widget/camera.h"
 #include "widget/form/settings/generalform.h"
 #include "widget/form/settings/identityform.h"
 #include "widget/form/settings/privacyform.h"
 #include "widget/form/settings/avform.h"
 
-SettingsWidget::SettingsWidget()
+SettingsWidget::SettingsWidget(Camera* cam)
     : QWidget()
 {
     generalForm  = new GeneralForm();
     identityForm = new IdentityForm();
     privacyForm  = new PrivacyForm();
-    avForm       = new AVForm();
+    avForm       = new AVForm(cam);
 
     main = new QWidget();
     body = new QWidget();
diff --git a/widget/form/settingswidget.h b/widget/form/settingswidget.h
index 6ee45f90d..b24f7ffb6 100644
--- a/widget/form/settingswidget.h
+++ b/widget/form/settingswidget.h
@@ -19,6 +19,7 @@
 
 #include <QHBoxLayout>
 #include <QPushButton>
+class Camera;
 class GenericForm;
 class GeneralForm;
 class IdentityForm;
@@ -30,12 +31,17 @@ class SettingsWidget : public QWidget
 {
     Q_OBJECT
 public:
-    SettingsWidget();
+    SettingsWidget(Camera* cam);
     ~SettingsWidget();
 
     void show(Ui::MainWindow &ui);
     
     QWidget *head, *body; // keep the others private
+    GenericForm* active;
+    GeneralForm* generalForm;
+    IdentityForm* identityForm;
+    PrivacyForm* privacyForm;
+    AVForm* avForm;
 
 public slots:
     //void setFriendAddress(const QString& friendAddress);
@@ -51,14 +57,8 @@ private:
     // main consists of body+foot for Ui::MainWindow
     QVBoxLayout *mainLayout;
     
-    GenericForm* active;
-    GeneralForm* generalForm;
-    IdentityForm* identityForm;
-    PrivacyForm* privacyForm;
-    AVForm* avForm;
     void hideSettingsForms();
-    
-    
+
     // the code pertaining to the icons is mostly copied from ui_mainwindow.h
     QHBoxLayout *iconsLayout;
     QPushButton *generalButton;
diff --git a/widget/widget.cpp b/widget/widget.cpp
index a0d5049b3..517fc70ad 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -156,6 +156,8 @@ Widget::Widget(QWidget *parent)
 
     camera = new Camera;
 
+    settingsWidget = new SettingsWidget(camera);
+
     // Disable some widgets until we're connected to the DHT
     ui->statusButton->setEnabled(false);
 
@@ -206,6 +208,8 @@ 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(settingsWidget->identityForm, &IdentityForm::userNameChanged,      core, &Core::setUsername);
+    connect(settingsWidget->identityForm, &IdentityForm::statusMessageChanged, core, &Core::setStatusMessage);
     connect(setStatusOnline, SIGNAL(triggered()), this, SLOT(setStatusOnline()));
     connect(setStatusAway, SIGNAL(triggered()), this, SLOT(setStatusAway()));
     connect(setStatusBusy, SIGNAL(triggered()), this, SLOT(setStatusBusy()));
@@ -219,12 +223,12 @@ Widget::Widget(QWidget *parent)
 Widget::~Widget()
 {
     core->saveConfiguration();
-    instance = nullptr;
     coreThread->exit();
     coreThread->wait(500); // In case of deadlock (can happen with QtAudio/PA bugs)
     if (!coreThread->isFinished())
         coreThread->terminate();
     delete core;
+    delete settingsWidget;
 
     hideMainForms();
 
@@ -235,6 +239,7 @@ Widget::~Widget()
         delete g;
     GroupList::groupList.clear();
     delete ui;
+    instance = nullptr;
 }
 
 Widget* Widget::getInstance()
@@ -335,7 +340,7 @@ void Widget::onTransferClicked()
 void Widget::onSettingsClicked()
 {
     hideMainForms();
-    settingsWidget.show(*ui);
+    settingsWidget->show(*ui);
     activeChatroomWidget = nullptr;
 }
 
@@ -364,6 +369,7 @@ void Widget::setUsername(const QString& username)
 {
     ui->nameLabel->setText(username);
     ui->nameLabel->setToolTip(username); // for overlength names
+    settingsWidget->identityForm->userName->setText(username);
 }
 
 void Widget::onStatusMessageChanged(const QString& newStatusMessage, const QString& oldStatusMessage)
@@ -377,11 +383,11 @@ void Widget::setStatusMessage(const QString &statusMessage)
 {
     ui->statusLabel->setText(statusMessage);
     ui->statusLabel->setToolTip(statusMessage); // for overlength messsages
+    settingsWidget->identityForm->statusMessage->setText(statusMessage);
 }
 
 void Widget::addFriend(int friendId, const QString &userId)
 {
-
     qDebug() << "Widget: Adding friend with id "+userId;
     Friend* newfriend = FriendList::addFriend(friendId, userId);
     QLayout* layout = contactListWidget->getFriendLayout(Status::Offline);
diff --git a/widget/widget.h b/widget/widget.h
index e94435fbb..26fecb84d 100644
--- a/widget/widget.h
+++ b/widget/widget.h
@@ -20,6 +20,7 @@
 #include <QMainWindow>
 #include "widget/form/addfriendform.h"
 #include "widget/form/settingswidget.h"
+#include "widget/form/settings/identityform.h"
 #include "widget/form/filesform.h"
 #include "corestructs.h"
 
@@ -134,7 +135,7 @@ private:
     Core* core;
     QThread* coreThread;
     AddFriendForm friendForm;
-    SettingsWidget settingsWidget;
+    SettingsWidget* settingsWidget;
     FilesForm filesForm;
     static Widget* instance;
     GenericChatroomWidget* activeChatroomWidget;

From e3580fc416dd5ed298899016ba6759e320c4e264 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Tue, 30 Sep 2014 05:02:49 -0500
Subject: [PATCH 127/205] one frickin stinkin merge error

---
 qtox.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qtox.pro b/qtox.pro
index ad0d839c2..68ab4db73 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -164,7 +164,7 @@ SOURCES += \
     widget/tool/chatactions/chataction.cpp \
     widget/chatareawidget.cpp \
     filetransferinstance.cpp \
-    corestructs.cpp
+    corestructs.cpp \
     widget/tool/chatactions/messageaction.cpp \
     widget/tool/chatactions/filetransferaction.cpp \
     widget/tool/chatactions/systemmessageaction.cpp \

From f4b9c813a83c479a3982d67f01a974c2b3c3bb3f Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Wed, 1 Oct 2014 00:35:27 +0700
Subject: [PATCH 128/205] Filetransfer: speed calculation fix

---
 filetransferinstance.cpp | 24 +++++++++++++-----------
 filetransferinstance.h   |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/filetransferinstance.cpp b/filetransferinstance.cpp
index 0561454b4..9ab0c75d3 100644
--- a/filetransferinstance.cpp
+++ b/filetransferinstance.cpp
@@ -35,6 +35,7 @@ FileTransferInstance::FileTransferInstance(ToxFile File)
     id = Idconter++;
     state = tsPending;
     remotePaused = false;
+    lastUpdateTime = QDateTime::currentDateTime();
 
     filename = File.fileName;
     QFont font;
@@ -76,17 +77,16 @@ void FileTransferInstance::onFileTransferInfo(int FriendId, int FileNum, int64_t
             return;
 
 //    state = tsProcessing;
-    QDateTime newtime = QDateTime::currentDateTime();
-    int timediff = started.secsTo(newtime);
+    QDateTime now = QDateTime::currentDateTime();
+    if (lastUpdateTime.secsTo(now) < 1) //update every 1s
+        return;
+
+    int timediff = startTime.secsTo(now);
     if (timediff <= 0)
         return;
-    qint64 totalbytes = BytesSent + lastBytesSent; // bytes sent so far
-    if (totalbytes < 0)
-    {
-        qWarning() << "FileTransferInstance::onFileTransferInfo: Negative transfer speed !";
-        totalbytes = 0;
-    }
-    long rawspeed = totalbytes / timediff;
+
+    long rawspeed = BytesSent / timediff;
+
     speed = getHumanReadableSize(rawspeed)+"/s";
     size = getHumanReadableSize(Filesize);
     totalBytes = Filesize;
@@ -96,7 +96,8 @@ void FileTransferInstance::onFileTransferInfo(int FriendId, int FileNum, int64_t
     QTime etaTime(0,0);
     etaTime = etaTime.addSecs(etaSecs);
     eta = etaTime.toString("mm:ss");
-    lastBytesSent = totalbytes;
+    lastBytesSent = BytesSent;
+    lastUpdateTime = now;
     emit stateUpdated();
 }
 
@@ -142,6 +143,7 @@ void FileTransferInstance::onFileTransferAccepted(ToxFile File)
 
     remotePaused = false;
     state = tsProcessing;
+    startTime = QDateTime::currentDateTime();
 
     emit stateUpdated();
 }
@@ -221,7 +223,7 @@ void FileTransferInstance::acceptRecvRequest()
     Core::getInstance()->acceptFileRecvRequest(friendId, fileNum, path);
     state = tsProcessing;
 
-    started = QDateTime::currentDateTime();
+    startTime = QDateTime::currentDateTime();
 
     emit stateUpdated();
 }
diff --git a/filetransferinstance.h b/filetransferinstance.h
index 0168f3c61..f32c10f92 100644
--- a/filetransferinstance.h
+++ b/filetransferinstance.h
@@ -74,7 +74,7 @@ private:
     QImage pic;
     QString filename, size, speed, eta;
     QString filenameElided;
-    QDateTime started;
+    QDateTime startTime, lastUpdateTime;
     long long lastBytesSent, totalBytes;
     int fileNum;
     int friendId;

From 01632d2d0e5fdb977732183498e7e1402563d1fa Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Mon, 29 Sep 2014 22:24:38 -0500
Subject: [PATCH 129/205] Create desktop file for GNU-Linux

---
 qTox.desktop | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 qTox.desktop

diff --git a/qTox.desktop b/qTox.desktop
new file mode 100644
index 000000000..afd74b440
--- /dev/null
+++ b/qTox.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=qTox
+GenericName=Tox client
+Comment=qTox is a powerful Tox client that follows the Tox design guidelines.
+TryExec=qtox
+Exec=qtox
+Icon=qtox
+Categories=InstantMessaging;;AudioVideo;Network;
+Terminal=false
+MimeType=x-scheme-handler/tox;

From c6f01c31ab456e54c470c7748f8ec47efbc9a323 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Mon, 29 Sep 2014 22:45:33 -0500
Subject: [PATCH 130/205] add utox icons for packaging

---
 img/icons/qtox-128x128.png | Bin 0 -> 2595 bytes
 img/icons/qtox-14x14.png   | Bin 0 -> 480 bytes
 img/icons/qtox-16x16.png   | Bin 0 -> 563 bytes
 img/icons/qtox-192x192.png | Bin 0 -> 4059 bytes
 img/icons/qtox-22x22.png   | Bin 0 -> 689 bytes
 img/icons/qtox-24x24.png   | Bin 0 -> 784 bytes
 img/icons/qtox-256x256.png | Bin 0 -> 5630 bytes
 img/icons/qtox-32x32.png   | Bin 0 -> 937 bytes
 img/icons/qtox-36x36.png   | Bin 0 -> 978 bytes
 img/icons/qtox-48x48.png   | Bin 0 -> 1299 bytes
 img/icons/qtox-512x512.png | Bin 0 -> 12635 bytes
 img/icons/qtox-64x64.png   | Bin 0 -> 1549 bytes
 img/icons/qtox-72x72.png   | Bin 0 -> 1762 bytes
 img/icons/qtox-96x96.png   | Bin 0 -> 2182 bytes
 img/icons/qtox.svg         |   4 ++++
 15 files changed, 4 insertions(+)
 create mode 100644 img/icons/qtox-128x128.png
 create mode 100644 img/icons/qtox-14x14.png
 create mode 100644 img/icons/qtox-16x16.png
 create mode 100644 img/icons/qtox-192x192.png
 create mode 100644 img/icons/qtox-22x22.png
 create mode 100644 img/icons/qtox-24x24.png
 create mode 100644 img/icons/qtox-256x256.png
 create mode 100644 img/icons/qtox-32x32.png
 create mode 100644 img/icons/qtox-36x36.png
 create mode 100644 img/icons/qtox-48x48.png
 create mode 100644 img/icons/qtox-512x512.png
 create mode 100644 img/icons/qtox-64x64.png
 create mode 100644 img/icons/qtox-72x72.png
 create mode 100644 img/icons/qtox-96x96.png
 create mode 100644 img/icons/qtox.svg

diff --git a/img/icons/qtox-128x128.png b/img/icons/qtox-128x128.png
new file mode 100644
index 0000000000000000000000000000000000000000..a790ae173b3c955d4af625081c4aada886478861
GIT binary patch
literal 2595
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

literal 0
HcmV?d00001

diff --git a/img/icons/qtox-14x14.png b/img/icons/qtox-14x14.png
new file mode 100644
index 0000000000000000000000000000000000000000..54890d417ccbce8e2db95d553369d5b1e90a36a6
GIT binary patch
literal 480
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zCn2Vh}LpV4%Za?&Y0OWEOctjQh
z=|dpQ=-(-G9mtR@ag8Vm&QB{TPb^AhC@(M9%goCzPEIUH)ypqRpZ(583aDsKfKQ0)
z|NsA0l~vIYQ1JEZ*FeErw{F3u4jnwSchBA(+jp#8yA~)ob;{I=@`|$3vY4ot<fLRE
z>Fe$5>*E{X7vSpb3en~0;0R<mIXbDUsyo;@XlZCc#4XG$%uUUKY-1y1AZcV^1SB=o
zG=K^;)ir?#qU`ly+cQ9S8kYq51v9XSnp*e-hD651CnP1OXJ!|a)=rqXVBv}_Tej^x
zbolVm6Q|Fdy?Ep1t=kVDKYsrC%hzwe(|$5O1!^z%ba4#fxbA!WBvWI8MBByfE6(c#
zripg(EPVd&{n=;nC1viDo*Yk={9Uvsd-H9x^z&QYlcrrLm)&GA+ptu&IFc{SN5#|e
zF4J%MTv-n*#yxTj?w+Cr=DQiEW+#S~{OVkkzdU=h?{ekMJG1#@E}1YFc|H_=F8hlA
YP?(5w!$}(_pc5E8UHx3vIVCg!09UrIivR!s

literal 0
HcmV?d00001

diff --git a/img/icons/qtox-16x16.png b/img/icons/qtox-16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2337959eacbf5c3c4a15f7d1141370d4dcd2bd0
GIT binary patch
literal 563
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfLzW3kH}&m
zeHVlo3xXH10~wMft`Q}{`DrEPiAAXl<>lpinR(g8$%zH2dih1^v)|cB0Tmq%@CkAK
z|Np<LvMPQARP*cCuRnkOoIZ8>`0?Wh4jfp!c5QoGdsAamV?!fcZ&qd&gq@L=k)D>G
zoRkdYh6aa11U=k5fDCI(YgZRnAj8zy)Xdb(*vQz-#LNN+P0WCTI$Ao$hQ>w)MnHz4
zz9CRVUsoT9fDAPiHBEI*AVWh<1HuK002x4Jsh)id=pBcWAirP+ZXOv$RW)@h8$0`u
z(9o3BjDpsV&aR%Rv**m6J8$8JjhhY}ICSL5nG2V$T)A=g!J|h{o<4i=^3|JnA3lBh
z{O9jK!#_(hfo4tfba4!k2oF7XU8u=Gfc1h#nRxX<DN#Z0B<F*t{{0W%dD?;Popav1
znKmvQexASnZPE$Z!oY9MW5UYzjd53o#s+zZowvB|<V!o$@BVn^x~+}AmF<@-%X?SF
zi_Gk;>_nS9x5%omGHiU(&6!Yinq?WoW}cW?YopoR7(Scac^TiE&eg~AOS4VU{%+K@
jdDRX9F|9LFVg>5+7b^1l-`$x8bRmPMtDnm{r-UW|m&e6n

literal 0
HcmV?d00001

diff --git a/img/icons/qtox-192x192.png b/img/icons/qtox-192x192.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9a2e5daa827c51894fc02dcfe73bc7bb36990c3
GIT binary patch
literal 4059
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
LE8}WIkC^`fqf9M6

literal 0
HcmV?d00001

diff --git a/img/icons/qtox-22x22.png b/img/icons/qtox-22x22.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fd03360fc406458cd3c1516ff6fe5f0666141cd
GIT binary patch
literal 689
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H3?x5i&EW)6%*9TgAsieWw;%dH0CG7CJR*x3
z7#Iyfn9*hRlDR-Z$r9IylHmNblJdl&REF~Ma=pyF?Be9af>gcyqV(DCY@~pSJ_PuL
zxc>kDUsYL^JOtGH=g*(dpFY2S{rcUzcgTjEJ#%*V?%gX_tX#Bk(e!E4`}_JQ^iSyN
z>H(_JP}68@ZEL7+C@(87EGW#$&dJWqPEJe)N<~IQMny&e89@O-{=WWxK7K&9kC%_P
zm$#Rv7m$sHtSqg7A|}Qr26_fShK`nwmWCFPp{cG3B!LzINi`KUbyamB1A^Wst6c#4
z-M=KrFPMRmiJ3)6SW#I;L)XB>!r9$7AS5I-JTfvSJ|QtVtEjA|p`od{wXJKy)S0su
zty;Z$)0XW!ckSM@_wbQpr_P+ea_#=}4<EjK{rc_4&tJcO|68_ljRw%@8=fwXArhBU
z&m9kAa%6D1=oH8^V}6I=5tA9r9Z4<$E)#$K-(P50%f}o%yRKHeHmYm-&6=F;v!f+@
zb)vWD?w%+6Fq!`y->Up?fkEo~VwhL_tTsAWT*kQ|<-B^u(Z5U%AFpR~#%*2AAgW$j
zb^BfH+xLap?|oQf>bmToZ~okvYd&4Y^S$F=!E@oBvv{Y+ExyQYsjMl#i|6TtpNiWV
zqBP&-Ieauex=&w3?oxk=R>2M5kDLcyT72(j*!}npV?ynTofi6wG`iM3KIeI9^YL#=
ko>4pgcs{y+cF`ApZvJ4#-YVxSKtD2gy85}Sb4q9e0Irn-O8@`>

literal 0
HcmV?d00001

diff --git a/img/icons/qtox-24x24.png b/img/icons/qtox-24x24.png
new file mode 100644
index 0000000000000000000000000000000000000000..243c7d27cb72fb9f5c8a90204fa54429d237e79b
GIT binary patch
literal 784
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAF&8^|hH!9j+<xf)0LbMm@Q5sC
zU|{qCVaCk1y_P^h$r9IylHmNblJdl&REF~Ma=pyF?Be9af>gcyqV(DCY@~py6#{%h
zT>t<7ud1v{Bmye__3PK4KYzY|{|?b|<;s<F=gyrxaT3CvH+LS~sQS8k2)iJ^ATKvB
zEj2AUDLF1CE<QFsIx;#cG72ag77`W~8Ws{10%QjV1_uQM1^5N{`S^KzdILo~+&mzp
zx~e*m;p*ZFBwd_b9PAyO9Gx8O9Bi#^?QHDq?d*Z#Ru)zk<`zJPg_(t^u_=%NL5BK<
z5Qe_4zJZ<rkc3NVYiet0XaSL?x+YLiLrnun0_{>$QG*~L_eG*~2rxk7OM?7@85o(E
zSy<UQgvDfSon1UaLPNtM5)zYB^NT7P+d8^>`lij8w{Y3ARjb#oU%zql<}KTH?%jXj
z;K9R3jvPI9{KV<AXU|@^eD&JRdk-HydGhqxix)57eE9h3^OtWwe*y#b?>}X)2b@5w
zzI(bjhG+!mPIw;1WGK?oyqjy0fB?(NOK+5}It4E2=C~pKXwU!X9hx%cI-k|cpILjp
zlXP10W$x<d)3Y+B>YTXA8h(A{vs<bKv;E8)ihUXF68fcXvDa{UJh*tcA-$)C$!o{5
zn9?aC7o6f76r;EqG^epAvdy|}Z(#OT_V`OigAe)ZI_`XBSovh3#d~v$6X%NeoNZU0
z_WJ&%z4PbpJM}Txydid0X2YeoD^0T13Jz}5@=i8yRAV;xKA_{1`6FHOMCIO}@tJ4p
zRc;1LzV78*pY{4Mlh&dm+gPu#y!gXBd&R5O1xYJ3u1VdDP!Eg{d8}%sRG#%`%Wl6D
Z@?w>R!p}l~`~?O9gQu&X%Q~loCIA~8C+7eF

literal 0
HcmV?d00001

diff --git a/img/icons/qtox-256x256.png b/img/icons/qtox-256x256.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea5cefa744a4ecdcb06e8e7f362ffe753ff274af
GIT binary patch
literal 5630
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

literal 0
HcmV?d00001

diff --git a/img/icons/qtox-32x32.png b/img/icons/qtox-32x32.png
new file mode 100644
index 0000000000000000000000000000000000000000..a33fc5df554692f88544fadd033df1d743748d5e
GIT binary patch
literal 937
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy%*9TgAsieWw;%dH0CG7CJR*x3
z7#MehFr(F*$B%%5k|nMYCBgY=CFO}lsSM@i<$9TU*~Q6;1*v-ZMd`EO*+>CZM+W$W
zxc>kDUsYL^JOtGH>({UE-@kwU^!eq>mq0_FK79%#A3u8h;K2ikndi=(JALZ((W6J#
zuUo%j`3j)m>{+uRQV??Dgo$u&d09D-U0PBKB#R1*3JVH>jQrgE+??E;?3}F3tjvte
zjI@lT#3YE8xR|);$moc$i15(xu#m9O;837=aA0tte_()L0FdqF>E-3&<>~GTWP7-I
zKy*3SIRKHpt-ZaSy`8O{osFH1wT-o<wUvbxP=T4L8IUwGFf!CP1Tui6ft~@7p|7hC
zB!NgvLrYU#Q$tMyh}2cpfg%u6O+^iefLsXKw0G$wU`!O11o;IsFtKxT@$w6bOGqne
zY1=q>dItuDgocGjMMuZP#Kt8gr=;Z<S5?*2*45WHH1$lFIBCk1sne#<m^pjS+(nC*
zEnBsA-TIB2HgDawXYaoK2M!!Ma{A2Kv**rVynOZA?FWyaK7023)vNa(zI^-f^Vjd+
zfByXa_m6e;4`E;wyLh@dhFJKQUJMUE<RHNMAVGZ12Cc9)8yk5yCb(~0+;KxN#3jJx
z<G=sxht*COc|5Z_`|huwpHbkHt}QH!X8M?1SQW86QIUV%p`gW~`PPn>)6KXI7K*-H
zuxj1%t%;ZJ+}`^9KCh8(?RJNIc}#u^)~71mHZ@#ksd1Pi*~w@p%)#8wB*Ty>+`(|2
zX%3U1_5^9;1Hz0Sj86Y93~7G$FEhU>|Al4UkvsgiCVcSwYSy{WSh>98!iQdo`_^Cf
z{ad@}xU1i}l~#PW9GCSrD^`Boy?)g~`AWG*2bA^yEbWh&lI}0+@haP6lESiPZJ{S@
zUVE**nR2Ea=(3sZP&jqtRwdqj({@X|=KD7>A+G+UFV`Na`rXebGo-U6d}p~K`d|*j
zai%HeOPQxz)V=vp`EB3P-fm|06BZT$+g8*?zn?m5=J6)ixwBSZJyqYj_1iz)`X8Tx
PvB}`+>gTe~DWM4fAJ}e2

literal 0
HcmV?d00001

diff --git a/img/icons/qtox-36x36.png b/img/icons/qtox-36x36.png
new file mode 100644
index 0000000000000000000000000000000000000000..f51945091178c0cbdb54afcd677748e5436733ef
GIT binary patch
literal 978
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`Zn2Vh}LpV4%Za?&Y0OWEOctjR6
zFfe`sVMb#HACP9r64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=2ep0(?ST
z|NsB5s;o*L0_y$s>(`$@f4+YG`uzFxJ9qBfxN+mwty`BaUAl7R%7qIT&Ye4V^ytw;
z2M--MaA5DAz5Dm=U$c76+&OdS&7C)M#!R54)22?FK5hEcDO3CV`g?nNJK8(y>*{N3
zYD<briVBMg@(c2E^RhFuA<j!nNlQ*lj*E$lkBtY4#6-ma$*_<xh%AKk_w|P`e7t?&
z;_j~Qt}d=XuA{x9m4%h1xuuzjnW?d<iIE9V(Adb>*wEO>zzB$dTtj_BATrQ103wJ9
zI$AmqhPI|QkO3jJG_)Xsn(CTB1YxVIs;jA}0of4puR@dnFfxiug8YIRnE3bwgvAw<
z)igBq42?}3J^g}0LPNu&<Kp8J6O)qD(latM3o9zBs%vU$8=6|WdL~bqHe=S@dGi-7
zTef_~>h&8oZrQed$FALb_8mBM<ix3~*YDoD|KQ=H$4{O<efIptyZ7%ueEj(7)924$
zzJC4o>-X<J|NcD_ObrJ{bEc<@V~B<S+)FRbog5|DKCI4Dj5c)IHbJ#zN^R$bB+i?{
z3pa_a`}zO;$FlTg*0ROVo1b6abN-K&ud$|=@2%-UKa;X{Ive&Y_hnA<O*<BO?CO-c
zNy(=VJoC4j=#jnQ#EljWuIQVZERwrhQbSVSZ1`x?@ufm8aRc`R?q94f#{A9R4Sz2D
zmXK;YsP7=yv)@|MDPF>zMT1RVE_E4u+YHWINf|LsTNGTYl|s@(C;#%D-<GDn>q5ZF
zPbRCTs^_xjA8US~eWl!c`q95)X;Jou^N;RaV>o5DX4h4TnqcFjnpKA;J?Y%|DOT~#
z*Ea4NXTSADzMl0G_u0c&)?ZNDxy)3POF(3TQq^NeO)I4r0bL(fNh^NuQgdHluuAgZ
zan1{c`A=`N`K7#AGkea;|8Y%DU*5M|Q_W~um{}Z>#8&yQRmaWnWWbFVI#xkNSDkj-
zT`x|bA!B&TY+6eDqBim3&-Xkg2JJ6YRO8>>cj}*hO{h(JvSRaJV4O2}y85}Sb4q9e
E0HC*vl>h($

literal 0
HcmV?d00001

diff --git a/img/icons/qtox-48x48.png b/img/icons/qtox-48x48.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ab7b0174665ac2e499a473123c1d1316e1df7cb
GIT binary patch
literal 1299
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s%*9TgAsieWw;%dH0CG7CJR*x3
z7?@^&Fr(RJ_xnIW$r9IylHmNblJdl&REF~Ma=pyF?Be9af>gcyqV(DCY@`?%7#|1t
zgt-3y|6f&El|lqG<kzoXfByXW{{8#sPoKYj{rcg<hu5!PzkB!Y`Sa(GA3eTv=gzHL
zw=P|}bmhvG3l}b&J9qB%snZZk4;(mvX8YQ;Yk?wbR<D7GFIl`~(ZWRw<}a8zW9E$M
zGbT=$2o!H`Yj109Yiew&ud8pUZ>X)V1qzmzm6w&40U4zwr4YSEg+;|h#Xxp`UOq%5
zHzzkQH!nLgJ0~j#D3Y0xnU<OcWTd5l$du%iq{O87xcKO(XdpKtJR&SKEF>r-I4C$M
zFbF6DM7}=0em;J_-o8FwK0e+)KoL)OPax^$;^ySw<Y?~*WZT=>14$sVwzRgkvIde?
z7FIy6rG=%rnYo3T1(0oKYG!U~Zf0TzWSbb907*lALm+9OXP~dE4`k@+=mALx($>@l
zGPE?bfTV`H28dKckm{=HKoJP3rlJO9Ba_K*Hi!e$#DbC_zhDMNW)@ZsPCfxaAz@K*
zNi|I^T_a07hmg?Fu<-DR$jIoJxcJ1xq~w&ejEu~z?A*M9!ouQ`(z5cZ>iX8!wvMi@
zo(U5sPMS1%%9JTnr%j(RW5%pmv**m4KYzi3MN3z%TDyMZrp?=T?%cU+_wGIW4;(&u
z>de^-mo8tva`oD^n>TOYzJ2HJ{fAFqym<Ng&D(dMK7IM}?fZ`(KY#xE_51gqKY#!J
z`=@uO{~|DHe)Dv34DmR=^-6fOaG*%*!-hpSjvjJTR_cls(Yc|aCAJ~aQF+CU-GK-1
zX=I5UY!bR6F}cS6YPY6k%AAw?3S)iGMZPySK0otKz=_$DdMCb{IPu+yXO@b-%jEv`
z&b80I{OKC^s&)gTJ^K{+Gt|^|5B}vXdz*g$bl~qI?|}Ma>J0O)=n84Be#`ja^cjW=
zTodf}I;@d7!?5MocW!pZypGwY8Jb)7Ef9H-oGPYM#~<*DJBuN&d*W*b(|rr%9?anE
zW4`jcsjMMZErTKBJF6^%xK9Dg0%Zvs<Aar~65oaTO%*Oa_?CT<p<-+GRUtvaolm*d
z)@Sb)?mgDC-lWvwNlU3@x7+%yYv!eVd%pkZ<gJ^`lmFG(>ffGk_vY>W+a>nts%A%7
z-S^hcOSAF*9s5BhRL=5mr@c*e=e>I^>4tU(*^chCPM-Tz>FM0$ov)ADDQrD#we78@
z>W(KeUtCphylSwL^=Ok7@O$-c!y(4gQ~R%&y!*e5Azv)&@1{D{2aZ!aPMnf^Yk8o1
zgNLhp)Q6uT5iUy}y)l=Sxch8RNwOR3x0Lh)mb^a_czRDQVY*}bJZL|YjL|_+)*G2k
z#{Ze;m>fJ?-?V7U&R^>aZw6V1{@yps`lV7j7texI4c2M9N*0`ERW0<jx3jj^zFu?w
q{{PTizsHdi+YhRhm9D$`hkNQX{-geU(~N+rmBG{1&t;ucLK6V|Ru^Ib

literal 0
HcmV?d00001

diff --git a/img/icons/qtox-512x512.png b/img/icons/qtox-512x512.png
new file mode 100644
index 0000000000000000000000000000000000000000..b02bbdfea31b2c13c9a71a37780b000de9bc0405
GIT binary patch
literal 12635
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
KPiCF4x${4-K-t{@

literal 0
HcmV?d00001

diff --git a/img/icons/qtox-64x64.png b/img/icons/qtox-64x64.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ff34310bc6dedcc82ecec95c9f26a35b4a13b0d
GIT binary patch
literal 1549
zcmb`Gi#yY60LOnDqE*l7LPa@x4!N7l+|{wuVKSG^HbODuY%#eUTeh8HmvZaLC8Q)y
zq0EHbiz9myDZ(Stg(adyl7*A&c|Cic{(|#7pZEKI-tY6izu)uxE~$7=mmLTV1O!1l
zT#q{uz>MA;DhePA8U-_8QeYf&C8?;Wym^Nk1<S3`$Nd<fjolou_(5SeDAk$HzD!~i
zjme_KP$3qJg$#=fXM|9qsmQ39)A_SUG$06Wj&~<HZ)|KF);|2d11`I~yu7-)y0o-3
zH#avmH6@iwhlhvdH|l!Y_4x7QC!J5)+uP-hL?Qvw@=r_agI0Odbib*gp`pI6zNWec
zG!+#UcgpXSiOR%cv8YsZtK^n^Ti(??Ai0-wujF32lz9nwMtVkiT6#)yN@_}Ka#C{Q
z`NX8eq;tY^0=|Hkz>ANI=W@6lHis3<Vzbyx1``}%#%v}dh5<4<D*6ol3_Xkv96+Pe
zPSZ{Up@vXF22+CNJ%vmm2atiE@;?=DG60CbpTF-3UmubWi9qrudJ_pmP!hZdM6XQ&
z;5=|RPn_Jbu2{K%#5iMq_zyYiaMZ!h0bp-yZ)am?V{Kz=ZEIs?0|0xhP*&EK)*vlW
zmSBl8M_HIz$j_Ranwufb0H!9U0C|ZtMw%Fz7#kV`Kx1TJ1kzC7@JAZx83323zMj6m
z?k1oC=<4VK<N}gwJ|_lWSQC@rNrYf<WyDT3b&UfDHGkICGqXTh+1R3;j$_^2aYT~0
zw~w!XKwxmlA5`!VLqo&D!sy}QXCfk_qW_GEVK7<jzvANJcznL#Ja|V*DXAAOre|bk
zW@TsR<Xq0ZmVdpVu<*u>qN3uGlG~*sQCWFKRdsbuZEbBsV`F1ebISwC!?yO0&Ys@B
zzUKpjL$6-Fels#MB7HkHHa;;q`QhW#r|FrQ*)MbR^D^1DZwm{Hi%U!YeqUZ$U0Yvo
zk}2ANUm(TR={J&ZTg%WCcbk{0@~D?Tz3f(lsQA%q%xCWJYJ-NtYcH27VsAdm>i54;
zmmB&ye3!q_$KdR`z1Hl-;rpoP&F?waqwE+7QH9;Z@1>#F!WU%5cK9J_AWIZV;(0ts
z3P6j+$!;B7m&`JwJPQsE^;*m+VJA50*^^3LEFJHuX-;?HtK)i=X=CAa*eaEgNOQ8|
z>|sS!^>JPg2L?eM1*_CLtkb-Dhcdf<`?~i#?f#V)F3?pBjn}Otp5IgAK!!xR#as#D
zWZIylw=~;@?Kp%$=Nx&;L}q$OKiOs{YnS}}Oev;wl)hJAZ|xv*RQnvq*evf`{HYsP
zw|i0qUrWf{O4!aIz7oRuN*3&Tu)r!yvd2_mCP#73P+_18&hE=1^ZOy|J4Jjq1T@yx
z<{+HL!l1pZXhEIpO5_@IS(C2Fx6}IA^C90wZ!t)wP+9C&0PEyNOuwM{$?~*D=3Dno
zR`RC$c=;5V=e>!q!G77YM6A8zBdZKtK-KmlzMlwBGziK^+)af4f<#r{txOI<?$cJq
zkK0~S$@1RsZW~zn4wedMXzq(6z=cnu9%9rEVR-6a3?Yh!hyXD)`iM$~s{H4cJFyG8
zQZLTM16kkevD2e#OqAnz+HU^W37uAp%7&a>U!EyIz5^+AbXV+nra6t5jF>|@a`vpf
zoe)?%uI*O{=tti_8-7H0+W?AN-srLWWq09ENH=)G-j_yO-Gc;t9myo6ePc^U4Z2JR
z-vPfF30vt=Er@t#n#O8IMbuQ)R^Hws4vb#Jkj2e1v>N|ct<dHP+2t1-2E9~Sx4P>z
t*9XZn>59c4Y?;QC2Q9z)o)<=&F-1q7IOLZ2SqA<r$ko}?sq$Em@IOJ>d`$oV

literal 0
HcmV?d00001

diff --git a/img/icons/qtox-72x72.png b/img/icons/qtox-72x72.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d33db7f8049640f769b4c7102bb6c15b74af7ef
GIT binary patch
literal 1762
zcmchW=TlQz9EJlp7||$-ND&YgLg-aRgcV2v1f_%+N>E^l7$8arAu)7AG4#+yC7`e%
zL5d(q39u_NR#uFmqauPVP3a?wS=r-c#t-`k?A-S}=lQ+o&fNRq-ZZSMBTPnF1_FV=
zoG@q{*fBpAR0@!2j$(jKDgx<*heDyR-@8qKaR(Jchyd;Mk0sH0%H|6wmFV`~^wVJ^
zIx~QF9>QcYjY23FBF+U+&l`o&f{GWdl_3zxD_Cc|{npkNToeBP2RwIkb5kS|ZES3;
zt*(I=SYBRUSXfwGTm(KnJv}os17v)Bd}3l^WMo7r6b=jw2n2$@zP{e)y$`z|c6D}j
zbae3B`7JFi;LiKa_Zu1-fYjC1)z;JkspeG!R#sF3ic?xr$}Q$zzjnR&Mloov7G5nZ
zD9p>v6Q5>tvVo+hrKhE)rLa@jSJ=r($%zSxm*X$T$HjxA*yz}psF<k8s7Pic80iso
z2DoT+S~xA78V;JU&@f6U1;|D6MREukNH8gw6i5OBLJS}R`knOy^gZh<E(zWQAA*m!
zm$!KI#Cv++J%HnJc$_;9hsB9|Hy1Y`E~i|aPdWo}a&*EtV1PKF9USZ(fS{3R6cPml
zX^RB3Jz;BSV+Z7CtgWoAEUm1LTOB`kTwGdOSOPhA^q80yM=Zp>xtTc-bJHI*Gcf}Z
z_r`|CAVvm8U=$OGft~>f5Pe;JKs_BjF?A8TKy<Wqei8vkfPhh3OZz_*?Bo}LuXc!z
zb3F}_kd)dc4VBrs3$|ykocsYrWffJmL+V;^9eop1vm-|>tWO|Oju<@N!^6|d+nYe}
zIdjI>*VjKFfOsx2D1?0BVrXa>l^RZ?(dn0%k&#i+(Xp{{@t0Yw#H8da?3C2>jLa-f
zc1~ViUVcGgQPH*QH;TC>H_OV)Z{Mz}s=iZGQ&)fYZbM^ZQ}g}S);4~}AAdgR>FIg&
z_{q~}y}iAEz36-Os=t45Xn1&JWOVfPo44;LC#R-9%+AftFMRyCxU{sqva+_ezW#aR
z%h#`)o8LsDfByOYogbg127b9uPG~#4ch94t8UKD;#qG<i7!&*b+bJ+!TkdgNEOqi>
zT2tzo@FYfp6j$Dm;rXUqr)|E)@E49xW9HRwF$OpNUY|9pE~+vXb#=}#-)V>Dv8P1v
zwk7VGo1rWIG(*F@1-9L#iV&8gzBI#>FzsF==jix1K^*17m7LIrDhKAyA@ds7z5ZVR
z!U`m&yH6%}q3=bhmO=EEDNTh6)%p2@_R~j~gr=7eLvy2e)2t^>@e_s8CaB?M&Za1G
zyvWzHGd5)~Z6$X7Xeovh)McSrkoK)L%DsM~n|40vb6mP2Zjg^)j&eCK7B`hjPnw>n
zsCUM?y%|TN4zBPN<POWWR`p}`)L_I!2Y&BRq;mQbuLp|SIxl=F$}T8tw(#05daP(?
zNRXsjrGDaW0ahAnCJ>NilP}=}I}`)`)oJ_40kUSs8fA4*s0O~>HS)->LF_SRHiy%v
zU0Ul<(()xZ9#`}GiV>-U{C4cQ?o_rlr69`HA~V9$3Y~Gel&h@WjrK#YR#Pn(RQDzI
z=MoWj9%m<gUe)|O3P;>F*-IDRT+<8q=GZ=}Ayk@wX*bpy&qhIckc6h2EJ}A-F%mJm
zU1jrt77IBY!+^Kz>bAoft65ly{YJ0(C!WPIwR{WflACN(;w)}x%gz$Gd(vx?QM)G(
z=?+S;Ge1l{g|eSxc)NCmU@%hbW-a>eT^{)YO%uG0`>fXYZ73cdT4GP-oxlE)Fb{<w
zTkfkNo^T`+a;AhlPtr%&sPw^sa*y^s!S{^RXWtUvF`HM-Rm|j!pDKCk1eUn?<&Y7w
zKAIcR6|&Kot|0iBt$-vm$xsj0gMDJ#y7Ytu%WpI5-)$o&8JEW*iM(brwjEYjuQ4ny
zo7zf5R>(-pGf1Rrzf{Pi0WM1#rJGBx-gghG>YDxFl^j-0<+<jq5eHuXn`~Aa3>&<2
zj;gxY!&NA;mmQ`&3S%{;(9Whk)2k(WvP66)wIOW7zh;jQF(Ycf5d7K@Cwo_PJ@U82
Fe*voy$$$U=

literal 0
HcmV?d00001

diff --git a/img/icons/qtox-96x96.png b/img/icons/qtox-96x96.png
new file mode 100644
index 0000000000000000000000000000000000000000..b97f35edb3de1b06e74dc45295e5ef214945fd8e
GIT binary patch
literal 2182
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
F@Gny#h+zN#

literal 0
HcmV?d00001

diff --git a/img/icons/qtox.svg b/img/icons/qtox.svg
new file mode 100644
index 000000000..4369cd63e
--- /dev/null
+++ b/img/icons/qtox.svg
@@ -0,0 +1,4 @@
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 256 256" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m80 31 48-15 42 15v205h-90z" fill="#FFF" fill-opacity="0.33"/>
+ <path d="m128.06-0.25c-31.017-0.0007-62.06 20.75-62.06 62.25v30h-16c-17.944 0-29 12.35-29 30v104c0 18.08 11.941 29.94 30 30l154 0.5c17.98 0.06 30-12.48 30-30.5v-104c0-17.94-12.07-30.583-30-30h-15l0.03-30c0.05-41.497-30.95-62.249-61.97-62.25zm-0.06 25.25c21.06 0 36 15.484 36 35 0 20.467-8 40-36 50 5-8 7-11 8-19-29 3-44-12.2-44-31s14.94-35 36-35zm0 96c14.86 0 27 11.87 27 27s-11 22.98-17.44 25.25 25.44 7.75 25.44 34.75v11c0 6-4 10-10 10h-51c-6 0-10-4-10-10v-11c0-27 26.38-34.72 26.38-34.72-5.39-1.27-17.38-10.28-17.38-25.28s12.14-27 27-27z" fill="#252325"/>
+</svg>

From dd96df9940bbb85dd6c65376e79f5bf4649658a1 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Tue, 30 Sep 2014 22:46:24 +0200
Subject: [PATCH 131/205] Fix performance regression, revert part of
 87c9bbf1e6f7565bcf8aba7cb1f61dea004912e9

---
 widget/adjustingscrollarea.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/widget/adjustingscrollarea.cpp b/widget/adjustingscrollarea.cpp
index 2bd9cd3e8..04b735ed1 100644
--- a/widget/adjustingscrollarea.cpp
+++ b/widget/adjustingscrollarea.cpp
@@ -55,8 +55,9 @@ bool AdjustingScrollArea::eventFilter(QObject *obj, QEvent *ev)
     {
         // workaround: sometimes a child widget gets drawn on top of the scrollbar
         // so we trigger a repaint afterwards
-        verticalScrollBar()->update();
-        horizontalScrollBar()->update();
+        // => Actually, we don't. This triggers an infinite loop of QEvent::UpdateRequest and burns 100% CPU !
+        //verticalScrollBar()->update();
+        //horizontalScrollBar()->update();
     }
 
     return QObject::eventFilter(obj, ev);

From 5ccc4aa3b133c3946491ff92fdf08660977db750 Mon Sep 17 00:00:00 2001
From: Marcel <github@retux.de>
Date: Tue, 30 Sep 2014 22:51:03 +0200
Subject: [PATCH 132/205] added table of content

---
 INSTALL.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/INSTALL.md b/INSTALL.md
index 3cb777597..ed63bfe78 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,3 +1,10 @@
+#Install Instructions
+- [Dependencies](#dependencies)
+- [Windows](#windows)
+- [Linux](#linux)
+- [OS X](#osx)
+
+<a name="dependencies" />
 ##Dependencies
 
 | Name         | Version     | Modules                         |
@@ -8,6 +15,7 @@
 | OpenCV       | >= 2.4.9    | core, highgui                   |
 | OpenAL Soft  | >= 1.16.0   |                                 |
 
+<a name="windows" />
 ##Windows
 
 ###Qt
@@ -68,6 +76,7 @@ make install
 ```
 Copy the dll "OpenAL32.dll" located at "C:\qTox\libs\openal-build\install\bin" to "C:\qTox\libs\lib". Finally, copy the directory "AL" located at "C:\qTox\libs\openal-build\install\include" to "C:\qTox\libs\include". Unlike OpenCV you don't need to patch any files. Feel free to delete the directories "openal-soft-x.y.z" and "openal-build", but you don't need to.
 
+<a name="linux" />
 ##Linux
 Most of the dependencies should be available through your package manger. You may either follow the directions below, or simply run `./simple_make.sh` after cloning, which will attempt to automatically download dependencies followed by compilation.
 
@@ -171,6 +180,7 @@ After installing the required dependencies, run `bootstrap.sh` and then run the
 `buildPackages.sh` script, found in the tools folder. It will automatically get the
 packages necessary for building .debs, so be prepared to type your password for sudo.
 
+<a name="osx" />
 ##OS X
 
 ###OSX Easy Install

From 8d9d53b9e9380275ecbdbaa5b85252bdd71c878f Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Tue, 30 Sep 2014 05:12:17 -0500
Subject: [PATCH 133/205] fix double free

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

diff --git a/widget/form/settingswidget.cpp b/widget/form/settingswidget.cpp
index dddce56e0..f82e1a689 100644
--- a/widget/form/settingswidget.cpp
+++ b/widget/form/settingswidget.cpp
@@ -41,7 +41,7 @@ SettingsWidget::SettingsWidget(Camera* cam)
     
     prepButtons();    
     foot->setLayout(iconsLayout);
-    mainLayout = new QVBoxLayout(main);
+    mainLayout = new QVBoxLayout();
     mainLayout->addWidget(body);
     mainLayout->addWidget(foot);
     // something something foot size

From d9454d1d6e2f4637b32598c355d257f6c6eb6f15 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Tue, 30 Sep 2014 23:34:32 +0200
Subject: [PATCH 134/205] Update package dependecies, close #355

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

diff --git a/debian/control b/debian/control
index 7fa0cc2b4..07da3e3e4 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, libopenal-dev, libopencv-dev, libopus-dev, qtbase5-dev, sudo, autoconf, libtool, pkg-config, libvpx-dev
+Build-Depends: debhelper (>= 9), cdbs, qt5-qmake, libopenal-dev (>= 1:1.15.1), libopencv-dev (>= 2.4.8), libopus-dev (>= 1.0), qtbase5-dev (>= 5.2), sudo, autoconf, libtool, pkg-config, libvpx-dev
 
 Package: qtox
 Architecture: any

From 5b7593781973fbe0fdb348eb8dbda302bc0864bf Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Wed, 1 Oct 2014 01:39:53 +0200
Subject: [PATCH 135/205] Update win32 build config

---
 qtox.pro | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/qtox.pro b/qtox.pro
index aa45650fd..4c4db4492 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -48,8 +48,9 @@ contains(JENKINS,YES) {
 
 # Rules for Windows, Mac OSX, and Linux
 win32 {
-    LIBS += -L$$PWD/libs/lib -lopencv_core249 -lopencv_highgui249 -lopencv_imgproc249 -lOpenAL32
-    LIBS += $$PWD/libs/lib/libtoxav.a $$PWD/libs/lib/libopus.a $$PWD/libs/lib/libvpx.a $$PWD/libs/lib/libtoxcore.a -lws2_32 $$PWD/libs/lib/libsodium.a -lpthread -liphlpapi
+    LIBS += -liphlpapi -L$$PWD/libs/lib -ltoxav -ltoxcore -lvpx -lpthread
+    LIBS += -L$$PWD/libs/lib -lopencv_core248 -lopencv_highgui248 -lopencv_imgproc248 -lOpenAL32 -lopus
+    LIBS += -lz -lopengl32 -lole32 -loleaut32 -luuid -lvfw32 -ljpeg -ltiff -lpng -ljasper -lIlmImf -lHalf -lws2_32
 } else {
     macx {
         LIBS += -L$$PWD/libs/lib/ -ltoxcore -ltoxav -lsodium -lvpx -framework OpenAL -lopencv_core -lopencv_highgui

From 9d8e4b28f2b5e1c916892cb39371953255e669e9 Mon Sep 17 00:00:00 2001
From: dubslow <bill@mint>
Date: Sat, 13 Sep 2014 00:55:21 -0500
Subject: [PATCH 136/205] first thing's first, gotta placate the ocd

---
 mainwindow.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mainwindow.ui b/mainwindow.ui
index 385ecb489..300cc60c3 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -3115,13 +3115,13 @@ QSplitter:handle{
           <property name="minimumSize">
            <size>
             <width>0</width>
-            <height>60</height>
+            <height>57</height>
            </size>
           </property>
           <property name="maximumSize">
            <size>
             <width>16777215</width>
-            <height>60</height>
+            <height>57</height>
            </size>
           </property>
           <property name="mouseTracking">

From 3aa1c7fdedf143243f5cf2b8588a57ee3db9e99f Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Tue, 30 Sep 2014 18:50:12 -0500
Subject: [PATCH 137/205] bootstrap tweaks

---
 core.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core.cpp b/core.cpp
index d73b17683..15cb84a7b 100644
--- a/core.cpp
+++ b/core.cpp
@@ -225,9 +225,9 @@ void Core::start()
  * 5 disconnected; 4 were DCd for less than 20 ticks, while the 5th was ~50 ticks.
  * So I set the tolerance here at 25, and initial DCs should be very rare now.
  * This should be able to go to 50 or 100 without affecting legitimate disconnects'
- * downtime, but lets be conservative for now.
+ * downtime, but lets be conservative for now. Edit: now 40.
  */
-#define CORE_DISCONNECT_TOLERANCE 25
+#define CORE_DISCONNECT_TOLERANCE 40
 
 void Core::process()
 {
@@ -284,7 +284,7 @@ void Core::bootstrapDht()
     qDebug() << "Core: Bootstraping to the DHT ...";
 
     int i=0;
-    while (i < 4)
+    while (i < 2) // i think the more we bootstrap, the more we jitter because the more we overwrite nodes
     {
         const Settings::DhtServer& dhtServer = dhtServerList[j % listSize];
         if (tox_bootstrap_from_address(tox, dhtServer.address.toLatin1().data(),

From 7a2558d41a95c9e58622cab43ad347b379fde722 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Wed, 1 Oct 2014 13:23:00 +0200
Subject: [PATCH 138/205] Fix #359

---
 core.cpp | 34 +++++++++++++++++++++++++++++-----
 core.h   |  2 +-
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/core.cpp b/core.cpp
index 15cb84a7b..53214dd3d 100644
--- a/core.cpp
+++ b/core.cpp
@@ -36,6 +36,7 @@
 #include <QDateTime>
 #include <QList>
 #include <QBuffer>
+#include <QMessageBox>
 
 const QString Core::CONFIG_FILE_NAME = "data";
 QList<ToxFile> Core::fileSendQueue;
@@ -166,7 +167,13 @@ void Core::start()
 
     qsrand(time(nullptr));
 
-    loadConfiguration();
+    if (!loadConfiguration())
+    {
+        emit failedToStart();
+        tox_kill(tox);
+        tox = nullptr;
+        return;
+    }
 
     tox_callback_friend_request(tox, onFriendRequest, this);
     tox_callback_friend_message(tox, onFriendMessage, this);
@@ -991,7 +998,7 @@ void Core::onFileTransferFinished(ToxFile file)
           emit fileDownloadFinished(file.filePath);
 }
 
-void Core::loadConfiguration()
+bool Core::loadConfiguration()
 {
     QString path = QDir(Settings::getSettingsDirPath()).filePath(CONFIG_FILE_NAME);
 
@@ -999,18 +1006,34 @@ void Core::loadConfiguration()
 
     if (!configurationFile.exists()) {
         qWarning() << "The Tox configuration file was not found";
-        return;
+        return true;
     }
 
     if (!configurationFile.open(QIODevice::ReadOnly)) {
         qCritical() << "File " << path << " cannot be opened";
-        return;
+        return true;
     }
 
     qint64 fileSize = configurationFile.size();
     if (fileSize > 0) {
         QByteArray data = configurationFile.readAll();
-        tox_load(tox, reinterpret_cast<uint8_t *>(data.data()), data.size());
+        int error = tox_load(tox, reinterpret_cast<uint8_t *>(data.data()), data.size());
+        if (error < 0)
+        {
+            qWarning() << "Core: tox_load failed with error "<<error;
+        }
+        else if (error == 1) // Encrypted data save
+        {
+            qWarning() << "Core: Can not open encrypted tox save";
+            if (QMessageBox::Ok != QMessageBox::warning(nullptr, tr("Encrypted profile"),
+                tr("Your tox profile seems to be encrypted, qTox can't open it\nDo you want to erase this profile ?"),
+                QMessageBox::Ok | QMessageBox::Cancel))
+            {
+                qWarning() << "Core: Couldn't open encrypted save, giving up";
+                configurationFile.close();
+                return false;
+            }
+        }
     }
 
     configurationFile.close();
@@ -1025,6 +1048,7 @@ void Core::loadConfiguration()
         emit statusMessageSet(msg);
 
     loadFriends();
+    return true;
 }
 
 void Core::saveConfiguration()
diff --git a/core.h b/core.h
index 2419bb6c3..71692c3b2 100644
--- a/core.h
+++ b/core.h
@@ -210,7 +210,7 @@ private:
 
     bool checkConnection();
 
-    void loadConfiguration();
+    bool loadConfiguration(); // Returns false for a critical error, true otherwise
     void loadFriends();
 
     static void sendAllFileData(Core* core, ToxFile* file);

From 864bb342d04bca00beea09cdf68836e23571483a Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Wed, 1 Oct 2014 14:55:48 +0200
Subject: [PATCH 139/205] Add GitHub release publishing script for Jenkins

---
 tools/publish.py | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 tools/publish.py

diff --git a/tools/publish.py b/tools/publish.py
new file mode 100644
index 000000000..b70ed84da
--- /dev/null
+++ b/tools/publish.py
@@ -0,0 +1,32 @@
+#!/usr/bin/python2.7
+
+from github3 import login, GitHub
+from getpass import getpass, getuser
+import time
+import datetime
+import sys
+try:
+    import readline
+except ImportError:
+    pass
+
+versionNumber = str(time.time())
+version = 'qtox-'+versionNumber
+title = 'qTox '+datetime.datetime.fromtimestamp(time.time()).strftime('%Y-%m-%d %H:%M:%S')
+user = "tux3"
+password = ""
+if password == "":
+	password = getpass('GitHub password for {0}: '.format(user))
+
+# Obviously you could also prompt for an OAuth token
+if not (user and password):
+    print("Cowardly refusing to login without a username and password.")
+    sys.exit(1)
+
+g = login(user, password)
+repo = g.repository('tux3', 'qTox')
+release = repo.create_release(version,'master',title,'This is an automated release of qTox, published by qTox\'s continous integration server.',True,False)
+
+if (len(sys.argv) >= 2):
+	file = open(sys.argv[1], 'r')
+	release.upload_asset('application/octet-stream',sys.argv[1],file)

From c4059af010b5cf04b945602a60943ec1642c7e3b Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Wed, 1 Oct 2014 15:05:58 +0200
Subject: [PATCH 140/205] Update publish.py

---
 tools/publish.py | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/tools/publish.py b/tools/publish.py
index b70ed84da..ea9624dfd 100644
--- a/tools/publish.py
+++ b/tools/publish.py
@@ -10,9 +10,21 @@ try:
 except ImportError:
     pass
 
+platform=''
+if (len(sys.argv) >= 3):
+	platform=sys.argv[2]
+
 versionNumber = str(time.time())
-version = 'qtox-'+versionNumber
-title = 'qTox '+datetime.datetime.fromtimestamp(time.time()).strftime('%Y-%m-%d %H:%M:%S')
+if (platform != ''):
+	version = 'qtox-'+platform+'-'+versionNumber
+else:
+	version = 'qtox-'+versionNumber
+if (platform == 'windows'):
+	title = 'qTox Windows '+datetime.datetime.fromtimestamp(time.time()).strftime('%Y-%m-%d %H:%M:%S')
+elif (platform == 'linux'):
+	title = 'qTox Linux '+datetime.datetime.fromtimestamp(time.time()).strftime('%Y-%m-%d %H:%M:%S')
+else:
+	title = 'qTox '+datetime.datetime.fromtimestamp(time.time()).strftime('%Y-%m-%d %H:%M:%S')
 user = "tux3"
 password = ""
 if password == "":
@@ -25,8 +37,9 @@ if not (user and password):
 
 g = login(user, password)
 repo = g.repository('tux3', 'qTox')
-release = repo.create_release(version,'master',title,'This is an automated release of qTox, published by qTox\'s continous integration server.',True,False)
+release = repo.create_release(version,'master',title,'This is an automated release of qTox, published by qTox\'s continous integration server.',False,False)
 
 if (len(sys.argv) >= 2):
 	file = open(sys.argv[1], 'r')
 	release.upload_asset('application/octet-stream',sys.argv[1],file)
+

From 86f9fb3ad50ef1fac2eac49079c694c97c341c52 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <tux3@users.noreply.github.com>
Date: Wed, 1 Oct 2014 15:38:29 +0200
Subject: [PATCH 141/205] README: Link to the new releases

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 39317b54a..430e6fcd2 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,8 @@ However, it is not a fork.
 
 This client runs on Windows, Linux and Mac natively.<br/>
 
+You can find the latest versions of qTox <a href="https://github.com/tux3/qTox/releases">here</a>, or from the Tox Project's servers :
+
 <a href="https://jenkins.libtoxcore.so/job/tux3-toxgui-win32/lastSuccessfulBuild/artifact/toxgui-win32.zip">Windows download</a><br/>
 <a href="https://jenkins.libtoxcore.so/job/ToxGUI%20OS%20X/lastSuccessfulBuild/artifact/qtox.dmg">Mac download </a><br/>
 <a href="https://jenkins.libtoxcore.so/job/qTox-linux-amd64/">Linux download</a> (click "Last successful artifacts")<br/>

From 1ccecaa80c8889ec2bf0154c73815d77f5eed6df Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Wed, 1 Oct 2014 16:05:03 +0200
Subject: [PATCH 142/205] Build both i386 and amd64 linux packages

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

diff --git a/tools/buildPackages.sh b/tools/buildPackages.sh
index 4e6b6e144..0c12e11c6 100755
--- a/tools/buildPackages.sh
+++ b/tools/buildPackages.sh
@@ -88,7 +88,8 @@ mv qTox-master $VERNAME
 # Build packages
 cd $VERNAME
 ./bootstrap.sh
-debuild -us -uc
+debuild -us -uc -aamd64
+debuild -us -uc -ai386
 cd ..
 
 # alien warns that it should probably be run as root...

From 4d916951692b0cc471bb3b8ec0ad7641f3e1b1e8 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Wed, 1 Oct 2014 16:30:04 +0200
Subject: [PATCH 143/205] Update package dependencies

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

diff --git a/debian/control b/debian/control
index 07da3e3e4..af90ab856 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9), cdbs, qt5-qmake, libopenal-dev (>= 1:1.15.1), l
 
 Package: qtox
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: libc6 (>= 2.17), libgcc1 (>= 1:4.1.1), libgl1-mesa-glx | libgl1, libopenal1 (>= 1.14), libopencv-core2.4, libopencv-highgui2.4, libopus0 (>= 1.0), libqt5core5a (>= 5.2), libqt5gui5 (>= 5.2), libqt5network5 (>= 5.0), libqt5widgets5 (>= 5.2), libqt5xml5 (>= 5.0), libstdc++6 (>= 4.9), libvpx1 (>= 1.0.0)
 Description: Tox client
  qTox is a powerful Tox client that follows the Tox design guidelines.
  Tox is a decentralized and encrypted replacement for Skype, supporting

From c260a7a100684504a315685cef72b4d197ea8d82 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Mon, 29 Sep 2014 20:18:03 +0200
Subject: [PATCH 144/205] MaskablePixmapWidget: auto-detect a suitable
 background color

---
 widget/friendwidget.cpp         |  1 +
 widget/groupwidget.cpp          |  6 ++--
 widget/maskablepixmapwidget.cpp | 57 ++++++++++++++++++++++++++++++---
 widget/maskablepixmapwidget.h   |  5 ++-
 4 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/widget/friendwidget.cpp b/widget/friendwidget.cpp
index ad16ac75c..32971b098 100644
--- a/widget/friendwidget.cpp
+++ b/widget/friendwidget.cpp
@@ -202,6 +202,7 @@ void FriendWidget::onAvatarChange(int FriendId, const QPixmap& pic)
 
     isDefaultAvatar = false;
     avatar->setPixmap(pic);
+    avatar->autopickBackground();
 }
 
 void FriendWidget::onAvatarRemoved(int FriendId)
diff --git a/widget/groupwidget.cpp b/widget/groupwidget.cpp
index d803063ce..949fefbdc 100644
--- a/widget/groupwidget.cpp
+++ b/widget/groupwidget.cpp
@@ -39,8 +39,8 @@ GroupWidget::GroupWidget(int GroupId, QString Name)
     textLayout.setMargin(0);
     setLayoutDirection(Qt::LeftToRight); // parent might have set Qt::RightToLeft
 
-    avatar = new MaskablePixmapWidget(this, QSize(40,40), QString(), Qt::transparent);
-    avatar->setPixmap(QPixmap(":img/group.png"));
+    avatar = new MaskablePixmapWidget(this, QSize(40,40), ":/img/avatar_mask.png");
+    avatar->setPixmap(QPixmap(":img/group_dark.png"));
     statusPic.setPixmap(QPixmap(":img/status/dot_online.png"));
     name.setText(Name);
     QFont small;
@@ -139,7 +139,7 @@ void GroupWidget::setAsInactiveChatroom()
     QPalette pal3;
     pal3.setColor(QPalette::Background, QColor(65,65,65,255));
     this->setPalette(pal3);
-    avatar->setPixmap(QPixmap(":img/group.png"));
+    avatar->setPixmap(QPixmap(":img/group_dark.png"));
 }
 
 void GroupWidget::updateStatusLight()
diff --git a/widget/maskablepixmapwidget.cpp b/widget/maskablepixmapwidget.cpp
index 90eaf9552..8cdf5d21b 100644
--- a/widget/maskablepixmapwidget.cpp
+++ b/widget/maskablepixmapwidget.cpp
@@ -17,10 +17,11 @@
 #include "maskablepixmapwidget.h"
 #include <QPainter>
 
-MaskablePixmapWidget::MaskablePixmapWidget(QWidget *parent, QSize size, QString maskName, QColor background)
+MaskablePixmapWidget::MaskablePixmapWidget(QWidget *parent, QSize size, QString maskName, bool autopickBackground)
     : QWidget(parent)
-    , backgroundColor(background)
+    , backgroundColor(Qt::white)
     , clickable(false)
+    , autoBackground(autopickBackground)
 {
     setFixedSize(size);
 
@@ -30,6 +31,47 @@ MaskablePixmapWidget::MaskablePixmapWidget(QWidget *parent, QSize size, QString
         mask = QPixmap(maskName).scaled(size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
 }
 
+void MaskablePixmapWidget::autopickBackground()
+{
+    QImage pic = pixmap.toImage();
+
+    if (pic.isNull())
+        return;
+
+    qreal r = 0.0f;
+    qreal g = 0.0f;
+    qreal b = 0.0f;
+    float weight = 1.0f;
+
+    for (int x=0;x<pic.width();++x)
+    {
+        for (int y=0;y<pic.height();++y)
+        {
+            QRgb color = pic.pixel(x,y);
+            r += qRed(color) / 255.0f;
+            g += qGreen(color) / 255.0f;
+            b += qBlue(color) / 255.0f;
+
+            weight += qAlpha(color) / 255.0f;
+        }
+    }
+
+    r /= weight;
+    g /= weight;
+    b /= weight;
+
+    QColor color = QColor::fromRgbF(r,g,b);
+    backgroundColor =  QColor::fromRgb(0xFFFFFF ^ color.rgb());
+
+    update();
+}
+
+void MaskablePixmapWidget::setBackground(QColor color)
+{
+    backgroundColor = color;
+    update();
+}
+
 void MaskablePixmapWidget::setClickable(bool clickable)
 {
     this->clickable = clickable;
@@ -42,8 +84,15 @@ void MaskablePixmapWidget::setClickable(bool clickable)
 
 void MaskablePixmapWidget::setPixmap(const QPixmap &pmap)
 {
-    pixmap = pmap.scaled(width(), height(), Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
-    update();
+    if (!pmap.isNull())
+    {
+        pixmap = pmap.scaled(width(), height(), Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
+
+        if (autoBackground)
+            autopickBackground();
+
+        update();
+    }
 }
 
 QPixmap MaskablePixmapWidget::getPixmap() const
diff --git a/widget/maskablepixmapwidget.h b/widget/maskablepixmapwidget.h
index c4601d227..d3e8d3616 100644
--- a/widget/maskablepixmapwidget.h
+++ b/widget/maskablepixmapwidget.h
@@ -23,8 +23,10 @@ class MaskablePixmapWidget : public QWidget
 {
     Q_OBJECT
 public:
-    MaskablePixmapWidget(QWidget *parent, QSize size, QString maskName, QColor background = Qt::white);
+    MaskablePixmapWidget(QWidget *parent, QSize size, QString maskName = QString(), bool autopickBackground = true);
 
+    void autopickBackground();
+    void setBackground(QColor color);
     void setClickable(bool clickable);
     void setPixmap(const QPixmap &pmap);
     QPixmap getPixmap() const;
@@ -43,6 +45,7 @@ private:
     QString maskName;
     QColor backgroundColor;
     bool clickable;
+    bool autoBackground;
 };
 
 #endif // MASKABLEPIXMAPWIDGET_H

From a4cd2d34db375660399247db4a17b368a56bb9d5 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Tue, 30 Sep 2014 20:10:42 +0200
Subject: [PATCH 145/205] cleanup, applied some of the "Tox User Interface
 Guidelines"

---
 misc/style.cpp                         |  43 ++++++++++++++-
 misc/style.h                           |  30 ++++++++++-
 ui/emoticonWidget/dot_page.png         | Bin 233 -> 216 bytes
 ui/emoticonWidget/dot_page_current.png | Bin 263 -> 234 bytes
 ui/emoticonWidget/dot_page_hover.png   | Bin 237 -> 233 bytes
 ui/emoticonWidget/emoticonWidget.css   |   4 +-
 widget/emoticonswidget.cpp             |   2 +-
 widget/form/chatform.cpp               |  11 +++-
 widget/form/genericchatform.cpp        |  24 +++++----
 widget/form/groupchatform.cpp          |   9 +++-
 widget/friendwidget.cpp                |  71 +++++++++++++-----------
 widget/genericchatroomwidget.cpp       |  48 ++++++++---------
 widget/genericchatroomwidget.h         |   8 +--
 widget/groupwidget.cpp                 |  72 +++++++++++++------------
 widget/maskablepixmapwidget.cpp        |  37 ++++++++-----
 widget/maskablepixmapwidget.h          |   4 +-
 widget/widget.cpp                      |  12 +++--
 17 files changed, 241 insertions(+), 134 deletions(-)

diff --git a/misc/style.cpp b/misc/style.cpp
index 609dcc277..0801cf154 100644
--- a/misc/style.cpp
+++ b/misc/style.cpp
@@ -19,8 +19,9 @@
 
 #include <QFile>
 #include <QDebug>
+#include <QVector>
 
-QString Style::get(const QString &filename)
+QString Style::getStylesheet(const QString &filename)
 {
     if (!Settings::getInstance().getUseNativeStyle())
     {
@@ -28,8 +29,46 @@ QString Style::get(const QString &filename)
         if (file.open(QFile::ReadOnly | QFile::Text))
             return file.readAll();
         else
-            qWarning() << "Style " << filename << " not found";
+            qWarning() << "Stylesheet " << filename << " not found";
     }
 
     return QString();
 }
+
+QColor Style::getColor(Style::ColorPalette entry)
+{
+    static QColor palette[] = {
+        QColor("#6bc260"),
+        QColor("#cebf44"),
+        QColor("#c84e4e"),
+        QColor("#000000"),
+        QColor("#1c1c1c"),
+        QColor("#414141"),
+        QColor("#d1d1d1"),
+        QColor("#ffffff"),
+    };
+
+    return palette[entry];
+}
+
+QFont appFont(int pixelSize, int weight) {
+    auto font = QFont();
+    font.setPixelSize(pixelSize);
+    font.setWeight(weight);
+    return font;
+}
+
+QFont Style::getFont(Style::Font font)
+{
+    static QFont fonts[] = {
+        appFont(14, QFont::Bold),
+        appFont(12, QFont::Normal),
+        appFont(12, QFont::Bold),
+        appFont(11, QFont::Normal),
+        appFont(11, QFont::Bold),
+        appFont(10, QFont::Normal),
+        appFont(10, QFont::Light),
+    };
+
+    return fonts[font];
+}
diff --git a/misc/style.h b/misc/style.h
index 4bd42d77f..326972d92 100644
--- a/misc/style.h
+++ b/misc/style.h
@@ -17,12 +17,40 @@
 #ifndef STYLE_H
 #define STYLE_H
 
+#include <QColor>
+#include <QFont>
+
 class QString;
 
 class Style
 {
 public:
-    static QString get(const QString& filename);
+    enum ColorPalette
+    {
+        Green,
+        Yellow,
+        Red,
+        Black,
+        DarkGrey,
+        MediumGrey,
+        LightGrey,
+        White,
+    };
+
+    enum Font
+    {
+        ExtraBig,   // 14px, bold
+        Big,        // 12px
+        BigBold,    // 12px, bold
+        Medium,     // 11px
+        MediumBold, // 11px, bold
+        Small,      // 10px
+        SmallLight  // 10px, light
+    };
+
+    static QString getStylesheet(const QString& filename);
+    static QColor getColor(ColorPalette entry);
+    static QFont getFont(Font font);
 private:
     Style();
 };
diff --git a/ui/emoticonWidget/dot_page.png b/ui/emoticonWidget/dot_page.png
index c7c2aa172e2a03a298bf6f7f21c55384fc0617d4..e74d514e21cf6a0a7f3fa6f87fca8d11224d0f55 100644
GIT binary patch
delta 142
zcmV;90CE560oVbMQhx~^5(N+@R0bUY003o4L_t&-(~Xcj3V<*WM8~w=Oc4CsN3gc=
zND_NJij9Khv)MopjCnBC4!b)e89)!Lz+v)0rx;-7n<?J(M<YA;$5H^7q*7^4r%arr
wJ;S#Ns55@7Lh><T8s1%o!f%rY+Ax0r=%eJTcouT|00000Ne4wvM6N<$f~gQXr2qf`

delta 159
zcmV;Q0AT;v0qFsdQhx{m2LS+Zc-)@=004GLL_t&-(~XcZ3c^4XMBo4CNfoi3I|L81
zHr9e|0!i*6NfGb>TMF8EA)8+=$-Z)U%)l5y&iMi)po!=Q%#s!W3uy$dlo=%5ESjF|
z(|ODtksN3%#FJBr1K$eo<3L{__AY4y9y`)q(#r~mpCft$lNh8G;17Dj9C>iHTcZE~
N002ovPDHLkV1lUoKeYe=

diff --git a/ui/emoticonWidget/dot_page_current.png b/ui/emoticonWidget/dot_page_current.png
index aa101903afbe49b8301478ab8d62053662ad07a4..7b18c42c216e4043588c1dd827246efc81f62347 100644
GIT binary patch
delta 160
zcmV;R0AK%y0_p*fQhx~^5(YRp%>5()004JML_t&-(~XcZ3WHD(MBm@@xJ^P1BA#P0
z&DMdmUogRIh!%kyA`lxdWV5B{f93F)fk_0znj4@6s)$zLZR!(13aJO~?9-XLr)U~E
zrk0pHqZQy%AYO$+1Xv2ZzW}*F%wp;v;CUcDO#Pd74!=e80~ubXJ_BqW7#z+n{nqaQ
O0000<MNUMnLSTY+073Nt

delta 189
zcmV;u07C!j0fz#RQhx{m1}hrlvxE8o005LpL_t&-(~Zh24#GebM&a{M7eVl?L%{;D
zQ%Smzf<UtXNC=XIB@k?{MB%`IBC`~di>c%>pFBCD7h`NBweCLZ(_PZ8>$($w0P4El
zy8E2ZHfFX|jIjZZ{5A`cTK;Q;yN@%*Ngz{@bj$dz0a#~@>oy{#^sK5X0Mjqi%FGT0
rKuYOcmgPgz5EuY2-~uenY!C1TL+vY1V!_+~00000NkvXXu0mjf17=jA

diff --git a/ui/emoticonWidget/dot_page_hover.png b/ui/emoticonWidget/dot_page_hover.png
index 1c23931b921ef2be1841c3404062acc16234ebcc..822dbb6c62fa37a722652a85770df1f574d56373 100644
GIT binary patch
delta 159
zcmV;Q0AT;^0qFsdQhx~^5(hW2Xwmcl004GLL_t&-(~XcZ3c^4XMBo3XnIe_qK|&6)
zHr9e|0w(teNfF2)1Z`~gI5xjr;=Xct%)l5y&bb2;&_whFCP@o`h4cijlo=%5EShGH
zX+7rtksLTxh-aq~2R;?v+kw79>|N3ZJPxG0q}>XKUm|(|qZp(W;0MEY95-u3c#Qx6
N002ovPDHLkV1i`1K#2eV

delta 163
zcmV;U09^m+0qp^hQhx{v4FWi+!8H{C004SPL_t&-(~XcZ3Iah81gqyU7a1u&<nSS9
zVqhegOmKqw579vI5rQU{&1W>3aM{}mo1z<9B;EeE0R~`^(F9z>bq7#NXJAX2Q@D1@
zrW<v7%egrQ1C|Zq%4o!ZZ-e(SU~CXa3)d4kR-{9?UMd{E&K&3sT*CDL_yfXx9U;{(
R{_X$(002ovPDHLkV1gC?K~(?%

diff --git a/ui/emoticonWidget/emoticonWidget.css b/ui/emoticonWidget/emoticonWidget.css
index a1aab7de3..eb168a07e 100644
--- a/ui/emoticonWidget/emoticonWidget.css
+++ b/ui/emoticonWidget/emoticonWidget.css
@@ -35,6 +35,6 @@ QRadioButton::indicator::checked
 
 QMenu
 {
-     background-color: rgb(240,240,240); /* sets background of the menu */
-     border: 1px solid;
+     background-color: #414141; /* sets background of the menu */
+     border: 0px solid;
 }
diff --git a/widget/emoticonswidget.cpp b/widget/emoticonswidget.cpp
index 1e3d0ea4e..8383c79a9 100644
--- a/widget/emoticonswidget.cpp
+++ b/widget/emoticonswidget.cpp
@@ -27,7 +27,7 @@
 EmoticonsWidget::EmoticonsWidget(QWidget *parent) :
     QMenu(parent)
 {
-    setStyleSheet(Style::get(":/ui/emoticonWidget/emoticonWidget.css"));
+    setStyleSheet(Style::getStylesheet(":/ui/emoticonWidget/emoticonWidget.css"));
     setLayout(&layout);
     layout.addWidget(&stack);
 
diff --git a/widget/form/chatform.cpp b/widget/form/chatform.cpp
index ed307bc89..8697da744 100644
--- a/widget/form/chatform.cpp
+++ b/widget/form/chatform.cpp
@@ -34,18 +34,25 @@
 #include "core.h"
 #include "widget/widget.h"
 #include "widget/maskablepixmapwidget.h"
+#include "style.h"
 
 ChatForm::ChatForm(Friend* chatFriend)
     : f(chatFriend)
 {
     nameLabel->setText(f->getName());
-    avatar->setPixmap(QPixmap(":/img/contact_dark.png"));
+
+    avatar->setPixmap(QPixmap(":/img/contact_dark.png"), Qt::transparent);
 
     statusMessageLabel = new CroppingLabel();
+    statusMessageLabel->setFont(Style::getFont(Style::Medium));
+    QPalette pal; pal.setColor(QPalette::WindowText, Style::getColor(Style::MediumGrey));
+    statusMessageLabel->setPalette(pal);
+
     netcam = new NetCamView();
 
     headTextLayout->addWidget(statusMessageLabel);
     headTextLayout->addStretch();
+    headTextLayout->setSpacing(0);
 
     connect(Core::getInstance(), &Core::fileSendStarted, this, &ChatForm::startFileSend);
     connect(Core::getInstance(), &Core::videoFrameReceived, netcam, &NetCamView::updateDisplay);
@@ -507,5 +514,5 @@ void ChatForm::onAvatarRemoved(int FriendId)
     if (FriendId != f->friendId)
         return;
 
-    avatar->setPixmap(QPixmap(":/img/contact_dark.png"));
+    avatar->setPixmap(QPixmap(":/img/contact_dark.png"), Qt::transparent);
 }
diff --git a/widget/form/genericchatform.cpp b/widget/form/genericchatform.cpp
index 26bd958ba..2abdd0def 100644
--- a/widget/form/genericchatform.cpp
+++ b/widget/form/genericchatform.cpp
@@ -36,6 +36,10 @@ GenericChatForm::GenericChatForm(QWidget *parent) :
     headWidget = new QWidget();
 
     nameLabel = new CroppingLabel();
+    nameLabel->setFont(Style::getFont(Style::MediumBold));
+    QPalette pal; pal.setColor(QPalette::WindowText, Style::getColor(Style::DarkGrey));
+    nameLabel->setPalette(pal);
+
     avatar = new MaskablePixmapWidget(this, QSize(40,40), ":/img/avatar_mask.png");
     QHBoxLayout *headLayout = new QHBoxLayout(), *mainFootLayout = new QHBoxLayout();
     headTextLayout = new QVBoxLayout();
@@ -43,8 +47,8 @@ GenericChatForm::GenericChatForm(QWidget *parent) :
     QVBoxLayout *footButtonsSmall = new QVBoxLayout(), *volMicLayout = new QVBoxLayout();
 
     chatWidget = new ChatAreaWidget();
-    chatWidget->document()->setDefaultStyleSheet(Style::get(":ui/chatArea/innerStyle.css"));
-    chatWidget->setStyleSheet(Style::get(":/ui/chatArea/chatArea.css"));
+    chatWidget->document()->setDefaultStyleSheet(Style::getStylesheet(":ui/chatArea/innerStyle.css"));
+    chatWidget->setStyleSheet(Style::getStylesheet(":/ui/chatArea/chatArea.css"));
 
     msgEdit = new ChatTextEdit();
 
@@ -63,25 +67,25 @@ GenericChatForm::GenericChatForm(QWidget *parent) :
 
     footButtonsSmall->setSpacing(2);
 
-    msgEdit->setStyleSheet(Style::get(":/ui/msgEdit/msgEdit.css"));
+    msgEdit->setStyleSheet(Style::getStylesheet(":/ui/msgEdit/msgEdit.css"));
     msgEdit->setFixedHeight(50);
     msgEdit->setFrameStyle(QFrame::NoFrame);
 
-    sendButton->setStyleSheet(Style::get(":/ui/sendButton/sendButton.css"));
-    fileButton->setStyleSheet(Style::get(":/ui/fileButton/fileButton.css"));
-    emoteButton->setStyleSheet(Style::get(":/ui/emoteButton/emoteButton.css"));
+    sendButton->setStyleSheet(Style::getStylesheet(":/ui/sendButton/sendButton.css"));
+    fileButton->setStyleSheet(Style::getStylesheet(":/ui/fileButton/fileButton.css"));
+    emoteButton->setStyleSheet(Style::getStylesheet(":/ui/emoteButton/emoteButton.css"));
 
     callButton->setObjectName("green");
-    callButton->setStyleSheet(Style::get(":/ui/callButton/callButton.css"));
+    callButton->setStyleSheet(Style::getStylesheet(":/ui/callButton/callButton.css"));
 
     videoButton->setObjectName("green");
-    videoButton->setStyleSheet(Style::get(":/ui/videoButton/videoButton.css"));
+    videoButton->setStyleSheet(Style::getStylesheet(":/ui/videoButton/videoButton.css"));
 
-    QString volButtonStylesheet = Style::get(":/ui/volButton/volButton.css");
+    QString volButtonStylesheet = Style::getStylesheet(":/ui/volButton/volButton.css");
     volButton->setObjectName("green");
     volButton->setStyleSheet(volButtonStylesheet);
 
-    QString micButtonStylesheet = Style::get(":/ui/micButton/micButton.css");
+    QString micButtonStylesheet = Style::getStylesheet(":/ui/micButton/micButton.css");
     micButton->setObjectName("green");
     micButton->setStyleSheet(micButtonStylesheet);
 
diff --git a/widget/form/groupchatform.cpp b/widget/form/groupchatform.cpp
index 7622f2cf0..5c3253afe 100644
--- a/widget/form/groupchatform.cpp
+++ b/widget/form/groupchatform.cpp
@@ -21,6 +21,7 @@
 #include "widget/croppinglabel.h"
 #include "widget/maskablepixmapwidget.h"
 #include "core.h"
+#include "style.h"
 #include <QPushButton>
 #include <QMimeData>
 #include <QDragEnterEvent>
@@ -41,9 +42,13 @@ GroupChatForm::GroupChatForm(Group* chatGroup)
     small.setPixelSize(10);
 
     nameLabel->setText(group->widget->name.text());
-    nusersLabel->setFont(small);
+
+    nusersLabel->setFont(Style::getFont(Style::Medium));
     nusersLabel->setText(GroupChatForm::tr("%1 users in chat","Number of users in chat").arg(group->peers.size()));
-    avatar->setPixmap(QPixmap(":/img/group_dark.png"));
+    QPalette pal; pal.setColor(QPalette::WindowText, Style::getColor(Style::MediumGrey));
+    nusersLabel->setPalette(pal);
+
+    avatar->setPixmap(QPixmap(":/img/group_dark.png"), Qt::transparent);
 
     QString names;
     for (QString& s : group->peers)
diff --git a/widget/friendwidget.cpp b/widget/friendwidget.cpp
index 32971b098..be83930ec 100644
--- a/widget/friendwidget.cpp
+++ b/widget/friendwidget.cpp
@@ -23,6 +23,7 @@
 #include "core.h"
 #include "widget/form/chatform.h"
 #include "widget/maskablepixmapwidget.h"
+#include "style.h"
 #include <QContextMenuEvent>
 #include <QMenu>
 #include <QDrag>
@@ -31,7 +32,8 @@
 #include <QBitmap>
 
 FriendWidget::FriendWidget(int FriendId, QString id)
-    : friendId(FriendId), isDefaultAvatar{true}
+    : friendId(FriendId)
+    , isDefaultAvatar{true}
 {
     setMouseTracking(true);
     setAutoFillBackground(true);
@@ -45,22 +47,28 @@ 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_dark.png"));
+    avatar->setPixmap(QPixmap(":img/contact.png"), Qt::transparent);
+
     name.setText(id);
     //statusPic.setAlignment(Qt::AlignHCenter);
     statusPic.setPixmap(QPixmap(":img/status/dot_away.png"));
-    QFont small;
-    small.setPixelSize(10);
-    statusMessage.setFont(small);
+
+    // status text
     QPalette pal;
-    pal.setColor(QPalette::WindowText,Qt::gray);
+    pal.setColor(QPalette::WindowText, Style::getColor(Style::LightGrey));
     statusMessage.setPalette(pal);
+    statusMessage.setFont(Style::getFont(Style::Medium));
+
+    // name text
     QPalette pal2;
-    pal2.setColor(QPalette::WindowText,Qt::white);
+    pal2.setColor(QPalette::WindowText, Style::getColor(Style::White));
     name.setPalette(pal2);
+    name.setFont(Style::getFont(Style::Big));
+
+    // background
     QPalette pal3;
-    pal3.setColor(QPalette::Background, QColor(65,65,65,255));
-    this->setPalette(pal3);
+    pal3.setColor(QPalette::Background, Style::getColor(Style::MediumGrey));
+    setPalette(pal3);
 
     textLayout.addStretch();
     textLayout.addWidget(&name);
@@ -69,13 +77,11 @@ FriendWidget::FriendWidget(int FriendId, QString id)
 
     layout.addSpacing(20);
     layout.addWidget(avatar);
-    layout.addSpacing(5);
+    layout.addSpacing(10);
     layout.addLayout(&textLayout);
-    layout.addSpacing(5);
+    layout.addSpacing(10);
     layout.addWidget(&statusPic);
-    layout.addSpacing(5);
-
-    isActiveWidget = 0;
+    layout.addSpacing(10);
 
     layout.invalidate();
     layout.update();
@@ -126,38 +132,39 @@ void FriendWidget::contextMenuEvent(QContextMenuEvent * event)
 
 void FriendWidget::setAsActiveChatroom()
 {
-    isActiveWidget = 1;
+    setActive(true);
 
-    QFont small;
-    small.setPixelSize(10);
-    statusMessage.setFont(small);
+    // status
     QPalette pal;
-    pal.setColor(QPalette::WindowText,Qt::darkGray);
+    pal.setColor(QPalette::WindowText, Style::getColor(Style::MediumGrey));
     statusMessage.setPalette(pal);
+
+    // name
     QPalette pal2;
-    pal2.setColor(QPalette::WindowText,Qt::black);
+    pal2.setColor(QPalette::WindowText, Style::getColor(Style::DarkGrey));
     name.setPalette(pal2);
-    QPalette pal3;
-    pal3.setColor(QPalette::Background, Qt::white);
-    this->setPalette(pal3);
+
+    if (isDefaultAvatar)
+        avatar->setPixmap(QPixmap(":img/contact_dark.png"), Qt::transparent);
 }
 
 void FriendWidget::setAsInactiveChatroom()
 {
-    isActiveWidget = 0;
+    setActive(false);
 
-    QFont small;
-    small.setPixelSize(10);
-    statusMessage.setFont(small);
+    // status
     QPalette pal;
-    pal.setColor(QPalette::WindowText,Qt::gray);
+    pal.setColor(QPalette::WindowText, Style::getColor(Style::LightGrey));
     statusMessage.setPalette(pal);
+
+    // name
     QPalette pal2;
-    pal2.setColor(QPalette::WindowText,Qt::white);
+    pal2.setColor(QPalette::WindowText, Style::getColor(Style::White));
     name.setPalette(pal2);
     QPalette pal3;
-    pal3.setColor(QPalette::Background, QColor(65,65,65,255));
-    this->setPalette(pal3);
+
+    if (isDefaultAvatar)
+        avatar->setPixmap(QPixmap(":img/contact.png"), Qt::transparent);
 }
 
 void FriendWidget::updateStatusLight()
@@ -211,7 +218,7 @@ void FriendWidget::onAvatarRemoved(int FriendId)
         return;
 
     isDefaultAvatar = true;
-    avatar->setPixmap(QPixmap(":img/contact_dark.png"));
+    avatar->setPixmap(QPixmap(":img/contact.png"), Qt::transparent);
 }
 
 void FriendWidget::mousePressEvent(QMouseEvent *ev)
diff --git a/widget/genericchatroomwidget.cpp b/widget/genericchatroomwidget.cpp
index 234da1222..224c8f463 100644
--- a/widget/genericchatroomwidget.cpp
+++ b/widget/genericchatroomwidget.cpp
@@ -15,55 +15,55 @@
 */
 
 #include "genericchatroomwidget.h"
+#include "style.h"
 #include <QMouseEvent>
 
-GenericChatroomWidget::GenericChatroomWidget(QWidget *parent) :
-    QWidget(parent)
+GenericChatroomWidget::GenericChatroomWidget(QWidget *parent)
+    : QWidget(parent)
+    , isActiveWidget(false)
 {
 }
 
-int GenericChatroomWidget::isActive()
+bool GenericChatroomWidget::isActive()
 {
     return isActiveWidget;
 }
 
-void GenericChatroomWidget::mousePressEvent(QMouseEvent *event)
+void GenericChatroomWidget::setActive(bool active)
 {
-    if ((event->buttons() & Qt::LeftButton) == Qt::LeftButton)
+    isActiveWidget = active;
+
+    if (active)
     {
-        if (isActive())
-        {
-            QPalette pal;
-            pal.setColor(QPalette::Background, QColor(250,250,250,255));
-            this->setPalette(pal);
-        }
-        else
-        {
-            QPalette pal;
-            pal.setColor(QPalette::Background, QColor(85,85,85,255));
-            this->setPalette(pal);
-        }
+        QPalette pal;
+        pal.setColor(QPalette::Background, Style::getColor(Style::White));
+        setPalette(pal);
+    }
+    else
+    {
+        QPalette pal;
+        pal.setColor(QPalette::Background, Style::getColor(Style::MediumGrey));
+        setPalette(pal);
     }
 }
 
 void GenericChatroomWidget::leaveEvent(QEvent *)
 {
-    if (isActive() != 1)
+    if (!isActive())
     {
         QPalette pal;
-        pal.setColor(QPalette::Background, lastColor);
-        this->setPalette(pal);
+        pal.setColor(QPalette::Background, Style::getColor(Style::MediumGrey));
+        setPalette(pal);
     }
 }
 
 void GenericChatroomWidget::enterEvent(QEvent *)
 {
-    if (isActive() != 1)
+    if (!isActive())
     {
         QPalette pal;
-        pal.setColor(QPalette::Background, QColor(75,75,75,255));
-        lastColor = this->palette().background().color();
-        this->setPalette(pal);
+        pal.setColor(QPalette::Background, Style::getColor(Style::MediumGrey).lighter(120));
+        setPalette(pal);
     }
 }
 
diff --git a/widget/genericchatroomwidget.h b/widget/genericchatroomwidget.h
index 14e46c16e..84b1f2669 100644
--- a/widget/genericchatroomwidget.h
+++ b/widget/genericchatroomwidget.h
@@ -30,7 +30,6 @@ class GenericChatroomWidget : public QWidget
     Q_OBJECT
 public:
     GenericChatroomWidget(QWidget *parent = 0);
-    void mousePressEvent(QMouseEvent *event);
     void mouseReleaseEvent (QMouseEvent* event);
     void leaveEvent(QEvent *);
     void enterEvent(QEvent *);
@@ -41,15 +40,18 @@ public:
     virtual void setChatForm(Ui::MainWindow &){;}
     virtual void resetEventFlags(){;}
 
-    int isActive();
+    bool isActive();
+    void setActive(bool active);
 
 signals:
     void chatroomWidgetClicked(GenericChatroomWidget* widget);
 
 public slots:
 
+private:
+    bool isActiveWidget;
+
 protected:
-    int isActiveWidget;
     QColor lastColor;
     QHBoxLayout layout;
     QVBoxLayout textLayout;
diff --git a/widget/groupwidget.cpp b/widget/groupwidget.cpp
index 949fefbdc..d2af2ba4c 100644
--- a/widget/groupwidget.cpp
+++ b/widget/groupwidget.cpp
@@ -20,6 +20,7 @@
 #include "misc/settings.h"
 #include "widget/form/groupchatform.h"
 #include "widget/maskablepixmapwidget.h"
+#include "style.h"
 #include <QPalette>
 #include <QMenu>
 #include <QContextMenuEvent>
@@ -40,21 +41,28 @@ GroupWidget::GroupWidget(int GroupId, QString Name)
     setLayoutDirection(Qt::LeftToRight); // parent might have set Qt::RightToLeft
 
     avatar = new MaskablePixmapWidget(this, QSize(40,40), ":/img/avatar_mask.png");
-    avatar->setPixmap(QPixmap(":img/group_dark.png"));
+    avatar->setPixmap(QPixmap(":img/group.png"), Qt::transparent);
+
     statusPic.setPixmap(QPixmap(":img/status/dot_online.png"));
-    name.setText(Name);
-    QFont small;
-    small.setPixelSize(10);
-    nusers.setFont(small);
-    QPalette pal;
-    pal.setColor(QPalette::WindowText,Qt::gray);
-    nusers.setPalette(pal);
+
+    // name
     QPalette pal2;
-    pal2.setColor(QPalette::WindowText,Qt::white);
+    pal2.setColor(QPalette::WindowText, Style::getColor(Style::White));
     name.setPalette(pal2);
+    name.setText(Name);
+    name.setFont(Style::getFont(Style::Big));
+
+    // status
+    QPalette pal;
+    pal.setColor(QPalette::WindowText, Style::getColor(Style::LightGrey));
+    nusers.setPalette(pal);
+    nusers.setFont(Style::getFont(Style::Medium));
+
+    // background
     QPalette pal3;
-    pal3.setColor(QPalette::Background, QColor(65,65,65,255));
+    pal3.setColor(QPalette::Background, Style::getColor(Style::MediumGrey));
     this->setPalette(pal3);
+
     Group* g = GroupList::findGroup(groupId);
     if (g)
         nusers.setText(GroupWidget::tr("%1 users in chat").arg(g->peers.size()));
@@ -68,14 +76,12 @@ GroupWidget::GroupWidget(int GroupId, QString Name)
 
     layout.addSpacing(20);
     layout.addWidget(avatar);
-    layout.addSpacing(5);
+    layout.addSpacing(10);
     layout.addLayout(&textLayout);
     layout.addStretch();
-    layout.addSpacing(5);
+    layout.addSpacing(10);
     layout.addWidget(&statusPic);
-    layout.addSpacing(5);
-
-    isActiveWidget = 0;
+    layout.addSpacing(10);
 }
 
 void GroupWidget::contextMenuEvent(QContextMenuEvent * event)
@@ -106,40 +112,36 @@ void GroupWidget::onUserListChanged()
 
 void GroupWidget::setAsActiveChatroom()
 {
-    isActiveWidget = 1;
+    setActive(true);
 
-    QFont small;
-    small.setPixelSize(10);
-    nusers.setFont(small);
+    // status
     QPalette pal;
-    pal.setColor(QPalette::WindowText,Qt::darkGray);
+    pal.setColor(QPalette::WindowText, Style::getColor(Style::MediumGrey));
     nusers.setPalette(pal);
+
+    // name
     QPalette pal2;
-    pal2.setColor(QPalette::WindowText,Qt::black);
+    pal2.setColor(QPalette::WindowText, Style::getColor(Style::DarkGrey));
     name.setPalette(pal2);
-    QPalette pal3;
-    pal3.setColor(QPalette::Background, Qt::white);
-    this->setPalette(pal3);
-    avatar->setPixmap(QPixmap(":img/group_dark.png"));
+
+    avatar->setPixmap(QPixmap(":img/group_dark.png"), Qt::transparent);
 }
 
 void GroupWidget::setAsInactiveChatroom()
 {
-    isActiveWidget = 0;
+    setActive(false);
 
-    QFont small;
-    small.setPixelSize(10);
-    nusers.setFont(small);
+    // status
     QPalette pal;
-    pal.setColor(QPalette::WindowText,Qt::gray);
+    pal.setColor(QPalette::WindowText, Style::getColor(Style::LightGrey));
     nusers.setPalette(pal);
+
+    // name
     QPalette pal2;
-    pal2.setColor(QPalette::WindowText,Qt::white);
+    pal2.setColor(QPalette::WindowText, Style::getColor(Style::White));
     name.setPalette(pal2);
-    QPalette pal3;
-    pal3.setColor(QPalette::Background, QColor(65,65,65,255));
-    this->setPalette(pal3);
-    avatar->setPixmap(QPixmap(":img/group_dark.png"));
+
+    avatar->setPixmap(QPixmap(":img/group.png"), Qt::transparent);
 }
 
 void GroupWidget::updateStatusLight()
diff --git a/widget/maskablepixmapwidget.cpp b/widget/maskablepixmapwidget.cpp
index 8cdf5d21b..185494147 100644
--- a/widget/maskablepixmapwidget.cpp
+++ b/widget/maskablepixmapwidget.cpp
@@ -17,11 +17,10 @@
 #include "maskablepixmapwidget.h"
 #include <QPainter>
 
-MaskablePixmapWidget::MaskablePixmapWidget(QWidget *parent, QSize size, QString maskName, bool autopickBackground)
+MaskablePixmapWidget::MaskablePixmapWidget(QWidget *parent, QSize size, QString maskName)
     : QWidget(parent)
     , backgroundColor(Qt::white)
     , clickable(false)
-    , autoBackground(autopickBackground)
 {
     setFixedSize(size);
 
@@ -38,29 +37,30 @@ void MaskablePixmapWidget::autopickBackground()
     if (pic.isNull())
         return;
 
-    qreal r = 0.0f;
-    qreal g = 0.0f;
-    qreal b = 0.0f;
-    float weight = 1.0f;
+    int r = 0;
+    int g = 0;
+    int b = 0;
+    int weight = 0;
 
     for (int x=0;x<pic.width();++x)
     {
         for (int y=0;y<pic.height();++y)
         {
             QRgb color = pic.pixel(x,y);
-            r += qRed(color) / 255.0f;
-            g += qGreen(color) / 255.0f;
-            b += qBlue(color) / 255.0f;
+            r += qRed(color);
+            g += qGreen(color);
+            b += qBlue(color);
 
-            weight += qAlpha(color) / 255.0f;
+            weight += qAlpha(color);
         }
     }
 
+    weight = qMax(1, weight / 255);
     r /= weight;
     g /= weight;
     b /= weight;
 
-    QColor color = QColor::fromRgbF(r,g,b);
+    QColor color = QColor::fromRgb(r,g,b);
     backgroundColor =  QColor::fromRgb(0xFFFFFF ^ color.rgb());
 
     update();
@@ -82,14 +82,23 @@ void MaskablePixmapWidget::setClickable(bool clickable)
         unsetCursor();
 }
 
+void MaskablePixmapWidget::setPixmap(const QPixmap &pmap, QColor background)
+{
+    if (!pmap.isNull())
+    {
+        pixmap = pmap.scaled(width(), height(), Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
+        backgroundColor = background;
+
+        update();
+    }
+}
+
 void MaskablePixmapWidget::setPixmap(const QPixmap &pmap)
 {
     if (!pmap.isNull())
     {
         pixmap = pmap.scaled(width(), height(), Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
-
-        if (autoBackground)
-            autopickBackground();
+        autopickBackground();
 
         update();
     }
diff --git a/widget/maskablepixmapwidget.h b/widget/maskablepixmapwidget.h
index d3e8d3616..2fe92c180 100644
--- a/widget/maskablepixmapwidget.h
+++ b/widget/maskablepixmapwidget.h
@@ -23,11 +23,12 @@ class MaskablePixmapWidget : public QWidget
 {
     Q_OBJECT
 public:
-    MaskablePixmapWidget(QWidget *parent, QSize size, QString maskName = QString(), bool autopickBackground = true);
+    MaskablePixmapWidget(QWidget *parent, QSize size, QString maskName = QString());
 
     void autopickBackground();
     void setBackground(QColor color);
     void setClickable(bool clickable);
+    void setPixmap(const QPixmap &pmap, QColor background);
     void setPixmap(const QPixmap &pmap);
     QPixmap getPixmap() const;
 
@@ -45,7 +46,6 @@ private:
     QString maskName;
     QColor backgroundColor;
     bool clickable;
-    bool autoBackground;
 };
 
 #endif // MASKABLEPIXMAPWIDGET_H
diff --git a/widget/widget.cpp b/widget/widget.cpp
index a70fac605..e2c4770e9 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -68,17 +68,17 @@ Widget::Widget(QWidget *parent)
         this->layout()->setContentsMargins(0, 0, 0, 0);
 
         ui->friendList->setObjectName("friendList");
-        ui->friendList->setStyleSheet(Style::get(":ui/friendList/friendList.css"));
+        ui->friendList->setStyleSheet(Style::getStylesheet(":ui/friendList/friendList.css"));
     }
     else
     {
         this->setObjectName("activeWindow");
-        this->setStyleSheet(Style::get(":ui/window/window.css"));
+        this->setStyleSheet(Style::getStylesheet(":ui/window/window.css"));
         ui->statusPanel->setStyleSheet(QString(""));
         ui->friendList->setStyleSheet(QString(""));
 
         ui->friendList->setObjectName("friendList");
-        ui->friendList->setStyleSheet(Style::get(":ui/friendList/friendList.css"));
+        ui->friendList->setStyleSheet(Style::getStylesheet(":ui/friendList/friendList.css"));
 
         ui->tbMenu->setIcon(QIcon(":ui/window/applicationIcon.png"));
         ui->pbMin->setObjectName("minimizeButton");
@@ -116,6 +116,7 @@ Widget::Widget(QWidget *parent)
     profilePicture->setPixmap(QPixmap(":/img/contact_dark.png"));
     profilePicture->setClickable(true);
     ui->horizontalLayout_3->insertWidget(0,profilePicture);
+    ui->horizontalLayout_3->insertSpacing(1, 7);
 
     ui->mainContent->setLayout(new QVBoxLayout());
     ui->mainHead->setLayout(new QVBoxLayout());
@@ -129,13 +130,16 @@ Widget::Widget(QWidget *parent)
     ui->nameLabel->setEditable(true);
     ui->statusLabel->setEditable(true);
 
+    ui->statusLabel->setFont(Style::getFont(Style::Medium));
+    ui->nameLabel->setFont(Style::getFont(Style::ExtraBig));
+
     // delay setting username and message until Core inits
     //ui->nameLabel->setText(core->getUsername());
     ui->nameLabel->setStyleSheet("QLabel { color : white; font-size: 11pt; font-weight:bold;}");
     //ui->statusLabel->setText(core->getStatusMessage());
     ui->statusLabel->setStyleSheet("QLabel { color : white; font-size: 8pt;}");
 
-    ui->statusButton->setStyleSheet(Style::get(":/ui/statusButton/statusButton.css"));
+    ui->statusButton->setStyleSheet(Style::getStylesheet(":/ui/statusButton/statusButton.css"));
 
     QMenu *statusButtonMenu = new QMenu(ui->statusButton);
     QAction* setStatusOnline = statusButtonMenu->addAction(Widget::tr("Online","Button to set your status to 'Online'"));

From 214e428b7ea8efb6e40b3df5c6ed7fbb924bd611 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Tue, 30 Sep 2014 23:45:33 +0200
Subject: [PATCH 146/205] cleanup, use qss instead of QPalette

---
 misc/style.cpp                   | 16 +++++++-------
 widget/friendwidget.cpp          | 21 -------------------
 widget/genericchatroomwidget.cpp | 36 +++++++++++++-------------------
 widget/groupwidget.cpp           | 28 ++++++++-----------------
 4 files changed, 32 insertions(+), 69 deletions(-)

diff --git a/misc/style.cpp b/misc/style.cpp
index 0801cf154..84096aad8 100644
--- a/misc/style.cpp
+++ b/misc/style.cpp
@@ -19,7 +19,14 @@
 
 #include <QFile>
 #include <QDebug>
-#include <QVector>
+
+// helper function
+QFont appFont(int pixelSize, int weight) {
+    auto font = QFont();
+    font.setPixelSize(pixelSize);
+    font.setWeight(weight);
+    return font;
+}
 
 QString Style::getStylesheet(const QString &filename)
 {
@@ -51,13 +58,6 @@ QColor Style::getColor(Style::ColorPalette entry)
     return palette[entry];
 }
 
-QFont appFont(int pixelSize, int weight) {
-    auto font = QFont();
-    font.setPixelSize(pixelSize);
-    font.setWeight(weight);
-    return font;
-}
-
 QFont Style::getFont(Style::Font font)
 {
     static QFont fonts[] = {
diff --git a/widget/friendwidget.cpp b/widget/friendwidget.cpp
index be83930ec..cc4e925de 100644
--- a/widget/friendwidget.cpp
+++ b/widget/friendwidget.cpp
@@ -35,22 +35,10 @@ FriendWidget::FriendWidget(int FriendId, QString id)
     : friendId(FriendId)
     , isDefaultAvatar{true}
 {
-    setMouseTracking(true);
-    setAutoFillBackground(true);
-    setFixedHeight(55);
-    setLayout(&layout);
-    layout.setSpacing(0);
-    layout.setMargin(0);
-    layout.setStretchFactor(this, 100);
-    textLayout.setSpacing(0);
-    textLayout.setMargin(0);
-    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"), Qt::transparent);
 
     name.setText(id);
-    //statusPic.setAlignment(Qt::AlignHCenter);
     statusPic.setPixmap(QPixmap(":img/status/dot_away.png"));
 
     // status text
@@ -65,11 +53,6 @@ FriendWidget::FriendWidget(int FriendId, QString id)
     name.setPalette(pal2);
     name.setFont(Style::getFont(Style::Big));
 
-    // background
-    QPalette pal3;
-    pal3.setColor(QPalette::Background, Style::getColor(Style::MediumGrey));
-    setPalette(pal3);
-
     textLayout.addStretch();
     textLayout.addWidget(&name);
     textLayout.addWidget(&statusMessage);
@@ -82,11 +65,7 @@ FriendWidget::FriendWidget(int FriendId, QString id)
     layout.addSpacing(10);
     layout.addWidget(&statusPic);
     layout.addSpacing(10);
-
-    layout.invalidate();
-    layout.update();
     layout.activate();
-    updateGeometry();
 }
 
 void FriendWidget::contextMenuEvent(QContextMenuEvent * event)
diff --git a/widget/genericchatroomwidget.cpp b/widget/genericchatroomwidget.cpp
index 224c8f463..971e1c303 100644
--- a/widget/genericchatroomwidget.cpp
+++ b/widget/genericchatroomwidget.cpp
@@ -22,49 +22,43 @@ GenericChatroomWidget::GenericChatroomWidget(QWidget *parent)
     : QWidget(parent)
     , isActiveWidget(false)
 {
+    setMouseTracking(true);
+    setFixedHeight(55);
+
+    setLayout(&layout);
+    layout.setSpacing(0);
+    layout.setMargin(0);
+    textLayout.setSpacing(0);
+    textLayout.setMargin(0);
+    setLayoutDirection(Qt::LeftToRight); // parent might have set Qt::RightToLeft
+
+    setStyleSheet(QString("background-color: %1").arg(Style::getColor(Style::MediumGrey).name()));
 }
 
 bool GenericChatroomWidget::isActive()
 {
     return isActiveWidget;
 }
-
 void GenericChatroomWidget::setActive(bool active)
 {
     isActiveWidget = active;
 
     if (active)
-    {
-        QPalette pal;
-        pal.setColor(QPalette::Background, Style::getColor(Style::White));
-        setPalette(pal);
-    }
+        setStyleSheet(QString("background-color: %1").arg(Style::getColor(Style::White).name()));
     else
-    {
-        QPalette pal;
-        pal.setColor(QPalette::Background, Style::getColor(Style::MediumGrey));
-        setPalette(pal);
-    }
+        setStyleSheet(QString("background-color: %1").arg(Style::getColor(Style::MediumGrey).name()));
 }
 
 void GenericChatroomWidget::leaveEvent(QEvent *)
 {
     if (!isActive())
-    {
-        QPalette pal;
-        pal.setColor(QPalette::Background, Style::getColor(Style::MediumGrey));
-        setPalette(pal);
-    }
+        setStyleSheet(QString("background-color: %1").arg(Style::getColor(Style::MediumGrey).name()));
 }
 
 void GenericChatroomWidget::enterEvent(QEvent *)
 {
     if (!isActive())
-    {
-        QPalette pal;
-        pal.setColor(QPalette::Background, Style::getColor(Style::MediumGrey).lighter(120));
-        setPalette(pal);
-    }
+        setStyleSheet(QString("background-color: %1").arg(Style::getColor(Style::MediumGrey).lighter(120).name()));
 }
 
 void GenericChatroomWidget::mouseReleaseEvent(QMouseEvent*)
diff --git a/widget/groupwidget.cpp b/widget/groupwidget.cpp
index d2af2ba4c..0c24e7183 100644
--- a/widget/groupwidget.cpp
+++ b/widget/groupwidget.cpp
@@ -30,16 +30,6 @@
 GroupWidget::GroupWidget(int GroupId, QString Name)
     : groupId{GroupId}
 {
-    setMouseTracking(true);
-    setAutoFillBackground(true);
-    setLayout(&layout);
-    setFixedHeight(55);
-    layout.setSpacing(0);
-    layout.setMargin(0);
-    textLayout.setSpacing(0);
-    textLayout.setMargin(0);
-    setLayoutDirection(Qt::LeftToRight); // parent might have set Qt::RightToLeft
-
     avatar = new MaskablePixmapWidget(this, QSize(40,40), ":/img/avatar_mask.png");
     avatar->setPixmap(QPixmap(":img/group.png"), Qt::transparent);
 
@@ -58,11 +48,6 @@ GroupWidget::GroupWidget(int GroupId, QString Name)
     nusers.setPalette(pal);
     nusers.setFont(Style::getFont(Style::Medium));
 
-    // background
-    QPalette pal3;
-    pal3.setColor(QPalette::Background, Style::getColor(Style::MediumGrey));
-    this->setPalette(pal3);
-
     Group* g = GroupList::findGroup(groupId);
     if (g)
         nusers.setText(GroupWidget::tr("%1 users in chat").arg(g->peers.size()));
@@ -82,6 +67,7 @@ GroupWidget::GroupWidget(int GroupId, QString Name)
     layout.addSpacing(10);
     layout.addWidget(&statusPic);
     layout.addSpacing(10);
+    layout.activate();
 }
 
 void GroupWidget::contextMenuEvent(QContextMenuEvent * event)
@@ -154,16 +140,20 @@ void GroupWidget::updateStatusLight()
         {
             statusPic.setPixmap(QPixmap(":img/status/dot_online.png"));
         } else {
-            if (g->userWasMentioned == 0) statusPic.setPixmap(QPixmap(":img/status/dot_online_notification.png"));
-            else statusPic.setPixmap(QPixmap(":img/status/dot_online_notification.png"));
+            if (g->userWasMentioned == 0)
+                statusPic.setPixmap(QPixmap(":img/status/dot_online_notification.png"));
+            else
+                statusPic.setPixmap(QPixmap(":img/status/dot_online_notification.png"));
         }
     } else {
         if (g->hasNewMessages == 0)
         {
             statusPic.setPixmap(QPixmap(":img/status/dot_groupchat.png"));
         } else {
-            if (g->userWasMentioned == 0) statusPic.setPixmap(QPixmap(":img/status/dot_groupchat_newmessages.png"));
-            else statusPic.setPixmap(QPixmap(":img/status/dot_groupchat_notification.png"));
+            if (g->userWasMentioned == 0)
+                statusPic.setPixmap(QPixmap(":img/status/dot_groupchat_newmessages.png"));
+            else
+                statusPic.setPixmap(QPixmap(":img/status/dot_groupchat_notification.png"));
         }
     }
 }

From 7a292b815eef5ae6ff32f53c72319e39354e1ddb Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Wed, 1 Oct 2014 09:58:14 +0200
Subject: [PATCH 147/205] qss vars

---
 misc/style.cpp | 26 ++++++++++++++++++++++++++
 misc/style.h   |  3 +++
 2 files changed, 29 insertions(+)

diff --git a/misc/style.cpp b/misc/style.cpp
index 84096aad8..6b4322e70 100644
--- a/misc/style.cpp
+++ b/misc/style.cpp
@@ -19,6 +19,8 @@
 
 #include <QFile>
 #include <QDebug>
+#include <QMap>
+#include <QRegularExpression>
 
 // helper function
 QFont appFont(int pixelSize, int weight) {
@@ -51,6 +53,7 @@ QColor Style::getColor(Style::ColorPalette entry)
         QColor("#000000"),
         QColor("#1c1c1c"),
         QColor("#414141"),
+        QColor("#414141").lighter(120),
         QColor("#d1d1d1"),
         QColor("#ffffff"),
     };
@@ -72,3 +75,26 @@ QFont Style::getFont(Style::Font font)
 
     return fonts[font];
 }
+
+QString Style::resolve(QString qss)
+{
+    static QMap<QString, QString> dict = {
+        {"@green", getColor(Green).name()},
+        {"@yellow", getColor(Yellow).name()},
+        {"@red", getColor(Red).name()},
+        {"@black", getColor(Black).name()},
+        {"@darkGrey", getColor(DarkGrey).name()},
+        {"@mediumGrey", getColor(MediumGrey).name()},
+        {"@mediumGreyLight", getColor(MediumGreyLight).name()},
+        {"@lightGrey", getColor(LightGrey).name()},
+        {"@white", getColor(White).name()},
+    };
+
+    for (const QString& key : dict.keys())
+    {
+        qDebug() << key;
+        qss.replace(QRegularExpression(QString("%1\\b").arg(key)), dict[key]);
+    }
+
+    return qss;
+}
diff --git a/misc/style.h b/misc/style.h
index 326972d92..eba949325 100644
--- a/misc/style.h
+++ b/misc/style.h
@@ -33,6 +33,7 @@ public:
         Black,
         DarkGrey,
         MediumGrey,
+        MediumGreyLight,
         LightGrey,
         White,
     };
@@ -51,6 +52,8 @@ public:
     static QString getStylesheet(const QString& filename);
     static QColor getColor(ColorPalette entry);
     static QFont getFont(Font font);
+    static QString resolve(QString qss);
+
 private:
     Style();
 };

From f7f0f696d8f48ff9a1aac03a2ee875610c9a5625 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Wed, 1 Oct 2014 11:12:02 +0200
Subject: [PATCH 148/205] qss font symbols

---
 misc/style.cpp | 56 +++++++++++++++++++++++++++++++++++++++++++++-----
 misc/style.h   |  2 ++
 2 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/misc/style.cpp b/misc/style.cpp
index 6b4322e70..fb8378579 100644
--- a/misc/style.cpp
+++ b/misc/style.cpp
@@ -21,24 +21,45 @@
 #include <QDebug>
 #include <QMap>
 #include <QRegularExpression>
+#include <QWidget>
+#include <QStyle>
 
-// helper function
-QFont appFont(int pixelSize, int weight) {
+// helper functions
+QFont appFont(int pixelSize, int weight)
+{
     auto font = QFont();
     font.setPixelSize(pixelSize);
     font.setWeight(weight);
     return font;
 }
 
+QString cssifyWeight(int weight)
+{
+    QString weightStr = "normal";
+    if (weight == QFont::Bold)
+        weightStr = "bold";
+    if (weight == QFont::Light)
+        weightStr = "lighter";
+
+    return QString("%1").arg(weightStr);
+}
+
+QString cssifyFont(QFont font)
+{
+    return QString("%1px %2")
+            .arg(font.pixelSize())
+            .arg(font.weight());
+}
+
 QString Style::getStylesheet(const QString &filename)
 {
     if (!Settings::getInstance().getUseNativeStyle())
     {
         QFile file(filename);
         if (file.open(QFile::ReadOnly | QFile::Text))
-            return file.readAll();
+            return resolve(file.readAll());
         else
-            qWarning() << "Stylesheet " << filename << " not found";
+            qWarning() << "Style: Stylesheet " << filename << " not found";
     }
 
     return QString();
@@ -79,6 +100,7 @@ QFont Style::getFont(Style::Font font)
 QString Style::resolve(QString qss)
 {
     static QMap<QString, QString> dict = {
+        // colors
         {"@green", getColor(Green).name()},
         {"@yellow", getColor(Yellow).name()},
         {"@red", getColor(Red).name()},
@@ -88,13 +110,37 @@ QString Style::resolve(QString qss)
         {"@mediumGreyLight", getColor(MediumGreyLight).name()},
         {"@lightGrey", getColor(LightGrey).name()},
         {"@white", getColor(White).name()},
+
+        // fonts
+        {"@extraBig", cssifyFont(getFont(ExtraBig))},
+        {"@big", cssifyFont(getFont(Big))},
+        {"@bigBold", cssifyFont(getFont(BigBold))},
+        {"@medium", cssifyFont(getFont(Medium))},
+        {"@mediumBold", cssifyFont(getFont(MediumBold))},
+        {"@small", cssifyFont(getFont(Small))},
+        {"@smallLight", cssifyFont(getFont(SmallLight))},
     };
 
     for (const QString& key : dict.keys())
     {
-        qDebug() << key;
         qss.replace(QRegularExpression(QString("%1\\b").arg(key)), dict[key]);
     }
 
     return qss;
 }
+
+void Style::repolish(QWidget *w)
+{
+    w->style()->unpolish(w);
+    w->style()->polish(w);
+
+    for (QObject* o : w->children())
+    {
+        QWidget* c = qobject_cast<QWidget*>(o);
+        if (c)
+        {
+            c->style()->unpolish(c);
+            c->style()->polish(c);
+        }
+    }
+}
diff --git a/misc/style.h b/misc/style.h
index eba949325..35c0b7e98 100644
--- a/misc/style.h
+++ b/misc/style.h
@@ -21,6 +21,7 @@
 #include <QFont>
 
 class QString;
+class QWidget;
 
 class Style
 {
@@ -53,6 +54,7 @@ public:
     static QColor getColor(ColorPalette entry);
     static QFont getFont(Font font);
     static QString resolve(QString qss);
+    static void repolish(QWidget* w);
 
 private:
     Style();

From 04f56cc9ec16bda63d13ab1c5c67b041ac21bc9e Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Wed, 1 Oct 2014 11:13:49 +0200
Subject: [PATCH 149/205] unmessification

---
 friend.cpp                       |  8 ++--
 res.qrc                          |  1 +
 widget/form/chatform.cpp         |  1 +
 widget/form/groupchatform.cpp    |  2 +-
 widget/friendwidget.cpp          | 54 ++-------------------------
 widget/friendwidget.h            |  4 --
 widget/genericchatroomwidget.cpp | 64 ++++++++++++++++++++++++--------
 widget/genericchatroomwidget.h   | 18 ++++++---
 widget/groupwidget.cpp           | 61 +++---------------------------
 widget/groupwidget.h             |  4 --
 10 files changed, 75 insertions(+), 142 deletions(-)

diff --git a/friend.cpp b/friend.cpp
index 6676cea81..5f48197dd 100644
--- a/friend.cpp
+++ b/friend.cpp
@@ -36,19 +36,17 @@ Friend::~Friend()
 
 void Friend::setName(QString name)
 {
-    widget->name.setText(name);
-    widget->name.setToolTip(name); // for overlength names
+    widget->setName(name);
     chatForm->setName(name);
 }
 
 void Friend::setStatusMessage(QString message)
 {
-    widget->statusMessage.setText(message);
-    widget->statusMessage.setToolTip(message); // for overlength messsages
+    widget->setStatusMsg(message);
     chatForm->setStatusMessage(message);
 }
 
 QString Friend::getName()
 {
-    return widget->name.text();
+    return widget->getName();
 }
diff --git a/res.qrc b/res.qrc
index c4719df01..5b4910039 100644
--- a/res.qrc
+++ b/res.qrc
@@ -145,5 +145,6 @@
         <file>translations/uk.qm</file>
         <file>img/avatar_mask.png</file>
         <file>img/group_2x.png</file>
+        <file>ui/chatroomWidgets/genericChatroomWidget.css</file>
     </qresource>
 </RCC>
diff --git a/widget/form/chatform.cpp b/widget/form/chatform.cpp
index 8697da744..efe61f818 100644
--- a/widget/form/chatform.cpp
+++ b/widget/form/chatform.cpp
@@ -34,6 +34,7 @@
 #include "core.h"
 #include "widget/widget.h"
 #include "widget/maskablepixmapwidget.h"
+#include "widget/croppinglabel.h"
 #include "style.h"
 
 ChatForm::ChatForm(Friend* chatFriend)
diff --git a/widget/form/groupchatform.cpp b/widget/form/groupchatform.cpp
index 5c3253afe..77e64ea83 100644
--- a/widget/form/groupchatform.cpp
+++ b/widget/form/groupchatform.cpp
@@ -41,7 +41,7 @@ GroupChatForm::GroupChatForm(Group* chatGroup)
     QFont small;
     small.setPixelSize(10);
 
-    nameLabel->setText(group->widget->name.text());
+    nameLabel->setText(group->widget->getName());
 
     nusersLabel->setFont(Style::getFont(Style::Medium));
     nusersLabel->setText(GroupChatForm::tr("%1 users in chat","Number of users in chat").arg(group->peers.size()));
diff --git a/widget/friendwidget.cpp b/widget/friendwidget.cpp
index cc4e925de..9159d3e7f 100644
--- a/widget/friendwidget.cpp
+++ b/widget/friendwidget.cpp
@@ -23,6 +23,7 @@
 #include "core.h"
 #include "widget/form/chatform.h"
 #include "widget/maskablepixmapwidget.h"
+#include "widget/croppinglabel.h"
 #include "style.h"
 #include <QContextMenuEvent>
 #include <QMenu>
@@ -35,37 +36,9 @@ FriendWidget::FriendWidget(int FriendId, QString id)
     : friendId(FriendId)
     , isDefaultAvatar{true}
 {
-    avatar = new MaskablePixmapWidget(this, QSize(40,40), ":/img/avatar_mask.png");
     avatar->setPixmap(QPixmap(":img/contact.png"), Qt::transparent);
-
-    name.setText(id);
     statusPic.setPixmap(QPixmap(":img/status/dot_away.png"));
-
-    // status text
-    QPalette pal;
-    pal.setColor(QPalette::WindowText, Style::getColor(Style::LightGrey));
-    statusMessage.setPalette(pal);
-    statusMessage.setFont(Style::getFont(Style::Medium));
-
-    // name text
-    QPalette pal2;
-    pal2.setColor(QPalette::WindowText, Style::getColor(Style::White));
-    name.setPalette(pal2);
-    name.setFont(Style::getFont(Style::Big));
-
-    textLayout.addStretch();
-    textLayout.addWidget(&name);
-    textLayout.addWidget(&statusMessage);
-    textLayout.addStretch();
-
-    layout.addSpacing(20);
-    layout.addWidget(avatar);
-    layout.addSpacing(10);
-    layout.addLayout(&textLayout);
-    layout.addSpacing(10);
-    layout.addWidget(&statusPic);
-    layout.addSpacing(10);
-    layout.activate();
+    nameLabel->setText(id);
 }
 
 void FriendWidget::contextMenuEvent(QContextMenuEvent * event)
@@ -77,7 +50,7 @@ void FriendWidget::contextMenuEvent(QContextMenuEvent * event)
     QMap<QAction*, Group*> groupActions;
     for (Group* group : GroupList::groupList)
     {
-        QAction* groupAction = inviteMenu->addAction(group->widget->name.text());
+        QAction* groupAction = inviteMenu->addAction(group->widget->getName());
         groupActions[groupAction] =  group;
     }
     if (groupActions.isEmpty())
@@ -113,16 +86,6 @@ void FriendWidget::setAsActiveChatroom()
 {
     setActive(true);
 
-    // status
-    QPalette pal;
-    pal.setColor(QPalette::WindowText, Style::getColor(Style::MediumGrey));
-    statusMessage.setPalette(pal);
-
-    // name
-    QPalette pal2;
-    pal2.setColor(QPalette::WindowText, Style::getColor(Style::DarkGrey));
-    name.setPalette(pal2);
-
     if (isDefaultAvatar)
         avatar->setPixmap(QPixmap(":img/contact_dark.png"), Qt::transparent);
 }
@@ -131,17 +94,6 @@ void FriendWidget::setAsInactiveChatroom()
 {
     setActive(false);
 
-    // status
-    QPalette pal;
-    pal.setColor(QPalette::WindowText, Style::getColor(Style::LightGrey));
-    statusMessage.setPalette(pal);
-
-    // name
-    QPalette pal2;
-    pal2.setColor(QPalette::WindowText, Style::getColor(Style::White));
-    name.setPalette(pal2);
-    QPalette pal3;
-
     if (isDefaultAvatar)
         avatar->setPixmap(QPixmap(":img/contact.png"), Qt::transparent);
 }
diff --git a/widget/friendwidget.h b/widget/friendwidget.h
index cc29c0385..a04a5e76e 100644
--- a/widget/friendwidget.h
+++ b/widget/friendwidget.h
@@ -20,7 +20,6 @@
 #include <QLabel>
 
 #include "genericchatroomwidget.h"
-#include "croppinglabel.h"
 
 class QPixmap;
 class MaskablePixmapWidget;
@@ -52,9 +51,6 @@ protected:
 
 public:
     int friendId;
-    MaskablePixmapWidget* avatar;
-    QLabel statusPic;
-    CroppingLabel name, statusMessage;
     bool isDefaultAvatar;
     QPoint dragStartPos;
 };
diff --git a/widget/genericchatroomwidget.cpp b/widget/genericchatroomwidget.cpp
index 971e1c303..ab0d13810 100644
--- a/widget/genericchatroomwidget.cpp
+++ b/widget/genericchatroomwidget.cpp
@@ -16,13 +16,14 @@
 
 #include "genericchatroomwidget.h"
 #include "style.h"
+#include "widget/maskablepixmapwidget.h"
+#include "croppinglabel.h"
 #include <QMouseEvent>
+#include <QStyle>
 
 GenericChatroomWidget::GenericChatroomWidget(QWidget *parent)
     : QWidget(parent)
-    , isActiveWidget(false)
 {
-    setMouseTracking(true);
     setFixedHeight(55);
 
     setLayout(&layout);
@@ -32,33 +33,64 @@ GenericChatroomWidget::GenericChatroomWidget(QWidget *parent)
     textLayout.setMargin(0);
     setLayoutDirection(Qt::LeftToRight); // parent might have set Qt::RightToLeft
 
-    setStyleSheet(QString("background-color: %1").arg(Style::getColor(Style::MediumGrey).name()));
+    // avatar
+    avatar = new MaskablePixmapWidget(this, QSize(40,40), ":/img/avatar_mask.png");
+
+    // status text
+    statusMessageLabel = new CroppingLabel(this);
+    statusMessageLabel->setObjectName("status");
+
+    // name text
+    nameLabel = new CroppingLabel(this);
+    nameLabel->setObjectName("name");
+
+    textLayout.addStretch();
+    textLayout.addWidget(nameLabel);
+    textLayout.addWidget(statusMessageLabel);
+    textLayout.addStretch();
+
+    layout.addSpacing(20);
+    layout.addWidget(avatar);
+    layout.addSpacing(10);
+    layout.addLayout(&textLayout);
+    layout.addSpacing(10);
+    layout.addWidget(&statusPic);
+    layout.addSpacing(10);
+    layout.activate();
+
+    setProperty("active", false);
+    setStyleSheet(Style::getStylesheet(":/ui/chatroomWidgets/genericChatroomWidget.css"));
 }
 
 bool GenericChatroomWidget::isActive()
 {
-    return isActiveWidget;
+    return property("active").toBool();
 }
+
 void GenericChatroomWidget::setActive(bool active)
 {
-    isActiveWidget = active;
-
-    if (active)
-        setStyleSheet(QString("background-color: %1").arg(Style::getColor(Style::White).name()));
-    else
-        setStyleSheet(QString("background-color: %1").arg(Style::getColor(Style::MediumGrey).name()));
+    setProperty("active", active);
+    Style::repolish(this);
 }
 
-void GenericChatroomWidget::leaveEvent(QEvent *)
+void GenericChatroomWidget::setName(const QString &name)
 {
-    if (!isActive())
-        setStyleSheet(QString("background-color: %1").arg(Style::getColor(Style::MediumGrey).name()));
+    nameLabel->setText(name);
 }
 
-void GenericChatroomWidget::enterEvent(QEvent *)
+void GenericChatroomWidget::setStatusMsg(const QString &status)
 {
-    if (!isActive())
-        setStyleSheet(QString("background-color: %1").arg(Style::getColor(Style::MediumGrey).lighter(120).name()));
+    statusMessageLabel->setText(status);
+}
+
+QString GenericChatroomWidget::getName() const
+{
+    return nameLabel->text();
+}
+
+QString GenericChatroomWidget::getStatusMsg() const
+{
+    return statusMessageLabel->text();
 }
 
 void GenericChatroomWidget::mouseReleaseEvent(QMouseEvent*)
diff --git a/widget/genericchatroomwidget.h b/widget/genericchatroomwidget.h
index 84b1f2669..a6e001e4b 100644
--- a/widget/genericchatroomwidget.h
+++ b/widget/genericchatroomwidget.h
@@ -20,6 +20,10 @@
 #include <QWidget>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
+#include <QLabel>
+
+class CroppingLabel;
+class MaskablePixmapWidget;
 
 namespace Ui {
     class MainWindow;
@@ -31,8 +35,6 @@ class GenericChatroomWidget : public QWidget
 public:
     GenericChatroomWidget(QWidget *parent = 0);
     void mouseReleaseEvent (QMouseEvent* event);
-    void leaveEvent(QEvent *);
-    void enterEvent(QEvent *);
 
     virtual void setAsActiveChatroom(){;}
     virtual void setAsInactiveChatroom(){;}
@@ -43,18 +45,24 @@ public:
     bool isActive();
     void setActive(bool active);
 
+    void setName(const QString& name);
+    void setStatusMsg(const QString& status);
+
+    QString getName() const;
+    QString getStatusMsg() const;
+
 signals:
     void chatroomWidgetClicked(GenericChatroomWidget* widget);
 
 public slots:
 
-private:
-    bool isActiveWidget;
-
 protected:
     QColor lastColor;
     QHBoxLayout layout;
     QVBoxLayout textLayout;
+    MaskablePixmapWidget* avatar;
+    QLabel statusPic;
+    CroppingLabel *nameLabel, *statusMessageLabel;
 };
 
 #endif // GENERICCHATROOMWIDGET_H
diff --git a/widget/groupwidget.cpp b/widget/groupwidget.cpp
index 0c24e7183..2d7b1ebe5 100644
--- a/widget/groupwidget.cpp
+++ b/widget/groupwidget.cpp
@@ -30,44 +30,15 @@
 GroupWidget::GroupWidget(int GroupId, QString Name)
     : groupId{GroupId}
 {
-    avatar = new MaskablePixmapWidget(this, QSize(40,40), ":/img/avatar_mask.png");
     avatar->setPixmap(QPixmap(":img/group.png"), Qt::transparent);
-
     statusPic.setPixmap(QPixmap(":img/status/dot_online.png"));
-
-    // name
-    QPalette pal2;
-    pal2.setColor(QPalette::WindowText, Style::getColor(Style::White));
-    name.setPalette(pal2);
-    name.setText(Name);
-    name.setFont(Style::getFont(Style::Big));
-
-    // status
-    QPalette pal;
-    pal.setColor(QPalette::WindowText, Style::getColor(Style::LightGrey));
-    nusers.setPalette(pal);
-    nusers.setFont(Style::getFont(Style::Medium));
+    nameLabel->setText(Name);
 
     Group* g = GroupList::findGroup(groupId);
     if (g)
-        nusers.setText(GroupWidget::tr("%1 users in chat").arg(g->peers.size()));
+        statusMessageLabel->setText(GroupWidget::tr("%1 users in chat").arg(g->peers.size()));
     else
-        nusers.setText(GroupWidget::tr("0 users in chat"));
-
-    textLayout.addStretch();
-    textLayout.addWidget(&name);
-    textLayout.addWidget(&nusers);
-    textLayout.addStretch();
-
-    layout.addSpacing(20);
-    layout.addWidget(avatar);
-    layout.addSpacing(10);
-    layout.addLayout(&textLayout);
-    layout.addStretch();
-    layout.addSpacing(10);
-    layout.addWidget(&statusPic);
-    layout.addSpacing(10);
-    layout.activate();
+        statusMessageLabel->setText(GroupWidget::tr("0 users in chat"));
 }
 
 void GroupWidget::contextMenuEvent(QContextMenuEvent * event)
@@ -91,42 +62,20 @@ void GroupWidget::onUserListChanged()
 {
     Group* g = GroupList::findGroup(groupId);
     if (g)
-        nusers.setText(tr("%1 users in chat").arg(g->nPeers));
+        statusMessageLabel->setText(tr("%1 users in chat").arg(g->nPeers));
     else
-        nusers.setText(tr("0 users in chat"));
+        statusMessageLabel->setText(tr("0 users in chat"));
 }
 
 void GroupWidget::setAsActiveChatroom()
 {
     setActive(true);
-
-    // status
-    QPalette pal;
-    pal.setColor(QPalette::WindowText, Style::getColor(Style::MediumGrey));
-    nusers.setPalette(pal);
-
-    // name
-    QPalette pal2;
-    pal2.setColor(QPalette::WindowText, Style::getColor(Style::DarkGrey));
-    name.setPalette(pal2);
-
     avatar->setPixmap(QPixmap(":img/group_dark.png"), Qt::transparent);
 }
 
 void GroupWidget::setAsInactiveChatroom()
 {
     setActive(false);
-
-    // status
-    QPalette pal;
-    pal.setColor(QPalette::WindowText, Style::getColor(Style::LightGrey));
-    nusers.setPalette(pal);
-
-    // name
-    QPalette pal2;
-    pal2.setColor(QPalette::WindowText, Style::getColor(Style::White));
-    name.setPalette(pal2);
-
     avatar->setPixmap(QPixmap(":img/group.png"), Qt::transparent);
 }
 
diff --git a/widget/groupwidget.h b/widget/groupwidget.h
index 960ab9cb7..2d35000a0 100644
--- a/widget/groupwidget.h
+++ b/widget/groupwidget.h
@@ -20,8 +20,6 @@
 #include <QLabel>
 #include "genericchatroomwidget.h"
 
-class MaskablePixmapWidget;
-
 class GroupWidget : public GenericChatroomWidget
 {
     Q_OBJECT
@@ -41,8 +39,6 @@ signals:
 
 public:
     int groupId;
-    QLabel name, nusers, statusPic;
-    MaskablePixmapWidget* avatar;
 };
 
 #endif // GROUPWIDGET_H

From 5e328d24048788121fa177abd1a52bcde7c925f0 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Wed, 1 Oct 2014 16:17:09 +0200
Subject: [PATCH 150/205] more styling

---
 misc/style.cpp                               | 27 +++++-----
 ui/chatArea/innerStyle.css                   | 56 +++++++++++---------
 ui/chatroomWidgets/genericChatroomWidget.css | 38 +++++++++++++
 ui/emoticonWidget/emoticonWidget.css         |  2 +-
 ui/msgEdit/msgEdit.css                       |  2 +-
 widget/chatareawidget.cpp                    | 25 +++++----
 widget/form/chatform.cpp                     |  2 +-
 widget/form/groupchatform.cpp                |  2 +-
 widget/friendwidget.cpp                      |  2 +-
 widget/genericchatroomwidget.cpp             |  2 +-
 widget/groupwidget.cpp                       |  2 +-
 widget/tool/chatactions/chataction.cpp       | 10 ++--
 widget/tool/chatactions/messageaction.cpp    |  5 +-
 13 files changed, 114 insertions(+), 61 deletions(-)
 create mode 100644 ui/chatroomWidgets/genericChatroomWidget.css

diff --git a/misc/style.cpp b/misc/style.cpp
index fb8378579..b4d1cc209 100644
--- a/misc/style.cpp
+++ b/misc/style.cpp
@@ -27,28 +27,29 @@
 // helper functions
 QFont appFont(int pixelSize, int weight)
 {
-    auto font = QFont();
+    QFont font;
     font.setPixelSize(pixelSize);
     font.setWeight(weight);
     return font;
 }
 
-QString cssifyWeight(int weight)
+QString qssifyWeight(int weight)
 {
     QString weightStr = "normal";
     if (weight == QFont::Bold)
         weightStr = "bold";
     if (weight == QFont::Light)
-        weightStr = "lighter";
+        weightStr = "light";
 
     return QString("%1").arg(weightStr);
 }
 
-QString cssifyFont(QFont font)
+QString qssifyFont(QFont font)
 {
-    return QString("%1px %2")
+    return QString("%1px %2 \"%3\"")
             .arg(font.pixelSize())
-            .arg(font.weight());
+            .arg(qssifyWeight(font.weight()))
+            .arg(font.family());
 }
 
 QString Style::getStylesheet(const QString &filename)
@@ -112,13 +113,13 @@ QString Style::resolve(QString qss)
         {"@white", getColor(White).name()},
 
         // fonts
-        {"@extraBig", cssifyFont(getFont(ExtraBig))},
-        {"@big", cssifyFont(getFont(Big))},
-        {"@bigBold", cssifyFont(getFont(BigBold))},
-        {"@medium", cssifyFont(getFont(Medium))},
-        {"@mediumBold", cssifyFont(getFont(MediumBold))},
-        {"@small", cssifyFont(getFont(Small))},
-        {"@smallLight", cssifyFont(getFont(SmallLight))},
+        {"@extraBig", qssifyFont(getFont(ExtraBig))},
+        {"@big", qssifyFont(getFont(Big))},
+        {"@bigBold", qssifyFont(getFont(BigBold))},
+        {"@medium", qssifyFont(getFont(Medium))},
+        {"@mediumBold", qssifyFont(getFont(MediumBold))},
+        {"@small", qssifyFont(getFont(Small))},
+        {"@smallLight", qssifyFont(getFont(SmallLight))},
     };
 
     for (const QString& key : dict.keys())
diff --git a/ui/chatArea/innerStyle.css b/ui/chatArea/innerStyle.css
index 28bcb32c8..fd0ca03ee 100644
--- a/ui/chatArea/innerStyle.css
+++ b/ui/chatArea/innerStyle.css
@@ -1,25 +1,31 @@
-div.name_me {
-  color: #646464;
-  font-weight: bold;
-  padding-right: 3px;
-}
-
 div.name {
-  color: #000000;
-  font-weight: bold;
-  padding-right: 3px;
+  color: @black;
+  font: @big;
 }
 
 div.message {
-  color: #000000;
-  padding-right: 3px;
-  padding-left: 3px;
+  color: @black;
+  font: @big;
 }
 
 div.date {
-  color: #000000;
-  padding-left: 3px;
-  white-space: nowrap;
+  color: @black;
+  font: @big;
+}
+
+div.name_me {
+  color: @mediumGrey;
+  font: @big;
+}
+
+div.message_me {
+  color: @mediumGrey;
+  font: @big;
+}
+
+div.date_me {
+  color: @mediumGrey;
+  font: @big;
 }
 
 span.quote {
@@ -31,9 +37,9 @@ div.green {
   margin-bottom: 12px;
   margin-left: 12px;
   margin-right: 12px;
-  color: #ffffff;
-  background-color: #6bc260;
-  font-size: 10px;
+  color: @white;
+  background-color: @green;
+  font: @small;
 }
 
 div.silver {
@@ -41,9 +47,9 @@ div.silver {
   margin-bottom: 12px;
   margin-left: 12px;
   margin-right: 12px;
-  color: #000000;
-  background-color: #d1d1d1;
-  font-size: 10px;
+  color: @black;
+  background-color: @lightGrey;
+  font: @small;
 }
 
 div.red {
@@ -51,14 +57,14 @@ div.red {
   margin-bottom: 12px;
   margin-left: 12px;
   margin-right: 12px;
-  color: #ffffff;
-  background-color: rgb(200,78,78);
-  font-size: 10px;
+  color: @white;
+  background-color: @red;
+  font: @small;
 }
 
 div.button {
   margin-top: 0px;
   margin-bottom: 0px;
   margin-left: 0px;
-  color: #ffffff;
+  color: @white;
 }
diff --git a/ui/chatroomWidgets/genericChatroomWidget.css b/ui/chatroomWidgets/genericChatroomWidget.css
new file mode 100644
index 000000000..4ed573fb0
--- /dev/null
+++ b/ui/chatroomWidgets/genericChatroomWidget.css
@@ -0,0 +1,38 @@
+GenericChatroomWidget 
+{ 
+  background-color: @mediumGrey;
+}
+
+GenericChatroomWidget[active="true"]
+{
+  background-color: @white;
+}
+
+GenericChatroomWidget[active="false"]:hover 
+{ 
+  background-color: @mediumGreyLight; 
+} 
+
+GenericChatroomWidget[active="true"] > QLabel#status 
+{
+  font: @medium;
+  color: @mediumGrey;
+}
+
+GenericChatroomWidget[active="false"] > QLabel#status 
+{
+  font: @medium;
+  color: @lightGrey;
+}
+
+GenericChatroomWidget[active="true"] > QLabel#name
+{
+  font: @big;
+  color: @darkGrey;
+}
+
+GenericChatroomWidget[active="false"] > QLabel#name
+{
+  font: @big;
+  color: @white;
+}
\ No newline at end of file
diff --git a/ui/emoticonWidget/emoticonWidget.css b/ui/emoticonWidget/emoticonWidget.css
index eb168a07e..093db5122 100644
--- a/ui/emoticonWidget/emoticonWidget.css
+++ b/ui/emoticonWidget/emoticonWidget.css
@@ -35,6 +35,6 @@ QRadioButton::indicator::checked
 
 QMenu
 {
-     background-color: #414141; /* sets background of the menu */
+     background-color: @mediumGrey; /* sets background of the menu */
      border: 0px solid;
 }
diff --git a/ui/msgEdit/msgEdit.css b/ui/msgEdit/msgEdit.css
index 2509f57fc..bbc967ccc 100644
--- a/ui/msgEdit/msgEdit.css
+++ b/ui/msgEdit/msgEdit.css
@@ -1,5 +1,5 @@
 QTextEdit {
-	border-color: #c4c1bd;
+	border-color: @lightGrey;
 	border-style: solid;
 	border-width: 1px 0 1px 1px;
 }
diff --git a/widget/chatareawidget.cpp b/widget/chatareawidget.cpp
index c2e7a90b6..a2c1d6384 100644
--- a/widget/chatareawidget.cpp
+++ b/widget/chatareawidget.cpp
@@ -36,19 +36,20 @@ ChatAreaWidget::ChatAreaWidget(QWidget *parent) :
     setAcceptRichText(false);
     setFrameStyle(QFrame::NoFrame);
 
-    chatTextTable = textCursor().insertTable(1,3);
-
     QTextTableFormat tableFormat;
+    tableFormat.setCellSpacing(15);
     tableFormat.setBorderStyle(QTextFrameFormat::BorderStyle_None);
-    tableFormat.setCellSpacing(2);
-    tableFormat.setWidth(QTextLength(QTextLength::PercentageLength,100));
-    chatTextTable->setFormat(tableFormat);
-    setNameColWidth(100);
+    tableFormat.setColumnWidthConstraints({QTextLength(QTextLength::VariableLength,0),
+                                           QTextLength(QTextLength::PercentageLength,100),
+                                           QTextLength(QTextLength::VariableLength,0)});
+
+    chatTextTable = textCursor().insertTable(1,3,tableFormat);
+
+    nameFormat.setAlignment(Qt::AlignRight);
+    nameFormat.setNonBreakableLines(true);
+    dateFormat.setAlignment(Qt::AlignLeft);
+    dateFormat.setNonBreakableLines(true);
 
-//    nameFormat.setAlignment(Qt::AlignRight);
-//    nameFormat.setNonBreakableLines(true);
-//    dateFormat.setAlignment(Qt::AlignLeft);
-//    dateFormat.setNonBreakableLines(true);
 
     connect(this, &ChatAreaWidget::anchorClicked, this, &ChatAreaWidget::onAnchorClicked);
     connect(verticalScrollBar(), SIGNAL(rangeChanged(int,int)), this, SLOT(onSliderRangeChanged()));
@@ -112,9 +113,11 @@ void ChatAreaWidget::insertMessage(ChatAction *msgAction)
     cur.clearSelection();
     cur.setKeepPositionOnInsert(true);
     chatTextTable->appendRows(1);
+    chatTextTable->cellAt(row,0).firstCursorPosition().setBlockFormat(nameFormat);
     chatTextTable->cellAt(row,0).firstCursorPosition().insertHtml(msgAction->getName());
     chatTextTable->cellAt(row,1).firstCursorPosition().insertHtml(msgAction->getMessage());
-    chatTextTable->cellAt(row,2).firstCursorPosition().insertText(msgAction->getDate());
+    chatTextTable->cellAt(row,2).firstCursorPosition().setBlockFormat(dateFormat);
+    chatTextTable->cellAt(row,2).firstCursorPosition().insertHtml(msgAction->getDate());
 
     msgAction->setup(cur, this);
 
diff --git a/widget/form/chatform.cpp b/widget/form/chatform.cpp
index efe61f818..f2f2c32d6 100644
--- a/widget/form/chatform.cpp
+++ b/widget/form/chatform.cpp
@@ -35,7 +35,7 @@
 #include "widget/widget.h"
 #include "widget/maskablepixmapwidget.h"
 #include "widget/croppinglabel.h"
-#include "style.h"
+#include "misc/style.h"
 
 ChatForm::ChatForm(Friend* chatFriend)
     : f(chatFriend)
diff --git a/widget/form/groupchatform.cpp b/widget/form/groupchatform.cpp
index 77e64ea83..412ef46e8 100644
--- a/widget/form/groupchatform.cpp
+++ b/widget/form/groupchatform.cpp
@@ -21,7 +21,7 @@
 #include "widget/croppinglabel.h"
 #include "widget/maskablepixmapwidget.h"
 #include "core.h"
-#include "style.h"
+#include "misc/style.h"
 #include <QPushButton>
 #include <QMimeData>
 #include <QDragEnterEvent>
diff --git a/widget/friendwidget.cpp b/widget/friendwidget.cpp
index 9159d3e7f..a524a7daf 100644
--- a/widget/friendwidget.cpp
+++ b/widget/friendwidget.cpp
@@ -24,7 +24,7 @@
 #include "widget/form/chatform.h"
 #include "widget/maskablepixmapwidget.h"
 #include "widget/croppinglabel.h"
-#include "style.h"
+#include "misc/style.h"
 #include <QContextMenuEvent>
 #include <QMenu>
 #include <QDrag>
diff --git a/widget/genericchatroomwidget.cpp b/widget/genericchatroomwidget.cpp
index ab0d13810..cd75964d8 100644
--- a/widget/genericchatroomwidget.cpp
+++ b/widget/genericchatroomwidget.cpp
@@ -15,7 +15,7 @@
 */
 
 #include "genericchatroomwidget.h"
-#include "style.h"
+#include "misc/style.h"
 #include "widget/maskablepixmapwidget.h"
 #include "croppinglabel.h"
 #include <QMouseEvent>
diff --git a/widget/groupwidget.cpp b/widget/groupwidget.cpp
index 2d7b1ebe5..aeecb3737 100644
--- a/widget/groupwidget.cpp
+++ b/widget/groupwidget.cpp
@@ -20,7 +20,7 @@
 #include "misc/settings.h"
 #include "widget/form/groupchatform.h"
 #include "widget/maskablepixmapwidget.h"
-#include "style.h"
+#include "misc/style.h"
 #include <QPalette>
 #include <QMenu>
 #include <QContextMenuEvent>
diff --git a/widget/tool/chatactions/chataction.cpp b/widget/tool/chatactions/chataction.cpp
index 7758aae33..6978711a6 100644
--- a/widget/tool/chatactions/chataction.cpp
+++ b/widget/tool/chatactions/chataction.cpp
@@ -41,13 +41,15 @@ QString ChatAction::QImage2base64(const QImage &img)
 QString ChatAction::getName()
 {
     if (isMe)
-        return QString("<div class=name_me>" + toHtmlChars(name) + "</div>");
+        return QString("<div class=%1>%2</div>").arg("name_me").arg(toHtmlChars(name));
     else
-        return QString("<div class=name>" + toHtmlChars(name) + "</div>");
+        return QString("<div class=%1>%2</div>").arg("name").arg(toHtmlChars(name));
 }
 
 QString ChatAction::getDate()
 {
-    QString res = date;
-    return res;
+    if (isMe)
+        return QString("<div class=date_me>" + toHtmlChars(date) + "</div>");
+    else
+        return QString("<div class=date>" + toHtmlChars(date) + "</div>");
 }
diff --git a/widget/tool/chatactions/messageaction.cpp b/widget/tool/chatactions/messageaction.cpp
index 9904be470..6445279ea 100644
--- a/widget/tool/chatactions/messageaction.cpp
+++ b/widget/tool/chatactions/messageaction.cpp
@@ -71,5 +71,8 @@ QString MessageAction::getMessage()
     }
     message_ = message_.left(message_.length()-4);
 
-    return QString("<div class=message>" + message_ + "</div>");
+    if (isMe)
+        return QString("<div class=message_me>" + message_ + "</div>");
+    else
+        return QString("<div class=message>" + message_ + "</div>");
 }

From a159b808012d25a19e4f1507b748a148caaeb21f Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Wed, 1 Oct 2014 16:31:23 +0200
Subject: [PATCH 151/205] removed workaround

---
 widget/groupwidget.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/widget/groupwidget.cpp b/widget/groupwidget.cpp
index aeecb3737..ab64a54da 100644
--- a/widget/groupwidget.cpp
+++ b/widget/groupwidget.cpp
@@ -49,13 +49,7 @@ void GroupWidget::contextMenuEvent(QContextMenuEvent * event)
 
     QAction* selectedItem = menu.exec(pos);
     if (selectedItem == quitGroup)
-    {
-        hide();
-        show(); //Toggle visibility to work around bug of repaintEvent() not being fired on parent widget when this is hidden
-        hide();
         emit removeGroup(groupId);
-        return;
-    }
 }
 
 void GroupWidget::onUserListChanged()

From ff8abd50166277f1aa5a1f01854e581c90f33833 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Wed, 1 Oct 2014 16:49:54 +0200
Subject: [PATCH 152/205] Fix #361, load Qt runtime platform plugins

---
 main.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/main.cpp b/main.cpp
index 8e981baa5..e21c1c647 100644
--- a/main.cpp
+++ b/main.cpp
@@ -27,6 +27,10 @@ int main(int argc, char *argv[])
     a.setApplicationName("qTox");
     a.setOrganizationName("Tox");
 
+    // Windows platform plugins DLL hell fix
+    QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath());
+    a.addLibraryPath("platforms");
+
     // Load translations
     QTranslator translator;
     if (Settings::getInstance().getUseTranslations())

From 8db22973e92586afb646412f9eb5b10928bf9e35 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Wed, 1 Oct 2014 17:03:59 +0200
Subject: [PATCH 153/205] fixed merge

---
 widget/chatareawidget.cpp       | 8 ++++----
 widget/form/genericchatform.cpp | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/widget/chatareawidget.cpp b/widget/chatareawidget.cpp
index a2c1d6384..c743574fa 100644
--- a/widget/chatareawidget.cpp
+++ b/widget/chatareawidget.cpp
@@ -23,8 +23,9 @@
 #include <QCoreApplication>
 #include <QDebug>
 
-ChatAreaWidget::ChatAreaWidget(QWidget *parent) :
-    QTextBrowser(parent)
+ChatAreaWidget::ChatAreaWidget(QWidget *parent)
+    : QTextBrowser(parent)
+    , nameWidth(75)
 {
     setReadOnly(true);
     viewport()->setCursor(Qt::ArrowCursor);
@@ -39,7 +40,7 @@ ChatAreaWidget::ChatAreaWidget(QWidget *parent) :
     QTextTableFormat tableFormat;
     tableFormat.setCellSpacing(15);
     tableFormat.setBorderStyle(QTextFrameFormat::BorderStyle_None);
-    tableFormat.setColumnWidthConstraints({QTextLength(QTextLength::VariableLength,0),
+    tableFormat.setColumnWidthConstraints({QTextLength(QTextLength::FixedLength,nameWidth),
                                            QTextLength(QTextLength::PercentageLength,100),
                                            QTextLength(QTextLength::VariableLength,0)});
 
@@ -50,7 +51,6 @@ ChatAreaWidget::ChatAreaWidget(QWidget *parent) :
     dateFormat.setAlignment(Qt::AlignLeft);
     dateFormat.setNonBreakableLines(true);
 
-
     connect(this, &ChatAreaWidget::anchorClicked, this, &ChatAreaWidget::onAnchorClicked);
     connect(verticalScrollBar(), SIGNAL(rangeChanged(int,int)), this, SLOT(onSliderRangeChanged()));
 }
diff --git a/widget/form/genericchatform.cpp b/widget/form/genericchatform.cpp
index 2abdd0def..a7bcb5e2b 100644
--- a/widget/form/genericchatform.cpp
+++ b/widget/form/genericchatform.cpp
@@ -173,7 +173,9 @@ void GenericChatForm::addMessage(QString author, QString message, QDateTime date
 
     if (previousName == author)
         chatWidget->insertMessage(new MessageAction("", message, date, isMe));
-    else chatWidget->insertMessage(new MessageAction(getElidedName(author) , message, date, isMe));
+    else
+        chatWidget->insertMessage(new MessageAction(getElidedName(author) , message, date, isMe));
+
     previousName = author;
 }
 

From e0e20d3ae7aef6a646c94d274c0f30a3b193d7d9 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Wed, 1 Oct 2014 17:22:51 +0200
Subject: [PATCH 154/205] AdjustingScrollArea: removed event filter

---
 widget/adjustingscrollarea.cpp | 14 --------------
 widget/adjustingscrollarea.h   |  1 -
 2 files changed, 15 deletions(-)

diff --git a/widget/adjustingscrollarea.cpp b/widget/adjustingscrollarea.cpp
index 04b735ed1..29315ba8b 100644
--- a/widget/adjustingscrollarea.cpp
+++ b/widget/adjustingscrollarea.cpp
@@ -48,17 +48,3 @@ QSize AdjustingScrollArea::sizeHint() const
 
     return QScrollArea::sizeHint();
 }
-
-bool AdjustingScrollArea::eventFilter(QObject *obj, QEvent *ev)
-{
-    if (ev->type() == QEvent::Paint)
-    {
-        // workaround: sometimes a child widget gets drawn on top of the scrollbar
-        // so we trigger a repaint afterwards
-        // => Actually, we don't. This triggers an infinite loop of QEvent::UpdateRequest and burns 100% CPU !
-        //verticalScrollBar()->update();
-        //horizontalScrollBar()->update();
-    }
-
-    return QObject::eventFilter(obj, ev);
-}
diff --git a/widget/adjustingscrollarea.h b/widget/adjustingscrollarea.h
index 380ac5df8..584e4e875 100644
--- a/widget/adjustingscrollarea.h
+++ b/widget/adjustingscrollarea.h
@@ -27,7 +27,6 @@ public:
 
     virtual void resizeEvent(QResizeEvent *ev) override;
     virtual QSize sizeHint() const override;
-    virtual bool eventFilter(QObject *obj, QEvent *ev) override;
 };
 
 #endif // ADJUSTINGSCROLLAREA_H

From f99825580a483f00d36f063acca2e0dafb1f9b31 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Wed, 1 Oct 2014 18:20:13 +0200
Subject: [PATCH 155/205] AutoFillBackground

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

diff --git a/widget/genericchatroomwidget.cpp b/widget/genericchatroomwidget.cpp
index cd75964d8..d346828b2 100644
--- a/widget/genericchatroomwidget.cpp
+++ b/widget/genericchatroomwidget.cpp
@@ -25,6 +25,7 @@ GenericChatroomWidget::GenericChatroomWidget(QWidget *parent)
     : QWidget(parent)
 {
     setFixedHeight(55);
+    setAutoFillBackground(true);
 
     setLayout(&layout);
     layout.setSpacing(0);

From 226c0f2cf186e332a63e1e2e88052cc3ef528812 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Wed, 1 Oct 2014 18:53:31 +0200
Subject: [PATCH 156/205] GenericChatroomWidget: use QFrame instead of QWidget
 as base class (fixes invisible background)

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

diff --git a/widget/genericchatroomwidget.cpp b/widget/genericchatroomwidget.cpp
index d346828b2..8e875bd3e 100644
--- a/widget/genericchatroomwidget.cpp
+++ b/widget/genericchatroomwidget.cpp
@@ -22,10 +22,9 @@
 #include <QStyle>
 
 GenericChatroomWidget::GenericChatroomWidget(QWidget *parent)
-    : QWidget(parent)
+    : QFrame(parent)
 {
     setFixedHeight(55);
-    setAutoFillBackground(true);
 
     setLayout(&layout);
     layout.setSpacing(0);
diff --git a/widget/genericchatroomwidget.h b/widget/genericchatroomwidget.h
index a6e001e4b..1dd6d8250 100644
--- a/widget/genericchatroomwidget.h
+++ b/widget/genericchatroomwidget.h
@@ -17,7 +17,7 @@
 #ifndef GENERICCHATROOMWIDGET_H
 #define GENERICCHATROOMWIDGET_H
 
-#include <QWidget>
+#include <QFrame>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QLabel>
@@ -29,7 +29,7 @@ namespace Ui {
     class MainWindow;
 }
 
-class GenericChatroomWidget : public QWidget
+class GenericChatroomWidget : public QFrame
 {
     Q_OBJECT
 public:

From 626cc248940cb295dff41d3b6adfa6656ccb911b Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Wed, 1 Oct 2014 16:53:38 -0500
Subject: [PATCH 157/205] reduce dependency versions to debian stable versions

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

diff --git a/debian/control b/debian/control
index af90ab856..bb17b1441 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9), cdbs, qt5-qmake, libopenal-dev (>= 1:1.15.1), l
 
 Package: qtox
 Architecture: any
-Depends: libc6 (>= 2.17), libgcc1 (>= 1:4.1.1), libgl1-mesa-glx | libgl1, libopenal1 (>= 1.14), libopencv-core2.4, libopencv-highgui2.4, libopus0 (>= 1.0), libqt5core5a (>= 5.2), libqt5gui5 (>= 5.2), libqt5network5 (>= 5.0), libqt5widgets5 (>= 5.2), libqt5xml5 (>= 5.0), libstdc++6 (>= 4.9), libvpx1 (>= 1.0.0)
+Depends: libc6 (>= 2.13-38+deb7u4), libgcc1 (>= 1:4.1.1), libgl1-mesa-glx | libgl1, libopenal1 (>= 1.14), libopencv-core2.3, libopencv-highgui2.3, libopus0 (>= 0.9.14+20120615-1+nmu1), libqt5core5a (>= 5.2), libqt5gui5 (>= 5.2), libqt5network5 (>= 5.0), libqt5widgets5 (>= 5.2), libqt5xml5 (>= 5.0), libstdc++6 (>= 4.7.2-5), libvpx1 (>= 1.0.0)
 Description: Tox client
  qTox is a powerful Tox client that follows the Tox design guidelines.
  Tox is a decentralized and encrypted replacement for Skype, supporting

From 30f386677261398bdb9145b38cca44b78f4331d0 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Wed, 1 Oct 2014 23:21:43 -0500
Subject: [PATCH 158/205] restore bold names in chat

---
 ui/chatArea/innerStyle.css | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ui/chatArea/innerStyle.css b/ui/chatArea/innerStyle.css
index fd0ca03ee..771068a1d 100644
--- a/ui/chatArea/innerStyle.css
+++ b/ui/chatArea/innerStyle.css
@@ -1,6 +1,7 @@
 div.name {
   color: @black;
-  font: @big;
+  font: @bigBold;
+  font-weight: bold; /* @bigBold doesn't actually work */
 }
 
 div.message {
@@ -19,12 +20,12 @@ div.name_me {
 }
 
 div.message_me {
-  color: @mediumGrey;
+  color: @black;
   font: @big;
 }
 
 div.date_me {
-  color: @mediumGrey;
+  color: @black;
   font: @big;
 }
 

From 5f106ab6183b202e35f3e712a779249c91d7ea68 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Thu, 2 Oct 2014 01:01:23 -0500
Subject: [PATCH 159/205] add receive actions (no one to test with currently)

---
 core.cpp                                 |  4 +-
 core.h                                   |  4 +-
 qtox.pro                                 |  2 +
 ui/chatArea/innerStyle.css               |  5 ++
 widget/form/genericchatform.cpp          |  9 ++--
 widget/form/genericchatform.h            |  2 +-
 widget/tool/chatactions/actionaction.cpp | 68 ++++++++++++++++++++++++
 widget/tool/chatactions/actionaction.h   | 35 ++++++++++++
 widget/widget.cpp                        |  4 +-
 widget/widget.h                          |  2 +-
 10 files changed, 123 insertions(+), 12 deletions(-)
 create mode 100644 widget/tool/chatactions/actionaction.cpp
 create mode 100644 widget/tool/chatactions/actionaction.h

diff --git a/core.cpp b/core.cpp
index 53214dd3d..f6b7a2a5c 100644
--- a/core.cpp
+++ b/core.cpp
@@ -313,7 +313,7 @@ void Core::onFriendRequest(Tox*/* tox*/, const uint8_t* cUserId, const uint8_t*
 
 void Core::onFriendMessage(Tox*/* tox*/, int friendId, const uint8_t* cMessage, uint16_t cMessageSize, void* core)
 {
-    emit static_cast<Core*>(core)->friendMessageReceived(friendId, CString::toString(cMessage, cMessageSize));
+    emit static_cast<Core*>(core)->friendMessageReceived(friendId, CString::toString(cMessage, cMessageSize), false);
 }
 
 void Core::onFriendNameChange(Tox*/* tox*/, int friendId, const uint8_t* cName, uint16_t cNameSize, void* core)
@@ -393,7 +393,7 @@ void Core::onConnectionStatusChanged(Tox*/* tox*/, int friendId, uint8_t status,
 
 void Core::onAction(Tox*/* tox*/, int friendId, const uint8_t *cMessage, uint16_t cMessageSize, void *core)
 {
-    emit static_cast<Core*>(core)->actionReceived(friendId, CString::toString(cMessage, cMessageSize));
+    emit static_cast<Core*>(core)->friendMessageReceived(friendId, CString::toString(cMessage, cMessageSize), true);
 }
 
 void Core::onGroupInvite(Tox*, int friendnumber, const uint8_t *group_public_key, uint16_t length,void *core)
diff --git a/core.h b/core.h
index 71692c3b2..b1b8c3f43 100644
--- a/core.h
+++ b/core.h
@@ -99,7 +99,7 @@ signals:
     void disconnected();
 
     void friendRequestReceived(const QString& userId, const QString& message);
-    void friendMessageReceived(int friendId, const QString& message);
+    void friendMessageReceived(int friendId, const QString& message, bool isAction);
 
     void friendAdded(int friendId, const QString& userId);
 
@@ -137,8 +137,6 @@ signals:
     void failedToSetStatus(Status status);
     void failedToSetTyping(bool typing);
 
-    void actionReceived(int friendId, const QString& acionMessage);
-
     void failedToStart();
 
     void fileSendStarted(ToxFile file);
diff --git a/qtox.pro b/qtox.pro
index 4c4db4492..e08e1f24e 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -119,6 +119,7 @@ HEADERS  += widget/form/addfriendform.h \
     widget/tool/chatactions/messageaction.h \
     widget/tool/chatactions/filetransferaction.h \
     widget/tool/chatactions/systemmessageaction.h \
+    widget/tool/chatactions/actionaction.h \
     widget/maskablepixmapwidget.h
 
 SOURCES += \
@@ -160,4 +161,5 @@ SOURCES += \
     widget/tool/chatactions/messageaction.cpp \
     widget/tool/chatactions/filetransferaction.cpp \
     widget/tool/chatactions/systemmessageaction.cpp \
+    widget/tool/chatactions/actionaction.cpp \
     widget/maskablepixmapwidget.cpp
diff --git a/ui/chatArea/innerStyle.css b/ui/chatArea/innerStyle.css
index 771068a1d..5775f41f3 100644
--- a/ui/chatArea/innerStyle.css
+++ b/ui/chatArea/innerStyle.css
@@ -9,6 +9,11 @@ div.message {
   font: @big;
 }
 
+div.action {
+  color: @blue;
+  font: @big;
+}
+
 div.date {
   color: @black;
   font: @big;
diff --git a/widget/form/genericchatform.cpp b/widget/form/genericchatform.cpp
index a7bcb5e2b..923089728 100644
--- a/widget/form/genericchatform.cpp
+++ b/widget/form/genericchatform.cpp
@@ -24,6 +24,7 @@
 #include "misc/settings.h"
 #include "widget/tool/chatactions/messageaction.h"
 #include "widget/tool/chatactions/systemmessageaction.h"
+#include "widget/tool/chatactions/actionaction.h"
 #include "widget/chatareawidget.h"
 #include "widget/tool/chattextedit.h"
 #include "widget/maskablepixmapwidget.h"
@@ -166,15 +167,17 @@ void GenericChatForm::onSaveLogClicked()
     file.close();
 }
 
-void GenericChatForm::addMessage(QString author, QString message, QDateTime datetime)
+void GenericChatForm::addMessage(QString author, QString message, bool isAction, QDateTime datetime)
 {
     QString date = datetime.toString(Settings::getInstance().getTimestampFormat());
     bool isMe = (author == Widget::getInstance()->getUsername());
 
-    if (previousName == author)
+    if (isAction)
+        chatWidget->insertMessage(new ActionAction (getElidedName(author), message, date, isMe));
+    else if (previousName == author)
         chatWidget->insertMessage(new MessageAction("", message, date, isMe));
     else
-        chatWidget->insertMessage(new MessageAction(getElidedName(author) , message, date, isMe));
+        chatWidget->insertMessage(new MessageAction(getElidedName(author), message, date, isMe));
 
     previousName = author;
 }
diff --git a/widget/form/genericchatform.h b/widget/form/genericchatform.h
index 2111bcdf9..863c90a0d 100644
--- a/widget/form/genericchatform.h
+++ b/widget/form/genericchatform.h
@@ -44,7 +44,7 @@ public:
 
     virtual void setName(const QString &newName);
     virtual void show(Ui::MainWindow &ui);
-    void addMessage(QString author, QString message, QDateTime datetime=QDateTime::currentDateTime());
+    void addMessage(QString author, QString message, bool isAction = false, QDateTime datetime=QDateTime::currentDateTime());
     void addSystemInfoMessage(const QString &message, const QString &type, const QDateTime &datetime=QDateTime::currentDateTime());
 
 signals:
diff --git a/widget/tool/chatactions/actionaction.cpp b/widget/tool/chatactions/actionaction.cpp
new file mode 100644
index 000000000..754966107
--- /dev/null
+++ b/widget/tool/chatactions/actionaction.cpp
@@ -0,0 +1,68 @@
+/*
+    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 "actionaction.h"
+#include "misc/smileypack.h"
+
+ActionAction::ActionAction(const QString &author, const QString &message, const QString &date, const bool& me) :
+    ChatAction(me, author, date),
+    message(message)
+{
+}
+
+void ActionAction::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
+    // Except we never udpate on our own, so we can safely free our resources
+
+    (void) cursor;
+    message.clear();
+    message.squeeze();
+    name.clear();
+    name.squeeze();
+    date.clear();
+    date.squeeze();
+}
+
+QString ActionAction::getName()
+{
+    return QString("<div class=action>-*-</div>");
+}
+
+QString ActionAction::getMessage()
+{
+    QString message_ = SmileyPack::getInstance().smileyfied(toHtmlChars(message));
+
+    // detect urls
+    QRegExp exp("(www\\.|http[s]?:\\/\\/|ftp:\\/\\/)\\S+");
+    int offset = 0;
+    while ((offset = exp.indexIn(message_, offset)) != -1)
+    {
+        QString url = exp.cap();
+
+        // add scheme if not specified
+        if (exp.cap(1) == "www.")
+            url.prepend("http://");
+
+        QString htmledUrl = QString("<a href=\"%1\">%1</a>").arg(url);
+        message_.replace(offset, exp.cap().length(), htmledUrl);
+
+        offset += htmledUrl.length();
+    }
+
+        return QString("<div class=action>%1 %2</div>").arg(name).arg(message_);
+}
diff --git a/widget/tool/chatactions/actionaction.h b/widget/tool/chatactions/actionaction.h
new file mode 100644
index 000000000..ec4e5f4a8
--- /dev/null
+++ b/widget/tool/chatactions/actionaction.h
@@ -0,0 +1,35 @@
+/*
+    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 ACTIONACTION_H
+#define ACTIONACTION_H
+
+#include "widget/tool/chatactions/chataction.h"
+
+class ActionAction : public ChatAction
+{
+public:
+    ActionAction(const QString &author, const QString &message, const QString& date, const bool&);
+    virtual ~ActionAction(){;}
+    virtual QString getMessage();
+    virtual QString getName();
+    virtual void setup(QTextCursor cursor, QTextEdit*) override;
+
+private:
+    QString message;
+};
+
+#endif // MESSAGEACTION_H
diff --git a/widget/widget.cpp b/widget/widget.cpp
index e2c4770e9..e16a33c88 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -545,13 +545,13 @@ void Widget::onChatroomWidgetClicked(GenericChatroomWidget *widget)
     widget->updateStatusLight();
 }
 
-void Widget::onFriendMessageReceived(int friendId, const QString& message)
+void Widget::onFriendMessageReceived(int friendId, const QString& message, bool isAction)
 {
     Friend* f = FriendList::findFriend(friendId);
     if (!f)
         return;
 
-    f->chatForm->addMessage(f->getName(), message);
+    f->chatForm->addMessage(f->getName(), message, isAction);
 
     if (activeChatroomWidget != nullptr)
     {
diff --git a/widget/widget.h b/widget/widget.h
index 5141e49f0..41289c9cd 100644
--- a/widget/widget.h
+++ b/widget/widget.h
@@ -93,7 +93,7 @@ private slots:
     void onFriendStatusMessageChanged(int friendId, const QString& message);
     void onFriendUsernameChanged(int friendId, const QString& username);
     void onChatroomWidgetClicked(GenericChatroomWidget *);
-    void onFriendMessageReceived(int friendId, const QString& message);
+    void onFriendMessageReceived(int friendId, const QString& message, bool isAction);
     void onFriendRequestReceived(const QString& userId, const QString& message);
     void onEmptyGroupCreated(int groupId);
     void onGroupInviteReceived(int32_t friendId, const uint8_t *publicKey,uint16_t length);

From cfa39460bfeded9410c5f2cc719b63aa456dfb43 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Thu, 2 Oct 2014 02:00:06 -0500
Subject: [PATCH 160/205] added sending actions, and tested both ways

---
 ui/chatArea/innerStyle.css      |  2 +-
 widget/form/chatform.cpp        | 13 +++++++++++--
 widget/form/genericchatform.cpp |  4 ++++
 widget/form/genericchatform.h   |  1 +
 widget/widget.cpp               |  1 +
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ui/chatArea/innerStyle.css b/ui/chatArea/innerStyle.css
index 5775f41f3..9c8ae6753 100644
--- a/ui/chatArea/innerStyle.css
+++ b/ui/chatArea/innerStyle.css
@@ -10,7 +10,7 @@ div.message {
 }
 
 div.action {
-  color: @blue;
+  color: #1818FF;
   font: @big;
 }
 
diff --git a/widget/form/chatform.cpp b/widget/form/chatform.cpp
index f2f2c32d6..f309ce94a 100644
--- a/widget/form/chatform.cpp
+++ b/widget/form/chatform.cpp
@@ -86,9 +86,18 @@ void ChatForm::onSendTriggered()
     if (msg.isEmpty())
         return;
     QString name = Widget::getInstance()->getUsername();
+    if (msg.startsWith("/me "))
+    {
+        msg = msg.right(msg.length() - 4);
+        addMessage(name, msg, true);
+        emit sendAction(f->friendId, msg);
+    }
+    else
+    {
+        addMessage(name, msg, false);
+        emit sendMessage(f->friendId, msg);
+    }
     msgEdit->clear();
-    addMessage(name, msg);
-    emit sendMessage(f->friendId, msg);
 }
 
 void ChatForm::onAttachClicked()
diff --git a/widget/form/genericchatform.cpp b/widget/form/genericchatform.cpp
index 923089728..8c3753b0b 100644
--- a/widget/form/genericchatform.cpp
+++ b/widget/form/genericchatform.cpp
@@ -173,7 +173,11 @@ void GenericChatForm::addMessage(QString author, QString message, bool isAction,
     bool isMe = (author == Widget::getInstance()->getUsername());
 
     if (isAction)
+    {
         chatWidget->insertMessage(new ActionAction (getElidedName(author), message, date, isMe));
+        previousName = ""; // next msg has a name regardless
+        return;
+    }
     else if (previousName == author)
         chatWidget->insertMessage(new MessageAction("", message, date, isMe));
     else
diff --git a/widget/form/genericchatform.h b/widget/form/genericchatform.h
index 863c90a0d..b8c373d23 100644
--- a/widget/form/genericchatform.h
+++ b/widget/form/genericchatform.h
@@ -49,6 +49,7 @@ public:
 
 signals:
     void sendMessage(int, QString);
+    void sendAction(int, QString);
 
 public slots:
     void focusInput();
diff --git a/widget/widget.cpp b/widget/widget.cpp
index e16a33c88..606036b15 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -455,6 +455,7 @@ void Widget::addFriend(int friendId, const QString &userId)
     connect(newfriend->widget, SIGNAL(copyFriendIdToClipboard(int)), this, SLOT(copyFriendIdToClipboard(int)));
     connect(newfriend->widget, SIGNAL(chatroomWidgetClicked(GenericChatroomWidget*)), newfriend->chatForm, SLOT(focusInput()));
     connect(newfriend->chatForm, SIGNAL(sendMessage(int,QString)), core, SLOT(sendMessage(int,QString)));
+    connect(newfriend->chatForm, &GenericChatForm::sendAction, core, &Core::sendAction);
     connect(newfriend->chatForm, SIGNAL(sendFile(int32_t, QString, QString, long long)), core, SLOT(sendFile(int32_t, QString, QString, long long)));
     connect(newfriend->chatForm, SIGNAL(answerCall(int)), core, SLOT(answerCall(int)));
     connect(newfriend->chatForm, SIGNAL(hangupCall(int)), core, SLOT(hangupCall(int)));

From daf5be96b51133f00c0c95beafceb65cdb9e6a85 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Thu, 2 Oct 2014 09:37:18 +0200
Subject: [PATCH 161/205] Style: font size doesn't take px suffix, fixes fonts
 not applying properly

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

diff --git a/misc/style.cpp b/misc/style.cpp
index b4d1cc209..af34f79d5 100644
--- a/misc/style.cpp
+++ b/misc/style.cpp
@@ -46,7 +46,7 @@ QString qssifyWeight(int weight)
 
 QString qssifyFont(QFont font)
 {
-    return QString("%1px %2 \"%3\"")
+    return QString("%1 %2 \"%3\"")
             .arg(font.pixelSize())
             .arg(qssifyWeight(font.weight()))
             .arg(font.family());

From 3127e023d867e0650108ebf977a9252e81f5a46d Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Thu, 2 Oct 2014 14:27:03 -0500
Subject: [PATCH 162/205] Revert "reduce dependency versions to debian stable
 versions"

This reverts commit 626cc248940cb295dff41d3b6adfa6656ccb911b.
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index bb17b1441..af90ab856 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9), cdbs, qt5-qmake, libopenal-dev (>= 1:1.15.1), l
 
 Package: qtox
 Architecture: any
-Depends: libc6 (>= 2.13-38+deb7u4), libgcc1 (>= 1:4.1.1), libgl1-mesa-glx | libgl1, libopenal1 (>= 1.14), libopencv-core2.3, libopencv-highgui2.3, libopus0 (>= 0.9.14+20120615-1+nmu1), libqt5core5a (>= 5.2), libqt5gui5 (>= 5.2), libqt5network5 (>= 5.0), libqt5widgets5 (>= 5.2), libqt5xml5 (>= 5.0), libstdc++6 (>= 4.7.2-5), libvpx1 (>= 1.0.0)
+Depends: libc6 (>= 2.17), libgcc1 (>= 1:4.1.1), libgl1-mesa-glx | libgl1, libopenal1 (>= 1.14), libopencv-core2.4, libopencv-highgui2.4, libopus0 (>= 1.0), libqt5core5a (>= 5.2), libqt5gui5 (>= 5.2), libqt5network5 (>= 5.0), libqt5widgets5 (>= 5.2), libqt5xml5 (>= 5.0), libstdc++6 (>= 4.9), libvpx1 (>= 1.0.0)
 Description: Tox client
  qTox is a powerful Tox client that follows the Tox design guidelines.
  Tox is a decentralized and encrypted replacement for Skype, supporting

From 8aba636c638732541af0cde7a4996b3172b777ce Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Thu, 2 Oct 2014 18:53:44 -0500
Subject: [PATCH 163/205] fix groupchat issue

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

diff --git a/widget/widget.cpp b/widget/widget.cpp
index 606036b15..555042ef8 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -176,6 +176,7 @@ Widget::Widget(QWidget *parent)
     qRegisterMetaType<Status>("Status");
     qRegisterMetaType<vpx_image>("vpx_image");
     qRegisterMetaType<uint8_t>("uint8_t");
+    qRegisterMetaType<uint16_t>("uint16_t");
     qRegisterMetaType<int32_t>("int32_t");
     qRegisterMetaType<int64_t>("int64_t");
     qRegisterMetaType<QPixmap>("QPixmap");

From 2ebc583f291b4ab78eb05006e1238d5702ba9793 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Fri, 3 Oct 2014 16:31:42 +0200
Subject: [PATCH 164/205] fixed #372

---
 misc/style.cpp             | 29 +++++++++++------------------
 ui/chatArea/innerStyle.css |  1 -
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/misc/style.cpp b/misc/style.cpp
index af34f79d5..b1c49bebc 100644
--- a/misc/style.cpp
+++ b/misc/style.cpp
@@ -33,22 +33,11 @@ QFont appFont(int pixelSize, int weight)
     return font;
 }
 
-QString qssifyWeight(int weight)
-{
-    QString weightStr = "normal";
-    if (weight == QFont::Bold)
-        weightStr = "bold";
-    if (weight == QFont::Light)
-        weightStr = "light";
-
-    return QString("%1").arg(weightStr);
-}
-
 QString qssifyFont(QFont font)
 {
-    return QString("%1 %2 \"%3\"")
+    return QString("%1 %2px \"%3\"")
+            .arg(font.weight()*10)
             .arg(font.pixelSize())
-            .arg(qssifyWeight(font.weight()))
             .arg(font.family());
 }
 
@@ -68,6 +57,8 @@ QString Style::getStylesheet(const QString &filename)
 
 QColor Style::getColor(Style::ColorPalette entry)
 {
+    // colors as defined in
+    // https://github.com/ItsDuke/Tox-UI/blob/master/UI%20GUIDELINES.md
     static QColor palette[] = {
         QColor("#6bc260"),
         QColor("#cebf44"),
@@ -85,14 +76,16 @@ QColor Style::getColor(Style::ColorPalette entry)
 
 QFont Style::getFont(Style::Font font)
 {
+    // fonts as defined in
+    // https://github.com/ItsDuke/Tox-UI/blob/master/UI%20GUIDELINES.md
     static QFont fonts[] = {
+        appFont(15, QFont::Bold),
+        appFont(14, QFont::Normal),
         appFont(14, QFont::Bold),
+        appFont(13, QFont::Normal),
+        appFont(13, QFont::Bold),
         appFont(12, QFont::Normal),
-        appFont(12, QFont::Bold),
-        appFont(11, QFont::Normal),
-        appFont(11, QFont::Bold),
-        appFont(10, QFont::Normal),
-        appFont(10, QFont::Light),
+        appFont(12, QFont::Light),
     };
 
     return fonts[font];
diff --git a/ui/chatArea/innerStyle.css b/ui/chatArea/innerStyle.css
index 9c8ae6753..03db4367b 100644
--- a/ui/chatArea/innerStyle.css
+++ b/ui/chatArea/innerStyle.css
@@ -1,7 +1,6 @@
 div.name {
   color: @black;
   font: @bigBold;
-  font-weight: bold; /* @bigBold doesn't actually work */
 }
 
 div.message {

From 300d045dd97b27cb17e4872331b09590973825c0 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Fri, 3 Oct 2014 21:04:01 +0200
Subject: [PATCH 165/205] FileTransferInstance: return of the edges

---
 filetransferinstance.cpp                 |  27 +++++++++++++++++++++--
 res.qrc                                  |   1 +
 ui/fileTransferInstance/sliverRTEdge.png | Bin 0 -> 225 bytes
 3 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 ui/fileTransferInstance/sliverRTEdge.png

diff --git a/filetransferinstance.cpp b/filetransferinstance.cpp
index 9ab0c75d3..22570aa53 100644
--- a/filetransferinstance.cpp
+++ b/filetransferinstance.cpp
@@ -391,10 +391,33 @@ QString FileTransferInstance::draw2ButtonsForm(const QString &type, const QImage
 
 QString FileTransferInstance::wrapIntoForm(const QString& content, const QString &type, const QString &imgAstr, const QString &imgBstr)
 {
-    QString res;
+    QString w = QString::number(QImage(":/ui/fileTransferInstance/emptyLRedFileButton.png").size().width());
+    QString imgLeftA, imgLeftB;
 
+    if (type == "green")
+    {
+        imgLeftA = "<img src=\"data:placeholder/png;base64," + QImage2base64(QImage(":/ui/fileTransferInstance/emptyLGreenFileButton.png").mirrored(true,false)) + "\">";
+        imgLeftB = "<img src=\"data:placeholder/png;base64," + QImage2base64(QImage(":/ui/fileTransferInstance/emptyLGreenFileButton.png").mirrored(true,true)) + "\">";
+    }
+
+    if (type == "silver")
+    {
+        imgLeftA = "<img src=\"data:placeholder/png;base64," + QImage2base64(QImage(":/ui/fileTransferInstance/sliverRTEdge.png").mirrored(true,false)) + "\">";
+        imgLeftB = "<img src=\"data:placeholder/png;base64," + QImage2base64(QImage(":/ui/fileTransferInstance/sliverRTEdge.png").mirrored(true,true)) + "\">";
+    }
+
+    if (type == "red")
+    {
+        imgLeftA = "<img src=\"data:placeholder/png;base64," + QImage2base64(QImage(":/ui/fileTransferInstance/emptyLRedFileButton.png").mirrored(true,false)) + "\">";
+        imgLeftB = "<img src=\"data:placeholder/png;base64," + QImage2base64(QImage(":/ui/fileTransferInstance/emptyLRedFileButton.png").mirrored(true,true)) + "\">";
+    }
+
+    QString res;
     res =  "<table cellspacing=\"0\">\n";
     res += "<tr valign=middle>\n";
+    res += "<td width=" + w + ">\n";
+    res += "<div class=button>" + imgLeftA + "<br>" + imgLeftB + "</div>\n";
+    res += "</td>\n";
     res += insertMiniature(type);
     res += "<td width=" + QString::number(CONTENT_WIDTH + 30) + ">\n";
     res += "<div class=" + type + ">";
@@ -402,7 +425,7 @@ QString FileTransferInstance::wrapIntoForm(const QString& content, const QString
     res += "</div>\n";
     res += "</td>\n";
     res += "<td>\n";
-    res += "<div class=button>" + imgAstr + "<br>" + imgBstr+ "</div>\n";
+    res += "<div class=button>" + imgAstr + "<br>" + imgBstr + "</div>\n";
     res += "</td>\n";
     res += "</tr>\n";
     res += "</table>\n";
diff --git a/res.qrc b/res.qrc
index 5b4910039..17c26eb2c 100644
--- a/res.qrc
+++ b/res.qrc
@@ -146,5 +146,6 @@
         <file>img/avatar_mask.png</file>
         <file>img/group_2x.png</file>
         <file>ui/chatroomWidgets/genericChatroomWidget.css</file>
+        <file>ui/fileTransferInstance/sliverRTEdge.png</file>
     </qresource>
 </RCC>
diff --git a/ui/fileTransferInstance/sliverRTEdge.png b/ui/fileTransferInstance/sliverRTEdge.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd363d10799f5c83d81844040df4367462483a93
GIT binary patch
literal 225
zcmeAS@N?(olHy`uVBq!ia0vp^l0YoO!3HF!sEAwuQfx`y?k)`fL2$v|<&%LToCO|{
z#S9F5M?jcysy3fAP>{XE)7O>#9v8Eaf!XHWTYz#5d7dtgAs)xyURWr2$U(&Q;^Y-e
z1SaIjera?K=9uIZbbPzZa<+m6M$HcI*8RF}SD1EBKv2H4>TxIQ_n=eT_!n3CT0Cqs
zRnpU)a6iqaEMrB*_5E=cJ-5sr-;!!9=6`a7d1jS@kf+K-7ZCC8gt!5(XwS7B3=e=d
OGkCiCxvX<aXaWGehfU@H

literal 0
HcmV?d00001


From a486f9aa4d1ce333a1cd4857c56383fbf2cf990e Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Sat, 4 Oct 2014 10:24:20 +0200
Subject: [PATCH 166/205] statusPanel: css, cleanup

---
 mainwindow.ui             | 1293 +------------------------------------
 misc/style.cpp            |    2 +-
 res.qrc                   |    1 +
 ui/window/statusPanel.css |   70 ++
 widget/widget.cpp         |   58 +-
 5 files changed, 96 insertions(+), 1328 deletions(-)
 create mode 100644 ui/window/statusPanel.css

diff --git a/mainwindow.ui b/mainwindow.ui
index 300cc60c3..f8f1f72f6 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>712</width>
-    <height>539</height>
+    <width>710</width>
+    <height>537</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -548,458 +548,13 @@ QSplitter:handle{
       <property name="childrenCollapsible">
        <bool>false</bool>
       </property>
-      <widget class="QWidget" name="statusPanel" native="true">
+      <widget class="QFrame" name="statusPanel">
        <property name="sizePolicy">
         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="palette">
-        <palette>
-         <active>
-          <colorrole role="WindowText">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>255</red>
-             <green>255</green>
-             <blue>255</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Button">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>28</red>
-             <green>28</green>
-             <blue>28</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Light">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>42</red>
-             <green>42</green>
-             <blue>42</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Midlight">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>35</red>
-             <green>35</green>
-             <blue>35</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Dark">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>14</red>
-             <green>14</green>
-             <blue>14</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Mid">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>18</red>
-             <green>18</green>
-             <blue>18</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Text">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>255</red>
-             <green>255</green>
-             <blue>255</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="BrightText">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>255</red>
-             <green>255</green>
-             <blue>255</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="ButtonText">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>255</red>
-             <green>255</green>
-             <blue>255</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Base">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>0</red>
-             <green>0</green>
-             <blue>0</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Window">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>28</red>
-             <green>28</green>
-             <blue>28</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Shadow">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>0</red>
-             <green>0</green>
-             <blue>0</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="AlternateBase">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>14</red>
-             <green>14</green>
-             <blue>14</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="NoRole">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>28</red>
-             <green>28</green>
-             <blue>28</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="ToolTipBase">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>255</red>
-             <green>255</green>
-             <blue>220</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="ToolTipText">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>0</red>
-             <green>0</green>
-             <blue>0</blue>
-            </color>
-           </brush>
-          </colorrole>
-         </active>
-         <inactive>
-          <colorrole role="WindowText">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>255</red>
-             <green>255</green>
-             <blue>255</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Button">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>28</red>
-             <green>28</green>
-             <blue>28</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Light">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>42</red>
-             <green>42</green>
-             <blue>42</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Midlight">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>35</red>
-             <green>35</green>
-             <blue>35</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Dark">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>14</red>
-             <green>14</green>
-             <blue>14</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Mid">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>18</red>
-             <green>18</green>
-             <blue>18</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Text">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>255</red>
-             <green>255</green>
-             <blue>255</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="BrightText">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>255</red>
-             <green>255</green>
-             <blue>255</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="ButtonText">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>255</red>
-             <green>255</green>
-             <blue>255</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Base">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>0</red>
-             <green>0</green>
-             <blue>0</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Window">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>28</red>
-             <green>28</green>
-             <blue>28</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Shadow">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>0</red>
-             <green>0</green>
-             <blue>0</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="AlternateBase">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>14</red>
-             <green>14</green>
-             <blue>14</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="NoRole">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>28</red>
-             <green>28</green>
-             <blue>28</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="ToolTipBase">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>255</red>
-             <green>255</green>
-             <blue>220</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="ToolTipText">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>0</red>
-             <green>0</green>
-             <blue>0</blue>
-            </color>
-           </brush>
-          </colorrole>
-         </inactive>
-         <disabled>
-          <colorrole role="WindowText">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>14</red>
-             <green>14</green>
-             <blue>14</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Button">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>28</red>
-             <green>28</green>
-             <blue>28</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Light">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>42</red>
-             <green>42</green>
-             <blue>42</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Midlight">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>35</red>
-             <green>35</green>
-             <blue>35</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Dark">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>14</red>
-             <green>14</green>
-             <blue>14</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Mid">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>18</red>
-             <green>18</green>
-             <blue>18</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Text">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>14</red>
-             <green>14</green>
-             <blue>14</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="BrightText">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>255</red>
-             <green>255</green>
-             <blue>255</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="ButtonText">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>14</red>
-             <green>14</green>
-             <blue>14</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Base">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>28</red>
-             <green>28</green>
-             <blue>28</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Window">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>28</red>
-             <green>28</green>
-             <blue>28</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="Shadow">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>0</red>
-             <green>0</green>
-             <blue>0</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="AlternateBase">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>28</red>
-             <green>28</green>
-             <blue>28</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="NoRole">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>28</red>
-             <green>28</green>
-             <blue>28</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="ToolTipBase">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>255</red>
-             <green>255</green>
-             <blue>220</blue>
-            </color>
-           </brush>
-          </colorrole>
-          <colorrole role="ToolTipText">
-           <brush brushstyle="SolidPattern">
-            <color alpha="255">
-             <red>0</red>
-             <green>0</green>
-             <blue>0</blue>
-            </color>
-           </brush>
-          </colorrole>
-         </disabled>
-        </palette>
-       </property>
-       <property name="autoFillBackground">
-        <bool>true</bool>
-       </property>
        <layout class="QVBoxLayout" name="verticalLayout_3">
         <property name="spacing">
          <number>0</number>
@@ -1027,424 +582,6 @@ QSplitter:handle{
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="palette">
-           <palette>
-            <active>
-             <colorrole role="WindowText">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>255</red>
-                <green>255</green>
-                <blue>255</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Button">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>28</red>
-                <green>28</green>
-                <blue>28</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Light">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>42</red>
-                <green>42</green>
-                <blue>42</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Midlight">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>35</red>
-                <green>35</green>
-                <blue>35</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Dark">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>14</red>
-                <green>14</green>
-                <blue>14</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Mid">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>18</red>
-                <green>18</green>
-                <blue>18</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Text">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>255</red>
-                <green>255</green>
-                <blue>255</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="BrightText">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>255</red>
-                <green>255</green>
-                <blue>255</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="ButtonText">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>255</red>
-                <green>255</green>
-                <blue>255</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Base">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>0</red>
-                <green>0</green>
-                <blue>0</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Window">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>28</red>
-                <green>28</green>
-                <blue>28</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Shadow">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>0</red>
-                <green>0</green>
-                <blue>0</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="AlternateBase">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>14</red>
-                <green>14</green>
-                <blue>14</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="ToolTipBase">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>255</red>
-                <green>255</green>
-                <blue>220</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="ToolTipText">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>0</red>
-                <green>0</green>
-                <blue>0</blue>
-               </color>
-              </brush>
-             </colorrole>
-            </active>
-            <inactive>
-             <colorrole role="WindowText">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>255</red>
-                <green>255</green>
-                <blue>255</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Button">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>28</red>
-                <green>28</green>
-                <blue>28</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Light">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>42</red>
-                <green>42</green>
-                <blue>42</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Midlight">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>35</red>
-                <green>35</green>
-                <blue>35</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Dark">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>14</red>
-                <green>14</green>
-                <blue>14</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Mid">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>18</red>
-                <green>18</green>
-                <blue>18</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Text">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>255</red>
-                <green>255</green>
-                <blue>255</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="BrightText">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>255</red>
-                <green>255</green>
-                <blue>255</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="ButtonText">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>255</red>
-                <green>255</green>
-                <blue>255</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Base">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>0</red>
-                <green>0</green>
-                <blue>0</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Window">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>28</red>
-                <green>28</green>
-                <blue>28</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Shadow">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>0</red>
-                <green>0</green>
-                <blue>0</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="AlternateBase">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>14</red>
-                <green>14</green>
-                <blue>14</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="ToolTipBase">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>255</red>
-                <green>255</green>
-                <blue>220</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="ToolTipText">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>0</red>
-                <green>0</green>
-                <blue>0</blue>
-               </color>
-              </brush>
-             </colorrole>
-            </inactive>
-            <disabled>
-             <colorrole role="WindowText">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>14</red>
-                <green>14</green>
-                <blue>14</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Button">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>28</red>
-                <green>28</green>
-                <blue>28</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Light">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>42</red>
-                <green>42</green>
-                <blue>42</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Midlight">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>35</red>
-                <green>35</green>
-                <blue>35</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Dark">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>14</red>
-                <green>14</green>
-                <blue>14</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Mid">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>18</red>
-                <green>18</green>
-                <blue>18</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Text">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>14</red>
-                <green>14</green>
-                <blue>14</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="BrightText">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>255</red>
-                <green>255</green>
-                <blue>255</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="ButtonText">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>14</red>
-                <green>14</green>
-                <blue>14</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Base">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>28</red>
-                <green>28</green>
-                <blue>28</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Window">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>28</red>
-                <green>28</green>
-                <blue>28</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Shadow">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>0</red>
-                <green>0</green>
-                <blue>0</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="AlternateBase">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>28</red>
-                <green>28</green>
-                <blue>28</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="ToolTipBase">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>255</red>
-                <green>255</green>
-                <blue>220</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="ToolTipText">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>0</red>
-                <green>0</green>
-                <blue>0</blue>
-               </color>
-              </brush>
-             </colorrole>
-            </disabled>
-           </palette>
-          </property>
-          <property name="autoFillBackground">
-           <bool>true</bool>
-          </property>
           <layout class="QGridLayout" name="gridLayout_2">
            <item row="0" column="0">
             <layout class="QHBoxLayout" name="horizontalLayout_3">
@@ -2083,8 +1220,8 @@ QSplitter:handle{
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>261</width>
-             <height>373</height>
+             <width>288</width>
+             <height>371</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_5"/>
@@ -2102,424 +1239,6 @@ QSplitter:handle{
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="palette">
-           <palette>
-            <active>
-             <colorrole role="WindowText">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>255</red>
-                <green>255</green>
-                <blue>255</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Button">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>28</red>
-                <green>28</green>
-                <blue>28</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Light">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>42</red>
-                <green>42</green>
-                <blue>42</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Midlight">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>35</red>
-                <green>35</green>
-                <blue>35</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Dark">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>14</red>
-                <green>14</green>
-                <blue>14</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Mid">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>18</red>
-                <green>18</green>
-                <blue>18</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Text">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>255</red>
-                <green>255</green>
-                <blue>255</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="BrightText">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>255</red>
-                <green>255</green>
-                <blue>255</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="ButtonText">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>255</red>
-                <green>255</green>
-                <blue>255</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Base">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>0</red>
-                <green>0</green>
-                <blue>0</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Window">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>28</red>
-                <green>28</green>
-                <blue>28</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Shadow">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>0</red>
-                <green>0</green>
-                <blue>0</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="AlternateBase">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>14</red>
-                <green>14</green>
-                <blue>14</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="ToolTipBase">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>255</red>
-                <green>255</green>
-                <blue>220</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="ToolTipText">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>0</red>
-                <green>0</green>
-                <blue>0</blue>
-               </color>
-              </brush>
-             </colorrole>
-            </active>
-            <inactive>
-             <colorrole role="WindowText">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>255</red>
-                <green>255</green>
-                <blue>255</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Button">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>28</red>
-                <green>28</green>
-                <blue>28</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Light">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>42</red>
-                <green>42</green>
-                <blue>42</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Midlight">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>35</red>
-                <green>35</green>
-                <blue>35</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Dark">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>14</red>
-                <green>14</green>
-                <blue>14</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Mid">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>18</red>
-                <green>18</green>
-                <blue>18</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Text">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>255</red>
-                <green>255</green>
-                <blue>255</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="BrightText">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>255</red>
-                <green>255</green>
-                <blue>255</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="ButtonText">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>255</red>
-                <green>255</green>
-                <blue>255</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Base">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>0</red>
-                <green>0</green>
-                <blue>0</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Window">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>28</red>
-                <green>28</green>
-                <blue>28</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Shadow">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>0</red>
-                <green>0</green>
-                <blue>0</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="AlternateBase">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>14</red>
-                <green>14</green>
-                <blue>14</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="ToolTipBase">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>255</red>
-                <green>255</green>
-                <blue>220</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="ToolTipText">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>0</red>
-                <green>0</green>
-                <blue>0</blue>
-               </color>
-              </brush>
-             </colorrole>
-            </inactive>
-            <disabled>
-             <colorrole role="WindowText">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>14</red>
-                <green>14</green>
-                <blue>14</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Button">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>28</red>
-                <green>28</green>
-                <blue>28</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Light">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>42</red>
-                <green>42</green>
-                <blue>42</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Midlight">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>35</red>
-                <green>35</green>
-                <blue>35</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Dark">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>14</red>
-                <green>14</green>
-                <blue>14</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Mid">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>18</red>
-                <green>18</green>
-                <blue>18</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Text">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>14</red>
-                <green>14</green>
-                <blue>14</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="BrightText">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>255</red>
-                <green>255</green>
-                <blue>255</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="ButtonText">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>14</red>
-                <green>14</green>
-                <blue>14</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Base">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>28</red>
-                <green>28</green>
-                <blue>28</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Window">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>28</red>
-                <green>28</green>
-                <blue>28</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="Shadow">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>0</red>
-                <green>0</green>
-                <blue>0</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="AlternateBase">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>28</red>
-                <green>28</green>
-                <blue>28</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="ToolTipBase">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>255</red>
-                <green>255</green>
-                <blue>220</blue>
-               </color>
-              </brush>
-             </colorrole>
-             <colorrole role="ToolTipText">
-              <brush brushstyle="SolidPattern">
-               <color alpha="255">
-                <red>0</red>
-                <green>0</green>
-                <blue>0</blue>
-               </color>
-              </brush>
-             </colorrole>
-            </disabled>
-           </palette>
-          </property>
-          <property name="autoFillBackground">
-           <bool>true</bool>
-          </property>
           <layout class="QHBoxLayout" name="horizontalLayout_2">
            <property name="spacing">
             <number>0</number>
@@ -3218,7 +1937,7 @@ QSplitter:handle{
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>712</width>
+     <width>710</width>
      <height>25</height>
     </rect>
    </property>
diff --git a/misc/style.cpp b/misc/style.cpp
index b1c49bebc..120991f65 100644
--- a/misc/style.cpp
+++ b/misc/style.cpp
@@ -79,7 +79,7 @@ QFont Style::getFont(Style::Font font)
     // fonts as defined in
     // https://github.com/ItsDuke/Tox-UI/blob/master/UI%20GUIDELINES.md
     static QFont fonts[] = {
-        appFont(15, QFont::Bold),
+        appFont(16, QFont::Bold),
         appFont(14, QFont::Normal),
         appFont(14, QFont::Bold),
         appFont(13, QFont::Normal),
diff --git a/res.qrc b/res.qrc
index 17c26eb2c..312ec457a 100644
--- a/res.qrc
+++ b/res.qrc
@@ -147,5 +147,6 @@
         <file>img/group_2x.png</file>
         <file>ui/chatroomWidgets/genericChatroomWidget.css</file>
         <file>ui/fileTransferInstance/sliverRTEdge.png</file>
+        <file>ui/window/statusPanel.css</file>
     </qresource>
 </RCC>
diff --git a/ui/window/statusPanel.css b/ui/window/statusPanel.css
new file mode 100644
index 000000000..3a0fc36da
--- /dev/null
+++ b/ui/window/statusPanel.css
@@ -0,0 +1,70 @@
+#statusPanel 
+{
+  background-color: @darkGrey;
+}
+
+#statusPanel > #statusHead > #nameLabel {
+  font: @extraBig;
+  color: @white;
+}
+
+#statusPanel > #statusHead > #statusLabel {
+  font: @smallLight;
+  color: @lightGrey;
+}
+
+#statusPanel > #statusHead > #statusButton
+{
+    background: none;
+    background-color: @mediumGrey;
+    border: none;
+    border-radius: 6px;
+    width: 20px;
+    height: 40px;
+}
+
+#statusPanel > #statusHead > #statusButton[status="online"]
+{
+  image: url(":ui/statusButton/dot_online.png") center center;
+}
+
+#statusPanel > #statusHead > #statusButton[status="away"]
+{
+  image: url(":ui/statusButton/dot_idle.png") center center;
+}
+
+#statusPanel > #statusHead > #statusButton[status="busy"]
+{
+  image: url(":ui/statusButton/dot_busy.png") center center;
+}
+
+#statusPanel > #statusHead > #statusButton[status="offline"]
+{
+  image: url(":ui/statusButton/dot_away.png") center center;
+}
+
+/*Bugged in Qt, but it's probably better to leave enabled so that users can tell it's clickable*/
+#statusPanel > #statusHead > #statusButton:hover 
+{
+  background-color: @mediumGreyLight;
+}
+
+#statusPanel > #statusHead > #statusButton:pressed 
+{
+  background-color: @mediumGrey;
+}
+
+#statusPanel > #statusHead > #statusButton:focus {
+  outline: none;
+}
+
+#statusPanel > #statusHead > #statusButton::menu-indicator {image: none;}
+
+#statusPanel > #statusHead > #statusButton::menu-indicator:pressed, #statusPanel > #statusHead > #statusButton::menu-indicator:open 
+{
+  image: url(":ui/statusButton/menu_indicator.png");
+  subcontrol-origin: padding;
+  subcontrol-position: bottom center;
+  position: relative;
+  bottom: 2px;
+}
diff --git a/widget/widget.cpp b/widget/widget.cpp
index 555042ef8..92c1ed95b 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -130,16 +130,7 @@ Widget::Widget(QWidget *parent)
     ui->nameLabel->setEditable(true);
     ui->statusLabel->setEditable(true);
 
-    ui->statusLabel->setFont(Style::getFont(Style::Medium));
-    ui->nameLabel->setFont(Style::getFont(Style::ExtraBig));
-
-    // delay setting username and message until Core inits
-    //ui->nameLabel->setText(core->getUsername());
-    ui->nameLabel->setStyleSheet("QLabel { color : white; font-size: 11pt; font-weight:bold;}");
-    //ui->statusLabel->setText(core->getStatusMessage());
-    ui->statusLabel->setStyleSheet("QLabel { color : white; font-size: 8pt;}");
-
-    ui->statusButton->setStyleSheet(Style::getStylesheet(":/ui/statusButton/statusButton.css"));
+    ui->statusPanel->setStyleSheet(Style::getStylesheet(":/ui/window/statusPanel.css"));
 
     QMenu *statusButtonMenu = new QMenu(ui->statusButton);
     QAction* setStatusOnline = statusButtonMenu->addAction(Widget::tr("Online","Button to set your status to 'Online'"));
@@ -150,22 +141,12 @@ Widget::Widget(QWidget *parent)
     setStatusBusy->setIcon(QIcon(":ui/statusButton/dot_busy.png"));
     ui->statusButton->setMenu(statusButtonMenu);
 
-    ui->titleBar->setMouseTracking(true);
-    ui->LTitle->setMouseTracking(true);
-    ui->tbMenu->setMouseTracking(true);
-    ui->pbMin->setMouseTracking(true);
-    ui->pbMax->setMouseTracking(true);
-    ui->pbClose->setMouseTracking(true);
-    ui->statusHead->setMouseTracking(true);
-
-    //ui->friendList->viewport()->installEventFilter(this);
-
     // disable proportional scaling
     ui->mainSplitter->setStretchFactor(0,0);
     ui->mainSplitter->setStretchFactor(1,1);
 
-    ui->statusButton->setObjectName("offline");
-    ui->statusButton->style()->polish(ui->statusButton);
+    ui->statusButton->setProperty("status", "offline");
+    Style::repolish(ui->statusButton);
 
     camera = new Camera;
     settingsDialog = new SettingsDialog(this);
@@ -359,26 +340,23 @@ void Widget::onStatusSet(Status status)
 {
     //We have to use stylesheets here, there's no way to
     //prevent the button icon from moving when pressed otherwise
-    if (status == Status::Online)
+    switch (status)
     {
-        ui->statusButton->setObjectName("online");
-        ui->statusButton->style()->polish(ui->statusButton);
-    }
-    else if (status == Status::Away)
-    {
-        ui->statusButton->setObjectName("away");
-        ui->statusButton->style()->polish(ui->statusButton);
-    }
-    else if (status == Status::Busy)
-    {
-        ui->statusButton->setObjectName("busy");
-        ui->statusButton->style()->polish(ui->statusButton);
-    }
-    else if (status == Status::Offline)
-    {
-        ui->statusButton->setObjectName("offline");
-        ui->statusButton->style()->polish(ui->statusButton);
+    case Status::Online:
+        ui->statusButton->setProperty("status" ,"online");
+        break;
+    case Status::Away:
+        ui->statusButton->setProperty("status" ,"away");
+        break;
+    case Status::Busy:
+        ui->statusButton->setProperty("status" ,"busy");
+        break;
+    case Status::Offline:
+        ui->statusButton->setProperty("status" ,"offline");
+        break;
     }
+
+    Style::repolish(ui->statusButton);
 }
 
 void Widget::onAddClicked()

From 23a64ef45fa7600859e1bf6a679c2e835f60a4d4 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Sat, 4 Oct 2014 10:54:50 +0200
Subject: [PATCH 167/205] removed broken custom window decoration

---
 mainwindow.ui                       | 189 +-----------
 misc/settings.cpp                   |  12 -
 misc/settings.h                     |   4 -
 res.qrc                             |  12 -
 ui/window/closeButton.png           | Bin 385 -> 0 bytes
 ui/window/closeButtonHover.png      | Bin 370 -> 0 bytes
 ui/window/closeButtonPressed.png    | Bin 372 -> 0 bytes
 ui/window/maximizeButton.png        | Bin 401 -> 0 bytes
 ui/window/maximizeButtonHover.png   | Bin 401 -> 0 bytes
 ui/window/maximizeButtonPressed.png | Bin 402 -> 0 bytes
 ui/window/minimizeButton.png        | Bin 371 -> 0 bytes
 ui/window/minimizeButtonHover.png   | Bin 371 -> 0 bytes
 ui/window/minimizeButtonPressed.png | Bin 372 -> 0 bytes
 ui/window/restoreButton.png         | Bin 401 -> 0 bytes
 ui/window/restoreButtonHover.png    | Bin 401 -> 0 bytes
 ui/window/restoreButtonPressed.png  | Bin 402 -> 0 bytes
 widget/form/chatform.cpp            |   4 +-
 widget/groupwidget.cpp              |  29 +-
 widget/widget.cpp                   | 430 +---------------------------
 widget/widget.h                     |  25 +-
 20 files changed, 21 insertions(+), 684 deletions(-)
 delete mode 100644 ui/window/closeButton.png
 delete mode 100644 ui/window/closeButtonHover.png
 delete mode 100644 ui/window/closeButtonPressed.png
 delete mode 100644 ui/window/maximizeButton.png
 delete mode 100644 ui/window/maximizeButtonHover.png
 delete mode 100644 ui/window/maximizeButtonPressed.png
 delete mode 100644 ui/window/minimizeButton.png
 delete mode 100644 ui/window/minimizeButtonHover.png
 delete mode 100644 ui/window/minimizeButtonPressed.png
 delete mode 100644 ui/window/restoreButton.png
 delete mode 100644 ui/window/restoreButtonHover.png
 delete mode 100644 ui/window/restoreButtonPressed.png

diff --git a/mainwindow.ui b/mainwindow.ui
index f8f1f72f6..78c16d345 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -37,193 +37,6 @@
     <property name="bottomMargin">
      <number>0</number>
     </property>
-    <item>
-     <widget class="QWidget" name="titleBar" native="true">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>0</width>
-        <height>23</height>
-       </size>
-      </property>
-      <property name="maximumSize">
-       <size>
-        <width>16777215</width>
-        <height>23</height>
-       </size>
-      </property>
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <property name="spacing">
-        <number>4</number>
-       </property>
-       <property name="leftMargin">
-        <number>5</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>1</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QToolButton" name="tbMenu">
-         <property name="minimumSize">
-          <size>
-           <width>16</width>
-           <height>16</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>16</width>
-           <height>16</height>
-          </size>
-         </property>
-         <property name="iconSize">
-          <size>
-           <width>16</width>
-           <height>16</height>
-          </size>
-         </property>
-         <property name="popupMode">
-          <enum>QToolButton::InstantPopup</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>15</width>
-           <height>1</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QLabel" name="LTitle">
-         <property name="minimumSize">
-          <size>
-           <width>100</width>
-           <height>22</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>22</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Minimum</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>134</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QPushButton" name="pbMin">
-         <property name="minimumSize">
-          <size>
-           <width>22</width>
-           <height>22</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>22</width>
-           <height>22</height>
-          </size>
-         </property>
-         <property name="iconSize">
-          <size>
-           <width>22</width>
-           <height>22</height>
-          </size>
-         </property>
-         <property name="flat">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="pbMax">
-         <property name="minimumSize">
-          <size>
-           <width>22</width>
-           <height>22</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>22</width>
-           <height>22</height>
-          </size>
-         </property>
-         <property name="iconSize">
-          <size>
-           <width>22</width>
-           <height>22</height>
-          </size>
-         </property>
-         <property name="flat">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="pbClose">
-         <property name="minimumSize">
-          <size>
-           <width>22</width>
-           <height>22</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>22</width>
-           <height>22</height>
-          </size>
-         </property>
-         <property name="iconSize">
-          <size>
-           <width>22</width>
-           <height>22</height>
-          </size>
-         </property>
-         <property name="flat">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </item>
     <item>
      <widget class="QSplitter" name="mainSplitter">
       <property name="sizePolicy">
@@ -1221,7 +1034,7 @@ QSplitter:handle{
              <x>0</x>
              <y>0</y>
              <width>288</width>
-             <height>371</height>
+             <height>400</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_5"/>
diff --git a/misc/settings.cpp b/misc/settings.cpp
index 31cbd158e..72a06e4ed 100644
--- a/misc/settings.cpp
+++ b/misc/settings.cpp
@@ -130,7 +130,6 @@ void Settings::load()
         timestampFormat = s.value("timestampFormat", "hh:mm").toString();
         minimizeOnClose = s.value("minimizeOnClose", false).toBool();
         useNativeStyle = s.value("nativeStyle", false).toBool();
-        useNativeDecoration = s.value("nativeDecoration", true).toBool();
     s.endGroup();
 
     s.beginGroup("State");
@@ -230,7 +229,6 @@ void Settings::save(QString path)
         s.setValue("timestampFormat", timestampFormat);
         s.setValue("minimizeOnClose", minimizeOnClose);
         s.setValue("nativeStyle", useNativeStyle);
-        s.setValue("nativeDecoration", useNativeDecoration);
     s.endGroup();
 
     s.beginGroup("State");
@@ -478,16 +476,6 @@ void Settings::setUseNativeStyle(bool value)
     useNativeStyle = value;
 }
 
-bool Settings::getUseNativeDecoration() const
-{
-    return useNativeDecoration;
-}
-
-void Settings::setUseNativeDecoration(bool value)
-{
-    useNativeDecoration = value;
-}
-
 QByteArray Settings::getWindowGeometry() const
 {
     return windowGeometry;
diff --git a/misc/settings.h b/misc/settings.h
index 9f379e886..f171c17af 100644
--- a/misc/settings.h
+++ b/misc/settings.h
@@ -121,9 +121,6 @@ public:
     bool getUseNativeStyle() const;
     void setUseNativeStyle(bool value);
 
-    bool getUseNativeDecoration() const;
-    void setUseNativeDecoration(bool value);
-
     QByteArray getWindowGeometry() const;
     void setWindowGeometry(const QByteArray &value);
 
@@ -170,7 +167,6 @@ private:
     int     emojiFontPointSize;
     bool minimizeOnClose;
     bool useNativeStyle;
-    bool useNativeDecoration;
     QByteArray windowGeometry;
     QByteArray windowState;
     QByteArray splitterState;
diff --git a/res.qrc b/res.qrc
index 312ec457a..e8156ac58 100644
--- a/res.qrc
+++ b/res.qrc
@@ -84,18 +84,6 @@
         <file>ui/videoButton/videoButtonYellowPressed.png</file>
         <file>img/group_dark.png</file>
         <file>ui/window/applicationIcon.png</file>
-        <file>ui/window/closeButton.png</file>
-        <file>ui/window/closeButtonHover.png</file>
-        <file>ui/window/closeButtonPressed.png</file>
-        <file>ui/window/maximizeButton.png</file>
-        <file>ui/window/maximizeButtonHover.png</file>
-        <file>ui/window/maximizeButtonPressed.png</file>
-        <file>ui/window/minimizeButton.png</file>
-        <file>ui/window/minimizeButtonHover.png</file>
-        <file>ui/window/minimizeButtonPressed.png</file>
-        <file>ui/window/restoreButton.png</file>
-        <file>ui/window/restoreButtonHover.png</file>
-        <file>ui/window/restoreButtonPressed.png</file>
         <file>ui/friendList/friendList.css</file>
         <file>ui/window/window.css</file>
         <file>img/status/dot_busy.png</file>
diff --git a/ui/window/closeButton.png b/ui/window/closeButton.png
deleted file mode 100644
index ce57b0e9e72cd37f84ef29e08d021ef035bbf152..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 385
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEa{HEjtmSN`?>!lvI6;>1s;*b
z3=G^tAk28_ZrvZCAbW|YuPggqc1ccEv#WRImjZ<(OI#yLobz*YQ}ap~oQqNuOHxx5
z$}>wc6x=<11Hv2m#DR*$K#GF%(@M${i&7a15;OBk^zu?m6ioCCtY3W11gbdc>EamT
z;l1_BM&3gXJggU{h)8xA=>~6Laou*xLQ``StH|;HLh48N^-mR8ULo}FhS(E}T|uWb
zQ)W1}NrH&0uj^hXws20<-<Ni6^-Qm}mV=D*0_q-AH_uX)EK1m_@TqO}t&1!fPp<dd
ztu#M;^t~bL!p`&lx*axu<bnleRaj(M82z+ereN~%$<>0CkJUboIYrLVIZ-vY7XNtu
z!EOI>k(On9?ajZLZNDHQD)l`^pz`;u1&<h>#J%Kd{#ozje$t?s$N0pD9hYhu`ep=m
U>^0CV2YQOZ)78&qol`;+05=km-v9sr

diff --git a/ui/window/closeButtonHover.png b/ui/window/closeButtonHover.png
deleted file mode 100644
index 8b756f08b9e4bdf1418c9083ccfac03062e30a1a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 370
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEa{HEjtmSN`?>!lvI6;>1s;*b
z3=G^tAk28_ZrvZCAbW|YuPggqc1ccEv#WRImjZ<(OI#yLobz*YQ}ap~oQqNuOHxx5
z$}>wc6x=<11Hv2m#DR*$K#GF%(@M${i&7a15;OBk^zu?m6ioCCtY3W11ghBO>EamT
z;l1_BM&4!z9@c<UB0N(jxz1=3$vJAF8EoLjb^P1J$!~sJb|#4XACk{uJZ>lu$R**{
zkjMfeww_UrzIp6hvy8Xdp?S<aSB?DN9DTuVX?`${%{lkL;XUTN7fbpc5I^<!`@1XE
zn`X~X<_f(hFLmMbhhm?FryebMHt+0t!&WWr{#n&!_QyrE3JY$n{*nGM49I@<=egQ-
zv)va&uI}VzDvuWq(Tx73{Zzd~kVpA|0Ta*q#SfV+9~B(=$B<(T^aX>btDnm{r-UW|
D8Xtz3

diff --git a/ui/window/closeButtonPressed.png b/ui/window/closeButtonPressed.png
deleted file mode 100644
index caa1e40744554c16099e678e8898026cb8ea62bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 372
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEa{HEjtmSN`?>!lvI6;>1s;*b
z3=G^tAk28_ZrvZCAbW|YuPggqc1ccEv#WRImjZ<(OI#yLobz*YQ}ap~oQqNuOHxx5
z$}>wc6x=<11Hv2m#DR*$K#GF%(@M${i&7a15;OBk^zu?m6ioCCtY3W11ghBM>EamT
z;l1^WAz!lr4{N|NKA9ED<qt&O$nFq5p7`c~q)}-`F1ymrpS>(M4p08T9__#p>!r!U
zV|(BNGmzLY<Ji12DT=rI`Ym54p66>zl4Ad)cHjQT9foR7o~4ZZo9&)-riC!Zp6I{7
zD>z$~-`ZVNX}`V6f~Tp^S2#U6>UdVSd+uVciQ#gl+jGkLv|JuM*brWr`Y{ct?$Mv;
z$F7I%4iG)Mlb5MHUQ|Re`j@~b;a!|<atSXO+rBS-$F8Yv!84iT=melY7(8A5T-G@y
GGywp?DT3$#

diff --git a/ui/window/maximizeButton.png b/ui/window/maximizeButton.png
deleted file mode 100644
index d3223796c7097b7cea52c97a680f1560b07d2ada..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 401
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEa{HEjtmSN`?>!lvI6;>1s;*b
z3=G^tAk28_ZrvZCAbW|YuPggqc1ccFxzab2{{n?1OI#yLobz*YQ}ap~oQqNuOHxx5
z$}>wc6x=<11Hv2m#DR*$K#GF%(@M${i&7a15;OBk^zu?m6ioCCtY3W11gf~{>EamT
z;l1_BLSCjo0hSBG94t&iT#iB_tO0D3m_B%PIRr4MDqLV`bWjoyX>h4Y6RJC;=lpK+
zZDIXHb!%<CpCOt{!%i49@hF3c%?ArFwW_{(@a@?BGgYf5pPUdNbC~rKfB1}5dM5>1
z1#RxLzdCcJcRfS5tVONJ>kps5{FOBpnD$J5X^?jPah{f?z1mZ6{I*V0(3u;%^2p))
zhRlg8w;qlT*DCx_e#RjpYDZA#*8RzBhlJv9+s}W@=M2;%DfU?2qs{5h<Z}T%|An)>
j+5}T19NW$=eZ^X__v`$H9AEi>o@DTJ^>bP0l+XkK9TJb^

diff --git a/ui/window/maximizeButtonHover.png b/ui/window/maximizeButtonHover.png
deleted file mode 100644
index dae87a3b54d0aed6bf82c99d9dffc0f48ae977c8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 401
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEa{HEjtmSN`?>!lvI6;>1s;*b
z3=G^tAk28_ZrvZCAbW|YuPggqc1ccFxzab2{{n?1OI#yLobz*YQ}ap~oQqNuOHxx5
z$}>wc6x=<11Hv2m#DR*$K#GF%(@M${i&7a15;OBk^zu?m6ioCCtY3W11gf~{>EamT
z;l1_BLSCjo0hRz3rbdSc8BCon3YyHGj1?-b3K|VU0wN6#b6gZO7&?EPQTaakb}GmG
zJM$_yt#3vao?JdX=v51k@(F_`5HUNXn=$7B$9JiEW9e0XYR*oDY@$o_^9;gcCn<6T
zS6pSUi(Dlw&nWi0AXB9N;d9BK)@celYo(S3Mb{taX<52gd#VLkC^mNGk<0fDnG;uT
zKFl7jRrsy^j6+1!?x4=O`;*xY3B}*GpZ}OK8K_56?6JH@o711k=K^~E3uk$^38qLm
ew!K|?PkN3I=e3&*mg|9@WbkzLb6Mw<&;$UDIf%^w

diff --git a/ui/window/maximizeButtonPressed.png b/ui/window/maximizeButtonPressed.png
deleted file mode 100644
index 719b3f8bc8cf2195d484e1ac0df1c1d64cb03a92..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 402
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEa{HEjtmSN`?>!lvI6;>1s;*b
z3=G^tAk28_ZrvZCAbW|YuPggqc1ccFxzab2{{n?1OI#yLobz*YQ}ap~oQqNuOHxx5
z$}>wc6x=<11Hv2m#DR*$K#GF%(@M${i&7a15;OBk^zu?m6ioCCtY3W11gf~@>EamT
z;l1_BLf%6O0;~_XgakNPnnRQ%8w@A#G`JhFG%-prUSt&DP+>aA@Fbk$m)=X&y^kmU
zTN3_J_0H+N!oGD~Q!XiFNHn$yf{3h`slqo7amw-j)V(>SRD_qci+jhx=k3-yk>M8v
zT7~YNZPe2)d#run5r^K|B=Mg%#`VW}n7m(yX<k2f->~_>rGrz8=KPg4=Fo|a)jWP0
zER@jRzi!InPvvJ6Hf$+eDpL*C@#)sTpECY4ep{ynMD)}vaJBwWUmMW#U-(rw#2tT^
aE@I1I+Vea~Vu=UPmkge+elF{r5}E+mN|D?E

diff --git a/ui/window/minimizeButton.png b/ui/window/minimizeButton.png
deleted file mode 100644
index 8773e5359ad2a88b312dd13d86d86e15eab892c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 371
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEa{HEjtmSN`?>!lvI6;>1s;*b
z3=G^tAk28_ZrvZCAbW|YuPggqc1ccFxzab2{{n?1OI#yLobz*YQ}ap~oQqNuOHxx5
z$}>wc6x=<11Hv2m#DR*$K#GF%(@M${i&7a15;OBk^zu?m6ioCCtY3W11ghBW>EamT
z;l1^WAz!lr59@^<S&IO7zN?MVh1}~dOl;if{vtt!UFqh}UYCvS>JRz1H3$d^wl*we
zm#6{}Vct?Vj-+kdc)oDXX2x$a2^!N(Hch?A|MLz<wIt6{M*hwF-gKs!Fvic2-(SA`
z+HBi5GNB!x{#|I8H+}A6u0Sz%)9+`>`m|gkYp>kdeA9B3Kx6aaxTE&n<{<WU`|UNk
zo4G>+V{a=Id^dFz-L%wS(SG6Vgcpo$atRgkOJ)C^$&!hUW^M<1gTd3)&t;ucLK6Tz
Cb%clj

diff --git a/ui/window/minimizeButtonHover.png b/ui/window/minimizeButtonHover.png
deleted file mode 100644
index 982c032b04daf140c24cd3e933ed9b05c3386df6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 371
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEa{HEjtmSN`?>!lvI6;>1s;*b
z3=G_YAk0{w5<d|r$X?><>&kwYU6PYkuJq01zd#|$64!_l=ltB<)VvY~=c3falGGH1
z^30M91$R&1fbd2>aiAhGkfPxHw370~qEv>0#LT=By}Z;C1rt33>la@$fhu-;x;Tb-
zcyGO8$k%MZ!y0gmt5Cs>?`mUop{Ut0z8+gA_UnZiD%SfaGE`Rx{Y&8HSg5>6z~Bpm
zGe3|xob;C6Y;)_|H?=a$a~f>fCAzlGztMeB{^cE(YDu1@jQpGJa$Jm8HR${F-`^FS
zoy>3TE~>QO-ekek%;zhdo*Z>NtJ^(yG1tU!dDHE0%KEfi9z56(UYPnZ4XEzXpXbxo
ztu0%q)m1Fb@@}7&hSRn${wMrjs7X{cEM%9s=YCf_RinJ;Y|lplpf?yiUHx3vIVCg!
E06^w|-v9sr

diff --git a/ui/window/minimizeButtonPressed.png b/ui/window/minimizeButtonPressed.png
deleted file mode 100644
index c72c1a5e9e9f44003305e751c0321ad8140e5139..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 372
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEa{HEjtmSN`?>!lvI6;>1s;*b
z3=G_YAk0{w5<d|r$X?><>&kwYU6PYkuJq01zd#|$64!_l=ltB<)VvY~=c3falGGH1
z^30M91$R&1fbd2>aiAhGkfPxHw370~qEv>0#LT=By}Z;C1rt33>la@$fhzWRx;Tb-
zcyGO8$k%MZ!+N1d)*`^2?`mUoA>+G?8<~@z`^essXIHxUvzNu<@Z=Bd(GDDn$8NCl
z+FrQ83?w#09AXeYv*A#+wckyLYBLiNZ;6Mj_w6t3ocN82cWER4X1juP<5dje%Z}&Y
zUHP?T_T0r>6YtAQU--14I7IQ&qYcld-8>iAdSdnYS<zwE?xKqxKge7E=*%PEvOcXN
zAJ6N?M!$6m6*+Fkakn-!pycMI-Fo&5yE9%iw#j8w#PZnBeQY69*Qxgv=nn=@S3j3^
HP6<r_=xK;N

diff --git a/ui/window/restoreButton.png b/ui/window/restoreButton.png
deleted file mode 100644
index d3223796c7097b7cea52c97a680f1560b07d2ada..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 401
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEa{HEjtmSN`?>!lvI6;>1s;*b
z3=G^tAk28_ZrvZCAbW|YuPggqc1ccFxzab2{{n?1OI#yLobz*YQ}ap~oQqNuOHxx5
z$}>wc6x=<11Hv2m#DR*$K#GF%(@M${i&7a15;OBk^zu?m6ioCCtY3W11gf~{>EamT
z;l1_BLSCjo0hSBG94t&iT#iB_tO0D3m_B%PIRr4MDqLV`bWjoyX>h4Y6RJC;=lpK+
zZDIXHb!%<CpCOt{!%i49@hF3c%?ArFwW_{(@a@?BGgYf5pPUdNbC~rKfB1}5dM5>1
z1#RxLzdCcJcRfS5tVONJ>kps5{FOBpnD$J5X^?jPah{f?z1mZ6{I*V0(3u;%^2p))
zhRlg8w;qlT*DCx_e#RjpYDZA#*8RzBhlJv9+s}W@=M2;%DfU?2qs{5h<Z}T%|An)>
j+5}T19NW$=eZ^X__v`$H9AEi>o@DTJ^>bP0l+XkK9TJb^

diff --git a/ui/window/restoreButtonHover.png b/ui/window/restoreButtonHover.png
deleted file mode 100644
index dae87a3b54d0aed6bf82c99d9dffc0f48ae977c8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 401
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEa{HEjtmSN`?>!lvI6;>1s;*b
z3=G^tAk28_ZrvZCAbW|YuPggqc1ccFxzab2{{n?1OI#yLobz*YQ}ap~oQqNuOHxx5
z$}>wc6x=<11Hv2m#DR*$K#GF%(@M${i&7a15;OBk^zu?m6ioCCtY3W11gf~{>EamT
z;l1_BLSCjo0hRz3rbdSc8BCon3YyHGj1?-b3K|VU0wN6#b6gZO7&?EPQTaakb}GmG
zJM$_yt#3vao?JdX=v51k@(F_`5HUNXn=$7B$9JiEW9e0XYR*oDY@$o_^9;gcCn<6T
zS6pSUi(Dlw&nWi0AXB9N;d9BK)@celYo(S3Mb{taX<52gd#VLkC^mNGk<0fDnG;uT
zKFl7jRrsy^j6+1!?x4=O`;*xY3B}*GpZ}OK8K_56?6JH@o711k=K^~E3uk$^38qLm
ew!K|?PkN3I=e3&*mg|9@WbkzLb6Mw<&;$UDIf%^w

diff --git a/ui/window/restoreButtonPressed.png b/ui/window/restoreButtonPressed.png
deleted file mode 100644
index 719b3f8bc8cf2195d484e1ac0df1c1d64cb03a92..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 402
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEa{HEjtmSN`?>!lvI6;>1s;*b
z3=G^tAk28_ZrvZCAbW|YuPggqc1ccFxzab2{{n?1OI#yLobz*YQ}ap~oQqNuOHxx5
z$}>wc6x=<11Hv2m#DR*$K#GF%(@M${i&7a15;OBk^zu?m6ioCCtY3W11gf~@>EamT
z;l1_BLf%6O0;~_XgakNPnnRQ%8w@A#G`JhFG%-prUSt&DP+>aA@Fbk$m)=X&y^kmU
zTN3_J_0H+N!oGD~Q!XiFNHn$yf{3h`slqo7amw-j)V(>SRD_qci+jhx=k3-yk>M8v
zT7~YNZPe2)d#run5r^K|B=Mg%#`VW}n7m(yX<k2f->~_>rGrz8=KPg4=Fo|a)jWP0
zER@jRzi!InPvvJ6Hf$+eDpL*C@#)sTpECY4ep{ynMD)}vaJBwWUmMW#U-(rw#2tT^
aE@I1I+Vea~Vu=UPmkge+elF{r5}E+mN|D?E

diff --git a/widget/form/chatform.cpp b/widget/form/chatform.cpp
index f309ce94a..a7e0a47b8 100644
--- a/widget/form/chatform.cpp
+++ b/widget/form/chatform.cpp
@@ -163,7 +163,7 @@ void ChatForm::onFileRecvRequest(ToxFile file)
     connect(Core::getInstance(), SIGNAL(fileTransferBrokenUnbroken(ToxFile, bool)), fileTrans, SLOT(onFileTransferBrokenUnbroken(ToxFile, bool)));
 
     Widget* w = Widget::getInstance();
-    if (!w->isFriendWidgetCurActiveWidget(f)|| w->getIsWindowMinimized() || !w->isActiveWindow())
+    if (!w->isFriendWidgetCurActiveWidget(f)|| w->isMinimized() || !w->isActiveWindow())
     {
         w->newMessageAlert();
         f->hasNewEvents=true;
@@ -204,7 +204,7 @@ void ChatForm::onAvInvite(int FriendId, int CallId, bool video)
     }
 
     Widget* w = Widget::getInstance();
-    if (!w->isFriendWidgetCurActiveWidget(f)|| w->getIsWindowMinimized() || !w->isActiveWindow())
+    if (!w->isFriendWidgetCurActiveWidget(f)|| w->isMinimized() || !w->isActiveWindow())
     {
         w->newMessageAlert();
         f->hasNewEvents=true;
diff --git a/widget/groupwidget.cpp b/widget/groupwidget.cpp
index ab64a54da..f6538a153 100644
--- a/widget/groupwidget.cpp
+++ b/widget/groupwidget.cpp
@@ -77,27 +77,16 @@ void GroupWidget::updateStatusLight()
 {
     Group *g = GroupList::findGroup(groupId);
 
-    if (Settings::getInstance().getUseNativeDecoration())
+    if (g->hasNewMessages == 0)
     {
-        if (g->hasNewMessages == 0)
-        {
-            statusPic.setPixmap(QPixmap(":img/status/dot_online.png"));
-        } else {
-            if (g->userWasMentioned == 0)
-                statusPic.setPixmap(QPixmap(":img/status/dot_online_notification.png"));
-            else
-                statusPic.setPixmap(QPixmap(":img/status/dot_online_notification.png"));
-        }
-    } else {
-        if (g->hasNewMessages == 0)
-        {
-            statusPic.setPixmap(QPixmap(":img/status/dot_groupchat.png"));
-        } else {
-            if (g->userWasMentioned == 0)
-                statusPic.setPixmap(QPixmap(":img/status/dot_groupchat_newmessages.png"));
-            else
-                statusPic.setPixmap(QPixmap(":img/status/dot_groupchat_notification.png"));
-        }
+        statusPic.setPixmap(QPixmap(":img/status/dot_groupchat.png"));
+    }
+    else
+    {
+        if (g->userWasMentioned == 0)
+            statusPic.setPixmap(QPixmap(":img/status/dot_groupchat_newmessages.png"));
+        else
+            statusPic.setPixmap(QPixmap(":img/status/dot_groupchat_notification.png"));
     }
 }
 
diff --git a/widget/widget.cpp b/widget/widget.cpp
index 92c1ed95b..2a83e7d8e 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -62,55 +62,8 @@ Widget::Widget(QWidget *parent)
     restoreState(Settings::getInstance().getWindowState());
     ui->mainSplitter->restoreState(Settings::getInstance().getSplitterState());
 
-    if (Settings::getInstance().getUseNativeDecoration())
-    {
-        ui->titleBar->hide();
-        this->layout()->setContentsMargins(0, 0, 0, 0);
-
-        ui->friendList->setObjectName("friendList");
-        ui->friendList->setStyleSheet(Style::getStylesheet(":ui/friendList/friendList.css"));
-    }
-    else
-    {
-        this->setObjectName("activeWindow");
-        this->setStyleSheet(Style::getStylesheet(":ui/window/window.css"));
-        ui->statusPanel->setStyleSheet(QString(""));
-        ui->friendList->setStyleSheet(QString(""));
-
-        ui->friendList->setObjectName("friendList");
-        ui->friendList->setStyleSheet(Style::getStylesheet(":ui/friendList/friendList.css"));
-
-        ui->tbMenu->setIcon(QIcon(":ui/window/applicationIcon.png"));
-        ui->pbMin->setObjectName("minimizeButton");
-        ui->pbMax->setObjectName("maximizeButton");
-        ui->pbClose->setObjectName("closeButton");
-
-        setWindowFlags(Qt::CustomizeWindowHint);
-        setWindowFlags(Qt::FramelessWindowHint);
-
-        addAction(ui->actionClose);
-
-        connect(ui->pbMin, SIGNAL(clicked()), this, SLOT(minimizeBtnClicked()));
-        connect(ui->pbMax, SIGNAL(clicked()), this, SLOT(maximizeBtnClicked()));
-        connect(ui->pbClose, SIGNAL(clicked()), this, SLOT(close()));
-
-        m_titleMode = FullTitle;
-        moveWidget = false;
-        inResizeZone = false;
-        allowToResize = false;
-        resizeVerSup = false;
-        resizeHorEsq = false;
-        resizeDiagSupEsq = false;
-        resizeDiagSupDer = false;
-
-        if (isMaximized())
-        {
-            showMaximized();
-            ui->pbMax->setObjectName("restoreButton");
-        }
-    }
-
-    isWindowMinimized = 0;
+    layout()->setContentsMargins(0, 0, 0, 0);
+    ui->friendList->setStyleSheet(Style::getStylesheet(":ui/friendList/friendList.css"));
 
     profilePicture = new MaskablePixmapWidget(this, QSize(40,40), ":/img/avatar_mask.png");
     profilePicture->setPixmap(QPixmap(":/img/contact_dark.png"));
@@ -225,8 +178,6 @@ Widget::~Widget()
         coreThread->terminate();
     delete core;
 
-    hideMainForms();
-
     for (Friend* f : FriendList::friendList)
         delete f;
     FriendList::friendList.clear();
@@ -390,7 +341,7 @@ void Widget::hideMainForms()
         item->widget()->hide();
     while ((item = ui->mainContent->layout()->takeAt(0)) != 0)
         item->widget()->hide();
-    
+
     if (activeChatroomWidget != nullptr)
     {
         activeChatroomWidget->setAsInactiveChatroom();
@@ -485,8 +436,8 @@ void Widget::onFriendStatusChanged(int friendId, Status status)
     f->widget->updateStatusLight();
 
     // Workaround widget style after returning to list
-    if (f->widget->isActive())
-        f->widget->setAsActiveChatroom();
+//    if (f->widget->isActive())
+//        f->widget->setAsActiveChatroom();
 }
 
 void Widget::onFriendStatusMessageChanged(int friendId, const QString& message)
@@ -535,7 +486,7 @@ void Widget::onFriendMessageReceived(int friendId, const QString& message, bool
 
     if (activeChatroomWidget != nullptr)
     {
-        if ((static_cast<GenericChatroomWidget*>(f->widget) != activeChatroomWidget) || isWindowMinimized || !isActiveWindow())
+        if ((static_cast<GenericChatroomWidget*>(f->widget) != activeChatroomWidget) || isMinimized() || !isActiveWindow())
         {
             f->hasNewEvents = 1;
             newMessageAlert();
@@ -619,7 +570,7 @@ void Widget::onGroupMessageReceived(int groupnumber, int friendgroupnumber, cons
 
     g->chatForm->addGroupMessage(message, friendgroupnumber);
 
-    if ((static_cast<GenericChatroomWidget*>(g->widget) != activeChatroomWidget) || isWindowMinimized || !isActiveWindow())
+    if ((static_cast<GenericChatroomWidget*>(g->widget) != activeChatroomWidget) || isMinimized() || !isActiveWindow())
     {
         g->hasNewMessages = 1;
         if (message.contains(core->getUsername(), Qt::CaseInsensitive))
@@ -712,368 +663,18 @@ bool Widget::isFriendWidgetCurActiveWidget(Friend* f)
 
 bool Widget::event(QEvent * e)
 {
-
-    if( e->type() == QEvent::WindowStateChange )
+    if (e->type() == QEvent::WindowActivate)
     {
-        if(windowState().testFlag(Qt::WindowMinimized) == true)
-        {
-            isWindowMinimized = 1;
-        }
-    }
-    else if (e->type() == QEvent::WindowActivate)
-    {
-        if (!Settings::getInstance().getUseNativeDecoration())
-        {
-            this->setObjectName("activeWindow");
-            this->style()->polish(this);
-        }
-        isWindowMinimized = 0;
         if (activeChatroomWidget != nullptr)
         {
             activeChatroomWidget->resetEventFlags();
             activeChatroomWidget->updateStatusLight();
         }
     }
-    else if (e->type() == QEvent::WindowDeactivate && !Settings::getInstance().getUseNativeDecoration())
-    {
-        this->setObjectName("inactiveWindow");
-        this->style()->polish(this);
-    }
-    else if (e->type() == QEvent::MouseMove && !Settings::getInstance().getUseNativeDecoration())
-    {
-        QMouseEvent *k = (QMouseEvent *)e;
-        int xMouse = k->pos().x();
-        int yMouse = k->pos().y();
-        int wWidth = this->geometry().width();
-        int wHeight = this->geometry().height();
-
-        if (moveWidget)
-        {
-            inResizeZone = false;
-            moveWindow(k);
-        }
-        else if (allowToResize)
-            resizeWindow(k);
-        else if (xMouse >= wWidth - PIXELS_TO_ACT or allowToResize)
-        {
-            inResizeZone = true;
-
-            if (yMouse >= wHeight - PIXELS_TO_ACT)
-            {
-                setCursor(Qt::SizeFDiagCursor);
-                resizeWindow(k);
-            }
-            else if (yMouse <= PIXELS_TO_ACT)
-            {
-                setCursor(Qt::SizeBDiagCursor);
-                resizeWindow(k);
-            }
-
-        }
-        else
-        {
-            inResizeZone = false;
-            setCursor(Qt::ArrowCursor);
-        }
-
-        e->accept();
-    }
 
     return QWidget::event(e);
 }
 
-void Widget::mousePressEvent(QMouseEvent *e)
-{
-    if (!Settings::getInstance().getUseNativeDecoration())
-    {
-        if (e->button() == Qt::LeftButton)
-        {
-            if (inResizeZone)
-            {
-                allowToResize = true;
-
-                if (e->pos().y() <= PIXELS_TO_ACT)
-                {
-                    if (e->pos().x() <= PIXELS_TO_ACT)
-                        resizeDiagSupEsq = true;
-                    else if (e->pos().x() >= geometry().width() - PIXELS_TO_ACT)
-                        resizeDiagSupDer = true;
-                    else
-                        resizeVerSup = true;
-                }
-                else if (e->pos().x() <= PIXELS_TO_ACT)
-                    resizeHorEsq = true;
-            }
-            else if (e->pos().x() >= PIXELS_TO_ACT and e->pos().x() < ui->titleBar->geometry().width()
-                     and e->pos().y() >= PIXELS_TO_ACT and e->pos().y() < ui->titleBar->geometry().height())
-            {
-                moveWidget = true;
-                dragPosition = e->globalPos() - frameGeometry().topLeft();
-            }
-        }
-
-        e->accept();
-    }
-}
-
-void Widget::mouseReleaseEvent(QMouseEvent *e)
-{
-    if (!Settings::getInstance().getUseNativeDecoration())
-    {
-        moveWidget = false;
-        allowToResize = false;
-        resizeVerSup = false;
-        resizeHorEsq = false;
-        resizeDiagSupEsq = false;
-        resizeDiagSupDer = false;
-
-        e->accept();
-    }
-}
-
-void Widget::mouseDoubleClickEvent(QMouseEvent *e)
-{
-    if (!Settings::getInstance().getUseNativeDecoration())
-    {
-        if (e->pos().x() < ui->tbMenu->geometry().right() and e->pos().y() < ui->tbMenu->geometry().bottom()
-                and e->pos().x() >=  ui->tbMenu->geometry().x() and e->pos().y() >= ui->tbMenu->geometry().y()
-                and ui->tbMenu->isVisible())
-            close();
-        else if (e->pos().x() < ui->titleBar->geometry().width()
-                 and e->pos().y() < ui->titleBar->geometry().height()
-                 and m_titleMode != FullScreenMode)
-            maximizeBtnClicked();
-        e->accept();
-    }
-}
-
-void Widget::paintEvent (QPaintEvent *)
-{
-    QStyleOption opt;
-    opt.init (this);
-    QPainter p(this);
-    style()->drawPrimitive (QStyle::PE_Widget, &opt, &p, this);
-}
-
-void Widget::moveWindow(QMouseEvent *e)
-{
-    if (!Settings::getInstance().getUseNativeDecoration())
-    {
-        if (e->buttons() & Qt::LeftButton)
-        {
-            move(e->globalPos() - dragPosition);
-            e->accept();
-        }
-    }
-}
-
-void Widget::resizeWindow(QMouseEvent *e)
-{
-    if (!Settings::getInstance().getUseNativeDecoration())
-    {
-        if (allowToResize)
-        {
-            int xMouse = e->pos().x();
-            int yMouse = e->pos().y();
-            int wWidth = geometry().width();
-            int wHeight = geometry().height();
-
-            if (cursor().shape() == Qt::SizeVerCursor)
-            {
-                if (resizeVerSup)
-                {
-                    int newY = geometry().y() + yMouse;
-                    int newHeight = wHeight - yMouse;
-
-                    if (newHeight > minimumSizeHint().height())
-                    {
-                        resize(wWidth, newHeight);
-                        move(geometry().x(), newY);
-                    }
-                }
-                else
-                    resize(wWidth, yMouse+1);
-            }
-            else if (cursor().shape() == Qt::SizeHorCursor)
-            {
-                if (resizeHorEsq)
-                {
-                    int newX = geometry().x() + xMouse;
-                    int newWidth = wWidth - xMouse;
-
-                    if (newWidth > minimumSizeHint().width())
-                    {
-                        resize(newWidth, wHeight);
-                        move(newX, geometry().y());
-                    }
-                }
-                else
-                    resize(xMouse, wHeight);
-            }
-            else if (cursor().shape() == Qt::SizeBDiagCursor)
-            {
-                int newX = 0;
-                int newWidth = 0;
-                int newY = 0;
-                int newHeight = 0;
-
-                if (resizeDiagSupDer)
-                {
-                    newX = geometry().x();
-                    newWidth = xMouse;
-                    newY = geometry().y() + yMouse;
-                    newHeight = wHeight - yMouse;
-                }
-                else
-                {
-                    newX = geometry().x() + xMouse;
-                    newWidth = wWidth - xMouse;
-                    newY = geometry().y();
-                    newHeight = yMouse;
-                }
-
-                if (newWidth >= minimumSizeHint().width() and newHeight >= minimumSizeHint().height())
-                {
-                    resize(newWidth, newHeight);
-                    move(newX, newY);
-                }
-                else if (newWidth >= minimumSizeHint().width())
-                {
-                    resize(newWidth, wHeight);
-                    move(newX, geometry().y());
-                }
-                else if (newHeight >= minimumSizeHint().height())
-                {
-                    resize(wWidth, newHeight);
-                    move(geometry().x(), newY);
-                }
-            }
-            else if (cursor().shape() == Qt::SizeFDiagCursor)
-            {
-                if (resizeDiagSupEsq)
-                {
-                    int newX = geometry().x() + xMouse;
-                    int newWidth = wWidth - xMouse;
-                    int newY = geometry().y() + yMouse;
-                    int newHeight = wHeight - yMouse;
-
-                    if (newWidth >= minimumSizeHint().width() and newHeight >= minimumSizeHint().height())
-                    {
-                        resize(newWidth, newHeight);
-                        move(newX, newY);
-                    }
-                    else if (newWidth >= minimumSizeHint().width())
-                    {
-                        resize(newWidth, wHeight);
-                        move(newX, geometry().y());
-                    }
-                    else if (newHeight >= minimumSizeHint().height())
-                    {
-                        resize(wWidth, newHeight);
-                        move(geometry().x(), newY);
-                    }
-                }
-                else
-                    resize(xMouse+1, yMouse+1);
-            }
-
-            e->accept();
-        }
-    }
-}
-
-void Widget::setCentralWidget(QWidget *widget, const QString &widgetName)
-{
-    connect(widget, SIGNAL(cancelled()), this, SLOT(close()));
-
-    centralLayout->addWidget(widget);
-    //ui->centralWidget->setLayout(centralLayout);
-    ui->LTitle->setText(widgetName);
-}
-
-void Widget::setTitlebarMode(const TitleMode &flag)
-{
-    m_titleMode = flag;
-
-    switch (m_titleMode)
-    {
-    case CleanTitle:
-        ui->tbMenu->setHidden(true);
-        ui->pbMin->setHidden(true);
-        ui->pbMax->setHidden(true);
-        ui->pbClose->setHidden(true);
-        break;
-    case OnlyCloseButton:
-        ui->tbMenu->setHidden(true);
-        ui->pbMin->setHidden(true);
-        ui->pbMax->setHidden(true);
-        break;
-    case MenuOff:
-        ui->tbMenu->setHidden(true);
-        break;
-    case MaxMinOff:
-        ui->pbMin->setHidden(true);
-        ui->pbMax->setHidden(true);
-        break;
-    case FullScreenMode:
-        ui->pbMax->setHidden(true);
-        showMaximized();
-        break;
-    case MaximizeModeOff:
-        ui->pbMax->setHidden(true);
-        break;
-    case MinimizeModeOff:
-        ui->pbMin->setHidden(true);
-        break;
-    case FullTitle:
-        ui->tbMenu->setVisible(true);
-        ui->pbMin->setVisible(true);
-        ui->pbMax->setVisible(true);
-        ui->pbClose->setVisible(true);
-        break;
-        break;
-    default:
-        ui->tbMenu->setVisible(true);
-        ui->pbMin->setVisible(true);
-        ui->pbMax->setVisible(true);
-        ui->pbClose->setVisible(true);
-        break;
-    }
-    ui->LTitle->setVisible(true);
-}
-
-void Widget::setTitlebarMenu(QMenu *menu, const QString &icon)
-{
-    ui->tbMenu->setMenu(menu);
-    ui->tbMenu->setIcon(QIcon(icon));
-}
-
-void Widget::maximizeBtnClicked()
-{
-    if (isFullScreen() or isMaximized())
-    {
-        ui->pbMax->setIcon(QIcon(":/ui/images/app_max.png"));
-        setWindowState(windowState() & ~Qt::WindowFullScreen & ~Qt::WindowMaximized);
-    }
-    else
-    {
-        ui->pbMax->setIcon(QIcon(":/ui/images/app_rest.png"));
-        setWindowState(windowState() | Qt::WindowFullScreen | Qt::WindowMaximized);
-    }
-}
-
-void Widget::minimizeBtnClicked()
-{
-    if (isMinimized())
-    {
-        setWindowState(windowState() & ~Qt::WindowMinimized);
-    }
-    else
-    {
-        setWindowState(windowState() | Qt::WindowMinimized);
-    }
-}
-
 void Widget::setStatusOnline()
 {
     core->setStatus(Status::Online);
@@ -1089,21 +690,6 @@ void Widget::setStatusBusy()
     core->setStatus(Status::Busy);
 }
 
-bool Widget::eventFilter(QObject *, QEvent *event)
-{
-    if (event->type() == QEvent::Wheel)
-    {
-        QWheelEvent * whlEvnt =  static_cast< QWheelEvent * >( event );
-        whlEvnt->angleDelta().setX(0);
-    }
-    return false;
-}
-
-bool Widget::getIsWindowMinimized()
-{
-    return static_cast<bool>(isWindowMinimized);
-}
-
 void Widget::onMessageSendResult(int friendId, const QString& message, int messageId)
 {
     Q_UNUSED(message)
diff --git a/widget/widget.h b/widget/widget.h
index 41289c9cd..3d7858e78 100644
--- a/widget/widget.h
+++ b/widget/widget.h
@@ -46,9 +46,6 @@ class Widget : public QMainWindow
 
 public:
     explicit Widget(QWidget *parent = 0);
-    enum TitleMode { CleanTitle = 0, OnlyCloseButton, MenuOff, MaxMinOff, FullScreenMode, MaximizeModeOff, MinimizeModeOff, FullTitle };
-    void setTitlebarMode(const TitleMode &flag);
-    void setTitlebarMenu(QMenu *menu, const QString &icon = "");
     void setCentralWidget(QWidget *widget, const QString &widgetName);
     QString getUsername();
     Core* getCore();
@@ -71,8 +68,6 @@ signals:
     void statusMessageChanged(const QString& statusMessage);
 
 private slots:
-    void maximizeBtnClicked();
-    void minimizeBtnClicked();
     void onConnected();
     void onDisconnected();
     void onStatusSet(Status status);
@@ -108,32 +103,15 @@ private slots:
     void onMessageSendResult(int friendId, const QString& message, int messageId);
     void onGroupSendResult(int groupId, const QString& message, int result);
 
-protected slots:
-    void moveWindow(QMouseEvent *e);
-
 private:
     void hideMainForms();
+    virtual bool event(QEvent * e);
     Group* createGroup(int groupId);
 
 private:
     Ui::MainWindow *ui;
     QSplitter *centralLayout;
     QPoint dragPosition;
-    TitleMode m_titleMode;
-    bool moveWidget;
-    bool inResizeZone;
-    bool allowToResize;
-    bool resizeVerSup;
-    bool resizeHorEsq;
-    bool resizeDiagSupEsq;
-    bool resizeDiagSupDer;
-    void mousePressEvent(QMouseEvent *e);
-    void mouseReleaseEvent(QMouseEvent *e);
-    void mouseDoubleClickEvent(QMouseEvent *e);
-    void paintEvent (QPaintEvent *);
-    void resizeWindow(QMouseEvent *e);
-    bool event(QEvent *event);
-    int isWindowMinimized;
     Core* core;
     QThread* coreThread;
     AddFriendForm friendForm;
@@ -145,7 +123,6 @@ private:
     Camera* camera;
     MaskablePixmapWidget* profilePicture;
     bool notify(QObject *receiver, QEvent *event);
-    bool eventFilter(QObject *, QEvent *event);
 };
 
 #endif // WIDGET_H

From b93343bb99e33114f39d2effde1d0427c31b8277 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Sat, 4 Oct 2014 11:02:28 +0200
Subject: [PATCH 168/205] tweak

---
 ui/chatArea/innerStyle.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/chatArea/innerStyle.css b/ui/chatArea/innerStyle.css
index 03db4367b..823c8dfbe 100644
--- a/ui/chatArea/innerStyle.css
+++ b/ui/chatArea/innerStyle.css
@@ -40,7 +40,7 @@ span.quote {
 div.green {
   margin-top: 12px;
   margin-bottom: 12px;
-  margin-left: 12px;
+  margin-left: 0px;
   margin-right: 12px;
   color: @white;
   background-color: @green;
@@ -50,7 +50,7 @@ div.green {
 div.silver {
   margin-top: 12px;
   margin-bottom: 12px;
-  margin-left: 12px;
+  margin-left: 0px;
   margin-right: 12px;
   color: @black;
   background-color: @lightGrey;
@@ -60,7 +60,7 @@ div.silver {
 div.red {
   margin-top: 12px;
   margin-bottom: 12px;
-  margin-left: 12px;
+  margin-left: 0px;
   margin-right: 12px;
   color: @white;
   background-color: @red;

From 67a7f99d71524b23d33a43128ba7b676f1bbdeca Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Sat, 4 Oct 2014 11:08:14 +0200
Subject: [PATCH 169/205] fixed wrong group status image

---
 widget/groupwidget.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/widget/groupwidget.cpp b/widget/groupwidget.cpp
index f6538a153..05d04cf76 100644
--- a/widget/groupwidget.cpp
+++ b/widget/groupwidget.cpp
@@ -79,14 +79,14 @@ void GroupWidget::updateStatusLight()
 
     if (g->hasNewMessages == 0)
     {
-        statusPic.setPixmap(QPixmap(":img/status/dot_groupchat.png"));
+        statusPic.setPixmap(QPixmap(":img/status/dot_online.png"));
     }
     else
     {
         if (g->userWasMentioned == 0)
-            statusPic.setPixmap(QPixmap(":img/status/dot_groupchat_newmessages.png"));
+            statusPic.setPixmap(QPixmap(":img/status/dot_online_notification.png"));
         else
-            statusPic.setPixmap(QPixmap(":img/status/dot_groupchat_notification.png"));
+            statusPic.setPixmap(QPixmap(":img/status/dot_online_notification.png"));
     }
 }
 

From ba42c934a34782d7b55d0b4993fdd3add089a1bd Mon Sep 17 00:00:00 2001
From: Zetok Zalbavar <zexavexxe@gmail.com>
Date: Sat, 4 Oct 2014 20:40:14 +0100
Subject: [PATCH 170/205] Change indicator for action messages

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

diff --git a/widget/tool/chatactions/actionaction.cpp b/widget/tool/chatactions/actionaction.cpp
index 754966107..8533b7cd8 100644
--- a/widget/tool/chatactions/actionaction.cpp
+++ b/widget/tool/chatactions/actionaction.cpp
@@ -40,7 +40,7 @@ void ActionAction::setup(QTextCursor cursor, QTextEdit *)
 
 QString ActionAction::getName()
 {
-    return QString("<div class=action>-*-</div>");
+    return QString("<div class=action>*</div>");
 }
 
 QString ActionAction::getMessage()

From 7100fb707be698e71a9e63d709ac08334c09899e Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Sun, 5 Oct 2014 14:22:28 +0200
Subject: [PATCH 171/205] fixed regression (#334)

---
 widget/friendwidget.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/widget/friendwidget.cpp b/widget/friendwidget.cpp
index a524a7daf..2b830f107 100644
--- a/widget/friendwidget.cpp
+++ b/widget/friendwidget.cpp
@@ -149,7 +149,11 @@ void FriendWidget::onAvatarRemoved(int FriendId)
         return;
 
     isDefaultAvatar = true;
-    avatar->setPixmap(QPixmap(":img/contact.png"), Qt::transparent);
+
+    if (isActive())
+        avatar->setPixmap(QPixmap(":img/contact_dark.png"), Qt::transparent);
+    else
+        avatar->setPixmap(QPixmap(":img/contact.png"), Qt::transparent);
 }
 
 void FriendWidget::mousePressEvent(QMouseEvent *ev)

From b487fddf994b9a87dccedd168b34296ad661e6af Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Sun, 5 Oct 2014 14:22:58 +0200
Subject: [PATCH 172/205] cleanup

---
 widget/widget.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/widget/widget.cpp b/widget/widget.cpp
index 2a83e7d8e..bfe0a483a 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -434,10 +434,6 @@ void Widget::onFriendStatusChanged(int friendId, Status status)
 
     f->friendStatus = status;
     f->widget->updateStatusLight();
-
-    // Workaround widget style after returning to list
-//    if (f->widget->isActive())
-//        f->widget->setAsActiveChatroom();
 }
 
 void Widget::onFriendStatusMessageChanged(int friendId, const QString& message)

From 8e664b5ff7949966e68bd9c9ad7cff9ffbcc21da Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Sun, 5 Oct 2014 14:36:07 +0200
Subject: [PATCH 173/205] MaskablePixmapWidget::getPixmap: return the masked
 pixmap

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

diff --git a/widget/maskablepixmapwidget.cpp b/widget/maskablepixmapwidget.cpp
index 185494147..f0015d6d0 100644
--- a/widget/maskablepixmapwidget.cpp
+++ b/widget/maskablepixmapwidget.cpp
@@ -19,6 +19,7 @@
 
 MaskablePixmapWidget::MaskablePixmapWidget(QWidget *parent, QSize size, QString maskName)
     : QWidget(parent)
+    , renderTarget(size)
     , backgroundColor(Qt::white)
     , clickable(false)
 {
@@ -106,17 +107,16 @@ void MaskablePixmapWidget::setPixmap(const QPixmap &pmap)
 
 QPixmap MaskablePixmapWidget::getPixmap() const
 {
-    return pixmap;
+    return renderTarget;
 }
 
 void MaskablePixmapWidget::paintEvent(QPaintEvent *)
 {
-    QPixmap tmp(width(), height());
-    tmp.fill(Qt::transparent);
+    renderTarget.fill(Qt::transparent);
 
     QPoint offset((width() - pixmap.size().width())/2,(height() - pixmap.size().height())/2); // centering the pixmap
 
-    QPainter painter(&tmp);
+    QPainter painter(&renderTarget);
     painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
     painter.fillRect(0,0,width(),height(),backgroundColor);
     painter.drawPixmap(offset,pixmap);
@@ -125,7 +125,7 @@ void MaskablePixmapWidget::paintEvent(QPaintEvent *)
     painter.end();
 
     painter.begin(this);
-    painter.drawPixmap(0,0,tmp);
+    painter.drawPixmap(0,0,renderTarget);
 }
 
 void MaskablePixmapWidget::mousePressEvent(QMouseEvent*)
diff --git a/widget/maskablepixmapwidget.h b/widget/maskablepixmapwidget.h
index 2fe92c180..86e690aae 100644
--- a/widget/maskablepixmapwidget.h
+++ b/widget/maskablepixmapwidget.h
@@ -42,6 +42,7 @@ protected:
 private:
     QPixmap pixmap;
     QPixmap mask;
+    QPixmap renderTarget;
     QSize size;
     QString maskName;
     QColor backgroundColor;

From 77d7189d665c0de0754e148e677053f07f885ae3 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Sun, 5 Oct 2014 14:47:22 +0200
Subject: [PATCH 174/205] FileTransferInstance: use correct fontmetrics

---
 filetransferinstance.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/filetransferinstance.cpp b/filetransferinstance.cpp
index 22570aa53..f3301e58a 100644
--- a/filetransferinstance.cpp
+++ b/filetransferinstance.cpp
@@ -16,6 +16,7 @@
 
 #include "filetransferinstance.h"
 #include "core.h"
+#include "misc/style.h"
 #include <math.h>
 #include <QFileDialog>
 #include <QMessageBox>
@@ -38,9 +39,10 @@ FileTransferInstance::FileTransferInstance(ToxFile File)
     lastUpdateTime = QDateTime::currentDateTime();
 
     filename = File.fileName;
-    QFont font;
-    font.setPixelSize(10);
-    QFontMetrics fm(font);
+
+    // update this whenever you change the font in innerStyle.css
+    QFontMetrics fm(Style::getFont(Style::Small));
+
     filenameElided = fm.elidedText(filename, Qt::ElideRight, CONTENT_WIDTH);
 
     size = getHumanReadableSize(File.filesize);

From b5801f1800f70a81c510cd489a3ed3ff21268e04 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Sun, 5 Oct 2014 14:58:47 +0200
Subject: [PATCH 175/205] Style: tweaked weight

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

diff --git a/misc/style.cpp b/misc/style.cpp
index 120991f65..1c83f0c6e 100644
--- a/misc/style.cpp
+++ b/misc/style.cpp
@@ -36,7 +36,7 @@ QFont appFont(int pixelSize, int weight)
 QString qssifyFont(QFont font)
 {
     return QString("%1 %2px \"%3\"")
-            .arg(font.weight()*10)
+            .arg(font.weight()*8)
             .arg(font.pixelSize())
             .arg(font.family());
 }

From 51f24115d71dd64577165f4d8b3f1bd112624a24 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@gmail.com>
Date: Sun, 5 Oct 2014 17:34:34 +0200
Subject: [PATCH 176/205] GenericChatForm: use correct fontmetrics

---
 widget/form/genericchatform.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/widget/form/genericchatform.cpp b/widget/form/genericchatform.cpp
index 8c3753b0b..4a73d3938 100644
--- a/widget/form/genericchatform.cpp
+++ b/widget/form/genericchatform.cpp
@@ -228,9 +228,8 @@ void GenericChatForm::addSystemInfoMessage(const QString &message, const QString
 
 QString GenericChatForm::getElidedName(const QString& name)
 {
-    QFont font;
-    font.setBold(true);
-    QFontMetrics fm(font);
+    // update this whenever you change the font in innerStyle.css
+    QFontMetrics fm(Style::getFont(Style::BigBold));
 
     return fm.elidedText(name, Qt::ElideRight, chatWidget->nameColWidth());
 }

From 8fa9457305d55a21ddd034dc569c0053162cd31f Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Mon, 6 Oct 2014 01:17:01 +0900
Subject: [PATCH 177/205] base refactoring

---
 qtox.pro                               |   5 +-
 widget/form/settings/avform.cpp        |  28 ++--
 widget/form/settings/avform.h          |  11 +-
 widget/form/settings/avsettings.ui     |  50 ++++++
 widget/form/settings/generalform.cpp   |  52 +++---
 widget/form/settings/generalform.h     |   8 +-
 widget/form/settings/genericsettings.h |  33 ++--
 widget/form/settings/identityform.cpp  |  61 +++----
 widget/form/settings/identityform.h    |  15 +-
 widget/form/settings/privacyform.cpp   |   5 +-
 widget/form/settingswidget.cpp         | 216 +++----------------------
 widget/form/settingswidget.h           |  37 +----
 widget/widget.cpp                      |   8 +-
 13 files changed, 181 insertions(+), 348 deletions(-)
 create mode 100644 widget/form/settings/avsettings.ui

diff --git a/qtox.pro b/qtox.pro
index 68ab4db73..11dec4a7c 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -26,7 +26,10 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 TARGET    = qtox
 TEMPLATE  = app
 FORMS    += \
-    mainwindow.ui
+    mainwindow.ui \
+    widget/form/settings/generalsettings.ui \
+    widget/form/settings/avsettings.ui \
+    widget/form/settings/identitysettings.ui
 CONFIG   += c++11
 
 TRANSLATIONS = translations/de.ts \
diff --git a/widget/form/settings/avform.cpp b/widget/form/settings/avform.cpp
index 3a4c86f0a..4b7afef25 100644
--- a/widget/form/settings/avform.cpp
+++ b/widget/form/settings/avform.cpp
@@ -16,41 +16,35 @@
 
 #include "avform.h"
 #include "widget/camera.h"
+#include "ui_avsettings.h"
 
-AVForm::AVForm(Camera* cam)
+AVForm::AVForm(Camera* cam) :
+    GenericForm(tr("Audio/Video settings"), QPixmap(":/img/settings/av.png"))
 {
-    icon.setPixmap(QPixmap(":/img/settings/av.png").scaledToHeight(headLayout.sizeHint().height(), Qt::SmoothTransformation));
-    label.setText(tr("Audio/Video settings"));
-    
-    QGroupBox *group = new QGroupBox(tr("Video Settings"));
+    bodyUI = new Ui::AVSettings;
+    bodyUI->setupUi(this);
 
-    camView = new SelfCamView(cam);
+    camView = new SelfCamView(cam, this);
+    bodyUI->videoGroup->layout()->addWidget(camView);
     camView->hide(); // hide by default
-    testVideo = new QPushButton(tr("Show video preview","On a button"));
-    connect(testVideo, &QPushButton::clicked, this, &AVForm::onTestVideoPressed);
 
-    videoLayout = new QVBoxLayout();
-    videoLayout->addWidget(testVideo);
-    videoLayout->addWidget(camView);
-    //videoGroup->setLayout(videoLayout); // strangely enough, this causes a segfault....
-
-    layout.addWidget(group);
-    layout.addStretch(1);
+    connect(bodyUI->testVideoBtn, &QPushButton::clicked, this, &AVForm::onTestVideoPressed);
 }
 
 AVForm::~AVForm()
 {
+    delete bodyUI;
 }
 
 void AVForm::showTestVideo()
 {
-    testVideo->setText(tr("Hide video preview","On a button"));
+    bodyUI->testVideoBtn->setText(tr("Hide video preview","On a button"));
     camView->show();
 }
 
 void AVForm::closeTestVideo()
 {
-    testVideo->setText(tr("Show video preview","On a button"));
+    bodyUI->testVideoBtn->setText(tr("Show video preview","On a button"));
     camView->close();
 }
 
diff --git a/widget/form/settings/avform.h b/widget/form/settings/avform.h
index be7c97dae..e75f742da 100644
--- a/widget/form/settings/avform.h
+++ b/widget/form/settings/avform.h
@@ -22,6 +22,11 @@
 #include <QGroupBox>
 #include <QVBoxLayout>
 #include <QPushButton>
+
+namespace Ui {
+class AVSettings;
+}
+
 class Camera;
 
 class AVForm : public GenericForm
@@ -33,10 +38,10 @@ public:
 
 private slots:
     void onTestVideoPressed();
+
 private:
-    QGroupBox* videoGroup;
-    QVBoxLayout* videoLayout;
-    QPushButton* testVideo;
+    Ui::AVSettings *bodyUI;
+
     SelfCamView* camView;
     
     void showTestVideo();
diff --git a/widget/form/settings/avsettings.ui b/widget/form/settings/avsettings.ui
new file mode 100644
index 000000000..77fbb18b4
--- /dev/null
+++ b/widget/form/settings/avsettings.ui
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AVSettings</class>
+ <widget class="QWidget" name="AVSettings">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QGroupBox" name="videoGroup">
+     <property name="title">
+      <string>Video settings</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QPushButton" name="testVideoBtn">
+        <property name="text">
+         <string>Show video preview</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/widget/form/settings/generalform.cpp b/widget/form/settings/generalform.cpp
index 1c7ed8bff..c816f4225 100644
--- a/widget/form/settings/generalform.cpp
+++ b/widget/form/settings/generalform.cpp
@@ -14,65 +14,57 @@
     See the COPYING file for more details.
 */
 
+#include "ui_generalsettings.h"
 #include "generalform.h"
 #include "widget/form/settingswidget.h"
 #include "widget/widget.h"
 #include "misc/settings.h"
 #include "misc/smileypack.h"
 
-GeneralForm::GeneralForm()
+GeneralForm::GeneralForm() :
+    GenericForm(tr("General Settings"), QPixmap(":/img/settings/general.png"))
 {
-    icon.setPixmap(QPixmap(":/img/settings/general.png").scaledToHeight(headLayout.sizeHint().height(), Qt::SmoothTransformation));
-    label.setText(tr("General Settings"));
-    
-    enableIPv6.setText(tr("Enable IPv6 (recommended)","Text on a checkbox to enable IPv6"));
-    enableIPv6.setChecked(Settings::getInstance().getEnableIPv6());
-    useTranslations.setText(tr("Use translations","Text on a checkbox to enable translations"));
-    useTranslations.setChecked(Settings::getInstance().getUseTranslations());
-    makeToxPortable.setText(tr("Make Tox portable","Text on a checkbox to make qTox a portable application"));
-    makeToxPortable.setChecked(Settings::getInstance().getMakeToxPortable());
-    makeToxPortable.setToolTip(tr("Save settings to the working directory instead of the usual conf dir","describes makeToxPortable checkbox"));
+    bodyUI = new Ui::GeneralSettings;
+    bodyUI->setupUi(this);
+
+    bodyUI->cbEnableIPv6->setChecked(Settings::getInstance().getEnableIPv6());
+    bodyUI->cbUseTranslations->setChecked(Settings::getInstance().getUseTranslations());
+    bodyUI->cbMakeToxPortable->setChecked(Settings::getInstance().getMakeToxPortable());
 
-    smileyPackLabel.setText(tr("Smiley Pack", "Text on smiley pack label"));
     for (auto entry : SmileyPack::listSmileyPacks())
-        smileyPackBrowser.addItem(entry.first, entry.second);
-    smileyPackBrowser.setCurrentIndex(smileyPackBrowser.findData(Settings::getInstance().getSmileyPack()));
+    {
+        bodyUI->smileyPackBrowser->addItem(entry.first, entry.second);
+    }
+    bodyUI->smileyPackBrowser->setCurrentIndex(bodyUI->smileyPackBrowser->findData(Settings::getInstance().getSmileyPack()));
     
-    headLayout.addWidget(&label);
-    layout.addWidget(&enableIPv6);
-    layout.addWidget(&useTranslations);
-    layout.addWidget(&makeToxPortable);
-    layout.addWidget(&smileyPackLabel);
-    layout.addWidget(&smileyPackBrowser);
-    layout.addStretch();
-    
-    connect(&enableIPv6, SIGNAL(stateChanged(int)), this, SLOT(onEnableIPv6Updated()));
-    connect(&useTranslations, SIGNAL(stateChanged(int)), this, SLOT(onUseTranslationUpdated()));
-    connect(&makeToxPortable, SIGNAL(stateChanged(int)), this, SLOT(onMakeToxPortableUpdated()));
-    connect(&smileyPackBrowser, SIGNAL(currentIndexChanged(int)), this, SLOT(onSmileyBrowserIndexChanged(int)));
+    connect(bodyUI->cbEnableIPv6, SIGNAL(stateChanged(int)), this, SLOT(onEnableIPv6Updated()));
+    connect(bodyUI->cbUseTranslations, SIGNAL(stateChanged(int)), this, SLOT(onUseTranslationUpdated()));
+    connect(bodyUI->cbMakeToxPortable, SIGNAL(stateChanged(int)), this, SLOT(onMakeToxPortableUpdated()));
+    connect(bodyUI->smileyPackBrowser, SIGNAL(currentIndexChanged(int)), this, SLOT(onSmileyBrowserIndexChanged(int)));
 }
 
 GeneralForm::~GeneralForm()
 {
+    delete bodyUI;
 }
 
 void GeneralForm::onEnableIPv6Updated()
 {
-    Settings::getInstance().setEnableIPv6(enableIPv6.isChecked());
+    Settings::getInstance().setEnableIPv6(bodyUI->cbEnableIPv6->isChecked());
 }
 
 void GeneralForm::onUseTranslationUpdated()
 {
-    Settings::getInstance().setUseTranslations(useTranslations.isChecked());
+    Settings::getInstance().setUseTranslations(bodyUI->cbUseTranslations->isChecked());
 }
 
 void GeneralForm::onMakeToxPortableUpdated()
 {
-    Settings::getInstance().setMakeToxPortable(makeToxPortable.isChecked());
+    Settings::getInstance().setMakeToxPortable(bodyUI->cbMakeToxPortable->isChecked());
 }
 
 void GeneralForm::onSmileyBrowserIndexChanged(int index)
 {
-    QString filename = smileyPackBrowser.itemData(index).toString();
+    QString filename = bodyUI->smileyPackBrowser->itemData(index).toString();
     Settings::getInstance().setSmileyPack(filename);
 }
diff --git a/widget/form/settings/generalform.h b/widget/form/settings/generalform.h
index b33b7ffcb..5d5fd6efe 100644
--- a/widget/form/settings/generalform.h
+++ b/widget/form/settings/generalform.h
@@ -21,6 +21,10 @@
 #include <QComboBox>
 #include <QCheckBox>
 
+namespace Ui {
+class GeneralSettings;
+}
+
 class GeneralForm : public GenericForm
 {
     Q_OBJECT
@@ -35,9 +39,7 @@ private slots:
     void onSmileyBrowserIndexChanged(int index);
 
 private:
-    QCheckBox enableIPv6, useTranslations, makeToxPortable;
-    QLabel label, smileyPackLabel;
-    QComboBox smileyPackBrowser;
+    Ui::GeneralSettings *bodyUI;
 };
 
 #endif
diff --git a/widget/form/settings/genericsettings.h b/widget/form/settings/genericsettings.h
index 8d6d4e9bb..e3852ee28 100644
--- a/widget/form/settings/genericsettings.h
+++ b/widget/form/settings/genericsettings.h
@@ -17,37 +17,30 @@
 #ifndef GENERICFORM_H
 #define GENERICFORM_H
 
-#include <QObject>
-#include <QVBoxLayout>
-#include <QLabel>
+#include <QWidget>
 #include "widget/form/settingswidget.h"
 
-class GenericForm : public QObject
+class GenericForm : public QWidget
 {
     Q_OBJECT
 public:
-    GenericForm()
-    {
-        head.setLayout(&headLayout);
-        headLayout.addWidget(&icon);
-        headLayout.addWidget(&label);
-        body.setLayout(&layout);
-    }
-    ~GenericForm() {};
+    GenericForm(const QString &name, const QPixmap &icon) : formName(name), formIcon(icon) {;}
+    ~GenericForm() {;}
 
     virtual void show(SettingsWidget& sw)
     {
-        sw.body->layout()->addWidget(&body);
-        body.show();
-        sw.head->layout()->addWidget(&head);
-        head.show();
+//        sw.body->layout()->addWidget(&body);
+//        body.show();
+//        sw.head->layout()->addWidget(&head);
+//        head.show();
     }
 
+    QString getFormName() {return formName;}
+    QPixmap getFormIcon() {return formIcon;}
+
 protected:
-    QVBoxLayout layout;
-    QHBoxLayout headLayout;
-    QLabel label, icon;
-    QWidget head, body;
+    QString formName;
+    QPixmap formIcon;
 };
 
 #endif
diff --git a/widget/form/settings/identityform.cpp b/widget/form/settings/identityform.cpp
index 57a69a759..bfc231c33 100644
--- a/widget/form/settings/identityform.cpp
+++ b/widget/form/settings/identityform.cpp
@@ -14,6 +14,7 @@
     See the COPYING file for more details.
 */
 
+#include "ui_identitysettings.h"
 #include "identityform.h"
 #include "widget/form/settingswidget.h"
 #include "widget/croppinglabel.h"
@@ -23,34 +24,18 @@
 #include <QApplication>
 #include <QClipboard>
 
-IdentityForm::IdentityForm()
+IdentityForm::IdentityForm() :
+    GenericForm(tr("Your identity"), QPixmap(":/img/settings/identity.png"))
 {
-    icon.setPixmap(QPixmap(":/img/settings/identity.png").scaledToHeight(headLayout.sizeHint().height(), Qt::SmoothTransformation));
-    label.setText(tr("Your identity"));
+    bodyUI = new Ui::IdentitySettings;
+    bodyUI->setupUi(this);
 
-    // public
-    publicGroup = new QGroupBox(tr("Public Information"));
-    userNameLabel = new QLabel(tr("Name","Username/nick"));
-    userName = new QLineEdit();
-    
-    statusMessageLabel = new QLabel(tr("Status","Status message"));
-    statusMessage = new QLineEdit();
-    
-    vLayout = new QVBoxLayout();
-    vLayout->addWidget(userNameLabel);
-    vLayout->addWidget(userName);
-    vLayout->addWidget(statusMessageLabel);
-    vLayout->addWidget(statusMessage);
-    publicGroup->setLayout(vLayout);
-    
     // tox
-    toxGroup = new QGroupBox(tr("Tox ID"));
-    toxIdLabel = new CroppingLabel();
-    toxIdLabel->setText(tr("Your Tox ID (click to copy)"));
     toxId = new ClickableTE();
     QFont small;
     small.setPixelSize(13);
     small.setKerning(false);
+
     toxId->setTextInteractionFlags(Qt::TextSelectableByMouse);
     toxId->setReadOnly(true);
     toxId->setFrameStyle(QFrame::NoFrame);
@@ -58,20 +43,12 @@ IdentityForm::IdentityForm()
     toxId->setFixedHeight(toxId->document()->size().height()*2);
     toxId->setFont(small);
     
-    QVBoxLayout* toxLayout = new QVBoxLayout();
-    toxLayout->addWidget(toxIdLabel);
-    toxLayout->addWidget(toxId);
-    toxGroup->setLayout(toxLayout);
+    bodyUI->toxGroup->layout()->addWidget(toxId);
     
-    layout.setSpacing(30);
-    layout.addWidget(publicGroup);
-    layout.addWidget(toxGroup);
-    layout.addStretch(1);
-    
-    connect(toxIdLabel, SIGNAL(clicked()), this, SLOT(copyIdClicked()));
+    connect(bodyUI->toxIdLabel, SIGNAL(clicked()), this, SLOT(copyIdClicked()));
     connect(toxId, SIGNAL(clicked()), this, SLOT(copyIdClicked()));
-    connect(userName, SIGNAL(editingFinished()), this, SLOT(onUserNameEdited()));
-    connect(statusMessage, SIGNAL(editingFinished()), this, SLOT(onStatusMessageEdited()));
+    connect(bodyUI->userName, SIGNAL(editingFinished()), this, SLOT(onUserNameEdited()));
+    connect(bodyUI->statusMessage, SIGNAL(editingFinished()), this, SLOT(onStatusMessageEdited()));
 }
 
 IdentityForm::~IdentityForm()
@@ -88,18 +65,28 @@ void IdentityForm::copyIdClicked()
 
 void IdentityForm::onUserNameEdited()
 {
-    emit userNameChanged(userName->text());
+    emit userNameChanged(bodyUI->userName->text());
 }
 
 void IdentityForm::onStatusMessageEdited()
 {
-    emit statusMessageChanged(statusMessage->text());
+    emit statusMessageChanged(bodyUI->statusMessage->text());
 }
 
 void IdentityForm::show(SettingsWidget& sw)
 {
-    userName->setText(Core::getInstance()->getUsername());
-    statusMessage->setText(Core::getInstance()->getStatusMessage());
+    bodyUI->userName->setText(Core::getInstance()->getUsername());
+    bodyUI->statusMessage->setText(Core::getInstance()->getStatusMessage());
     toxId->setText(Core::getInstance()->getSelfId().toString());
     GenericForm::show(sw);
 }
+
+void IdentityForm::setUserName(const QString &name)
+{
+    bodyUI->userName->setText(name);
+}
+
+void IdentityForm::setStatusMessage(const QString &msg)
+{
+    bodyUI->statusMessage->setText(msg);
+}
diff --git a/widget/form/settings/identityform.h b/widget/form/settings/identityform.h
index 8e80e0aaf..0cacb4dc7 100644
--- a/widget/form/settings/identityform.h
+++ b/widget/form/settings/identityform.h
@@ -21,8 +21,14 @@
 #include <QGroupBox>
 #include <QTextEdit>
 #include <QLineEdit>
+#include <QLabel>
+
 class CroppingLabel;
 
+namespace Ui {
+class IdentitySettings;
+}
+
 class ClickableTE : public QTextEdit
 {
     Q_OBJECT
@@ -41,7 +47,8 @@ public:
     IdentityForm();
     ~IdentityForm();
 
-    QLineEdit* userName, * statusMessage;
+    void setUserName(const QString &name);
+    void setStatusMessage(const QString &msg);
 
     void show(SettingsWidget& sw);
 
@@ -55,11 +62,9 @@ private slots:
     void onStatusMessageEdited();
 
 private:
-    QGroupBox* toxGroup, * publicGroup;
+    Ui::IdentitySettings* bodyUI;
+
     ClickableTE* toxId;
-    QLabel* userNameLabel, * statusMessageLabel;
-    CroppingLabel* toxIdLabel;
-    QVBoxLayout* vLayout, * toxLayout;
 };
 
 #endif
diff --git a/widget/form/settings/privacyform.cpp b/widget/form/settings/privacyform.cpp
index 683bdff4b..c51dc0878 100644
--- a/widget/form/settings/privacyform.cpp
+++ b/widget/form/settings/privacyform.cpp
@@ -17,10 +17,9 @@
 #include "privacyform.h"
 #include "widget/form/settingswidget.h"
 
-PrivacyForm::PrivacyForm()
+PrivacyForm::PrivacyForm() :
+    GenericForm(tr("Privacy settings"), QPixmap(":/img/settings/privacy.png"))
 {
-    icon.setPixmap(QPixmap(":/img/settings/privacy.png").scaledToHeight(headLayout.sizeHint().height(), Qt::SmoothTransformation));
-    label.setText(tr("Privacy settings"));
 }
 
 PrivacyForm::~PrivacyForm()
diff --git a/widget/form/settingswidget.cpp b/widget/form/settingswidget.cpp
index f82e1a689..047c5aaac 100644
--- a/widget/form/settingswidget.cpp
+++ b/widget/form/settingswidget.cpp
@@ -22,37 +22,30 @@
 #include "widget/form/settings/identityform.h"
 #include "widget/form/settings/privacyform.h"
 #include "widget/form/settings/avform.h"
+#include <QTabWidget>
 
-SettingsWidget::SettingsWidget(Camera* cam)
-    : QWidget()
+SettingsWidget::SettingsWidget(Camera* cam, QWidget* parent)
+    : QWidget(parent)
 {
-    generalForm  = new GeneralForm();
-    identityForm = new IdentityForm();
-    privacyForm  = new PrivacyForm();
-    avForm       = new AVForm(cam);
-
-    main = new QWidget();
     body = new QWidget();
     head = new QWidget();
-    foot = new QWidget();
-    
-    head->setLayout(new QVBoxLayout());
-    body->setLayout(new QVBoxLayout());
-    
-    prepButtons();    
-    foot->setLayout(iconsLayout);
-    mainLayout = new QVBoxLayout();
-    mainLayout->addWidget(body);
-    mainLayout->addWidget(foot);
-    // something something foot size
-    main->setLayout(mainLayout);
-    
-    connect(generalButton,  &QPushButton::clicked, this, &SettingsWidget::onGeneralClicked);
-    connect(identityButton, &QPushButton::clicked, this, &SettingsWidget::onIdentityClicked);
-    connect(privacyButton,  &QPushButton::clicked, this, &SettingsWidget::onPrivacyClicked);
-    connect(avButton,  &QPushButton::clicked, this, &SettingsWidget::onAVClicked);
-    
-    active = generalForm;
+
+    QVBoxLayout *bodyLayout = new QVBoxLayout();
+    body->setLayout(bodyLayout);
+
+    QTabWidget *settingsTabs = new QTabWidget();
+    bodyLayout->addWidget(settingsTabs);
+
+    GeneralForm *gfrm = new GeneralForm;
+    ifrm = new IdentityForm;
+    PrivacyForm *pfrm = new PrivacyForm;
+    AVForm *avfrm = new AVForm(cam);
+
+    GenericForm *cfgForms[] = {gfrm, ifrm, pfrm, avfrm};
+    for (auto cfgForm : cfgForms)
+    {
+        settingsTabs->addTab(cfgForm, cfgForm->getFormIcon(), cfgForm->getFormName());
+    }
 }
 
 SettingsWidget::~SettingsWidget()
@@ -61,173 +54,8 @@ SettingsWidget::~SettingsWidget()
 
 void SettingsWidget::show(Ui::MainWindow& ui)
 {
-    active->show(*this);
-    ui.mainContent->layout()->addWidget(main);
+    ui.mainContent->layout()->addWidget(body);
     ui.mainHead->layout()->addWidget(head);
-    main->show();
+    body->show();
     head->show();
 }
-
-void SettingsWidget::onGeneralClicked()
-{
-    hideSettingsForms();
-    active = generalForm;
-    generalForm->show(*this);
-}
-
-void SettingsWidget::onIdentityClicked()
-{
-    hideSettingsForms();
-    active = identityForm;
-    identityForm->show(*this);
-}
-
-void SettingsWidget::onPrivacyClicked()
-{
-    hideSettingsForms();
-    active = privacyForm;
-    privacyForm->show(*this);
-}
-
-void SettingsWidget::onAVClicked()
-{
-    hideSettingsForms();
-    active = avForm;
-    avForm->show(*this);
-}
-
-void SettingsWidget::hideSettingsForms()
-{
-    QLayoutItem *item;
-    while ((item = head->layout()->takeAt(0)) != 0)
-        item->widget()->hide();
-    while ((item = body->layout()->takeAt(0)) != 0)
-        item->widget()->hide();
-}
-
-void SettingsWidget::prepButtons()
-{
-    // this crap is copied from ui_mainwindow.h... there's no easy way around
-    // just straight up copying it like this... oh well
-    // the layout/icons obviously need to be improved, but it's a working model,
-    // not a pretty one
-    QSizePolicy sizePolicy3(QSizePolicy::Fixed, QSizePolicy::Fixed);
-    sizePolicy3.setHorizontalStretch(0);
-    sizePolicy3.setVerticalStretch(0);
-    foot->setObjectName(QStringLiteral("foot"));
-    foot->setEnabled(true);
-    foot->setSizePolicy(sizePolicy3);
-    QPalette palette5;
-    QBrush brush(QColor(255, 255, 255, 255));
-    brush.setStyle(Qt::SolidPattern);
-    QBrush brush1(QColor(28, 28, 28, 255));
-    brush1.setStyle(Qt::SolidPattern);
-    QBrush brush2(QColor(42, 42, 42, 255));
-    brush2.setStyle(Qt::SolidPattern);
-    QBrush brush3(QColor(35, 35, 35, 255));
-    brush3.setStyle(Qt::SolidPattern);
-    QBrush brush4(QColor(14, 14, 14, 255));
-    brush4.setStyle(Qt::SolidPattern);
-    QBrush brush5(QColor(18, 18, 18, 255));
-    brush5.setStyle(Qt::SolidPattern);
-    QBrush brush6(QColor(0, 0, 0, 255));
-    brush6.setStyle(Qt::SolidPattern);
-    QBrush brush7(QColor(255, 255, 220, 255));
-    brush7.setStyle(Qt::SolidPattern);
-    palette5.setBrush(QPalette::Active, QPalette::WindowText, brush);
-    palette5.setBrush(QPalette::Active, QPalette::Button, brush1);
-    palette5.setBrush(QPalette::Active, QPalette::Light, brush2);
-    palette5.setBrush(QPalette::Active, QPalette::Midlight, brush3);
-    palette5.setBrush(QPalette::Active, QPalette::Dark, brush4);
-    palette5.setBrush(QPalette::Active, QPalette::Mid, brush5);
-    palette5.setBrush(QPalette::Active, QPalette::Text, brush);
-    palette5.setBrush(QPalette::Active, QPalette::BrightText, brush);
-    palette5.setBrush(QPalette::Active, QPalette::ButtonText, brush);
-    palette5.setBrush(QPalette::Active, QPalette::Base, brush6);
-    palette5.setBrush(QPalette::Active, QPalette::Window, brush1);
-    palette5.setBrush(QPalette::Active, QPalette::Shadow, brush6);
-    palette5.setBrush(QPalette::Active, QPalette::AlternateBase, brush4);
-    palette5.setBrush(QPalette::Active, QPalette::ToolTipBase, brush7);
-    palette5.setBrush(QPalette::Active, QPalette::ToolTipText, brush6);
-    palette5.setBrush(QPalette::Inactive, QPalette::WindowText, brush);
-    palette5.setBrush(QPalette::Inactive, QPalette::Button, brush1);
-    palette5.setBrush(QPalette::Inactive, QPalette::Light, brush2);
-    palette5.setBrush(QPalette::Inactive, QPalette::Midlight, brush3);
-    palette5.setBrush(QPalette::Inactive, QPalette::Dark, brush4);
-    palette5.setBrush(QPalette::Inactive, QPalette::Mid, brush5);
-    palette5.setBrush(QPalette::Inactive, QPalette::Text, brush);
-    palette5.setBrush(QPalette::Inactive, QPalette::BrightText, brush);
-    palette5.setBrush(QPalette::Inactive, QPalette::ButtonText, brush);
-    palette5.setBrush(QPalette::Inactive, QPalette::Base, brush6);
-    palette5.setBrush(QPalette::Inactive, QPalette::Window, brush1);
-    palette5.setBrush(QPalette::Inactive, QPalette::Shadow, brush6);
-    palette5.setBrush(QPalette::Inactive, QPalette::AlternateBase, brush4);
-    palette5.setBrush(QPalette::Inactive, QPalette::ToolTipBase, brush7);
-    palette5.setBrush(QPalette::Inactive, QPalette::ToolTipText, brush6);
-    palette5.setBrush(QPalette::Disabled, QPalette::WindowText, brush4);
-    palette5.setBrush(QPalette::Disabled, QPalette::Button, brush1);
-    palette5.setBrush(QPalette::Disabled, QPalette::Light, brush2);
-    palette5.setBrush(QPalette::Disabled, QPalette::Midlight, brush3);
-    palette5.setBrush(QPalette::Disabled, QPalette::Dark, brush4);
-    palette5.setBrush(QPalette::Disabled, QPalette::Mid, brush5);
-    palette5.setBrush(QPalette::Disabled, QPalette::Text, brush4);
-    palette5.setBrush(QPalette::Disabled, QPalette::BrightText, brush);
-    palette5.setBrush(QPalette::Disabled, QPalette::ButtonText, brush4);
-    palette5.setBrush(QPalette::Disabled, QPalette::Base, brush1);
-    palette5.setBrush(QPalette::Disabled, QPalette::Window, brush1);
-    palette5.setBrush(QPalette::Disabled, QPalette::Shadow, brush6);
-    palette5.setBrush(QPalette::Disabled, QPalette::AlternateBase, brush1);
-    palette5.setBrush(QPalette::Disabled, QPalette::ToolTipBase, brush7);
-    palette5.setBrush(QPalette::Disabled, QPalette::ToolTipText, brush6);
-    foot->setPalette(palette5);
-    foot->setAutoFillBackground(true);
-    
-    iconsLayout = new QHBoxLayout(foot);
-    iconsLayout->setSpacing(0);
-    iconsLayout->setObjectName(QStringLiteral("iconsLayout"));
-    iconsLayout->setContentsMargins(0, 0, 0, 0);
-
-    generalButton = new QPushButton(foot);
-    generalButton->setObjectName(QStringLiteral("generalButton"));
-    generalButton->setMinimumSize(QSize(55, 35));
-    generalButton->setMaximumSize(QSize(55, 35));
-    generalButton->setFocusPolicy(Qt::NoFocus);
-    QIcon icon1;
-    icon1.addFile(QStringLiteral(":/img/add.png"), QSize(), QIcon::Normal, QIcon::Off);
-    generalButton->setIcon(icon1);
-    generalButton->setFlat(true);
-    iconsLayout->addWidget(generalButton);
-    
-    identityButton = new QPushButton(foot);
-    identityButton->setObjectName(QStringLiteral("identityButton"));
-    identityButton->setMinimumSize(QSize(55, 35));
-    identityButton->setMaximumSize(QSize(55, 35));
-    identityButton->setFocusPolicy(Qt::NoFocus);
-    QIcon icon2;
-    icon2.addFile(QStringLiteral(":/img/group.png"), QSize(), QIcon::Normal, QIcon::Off);
-    identityButton->setIcon(icon2);
-    identityButton->setFlat(true);
-    iconsLayout->addWidget(identityButton);
-    
-    privacyButton = new QPushButton(foot);
-    privacyButton->setObjectName(QStringLiteral("privacyButton"));
-    privacyButton->setMinimumSize(QSize(55, 35));
-    privacyButton->setMaximumSize(QSize(55, 35));
-    privacyButton->setFocusPolicy(Qt::NoFocus);
-    QIcon icon3;
-    icon3.addFile(QStringLiteral(":/img/transfer.png"), QSize(), QIcon::Normal, QIcon::Off);
-    privacyButton->setIcon(icon3);
-    privacyButton->setFlat(true);
-    iconsLayout->addWidget(privacyButton);
-    
-    avButton = new QPushButton(foot);
-    avButton->setObjectName(QStringLiteral("avButton"));
-    avButton->setMinimumSize(QSize(55, 35));
-    avButton->setMaximumSize(QSize(55, 35));
-    avButton->setFocusPolicy(Qt::NoFocus);
-    QIcon icon4;
-    icon4.addFile(QStringLiteral(":/img/settings.png"), QSize(), QIcon::Normal, QIcon::Off);
-    avButton->setIcon(icon4);
-    avButton->setFlat(true);
-    iconsLayout->addWidget(avButton);
-}
diff --git a/widget/form/settingswidget.h b/widget/form/settingswidget.h
index b24f7ffb6..552af5104 100644
--- a/widget/form/settingswidget.h
+++ b/widget/form/settingswidget.h
@@ -25,47 +25,22 @@ class GeneralForm;
 class IdentityForm;
 class PrivacyForm;
 class AVForm;
-namespace Ui {class MainWindow;};
+
+namespace Ui {class MainWindow;}
 
 class SettingsWidget : public QWidget
 {
     Q_OBJECT
 public:
-    SettingsWidget(Camera* cam);
+    SettingsWidget(Camera* cam, QWidget* parent = nullptr);
     ~SettingsWidget();
 
     void show(Ui::MainWindow &ui);
-    
-    QWidget *head, *body; // keep the others private
-    GenericForm* active;
-    GeneralForm* generalForm;
-    IdentityForm* identityForm;
-    PrivacyForm* privacyForm;
-    AVForm* avForm;
-
-public slots:
-    //void setFriendAddress(const QString& friendAddress);
-
-private slots:
-    void onGeneralClicked();
-    void onIdentityClicked();
-    void onPrivacyClicked();
-    void onAVClicked();
+    IdentityForm *getIdentityForm() {return ifrm;}
 
 private:
-    QWidget *main, *foot;
-    // main consists of body+foot for Ui::MainWindow
-    QVBoxLayout *mainLayout;
-    
-    void hideSettingsForms();
-
-    // the code pertaining to the icons is mostly copied from ui_mainwindow.h
-    QHBoxLayout *iconsLayout;
-    QPushButton *generalButton;
-    QPushButton *identityButton;
-    QPushButton *privacyButton;
-    QPushButton *avButton;
-    void prepButtons(); // just so I can move the crap to the bottom of the file
+    QWidget *head, *body; // keep the others private
+    IdentityForm *ifrm;
 };
 
 #endif // SETTINGSWIDGET_H
diff --git a/widget/widget.cpp b/widget/widget.cpp
index a6730ec44..46e3e5d09 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -218,9 +218,9 @@ Widget::Widget(QWidget *parent)
     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(profilePicture, SIGNAL(clicked()), this, SLOT(onAvatarClicked()));
-    connect(settingsWidget->identityForm, &IdentityForm::userNameChanged,      core, &Core::setUsername);
-    connect(settingsWidget->identityForm, &IdentityForm::statusMessageChanged, core, &Core::setStatusMessage);
     connect(setStatusOnline, SIGNAL(triggered()), this, SLOT(setStatusOnline()));
+//    connect(settingsWidget->getIdentityForm(), &IdentityForm::userNameChanged, Core::getInstance(), &Core::setUsername);
+//    connect(settingsWidget->getIdentityForm(), &IdentityForm::statusMessageChanged, Core::getInstance(), &Core::setStatusMessage);
     connect(setStatusAway, SIGNAL(triggered()), this, SLOT(setStatusAway()));
     connect(setStatusBusy, SIGNAL(triggered()), this, SLOT(setStatusBusy()));
     connect(&friendForm, SIGNAL(friendRequested(QString,QString)), this, SIGNAL(friendRequested(QString,QString)));
@@ -428,7 +428,7 @@ void Widget::setUsername(const QString& username)
 {
     ui->nameLabel->setText(username);
     ui->nameLabel->setToolTip(username); // for overlength names
-    settingsWidget->identityForm->userName->setText(username);
+    settingsWidget->getIdentityForm()->setUserName(username);
 }
 
 void Widget::onStatusMessageChanged(const QString& newStatusMessage, const QString& oldStatusMessage)
@@ -442,7 +442,7 @@ void Widget::setStatusMessage(const QString &statusMessage)
 {
     ui->statusLabel->setText(statusMessage);
     ui->statusLabel->setToolTip(statusMessage); // for overlength messsages
-    settingsWidget->identityForm->statusMessage->setText(statusMessage);
+    settingsWidget->getIdentityForm()->setStatusMessage(statusMessage);
 }
 
 void Widget::addFriend(int friendId, const QString &userId)

From 0c2bf63b1aaf0294b7777e7ad78a76a43298f236 Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Mon, 6 Oct 2014 01:17:20 +0900
Subject: [PATCH 178/205] add missed files

---
 widget/form/settings/generalsettings.ui  | 81 ++++++++++++++++++++++
 widget/form/settings/identitysettings.ui | 86 ++++++++++++++++++++++++
 2 files changed, 167 insertions(+)
 create mode 100644 widget/form/settings/generalsettings.ui
 create mode 100644 widget/form/settings/identitysettings.ui

diff --git a/widget/form/settings/generalsettings.ui b/widget/form/settings/generalsettings.ui
new file mode 100644
index 000000000..ca01dbc5b
--- /dev/null
+++ b/widget/form/settings/generalsettings.ui
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>GeneralSettings</class>
+ <widget class="QWidget" name="GeneralSettings">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>527</width>
+    <height>367</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <property name="leftMargin">
+    <number>15</number>
+   </property>
+   <property name="topMargin">
+    <number>15</number>
+   </property>
+   <property name="rightMargin">
+    <number>15</number>
+   </property>
+   <item>
+    <widget class="QCheckBox" name="cbEnableIPv6">
+     <property name="text">
+      <string extracomment="Text on a checkbox to enable IPv6">Enable IPv6 (recommended)</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="cbUseTranslations">
+     <property name="text">
+      <string extracomment="Text on a checkbox to enable translations">Use translations</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="cbMakeToxPortable">
+     <property name="toolTip">
+      <string extracomment="describes makeToxPortable checkbox">Save settings to the working directory instead of the usual conf dir</string>
+     </property>
+     <property name="text">
+      <string>Make Tox portable</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="smileLayout">
+     <item>
+      <widget class="QLabel" name="smileyPackLabel">
+       <property name="text">
+        <string extracomment="Text on smiley pack label">Smiley Pack</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="smileyPackBrowser"/>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/widget/form/settings/identitysettings.ui b/widget/form/settings/identitysettings.ui
new file mode 100644
index 000000000..d27300155
--- /dev/null
+++ b/widget/form/settings/identitysettings.ui
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>IdentitySettings</class>
+ <widget class="QWidget" name="IdentitySettings">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QGroupBox" name="publicGroup">
+     <property name="title">
+      <string>Public Information</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QLabel" name="userNameLabel">
+        <property name="text">
+         <string>Name</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="userName"/>
+      </item>
+      <item>
+       <widget class="QLabel" name="statusMessageLabel">
+        <property name="text">
+         <string>Status</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="statusMessage"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="toxGroup">
+     <property name="title">
+      <string>Tox ID</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <item>
+       <widget class="CroppingLabel" name="toxIdLabel">
+        <property name="text">
+         <string>Your Tox ID (click to copy)</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>CroppingLabel</class>
+   <extends>QLabel</extends>
+   <header>widget/croppinglabel.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

From 866f986d04e7605b79a0b282e302f47d082bc1f0 Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Mon, 6 Oct 2014 01:30:31 +0900
Subject: [PATCH 179/205] small fixes

---
 widget/form/settings/genericsettings.h |  9 +--------
 widget/form/settings/identityform.cpp  | 10 ++++------
 widget/form/settings/identityform.h    |  2 +-
 widget/form/settingswidget.cpp         |  9 ++++++++-
 widget/form/settingswidget.h           |  5 +++++
 5 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/widget/form/settings/genericsettings.h b/widget/form/settings/genericsettings.h
index e3852ee28..e79ec7b06 100644
--- a/widget/form/settings/genericsettings.h
+++ b/widget/form/settings/genericsettings.h
@@ -27,14 +27,7 @@ public:
     GenericForm(const QString &name, const QPixmap &icon) : formName(name), formIcon(icon) {;}
     ~GenericForm() {;}
 
-    virtual void show(SettingsWidget& sw)
-    {
-//        sw.body->layout()->addWidget(&body);
-//        body.show();
-//        sw.head->layout()->addWidget(&head);
-//        head.show();
-    }
-
+    virtual void updateContent() {;}
     QString getFormName() {return formName;}
     QPixmap getFormIcon() {return formIcon;}
 
diff --git a/widget/form/settings/identityform.cpp b/widget/form/settings/identityform.cpp
index bfc231c33..c2dac21b0 100644
--- a/widget/form/settings/identityform.cpp
+++ b/widget/form/settings/identityform.cpp
@@ -14,6 +14,7 @@
     See the COPYING file for more details.
 */
 
+#include "core.h"
 #include "ui_identitysettings.h"
 #include "identityform.h"
 #include "widget/form/settingswidget.h"
@@ -65,20 +66,17 @@ void IdentityForm::copyIdClicked()
 
 void IdentityForm::onUserNameEdited()
 {
-    emit userNameChanged(bodyUI->userName->text());
+    Core::getInstance()->setUsername(bodyUI->userName->text());
 }
 
 void IdentityForm::onStatusMessageEdited()
 {
-    emit statusMessageChanged(bodyUI->statusMessage->text());
+    Core::getInstance()->setStatusMessage(bodyUI->statusMessage->text());
 }
 
-void IdentityForm::show(SettingsWidget& sw)
+void IdentityForm::updateContent()
 {
-    bodyUI->userName->setText(Core::getInstance()->getUsername());
-    bodyUI->statusMessage->setText(Core::getInstance()->getStatusMessage());
     toxId->setText(Core::getInstance()->getSelfId().toString());
-    GenericForm::show(sw);
 }
 
 void IdentityForm::setUserName(const QString &name)
diff --git a/widget/form/settings/identityform.h b/widget/form/settings/identityform.h
index 0cacb4dc7..c5505e6ea 100644
--- a/widget/form/settings/identityform.h
+++ b/widget/form/settings/identityform.h
@@ -50,7 +50,7 @@ public:
     void setUserName(const QString &name);
     void setStatusMessage(const QString &msg);
 
-    void show(SettingsWidget& sw);
+    virtual void updateContent();
 
 signals:
     void userNameChanged(QString);
diff --git a/widget/form/settingswidget.cpp b/widget/form/settingswidget.cpp
index 047c5aaac..b4d208f61 100644
--- a/widget/form/settingswidget.cpp
+++ b/widget/form/settingswidget.cpp
@@ -33,7 +33,7 @@ SettingsWidget::SettingsWidget(Camera* cam, QWidget* parent)
     QVBoxLayout *bodyLayout = new QVBoxLayout();
     body->setLayout(bodyLayout);
 
-    QTabWidget *settingsTabs = new QTabWidget();
+    settingsTabs = new QTabWidget();
     bodyLayout->addWidget(settingsTabs);
 
     GeneralForm *gfrm = new GeneralForm;
@@ -46,6 +46,8 @@ SettingsWidget::SettingsWidget(Camera* cam, QWidget* parent)
     {
         settingsTabs->addTab(cfgForm, cfgForm->getFormIcon(), cfgForm->getFormName());
     }
+
+    connect(settingsTabs, SIGNAL(currentChanged(int)), this, SLOT(onTabChanged(int)));
 }
 
 SettingsWidget::~SettingsWidget()
@@ -59,3 +61,8 @@ void SettingsWidget::show(Ui::MainWindow& ui)
     body->show();
     head->show();
 }
+
+void SettingsWidget::onTabChanged(int index)
+{
+    static_cast<GenericForm*>(this->settingsTabs->widget(index))->updateContent();
+}
diff --git a/widget/form/settingswidget.h b/widget/form/settingswidget.h
index 552af5104..713eddde8 100644
--- a/widget/form/settingswidget.h
+++ b/widget/form/settingswidget.h
@@ -25,6 +25,7 @@ class GeneralForm;
 class IdentityForm;
 class PrivacyForm;
 class AVForm;
+class QTabWidget;
 
 namespace Ui {class MainWindow;}
 
@@ -38,9 +39,13 @@ public:
     void show(Ui::MainWindow &ui);
     IdentityForm *getIdentityForm() {return ifrm;}
 
+private slots:
+    void onTabChanged(int);
+
 private:
     QWidget *head, *body; // keep the others private
     IdentityForm *ifrm;
+    QTabWidget *settingsTabs;
 };
 
 #endif // SETTINGSWIDGET_H

From 35aeca5dd05ea50aa17207821cd5b59f5766e87e Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Mon, 6 Oct 2014 03:02:12 +0900
Subject: [PATCH 180/205] cosmetic fixes

---
 widget/form/settings/generalsettings.ui | 74 +++++++++++++++----------
 widget/form/settings/identityform.cpp   | 10 ++--
 widget/form/settings/identityform.h     |  2 +-
 widget/form/settingswidget.cpp          | 42 +++++++++++---
 widget/form/settingswidget.h            |  8 ++-
 5 files changed, 89 insertions(+), 47 deletions(-)

diff --git a/widget/form/settings/generalsettings.ui b/widget/form/settings/generalsettings.ui
index ca01dbc5b..902d41039 100644
--- a/widget/form/settings/generalsettings.ui
+++ b/widget/form/settings/generalsettings.ui
@@ -24,43 +24,57 @@
     <number>15</number>
    </property>
    <item>
-    <widget class="QCheckBox" name="cbEnableIPv6">
-     <property name="text">
-      <string extracomment="Text on a checkbox to enable IPv6">Enable IPv6 (recommended)</string>
+    <widget class="QGroupBox" name="generalGroup">
+     <property name="title">
+      <string>General Settings</string>
      </property>
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <item>
+       <widget class="QCheckBox" name="cbEnableIPv6">
+        <property name="text">
+         <string extracomment="Text on a checkbox to enable IPv6">Enable IPv6 (recommended)</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="cbUseTranslations">
+        <property name="text">
+         <string extracomment="Text on a checkbox to enable translations">Use translations</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="cbMakeToxPortable">
+        <property name="toolTip">
+         <string extracomment="describes makeToxPortable checkbox">Save settings to the working directory instead of the usual conf dir</string>
+        </property>
+        <property name="text">
+         <string>Make Tox portable</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
    <item>
-    <widget class="QCheckBox" name="cbUseTranslations">
-     <property name="text">
-      <string extracomment="Text on a checkbox to enable translations">Use translations</string>
+    <widget class="QGroupBox" name="themeGroup">
+     <property name="title">
+      <string>Theme</string>
      </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QLabel" name="smileyPackLabel">
+        <property name="text">
+         <string extracomment="Text on smiley pack label">Smiley Pack</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="smileyPackBrowser"/>
+      </item>
+     </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QCheckBox" name="cbMakeToxPortable">
-     <property name="toolTip">
-      <string extracomment="describes makeToxPortable checkbox">Save settings to the working directory instead of the usual conf dir</string>
-     </property>
-     <property name="text">
-      <string>Make Tox portable</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QVBoxLayout" name="smileLayout">
-     <item>
-      <widget class="QLabel" name="smileyPackLabel">
-       <property name="text">
-        <string extracomment="Text on smiley pack label">Smiley Pack</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="smileyPackBrowser"/>
-     </item>
-    </layout>
-   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
diff --git a/widget/form/settings/identityform.cpp b/widget/form/settings/identityform.cpp
index c2dac21b0..5aff0e513 100644
--- a/widget/form/settings/identityform.cpp
+++ b/widget/form/settings/identityform.cpp
@@ -37,11 +37,11 @@ IdentityForm::IdentityForm() :
     small.setPixelSize(13);
     small.setKerning(false);
 
-    toxId->setTextInteractionFlags(Qt::TextSelectableByMouse);
+//    toxId->setTextInteractionFlags(Qt::TextSelectableByMouse);
     toxId->setReadOnly(true);
-    toxId->setFrameStyle(QFrame::NoFrame);
-    toxId->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    toxId->setFixedHeight(toxId->document()->size().height()*2);
+//    toxId->setFrameStyle(QFrame::NoFrame);
+//    toxId->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+//    toxId->setFixedHeight(toxId->document()->size().height()*2);
     toxId->setFont(small);
     
     bodyUI->toxGroup->layout()->addWidget(toxId);
@@ -59,7 +59,7 @@ IdentityForm::~IdentityForm()
 void IdentityForm::copyIdClicked()
 {
     toxId->selectAll();
-    QString txt = toxId->toPlainText();
+    QString txt = toxId->text();
     txt.replace('\n',"");
     QApplication::clipboard()->setText(txt);
 }
diff --git a/widget/form/settings/identityform.h b/widget/form/settings/identityform.h
index c5505e6ea..2a4b07a77 100644
--- a/widget/form/settings/identityform.h
+++ b/widget/form/settings/identityform.h
@@ -29,7 +29,7 @@ namespace Ui {
 class IdentitySettings;
 }
 
-class ClickableTE : public QTextEdit
+class ClickableTE : public QLineEdit
 {
     Q_OBJECT
 public:
diff --git a/widget/form/settingswidget.cpp b/widget/form/settingswidget.cpp
index b4d208f61..434513004 100644
--- a/widget/form/settingswidget.cpp
+++ b/widget/form/settingswidget.cpp
@@ -22,19 +22,35 @@
 #include "widget/form/settings/identityform.h"
 #include "widget/form/settings/privacyform.h"
 #include "widget/form/settings/avform.h"
-#include <QTabWidget>
+#include <QTabBar>
+#include <QStackedWidget>
 
 SettingsWidget::SettingsWidget(Camera* cam, QWidget* parent)
     : QWidget(parent)
 {
-    body = new QWidget();
-    head = new QWidget();
-
+    body = new QWidget(this);
     QVBoxLayout *bodyLayout = new QVBoxLayout();
     body->setLayout(bodyLayout);
 
-    settingsTabs = new QTabWidget();
-    bodyLayout->addWidget(settingsTabs);
+    head = new QWidget(this);
+    QHBoxLayout *headLayout = new QHBoxLayout();
+    head->setLayout(headLayout);
+
+    imgLabel = new QLabel();
+    headLayout->addWidget(imgLabel);
+
+    nameLabel = new QLabel();
+    QFont bold;
+    bold.setBold(true);
+    nameLabel->setFont(bold);
+    headLayout->addWidget(nameLabel);
+    headLayout->addStretch(1);
+
+    settingsWidgets = new QStackedWidget;
+    bodyLayout->addWidget(settingsWidgets);
+
+    tabBar = new QTabBar;
+    bodyLayout->addWidget(tabBar);
 
     GeneralForm *gfrm = new GeneralForm;
     ifrm = new IdentityForm;
@@ -44,10 +60,13 @@ SettingsWidget::SettingsWidget(Camera* cam, QWidget* parent)
     GenericForm *cfgForms[] = {gfrm, ifrm, pfrm, avfrm};
     for (auto cfgForm : cfgForms)
     {
-        settingsTabs->addTab(cfgForm, cfgForm->getFormIcon(), cfgForm->getFormName());
+        tabBar->addTab(cfgForm->getFormIcon(), "");
+        settingsWidgets->addWidget(cfgForm);
     }
+    tabBar->setIconSize(QSize(20, 20));
+    tabBar->setShape(QTabBar::RoundedSouth);
 
-    connect(settingsTabs, SIGNAL(currentChanged(int)), this, SLOT(onTabChanged(int)));
+    connect(tabBar, SIGNAL(currentChanged(int)), this, SLOT(onTabChanged(int)));
 }
 
 SettingsWidget::~SettingsWidget()
@@ -60,9 +79,14 @@ void SettingsWidget::show(Ui::MainWindow& ui)
     ui.mainHead->layout()->addWidget(head);
     body->show();
     head->show();
+    onTabChanged(tabBar->currentIndex());
 }
 
 void SettingsWidget::onTabChanged(int index)
 {
-    static_cast<GenericForm*>(this->settingsTabs->widget(index))->updateContent();
+    this->settingsWidgets->setCurrentIndex(index);
+    GenericForm *currentWidget = static_cast<GenericForm*>(this->settingsWidgets->widget(index));
+    currentWidget->updateContent();
+    nameLabel->setText(currentWidget->getFormName());
+    imgLabel->setPixmap(currentWidget->getFormIcon().scaledToHeight(40, Qt::SmoothTransformation));
 }
diff --git a/widget/form/settingswidget.h b/widget/form/settingswidget.h
index 713eddde8..431e52c1c 100644
--- a/widget/form/settingswidget.h
+++ b/widget/form/settingswidget.h
@@ -25,7 +25,9 @@ class GeneralForm;
 class IdentityForm;
 class PrivacyForm;
 class AVForm;
-class QTabWidget;
+class QTabBar;
+class QStackedWidget;
+class QLabel;
 
 namespace Ui {class MainWindow;}
 
@@ -45,7 +47,9 @@ private slots:
 private:
     QWidget *head, *body; // keep the others private
     IdentityForm *ifrm;
-    QTabWidget *settingsTabs;
+    QStackedWidget *settingsWidgets;
+    QTabBar *tabBar;
+    QLabel *nameLabel, *imgLabel;
 };
 
 #endif // SETTINGSWIDGET_H

From d1c042ed5e608b0ddb381912be68ecfa9df655eb Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Sun, 5 Oct 2014 22:47:12 -0500
Subject: [PATCH 181/205] add Kappa emote

---
 smileys/default/Kappa.png     | Bin 0 -> 1242 bytes
 smileys/default/emoticons.xml |   3 +++
 2 files changed, 3 insertions(+)
 create mode 100644 smileys/default/Kappa.png

diff --git a/smileys/default/Kappa.png b/smileys/default/Kappa.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7ebbec4d90af0efba51de1a263d08793ce3a67a
GIT binary patch
literal 1242
zcmeAS@N?(olHy`uVBq!ia0vp^l0YoO!2%@hbniq1DW)WEcNYeRRlUkaKptm-M`SUO
z_5fqIli7Aa6^A`t978NlmtOJCo|7uk@bLBQmn!jUlYP?E)K+$?nO<TJnwq8E6;z`5
z;#RJBUhGcc|Be5hHcA&N?kETq3_r@eElgm!uXn~Ivv#$a!Rj*~f8Vvi!gIFW?RM_C
zd+hI4ygvC;>&e-OZw?oizWA8?#p0*xnjemD)|Aek7ijS0@{5&Eu5VbPmhBpTYemmI
z)7<qlKRcGN{ItyBY?3U$Y8ztuYT7Kz<+_<3F@1a!<(*xXQqOcr{re^^q-uOgYueH|
zA8L<m{C}YLg2?T1|1~f7mGYmBoF2MKG3e5^Y^MGbMJrCe*pVH2cwX%6G!dU!+cNIT
zmTyrlV_WiO;j~S+^H!fa{qpsUl6#)6x!!p{?(Sn}{xo}C-=@^pZc}_L^G@A9CwYBS
z{-s3;uIUc{1hOMSCrSi<S$1TOc~92MSBW<&&8M=fq~5lbohYt5!~DHPo9yL_m#=SH
z{-EhBW9QnHQl_s<m!GLTw?<KNqKk_5G><dV(i8F*87m5P`c__-G+c4}+Js5hFF7Cl
z(NN&ypLFbZ+%%`Nq2?(%8c|zwe53BYas0F}|7pz=S>5Y@A8(s2wX8>D=OcC9%JWv{
z3gL%cHLuS-Hcxl^lu}XMij$g)laiB+<0K|*Uu1un)v>AR`<$)M_N^24)7qKgace{7
z(PsYBGfPiSv5ibVHYZ^EMPbj`+m~uw3$pf5^VMFl`t@mvNt41a1|C_mrzg?cjBiq>
zhU~9jm#n0AHFd4pGp&$6WJ~XjYc?JkS;~v^<6T3~f1b52<94X|+RXPC_x@8a4B@MM
z+@vV{YtyG7G2NR2U#7Y&I@}VzID4V0_9WxH!={e+_eBKX+R^5}=r~8Ibx~5N^Ng^~
zYm^MvX1u*vZ!5U;y_3>n?TVvwLQ_{)b(Q7(QmXPg{=;a(c8%q$(xQV??ml;S%`}K_
zU$cjkwKlpeq^3rp&Rs~ay|&iU@$9_wd{;lk>zWCB&W*|x0H$lz64!{5l*E!$tK_0o
zAjM#0U}&UkV61Ck7Gh{>WngS&Y^rNuVP#;zu(<dViiX_$l+3hB+!_l1oz4Sla0A&;
zoS#-wo>-L1;F+74p6Z*Jo|&AjV5SFzx<(2>D-CqPwkiY~nki(IloVL$>z9|8>t%ve
z12IswUVc%!gP83hpotP76GJjebCayBT=J7kb5rw5tgHfnN{bl`m;c|b4^$(Lqy}uK
zl~qP+W_m^mgONq>=|vnsC1RLL!ZTA!G8l|Z!&T<Y2C9%mQsJAKn_5y?kjemdlYT*7
zy8WgwKQx<sLx8Fn42_Kq4a`jq3{899-=7XtB8X&8aAs91gN3QNlhYob;3A-;E|O$u
zkS9Z0W=<;5`}!rh1^T&}c_8b6-ZwNiH#FBZGS&lHEc*WE7obK4Pgg&ebxsLQ0B;QW
Ao&W#<

literal 0
HcmV?d00001

diff --git a/smileys/default/emoticons.xml b/smileys/default/emoticons.xml
index d1fe8c715..c6f816f7b 100644
--- a/smileys/default/emoticons.xml
+++ b/smileys/default/emoticons.xml
@@ -82,4 +82,7 @@
     <string>XD</string>
   </emoticon>
   
+  <emoticon file="Kappa.png">
+    <string>:Kappa:</string>
+  </emoticon>
 </messaging-emoticon-map>

From 227e483bdd43fb2759ac07b7b35f15a5b5661e02 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Mon, 6 Oct 2014 00:49:26 -0500
Subject: [PATCH 182/205] tweak buildPackages

---
 tools/buildPackages.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/buildPackages.sh b/tools/buildPackages.sh
index 0c12e11c6..501d7b429 100755
--- a/tools/buildPackages.sh
+++ b/tools/buildPackages.sh
@@ -87,7 +87,7 @@ mv qTox-master $VERNAME
 
 # Build packages
 cd $VERNAME
-./bootstrap.sh
+./bootstrap.sh --local
 debuild -us -uc -aamd64
 debuild -us -uc -ai386
 cd ..

From 9e2195c03cb8291115e4bc4deef46fcda1b4627c Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Mon, 6 Oct 2014 01:46:30 -0500
Subject: [PATCH 183/205] simplify groupchat names, fix #379, more
 simplification is possible

---
 core.cpp                        |  5 +--
 core.h                          |  2 +-
 group.cpp                       | 57 +++------------------------------
 group.h                         |  6 ----
 widget/form/genericchatform.cpp |  6 ++++
 widget/form/groupchatform.cpp   | 11 -------
 widget/form/groupchatform.h     |  1 -
 widget/widget.cpp               | 10 +++---
 widget/widget.h                 |  2 +-
 9 files changed, 20 insertions(+), 80 deletions(-)

diff --git a/core.cpp b/core.cpp
index f6b7a2a5c..fddca6eda 100644
--- a/core.cpp
+++ b/core.cpp
@@ -402,9 +402,10 @@ void Core::onGroupInvite(Tox*, int friendnumber, const uint8_t *group_public_key
     emit static_cast<Core*>(core)->groupInviteReceived(friendnumber, group_public_key,length);
 }
 
-void Core::onGroupMessage(Tox*, int groupnumber, int friendgroupnumber, const uint8_t * message, uint16_t length, void *core)
+void Core::onGroupMessage(Tox*, int groupnumber, int peernumber, const uint8_t * message, uint16_t length, void *_core)
 {
-    emit static_cast<Core*>(core)->groupMessageReceived(groupnumber, friendgroupnumber, CString::toString(message, length));
+    Core* core = static_cast<Core*>(_core);
+    emit core->groupMessageReceived(groupnumber, CString::toString(message, length), core->getGroupPeerName(groupnumber, peernumber));
 }
 
 void Core::onGroupNamelistChange(Tox*, int groupnumber, int peernumber, uint8_t change, void *core)
diff --git a/core.h b/core.h
index b1b8c3f43..51d885688 100644
--- a/core.h
+++ b/core.h
@@ -118,7 +118,7 @@ signals:
 
     void emptyGroupCreated(int groupnumber);
     void groupInviteReceived(int friendnumber, const uint8_t *group_public_key,uint16_t length);
-    void groupMessageReceived(int groupnumber, int friendgroupnumber, const QString& message);
+    void groupMessageReceived(int groupnumber, const QString& message, const QString& author);
     void groupNamelistChanged(int groupnumber, int peernumber, uint8_t change);
 
     void usernameSet(const QString& username);
diff --git a/group.cpp b/group.cpp
index 4898f525a..d74610131 100644
--- a/group.cpp
+++ b/group.cpp
@@ -24,16 +24,14 @@
 #include <QTimer>
 
 Group::Group(int GroupId, QString Name)
-    : groupId(GroupId), nPeers{0}, hasPeerInfo{false}, peerInfoTimer{new QTimer}
+    : groupId(GroupId), nPeers{0}
 {
     widget = new GroupWidget(groupId, Name);
     chatForm = new GroupChatForm(this);
-    connect(peerInfoTimer, SIGNAL(timeout()), this, SLOT(queryPeerInfo()));
-    peerInfoTimer->setInterval(500);
-    peerInfoTimer->setSingleShot(false);
-    //peerInfoTimer.start();
 
-    //in groupchats, we only notify on messages containing your name
+    //in groupchats, we only notify on messages containing your name <-- dumb
+    // sound notifications should be on all messages, but system popup notification
+    // on naming is appropriate
     hasNewMessages = 0;
     userWasMentioned = 0;
 }
@@ -42,53 +40,6 @@ Group::~Group()
 {
     delete chatForm;
     delete widget;
-    delete peerInfoTimer;
-}
-
-void Group::queryPeerInfo()
-{
-    const Core* core = Core::getInstance();
-    int nPeersResult = core->getGroupNumberPeers(groupId);
-    if (nPeersResult == -1)
-    {
-        qDebug() << "Group::queryPeerInfo: Can't get number of peers";
-        return;
-    }
-    nPeers = nPeersResult;
-    widget->onUserListChanged();
-    chatForm->onUserListChanged();
-
-    if (nPeersResult == 0)
-        return;
-
-    bool namesOk = true;
-    QList<QString> names = core->getGroupPeerNames(groupId);
-    if (names.isEmpty())
-    {
-        qDebug() << "Group::queryPeerInfo: Can't get names of peers";
-        return;
-    }
-    for (int i=0; i<names.size(); i++)
-    {
-        QString name = names[i];
-        if (name.isEmpty())
-        {
-            name = "<Unknown>";
-            namesOk = false;
-        }
-        peers[i] = name;
-    }
-    nPeers = names.size();
-
-    widget->onUserListChanged();
-    chatForm->onUserListChanged();
-
-    if (namesOk)
-    {
-        qDebug() << "Group::queryPeerInfo: Successfully loaded names";
-        hasPeerInfo = true;
-        peerInfoTimer->stop();
-    }
 }
 
 void Group::addPeer(int peerId, QString name)
diff --git a/group.h b/group.h
index fed4b11ee..cd263538f 100644
--- a/group.h
+++ b/group.h
@@ -25,7 +25,6 @@
 struct Friend;
 class GroupWidget;
 class GroupChatForm;
-class QTimer;
 
 class Group : public QObject
 {
@@ -37,17 +36,12 @@ public:
     void removePeer(int peerId);
     void updatePeer(int peerId, QString newName);
 
-private slots:
-    void queryPeerInfo();
-
 public:
     int groupId;
     QMap<int,QString> peers;
     int nPeers;
     GroupWidget* widget;
     GroupChatForm* chatForm;
-    bool hasPeerInfo;
-    QTimer* peerInfoTimer;
     int hasNewMessages, userWasMentioned;
 };
 
diff --git a/widget/form/genericchatform.cpp b/widget/form/genericchatform.cpp
index 4a73d3938..08e8040bb 100644
--- a/widget/form/genericchatform.cpp
+++ b/widget/form/genericchatform.cpp
@@ -172,6 +172,12 @@ void GenericChatForm::addMessage(QString author, QString message, bool isAction,
     QString date = datetime.toString(Settings::getInstance().getTimestampFormat());
     bool isMe = (author == Widget::getInstance()->getUsername());
 
+    if (!isAction && message.startsWith("/me "))
+    { // always render actions regardless of what core thinks
+        isAction = true;
+        message = message.right(message.length()-4);
+    }
+
     if (isAction)
     {
         chatWidget->insertMessage(new ActionAction (getElidedName(author), message, date, isMe));
diff --git a/widget/form/groupchatform.cpp b/widget/form/groupchatform.cpp
index 412ef46e8..5e97d22df 100644
--- a/widget/form/groupchatform.cpp
+++ b/widget/form/groupchatform.cpp
@@ -80,17 +80,6 @@ void GroupChatForm::onSendTriggered()
     emit sendMessage(group->groupId, msg);
 }
 
-void GroupChatForm::addGroupMessage(QString message, int peerId)
-{
-    QString msgAuthor;
-    if (group->peers.contains(peerId))
-        msgAuthor = group->peers[peerId];
-    else
-        msgAuthor = tr("<Unknown>");
-
-    addMessage(msgAuthor, message);
-}
-
 void GroupChatForm::onUserListChanged()
 {
     nusersLabel->setText(tr("%1 users in chat").arg(group->nPeers));
diff --git a/widget/form/groupchatform.h b/widget/form/groupchatform.h
index a544034de..6b3984b06 100644
--- a/widget/form/groupchatform.h
+++ b/widget/form/groupchatform.h
@@ -28,7 +28,6 @@ class GroupChatForm : public GenericChatForm
 public:
     GroupChatForm(Group* chatGroup);
 
-    void addGroupMessage(QString message, int peerId);
     void onUserListChanged();
 
 private slots:
diff --git a/widget/widget.cpp b/widget/widget.cpp
index bfe0a483a..5cbaa74ee 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -209,7 +209,7 @@ void Widget::closeEvent(QCloseEvent *event)
 
 QString Widget::getUsername()
 {
-    return ui->nameLabel->text();
+    return core->getUsername();
 }
 
 Camera* Widget::getCamera()
@@ -558,21 +558,21 @@ void Widget::onGroupInviteReceived(int32_t friendId, const uint8_t* publicKey,ui
     }
 }
 
-void Widget::onGroupMessageReceived(int groupnumber, int friendgroupnumber, const QString& message)
+void Widget::onGroupMessageReceived(int groupnumber, const QString& message, const QString& author)
 {
     Group* g = GroupList::findGroup(groupnumber);
     if (!g)
         return;
 
-    g->chatForm->addGroupMessage(message, friendgroupnumber);
+    g->chatForm->addMessage(author, message);
 
     if ((static_cast<GenericChatroomWidget*>(g->widget) != activeChatroomWidget) || isMinimized() || !isActiveWindow())
     {
         g->hasNewMessages = 1;
+        newMessageAlert(); // sound alert on any message, not just naming user
         if (message.contains(core->getUsername(), Qt::CaseInsensitive))
         {
-            newMessageAlert();
-            g->userWasMentioned = 1;
+            g->userWasMentioned = 1; // useful for highlighting line or desktop notifications
         }
         g->widget->updateStatusLight();
     }
diff --git a/widget/widget.h b/widget/widget.h
index 3d7858e78..7e17f565f 100644
--- a/widget/widget.h
+++ b/widget/widget.h
@@ -92,7 +92,7 @@ private slots:
     void onFriendRequestReceived(const QString& userId, const QString& message);
     void onEmptyGroupCreated(int groupId);
     void onGroupInviteReceived(int32_t friendId, const uint8_t *publicKey,uint16_t length);
-    void onGroupMessageReceived(int groupnumber, int friendgroupnumber, const QString& message);
+    void onGroupMessageReceived(int groupnumber, const QString& message, const QString& author);
     void onGroupNamelistChanged(int groupnumber, int peernumber, uint8_t change);
     void removeFriend(int friendId);
     void copyFriendIdToClipboard(int friendId);

From 200c6d30e9d77be52de914b12d85adbef5358ef4 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Mon, 6 Oct 2014 03:21:47 -0500
Subject: [PATCH 184/205] reduce font size and space between chat lines

---
 ui/chatArea/innerStyle.css | 14 +++++++-------
 widget/chatareawidget.cpp  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ui/chatArea/innerStyle.css b/ui/chatArea/innerStyle.css
index 823c8dfbe..444d4381b 100644
--- a/ui/chatArea/innerStyle.css
+++ b/ui/chatArea/innerStyle.css
@@ -1,36 +1,36 @@
 div.name {
   color: @black;
-  font: @bigBold;
+  font: @mediumBold;
 }
 
 div.message {
   color: @black;
-  font: @big;
+  font: @medium;
 }
 
 div.action {
   color: #1818FF;
-  font: @big;
+  font: @medium;
 }
 
 div.date {
   color: @black;
-  font: @big;
+  font: @medium;
 }
 
 div.name_me {
   color: @mediumGrey;
-  font: @big;
+  font: @medium;
 }
 
 div.message_me {
   color: @black;
-  font: @big;
+  font: @medium;
 }
 
 div.date_me {
   color: @black;
-  font: @big;
+  font: @medium;
 }
 
 span.quote {
diff --git a/widget/chatareawidget.cpp b/widget/chatareawidget.cpp
index c743574fa..d3d326b63 100644
--- a/widget/chatareawidget.cpp
+++ b/widget/chatareawidget.cpp
@@ -38,7 +38,7 @@ ChatAreaWidget::ChatAreaWidget(QWidget *parent)
     setFrameStyle(QFrame::NoFrame);
 
     QTextTableFormat tableFormat;
-    tableFormat.setCellSpacing(15);
+    tableFormat.setCellSpacing(5);
     tableFormat.setBorderStyle(QTextFrameFormat::BorderStyle_None);
     tableFormat.setColumnWidthConstraints({QTextLength(QTextLength::FixedLength,nameWidth),
                                            QTextLength(QTextLength::PercentageLength,100),

From 6e02240b561f9350c7300626199bf9bd7c012bec Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Mon, 6 Oct 2014 23:39:07 +0900
Subject: [PATCH 185/205] relative to system wide default font sizes in css

---
 misc/style.cpp            | 18 +++++++++++-------
 misc/style.h              | 14 +++++++-------
 ui/window/statusPanel.css |  2 +-
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/misc/style.cpp b/misc/style.cpp
index 1c83f0c6e..6d7b191a2 100644
--- a/misc/style.cpp
+++ b/misc/style.cpp
@@ -23,6 +23,7 @@
 #include <QRegularExpression>
 #include <QWidget>
 #include <QStyle>
+#include <QFontInfo>
 
 // helper functions
 QFont appFont(int pixelSize, int weight)
@@ -78,14 +79,17 @@ QFont Style::getFont(Style::Font font)
 {
     // fonts as defined in
     // https://github.com/ItsDuke/Tox-UI/blob/master/UI%20GUIDELINES.md
+
+    static int defSize = QFontInfo(QFont()).pixelSize();
+
     static QFont fonts[] = {
-        appFont(16, QFont::Bold),
-        appFont(14, QFont::Normal),
-        appFont(14, QFont::Bold),
-        appFont(13, QFont::Normal),
-        appFont(13, QFont::Bold),
-        appFont(12, QFont::Normal),
-        appFont(12, QFont::Light),
+        appFont(defSize + 2, QFont::Bold),
+        appFont(defSize    , QFont::Normal),
+        appFont(defSize    , QFont::Bold),
+        appFont(defSize - 1, QFont::Normal),
+        appFont(defSize - 1, QFont::Bold),
+        appFont(defSize - 2, QFont::Normal),
+        appFont(defSize - 2, QFont::Light),
     };
 
     return fonts[font];
diff --git a/misc/style.h b/misc/style.h
index 35c0b7e98..a07064e04 100644
--- a/misc/style.h
+++ b/misc/style.h
@@ -41,13 +41,13 @@ public:
 
     enum Font
     {
-        ExtraBig,   // 14px, bold
-        Big,        // 12px
-        BigBold,    // 12px, bold
-        Medium,     // 11px
-        MediumBold, // 11px, bold
-        Small,      // 10px
-        SmallLight  // 10px, light
+        ExtraBig,   // [SystemDefault + 2]px, bold
+        Big,        // [SystemDefault    ]px
+        BigBold,    // [SystemDefault    ]px, bold
+        Medium,     // [SystemDefault - 1]px
+        MediumBold, // [SystemDefault - 1]px, bold
+        Small,      // [SystemDefault - 2]px
+        SmallLight  // [SystemDefault - 2]px, light
     };
 
     static QString getStylesheet(const QString& filename);
diff --git a/ui/window/statusPanel.css b/ui/window/statusPanel.css
index 3a0fc36da..4683bc15a 100644
--- a/ui/window/statusPanel.css
+++ b/ui/window/statusPanel.css
@@ -9,7 +9,7 @@
 }
 
 #statusPanel > #statusHead > #statusLabel {
-  font: @smallLight;
+  font: @medium;
   color: @lightGrey;
 }
 

From d42f9d31662a4d805d92ef80ea7f49a43d99fbee Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Mon, 6 Oct 2014 09:57:50 -0500
Subject: [PATCH 186/205] Revert "reduce font size and space between chat
 lines", use #386

This reverts commit 200c6d30e9d77be52de914b12d85adbef5358ef4.
---
 ui/chatArea/innerStyle.css | 14 +++++++-------
 widget/chatareawidget.cpp  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ui/chatArea/innerStyle.css b/ui/chatArea/innerStyle.css
index 444d4381b..823c8dfbe 100644
--- a/ui/chatArea/innerStyle.css
+++ b/ui/chatArea/innerStyle.css
@@ -1,36 +1,36 @@
 div.name {
   color: @black;
-  font: @mediumBold;
+  font: @bigBold;
 }
 
 div.message {
   color: @black;
-  font: @medium;
+  font: @big;
 }
 
 div.action {
   color: #1818FF;
-  font: @medium;
+  font: @big;
 }
 
 div.date {
   color: @black;
-  font: @medium;
+  font: @big;
 }
 
 div.name_me {
   color: @mediumGrey;
-  font: @medium;
+  font: @big;
 }
 
 div.message_me {
   color: @black;
-  font: @medium;
+  font: @big;
 }
 
 div.date_me {
   color: @black;
-  font: @medium;
+  font: @big;
 }
 
 span.quote {
diff --git a/widget/chatareawidget.cpp b/widget/chatareawidget.cpp
index d3d326b63..c743574fa 100644
--- a/widget/chatareawidget.cpp
+++ b/widget/chatareawidget.cpp
@@ -38,7 +38,7 @@ ChatAreaWidget::ChatAreaWidget(QWidget *parent)
     setFrameStyle(QFrame::NoFrame);
 
     QTextTableFormat tableFormat;
-    tableFormat.setCellSpacing(5);
+    tableFormat.setCellSpacing(15);
     tableFormat.setBorderStyle(QTextFrameFormat::BorderStyle_None);
     tableFormat.setColumnWidthConstraints({QTextLength(QTextLength::FixedLength,nameWidth),
                                            QTextLength(QTextLength::PercentageLength,100),

From b9a666159aa84cd000891d7778d6bad7ae7a22bc Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Mon, 6 Oct 2014 09:58:48 -0500
Subject: [PATCH 187/205] reduce space between chat lines

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

diff --git a/widget/chatareawidget.cpp b/widget/chatareawidget.cpp
index c743574fa..d3d326b63 100644
--- a/widget/chatareawidget.cpp
+++ b/widget/chatareawidget.cpp
@@ -38,7 +38,7 @@ ChatAreaWidget::ChatAreaWidget(QWidget *parent)
     setFrameStyle(QFrame::NoFrame);
 
     QTextTableFormat tableFormat;
-    tableFormat.setCellSpacing(15);
+    tableFormat.setCellSpacing(5);
     tableFormat.setBorderStyle(QTextFrameFormat::BorderStyle_None);
     tableFormat.setColumnWidthConstraints({QTextLength(QTextLength::FixedLength,nameWidth),
                                            QTextLength(QTextLength::PercentageLength,100),

From d093679d03bfeeae62aaceaa388a85391640673b Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Sun, 5 Oct 2014 15:49:44 -0500
Subject: [PATCH 188/205] Add proxy support

---
 core.cpp                                | 57 ++++++++++++++++++++-----
 core.h                                  |  1 +
 misc/cstring.h                          |  3 +-
 misc/settings.cpp                       | 36 ++++++++++++++++
 misc/settings.h                         | 13 ++++++
 widget/form/settings/generalform.cpp    | 42 ++++++++++++++++--
 widget/form/settings/generalform.h      |  3 ++
 widget/form/settings/generalsettings.ui | 46 ++++++++++++++++++++
 widget/form/settingswidget.cpp          |  2 +-
 widget/widget.cpp                       | 13 +++++-
 widget/widget.h                         |  1 +
 11 files changed, 199 insertions(+), 18 deletions(-)

diff --git a/core.cpp b/core.cpp
index f6b7a2a5c..fdc91616a 100644
--- a/core.cpp
+++ b/core.cpp
@@ -121,6 +121,9 @@ void Core::start()
 {
     // IPv6 needed for LAN discovery, but can crash some weird routers. On by default, can be disabled in options.
     bool enableIPv6 = Settings::getInstance().getEnableIPv6();
+    bool forceTCP = Settings::getInstance().getForceTCP();
+    QString proxyAddr = Settings::getInstance().getProxyAddr();
+    int proxyPort = Settings::getInstance().getProxyPort();
     if (enableIPv6)
         qDebug() << "Core starting with IPv6 enabled";
     else
@@ -128,10 +131,28 @@ void Core::start()
 
     Tox_Options toxOptions;
     toxOptions.ipv6enabled = enableIPv6;
-    toxOptions.udp_disabled = 0;
-    toxOptions.proxy_enabled = false;
-    toxOptions.proxy_address[0] = 0;
-    toxOptions.proxy_port = 0;
+    toxOptions.udp_disabled = forceTCP;
+    if (proxyAddr.length() > 255)
+    {
+        qWarning() << "Core: proxy address" << proxyAddr << "is too long";
+        toxOptions.proxy_enabled = false;
+        toxOptions.proxy_address[0] = 0;
+        toxOptions.proxy_port = 0;
+    }
+    else if (proxyAddr != "" && proxyPort > 0)
+    {
+        qDebug() << "Core: using proxy" << proxyAddr << ":" << proxyPort;
+        toxOptions.proxy_enabled = true;
+        uint16_t sz = CString::fromString(proxyAddr, (unsigned char*)toxOptions.proxy_address);
+        toxOptions.proxy_address[sz] = 0;
+        toxOptions.proxy_port = proxyPort;
+    }
+    else
+    {
+        toxOptions.proxy_enabled = false;
+        toxOptions.proxy_address[0] = 0;
+        toxOptions.proxy_port = 0;
+    }
 
     tox = tox_new(&toxOptions);
     if (tox == nullptr)
@@ -142,13 +163,29 @@ void Core::start()
             tox = tox_new(&toxOptions);
             if (tox == nullptr)
             {
-                qCritical() << "Tox core failed to start";
-                emit failedToStart();
+                if (toxOptions.proxy_enabled)
+                {
+                    //QMessageBox::critical(Widget::getInstance(), tr("Proxy failure", "popup title"), 
+                    //tr("toxcore failed to start with your proxy settings. qTox cannot run; please modify your "
+                       //"settings and restart.", "popup text"));
+                    qCritical() << "Core: bad proxy! no toxcore!";
+                    emit badProxy();
+                } 
+                else
+                {
+                    qCritical() << "Tox core failed to start";
+                    emit failedToStart();
+                }
                 return;
-            }
+            } 
             else
                 qWarning() << "Core failed to start with IPv6, falling back to IPv4. LAN discovery may not work properly.";
         }
+        else if (toxOptions.proxy_enabled)
+        {
+            emit badProxy();
+            return;
+        }
         else
         {
             qCritical() << "Tox core failed to start";
@@ -919,8 +956,6 @@ void Core::setAvatar(uint8_t format, const QByteArray& data)
         qWarning() << "Core: Failed to set self avatar";
         return;
     }
-    else
-        qDebug() << "Core: Set avatar, format:"<<format<<", size:"<<data.size();
 
     QPixmap pic;
     pic.loadFromData(data);
@@ -1053,6 +1088,8 @@ bool Core::loadConfiguration()
 
 void Core::saveConfiguration()
 {
+    Settings::getInstance().save();
+    
     if (!tox)
     {
         qWarning() << "Core::saveConfiguration: Tox not started, aborting!";
@@ -1085,8 +1122,6 @@ void Core::saveConfiguration()
         configurationFile.commit();
         delete[] data;
     }
-
-    Settings::getInstance().save();
 }
 
 void Core::loadFriends()
diff --git a/core.h b/core.h
index b1b8c3f43..b911d3372 100644
--- a/core.h
+++ b/core.h
@@ -138,6 +138,7 @@ signals:
     void failedToSetTyping(bool typing);
 
     void failedToStart();
+    void badProxy();
 
     void fileSendStarted(ToxFile file);
     void fileReceiveRequested(ToxFile file);
diff --git a/misc/cstring.h b/misc/cstring.h
index 818c79bc8..869fa29f2 100644
--- a/misc/cstring.h
+++ b/misc/cstring.h
@@ -34,13 +34,12 @@ public:
     uint16_t size();
 
     static QString toString(const uint8_t* cMessage, const uint16_t cMessageSize);
+    static uint16_t fromString(const QString& message, uint8_t* cMessage);
 
 private:
     const static int MAX_SIZE_OF_UTF8_ENCODED_CHARACTER = 4;
 
     uint8_t* cString;
     uint16_t cStringSize;
-
-    static uint16_t fromString(const QString& message, uint8_t* cMessage);
 };
 #endif // CSTRING_H
diff --git a/misc/settings.cpp b/misc/settings.cpp
index 72a06e4ed..b3af2144d 100644
--- a/misc/settings.cpp
+++ b/misc/settings.cpp
@@ -140,6 +140,9 @@ void Settings::load()
 
     s.beginGroup("Privacy");
         typingNotification = s.value("typingNotification", false).toBool();
+        forceTCP = s.value("forceTCP", false).toBool();
+        proxyAddr = s.value("proxyAddr", "").toString();
+        proxyPort = s.value("proxyPort", 0).toInt();
     s.endGroup();
 
     // try to set a smiley pack if none is selected
@@ -239,6 +242,9 @@ void Settings::save(QString path)
 
     s.beginGroup("Privacy");
         s.setValue("typingNotification", typingNotification);
+        s.setValue("forceTCP", forceTCP);
+        s.setValue("proxyAddr", proxyAddr);
+        s.setValue("proxyPort", proxyPort);
     s.endGroup();
 }
 
@@ -351,6 +357,36 @@ void Settings::setUseTranslations(bool newValue)
     useTranslations = newValue;
 }
 
+bool Settings::getForceTCP() const
+{
+    return forceTCP;
+}
+
+void Settings::setForceTCP(bool newValue)
+{
+    forceTCP = newValue;
+}
+
+QString Settings::getProxyAddr() const
+{
+    return proxyAddr;
+}
+
+void Settings::setProxyAddr(const QString& newValue)
+{
+    proxyAddr = newValue;
+}
+
+int Settings::getProxyPort() const
+{
+    return proxyPort;
+}
+
+void Settings::setProxyPort(int newValue)
+{
+    proxyPort = newValue;
+}
+
 bool Settings::getEnableLogging() const
 {
     return enableLogging;
diff --git a/misc/settings.h b/misc/settings.h
index f171c17af..82f6e3872 100644
--- a/misc/settings.h
+++ b/misc/settings.h
@@ -52,6 +52,15 @@ public:
     bool getUseTranslations() const;
     void setUseTranslations(bool newValue);
 
+    bool getForceTCP() const;
+    void setForceTCP(bool newValue);
+    
+    QString getProxyAddr() const;
+    void setProxyAddr(const QString& newValue);
+
+    int getProxyPort() const;
+    void setProxyPort(int newValue);
+
     bool getEnableLogging() const;
     void setEnableLogging(bool newValue);
 
@@ -153,6 +162,10 @@ private:
     bool enableIPv6;
     bool useTranslations;
     static bool makeToxPortable;
+    
+    bool forceTCP;
+    QString proxyAddr;
+    int proxyPort;
 
     bool enableLogging;
     bool encryptLogs;
diff --git a/widget/form/settings/generalform.cpp b/widget/form/settings/generalform.cpp
index c816f4225..e998a9f5f 100644
--- a/widget/form/settings/generalform.cpp
+++ b/widget/form/settings/generalform.cpp
@@ -20,6 +20,7 @@
 #include "widget/widget.h"
 #include "misc/settings.h"
 #include "misc/smileypack.h"
+#include <QMessageBox>
 
 GeneralForm::GeneralForm() :
     GenericForm(tr("General Settings"), QPixmap(":/img/settings/general.png"))
@@ -37,10 +38,20 @@ GeneralForm::GeneralForm() :
     }
     bodyUI->smileyPackBrowser->setCurrentIndex(bodyUI->smileyPackBrowser->findData(Settings::getInstance().getSmileyPack()));
     
-    connect(bodyUI->cbEnableIPv6, SIGNAL(stateChanged(int)), this, SLOT(onEnableIPv6Updated()));
-    connect(bodyUI->cbUseTranslations, SIGNAL(stateChanged(int)), this, SLOT(onUseTranslationUpdated()));
-    connect(bodyUI->cbMakeToxPortable, SIGNAL(stateChanged(int)), this, SLOT(onMakeToxPortableUpdated()));
+    bodyUI->cbUDPDisabled->setChecked(Settings::getInstance().getForceTCP());
+    bodyUI->proxyAddr->setText(Settings::getInstance().getProxyAddr());
+    int port = Settings::getInstance().getProxyPort();
+    if (port != -1)
+        bodyUI->proxyPort->setText(QString::number(port));
+    
+    connect(bodyUI->cbEnableIPv6, &QCheckBox::stateChanged, this, &GeneralForm::onEnableIPv6Updated);
+    connect(bodyUI->cbUseTranslations, &QCheckBox::stateChanged, this, &GeneralForm::onUseTranslationUpdated);
+    connect(bodyUI->cbMakeToxPortable, &QCheckBox::stateChanged, this, &GeneralForm::onMakeToxPortableUpdated);
     connect(bodyUI->smileyPackBrowser, SIGNAL(currentIndexChanged(int)), this, SLOT(onSmileyBrowserIndexChanged(int)));
+    // new syntax can't handle overloaded signals... (at least not in a pretty way)
+    connect(bodyUI->cbUDPDisabled, &QCheckBox::stateChanged, this, &GeneralForm::onUDPUpdated);
+    connect(bodyUI->proxyAddr, &QLineEdit::editingFinished, this, &GeneralForm::onProxyAddrEdited);
+    connect(bodyUI->proxyPort, &QLineEdit::editingFinished, this, &GeneralForm::onProxyPortEdited);
 }
 
 GeneralForm::~GeneralForm()
@@ -68,3 +79,28 @@ void GeneralForm::onSmileyBrowserIndexChanged(int index)
     QString filename = bodyUI->smileyPackBrowser->itemData(index).toString();
     Settings::getInstance().setSmileyPack(filename);
 }
+
+void GeneralForm::onUDPUpdated()
+{
+    Settings::getInstance().setForceTCP(bodyUI->cbUDPDisabled->isChecked());
+}
+
+void GeneralForm::onProxyAddrEdited()
+{
+    Settings::getInstance().setProxyAddr(bodyUI->proxyAddr->text());
+}
+
+void GeneralForm::onProxyPortEdited()
+{
+    QString text = bodyUI->proxyPort->text();
+    if (text != "")
+    {
+        int port = text.toInt();
+        if (port < 1)
+            QMessageBox::warning(bodyUI->proxyPort, tr("Bad port", "title of bad port popup"), tr("The port you entered is invalid; please enter another.", "text of bad port popup"));
+        else
+            Settings::getInstance().setProxyPort(port);
+    }
+    else
+        Settings::getInstance().setProxyPort(-1);
+}
diff --git a/widget/form/settings/generalform.h b/widget/form/settings/generalform.h
index 5d5fd6efe..2af8f4bb6 100644
--- a/widget/form/settings/generalform.h
+++ b/widget/form/settings/generalform.h
@@ -37,6 +37,9 @@ private slots:
     void onUseTranslationUpdated();
     void onMakeToxPortableUpdated();
     void onSmileyBrowserIndexChanged(int index);
+    void onUDPUpdated();
+    void onProxyAddrEdited();
+    void onProxyPortEdited();
 
 private:
     Ui::GeneralSettings *bodyUI;
diff --git a/widget/form/settings/generalsettings.ui b/widget/form/settings/generalsettings.ui
index 902d41039..0015d1787 100644
--- a/widget/form/settings/generalsettings.ui
+++ b/widget/form/settings/generalsettings.ui
@@ -75,6 +75,52 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QGroupBox" name="proxyGroup">
+     <property name="title">
+      <string>Proxy settings</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayoutProxy">
+      <item>
+       <widget class="QCheckBox" name="cbUDPDisabled">
+        <property name="text">
+         <string extracomment="Text on checkbox to disable UDP">Disable UDP (not recommended)</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayoutProxyLabel">
+        <item>
+         <widget class="QLabel" name="proxyAddrLabel">
+          <property name="text">
+           <string extracomment="Text on proxy addr label">Proxy address</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="proxyPortLabel">
+          <property name="text">
+           <string extracomment="Text on proxy port label">Proxy port</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayoutProxyBoxes">
+        <item>
+         <widget class="QLineEdit" name="proxyAddr">
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="proxyPort">
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
diff --git a/widget/form/settingswidget.cpp b/widget/form/settingswidget.cpp
index 434513004..b7539a4c5 100644
--- a/widget/form/settingswidget.cpp
+++ b/widget/form/settingswidget.cpp
@@ -66,7 +66,7 @@ SettingsWidget::SettingsWidget(Camera* cam, QWidget* parent)
     tabBar->setIconSize(QSize(20, 20));
     tabBar->setShape(QTabBar::RoundedSouth);
 
-    connect(tabBar, SIGNAL(currentChanged(int)), this, SLOT(onTabChanged(int)));
+    connect(tabBar, &QTabBar::currentChanged, this, &SettingsWidget::onTabChanged);
 }
 
 SettingsWidget::~SettingsWidget()
diff --git a/widget/widget.cpp b/widget/widget.cpp
index 283900fdc..ad08389bf 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -124,6 +124,7 @@ Widget::Widget(QWidget *parent)
     connect(core, &Core::connected, this, &Widget::onConnected);
     connect(core, &Core::disconnected, this, &Widget::onDisconnected);
     connect(core, &Core::failedToStart, this, &Widget::onFailedToStartCore);
+    connect(core, &Core::badProxy, this, &Widget::onBadProxyCore);
     connect(core, &Core::statusSet, this, &Widget::onStatusSet);
     connect(core, &Core::usernameSet, this, &Widget::setUsername);
     connect(core, &Core::statusMessageSet, this, &Widget::setStatusMessage);
@@ -283,12 +284,22 @@ void Widget::onDisconnected()
 void Widget::onFailedToStartCore()
 {
     QMessageBox critical(this);
-    critical.setText("Toxcore failed to start, the application will terminate after you close this message.");
+    critical.setText(tr("Toxcore failed to start, the application will terminate after you close this message."));
     critical.setIcon(QMessageBox::Critical);
     critical.exec();
     qApp->quit();
 }
 
+void Widget::onBadProxyCore()
+{
+    QMessageBox critical(this);
+    critical.setText(tr("toxcore failed to start with your proxy settings. qTox cannot run; please modify your "
+               "settings and restart.", "popup text"));
+    critical.setIcon(QMessageBox::Critical);
+    critical.exec();
+    onSettingsClicked();
+}
+
 void Widget::onStatusSet(Status status)
 {
     //We have to use stylesheets here, there's no way to
diff --git a/widget/widget.h b/widget/widget.h
index fa371a9b2..aae819adc 100644
--- a/widget/widget.h
+++ b/widget/widget.h
@@ -77,6 +77,7 @@ private slots:
     void onTransferClicked();
     void onSettingsClicked();
     void onFailedToStartCore();
+    void onBadProxyCore();
     void onAvatarClicked();
     void onSelfAvatarLoaded(const QPixmap &pic);
     void onUsernameChanged(const QString& newUsername, const QString& oldUsername);

From dc73d5658a9605c934dbdd87facc554bd9ea0913 Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Sun, 5 Oct 2014 16:03:22 -0500
Subject: [PATCH 189/205] add tooltip

---
 widget/form/settings/generalsettings.ui | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/widget/form/settings/generalsettings.ui b/widget/form/settings/generalsettings.ui
index 0015d1787..7057866a8 100644
--- a/widget/form/settings/generalsettings.ui
+++ b/widget/form/settings/generalsettings.ui
@@ -86,6 +86,9 @@
         <property name="text">
          <string extracomment="Text on checkbox to disable UDP">Disable UDP (not recommended)</string>
         </property>
+        <property name="toolTip">
+         <string extracomment="force tcp checkbox tooltip">This allows, e.g., toxing over Tor. It adds load to the Tox network however, so use only when necessary.</string>
+        </property>
        </widget>
       </item>
       <item>

From b898e55b75d6d45c10bcaf21f1836ef43c3aa6b1 Mon Sep 17 00:00:00 2001
From: Ilya87 <yast4ik@yahoo.com>
Date: Tue, 7 Oct 2014 00:52:22 +0400
Subject: [PATCH 190/205] Update Russian translation

---
 translations/ru.qm | Bin 6581 -> 9681 bytes
 translations/ru.ts | 501 ++++++++++++++++++++++-----------------------
 2 files changed, 242 insertions(+), 259 deletions(-)

diff --git a/translations/ru.qm b/translations/ru.qm
index 50ef1c79f7626d2a63376a1e2b030909131555d6..f3d7a3e2aaf52ae9705de7a7fee08a57647cba6a 100644
GIT binary patch
literal 9681
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
C0VT!&

delta 1440
zcmZ`%ZERCz6h5~-x8L7uyRmj~*K89Kbc3yKHMDR?wd=rafeiyhO<C`@+O92Yr!JT@
zL`kNokiEhtYXS-52Qvss(L^B81k`0&W(>IK50%73eyH(>Gk#_2X$y4)_v7BvzV|%m
z`FPLgJKk$PZq2L*;P(UAJ%De#O7%8i_B=qP7WfV~fO#z_qk{m}H=*Tk1W+x2=j&zw
zT`h<s3;>^mju$)tHaT=YdIG@m1MK^ea0VMpE#CsDsDabZ^3*>fL-9lE^U93R_0jo^
z+`g0p$N<QLjz0m^KKb0l5dcmm|6=?XA~ND=HcfRLCxh1rcmyZM-lD<37OTmKr#$rE
zG=%RQ<7nV0UUcjQ(7ub;>Xraxcks8V?*QN=U;pqo0LJ-ZwNLY{oo8uIJHK_Xj`%q*
zFEu?*j$8QGwbLZzZGPtHb#k8N-=Drk^5%=x{29MEON17gB3k_s5icqdI>PZ;MZ(_;
zpxCG6s_471SE;F=Ac8Z><DdRPi5^hS-FcZ3>{fAyUm;;Zwf^7&%@3-_vOVOV`$T=C
z;|hQ#s$M*Qjt1UVf2$`4nyZ?RF9*r_lIHi5Efn?lTK7$=@*!PdJrP=~bg8Gvq3UVf
z&ktP%(9i3`my(o#Nq=K@3*oNlXI(c*a645>6axCWDZ;70GB_JubS1L}=j7%v0s0Ni
zr=KAQGlpGBMu680yN+HYLNM%h(g5X`hD-gIiSUC6#S~&2vDvX(N~a_7fs~TwD#ShA
zp#h1L({C4AS*^mBJBD7K?brBob-D$fU8p$V(gvisG#rYRTI+Bvis(fjZl?DRbdT3t
z*?f(f?X=o-E4$f2YrwMdpulv7U9cT8w_qD?LpMH#?KEf`wy{Qge>wV`-J5v;twI-}
zwqTQrM1z7JzGqMxlJb5YXnq6*+)i3WqVZuDwvyUFL9+)065u6rH<A14?Lo0L($t%h
zg!FJIUX_Z4(vd{G5ZB7_xlL;}aV#k`<+`d}9J}sVqt^w)Qal|=kLH77KRKSb@5JwH
zxbNhUv%yh@D&%8D3pQZ~2<))aR-@gU7#S9N5-$otf8JwRf3CacB^hfFIs+D5mk*JG
zag(by^0l+%h8L5`*k~SXxOe;hNGO&VD9}}-i89JxhmR;ltjuV|k#Ho@xF-^p604zf
zv;*yT+5Wo<#r9CVPl~MuGL<ck58Wk+%DX$3M^^s7N(cMPQJYcS3wbpTB#!FRTv=Ci
zwZ<wmQ&z3C7h5Ur;y#OIxhcDcBhQEWRwkz!NEM@FQQ-uesNG;0BgJ|%x4c37k5z`t
I8#NXG0(b9ISpWb4

diff --git a/translations/ru.ts b/translations/ru.ts
index 56c4aaebf..274e26a7c 100644
--- a/translations/ru.ts
+++ b/translations/ru.ts
@@ -1,25 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="ru_RU">
+<TS version="2.0" language="ru_RU">
 <context>
-    <name>AVPage</name>
+    <name>AVForm</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="132"/>
-        <source>Video Settings</source>
+        <location filename="../widget/form/settings/avform.cpp" line="22"/>
+        <source>Audio/Video settings</source>
+        <translation>Настройки аудио/видео</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/avform.cpp" line="41"/>
+        <source>Hide video preview</source>
+        <comment>On a button</comment>
+        <translation>Спрятать видео-превью</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/avform.cpp" line="47"/>
+        <source>Show video preview</source>
+        <comment>On a button</comment>
+        <translation>Посмотреть видео-превью</translation>
+    </message>
+</context>
+<context>
+    <name>AVSettings</name>
+    <message>
+        <location filename="../widget/form/settings/avsettings.ui" line="14"/>
+        <location filename="../ui_avsettings.h" line="65"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/avsettings.ui" line="20"/>
+        <location filename="../ui_avsettings.h" line="66"/>
+        <source>Video settings</source>
         <translation>Настройки видео</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="136"/>
-        <location filename="../widget/settingsdialog.cpp" line="163"/>
+        <location filename="../widget/form/settings/avsettings.ui" line="26"/>
+        <location filename="../ui_avsettings.h" line="67"/>
         <source>Show video preview</source>
-        <comment>On a button</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widget/settingsdialog.cpp" line="157"/>
-        <source>Hide video preview</source>
-        <comment>On a button</comment>
-        <translation type="unfinished"></translation>
+        <translation>Посмотреть видео-превью</translation>
     </message>
 </context>
 <context>
@@ -27,7 +47,7 @@
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="34"/>
         <source>Add Friends</source>
-        <translation>Добавление друзей</translation>
+        <translation>Добавить друзей</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="37"/>
@@ -64,12 +84,7 @@
         <location filename="../widget/form/addfriendform.cpp" line="99"/>
         <source>You can&apos;t add yourself as a friend!</source>
         <comment>When trying to add your own Tox ID as friend</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You can&apos;t add yourself as a friend !</source>
-        <comment>When trying to add your own Tox ID as friend</comment>
-        <translation type="vanished">Нельзя добавить самого себя в друзья!</translation>
+        <translation>Вы не можете добавить себя как друга!</translation>
     </message>
     <message>
         <location filename="../widget/form/addfriendform.cpp" line="116"/>
@@ -109,75 +124,50 @@
         <translation>Ответ DNS не содержит корректных Tox ID</translation>
     </message>
 </context>
-<context>
-    <name>Camera</name>
-    <message>
-        <source>Camera eror</source>
-        <translation type="obsolete">Ошибка камеры</translation>
-    </message>
-    <message>
-        <source>Camera format %1 not supported, can&apos;t use the camera</source>
-        <translation type="obsolete">Формат камеры %1 не поддерживается, невозможно использовать камеру</translation>
-    </message>
-</context>
 <context>
     <name>ChatForm</name>
     <message>
-        <location filename="../widget/form/chatform.cpp" line="80"/>
+        <location filename="../widget/form/chatform.cpp" line="105"/>
         <source>Send a file</source>
         <translation>Отправить файл</translation>
     </message>
-    <message>
-        <source>Save chat log</source>
-        <translation type="obsolete">Сохранить лог чата</translation>
-    </message>
 </context>
 <context>
-    <name>CopyableElideLabel</name>
+    <name>Core</name>
     <message>
-        <source>Copy</source>
-        <translation type="obsolete">Копировать</translation>
+        <location filename="../core.cpp" line="1064"/>
+        <source>Encrypted profile</source>
+        <translation>Зашифрованный профиль</translation>
+    </message>
+    <message>
+        <location filename="../core.cpp" line="1065"/>
+        <source>Your tox profile seems to be encrypted, qTox can&apos;t open it
+Do you want to erase this profile ?</source>
+        <translation>Похоже, ваш tox-профиль зашифрован, qTox не может открыть его
+Вы хотите удалить этот профиль?</translation>
     </message>
 </context>
 <context>
     <name>FileTransferInstance</name>
     <message>
-        <location filename="../filetransferinstance.cpp" line="191"/>
+        <location filename="../filetransferinstance.cpp" line="208"/>
         <source>Save a file</source>
         <comment>Title of the file saving dialog</comment>
         <translation>Сохранить файл</translation>
     </message>
     <message>
-        <location filename="../filetransferinstance.cpp" line="202"/>
+        <location filename="../filetransferinstance.cpp" line="219"/>
         <source>Location not writable</source>
         <comment>Title of permissions popup</comment>
         <translation>Непригодная для записи локация</translation>
     </message>
     <message>
-        <location filename="../filetransferinstance.cpp" line="202"/>
+        <location filename="../filetransferinstance.cpp" line="219"/>
         <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
         <comment>text of permissions popup</comment>
         <translation>У вас нет прав записи в эту локацию. Выберете другую или закройте диалог сохранения.</translation>
     </message>
 </context>
-<context>
-    <name>FileTransfertWidget</name>
-    <message>
-        <source>Save a file</source>
-        <comment>Title of the file saving dialog</comment>
-        <translation type="obsolete">Сохранить файл</translation>
-    </message>
-    <message>
-        <source>Location not writable</source>
-        <comment>Title of permissions popup</comment>
-        <translation type="obsolete">Непригодная для записи локация</translation>
-    </message>
-    <message>
-        <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
-        <comment>text of permissions popup</comment>
-        <translation type="obsolete">У вас нет прав записи в эту локацию. Выберете другую или закройте диалог сохранения.</translation>
-    </message>
-</context>
 <context>
     <name>FilesForm</name>
     <message>
@@ -238,71 +228,138 @@
 <context>
     <name>FriendWidget</name>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="84"/>
+        <location filename="../widget/friendwidget.cpp" line="48"/>
         <source>Copy friend ID</source>
         <comment>Menu to copy the Tox ID of that friend</comment>
         <translation>Копировать ID друга</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="85"/>
+        <location filename="../widget/friendwidget.cpp" line="49"/>
         <source>Invite in group</source>
         <comment>Menu to invite a friend in a groupchat</comment>
         <translation>Пригласить в группу</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="95"/>
+        <location filename="../widget/friendwidget.cpp" line="59"/>
         <source>Remove friend</source>
         <comment>Menu to remove the friend from our friendlist</comment>
         <translation>Удалить друга</translation>
     </message>
 </context>
 <context>
-    <name>GeneralPage</name>
+    <name>GeneralForm</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="31"/>
+        <location filename="../widget/form/settings/generalform.cpp" line="26"/>
         <source>General Settings</source>
-        <translation>Основные настройки</translation>
+        <translation>Общие настройки</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="34"/>
+        <location filename="../widget/form/settings/generalform.cpp" line="100"/>
+        <source>Bad port</source>
+        <comment>title of bad port popup</comment>
+        <translation>Неправильный порт</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalform.cpp" line="100"/>
+        <source>The port you entered is invalid; please enter another.</source>
+        <comment>text of bad port popup</comment>
+        <translation>Введёный порт неверен; введите другой.</translation>
+    </message>
+</context>
+<context>
+    <name>GeneralSettings</name>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="14"/>
+        <location filename="../ui_generalsettings.h" line="154"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="29"/>
+        <location filename="../ui_generalsettings.h" line="155"/>
+        <source>General Settings</source>
+        <translation>Общие настройки</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="35"/>
+        <location filename="../ui_generalsettings.h" line="156"/>
         <source>Enable IPv6 (recommended)</source>
-        <comment>Text on a checkbox to enable IPv6</comment>
+        <extracomment>Text on a checkbox to enable IPv6</extracomment>
         <translation>Включить IPv6 (рекомендуется)</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="36"/>
+        <location filename="../widget/form/settings/generalsettings.ui" line="42"/>
+        <location filename="../ui_generalsettings.h" line="157"/>
         <source>Use translations</source>
-        <comment>Text on a checkbox to enable translations</comment>
-        <translation>Русскоязычный интерфейс</translation>
+        <extracomment>Text on a checkbox to enable translations</extracomment>
+        <translation>Использовать перевод</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="38"/>
+        <location filename="../widget/form/settings/generalsettings.ui" line="49"/>
+        <location filename="../ui_generalsettings.h" line="159"/>
+        <source>Save settings to the working directory instead of the usual conf dir</source>
+        <extracomment>describes makeToxPortable checkbox</extracomment>
+        <translation>Сохранять настройки в рабочую директорию вместо страндартной папки настроек</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="52"/>
+        <location filename="../ui_generalsettings.h" line="161"/>
         <source>Make Tox portable</source>
-        <comment>Text on a checkbox to make qTox a portable application</comment>
         <translation>Портативный режим</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="39"/>
-        <source>Save settings to the working directory instead of the usual conf dir</source>
-        <comment>describes makeToxPortable checkbox</comment>
-        <translation>Сохранять настройки в рабочую директорию вместо страндартной директории настроек</translation>
-    </message>
-    <message>
-        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <location filename="../widget/form/settings/generalsettings.ui" line="62"/>
+        <location filename="../ui_generalsettings.h" line="162"/>
         <source>Theme</source>
         <translation>Тема</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="49"/>
+        <location filename="../widget/form/settings/generalsettings.ui" line="68"/>
+        <location filename="../ui_generalsettings.h" line="163"/>
         <source>Smiley Pack</source>
+        <extracomment>Text on smiley pack label</extracomment>
         <translation>Набор смайликов</translation>
     </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="81"/>
+        <location filename="../ui_generalsettings.h" line="164"/>
+        <source>Proxy settings</source>
+        <translation>Настройки прокси</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="87"/>
+        <location filename="../ui_generalsettings.h" line="165"/>
+        <source>Disable UDP (not recommended)</source>
+        <extracomment>Text on checkbox to disable UDP</extracomment>
+        <translation>Выключить UDP (не рекомендуется)</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="90"/>
+        <location filename="../ui_generalsettings.h" line="167"/>
+        <source>This allows, e.g., toxing over Tor. It adds load to the Tox network however, so use only when necessary.</source>
+        <extracomment>force tcp checkbox tooltip</extracomment>
+        <translation>Это позволяет, например, использовать tox поверх Tor. Однако это добавляет нагрузку на сеть Tox, так что используйте только в случае необходимости.</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="99"/>
+        <location filename="../ui_generalsettings.h" line="169"/>
+        <source>Proxy address</source>
+        <extracomment>Text on proxy addr label</extracomment>
+        <translation>Адрес прокси</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="106"/>
+        <location filename="../ui_generalsettings.h" line="170"/>
+        <source>Proxy port</source>
+        <extracomment>Text on proxy port label</extracomment>
+        <translation>Порт прокси</translation>
+    </message>
 </context>
 <context>
     <name>GenericChatForm</name>
     <message>
-        <location filename="../widget/form/genericchatform.cpp" line="142"/>
-        <location filename="../widget/form/genericchatform.cpp" line="148"/>
+        <location filename="../widget/form/genericchatform.cpp" line="149"/>
+        <location filename="../widget/form/genericchatform.cpp" line="155"/>
         <source>Save chat log</source>
         <translation>Сохранить лог чата</translation>
     </message>
@@ -310,125 +367,150 @@
 <context>
     <name>GroupChatForm</name>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="41"/>
+        <location filename="../widget/form/groupchatform.cpp" line="47"/>
         <source>%1 users in chat</source>
         <comment>Number of users in chat</comment>
         <translation>%1 пользователей в чате</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="83"/>
-        <source>&lt;Unknown&gt;</source>
-        <translation>&lt;Неизвестно&gt;</translation>
-    </message>
-    <message>
-        <location filename="../widget/form/groupchatform.cpp" line="90"/>
+        <location filename="../widget/form/groupchatform.cpp" line="85"/>
         <source>%1 users in chat</source>
         <translation>%1 пользователей в чате</translation>
     </message>
-    <message>
-        <source>Save chat log</source>
-        <translation type="obsolete">Сохранить лог чата</translation>
-    </message>
 </context>
 <context>
     <name>GroupWidget</name>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="83"/>
+        <location filename="../widget/groupwidget.cpp" line="48"/>
         <source>Quit group</source>
         <comment>Menu to quit a groupchat</comment>
         <translation>Покинуть группу</translation>
     </message>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="58"/>
-        <location filename="../widget/groupwidget.cpp" line="100"/>
+        <location filename="../widget/groupwidget.cpp" line="39"/>
+        <location filename="../widget/groupwidget.cpp" line="59"/>
         <source>%1 users in chat</source>
         <translation>%1 пользователей в чате</translation>
     </message>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="60"/>
-        <location filename="../widget/groupwidget.cpp" line="102"/>
+        <location filename="../widget/groupwidget.cpp" line="41"/>
+        <location filename="../widget/groupwidget.cpp" line="61"/>
         <source>0 users in chat</source>
         <translation>Ни одного пользователя в чате</translation>
     </message>
 </context>
 <context>
-    <name>IdentityPage</name>
+    <name>IdentityForm</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="82"/>
+        <location filename="../widget/form/settings/identityform.cpp" line="29"/>
+        <source>Your identity</source>
+        <translation>Ваша идентификация</translation>
+    </message>
+</context>
+<context>
+    <name>IdentitySettings</name>
+    <message>
+        <location filename="../widget/form/settings/identitysettings.ui" line="14"/>
+        <location filename="../ui_identitysettings.h" line="100"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/identitysettings.ui" line="20"/>
+        <location filename="../ui_identitysettings.h" line="101"/>
         <source>Public Information</source>
         <translation>Публичные данные</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <location filename="../widget/form/settings/identitysettings.ui" line="26"/>
+        <location filename="../ui_identitysettings.h" line="102"/>
         <source>Name</source>
-        <comment>Username/nick</comment>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="85"/>
+        <location filename="../widget/form/settings/identitysettings.ui" line="36"/>
+        <location filename="../ui_identitysettings.h" line="103"/>
         <source>Status</source>
-        <comment>Status message</comment>
         <translation>Статус</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="95"/>
+        <location filename="../widget/form/settings/identitysettings.ui" line="49"/>
+        <location filename="../ui_identitysettings.h" line="104"/>
         <source>Tox ID</source>
         <translation>Tox ID</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="96"/>
-        <source>Your Tox ID</source>
-        <translation>Ваш Tox ID</translation>
+        <location filename="../widget/form/settings/identitysettings.ui" line="55"/>
+        <location filename="../ui_identitysettings.h" line="105"/>
+        <source>Your Tox ID (click to copy)</source>
+        <translation>Ваш Tox ID (нажмите на него, чтобы скопировать)</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <location filename="../mainwindow.ui" line="20"/>
+        <location filename="../ui_mainwindow.h" line="492"/>
         <source>qTox</source>
         <translation>qTox</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1918"/>
+        <location filename="../mainwindow.ui" line="859"/>
+        <location filename="../ui_mainwindow.h" line="495"/>
         <source>Your name</source>
         <translation>Ваше имя</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2000"/>
+        <location filename="../mainwindow.ui" line="941"/>
+        <location filename="../ui_mainwindow.h" line="496"/>
         <source>Your status</source>
         <translation>Ваш статус</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2566"/>
+        <location filename="../mainwindow.ui" line="1089"/>
+        <location filename="../ui_mainwindow.h" line="499"/>
         <source>Add friends</source>
         <translation>Добавить друзей</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2592"/>
+        <location filename="../mainwindow.ui" line="1115"/>
+        <location filename="../ui_mainwindow.h" line="503"/>
         <source>Create a group chat</source>
         <translation>Создать групповой чат</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2624"/>
+        <location filename="../mainwindow.ui" line="1147"/>
+        <location filename="../ui_mainwindow.h" line="507"/>
         <source>View completed file transfers</source>
         <translation>Завершённые файлопередачи</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2656"/>
+        <location filename="../mainwindow.ui" line="1179"/>
+        <location filename="../ui_mainwindow.h" line="511"/>
         <source>Change your settings</source>
         <translation>Изменить ваши настройки</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3238"/>
+        <location filename="../mainwindow.ui" line="1761"/>
+        <location filename="../ui_mainwindow.h" line="493"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3241"/>
+        <location filename="../mainwindow.ui" line="1764"/>
+        <location filename="../ui_mainwindow.h" line="494"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
 </context>
+<context>
+    <name>PrivacyForm</name>
+    <message>
+        <location filename="../widget/form/settings/privacyform.cpp" line="21"/>
+        <source>Privacy settings</source>
+        <translation>Настройки приватности</translation>
+    </message>
+</context>
 <context>
     <name>SelfCamView</name>
     <message>
@@ -438,166 +520,67 @@
         <translation>Проверка видео</translation>
     </message>
 </context>
-<context>
-    <name>SettingsDialog</name>
-    <message>
-        <source>Settings Dialog</source>
-        <translation type="vanished">Диалог настроек</translation>
-    </message>
-    <message>
-        <location filename="../widget/settingsdialog.cpp" line="197"/>
-        <source>qTox – Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widget/settingsdialog.cpp" line="224"/>
-        <source>General</source>
-        <translation>Основное</translation>
-    </message>
-    <message>
-        <location filename="../widget/settingsdialog.cpp" line="230"/>
-        <source>Identity</source>
-        <translation>Личные данные</translation>
-    </message>
-    <message>
-        <location filename="../widget/settingsdialog.cpp" line="236"/>
-        <source>Privacy</source>
-        <translation>Безопасность</translation>
-    </message>
-    <message>
-        <location filename="../widget/settingsdialog.cpp" line="242"/>
-        <source>Audio/Video</source>
-        <translation>Аудио и видео</translation>
-    </message>
-    <message>
-        <location filename="../widget/settingsdialog.cpp" line="251"/>
-        <source>Ok</source>
-        <translation>ОК</translation>
-    </message>
-    <message>
-        <location filename="../widget/settingsdialog.cpp" line="252"/>
-        <source>Cancel</source>
-        <translation>Отмена</translation>
-    </message>
-    <message>
-        <location filename="../widget/settingsdialog.cpp" line="253"/>
-        <source>Apply</source>
-        <translation>Применить</translation>
-    </message>
-</context>
-<context>
-    <name>SettingsForm</name>
-    <message>
-        <source>User Settings</source>
-        <comment>&quot;Headline&quot; of the window</comment>
-        <translation type="obsolete">Пользовательские настройки</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <comment>Username/nick</comment>
-        <translation type="obsolete">Имя</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <comment>Status message</comment>
-        <translation type="obsolete">Статус</translation>
-    </message>
-    <message>
-        <source>(click here to copy)</source>
-        <comment>Click on this text to copy TID to clipboard</comment>
-        <translation type="obsolete">(нажмите здесь чтобы скопировать)</translation>
-    </message>
-    <message>
-        <source>Test video</source>
-        <comment>Text on a button to test the video/webcam</comment>
-        <translation type="obsolete">Проверить видео</translation>
-    </message>
-    <message>
-        <source>Enable IPv6 (recommended)</source>
-        <comment>Text on a checkbox to enable IPv6</comment>
-        <translation type="obsolete">Включить IPv6 (рекомендуется)</translation>
-    </message>
-    <message>
-        <source>Use translations</source>
-        <comment>Text on a checkbox to enable translations</comment>
-        <translatorcomment>Так гораздо понятнее, чем «использовать переводы»</translatorcomment>
-        <translation type="obsolete">Русскоязычный интерфейс</translation>
-    </message>
-    <message>
-        <source>Make Tox portable</source>
-        <comment>Text on a checkbox to make qTox a portable application</comment>
-        <translation type="obsolete">Портативный режим</translation>
-    </message>
-    <message>
-        <source>Save settings to the working directory instead of the usual conf dir</source>
-        <comment>describes makeToxPortable checkbox</comment>
-        <translation type="obsolete">Сохранять настройки в рабочую директорию вместо страндартной директории настроек</translation>
-    </message>
-    <message>
-        <source>Smiley Pack</source>
-        <comment>Text on smiley pack label</comment>
-        <translation type="obsolete">Набор смайликов</translation>
-    </message>
-</context>
 <context>
     <name>Widget</name>
     <message>
-        <source>Tox</source>
-        <translation type="obsolete">Tox</translation>
-    </message>
-    <message>
-        <source>Your name</source>
-        <translation type="obsolete">Ваше имя</translation>
-    </message>
-    <message>
-        <source>Your status</source>
-        <translation type="obsolete">Ваш статус</translation>
-    </message>
-    <message>
-        <source>Add friends</source>
-        <translation type="obsolete">Добавить друзей</translation>
-    </message>
-    <message>
-        <source>Create a group chat</source>
-        <translation type="obsolete">Создать групповой чат</translation>
-    </message>
-    <message>
-        <source>(button inactive currently)</source>
-        <translation type="obsolete">(кнопка на данный момент неактивна)</translation>
-    </message>
-    <message>
-        <source>Change your settings</source>
-        <translation type="obsolete">Изменить ваши настройки</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="obsolete">Закрыть</translation>
-    </message>
-    <message>
-        <source>Ctrl+Q</source>
-        <translation type="obsolete">Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../widget/widget.cpp" line="133"/>
+        <location filename="../widget/widget.cpp" line="88"/>
         <source>Online</source>
         <comment>Button to set your status to &apos;Online&apos;</comment>
         <translation>В сети</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="135"/>
+        <location filename="../widget/widget.cpp" line="90"/>
         <source>Away</source>
         <comment>Button to set your status to &apos;Away&apos;</comment>
         <translatorcomment>Вероятно, это не столь долгое путешествие</translatorcomment>
         <translation>Отошёл</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="137"/>
+        <location filename="../widget/widget.cpp" line="92"/>
         <source>Busy</source>
         <comment>Button to set your status to &apos;Busy&apos;</comment>
         <translation>Занят</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="605"/>
+        <location filename="../widget/widget.cpp" line="225"/>
+        <source>Choose a profile picture</source>
+        <translation>Выбрать картинку для профиля</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="232"/>
+        <location filename="../widget/widget.cpp" line="239"/>
+        <location filename="../widget/widget.cpp" line="260"/>
+        <source>Error</source>
+        <translation>Ошибка</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="232"/>
+        <source>Unable to open this file</source>
+        <translation>Невозможно открыть файл</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="239"/>
+        <source>Unable to read this image</source>
+        <translation>Невозможно прочесть это изображение</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="260"/>
+        <source>This image is too big</source>
+        <translation>Это изображение слишком большое</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="287"/>
+        <source>Toxcore failed to start, the application will terminate after you close this message.</source>
+        <translation>Не удалось запустить toxcore, приложение будет завершено после того как вы закроете это сообщение.</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="296"/>
+        <source>toxcore failed to start with your proxy settings. qTox cannot run; please modify your settings and restart.</source>
+        <comment>popup text</comment>
+        <translation>Не удалось запустить toxcore с вашими настройками прокси, qTox не может работать; измените ваши настройки и перезапустите его.</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="611"/>
         <source>&lt;Unknown&gt;</source>
         <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
         <translation>&lt;Неизвестно&gt;</translation>

From ddf7a7edfd897f0731a0fbf31af718e09fd601f3 Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Tue, 7 Oct 2014 11:09:15 +0900
Subject: [PATCH 191/205] added "Use Proxy" checkbox

---
 core.cpp                                | 46 ++++++++++++++-----------
 misc/settings.cpp                       | 11 ++++++
 misc/settings.h                         |  5 +++
 widget/form/settings/generalform.cpp    | 32 ++++++++++-------
 widget/form/settings/generalform.h      |  3 +-
 widget/form/settings/generalsettings.ui | 44 +++++++++++++----------
 6 files changed, 89 insertions(+), 52 deletions(-)

diff --git a/core.cpp b/core.cpp
index ea83116b8..dd8445dee 100644
--- a/core.cpp
+++ b/core.cpp
@@ -122,8 +122,9 @@ void Core::start()
     // IPv6 needed for LAN discovery, but can crash some weird routers. On by default, can be disabled in options.
     bool enableIPv6 = Settings::getInstance().getEnableIPv6();
     bool forceTCP = Settings::getInstance().getForceTCP();
-    QString proxyAddr = Settings::getInstance().getProxyAddr();
-    int proxyPort = Settings::getInstance().getProxyPort();
+
+    bool useProxy = Settings::getInstance().getUseProxy();
+
     if (enableIPv6)
         qDebug() << "Core starting with IPv6 enabled";
     else
@@ -132,26 +133,29 @@ void Core::start()
     Tox_Options toxOptions;
     toxOptions.ipv6enabled = enableIPv6;
     toxOptions.udp_disabled = forceTCP;
-    if (proxyAddr.length() > 255)
+
+    // No proxy by default
+    toxOptions.proxy_enabled = false;
+    toxOptions.proxy_address[0] = 0;
+    toxOptions.proxy_port = 0;
+
+    if (useProxy)
     {
-        qWarning() << "Core: proxy address" << proxyAddr << "is too long";
-        toxOptions.proxy_enabled = false;
-        toxOptions.proxy_address[0] = 0;
-        toxOptions.proxy_port = 0;
-    }
-    else if (proxyAddr != "" && proxyPort > 0)
-    {
-        qDebug() << "Core: using proxy" << proxyAddr << ":" << proxyPort;
-        toxOptions.proxy_enabled = true;
-        uint16_t sz = CString::fromString(proxyAddr, (unsigned char*)toxOptions.proxy_address);
-        toxOptions.proxy_address[sz] = 0;
-        toxOptions.proxy_port = proxyPort;
-    }
-    else
-    {
-        toxOptions.proxy_enabled = false;
-        toxOptions.proxy_address[0] = 0;
-        toxOptions.proxy_port = 0;
+        QString proxyAddr = Settings::getInstance().getProxyAddr();
+        int proxyPort = Settings::getInstance().getProxyPort();
+
+        if (proxyAddr.length() > 255)
+        {
+            qWarning() << "Core: proxy address" << proxyAddr << "is too long";
+        }
+        else if (proxyAddr != "" && proxyPort > 0)
+        {
+            qDebug() << "Core: using proxy" << proxyAddr << ":" << proxyPort;
+            toxOptions.proxy_enabled = true;
+            uint16_t sz = CString::fromString(proxyAddr, (unsigned char*)toxOptions.proxy_address);
+            toxOptions.proxy_address[sz] = 0;
+            toxOptions.proxy_port = proxyPort;
+        }
     }
 
     tox = tox_new(&toxOptions);
diff --git a/misc/settings.cpp b/misc/settings.cpp
index b3af2144d..8e4df9f02 100644
--- a/misc/settings.cpp
+++ b/misc/settings.cpp
@@ -141,6 +141,7 @@ void Settings::load()
     s.beginGroup("Privacy");
         typingNotification = s.value("typingNotification", false).toBool();
         forceTCP = s.value("forceTCP", false).toBool();
+        useProxy = s.value("useProxy", false).toBool();
         proxyAddr = s.value("proxyAddr", "").toString();
         proxyPort = s.value("proxyPort", 0).toInt();
     s.endGroup();
@@ -242,6 +243,7 @@ void Settings::save(QString path)
 
     s.beginGroup("Privacy");
         s.setValue("typingNotification", typingNotification);
+        s.setValue("useProxy", useProxy);
         s.setValue("forceTCP", forceTCP);
         s.setValue("proxyAddr", proxyAddr);
         s.setValue("proxyPort", proxyPort);
@@ -367,6 +369,15 @@ void Settings::setForceTCP(bool newValue)
     forceTCP = newValue;
 }
 
+bool Settings::getUseProxy() const
+{
+    return useProxy;
+}
+void Settings::setUseProxy(bool newValue)
+{
+    useProxy = newValue;
+}
+
 QString Settings::getProxyAddr() const
 {
     return proxyAddr;
diff --git a/misc/settings.h b/misc/settings.h
index 82f6e3872..7c43987d6 100644
--- a/misc/settings.h
+++ b/misc/settings.h
@@ -58,6 +58,9 @@ public:
     QString getProxyAddr() const;
     void setProxyAddr(const QString& newValue);
 
+    bool getUseProxy() const;
+    void setUseProxy(bool newValue);
+
     int getProxyPort() const;
     void setProxyPort(int newValue);
 
@@ -164,6 +167,8 @@ private:
     static bool makeToxPortable;
     
     bool forceTCP;
+
+    bool useProxy;
     QString proxyAddr;
     int proxyPort;
 
diff --git a/widget/form/settings/generalform.cpp b/widget/form/settings/generalform.cpp
index e998a9f5f..b8138874e 100644
--- a/widget/form/settings/generalform.cpp
+++ b/widget/form/settings/generalform.cpp
@@ -42,7 +42,10 @@ GeneralForm::GeneralForm() :
     bodyUI->proxyAddr->setText(Settings::getInstance().getProxyAddr());
     int port = Settings::getInstance().getProxyPort();
     if (port != -1)
-        bodyUI->proxyPort->setText(QString::number(port));
+        bodyUI->proxyPort->setValue(port);
+
+    bodyUI->cbUseProxy->setChecked(Settings::getInstance().getUseProxy());
+    onUseProxyUpdated();
     
     connect(bodyUI->cbEnableIPv6, &QCheckBox::stateChanged, this, &GeneralForm::onEnableIPv6Updated);
     connect(bodyUI->cbUseTranslations, &QCheckBox::stateChanged, this, &GeneralForm::onUseTranslationUpdated);
@@ -51,7 +54,8 @@ GeneralForm::GeneralForm() :
     // new syntax can't handle overloaded signals... (at least not in a pretty way)
     connect(bodyUI->cbUDPDisabled, &QCheckBox::stateChanged, this, &GeneralForm::onUDPUpdated);
     connect(bodyUI->proxyAddr, &QLineEdit::editingFinished, this, &GeneralForm::onProxyAddrEdited);
-    connect(bodyUI->proxyPort, &QLineEdit::editingFinished, this, &GeneralForm::onProxyPortEdited);
+    connect(bodyUI->proxyPort, SIGNAL(valueChanged(int)), this, SLOT(onProxyPortEdited(int)));
+    connect(bodyUI->cbUseProxy, &QCheckBox::stateChanged, this, &GeneralForm::onUseProxyUpdated);
 }
 
 GeneralForm::~GeneralForm()
@@ -90,17 +94,21 @@ void GeneralForm::onProxyAddrEdited()
     Settings::getInstance().setProxyAddr(bodyUI->proxyAddr->text());
 }
 
-void GeneralForm::onProxyPortEdited()
+void GeneralForm::onProxyPortEdited(int port)
 {
-    QString text = bodyUI->proxyPort->text();
-    if (text != "")
+    if (port > 0)
     {
-        int port = text.toInt();
-        if (port < 1)
-            QMessageBox::warning(bodyUI->proxyPort, tr("Bad port", "title of bad port popup"), tr("The port you entered is invalid; please enter another.", "text of bad port popup"));
-        else
-            Settings::getInstance().setProxyPort(port);
-    }
-    else
+        Settings::getInstance().setProxyPort(port);
+    } else {
         Settings::getInstance().setProxyPort(-1);
+    }
+}
+
+void GeneralForm::onUseProxyUpdated()
+{
+    bool state = bodyUI->cbUseProxy->isChecked();
+
+    bodyUI->proxyAddr->setEnabled(state);
+    bodyUI->proxyPort->setEnabled(state);
+    Settings::getInstance().setUseProxy(state);
 }
diff --git a/widget/form/settings/generalform.h b/widget/form/settings/generalform.h
index 2af8f4bb6..ddfde9522 100644
--- a/widget/form/settings/generalform.h
+++ b/widget/form/settings/generalform.h
@@ -39,7 +39,8 @@ private slots:
     void onSmileyBrowserIndexChanged(int index);
     void onUDPUpdated();
     void onProxyAddrEdited();
-    void onProxyPortEdited();
+    void onProxyPortEdited(int port);
+    void onUseProxyUpdated();
 
 private:
     Ui::GeneralSettings *bodyUI;
diff --git a/widget/form/settings/generalsettings.ui b/widget/form/settings/generalsettings.ui
index 7057866a8..fff913ef4 100644
--- a/widget/form/settings/generalsettings.ui
+++ b/widget/form/settings/generalsettings.ui
@@ -15,13 +15,13 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <property name="leftMargin">
-    <number>15</number>
+    <number>6</number>
    </property>
    <property name="topMargin">
-    <number>15</number>
+    <number>6</number>
    </property>
    <property name="rightMargin">
-    <number>15</number>
+    <number>6</number>
    </property>
    <item>
     <widget class="QGroupBox" name="generalGroup">
@@ -83,40 +83,48 @@
      <layout class="QVBoxLayout" name="verticalLayoutProxy">
       <item>
        <widget class="QCheckBox" name="cbUDPDisabled">
-        <property name="text">
-         <string extracomment="Text on checkbox to disable UDP">Disable UDP (not recommended)</string>
-        </property>
         <property name="toolTip">
          <string extracomment="force tcp checkbox tooltip">This allows, e.g., toxing over Tor. It adds load to the Tox network however, so use only when necessary.</string>
         </property>
+        <property name="text">
+         <string extracomment="Text on checkbox to disable UDP">Disable UDP (not recommended)</string>
+        </property>
        </widget>
       </item>
       <item>
-       <layout class="QHBoxLayout" name="horizontalLayoutProxyLabel">
+       <widget class="QCheckBox" name="cbUseProxy">
+        <property name="text">
+         <string>Use proxy (SOCKS5)</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="proxyLayout">
         <item>
          <widget class="QLabel" name="proxyAddrLabel">
           <property name="text">
-           <string extracomment="Text on proxy addr label">Proxy address</string>
+           <string extracomment="Text on proxy addr label">Address</string>
           </property>
          </widget>
         </item>
+        <item>
+         <widget class="QLineEdit" name="proxyAddr"/>
+        </item>
         <item>
          <widget class="QLabel" name="proxyPortLabel">
           <property name="text">
-           <string extracomment="Text on proxy port label">Proxy port</string>
+           <string extracomment="Text on proxy port label">Port</string>
           </property>
          </widget>
         </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayoutProxyBoxes">
         <item>
-         <widget class="QLineEdit" name="proxyAddr">
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="proxyPort">
+         <widget class="QSpinBox" name="proxyPort">
+          <property name="minimum">
+           <number>0</number>
+          </property>
+          <property name="maximum">
+           <number>65535</number>
+          </property>
          </widget>
         </item>
        </layout>

From f5c619465675dc4ff0ec35c734a4aed5069dd442 Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Tue, 7 Oct 2014 11:11:40 +0900
Subject: [PATCH 192/205] Introduced "Connection Settings" group in
 GeneralSettings widget

---
 widget/form/settings/generalsettings.ui | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/widget/form/settings/generalsettings.ui b/widget/form/settings/generalsettings.ui
index fff913ef4..653f15204 100644
--- a/widget/form/settings/generalsettings.ui
+++ b/widget/form/settings/generalsettings.ui
@@ -29,13 +29,6 @@
       <string>General Settings</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_3">
-      <item>
-       <widget class="QCheckBox" name="cbEnableIPv6">
-        <property name="text">
-         <string extracomment="Text on a checkbox to enable IPv6">Enable IPv6 (recommended)</string>
-        </property>
-       </widget>
-      </item>
       <item>
        <widget class="QCheckBox" name="cbUseTranslations">
         <property name="text">
@@ -76,11 +69,18 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="proxyGroup">
+    <widget class="QGroupBox" name="connectionGroup">
      <property name="title">
-      <string>Proxy settings</string>
+      <string>Connection Settings</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayoutProxy">
+      <item>
+       <widget class="QCheckBox" name="cbEnableIPv6">
+        <property name="text">
+         <string extracomment="Text on a checkbox to enable IPv6">Enable IPv6 (recommended)</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QCheckBox" name="cbUDPDisabled">
         <property name="toolTip">

From 443ee0a4f864bb5862c1536aecf50616013ef518 Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Tue, 7 Oct 2014 11:16:06 +0900
Subject: [PATCH 193/205] Proxy settings is more close to General group in
 settings.ini than to Privacy

---
 misc/settings.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/misc/settings.cpp b/misc/settings.cpp
index 8e4df9f02..545684272 100644
--- a/misc/settings.cpp
+++ b/misc/settings.cpp
@@ -110,6 +110,10 @@ void Settings::load()
         enableIPv6 = s.value("enableIPv6", true).toBool();
         useTranslations = s.value("useTranslations", true).toBool();
         makeToxPortable = s.value("makeToxPortable", false).toBool();
+        forceTCP = s.value("forceTCP", false).toBool();
+        useProxy = s.value("useProxy", false).toBool();
+        proxyAddr = s.value("proxyAddr", "").toString();
+        proxyPort = s.value("proxyPort", 0).toInt();
     s.endGroup();
 
     s.beginGroup("Widgets");
@@ -140,10 +144,6 @@ void Settings::load()
 
     s.beginGroup("Privacy");
         typingNotification = s.value("typingNotification", false).toBool();
-        forceTCP = s.value("forceTCP", false).toBool();
-        useProxy = s.value("useProxy", false).toBool();
-        proxyAddr = s.value("proxyAddr", "").toString();
-        proxyPort = s.value("proxyPort", 0).toInt();
     s.endGroup();
 
     // try to set a smiley pack if none is selected
@@ -213,6 +213,10 @@ void Settings::save(QString path)
         s.setValue("enableIPv6", enableIPv6);
         s.setValue("useTranslations",useTranslations);
         s.setValue("makeToxPortable",makeToxPortable);
+        s.setValue("useProxy", useProxy);
+        s.setValue("forceTCP", forceTCP);
+        s.setValue("proxyAddr", proxyAddr);
+        s.setValue("proxyPort", proxyPort);
     s.endGroup();
 
     s.beginGroup("Widgets");
@@ -243,10 +247,6 @@ void Settings::save(QString path)
 
     s.beginGroup("Privacy");
         s.setValue("typingNotification", typingNotification);
-        s.setValue("useProxy", useProxy);
-        s.setValue("forceTCP", forceTCP);
-        s.setValue("proxyAddr", proxyAddr);
-        s.setValue("proxyPort", proxyPort);
     s.endGroup();
 }
 

From 1fdc98873bbb29a041ec5bf591e6899a37ea3f24 Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Tue, 7 Oct 2014 16:12:05 +0900
Subject: [PATCH 194/205] reimplemented insert chat line function: every line
 in own table

---
 widget/chatareawidget.cpp | 59 ++++++++++++++++++++++++---------------
 widget/chatareawidget.h   |  3 +-
 2 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/widget/chatareawidget.cpp b/widget/chatareawidget.cpp
index d3d326b63..c2d4e1a81 100644
--- a/widget/chatareawidget.cpp
+++ b/widget/chatareawidget.cpp
@@ -26,6 +26,7 @@
 ChatAreaWidget::ChatAreaWidget(QWidget *parent)
     : QTextBrowser(parent)
     , nameWidth(75)
+    , tableFrmt(nullptr)
 {
     setReadOnly(true);
     viewport()->setCursor(Qt::ArrowCursor);
@@ -37,15 +38,6 @@ ChatAreaWidget::ChatAreaWidget(QWidget *parent)
     setAcceptRichText(false);
     setFrameStyle(QFrame::NoFrame);
 
-    QTextTableFormat tableFormat;
-    tableFormat.setCellSpacing(5);
-    tableFormat.setBorderStyle(QTextFrameFormat::BorderStyle_None);
-    tableFormat.setColumnWidthConstraints({QTextLength(QTextLength::FixedLength,nameWidth),
-                                           QTextLength(QTextLength::PercentageLength,100),
-                                           QTextLength(QTextLength::VariableLength,0)});
-
-    chatTextTable = textCursor().insertTable(1,3,tableFormat);
-
     nameFormat.setAlignment(Qt::AlignRight);
     nameFormat.setNonBreakableLines(true);
     dateFormat.setAlignment(Qt::AlignLeft);
@@ -60,6 +52,9 @@ ChatAreaWidget::~ChatAreaWidget()
     for (ChatAction* action : messages)
         delete action;
     messages.clear();
+
+    if (tableFrmt)
+        delete tableFrmt;
 }
 
 void ChatAreaWidget::mouseReleaseEvent(QMouseEvent * event)
@@ -108,16 +103,15 @@ void ChatAreaWidget::insertMessage(ChatAction *msgAction)
 
     checkSlider();
 
-    int row = chatTextTable->rows() - 1;
-    QTextCursor cur = chatTextTable->cellAt(row,1).firstCursorPosition();
+    QTextTable *chatTextTable = getMsgTable();
+    QTextCursor cur = chatTextTable->cellAt(0, 1).firstCursorPosition();
     cur.clearSelection();
     cur.setKeepPositionOnInsert(true);
-    chatTextTable->appendRows(1);
-    chatTextTable->cellAt(row,0).firstCursorPosition().setBlockFormat(nameFormat);
-    chatTextTable->cellAt(row,0).firstCursorPosition().insertHtml(msgAction->getName());
-    chatTextTable->cellAt(row,1).firstCursorPosition().insertHtml(msgAction->getMessage());
-    chatTextTable->cellAt(row,2).firstCursorPosition().setBlockFormat(dateFormat);
-    chatTextTable->cellAt(row,2).firstCursorPosition().insertHtml(msgAction->getDate());
+    chatTextTable->cellAt(0, 0).firstCursorPosition().setBlockFormat(nameFormat);
+    chatTextTable->cellAt(0, 0).firstCursorPosition().insertHtml(msgAction->getName());
+    chatTextTable->cellAt(0, 2).firstCursorPosition().insertHtml(msgAction->getMessage());
+    chatTextTable->cellAt(0, 4).firstCursorPosition().setBlockFormat(dateFormat);
+    chatTextTable->cellAt(0, 4).firstCursorPosition().insertHtml(msgAction->getDate());
 
     msgAction->setup(cur, this);
 
@@ -137,13 +131,32 @@ void ChatAreaWidget::checkSlider()
     lockSliderToBottom = scroll && scroll->value() == scroll->maximum();
 }
 
+QTextTable *ChatAreaWidget::getMsgTable()
+{
+    if (tableFrmt == nullptr)
+    {
+        tableFrmt = new QTextTableFormat();
+        tableFrmt->setCellSpacing(2);
+        tableFrmt->setBorderStyle(QTextFrameFormat::BorderStyle_None);
+        tableFrmt->setColumnWidthConstraints({QTextLength(QTextLength::FixedLength,nameWidth),
+                                              QTextLength(QTextLength::FixedLength,2),
+                                              QTextLength(QTextLength::PercentageLength,100),
+                                              QTextLength(QTextLength::FixedLength,2),
+                                              QTextLength(QTextLength::VariableLength,0)});
+    }
+
+    QTextTable *chatTextTable = textCursor().insertTable(1, 5, *tableFrmt);
+
+    return chatTextTable;
+}
+
 void ChatAreaWidget::setNameColWidth(int w)
 {
-    nameWidth = w;
+    if (tableFrmt != nullptr)
+    {
+        delete tableFrmt;
+        tableFrmt = nullptr;
+    }
 
-    QTextTableFormat tableFormat = chatTextTable->format();
-    tableFormat.setColumnWidthConstraints({QTextLength(QTextLength::FixedLength, 100),
-                                           QTextLength(QTextLength::PercentageLength, 100),
-                                           QTextLength(QTextLength::FixedLength, 40)});
-    chatTextTable->setFormat(tableFormat);
+    nameWidth = w;
 }
diff --git a/widget/chatareawidget.h b/widget/chatareawidget.h
index 05d41de4e..d1e2dbe8f 100644
--- a/widget/chatareawidget.h
+++ b/widget/chatareawidget.h
@@ -46,12 +46,13 @@ private slots:
 
 private:
     void checkSlider();
+    QTextTable* getMsgTable();
 
+    QTextTableFormat* tableFrmt;
     QList<ChatAction*> messages;
     bool lockSliderToBottom;
     int sliderPosition;
     int nameWidth;
-    QTextTable *chatTextTable;
     QTextBlockFormat nameFormat, dateFormat;
 };
 

From 7a7076eb192d16f03a9c2efa0eb614b81d35155e Mon Sep 17 00:00:00 2001
From: Ansa89 <ansalonistefano@gmail.com>
Date: Tue, 7 Oct 2014 11:06:54 +0200
Subject: [PATCH 195/205] Italian translation: update

---
 translations/it.qm | Bin 7641 -> 9978 bytes
 translations/it.ts | 313 +++++++++++++++++++++++++++------------------
 2 files changed, 190 insertions(+), 123 deletions(-)

diff --git a/translations/it.qm b/translations/it.qm
index 179823b08a782188749dffc9c18478eb15acdf03..a0899636248de8e86218d7e41c0bb5feb7b326b1 100644
GIT binary patch
delta 3620
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
TWmN1o;uE?XIDiT-3k3cTAOnBX

delta 1483
zcmZ`%du&s66#i~|Z*OlOcaN^6uSqw?=07|XkTj4$<6tchJ4c0}2CeIL>(=!}I~e~I
zgM{fcY+jMQk|oMW27e6gVxp305XZ8Zso6#(#0Si%7!qP!RLD?IJ89O1<(KC4o^!tM
zob#P?Z}+uLoh7L#z&!^n`wi@yuL0&6u>C`Tr4XEZ15o@C_~u5y<i+}bSU__O&hOR%
z`kQbiWx}3-`;e33quBApDWIemyLw(C{0N@CP56S_=(|5f{&5VvzyacBOuRl#@huA0
z^(l}t%_$0+>H(uiAyrLM13Q(b*))K6l^)wYDtJRVe)>4TTvATI^#>q~vYt^YWR0<H
z{RxWKu-%@EG{9E2yZvpT@XL8y^flY-r0?Q#_WVhP_|5FFZ9g@hWG`0C0?Hotuf7?i
zz-;AKuKFG*>X^6YL2l!Y_lU^CZE38a!uL68?KbN8NA3;n89>{_o$L4<Fl^&KJTnEb
zm*%aZmAg7d1r0;0X6t8EIHro|2*-O>k?Lp2UgsGz#fu!gX60$(Z{a(y+)dHM27dgP
zV<e%VW?p#}P+U_Vo#JUiy`Yax5Yf+qvG)d``ao#!_fb45Ty}p9=++8XhX#qbOZY)Q
zOWz6M-#8VteyjOn#6ya_ulf6(^@J0(8z#xJUR}+j)QIsb-NAh`q+E&aPF3m?+R?B+
zaDnbXH?6-swwZv3^ke0;3d0?;BsqT9kM|K!dseisDW@Ht67AgqlCnx%H*f$@uMq2^
zGVOSiSl2O3h5i)x*a<J36fe9yLW3O<Z&h6(o~H|XZe=WjfX%I>KNTXjLqZ%a@WX+q
zd|c^}UsPJmwf+W)$!5TXR(io)f>V<VR?1PMjoBx6DGgR}Z!jQ59DAfhA{cHsNCHCT
z+M7vDpI`@7>GQguIC-Mvd7ZXK3QKW+C=-&Kj8Ek|#*Dl39O++8B9rHlRp!T>3rVtl
zs^OzSXbg2`Ko$KsU!&9_W%^i{EYDfod30%?bp<0IDSKQF*yiNxcAH-32}t2YFwvIn
zkT0!U<Y_9cSmYTftz4dm%C=;M2O&~5fg~bw7r(4jyFZeQJA9GD4o`Kau{=zA`y-tS
zd3D*YjUs6tr57UA>laSsibg|i8KC$;=IWq76lutoGs$-q%TrocG7yZc$u485%nW~+
zUXm(=7VxW{^oQ%E&{D8M)R4sC?7jF2DCMN)|6eH&%fovUQ7gyn#+3Sjv`f`s;l<7z
zufp5BR3b6b*#_w{{iIP_4#L;QgRTDhhpSXf(p4fxrxL+o+RQ3A=z`6wbLgU2W;r*H
Z%6WIZNbPj8>>EZtP%+836Q6=%{sR@-dwl=^

diff --git a/translations/it.ts b/translations/it.ts
index 96f3de1de..3740103da 100644
--- a/translations/it.ts
+++ b/translations/it.ts
@@ -2,24 +2,41 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="it_IT">
 <context>
-    <name>AVPage</name>
+    <name>AVForm</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="132"/>
-        <source>Video Settings</source>
-        <translation>Impostazioni Webcam</translation>
+        <location filename="../widget/form/settings/avform.cpp" line="22"/>
+        <source>Audio/Video settings</source>
+        <translation>Impostazioni Audio/Video</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="136"/>
-        <location filename="../widget/settingsdialog.cpp" line="163"/>
-        <source>Show video preview</source>
-        <comment>On a button</comment>
-        <translation>Avvia prova webcam</translation>
-    </message>
-    <message>
-        <location filename="../widget/settingsdialog.cpp" line="157"/>
+        <location filename="../widget/form/settings/avform.cpp" line="41"/>
         <source>Hide video preview</source>
         <comment>On a button</comment>
-        <translation>Ferma prova webcam</translation>
+        <translation>Ferma webcam</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/avform.cpp" line="47"/>
+        <source>Show video preview</source>
+        <comment>On a button</comment>
+        <translation>Prova webcam</translation>
+    </message>
+</context>
+<context>
+    <name>AVSettings</name>
+    <message>
+        <location filename="../widget/form/settings/avsettings.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/avsettings.ui" line="20"/>
+        <source>Video settings</source>
+        <translation>Impostazioni Video</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/avsettings.ui" line="26"/>
+        <source>Show video preview</source>
+        <translation>Prova webcam</translation>
     </message>
 </context>
 <context>
@@ -105,27 +122,41 @@
 <context>
     <name>ChatForm</name>
     <message>
-        <location filename="../widget/form/chatform.cpp" line="86"/>
+        <location filename="../widget/form/chatform.cpp" line="105"/>
         <source>Send a file</source>
         <translation>Invia un file</translation>
     </message>
 </context>
+<context>
+    <name>Core</name>
+    <message>
+        <location filename="../core.cpp" line="1064"/>
+        <source>Encrypted profile</source>
+        <translation>Profilo criptato</translation>
+    </message>
+    <message>
+        <location filename="../core.cpp" line="1065"/>
+        <source>Your tox profile seems to be encrypted, qTox can&apos;t open it
+Do you want to erase this profile ?</source>
+        <translation>Il tuo profilo Tox sembra essere criptato, qTox non può aprirlo\nVuoi eliminare questo profilo?</translation>
+    </message>
+</context>
 <context>
     <name>FileTransferInstance</name>
     <message>
-        <location filename="../filetransferinstance.cpp" line="193"/>
+        <location filename="../filetransferinstance.cpp" line="208"/>
         <source>Save a file</source>
         <comment>Title of the file saving dialog</comment>
         <translation>Salva file</translation>
     </message>
     <message>
-        <location filename="../filetransferinstance.cpp" line="204"/>
+        <location filename="../filetransferinstance.cpp" line="219"/>
         <source>Location not writable</source>
         <comment>Title of permissions popup</comment>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="../filetransferinstance.cpp" line="204"/>
+        <location filename="../filetransferinstance.cpp" line="219"/>
         <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
         <comment>text of permissions popup</comment>
         <translation>Non hai sufficienti permessi per scrivere in questa locazione. Scegli un&apos;altra posizione, o annulla il salvataggio.</translation>
@@ -189,71 +220,125 @@
 <context>
     <name>FriendWidget</name>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="87"/>
+        <location filename="../widget/friendwidget.cpp" line="48"/>
         <source>Copy friend ID</source>
         <comment>Menu to copy the Tox ID of that friend</comment>
         <translation>Copia Tox ID del contatto</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="88"/>
+        <location filename="../widget/friendwidget.cpp" line="49"/>
         <source>Invite in group</source>
         <comment>Menu to invite a friend in a groupchat</comment>
         <translation>Invita nel gruppo</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="98"/>
+        <location filename="../widget/friendwidget.cpp" line="59"/>
         <source>Remove friend</source>
         <comment>Menu to remove the friend from our friendlist</comment>
         <translation>Rimuovi contatto</translation>
     </message>
 </context>
 <context>
-    <name>GeneralPage</name>
+    <name>GeneralForm</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="31"/>
+        <location filename="../widget/form/settings/generalform.cpp" line="26"/>
         <source>General Settings</source>
         <translation>Impostazioni Generali</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="34"/>
+        <location filename="../widget/form/settings/generalform.cpp" line="100"/>
+        <source>Bad port</source>
+        <comment>title of bad port popup</comment>
+        <translation>Numero porta errato</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalform.cpp" line="100"/>
+        <source>The port you entered is invalid; please enter another.</source>
+        <comment>text of bad port popup</comment>
+        <translation>Il numero della porta che hai inserito è invalido; per favore inseriscine un altro.</translation>
+    </message>
+</context>
+<context>
+    <name>GeneralSettings</name>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="29"/>
+        <source>General Settings</source>
+        <translation>Impostazioni Generali</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="35"/>
         <source>Enable IPv6 (recommended)</source>
-        <comment>Text on a checkbox to enable IPv6</comment>
+        <extracomment>Text on a checkbox to enable IPv6</extracomment>
         <translation>Abilita IPv6 (consigliato)</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="36"/>
+        <location filename="../widget/form/settings/generalsettings.ui" line="42"/>
         <source>Use translations</source>
-        <comment>Text on a checkbox to enable translations</comment>
+        <extracomment>Text on a checkbox to enable translations</extracomment>
         <translation>Abilita traduzioni</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="38"/>
-        <source>Make Tox portable</source>
-        <comment>Text on a checkbox to make qTox a portable application</comment>
-        <translation>Rendi qTox portabile</translation>
-    </message>
-    <message>
-        <location filename="../widget/settingsdialog.cpp" line="39"/>
+        <location filename="../widget/form/settings/generalsettings.ui" line="49"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
-        <comment>describes makeToxPortable checkbox</comment>
+        <extracomment>describes makeToxPortable checkbox</extracomment>
         <translation>Slava le impostazioni nella directory di lavoro corrente, invece della directory di default</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="48"/>
-        <source>Theme</source>
-        <translation>Tema</translation>
+        <location filename="../widget/form/settings/generalsettings.ui" line="52"/>
+        <source>Make Tox portable</source>
+        <translation>Rendi qTox portabile</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="49"/>
+        <location filename="../widget/form/settings/generalsettings.ui" line="62"/>
+        <source>Theme</source>
+        <translation>Impostazioni tema</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="68"/>
         <source>Smiley Pack</source>
+        <extracomment>Text on smiley pack label</extracomment>
         <translation>Emoticons</translation>
     </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="81"/>
+        <source>Proxy settings</source>
+        <translation>Impostazioni proxy</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="87"/>
+        <source>Disable UDP (not recommended)</source>
+        <extracomment>Text on checkbox to disable UDP</extracomment>
+        <translation>Disabilita connessioni UDP (non raccomandato)</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="90"/>
+        <source>This allows, e.g., toxing over Tor. It adds load to the Tox network however, so use only when necessary.</source>
+        <extracomment>force tcp checkbox tooltip</extracomment>
+        <translation>Questo permette di usare qTox con Tor; tuttavia aggiunge carico alla rete Tox, quindi usalo solo se necessario.</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="99"/>
+        <source>Proxy address</source>
+        <extracomment>Text on proxy addr label</extracomment>
+        <translation>IP</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="106"/>
+        <source>Proxy port</source>
+        <extracomment>Text on proxy port label</extracomment>
+        <translation>Porta</translation>
+    </message>
 </context>
 <context>
     <name>GenericChatForm</name>
     <message>
-        <location filename="../widget/form/genericchatform.cpp" line="143"/>
         <location filename="../widget/form/genericchatform.cpp" line="149"/>
+        <location filename="../widget/form/genericchatform.cpp" line="155"/>
         <source>Save chat log</source>
         <translation>Salva il log della chat</translation>
     </message>
@@ -261,18 +346,13 @@
 <context>
     <name>GroupChatForm</name>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="44"/>
+        <location filename="../widget/form/groupchatform.cpp" line="47"/>
         <source>%1 users in chat</source>
         <comment>Number of users in chat</comment>
         <translation>%1 utenti in chat</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="83"/>
-        <source>&lt;Unknown&gt;</source>
-        <translation>&lt;Sconosciuto&gt;</translation>
-    </message>
-    <message>
-        <location filename="../widget/form/groupchatform.cpp" line="90"/>
+        <location filename="../widget/form/groupchatform.cpp" line="85"/>
         <source>%1 users in chat</source>
         <translation>%1 utenti in chat</translation>
     </message>
@@ -280,52 +360,63 @@
 <context>
     <name>GroupWidget</name>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="58"/>
-        <location filename="../widget/groupwidget.cpp" line="100"/>
+        <location filename="../widget/groupwidget.cpp" line="39"/>
+        <location filename="../widget/groupwidget.cpp" line="59"/>
         <source>%1 users in chat</source>
         <translation>%1 utenti in chat</translation>
     </message>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="60"/>
-        <location filename="../widget/groupwidget.cpp" line="102"/>
+        <location filename="../widget/groupwidget.cpp" line="41"/>
+        <location filename="../widget/groupwidget.cpp" line="61"/>
         <source>0 users in chat</source>
         <translation>0 utenti in chat</translation>
     </message>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="83"/>
+        <location filename="../widget/groupwidget.cpp" line="48"/>
         <source>Quit group</source>
         <comment>Menu to quit a groupchat</comment>
         <translation>Esci dal gruppo</translation>
     </message>
 </context>
 <context>
-    <name>IdentityPage</name>
+    <name>IdentityForm</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="82"/>
+        <location filename="../widget/form/settings/identityform.cpp" line="29"/>
+        <source>Your identity</source>
+        <translation>Il tuo profilo</translation>
+    </message>
+</context>
+<context>
+    <name>IdentitySettings</name>
+    <message>
+        <location filename="../widget/form/settings/identitysettings.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/identitysettings.ui" line="20"/>
         <source>Public Information</source>
         <translation>Informazioni Pubbliche</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <location filename="../widget/form/settings/identitysettings.ui" line="26"/>
         <source>Name</source>
-        <comment>Username/nick</comment>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="85"/>
+        <location filename="../widget/form/settings/identitysettings.ui" line="36"/>
         <source>Status</source>
-        <comment>Status message</comment>
         <translation>Stato</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="95"/>
+        <location filename="../widget/form/settings/identitysettings.ui" line="49"/>
         <source>Tox ID</source>
         <translation>Tox ID</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="96"/>
-        <source>Your Tox ID</source>
-        <translation>Il tuo Tox ID</translation>
+        <location filename="../widget/form/settings/identitysettings.ui" line="55"/>
+        <source>Your Tox ID (click to copy)</source>
+        <translation>(clicca qui per copiare)</translation>
     </message>
 </context>
 <context>
@@ -336,46 +427,54 @@
         <translation>qTox</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1921"/>
+        <location filename="../mainwindow.ui" line="859"/>
         <source>Your name</source>
         <translation>qTox User</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2003"/>
+        <location filename="../mainwindow.ui" line="941"/>
         <source>Your status</source>
         <translation>Toxing on qTox</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2569"/>
+        <location filename="../mainwindow.ui" line="1089"/>
         <source>Add friends</source>
         <translation>Aggiungi contatto</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2595"/>
+        <location filename="../mainwindow.ui" line="1115"/>
         <source>Create a group chat</source>
         <translation>Crea un gruppo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2627"/>
+        <location filename="../mainwindow.ui" line="1147"/>
         <source>View completed file transfers</source>
         <translation>Visualizza i trasferimenti completati</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2659"/>
+        <location filename="../mainwindow.ui" line="1179"/>
         <source>Change your settings</source>
         <translation>Cambia le impostazioni</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3241"/>
+        <location filename="../mainwindow.ui" line="1761"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3244"/>
+        <location filename="../mainwindow.ui" line="1764"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
 </context>
+<context>
+    <name>PrivacyForm</name>
+    <message>
+        <location filename="../widget/form/settings/privacyform.cpp" line="21"/>
+        <source>Privacy settings</source>
+        <translation>Impostazioni privacy</translation>
+    </message>
+</context>
 <context>
     <name>SelfCamView</name>
     <message>
@@ -385,98 +484,66 @@
         <translation>qTox video test</translation>
     </message>
 </context>
-<context>
-    <name>SettingsDialog</name>
-    <message>
-        <location filename="../widget/settingsdialog.cpp" line="197"/>
-        <source>qTox – Settings</source>
-        <translation>qTox - Impostazioni</translation>
-    </message>
-    <message>
-        <location filename="../widget/settingsdialog.cpp" line="224"/>
-        <source>General</source>
-        <translation>Generale</translation>
-    </message>
-    <message>
-        <location filename="../widget/settingsdialog.cpp" line="230"/>
-        <source>Identity</source>
-        <translation>Profilo</translation>
-    </message>
-    <message>
-        <location filename="../widget/settingsdialog.cpp" line="236"/>
-        <source>Privacy</source>
-        <translation>Privacy</translation>
-    </message>
-    <message>
-        <location filename="../widget/settingsdialog.cpp" line="242"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../widget/settingsdialog.cpp" line="251"/>
-        <source>Ok</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../widget/settingsdialog.cpp" line="252"/>
-        <source>Cancel</source>
-        <translation>Annulla</translation>
-    </message>
-    <message>
-        <location filename="../widget/settingsdialog.cpp" line="253"/>
-        <source>Apply</source>
-        <translation>Applica</translation>
-    </message>
-</context>
 <context>
     <name>Widget</name>
     <message>
-        <location filename="../widget/widget.cpp" line="135"/>
+        <location filename="../widget/widget.cpp" line="88"/>
         <source>Online</source>
         <comment>Button to set your status to &apos;Online&apos;</comment>
         <translation>Online</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="137"/>
+        <location filename="../widget/widget.cpp" line="90"/>
         <source>Away</source>
         <comment>Button to set your status to &apos;Away&apos;</comment>
         <translation>Assente</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="139"/>
+        <location filename="../widget/widget.cpp" line="92"/>
         <source>Busy</source>
         <comment>Button to set your status to &apos;Busy&apos;</comment>
         <translation>Occupato</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="281"/>
+        <location filename="../widget/widget.cpp" line="225"/>
         <source>Choose a profile picture</source>
         <translation>Scegli un&apos;immagine per il profilo</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="288"/>
-        <location filename="../widget/widget.cpp" line="295"/>
-        <location filename="../widget/widget.cpp" line="316"/>
+        <location filename="../widget/widget.cpp" line="232"/>
+        <location filename="../widget/widget.cpp" line="239"/>
+        <location filename="../widget/widget.cpp" line="260"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="288"/>
+        <location filename="../widget/widget.cpp" line="232"/>
         <source>Unable to open this file</source>
         <translation>Impossibile aprire il file</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="295"/>
+        <location filename="../widget/widget.cpp" line="239"/>
         <source>Unable to read this image</source>
         <translation>Impossibile leggere l&apos;immagine</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="316"/>
+        <location filename="../widget/widget.cpp" line="260"/>
         <source>This image is too big</source>
         <translation>L&apos;immagine è troppo grande</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="672"/>
+        <location filename="../widget/widget.cpp" line="287"/>
+        <source>Toxcore failed to start, the application will terminate after you close this message.</source>
+        <translation>Impossibile avviare Toxcore.\nqTox terminerà dopo che avrai chiuso questo messaggio.</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="296"/>
+        <source>toxcore failed to start with your proxy settings. qTox cannot run; please modify your settings and restart.</source>
+        <comment>popup text</comment>
+        <translation>Impossibile avviare Toxcore con le tue impostazione proxy.\nqTox non può funzionare correttamente, per favore modifica le impostazioni e riavvia il programma.</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="611"/>
         <source>&lt;Unknown&gt;</source>
         <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
         <translation>&lt;Sconosciuto&gt;</translation>

From 57c7734c48f080a25c2b40ec2c477e3660bbc16a Mon Sep 17 00:00:00 2001
From: apprb <apprb@users.noreply.github.com>
Date: Tue, 7 Oct 2014 19:20:53 +0900
Subject: [PATCH 196/205] bug in file transfer widget displaying fix

---
 widget/chatareawidget.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/widget/chatareawidget.cpp b/widget/chatareawidget.cpp
index c2d4e1a81..2ce9fc267 100644
--- a/widget/chatareawidget.cpp
+++ b/widget/chatareawidget.cpp
@@ -25,8 +25,8 @@
 
 ChatAreaWidget::ChatAreaWidget(QWidget *parent)
     : QTextBrowser(parent)
-    , nameWidth(75)
     , tableFrmt(nullptr)
+    , nameWidth(75)
 {
     setReadOnly(true);
     viewport()->setCursor(Qt::ArrowCursor);
@@ -104,7 +104,7 @@ void ChatAreaWidget::insertMessage(ChatAction *msgAction)
     checkSlider();
 
     QTextTable *chatTextTable = getMsgTable();
-    QTextCursor cur = chatTextTable->cellAt(0, 1).firstCursorPosition();
+    QTextCursor cur = chatTextTable->cellAt(0, 2).firstCursorPosition();
     cur.clearSelection();
     cur.setKeepPositionOnInsert(true);
     chatTextTable->cellAt(0, 0).firstCursorPosition().setBlockFormat(nameFormat);
@@ -145,7 +145,9 @@ QTextTable *ChatAreaWidget::getMsgTable()
                                               QTextLength(QTextLength::VariableLength,0)});
     }
 
-    QTextTable *chatTextTable = textCursor().insertTable(1, 5, *tableFrmt);
+    QTextCursor tc = textCursor();
+    tc.movePosition(QTextCursor::End);
+    QTextTable *chatTextTable = tc.insertTable(1, 5, *tableFrmt);
 
     return chatTextTable;
 }

From 938325bd2adb2d406004777c595d92d8b824e98f Mon Sep 17 00:00:00 2001
From: Ansa89 <ansalonistefano@gmail.com>
Date: Tue, 7 Oct 2014 14:54:58 +0200
Subject: [PATCH 197/205] Italian translation: update

---
 translations/it.qm | Bin 9978 -> 9735 bytes
 translations/it.ts |  69 ++++++++++++++++++++-------------------------
 2 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/translations/it.qm b/translations/it.qm
index a0899636248de8e86218d7e41c0bb5feb7b326b1..ace34002bc8dd7b4c0a410d0ea70ce2a3a976cd7 100644
GIT binary patch
delta 828
zcmX|9Ye*DP7(JsiJKOHetgGwlx?67MYXeL0QC48GM!r(fEDB6gH#Ec9)Iy2a%Akiz
z*5q3dNraMoun|!~f=Hp^A2o<l$bQs<wLf}TlF^q7av9Eicg}atch8;GL)UUz4X!6(
zTW$cGy<mIq16wR$-?RYm_)!1QhoK+9Wh4QnKyc^p0)d_2t11A?5)%Kifbaq-3kiU3
z%!m2~q@7a$RXVbg+W>PMa=J=Me;mh`NylJA&)OWY-CT^m5{?A-Vlu0i1`#oHbDoIV
z@V@>^#5zCS=`s>{e|s|8Wo=^{dh5upk?p)rV;H?Y3>jv-Q>YFFJ9LX7_7FQ_J_hLb
zvCkvF1MCrYrRO8StZ`9si{vuK?aI1G{kyr;ib%lkDd&hkK(5PNvvvRw2e}7L6Lj1`
z?(x7Jz`54345oLgs<3e~%2UY#HK+xZoL&TILU<;W1_-h9ny3yEZsmuX$uL06PbB^z
zUM@fNsgd&PRWp~b0{-plOLIIBZc-1<Qf|N|@$3v4+Ld`G*=7Bsxij$=2wv29e%i>c
zL-VUWk>Z@zvKf^?SfDm(mTFEA%u^I|z#idXERA6)6>5)?t&lHxW1ay)pT+V~CtZtP
zbhl8NThEBEB4(-o3gI`(V_2N(p+0d*vh0kYTbPn8o#iNou1rekJ3;3vkqVq-5H=$f
zG>wp<TPn1WfOc9MJ@tr!bV#0<mo)x>4;h25S*HIepkLSJ`M+PH8|%-db6%vWx9#w!
zop{9=Y<92uwdoW&I8%uZ(g(1}M82B7K}8RrrtCL{GwVE?9WttEIZ#Wha=mhFP=oAp
zb+x0cu2Qa6hJqv935FF$DKQ#2Hear(Q}jlY`-|}c!yI;3hITWlMI><&Rya{ZLiK2%
p_gEAn4|Ze|Cc(BL9avQBusUnx`UY!kVV*s^Fv+&A$AtYB{sD@C(MkXS

delta 1108
zcmZ8fZEO>D9DZ)xwOxC?vaWUOR^XW9#Sa_m#taf;G$>;kOM|=wKCqnYVJls)Ub{)d
zhk}@Z!lKK`U@r+8mnA~NTaC#8BMAxykeF;}B+*3qfQ!b7f)JCb&t1)e=5qh%{=b*!
z`Td^U-u6G&z8xx@huHT9F#iU`kq>|cZirv?0hlUbP%B~NDx}usKx78)?FnGs7YHw%
z56s<+=D$Qh{sb$&Z2|&+moV6mr(U&y%62@{Lv*b|TgyQpT8;L>7pZd$TYe_r<KZ-h
zXC|3w#gR@42u|a(wk!qi<Jz0oS=fT<tG@u@@v^|nU97v*|MB9&!d+s1BuCjj;^BSo
z097|iSUo5Xt>C@-C-K-@0;>na6SbRxieJTZ^>+Yqqj+!lCLqj6iyFS;+9T2vZSS-H
zVd?2aJy3Q=(jR?}s$WY7e4~JWOgg&%0#MU0eKa}=NCgKAsJSRz-#CZ+jk~tjoTo2O
zx(u0(9@%BA+5mW~+(NZINTb`k=nw^Vx?eIw^yifOLi1hLb+|9z+QT*XdW7At19JvE
zyC&U$Dtg8y=p#_>f8`p58_UB(-ve%=eBa1=)-{xW+Iq(NMyM++yyczx;}J@~=Dk1A
zOpCAh#MUHRW_-&hc$Z{(^-_*9Z>^l&bdz4i<mn}6>12aHelo*RD*VMhI$O8N|9Ra6
zP}@!Xo!%VxUmj+k{|6<ytPThTl<46&>${YuBU`yzr?M_%A%@y<W!?T06e=n&L`mSg
zqMY3JAx(`bQ%f#!h0ziUp}+xy|5n9@z~Gb}?+l!JuY<cL0;iYVp@+LUb$!H=E7js}
zWd{Rm7NY|_=!Omx22^Btn#e)pw;eP2m4o52ZF2GTJgddkjA7<zAbhL!v~Fst=MA&l
zIv(n<z6@3r#;^t{cBlWt8z)<ekInm_Mi&yys5~_!iAnZl9p$90%gB%aMtfP2Vm{93
zO2#rym5ObQ_c~MCJjucX1X*-Bgm$8ban+&7Ijc6#uGF$Vp*t(7d80?w(>dML<7zUi
zCeyuIDj8p?W>UJA)k`T=OB=a_ZZ`hk0D-?KwxF1=yem8;(uCNof<I;&JMyY#-3~6W
z(&3QLTMF1dT8~vltR^v9lX1q{f&6TnQmV>Yw?k_2-SAF9$Q7eiLqc(G<evNwJN*@@

diff --git a/translations/it.ts b/translations/it.ts
index 3740103da..114976d15 100644
--- a/translations/it.ts
+++ b/translations/it.ts
@@ -130,12 +130,12 @@
 <context>
     <name>Core</name>
     <message>
-        <location filename="../core.cpp" line="1064"/>
+        <location filename="../core.cpp" line="1068"/>
         <source>Encrypted profile</source>
         <translation>Profilo criptato</translation>
     </message>
     <message>
-        <location filename="../core.cpp" line="1065"/>
+        <location filename="../core.cpp" line="1069"/>
         <source>Your tox profile seems to be encrypted, qTox can&apos;t open it
 Do you want to erase this profile ?</source>
         <translation>Il tuo profilo Tox sembra essere criptato, qTox non può aprirlo\nVuoi eliminare questo profilo?</translation>
@@ -245,18 +245,6 @@ Do you want to erase this profile ?</source>
         <source>General Settings</source>
         <translation>Impostazioni Generali</translation>
     </message>
-    <message>
-        <location filename="../widget/form/settings/generalform.cpp" line="100"/>
-        <source>Bad port</source>
-        <comment>title of bad port popup</comment>
-        <translation>Numero porta errato</translation>
-    </message>
-    <message>
-        <location filename="../widget/form/settings/generalform.cpp" line="100"/>
-        <source>The port you entered is invalid; please enter another.</source>
-        <comment>text of bad port popup</comment>
-        <translation>Il numero della porta che hai inserito è invalido; per favore inseriscine un altro.</translation>
-    </message>
 </context>
 <context>
     <name>GeneralSettings</name>
@@ -271,68 +259,73 @@ Do you want to erase this profile ?</source>
         <translation>Impostazioni Generali</translation>
     </message>
     <message>
-        <location filename="../widget/form/settings/generalsettings.ui" line="35"/>
+        <location filename="../widget/form/settings/generalsettings.ui" line="74"/>
+        <source>Connection Settings</source>
+        <translation>Impostazioni Connessione</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="80"/>
         <source>Enable IPv6 (recommended)</source>
         <extracomment>Text on a checkbox to enable IPv6</extracomment>
         <translation>Abilita IPv6 (consigliato)</translation>
     </message>
     <message>
-        <location filename="../widget/form/settings/generalsettings.ui" line="42"/>
+        <location filename="../widget/form/settings/generalsettings.ui" line="35"/>
         <source>Use translations</source>
         <extracomment>Text on a checkbox to enable translations</extracomment>
         <translation>Abilita traduzioni</translation>
     </message>
     <message>
-        <location filename="../widget/form/settings/generalsettings.ui" line="49"/>
+        <location filename="../widget/form/settings/generalsettings.ui" line="42"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <extracomment>describes makeToxPortable checkbox</extracomment>
         <translation>Slava le impostazioni nella directory di lavoro corrente, invece della directory di default</translation>
     </message>
     <message>
-        <location filename="../widget/form/settings/generalsettings.ui" line="52"/>
+        <location filename="../widget/form/settings/generalsettings.ui" line="45"/>
         <source>Make Tox portable</source>
         <translation>Rendi qTox portabile</translation>
     </message>
     <message>
-        <location filename="../widget/form/settings/generalsettings.ui" line="62"/>
+        <location filename="../widget/form/settings/generalsettings.ui" line="55"/>
         <source>Theme</source>
-        <translation>Impostazioni tema</translation>
+        <translation>Impostazioni Tema</translation>
     </message>
     <message>
-        <location filename="../widget/form/settings/generalsettings.ui" line="68"/>
+        <location filename="../widget/form/settings/generalsettings.ui" line="61"/>
         <source>Smiley Pack</source>
         <extracomment>Text on smiley pack label</extracomment>
         <translation>Emoticons</translation>
     </message>
     <message>
-        <location filename="../widget/form/settings/generalsettings.ui" line="81"/>
-        <source>Proxy settings</source>
-        <translation>Impostazioni proxy</translation>
+        <location filename="../widget/form/settings/generalsettings.ui" line="97"/>
+        <source>Use proxy (SOCKS5)</source>
+        <translation>Usa proxy (SOCKS5)</translation>
     </message>
     <message>
-        <location filename="../widget/form/settings/generalsettings.ui" line="87"/>
+        <location filename="../widget/form/settings/generalsettings.ui" line="106"/>
+        <source>Address</source>
+        <extracomment>Text on proxy addr label</extracomment>
+        <translation>IP</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="116"/>
+        <source>Port</source>
+        <extracomment>Text on proxy port label</extracomment>
+        <translation>Porta</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="90"/>
         <source>Disable UDP (not recommended)</source>
         <extracomment>Text on checkbox to disable UDP</extracomment>
         <translation>Disabilita connessioni UDP (non raccomandato)</translation>
     </message>
     <message>
-        <location filename="../widget/form/settings/generalsettings.ui" line="90"/>
+        <location filename="../widget/form/settings/generalsettings.ui" line="87"/>
         <source>This allows, e.g., toxing over Tor. It adds load to the Tox network however, so use only when necessary.</source>
         <extracomment>force tcp checkbox tooltip</extracomment>
         <translation>Questo permette di usare qTox con Tor; tuttavia aggiunge carico alla rete Tox, quindi usalo solo se necessario.</translation>
     </message>
-    <message>
-        <location filename="../widget/form/settings/generalsettings.ui" line="99"/>
-        <source>Proxy address</source>
-        <extracomment>Text on proxy addr label</extracomment>
-        <translation>IP</translation>
-    </message>
-    <message>
-        <location filename="../widget/form/settings/generalsettings.ui" line="106"/>
-        <source>Proxy port</source>
-        <extracomment>Text on proxy port label</extracomment>
-        <translation>Porta</translation>
-    </message>
 </context>
 <context>
     <name>GenericChatForm</name>

From 32c56cbba4b99711147a8c7f890b23d3ad0b487e Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Tue, 7 Oct 2014 21:21:13 +0200
Subject: [PATCH 198/205] Update french translation

---
 translations/fr.qm | Bin 7085 -> 9699 bytes
 translations/fr.ts | 369 +++++++++++++++++++++++++++++++++++----------
 2 files changed, 286 insertions(+), 83 deletions(-)

diff --git a/translations/fr.qm b/translations/fr.qm
index 278415266881501d4faa330eddeeb5386c01c6cc..ff6462596e1d9c32e0ce42cdd9ba341507bc3a91 100644
GIT binary patch
delta 3891
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
EALos~qyPW_

delta 1427
zcmZ`%ZERCz6n@(K-h2CTd-u_g6;`qfvQ<q87=~ntMjMA)nOSQoTfk(dX)mL$^lKe3
zjj5;$GxGzv>gKk%A2O3k%$Af8g9Ob)S*Gz1+x{uR{lF>FAIvBu7*D&cvB+|BbMAZI
z^E~G{&$){&pY1+n%Qgf2b3oNJ*jsM^&PlM*35vgfZ{7t|4npiY3^;00{|^I9eQ5Y`
zCt$e%Pme~}XVHADf$oQ~_tEzOTO0>(60Yo9jNF~0^G6tao(E(}&pcmJ-JHJcg)m^R
z(W~yOK-T#X=UC1GnBu(Ecc{TUH#^t|=%%^()3*TQ0_z>kP`-%`c`uSsCmZU24=7()
zi4~XFa08ty1$Oow9X0%&O;#Tufj)L|>oUL%u)jtYiSJ3icH2)t#fg>Z?B#dw{TNx4
z{mDOZcq<j$=G7g0fDKmuP4gMR{51dRz}J9vGk^Zf9KeQFqBY1b%uqw?Nug`wSJb#g
zNJxYeDK_p044kNQ(tU*@nra70=zj6kmD?ozH*xmHYc%<yL3iSHK!43>N&S!|f@!0D
z_&Ok*HujGO>EcD><>m{3RBl|D7$@RE<2B1NojXk5obwXVNz>mS)RXmd=3Q4QvRbL>
zL27KDkh<GxQj<ga!~F%V;AKl>DoMDrmdi7b5zc3s*+Q0EzoSUb;+AE0BtSs(tFmkR
z7TQr*b`3?yI#J#^)<Khm<v>y+OYL%CV3HbrFYj{^f$?2=>d-mbrC(lhUm>FQvJaQ?
z5mB<QQFC(v<_~qMnvMlT!P8dw?qEBt`_xP(8t?2DsdP1;8)p+jZeIGF*X~#kO6Ddt
zuBJn=0;IpPb%p0wTTA7CZ*&|HoY!8m_tiw8LO~b_#BqrFccKSrgpi?c%4v7)ky6r>
z<MGnOCC3A$iR;c_Ng}sr!y`H^r97;KH{Prh&`QKd4Eb>ddRc4eh?*Zr@<!BnCYtFj
zXkV@lSV}YPuDW|NZ@cPhN@@yoInhQ9GBgEEruhx_P38lMp0pB799O)J|L-);>T}07
zwdpmt@=SvVNqS;5e2R=vkuK`wJ;`LOHxHNB*3cLY#S)!`rVj0fz9wt-^hBbG?QPMB
znpm$=hKH<<6ML+LUwA4M538~DVNFyX&qHWCv7#(-b>Vqj)%}!}!>e^vS7i-r_O91~
z!H2FQuin?SUZIT)j*<`sei9SKQ7l0%0!4p1dNdTi*QsF9Di>KBqzxU1qS%PUM~1Kd
jZRjr2RHX9z`uP=2S#$e7a<rH-rhT$`o7hj&>p9)OtZ8kS

diff --git a/translations/fr.ts b/translations/fr.ts
index 2057d56da..c43857b12 100644
--- a/translations/fr.ts
+++ b/translations/fr.ts
@@ -2,24 +2,58 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="fr_FR">
 <context>
-    <name>AVPage</name>
+    <name>AVForm</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="132"/>
-        <source>Video Settings</source>
-        <translation>Options vidéo</translation>
+        <location filename="../widget/form/settings/avform.cpp" line="22"/>
+        <source>Audio/Video settings</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="136"/>
-        <location filename="../widget/settingsdialog.cpp" line="163"/>
-        <source>Show video preview</source>
-        <comment>On a button</comment>
-        <translation>Montrer l&apos;aperçu vidéo</translation>
-    </message>
-    <message>
-        <location filename="../widget/settingsdialog.cpp" line="157"/>
+        <location filename="../widget/form/settings/avform.cpp" line="41"/>
         <source>Hide video preview</source>
         <comment>On a button</comment>
-        <translation>Cacher l&apos;aperçu vidéo</translation>
+        <translation type="unfinished">Cacher l&apos;aperçu vidéo</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/avform.cpp" line="47"/>
+        <source>Show video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished">Montrer l&apos;aperçu vidéo</translation>
+    </message>
+</context>
+<context>
+    <name>AVPage</name>
+    <message>
+        <source>Video Settings</source>
+        <translation type="vanished">Options vidéo</translation>
+    </message>
+    <message>
+        <source>Show video preview</source>
+        <comment>On a button</comment>
+        <translation type="vanished">Montrer l&apos;aperçu vidéo</translation>
+    </message>
+    <message>
+        <source>Hide video preview</source>
+        <comment>On a button</comment>
+        <translation type="vanished">Cacher l&apos;aperçu vidéo</translation>
+    </message>
+</context>
+<context>
+    <name>AVSettings</name>
+    <message>
+        <location filename="../widget/form/settings/avsettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/avsettings.ui" line="20"/>
+        <source>Video settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/avsettings.ui" line="26"/>
+        <source>Show video preview</source>
+        <translation type="unfinished">Montrer l&apos;aperçu vidéo</translation>
     </message>
 </context>
 <context>
@@ -116,7 +150,7 @@
 <context>
     <name>ChatForm</name>
     <message>
-        <location filename="../widget/form/chatform.cpp" line="80"/>
+        <location filename="../widget/form/chatform.cpp" line="105"/>
         <source>Send a file</source>
         <translation>Envoyer un fichier</translation>
     </message>
@@ -132,22 +166,36 @@
         <translation type="vanished">Copier</translation>
     </message>
 </context>
+<context>
+    <name>Core</name>
+    <message>
+        <location filename="../core.cpp" line="1068"/>
+        <source>Encrypted profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core.cpp" line="1069"/>
+        <source>Your tox profile seems to be encrypted, qTox can&apos;t open it
+Do you want to erase this profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FileTransferInstance</name>
     <message>
-        <location filename="../filetransferinstance.cpp" line="191"/>
+        <location filename="../filetransferinstance.cpp" line="208"/>
         <source>Save a file</source>
         <comment>Title of the file saving dialog</comment>
         <translation>Sauvegarder un fichier</translation>
     </message>
     <message>
-        <location filename="../filetransferinstance.cpp" line="202"/>
+        <location filename="../filetransferinstance.cpp" line="219"/>
         <source>Location not writable</source>
         <comment>Title of permissions popup</comment>
         <translation>Impossible d&apos;écrire ici</translation>
     </message>
     <message>
-        <location filename="../filetransferinstance.cpp" line="202"/>
+        <location filename="../filetransferinstance.cpp" line="219"/>
         <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
         <comment>text of permissions popup</comment>
         <translation>Vous n&apos;avez pas la permission d&apos;écrire ici. Choisissez un audre endroit, ou annulez.</translation>
@@ -219,71 +267,153 @@
 <context>
     <name>FriendWidget</name>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="84"/>
+        <location filename="../widget/friendwidget.cpp" line="48"/>
         <source>Copy friend ID</source>
         <comment>Menu to copy the Tox ID of that friend</comment>
         <translation>Copier l&apos;ID ami</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="85"/>
+        <location filename="../widget/friendwidget.cpp" line="49"/>
         <source>Invite in group</source>
         <comment>Menu to invite a friend in a groupchat</comment>
         <translation>Inviter dans un groupe</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="95"/>
+        <location filename="../widget/friendwidget.cpp" line="59"/>
         <source>Remove friend</source>
         <comment>Menu to remove the friend from our friendlist</comment>
         <translation>Supprimer ami</translation>
     </message>
 </context>
+<context>
+    <name>GeneralForm</name>
+    <message>
+        <location filename="../widget/form/settings/generalform.cpp" line="26"/>
+        <source>General Settings</source>
+        <translation type="unfinished">Options Générales</translation>
+    </message>
+</context>
 <context>
     <name>GeneralPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="31"/>
         <source>General Settings</source>
-        <translation>Options Générales</translation>
+        <translation type="vanished">Options Générales</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="34"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
-        <translation>Activer IPv6 (recommandé)</translation>
+        <translation type="vanished">Activer IPv6 (recommandé)</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="36"/>
         <source>Use translations</source>
         <comment>Text on a checkbox to enable translations</comment>
-        <translation>Utiliser les traductions</translation>
+        <translation type="vanished">Utiliser les traductions</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="38"/>
         <source>Make Tox portable</source>
         <comment>Text on a checkbox to make qTox a portable application</comment>
-        <translation>Rendre Tox portable</translation>
+        <translation type="vanished">Rendre Tox portable</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="39"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
         <comment>describes makeToxPortable checkbox</comment>
-        <translation>Sauvegarde les options dans le dossier courant au lieu du dossier de configuration habituel</translation>
+        <translation type="vanished">Sauvegarde les options dans le dossier courant au lieu du dossier de configuration habituel</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="48"/>
         <source>Theme</source>
-        <translation>Thème</translation>
+        <translation type="vanished">Thème</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="49"/>
         <source>Smiley Pack</source>
-        <translation>Pack de smileys</translation>
+        <translation type="vanished">Pack de smileys</translation>
+    </message>
+</context>
+<context>
+    <name>GeneralSettings</name>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="29"/>
+        <source>General Settings</source>
+        <translation type="unfinished">Options Générales</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="35"/>
+        <source>Use translations</source>
+        <extracomment>Text on a checkbox to enable translations</extracomment>
+        <translation type="unfinished">Utiliser les traductions</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="42"/>
+        <source>Save settings to the working directory instead of the usual conf dir</source>
+        <extracomment>describes makeToxPortable checkbox</extracomment>
+        <translation type="unfinished">Sauvegarde les options dans le dossier courant au lieu du dossier de configuration habituel</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="45"/>
+        <source>Make Tox portable</source>
+        <translation type="unfinished">Rendre Tox portable</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="55"/>
+        <source>Theme</source>
+        <translation type="unfinished">Thème</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="61"/>
+        <source>Smiley Pack</source>
+        <extracomment>Text on smiley pack label</extracomment>
+        <translation type="unfinished">Pack de smileys</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="74"/>
+        <source>Connection Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="80"/>
+        <source>Enable IPv6 (recommended)</source>
+        <extracomment>Text on a checkbox to enable IPv6</extracomment>
+        <translation type="unfinished">Activer IPv6 (recommandé)</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="87"/>
+        <source>This allows, e.g., toxing over Tor. It adds load to the Tox network however, so use only when necessary.</source>
+        <extracomment>force tcp checkbox tooltip</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="90"/>
+        <source>Disable UDP (not recommended)</source>
+        <extracomment>Text on checkbox to disable UDP</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="97"/>
+        <source>Use proxy (SOCKS5)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="106"/>
+        <source>Address</source>
+        <extracomment>Text on proxy addr label</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="116"/>
+        <source>Port</source>
+        <extracomment>Text on proxy port label</extracomment>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GenericChatForm</name>
     <message>
-        <location filename="../widget/form/genericchatform.cpp" line="142"/>
-        <location filename="../widget/form/genericchatform.cpp" line="148"/>
+        <location filename="../widget/form/genericchatform.cpp" line="149"/>
+        <location filename="../widget/form/genericchatform.cpp" line="155"/>
         <source>Save chat log</source>
         <translation>Sauvegarder l&apos;historique de conversation</translation>
     </message>
@@ -291,18 +421,17 @@
 <context>
     <name>GroupChatForm</name>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="41"/>
+        <location filename="../widget/form/groupchatform.cpp" line="47"/>
         <source>%1 users in chat</source>
         <comment>Number of users in chat</comment>
         <translation>%1 personnes</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="83"/>
         <source>&lt;Unknown&gt;</source>
-        <translation>&lt;Inconnu&gt;</translation>
+        <translation type="vanished">&lt;Inconnu&gt;</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="90"/>
+        <location filename="../widget/form/groupchatform.cpp" line="85"/>
         <source>%1 users in chat</source>
         <translation>%1 personnes</translation>
     </message>
@@ -314,52 +443,88 @@
 <context>
     <name>GroupWidget</name>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="58"/>
-        <location filename="../widget/groupwidget.cpp" line="100"/>
+        <location filename="../widget/groupwidget.cpp" line="39"/>
+        <location filename="../widget/groupwidget.cpp" line="59"/>
         <source>%1 users in chat</source>
         <translation>%1 personnes</translation>
     </message>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="60"/>
-        <location filename="../widget/groupwidget.cpp" line="102"/>
+        <location filename="../widget/groupwidget.cpp" line="41"/>
+        <location filename="../widget/groupwidget.cpp" line="61"/>
         <source>0 users in chat</source>
         <translation>0 personnes</translation>
     </message>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="83"/>
+        <location filename="../widget/groupwidget.cpp" line="48"/>
         <source>Quit group</source>
         <comment>Menu to quit a groupchat</comment>
         <translation>Quitter le groupe</translation>
     </message>
 </context>
+<context>
+    <name>IdentityForm</name>
+    <message>
+        <location filename="../widget/form/settings/identityform.cpp" line="29"/>
+        <source>Your identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>IdentityPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="82"/>
         <source>Public Information</source>
-        <translation>Informations Publiques</translation>
+        <translation type="vanished">Informations Publiques</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="83"/>
         <source>Name</source>
         <comment>Username/nick</comment>
-        <translation>Nom</translation>
+        <translation type="vanished">Nom</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="85"/>
         <source>Status</source>
         <comment>Status message</comment>
-        <translation>Status</translation>
+        <translation type="vanished">Status</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="95"/>
         <source>Tox ID</source>
-        <translation>ID Tox</translation>
+        <translation type="vanished">ID Tox</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="96"/>
         <source>Your Tox ID</source>
-        <translation>Votre ID Tox</translation>
+        <translation type="vanished">Votre ID Tox</translation>
+    </message>
+</context>
+<context>
+    <name>IdentitySettings</name>
+    <message>
+        <location filename="../widget/form/settings/identitysettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/identitysettings.ui" line="20"/>
+        <source>Public Information</source>
+        <translation type="unfinished">Informations Publiques</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/identitysettings.ui" line="26"/>
+        <source>Name</source>
+        <translation type="unfinished">Nom</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/identitysettings.ui" line="36"/>
+        <source>Status</source>
+        <translation type="unfinished">Status</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/identitysettings.ui" line="49"/>
+        <source>Tox ID</source>
+        <translation type="unfinished">ID Tox</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/identitysettings.ui" line="55"/>
+        <source>Your Tox ID (click to copy)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -370,46 +535,54 @@
         <translation>qTox</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1918"/>
+        <location filename="../mainwindow.ui" line="859"/>
         <source>Your name</source>
         <translation>Votre nom</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2000"/>
+        <location filename="../mainwindow.ui" line="941"/>
         <source>Your status</source>
         <translation>Votre status</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2566"/>
+        <location filename="../mainwindow.ui" line="1089"/>
         <source>Add friends</source>
         <translation>Ajouter des amis</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2592"/>
+        <location filename="../mainwindow.ui" line="1115"/>
         <source>Create a group chat</source>
         <translation>Creer un groupe</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2624"/>
+        <location filename="../mainwindow.ui" line="1147"/>
         <source>View completed file transfers</source>
         <translation>Voir les transfers de fichiers terminés</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2656"/>
+        <location filename="../mainwindow.ui" line="1179"/>
         <source>Change your settings</source>
         <translation>Changer les options</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3238"/>
+        <location filename="../mainwindow.ui" line="1761"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3241"/>
+        <location filename="../mainwindow.ui" line="1764"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
 </context>
+<context>
+    <name>PrivacyForm</name>
+    <message>
+        <location filename="../widget/form/settings/privacyform.cpp" line="21"/>
+        <source>Privacy settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>SelfCamView</name>
     <message>
@@ -422,44 +595,36 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="197"/>
         <source>qTox – Settings</source>
-        <translation>qTox — Options</translation>
+        <translation type="vanished">qTox — Options</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="224"/>
         <source>General</source>
-        <translation>General</translation>
+        <translation type="vanished">General</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="230"/>
         <source>Identity</source>
-        <translation>Identité</translation>
+        <translation type="vanished">Identité</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="236"/>
         <source>Privacy</source>
-        <translation>Vie Privée</translation>
+        <translation type="vanished">Vie Privée</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="242"/>
         <source>Audio/Video</source>
-        <translation>Audio/Vidéo</translation>
+        <translation type="vanished">Audio/Vidéo</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="251"/>
         <source>Ok</source>
-        <translation>Ok</translation>
+        <translation type="vanished">Ok</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="252"/>
         <source>Cancel</source>
-        <translation>Annuler</translation>
+        <translation type="vanished">Annuler</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="253"/>
         <source>Apply</source>
-        <translation>Appliquer</translation>
+        <translation type="vanished">Appliquer</translation>
     </message>
 </context>
 <context>
@@ -513,25 +678,63 @@
         <translation type="vanished">Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="133"/>
+        <location filename="../widget/widget.cpp" line="88"/>
         <source>Online</source>
         <comment>Button to set your status to &apos;Online&apos;</comment>
         <translation>Connecté</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="135"/>
+        <location filename="../widget/widget.cpp" line="90"/>
         <source>Away</source>
         <comment>Button to set your status to &apos;Away&apos;</comment>
         <translation>Indisponnible</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="137"/>
+        <location filename="../widget/widget.cpp" line="92"/>
         <source>Busy</source>
         <comment>Button to set your status to &apos;Busy&apos;</comment>
         <translation>Occupé</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="605"/>
+        <location filename="../widget/widget.cpp" line="225"/>
+        <source>Choose a profile picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="232"/>
+        <location filename="../widget/widget.cpp" line="239"/>
+        <location filename="../widget/widget.cpp" line="260"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="232"/>
+        <source>Unable to open this file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="239"/>
+        <source>Unable to read this image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="260"/>
+        <source>This image is too big</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="287"/>
+        <source>Toxcore failed to start, the application will terminate after you close this message.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="296"/>
+        <source>toxcore failed to start with your proxy settings. qTox cannot run; please modify your settings and restart.</source>
+        <comment>popup text</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="611"/>
         <source>&lt;Unknown&gt;</source>
         <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
         <translation>&lt;Inconnu&gt;</translation>

From b7dcbdc4742b8ecdafb638674ba19af1c92208ee Mon Sep 17 00:00:00 2001
From: Zetok Zalbavar <zexavexxe@gmail.com>
Date: Tue, 7 Oct 2014 20:33:06 +0100
Subject: [PATCH 199/205] Update Polish translation

---
 translations/pl.qm | Bin 6709 -> 9279 bytes
 translations/pl.ts | 373 +++++++++++++++++++++++++++++++++++----------
 2 files changed, 289 insertions(+), 84 deletions(-)

diff --git a/translations/pl.qm b/translations/pl.qm
index d05682dd157ed6c4cdf4f6a3a40d7171139dab1b..b9b482a495036fd5d27703a3aa12a704ffe9a1fc 100644
GIT binary patch
literal 9279
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
HYhLspDiHb{

delta 1380
zcmZ`$ZA@Eb7(KUrZ*RZuEzr_J+hK!)Y1FX~=0;+Il}=hr24QT=x}>wxD=Te!ffk{E
ztVXwBreX1-BZIg^w-_|;BSkkA!xCpC{LttS|M(GSjDKd#9Lewl^{I>|m)IuF)1LP^
z=RD7OW`plGo^a%L0sJAr*#`E~3xKNyY;ua~F!<mOpnNNY#1X)85siN{z+^|$x7z{h
z6YvkJ0NaY-P!mvDkG2P20V@7N_y+N$U6@!|0PLG_`Y=!Z(>ms#rM`&H*4s_^C7rzK
z8jy2d)H|2*ppQP}`GX7;{rt(J0B6*H_3|yi*vYb!8LD5f@z4wjyw1i)#sHghwU#xq
zQ%&^0Y>d4<%8~FfcHVOku-s-d8<zmxN9^{*k0d|F*FEqZ@ouhGm%#6AdjmO0J$&<#
zjbzxu%UgES=5O*ZTF%fQ%luo%Kc)oU=ifWCK;xZTt>riP#W^ypxXX}mUm@e02E|G|
z17}bI`>5sxu8Q7m!-Bc)Bqec4IPvN4lyF*@|M@vevfs!(`#cSHpGoZhEJp?rQ{|~2
z=nN^-$Yd7{GGn?L`~WatHZ4w_CBbIX_u>+5WH5g+9U>voy!>h-MSsPz;~G`{Zfom3
zWbD{!O&_35jjvgM-Si<K{vyUM^bzl{cy;a}O73fMu9hONh*G6w5fbMoT8U`hCV3lb
ziC~eu<1r$<BW*t&A>$RPvri?$l+=0rJQ-b=_IgRcxIwz`<TM$66Q{Tq^d#j|XLT-h
zGpn}ml{1-mswXWFYVhyxi1x_&2>X-I|7N+&t2TSsYH5{I@<23Mcv7?WN43D`_Q$k9
z*s-Vu9<FTG0;838Yk{X-0S%D<($&nVD>Ylxqg6pQQRP-2uRf=S-5${zipi-=Jd^!z
zm}Ble>yV$^_3IF?r@mdo;tKma(S;%0LN9#uOTjSJ5CTSef`Pu4gUaB5uS*&Bg#v|S
zGzw~jZOfaydvt2PrY%>7Frr8!Lo#U$qPHl*`}_Km*#cc!OF0maCY7E$BlxL1hB)yW
zaDZwIGL$0Q;vbB~m4^NCn5>l2u)?1}ie!=+V?#?c)h#DWvs$@FX!#+c%0)ln&Y4TG
zD$u2Fa98JyYbPkx$k2{NQC8QUDAnjd2L_O(Iii$a3JQ0K6N*HkV<7%iw0nJi?qYzo
z=wG{?&rbK-r;ge^b>;nqt6hIa^{r+8KlbW!%~`eHcdu=Pj$`Jye;hita=+RBFO61T
A*#H0l

diff --git a/translations/pl.ts b/translations/pl.ts
index 481762e0e..a91d8a8a4 100644
--- a/translations/pl.ts
+++ b/translations/pl.ts
@@ -1,25 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="pl_PL">
+<TS version="2.0" language="pl_PL">
 <context>
-    <name>AVPage</name>
+    <name>AVForm</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="132"/>
-        <source>Video Settings</source>
-        <translation>Ustawienia wideo</translation>
+        <location filename="../widget/form/settings/avform.cpp" line="22"/>
+        <source>Audio/Video settings</source>
+        <translation>Ustawienia audio/video</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="136"/>
-        <location filename="../widget/settingsdialog.cpp" line="163"/>
+        <location filename="../widget/form/settings/avform.cpp" line="41"/>
+        <source>Hide video preview</source>
+        <comment>On a button</comment>
+        <translation>Ukryj podgląd wideo</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/avform.cpp" line="47"/>
         <source>Show video preview</source>
         <comment>On a button</comment>
         <translation>Pokaż podgląd wideo</translation>
     </message>
+</context>
+<context>
+    <name>AVPage</name>
+    <message>
+        <source>Video Settings</source>
+        <translation type="obsolete">Ustawienia wideo</translation>
+    </message>
+    <message>
+        <source>Show video preview</source>
+        <comment>On a button</comment>
+        <translation type="obsolete">Pokaż podgląd wideo</translation>
+    </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="157"/>
         <source>Hide video preview</source>
         <comment>On a button</comment>
-        <translation>Ukryj podgląd wideo</translation>
+        <translation type="obsolete">Ukryj podgląd wideo</translation>
+    </message>
+</context>
+<context>
+    <name>AVSettings</name>
+    <message>
+        <location filename="../widget/form/settings/avsettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/avsettings.ui" line="20"/>
+        <source>Video settings</source>
+        <translation>Ustawienia wideo</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/avsettings.ui" line="26"/>
+        <source>Show video preview</source>
+        <translation>Pokaż podgląd wideo</translation>
     </message>
 </context>
 <context>
@@ -105,27 +139,42 @@
 <context>
     <name>ChatForm</name>
     <message>
-        <location filename="../widget/form/chatform.cpp" line="80"/>
+        <location filename="../widget/form/chatform.cpp" line="105"/>
         <source>Send a file</source>
         <translation>Wyślij plik</translation>
     </message>
 </context>
+<context>
+    <name>Core</name>
+    <message>
+        <location filename="../core.cpp" line="1068"/>
+        <source>Encrypted profile</source>
+        <translation>Zaszyfrowany profil</translation>
+    </message>
+    <message>
+        <location filename="../core.cpp" line="1069"/>
+        <source>Your tox profile seems to be encrypted, qTox can&apos;t open it
+Do you want to erase this profile ?</source>
+        <translation>Twój profil zdaje się być zaszyfrowany, qTox nie jest w stanie go otworzyć
+Czy chcesz usunąć ten profil ?</translation>
+    </message>
+</context>
 <context>
     <name>FileTransferInstance</name>
     <message>
-        <location filename="../filetransferinstance.cpp" line="191"/>
+        <location filename="../filetransferinstance.cpp" line="208"/>
         <source>Save a file</source>
         <comment>Title of the file saving dialog</comment>
         <translation>Zapisz plik</translation>
     </message>
     <message>
-        <location filename="../filetransferinstance.cpp" line="202"/>
+        <location filename="../filetransferinstance.cpp" line="219"/>
         <source>Location not writable</source>
         <comment>Title of permissions popup</comment>
         <translation>Nie można zapisać w lokacji</translation>
     </message>
     <message>
-        <location filename="../filetransferinstance.cpp" line="202"/>
+        <location filename="../filetransferinstance.cpp" line="219"/>
         <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
         <comment>text of permissions popup</comment>
         <translation>Nie masz uprawnienia by zapisać w tej lokacji. Wybierz inną lub anuluj zapis.</translation>
@@ -191,72 +240,155 @@
 <context>
     <name>FriendWidget</name>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="84"/>
+        <location filename="../widget/friendwidget.cpp" line="48"/>
         <source>Copy friend ID</source>
         <comment>Menu to copy the Tox ID of that friend</comment>
         <translation>Kopiuj ID znajomej/go</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="85"/>
+        <location filename="../widget/friendwidget.cpp" line="49"/>
         <source>Invite in group</source>
         <comment>Menu to invite a friend in a groupchat</comment>
         <translation>Zaproś do grupy</translation>
     </message>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="95"/>
+        <location filename="../widget/friendwidget.cpp" line="59"/>
         <source>Remove friend</source>
         <comment>Menu to remove the friend from our friendlist</comment>
         <translation>Usuń znajomego</translation>
     </message>
 </context>
+<context>
+    <name>GeneralForm</name>
+    <message>
+        <location filename="../widget/form/settings/generalform.cpp" line="26"/>
+        <source>General Settings</source>
+        <translation>Główne ustawienia</translation>
+    </message>
+</context>
 <context>
     <name>GeneralPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="31"/>
+        <source>General Settings</source>
+        <translation type="obsolete">Główne ustawienia</translation>
+    </message>
+    <message>
+        <source>Enable IPv6 (recommended)</source>
+        <comment>Text on a checkbox to enable IPv6</comment>
+        <translation type="obsolete">Użyj IPv6 (rekomendowane)</translation>
+    </message>
+    <message>
+        <source>Use translations</source>
+        <comment>Text on a checkbox to enable translations</comment>
+        <translation type="obsolete">Użyj tłumaczenia</translation>
+    </message>
+    <message>
+        <source>Make Tox portable</source>
+        <comment>Text on a checkbox to make qTox a portable application</comment>
+        <translation type="obsolete">Zrób Tox przenośnym</translation>
+    </message>
+    <message>
+        <source>Save settings to the working directory instead of the usual conf dir</source>
+        <comment>describes makeToxPortable checkbox</comment>
+        <translation type="obsolete">Zamiast domyślnego katalogu użyj obecnego do zapisania ustawień</translation>
+    </message>
+    <message>
+        <source>Theme</source>
+        <translation type="obsolete">Motyw</translation>
+    </message>
+    <message>
+        <source>Smiley Pack</source>
+        <translatorcomment>needs better translation</translatorcomment>
+        <translation type="obsolete">Paczka uśmiechów</translation>
+    </message>
+</context>
+<context>
+    <name>GeneralSettings</name>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="29"/>
         <source>General Settings</source>
         <translation>Główne ustawienia</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="34"/>
-        <source>Enable IPv6 (recommended)</source>
-        <comment>Text on a checkbox to enable IPv6</comment>
-        <translation>Użyj IPv6 (rekomendowane)</translation>
-    </message>
-    <message>
-        <location filename="../widget/settingsdialog.cpp" line="36"/>
+        <location filename="../widget/form/settings/generalsettings.ui" line="35"/>
         <source>Use translations</source>
-        <comment>Text on a checkbox to enable translations</comment>
+        <extracomment>Text on a checkbox to enable translations</extracomment>
         <translation>Użyj tłumaczenia</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="38"/>
-        <source>Make Tox portable</source>
-        <comment>Text on a checkbox to make qTox a portable application</comment>
-        <translation>Zrób Tox przenośnym</translation>
-    </message>
-    <message>
-        <location filename="../widget/settingsdialog.cpp" line="39"/>
+        <location filename="../widget/form/settings/generalsettings.ui" line="42"/>
         <source>Save settings to the working directory instead of the usual conf dir</source>
-        <comment>describes makeToxPortable checkbox</comment>
+        <extracomment>describes makeToxPortable checkbox</extracomment>
         <translation>Zamiast domyślnego katalogu użyj obecnego do zapisania ustawień</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="48"/>
+        <location filename="../widget/form/settings/generalsettings.ui" line="45"/>
+        <source>Make Tox portable</source>
+        <translation>Zrób Tox przenośnym</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="55"/>
         <source>Theme</source>
         <translation>Motyw</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="49"/>
+        <location filename="../widget/form/settings/generalsettings.ui" line="61"/>
         <source>Smiley Pack</source>
-        <translatorcomment>needs better translation</translatorcomment>
+        <extracomment>Text on smiley pack label</extracomment>
+        <translatorcomment>better translation? anyone?</translatorcomment>
         <translation>Paczka uśmiechów</translation>
     </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="74"/>
+        <source>Connection Settings</source>
+        <translation>Ustawienia połączenia</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="80"/>
+        <source>Enable IPv6 (recommended)</source>
+        <extracomment>Text on a checkbox to enable IPv6</extracomment>
+        <translation>Użyj IPv6 (rekomendowane)</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="87"/>
+        <source>This allows, e.g., toxing over Tor. It adds load to the Tox network however, so use only when necessary.</source>
+        <extracomment>force tcp checkbox tooltip</extracomment>
+        <translation>To pozwala n.p. na toxowanie przez Tora. Niestety obciąża to sieć Tox, więc używaj tylko w razie potrzeby.</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="90"/>
+        <source>Disable UDP (not recommended)</source>
+        <extracomment>Text on checkbox to disable UDP</extracomment>
+        <translation>Wyłącz UDP (nie rekomendowane)</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="97"/>
+        <source>Use proxy (SOCKS5)</source>
+        <translation>Użyj proxy (SOCKS5)</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="106"/>
+        <source>Address</source>
+        <extracomment>Text on proxy addr label</extracomment>
+        <translation>Adres</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="116"/>
+        <source>Port</source>
+        <extracomment>Text on proxy port label</extracomment>
+        <translation>Port</translation>
+    </message>
 </context>
 <context>
     <name>GenericChatForm</name>
     <message>
-        <location filename="../widget/form/genericchatform.cpp" line="142"/>
-        <location filename="../widget/form/genericchatform.cpp" line="148"/>
+        <location filename="../widget/form/genericchatform.cpp" line="149"/>
+        <location filename="../widget/form/genericchatform.cpp" line="155"/>
         <source>Save chat log</source>
         <translation>Zapisz historię rozmowy</translation>
     </message>
@@ -264,18 +396,17 @@
 <context>
     <name>GroupChatForm</name>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="41"/>
+        <location filename="../widget/form/groupchatform.cpp" line="47"/>
         <source>%1 users in chat</source>
         <comment>Number of users in chat</comment>
         <translation>%1 użytkowników w czacie</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="83"/>
         <source>&lt;Unknown&gt;</source>
-        <translation>&lt;Nieznany/a&gt;</translation>
+        <translation type="obsolete">&lt;Nieznany/a&gt;</translation>
     </message>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="90"/>
+        <location filename="../widget/form/groupchatform.cpp" line="85"/>
         <source>%1 users in chat</source>
         <translation>%1 użytkowników w czacie</translation>
     </message>
@@ -283,52 +414,88 @@
 <context>
     <name>GroupWidget</name>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="58"/>
-        <location filename="../widget/groupwidget.cpp" line="100"/>
+        <location filename="../widget/groupwidget.cpp" line="39"/>
+        <location filename="../widget/groupwidget.cpp" line="59"/>
         <source>%1 users in chat</source>
         <translation>%1 użytkowników w czacie</translation>
     </message>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="60"/>
-        <location filename="../widget/groupwidget.cpp" line="102"/>
+        <location filename="../widget/groupwidget.cpp" line="41"/>
+        <location filename="../widget/groupwidget.cpp" line="61"/>
         <source>0 users in chat</source>
         <translation>0 użytkowników w czacie</translation>
     </message>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="83"/>
+        <location filename="../widget/groupwidget.cpp" line="48"/>
         <source>Quit group</source>
         <comment>Menu to quit a groupchat</comment>
         <translation>Opuść grupę</translation>
     </message>
 </context>
+<context>
+    <name>IdentityForm</name>
+    <message>
+        <location filename="../widget/form/settings/identityform.cpp" line="29"/>
+        <source>Your identity</source>
+        <translation>Twoja tożsamość</translation>
+    </message>
+</context>
 <context>
     <name>IdentityPage</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="82"/>
+        <source>Public Information</source>
+        <translation type="obsolete">Informacja publiczna</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <comment>Username/nick</comment>
+        <translation type="obsolete">Nick</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <comment>Status message</comment>
+        <translation type="obsolete">Status</translation>
+    </message>
+    <message>
+        <source>Tox ID</source>
+        <translation type="obsolete">Tox ID</translation>
+    </message>
+    <message>
+        <source>Your Tox ID</source>
+        <translation type="obsolete">Twój Tox ID</translation>
+    </message>
+</context>
+<context>
+    <name>IdentitySettings</name>
+    <message>
+        <location filename="../widget/form/settings/identitysettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/identitysettings.ui" line="20"/>
         <source>Public Information</source>
         <translation>Informacja publiczna</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="83"/>
+        <location filename="../widget/form/settings/identitysettings.ui" line="26"/>
         <source>Name</source>
-        <comment>Username/nick</comment>
         <translation>Nick</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="85"/>
+        <location filename="../widget/form/settings/identitysettings.ui" line="36"/>
         <source>Status</source>
-        <comment>Status message</comment>
         <translation>Status</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="95"/>
+        <location filename="../widget/form/settings/identitysettings.ui" line="49"/>
         <source>Tox ID</source>
         <translation>Tox ID</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="96"/>
-        <source>Your Tox ID</source>
-        <translation>Twój Tox ID</translation>
+        <location filename="../widget/form/settings/identitysettings.ui" line="55"/>
+        <source>Your Tox ID (click to copy)</source>
+        <translation>Twój Tox ID (kliknij by skopiować)</translation>
     </message>
 </context>
 <context>
@@ -339,47 +506,55 @@
         <translation>qTox</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1918"/>
+        <location filename="../mainwindow.ui" line="859"/>
         <source>Your name</source>
         <translation>Twój nick</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2000"/>
+        <location filename="../mainwindow.ui" line="941"/>
         <source>Your status</source>
         <translation>Twój status</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2566"/>
+        <location filename="../mainwindow.ui" line="1089"/>
         <source>Add friends</source>
         <translation>Dodaj znajomych</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2592"/>
+        <location filename="../mainwindow.ui" line="1115"/>
         <source>Create a group chat</source>
         <translation>Utwórz czat grupowy</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2624"/>
+        <location filename="../mainwindow.ui" line="1147"/>
         <source>View completed file transfers</source>
         <translation>Zobacz zakończone transfery plików</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="2656"/>
+        <location filename="../mainwindow.ui" line="1179"/>
         <source>Change your settings</source>
         <translatorcomment>translated as &quot;change settings&quot;;  seems to be simpler this way</translatorcomment>
         <translation>Zmień ustawienia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3238"/>
+        <location filename="../mainwindow.ui" line="1761"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="3241"/>
+        <location filename="../mainwindow.ui" line="1764"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
 </context>
+<context>
+    <name>PrivacyForm</name>
+    <message>
+        <location filename="../widget/form/settings/privacyform.cpp" line="21"/>
+        <source>Privacy settings</source>
+        <translation>Ustawienia prywatności</translation>
+    </message>
+</context>
 <context>
     <name>SelfCamView</name>
     <message>
@@ -392,68 +567,98 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="197"/>
         <source>qTox – Settings</source>
-        <translation>qTox – Ustawienia</translation>
+        <translation type="obsolete">qTox – Ustawienia</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="224"/>
         <source>General</source>
-        <translation>Główne</translation>
+        <translation type="obsolete">Główne</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="230"/>
         <source>Identity</source>
-        <translation>Tożsamość</translation>
+        <translation type="obsolete">Tożsamość</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="236"/>
         <source>Privacy</source>
-        <translation>Prywatność</translation>
+        <translation type="obsolete">Prywatność</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="242"/>
         <source>Audio/Video</source>
-        <translation>Audio/Wideo</translation>
+        <translation type="obsolete">Audio/Wideo</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="251"/>
         <source>Ok</source>
-        <translation>Ok</translation>
+        <translation type="obsolete">Ok</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="252"/>
         <source>Cancel</source>
-        <translation>Anuluj</translation>
+        <translation type="obsolete">Anuluj</translation>
     </message>
     <message>
-        <location filename="../widget/settingsdialog.cpp" line="253"/>
         <source>Apply</source>
-        <translation>Zastosuj</translation>
+        <translation type="obsolete">Zastosuj</translation>
     </message>
 </context>
 <context>
     <name>Widget</name>
     <message>
-        <location filename="../widget/widget.cpp" line="133"/>
+        <location filename="../widget/widget.cpp" line="88"/>
         <source>Online</source>
         <comment>Button to set your status to &apos;Online&apos;</comment>
         <translation>Online</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="135"/>
+        <location filename="../widget/widget.cpp" line="90"/>
         <source>Away</source>
         <comment>Button to set your status to &apos;Away&apos;</comment>
         <translation>Nieobecny/a</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="137"/>
+        <location filename="../widget/widget.cpp" line="92"/>
         <source>Busy</source>
         <comment>Button to set your status to &apos;Busy&apos;</comment>
         <translation>Zajęty/a</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="605"/>
+        <location filename="../widget/widget.cpp" line="225"/>
+        <source>Choose a profile picture</source>
+        <translation>Wybierz obrazek profilu</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="232"/>
+        <location filename="../widget/widget.cpp" line="239"/>
+        <location filename="../widget/widget.cpp" line="260"/>
+        <source>Error</source>
+        <translation>Błąd</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="232"/>
+        <source>Unable to open this file</source>
+        <translation>Nie można otworzyć tego pliku</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="239"/>
+        <source>Unable to read this image</source>
+        <translation>Nie można odczytać tego obrazka</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="260"/>
+        <source>This image is too big</source>
+        <translation>Ten obrazek jest zbyt wielki</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="287"/>
+        <source>Toxcore failed to start, the application will terminate after you close this message.</source>
+        <translation>Nie udało się uruchomić Toxcore, aplikacja zamknie się po zamknięciu tej wiadomości.</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="296"/>
+        <source>toxcore failed to start with your proxy settings. qTox cannot run; please modify your settings and restart.</source>
+        <comment>popup text</comment>
+        <translation>Nie udało się uruchomić toxcore z twoimi ustawieniami proxy. qTox nie może działać, proszę zmodyfikuj ustawienia i zrestartuj.</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="611"/>
         <source>&lt;Unknown&gt;</source>
         <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
         <translation>&lt;Nieznany/a&gt;</translation>

From afc77f63dbd650383e8baad7716c79842f1b278e Mon Sep 17 00:00:00 2001
From: agilob <info@agilob.net>
Date: Tue, 7 Oct 2014 11:50:36 +0200
Subject: [PATCH 200/205] css styles for mainHead and mainContent in widget.cpp

fixes problems with ugly UI on non-standard system theme.
before: https://i.imgur.com/XJ0mbpi.png
after: https://imgur.com/a/UbgNz
---
 res.qrc                     |  2 ++
 ui/settings/mainContent.css | 36 ++++++++++++++++++++++++++++++++++++
 ui/settings/mainHead.css    |  5 +++++
 widget/widget.cpp           |  2 ++
 4 files changed, 45 insertions(+)
 create mode 100644 ui/settings/mainContent.css
 create mode 100644 ui/settings/mainHead.css

diff --git a/res.qrc b/res.qrc
index e8156ac58..4ef12f901 100644
--- a/res.qrc
+++ b/res.qrc
@@ -136,5 +136,7 @@
         <file>ui/chatroomWidgets/genericChatroomWidget.css</file>
         <file>ui/fileTransferInstance/sliverRTEdge.png</file>
         <file>ui/window/statusPanel.css</file>
+        <file>ui/settings/mainContent.css</file>
+        <file>ui/settings/mainHead.css</file>
     </qresource>
 </RCC>
diff --git a/ui/settings/mainContent.css b/ui/settings/mainContent.css
new file mode 100644
index 000000000..e08dc24b5
--- /dev/null
+++ b/ui/settings/mainContent.css
@@ -0,0 +1,36 @@
+QCheckBox
+{
+    color: black;
+}
+
+QLabel
+{
+    color: black;
+}
+
+QGroupBox::title
+{
+    color: black;
+    background-color: white;
+}
+
+QWidget
+{
+    color: black;
+    background-color: white;
+}
+
+QComboBox
+{
+    background-color: white;
+}
+
+QComboBox:on QComboBox:off QComboBox:drop-down
+{
+    background: rgba(18, 18, 18, 204);
+}
+
+QComboBox:active
+{
+    background: white;
+}
diff --git a/ui/settings/mainHead.css b/ui/settings/mainHead.css
new file mode 100644
index 000000000..3a97d7d35
--- /dev/null
+++ b/ui/settings/mainHead.css
@@ -0,0 +1,5 @@
+QWidget
+{
+    color: black;
+    background: white;
+}
diff --git a/widget/widget.cpp b/widget/widget.cpp
index 53a34449c..dfa25fffe 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -74,6 +74,8 @@ Widget::Widget(QWidget *parent)
     ui->mainHead->setLayout(new QVBoxLayout());
     ui->mainHead->layout()->setMargin(0);
     ui->mainHead->layout()->setSpacing(0);
+    ui->mainHead->setStyleSheet(Style::getStylesheet(":ui/settings/mainHead.css"));
+    ui->mainContent->setStyleSheet(Style::getStylesheet(":ui/settings/mainContent.css"));
 
     contactListWidget = new FriendListWidget();
     ui->friendList->setWidget(contactListWidget);

From aa11caa63b105b0eff56ed695ab314321bbe2777 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Tue, 7 Oct 2014 23:05:05 +0200
Subject: [PATCH 201/205] debian: Exclude libs from source package

---
 debian/source/options | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 debian/source/options

diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 000000000..2c6d70e0d
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1 @@
+--diff-ignore=libs

From f441ffd74a5872e203f2d810d62af3b0a5da2e31 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Wed, 8 Oct 2014 00:41:56 +0200
Subject: [PATCH 202/205] Try to link opencv statically in linux packages

---
 qtox.pro | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/qtox.pro b/qtox.pro
index 879112e5f..3b95cdf1f 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -62,7 +62,10 @@ win32 {
         contains(STATICPKG, YES) {
             target.path = /usr/bin
             INSTALLS += target
-            LIBS += -L$$PWD/libs/lib/ -Wl,-Bstatic -ltoxcore -ltoxav -lsodium -Wl,-Bdynamic -lopus -lvpx -lopenal -lopencv_core -lopencv_highgui
+            LIBS += -L$$PWD/libs/lib/ -lopus -lvpx -lopenal -Wl,-Bstatic -ltoxcore -ltoxav -lsodium -lopencv_highgui -lopencv_imgproc -lopencv_core -lz -Wl,-Bdynamic
+	    LIBS += -Wl,-Bstatic -ljpeg -ltiff -lpng -ljasper -lIlmImf -lIlmThread -lIex -ldc1394 -lraw1394 -lHalf -lz -llzma -ljbig
+	    LIBS += -Wl,-Bdynamic -ltbb -lv4l1 -lv4l2 -lgnutls -lrtmp -lgnutls -lavformat -lavcodec -lavutil -lavfilter -lswscale -lusb-1.0
+
         } else {
             LIBS += -L$$PWD/libs/lib/ -ltoxcore -ltoxav -lvpx -lopenal -lopencv_core -lopencv_highgui
         }

From 54eb425238a277a8f23c599041eec281f3b43a5a Mon Sep 17 00:00:00 2001
From: dubslow <bunslow@gmail.com>
Date: Tue, 7 Oct 2014 21:20:38 -0500
Subject: [PATCH 203/205] add ringtone (not well done, but still better than
 status quo)

---
 audio/ToxicIncomingCall.pcm | Bin 0 -> 300000 bytes
 res.qrc                     |   1 +
 widget/widget.cpp           |  21 +++++++++++++++++++++
 widget/widget.h             |   1 +
 4 files changed, 23 insertions(+)
 create mode 100644 audio/ToxicIncomingCall.pcm

diff --git a/audio/ToxicIncomingCall.pcm b/audio/ToxicIncomingCall.pcm
new file mode 100644
index 0000000000000000000000000000000000000000..8239c74cf46aac69a711873f68a1b8a3b71b611f
GIT binary patch
literal 300000
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%0A;MIVIyvy1RuQ!;YPl<)@Tb0v`Q=7a7a+-fm
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

literal 0
HcmV?d00001

diff --git a/res.qrc b/res.qrc
index 4ef12f901..5f3cfe467 100644
--- a/res.qrc
+++ b/res.qrc
@@ -123,6 +123,7 @@
         <file>ui/fileTransferInstance/emptyRGreenFileButton.png</file>
         <file>ui/fileTransferInstance/emptyRRedFileButton.png</file>
         <file>audio/notification.pcm</file>
+        <file>audio/ToxicIncomingCall.pcm</file>
         <file>img/settings/general.png</file>
         <file>img/settings/identity.png</file>
         <file>img/settings/privacy.png</file>
diff --git a/widget/widget.cpp b/widget/widget.cpp
index dfa25fffe..708c23fd4 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -145,6 +145,7 @@ Widget::Widget(QWidget *parent)
     connect(core, &Core::groupMessageReceived, this, &Widget::onGroupMessageReceived);
     connect(core, &Core::groupNamelistChanged, this, &Widget::onGroupNamelistChanged);
     connect(core, &Core::emptyGroupCreated, this, &Widget::onEmptyGroupCreated);
+    connect(core, &Core::avInvite, this, &Widget::playRingtone);
 
     connect(core, SIGNAL(messageSentResult(int,QString,int)), this, SLOT(onMessageSendResult(int,QString,int)));
     connect(core, SIGNAL(groupSentResult(int,QString,int)), this, SLOT(onGroupSendResult(int,QString,int)));
@@ -535,6 +536,26 @@ void Widget::newMessageAlert()
     alSourcePlay(core->alMainSource);
 }
 
+void Widget::playRingtone()
+{
+    QApplication::alert(this);
+
+    static QFile sndFile1(":audio/ToxicIncomingCall.pcm"); // for whatever reason this plays slower/downshifted from what any other program plays the file as... but whatever
+    static QByteArray sndData1;
+    if (sndData1.isEmpty())
+    {
+        sndFile1.open(QIODevice::ReadOnly);
+        sndData1 = sndFile1.readAll();
+        sndFile1.close();
+    }
+
+    ALuint buffer;
+    alGenBuffers(1, &buffer);
+    alBufferData(buffer, AL_FORMAT_MONO16, sndData1.data(), sndData1.size(), 44100);
+    alSourcei(core->alMainSource, AL_BUFFER, buffer);
+    alSourcePlay(core->alMainSource);
+}
+
 void Widget::onFriendRequestReceived(const QString& userId, const QString& message)
 {
     FriendRequestDialog dialog(this, userId, message);
diff --git a/widget/widget.h b/widget/widget.h
index c9d4e6388..b7abc60fa 100644
--- a/widget/widget.h
+++ b/widget/widget.h
@@ -104,6 +104,7 @@ private slots:
     void setStatusBusy();
     void onMessageSendResult(int friendId, const QString& message, int messageId);
     void onGroupSendResult(int groupId, const QString& message, int result);
+    void playRingtone();
 
 private:
     void hideMainForms();

From 19199670827afb7e92c630650201557a1b7bcab0 Mon Sep 17 00:00:00 2001
From: Zetok Zalbavar <zexavexxe@gmail.com>
Date: Wed, 8 Oct 2014 11:57:41 +0100
Subject: [PATCH 204/205] Add initial Pirate translation

---
 qtox.pro               |   1 +
 translations/pirate.qm | Bin 0 -> 5594 bytes
 translations/pirate.ts | 545 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 546 insertions(+)
 create mode 100644 translations/pirate.qm
 create mode 100644 translations/pirate.ts

diff --git a/qtox.pro b/qtox.pro
index 879112e5f..edddb76ae 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -36,6 +36,7 @@ TRANSLATIONS = translations/de.ts \
                translations/fr.ts \
                translations/it.ts \
                translations/ru.ts \
+               translations/pirate.ts \
                translations/pl.ts \
                translations/fi.ts \
                translations/mannol.ts \
diff --git a/translations/pirate.qm b/translations/pirate.qm
new file mode 100644
index 0000000000000000000000000000000000000000..c245f536e083b1e475331d727597efdc80efd548
GIT binary patch
literal 5594
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

literal 0
HcmV?d00001

diff --git a/translations/pirate.ts b/translations/pirate.ts
new file mode 100644
index 000000000..85a149a95
--- /dev/null
+++ b/translations/pirate.ts
@@ -0,0 +1,545 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="en_PIRATE">
+<context>
+    <name>AVForm</name>
+    <message>
+        <location filename="../widget/form/settings/avform.cpp" line="22"/>
+        <source>Audio/Video settings</source>
+        <translation type="unfinished">Hollerin&apos;/Crystals o&apos; Far-Seein&apos; settings</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/avform.cpp" line="41"/>
+        <source>Hide video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished">Hide crystals o&apos; Far-Seein&apos; preview</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/avform.cpp" line="47"/>
+        <source>Show video preview</source>
+        <comment>On a button</comment>
+        <translation type="unfinished">See crystals o&apos; Far-Seein&apos; preview</translation>
+    </message>
+</context>
+<context>
+    <name>AVSettings</name>
+    <message>
+        <location filename="../widget/form/settings/avsettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/avsettings.ui" line="20"/>
+        <source>Video settings</source>
+        <translation type="unfinished">Crystals o&apos; Far-Seein&apos; settings</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/avsettings.ui" line="26"/>
+        <source>Show video preview</source>
+        <translation type="unfinished">See crystals o&apos; Far-Seein&apos; preview</translation>
+    </message>
+</context>
+<context>
+    <name>AddFriendForm</name>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="34"/>
+        <source>Add Friends</source>
+        <translation>Recruit yer crew</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="37"/>
+        <source>Tox ID</source>
+        <comment>Tox ID of the person you&apos;re sending a friend request to</comment>
+        <translation>Tox ID</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="38"/>
+        <source>Message</source>
+        <comment>The message you send in friend requests</comment>
+        <translation type="unfinished">Parchment Bottle of recruiting</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="39"/>
+        <source>Send friend request</source>
+        <translation type="unfinished">Send recruitment letter</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="40"/>
+        <source>Tox me maybe?</source>
+        <comment>Default message in friend requests if the field is left blank. Write something appropriate!</comment>
+        <translation type="unfinished">Tox, arrr?</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="96"/>
+        <source>Please fill in a valid Tox ID</source>
+        <comment>Tox ID of the friend you&apos;re sending a friend request to</comment>
+        <translation type="unfinished">Throw in here Tox ID, but a rightful one!</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="99"/>
+        <source>You can&apos;t add yourself as a friend!</source>
+        <comment>When trying to add your own Tox ID as friend</comment>
+        <translation type="unfinished">Yer cannot add yerself in yer crew!</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="116"/>
+        <source>This address does not exist</source>
+        <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
+        <translation type="unfinished">Recruitment address yer usin&apos; ain&apos;t there</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="120"/>
+        <source>Error while looking up DNS</source>
+        <comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
+        <translation type="unfinished">DNS witchery errored upon looking</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="126"/>
+        <source>Unexpected number of text records</source>
+        <comment>Error with the DNS</comment>
+        <translation type="unfinished">All numbery that DNS brought upon was unexpectable</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="132"/>
+        <source>Unexpected number of values in text record</source>
+        <comment>Error with the DNS</comment>
+        <translation type="unfinished">All things </translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="139"/>
+        <source>The DNS lookup does not contain any Tox ID</source>
+        <comment>Error with the DNS</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/addfriendform.cpp" line="145"/>
+        <location filename="../widget/form/addfriendform.cpp" line="151"/>
+        <source>The DNS lookup does not contain a valid Tox ID</source>
+        <comment>Error with the DNS</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ChatForm</name>
+    <message>
+        <location filename="../widget/form/chatform.cpp" line="105"/>
+        <source>Send a file</source>
+        <translation type="unfinished">Send treasure</translation>
+    </message>
+</context>
+<context>
+    <name>Core</name>
+    <message>
+        <location filename="../core.cpp" line="1068"/>
+        <source>Encrypted profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../core.cpp" line="1069"/>
+        <source>Your tox profile seems to be encrypted, qTox can&apos;t open it
+Do you want to erase this profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FileTransferInstance</name>
+    <message>
+        <location filename="../filetransferinstance.cpp" line="208"/>
+        <source>Save a file</source>
+        <comment>Title of the file saving dialog</comment>
+        <translation type="unfinished">Receive treasure</translation>
+    </message>
+    <message>
+        <location filename="../filetransferinstance.cpp" line="219"/>
+        <source>Location not writable</source>
+        <comment>Title of permissions popup</comment>
+        <translation type="unfinished">Cannot bury treasure here</translation>
+    </message>
+    <message>
+        <location filename="../filetransferinstance.cpp" line="219"/>
+        <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
+        <comment>text of permissions popup</comment>
+        <translation type="unfinished">Captain did&apos;t give permission bury that treasure here! Find another location or abandon hope of keepin&apos; it.</translation>
+    </message>
+</context>
+<context>
+    <name>FilesForm</name>
+    <message>
+        <location filename="../widget/form/filesform.cpp" line="30"/>
+        <source>Transfered Files</source>
+        <comment>&quot;Headline&quot; of the window</comment>
+        <translation type="unfinished">Treasures given/received</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/filesform.cpp" line="38"/>
+        <source>Downloads</source>
+        <translation type="unfinished">Received</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/filesform.cpp" line="39"/>
+        <source>Uploads</source>
+        <translation type="unfinished">Sent</translation>
+    </message>
+</context>
+<context>
+    <name>FriendRequestDialog</name>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="30"/>
+        <source>Friend request</source>
+        <comment>Title of the window to aceept/deny a friend request</comment>
+        <translation type="unfinished">Recruitment</translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="32"/>
+        <source>Someone wants to make friends with you</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="33"/>
+        <source>User ID:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="37"/>
+        <source>Friend request message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="44"/>
+        <source>Accept</source>
+        <comment>Accept a friend request</comment>
+        <translation type="unfinished">Arr</translation>
+    </message>
+    <message>
+        <location filename="../widget/tool/friendrequestdialog.cpp" line="45"/>
+        <source>Reject</source>
+        <comment>Reject a friend request</comment>
+        <translation type="unfinished">No</translation>
+    </message>
+</context>
+<context>
+    <name>FriendWidget</name>
+    <message>
+        <location filename="../widget/friendwidget.cpp" line="48"/>
+        <source>Copy friend ID</source>
+        <comment>Menu to copy the Tox ID of that friend</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/friendwidget.cpp" line="49"/>
+        <source>Invite in group</source>
+        <comment>Menu to invite a friend in a groupchat</comment>
+        <translation type="unfinished">Recruit in group</translation>
+    </message>
+    <message>
+        <location filename="../widget/friendwidget.cpp" line="59"/>
+        <source>Remove friend</source>
+        <comment>Menu to remove the friend from our friendlist</comment>
+        <translation type="unfinished">Throw out traitor</translation>
+    </message>
+</context>
+<context>
+    <name>GeneralForm</name>
+    <message>
+        <location filename="../widget/form/settings/generalform.cpp" line="26"/>
+        <source>General Settings</source>
+        <translation type="unfinished">O&apos; ship settings</translation>
+    </message>
+</context>
+<context>
+    <name>GeneralSettings</name>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="29"/>
+        <source>General Settings</source>
+        <translation type="unfinished">O&apos; ship settings</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="35"/>
+        <source>Use translations</source>
+        <extracomment>Text on a checkbox to enable translations</extracomment>
+        <translation type="unfinished">Linguistics use</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="42"/>
+        <source>Save settings to the working directory instead of the usual conf dir</source>
+        <extracomment>describes makeToxPortable checkbox</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="45"/>
+        <source>Make Tox portable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="55"/>
+        <source>Theme</source>
+        <translation type="unfinished">Lookin&apos;</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="61"/>
+        <source>Smiley Pack</source>
+        <extracomment>Text on smiley pack label</extracomment>
+        <translation type="unfinished">Teeth showin&apos; box</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="74"/>
+        <source>Connection Settings</source>
+        <translation type="unfinished">Sailin&apos; setting</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="80"/>
+        <source>Enable IPv6 (recommended)</source>
+        <extracomment>Text on a checkbox to enable IPv6</extracomment>
+        <translation type="unfinished">Use IPv6 (good for ya)</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="87"/>
+        <source>This allows, e.g., toxing over Tor. It adds load to the Tox network however, so use only when necessary.</source>
+        <extracomment>force tcp checkbox tooltip</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="90"/>
+        <source>Disable UDP (not recommended)</source>
+        <extracomment>Text on checkbox to disable UDP</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="97"/>
+        <source>Use proxy (SOCKS5)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="106"/>
+        <source>Address</source>
+        <extracomment>Text on proxy addr label</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/generalsettings.ui" line="116"/>
+        <source>Port</source>
+        <extracomment>Text on proxy port label</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GenericChatForm</name>
+    <message>
+        <location filename="../widget/form/genericchatform.cpp" line="149"/>
+        <location filename="../widget/form/genericchatform.cpp" line="155"/>
+        <source>Save chat log</source>
+        <translation type="unfinished">Write log of yer talkin&apos;</translation>
+    </message>
+</context>
+<context>
+    <name>GroupChatForm</name>
+    <message>
+        <location filename="../widget/form/groupchatform.cpp" line="47"/>
+        <source>%1 users in chat</source>
+        <comment>Number of users in chat</comment>
+        <translation type="unfinished">%1 mates in chat</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/groupchatform.cpp" line="85"/>
+        <source>%1 users in chat</source>
+        <translation type="unfinished">%1 mates in chat</translation>
+    </message>
+</context>
+<context>
+    <name>GroupWidget</name>
+    <message>
+        <location filename="../widget/groupwidget.cpp" line="39"/>
+        <location filename="../widget/groupwidget.cpp" line="59"/>
+        <source>%1 users in chat</source>
+        <translation type="unfinished">%1 mates in chat</translation>
+    </message>
+    <message>
+        <location filename="../widget/groupwidget.cpp" line="41"/>
+        <location filename="../widget/groupwidget.cpp" line="61"/>
+        <source>0 users in chat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/groupwidget.cpp" line="48"/>
+        <source>Quit group</source>
+        <comment>Menu to quit a groupchat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IdentityForm</name>
+    <message>
+        <location filename="../widget/form/settings/identityform.cpp" line="29"/>
+        <source>Your identity</source>
+        <translation type="unfinished">Yer self</translation>
+    </message>
+</context>
+<context>
+    <name>IdentitySettings</name>
+    <message>
+        <location filename="../widget/form/settings/identitysettings.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/identitysettings.ui" line="20"/>
+        <source>Public Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/identitysettings.ui" line="26"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/identitysettings.ui" line="36"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/identitysettings.ui" line="49"/>
+        <source>Tox ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settings/identitysettings.ui" line="55"/>
+        <source>Your Tox ID (click to copy)</source>
+        <translation type="unfinished">Yer Tox ID (hit to steal)</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../mainwindow.ui" line="20"/>
+        <source>qTox</source>
+        <translation>qTox</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="859"/>
+        <source>Your name</source>
+        <translation>Yer name</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="941"/>
+        <source>Your status</source>
+        <translation>Yer status</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="1089"/>
+        <source>Add friends</source>
+        <translation>Recruit crew</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="1115"/>
+        <source>Create a group chat</source>
+        <translation>Make a chat with yer mates</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="1147"/>
+        <source>View completed file transfers</source>
+        <translation>See treasures given and received</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="1179"/>
+        <source>Change your settings</source>
+        <translation>Change yer setting&apos;</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="1761"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="1764"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PrivacyForm</name>
+    <message>
+        <location filename="../widget/form/settings/privacyform.cpp" line="21"/>
+        <source>Privacy settings</source>
+        <translation>Secrecy settin&apos;</translation>
+    </message>
+</context>
+<context>
+    <name>SelfCamView</name>
+    <message>
+        <location filename="../widget/selfcamview.cpp" line="33"/>
+        <source>Tox video test</source>
+        <comment>Title of the window to test the video/webcam</comment>
+        <translation>Tox crystals o&apos; Far-Seein&apos; test</translation>
+    </message>
+</context>
+<context>
+    <name>Widget</name>
+    <message>
+        <location filename="../widget/widget.cpp" line="88"/>
+        <source>Online</source>
+        <comment>Button to set your status to &apos;Online&apos;</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="90"/>
+        <source>Away</source>
+        <comment>Button to set your status to &apos;Away&apos;</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="92"/>
+        <source>Busy</source>
+        <comment>Button to set your status to &apos;Busy&apos;</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="225"/>
+        <source>Choose a profile picture</source>
+        <translation>Choose yer flag</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="232"/>
+        <location filename="../widget/widget.cpp" line="239"/>
+        <location filename="../widget/widget.cpp" line="260"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="232"/>
+        <source>Unable to open this file</source>
+        <translation>Treasure cannot be opened</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="239"/>
+        <source>Unable to read this image</source>
+        <translation type="unfinished">Cannot see treasure</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="260"/>
+        <source>This image is too big</source>
+        <translation type="unfinished">Yer flag too big</translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="287"/>
+        <source>Toxcore failed to start, the application will terminate after you close this message.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="296"/>
+        <source>toxcore failed to start with your proxy settings. qTox cannot run; please modify your settings and restart.</source>
+        <comment>popup text</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget/widget.cpp" line="611"/>
+        <source>&lt;Unknown&gt;</source>
+        <comment>Placeholder when we don&apos;t know someone&apos;s name in a group chat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>

From 7ba9ac69dc8afb997ffa8742f79cab914b9d01c1 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Wed, 8 Oct 2014 13:49:11 +0200
Subject: [PATCH 205/205] Embed pirate translation

---
 res.qrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res.qrc b/res.qrc
index 4ef12f901..4a8180ced 100644
--- a/res.qrc
+++ b/res.qrc
@@ -138,5 +138,6 @@
         <file>ui/window/statusPanel.css</file>
         <file>ui/settings/mainContent.css</file>
         <file>ui/settings/mainHead.css</file>
+        <file>translations/pirate.qm</file>
     </qresource>
 </RCC>