Merge branch 'master' into corencryption

Conflicts:
	src/misc/settings.cpp
	src/misc/settings.h
	src/widget/widget.h

debian/control

@@ -3,11 +3,11 @@ Maintainer: John Smith <barrdetwix@gmail.com>
 Section: misc
 Priority: optional
 Standards-Version: 3.9.5
-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
+Build-Depends: debhelper (>= 9), cdbs, qt5-qmake, libopenal-dev (>= 1:1.14), libopencv-dev (>= 2.3), libopus-dev (>= 0.9), qtbase5-dev (>= 5.2), sudo, autoconf, libtool, pkg-config, libvpx-dev
 
 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: ${shlibs:Depends}, ${misc:Depends}, libgcc1 (>= 1:4.1.1), libgl1-mesa-glx | libgl1, libopenal1 (>= 1.14), libopus0 (>= 0.9), 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

src/misc/settings.cpp

@@ -115,7 +115,8 @@ void Settings::load()
         useProxy = s.value("useProxy", false).toBool();
         proxyAddr = s.value("proxyAddr", "").toString();
         proxyPort = s.value("proxyPort", 0).toInt();
-		currentProfile = s.value("currentProfile", "").toString();
+        currentProfile = s.value("currentProfile", "").toString();
+    	autoAwayTime = s.value("autoAwayTime", 10).toInt();
     s.endGroup();
 
     s.beginGroup("Widgets");
@@ -136,6 +137,8 @@ void Settings::load()
         timestampFormat = s.value("timestampFormat", "hh:mm").toString();
         minimizeOnClose = s.value("minimizeOnClose", false).toBool();
         useNativeStyle = s.value("nativeStyle", false).toBool();
+        style = s.value("style", "None").toString();
+        statusChangeNotificationEnabled = s.value("statusChangeNotificationEnabled", false).toBool();
     s.endGroup();
 
     s.beginGroup("State");
@@ -221,6 +224,7 @@ void Settings::save(QString path)
         s.setValue("proxyAddr", proxyAddr);
         s.setValue("proxyPort", proxyPort);
         s.setValue("currentProfile", currentProfile);
+        s.setValue("autoAwayTime", autoAwayTime);
     s.endGroup();
 
     s.beginGroup("Widgets");
@@ -241,6 +245,8 @@ void Settings::save(QString path)
         s.setValue("timestampFormat", timestampFormat);
         s.setValue("minimizeOnClose", minimizeOnClose);
         s.setValue("nativeStyle", useNativeStyle);
+        s.setValue("style",style);
+        s.setValue("statusChangeNotificationEnabled", statusChangeNotificationEnabled);
     s.endGroup();
 
     s.beginGroup("State");
@@ -358,11 +364,31 @@ bool Settings::getAutostartInTray() const
     return autostartInTray;
 }
 
+QString Settings::getStyle() const
+{
+    return style;
+}
+
+void Settings::setStyle(const QString& newStyle) 
+{
+    style = newStyle;
+}
+
 void Settings::setAutostartInTray(bool newValue)
 {
     autostartInTray = newValue;
 }
 
+bool Settings::getStatusChangeNotificationEnabled() const
+{
+    return statusChangeNotificationEnabled;
+}
+
+void Settings::setStatusChangeNotificationEnabled(bool newValue)
+{
+    statusChangeNotificationEnabled = newValue;
+}
+
 bool Settings::getUseTranslations() const
 {
     return useTranslations;
@@ -452,6 +478,18 @@ void Settings::setEncryptTox(bool newValue)
     encryptTox = newValue;
 }
 
+int Settings::getAutoAwayTime() const
+{
+    return autoAwayTime;
+}
+
+void Settings::setAutoAwayTime(int newValue)
+{
+    if (newValue < 0)
+        newValue = 10;
+    autoAwayTime = newValue;
+}
+
 void Settings::setWidgetData(const QString& uniqueName, const QByteArray& data)
 {
     widgetSettings[uniqueName] = data;

src/misc/settings.h

@@ -51,6 +51,9 @@ public:
 
     bool getAutostartInTray() const;
     void setAutostartInTray(bool newValue);
+    
+    QString getStyle() const;
+    void setStyle(const QString& newValue);
 
     QString getCurrentProfile() const;
     void setCurrentProfile(QString profile);
@@ -79,6 +82,9 @@ public:
     bool getEncryptTox() const;
     void setEncryptTox(bool newValue);
 
+    int getAutoAwayTime() const;
+    void setAutoAwayTime(int newValue);
+
     QPixmap getSavedAvatar(const QString& ownerId);
     void saveAvatar(QPixmap& pic, const QString& ownerId);
 
@@ -135,10 +141,14 @@ public:
     bool isMinimizeOnCloseEnabled() const;
     void setMinimizeOnClose(bool newValue);
 
+    bool getStatusChangeNotificationEnabled() const;
+    void setStatusChangeNotificationEnabled(bool newValue);
+
     // Privacy
     bool isTypingNotificationEnabled() const;
     void setTypingNotification(bool enabled);
 
+    // State
     bool getUseNativeStyle() const;
     void setUseNativeStyle(bool value);
 
@@ -188,6 +198,8 @@ private:
     bool encryptLogs;
     bool encryptTox;
 
+    int autoAwayTime;
+
     QHash<QString, QByteArray> widgetSettings;
 
     // GUI
@@ -201,11 +213,13 @@ private:
     QByteArray windowGeometry;
     QByteArray windowState;
     QByteArray splitterState;
-
+    QString style;
+    
     // ChatView
     int firstColumnHandlePos;
     int secondColumnHandlePosFromRight;
     QString timestampFormat;
+    bool statusChangeNotificationEnabled;
 
     // Privacy
     bool typingNotification;

src/misc/smileypack.cpp

@@ -127,12 +127,21 @@ bool SmileyPack::load(const QString& filename)
         {
             QString emoticon = stringElement.text();
             filenameTable.insert(emoticon, file);
-            emoticonSet.push_back(emoticon);
+            
             cacheSmiley(file); // preload all smileys
-
+            
+            QPixmap pm;
+            pm.loadFromData(getCachedSmiley(emoticon), "PNG");
+            
+            if(pm.size().width() > 0) 
+                emoticonSet.push_back(emoticon);
+            
             stringElement = stringElement.nextSibling().toElement();
+            
         }
-        emoticons.push_back(emoticonSet);
+        
+        if(emoticonSet.size() > 0)
+            emoticons.push_back(emoticonSet);
     }
 
     // success!
@@ -176,7 +185,6 @@ QIcon SmileyPack::getAsIcon(const QString &key)
 {
     QPixmap pm;
     pm.loadFromData(getCachedSmiley(key), "PNG");
-
     return QIcon(pm);
 }
 

src/widget/chatareawidget.cpp

@@ -118,6 +118,11 @@ void ChatAreaWidget::insertMessage(ChatAction *msgAction)
     messages.append(msgAction);
 }
 
+int ChatAreaWidget::getNumberOfMessages()
+{
+    return messages.size();
+}
+
 void ChatAreaWidget::onSliderRangeChanged()
 {
     QScrollBar* scroll = verticalScrollBar();

src/widget/chatareawidget.h

@@ -33,6 +33,7 @@ public:
 
     int nameColWidth() {return nameWidth;}
     void setNameColWidth(int w);
+    int getNumberOfMessages();
 
 signals:
     void onFileTranfertInterract(QString widgetName, QString buttonName);

src/widget/form/genericchatform.cpp

@@ -127,6 +127,11 @@ GenericChatForm::GenericChatForm(QWidget *parent) :
     connect(chatWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onChatContextMenuRequested(QPoint)));
 }
 
+int GenericChatForm::getNumberOfMessages()
+{
+    return chatWidget->getNumberOfMessages();
+}
+
 void GenericChatForm::setName(const QString &newName)
 {
     nameLabel->setText(newName);

src/widget/form/genericchatform.h

@@ -46,7 +46,8 @@ public:
     virtual void show(Ui::MainWindow &ui);
     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());
-
+    int getNumberOfMessages();
+    
 signals:
     void sendMessage(int, QString);
     void sendAction(int, QString);

src/widget/form/settings/generalform.cpp

@@ -21,24 +21,39 @@
 #include "src/misc/settings.h"
 #include "src/misc/smileypack.h"
 #include <QMessageBox>
+#include <QStyleFactory>
 
-GeneralForm::GeneralForm() :
+GeneralForm::GeneralForm(SettingsWidget *myParent) :
     GenericForm(tr("General Settings"), QPixmap(":/img/settings/general.png"))
 {
+    parent = myParent;    
+    
     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());
     bodyUI->startInTray->setChecked(Settings::getInstance().getAutostartInTray());
+    bodyUI->statusChangesCheckbox->setChecked(Settings::getInstance().getStatusChangeNotificationEnabled());
 
     for (auto entry : SmileyPack::listSmileyPacks())
     {
         bodyUI->smileyPackBrowser->addItem(entry.first, entry.second);
     }
     bodyUI->smileyPackBrowser->setCurrentIndex(bodyUI->smileyPackBrowser->findData(Settings::getInstance().getSmileyPack()));
+    reloadSmiles();
 
+    bodyUI->styleBrowser->addItems(QStyleFactory::keys());
+    bodyUI->styleBrowser->addItem("None");
+        
+    if(QStyleFactory::keys().contains(Settings::getInstance().getStyle()))
+        bodyUI->styleBrowser->setCurrentText(Settings::getInstance().getStyle());
+    else
+        bodyUI->styleBrowser->setCurrentText("None");
+    
+    bodyUI->autoAwaySpinBox->setValue(Settings::getInstance().getAutoAwayTime());
+    
     bodyUI->cbUDPDisabled->setChecked(Settings::getInstance().getForceTCP());
     bodyUI->proxyAddr->setText(Settings::getInstance().getProxyAddr());
     int port = Settings::getInstance().getProxyPort();
@@ -52,12 +67,15 @@ GeneralForm::GeneralForm() :
     connect(bodyUI->cbUseTranslations, &QCheckBox::stateChanged, this, &GeneralForm::onUseTranslationUpdated);
     connect(bodyUI->cbMakeToxPortable, &QCheckBox::stateChanged, this, &GeneralForm::onMakeToxPortableUpdated);
     connect(bodyUI->startInTray, &QCheckBox::stateChanged, this, &GeneralForm::onSetAutostartInTray);
+    connect(bodyUI->statusChangesCheckbox, &QCheckBox::stateChanged, this, &GeneralForm::onSetStatusChange);
     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, SIGNAL(valueChanged(int)), this, SLOT(onProxyPortEdited(int)));
     connect(bodyUI->cbUseProxy, &QCheckBox::stateChanged, this, &GeneralForm::onUseProxyUpdated);
+    connect(bodyUI->styleBrowser, SIGNAL(currentTextChanged(QString)), this, SLOT(onStyleSelected(QString)));
+    connect(bodyUI->autoAwaySpinBox, SIGNAL(editingFinished()), this, SLOT(onAutoAwayChanged()));
 }
 
 GeneralForm::~GeneralForm()
@@ -85,10 +103,30 @@ void GeneralForm::onSetAutostartInTray()
     Settings::getInstance().setAutostartInTray(bodyUI->startInTray->isChecked());
 }
 
+void GeneralForm::onStyleSelected(QString style)
+{
+    Settings::getInstance().setStyle(style);
+    this->setStyle(QStyleFactory::create(style));
+    parent->setBodyHeadStyle(style);
+}
+
+void GeneralForm::onAutoAwayChanged()
+{
+    int minutes = bodyUI->autoAwaySpinBox->value();
+    Settings::getInstance().setAutoAwayTime(minutes);
+    Widget::getInstance()->setIdleTimer(minutes);
+}
+
+void GeneralForm::onSetStatusChange()
+{
+    Settings::getInstance().setStatusChangeNotificationEnabled(bodyUI->statusChangesCheckbox->isChecked());
+}
+
 void GeneralForm::onSmileyBrowserIndexChanged(int index)
 {
     QString filename = bodyUI->smileyPackBrowser->itemData(index).toString();
     Settings::getInstance().setSmileyPack(filename);
+    reloadSmiles();
 }
 
 void GeneralForm::onUDPUpdated()
@@ -119,3 +157,26 @@ void GeneralForm::onUseProxyUpdated()
     bodyUI->proxyPort->setEnabled(state);
     Settings::getInstance().setUseProxy(state);
 }
+
+void GeneralForm::reloadSmiles()
+{
+    QList<QStringList> emoticons = SmileyPack::getInstance().getEmoticons();
+    QStringList smiles;
+    smiles << ":)" << ";)" << ":p" << ":O" << ":["; //just in case...
+
+    for(int i = 0; i < emoticons.size(); i++)  
+        smiles.push_front(emoticons.at(i).first());
+        
+    int pixSize = 30;
+    bodyUI->smile1->setPixmap(SmileyPack::getInstance().getAsIcon(smiles[0]).pixmap(pixSize, pixSize));
+    bodyUI->smile2->setPixmap(SmileyPack::getInstance().getAsIcon(smiles[1]).pixmap(pixSize, pixSize));
+    bodyUI->smile3->setPixmap(SmileyPack::getInstance().getAsIcon(smiles[2]).pixmap(pixSize, pixSize));
+    bodyUI->smile4->setPixmap(SmileyPack::getInstance().getAsIcon(smiles[3]).pixmap(pixSize, pixSize));
+    bodyUI->smile5->setPixmap(SmileyPack::getInstance().getAsIcon(smiles[4]).pixmap(pixSize, pixSize));
+    
+    bodyUI->smile1->setToolTip(smiles[0]);    
+    bodyUI->smile2->setToolTip(smiles[1]);
+    bodyUI->smile3->setToolTip(smiles[2]);
+    bodyUI->smile4->setToolTip(smiles[3]);
+    bodyUI->smile5->setToolTip(smiles[4]);
+}

src/widget/form/settings/generalform.h

@@ -18,8 +18,6 @@
 #define GENERALFORM_H
 
 #include "genericsettings.h"
-#include <QComboBox>
-#include <QCheckBox>
 
 namespace Ui {
 class GeneralSettings;
@@ -29,7 +27,7 @@ class GeneralForm : public GenericForm
 {
     Q_OBJECT
 public:
-    GeneralForm();
+    GeneralForm(SettingsWidget *parent);
     ~GeneralForm();
 
 private slots:
@@ -42,9 +40,15 @@ private slots:
     void onProxyAddrEdited();
     void onProxyPortEdited(int port);
     void onUseProxyUpdated();
+    void onStyleSelected(QString style);    
+    void onSetStatusChange();
+    void onAutoAwayChanged();
+    
 
 private:
     Ui::GeneralSettings *bodyUI;
+    void reloadSmiles();
+    SettingsWidget *parent;
 };
 
 #endif

src/widget/form/settings/generalsettings.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>527</width>
-    <height>369</height>
+    <height>500</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -53,6 +53,49 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QCheckBox" name="statusChangesCheckbox">
+        <property name="text">
+         <string>Show contacts' status changes</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item alignment="Qt::AlignLeft">
+         <widget class="QLabel" name="autoAwayLabel">
+          <property name="toolTip">
+           <string>Provided in minutes</string>
+          </property>
+          <property name="layoutDirection">
+           <enum>Qt::LeftToRight</enum>
+          </property>
+          <property name="text">
+           <string>Auto away after:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="autoAwaySpinBox">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="suffix">
+           <string> minutes</string>
+          </property>
+          <property name="minimum">
+           <number>1</number>
+          </property>
+          <property name="maximum">
+           <number>600</number>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
      </layout>
     </widget>
    </item>
@@ -72,6 +115,70 @@
       <item>
        <widget class="QComboBox" name="smileyPackBrowser"/>
       </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QLabel" name="smile1">
+          <property name="toolTip">
+           <string>:)</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="smile2">
+          <property name="toolTip">
+           <string>;)</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="smile3">
+          <property name="toolTip">
+           <string>:p</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="smile4">
+          <property name="toolTip">
+           <string>:O</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="smile5">
+          <property name="toolTip">
+           <string>:'(</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="QLabel" name="styleLabel">
+        <property name="text">
+         <string>Style</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="styleBrowser"/>
+      </item>
      </layout>
     </widget>
    </item>

src/widget/form/settings/identityform.cpp

@@ -168,10 +168,17 @@ void IdentityForm::onImportClicked()
     QString path = QFileDialog::getOpenFileName(this, tr("Import profile", "import dialog title"), QDir::homePath(), tr("Tox save file (*.tox)", "import dialog filter"));
     if (path.isEmpty())
         return;
+
     QFileInfo info(path);
+
+    if (info.suffix() != "tox")
+    {
+        QMessageBox::warning(this, tr("Ignoring non-Tox file", "popup title"), tr("Warning: you've chosen a file that is not a Tox save file; ignoring.", "popup text"));
+        return;
+    }
+
     QString profile = info.completeBaseName();
     QString profilePath = QDir(Settings::getSettingsDirPath()).filePath(profile + Core::TOX_EXT);
     QFile::copy(path, profilePath);
     bodyUI->profiles->addItem(profile);
-    Core::getInstance()->switchConfiguration(profile);
 }

src/widget/form/settingswidget.cpp

@@ -52,7 +52,7 @@ SettingsWidget::SettingsWidget(QWidget* parent)
     tabBar = new QTabBar;
     bodyLayout->addWidget(tabBar);
 
-    GeneralForm *gfrm = new GeneralForm;
+    GeneralForm *gfrm = new GeneralForm(this);
     ifrm = new IdentityForm;
     PrivacyForm *pfrm = new PrivacyForm;
     AVForm *avfrm = new AVForm;
@@ -73,6 +73,12 @@ SettingsWidget::~SettingsWidget()
 {
 }
 
+void SettingsWidget::setBodyHeadStyle(QString style)
+{
+    head->setStyle(QStyleFactory::create(style));    
+    body->setStyle(QStyleFactory::create(style));
+}
+
 void SettingsWidget::show(Ui::MainWindow& ui)
 {
     ui.mainContent->layout()->addWidget(body);

src/widget/form/settingswidget.h

@@ -19,6 +19,8 @@
 
 #include <QHBoxLayout>
 #include <QPushButton>
+#include <QStyleFactory>
+
 class Camera;
 class GenericForm;
 class GeneralForm;
@@ -40,6 +42,7 @@ public:
 
     void show(Ui::MainWindow &ui);
     IdentityForm *getIdentityForm() {return ifrm;}
+    void setBodyHeadStyle(QString style);
 
 private slots:
     void onTabChanged(int);

src/widget/widget.cpp

@@ -42,7 +42,9 @@
 #include <QThread>
 #include <QFileDialog>
 #include <QInputDialog>
+#include <QTimer>
 #include <tox/tox.h>
+#include <QStyleFactory>
 
 Widget *Widget::instance{nullptr};
 
@@ -74,7 +76,16 @@ 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"));
+    
+
+    if(QStyleFactory::keys().contains(Settings::getInstance().getStyle())
+            && Settings::getInstance().getStyle() != "None")
+    {
+        ui->mainHead->setStyle(QStyleFactory::create(Settings::getInstance().getStyle()));
+        ui->mainContent->setStyle(QStyleFactory::create(Settings::getInstance().getStyle()));
+    }
+    
+    ui->mainHead->setStyleSheet(Style::getStylesheet(":ui/settings/mainHead.css"));    
     ui->mainContent->setStyleSheet(Style::getStylesheet(":ui/settings/mainContent.css"));
 
     contactListWidget = new FriendListWidget();
@@ -107,6 +118,11 @@ Widget::Widget(QWidget *parent)
     // Disable some widgets until we're connected to the DHT
     ui->statusButton->setEnabled(false);
 
+    idleTimer = new QTimer();
+    int mins = Settings::getInstance().getAutoAwayTime();
+    if (mins > 0)
+        idleTimer->start(mins * 1000*60);
+
     qRegisterMetaType<Status>("Status");
     qRegisterMetaType<vpx_image>("vpx_image");
     qRegisterMetaType<uint8_t>("uint8_t");
@@ -135,7 +151,6 @@ Widget::Widget(QWidget *parent)
     connect(core, SIGNAL(fileUploadFinished(const QString&)), &filesForm, SLOT(onFileUploadComplete(const QString&)));
     connect(core, &Core::friendAdded, this, &Widget::addFriend);
     connect(core, &Core::failedToAddFriend, this, &Widget::addFriendFailed);
-    connect(core, &Core::friendStatusChanged, this, &Widget::onFriendStatusChanged);
     connect(core, &Core::friendUsernameChanged, this, &Widget::onFriendUsernameChanged);
     connect(core, &Core::friendStatusChanged, this, &Widget::onFriendStatusChanged);
     connect(core, &Core::friendStatusMessageChanged, this, &Widget::onFriendStatusMessageChanged);
@@ -170,6 +185,7 @@ Widget::Widget(QWidget *parent)
     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)));
+    connect(idleTimer, &QTimer::timeout, this, &Widget::onUserAway);
 
     coreThread->start();
 
@@ -279,6 +295,11 @@ QString Widget::askProfiles()
         return profile;
 }
 
+void Widget::setIdleTimer(int minutes)
+{
+    idleTimer->start(minutes * 1000*60);
+}
+
 QString Widget::getUsername()
 {
     return core->getUsername();
@@ -522,6 +543,23 @@ void Widget::onFriendStatusChanged(int friendId, Status status)
 
     f->friendStatus = status;
     f->widget->updateStatusLight();
+    
+    QString fStatus = ""; 
+    switch(f->friendStatus){
+    case Status::Away:
+        fStatus = tr("away", "contact status"); break;
+    case Status::Busy:
+        fStatus = tr("busy", "contact status"); break;
+    case Status::Offline:
+        fStatus = tr("offline", "contact status"); break;
+    default:
+        fStatus = tr("online", "contact status"); break;
+    }
+        
+    //won't print the message if there were no messages before    
+    if(f->chatForm->getNumberOfMessages() != 0
+            && Settings::getInstance().getStatusChangeNotificationEnabled() == true)
+        f->chatForm->addSystemInfoMessage(tr("%1 is now %2", "e.g. \"Dubslow is now online\"").arg(f->getName()).arg(fStatus), "white");
 }
 
 void Widget::onFriendStatusMessageChanged(int friendId, const QString& message)
@@ -783,18 +821,49 @@ bool Widget::isFriendWidgetCurActiveWidget(Friend* f)
 
 bool Widget::event(QEvent * e)
 {
-    if (e->type() == QEvent::WindowActivate)
+    switch(e->type()) {
-    {
+        case QEvent::WindowActivate:
-        if (activeChatroomWidget != nullptr)
+            if (activeChatroomWidget != nullptr)
-        {
+            {
-            activeChatroomWidget->resetEventFlags();
+                activeChatroomWidget->resetEventFlags();
-            activeChatroomWidget->updateStatusLight();
+                activeChatroomWidget->updateStatusLight();
-        }
+            }
+        // http://qt-project.org/faq/answer/how_can_i_detect_a_period_of_no_user_interaction
+        // Detecting global inactivity, like Skype, is possible but not via Qt:
+        // http://stackoverflow.com/a/21905027/1497645
+        case QEvent::MouseButtonPress:
+        case QEvent::MouseButtonRelease:
+        case QEvent::Wheel:
+        case QEvent::KeyPress:
+        case QEvent::KeyRelease:
+            if (autoAwayActive)
+            {
+                qDebug() << "Widget: auto away deactivated";
+                autoAwayActive = false;
+                emit statusSet(Status::Online);
+                int mins = Settings::getInstance().getAutoAwayTime();
+                if (mins > 0)
+                    idleTimer->start(mins * 1000*60);
+            }
+        default:
+            break;
     }
 
     return QWidget::event(e);
 }
 
+void Widget::onUserAway()
+{
+    if (Settings::getInstance().getAutoAwayTime() > 0
+        && ui->statusButton->property("status").toString() == "online") // leave user-set statuses in place
+    {
+        qDebug() << "Widget: auto away activated";
+        emit statusSet(Status::Away);
+        autoAwayActive = true;
+    }
+    idleTimer->stop();
+}
+
 void Widget::setStatusOnline()
 {
     core->setStatus(Status::Online);

src/widget/widget.h

@@ -40,6 +40,7 @@ class Core;
 class Camera;
 class FriendListWidget;
 class MaskablePixmapWidget;
+class QTimer;
 
 class Widget : public QMainWindow
 {
@@ -57,6 +58,8 @@ public:
     bool isFriendWidgetCurActiveWidget(Friend* f);
     bool getIsWindowMinimized();
     static QList<QString> searchProfiles();
+    void clearContactsList();
+    void setIdleTimer(int minutes);    
     ~Widget();
 
     virtual void closeEvent(QCloseEvent *event);
@@ -108,7 +111,7 @@ private slots:
     void onGroupSendResult(int groupId, const QString& message, int result);
     void playRingtone();
     void onIconClick();
-    void clearContactsList();
+    void onUserAway();
     void getPassword();
 
 private:
@@ -133,6 +136,8 @@ private:
     FriendListWidget* contactListWidget;
     MaskablePixmapWidget* profilePicture;
     bool notify(QObject *receiver, QEvent *event);
+    bool autoAwayActive = false;
+    QTimer* idleTimer;
 };
 
 #endif // WIDGET_H

tools/buildPackages.sh

@@ -87,7 +87,7 @@ mv qTox-master $VERNAME
 
 # Build packages
 cd $VERNAME
-./bootstrap.sh --local
+./bootstrap.sh -t
 debuild -us -uc -aamd64
 debuild -us -uc -ai386
 cd ..

translations/it.ts

@@ -4,116 +4,144 @@
 <context>
     <name>AVForm</name>
     <message>
-        <location filename="../widget/form/settings/avform.cpp" line="22"/>
+        <location filename="../src/widget/form/settings/avform.cpp" line="22"/>
         <source>Audio/Video settings</source>
         <translation>Impostazioni Audio/Video</translation>
     </message>
-    <message>
-        <location filename="../widget/form/settings/avform.cpp" line="41"/>
-        <source>Hide video preview</source>
-        <comment>On a button</comment>
-        <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"/>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="14"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../widget/form/settings/avsettings.ui" line="20"/>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="20"/>
+        <source>Volume Settings (Stubs)</source>
+        <translation>Impostazioni Volume (Stub)</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="26"/>
+        <source>Playback</source>
+        <translation>Altoparlanti</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="40"/>
+        <source>Microphone</source>
+        <translation>Microfono</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="57"/>
         <source>Video settings</source>
         <translation>Impostazioni Video</translation>
     </message>
     <message>
-        <location filename="../widget/form/settings/avsettings.ui" line="26"/>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="66"/>
-        <source>Show video preview</source>
+        <source>Modes</source>
-        <translation>Prova webcam</translation>
+        <translation>Modalità</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="83"/>
+        <source>Hue</source>
+        <translation>Colore</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="97"/>
+        <source>Brightness</source>
+        <translation>Luminoistà</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="111"/>
+        <source>Saturation</source>
+        <translation>Saturazione</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="125"/>
+        <source>Contrast</source>
+        <translation>Contrasto</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/avsettings.ui" line="139"/>
+        <source>Preview</source>
+        <translation>Anteprima</translation>
     </message>
 </context>
 <context>
     <name>AddFriendForm</name>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="34"/>
+        <location filename="../src/widget/form/addfriendform.cpp" line="34"/>
         <source>Add Friends</source>
         <translation>Aggiungi Contatto</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="37"/>
+        <location filename="../src/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"/>
+        <location filename="../src/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="39"/>
+        <location filename="../src/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="40"/>
+        <location filename="../src/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="96"/>
+        <location filename="../src/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="99"/>
+        <location filename="../src/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>Non puoi aggiungere te stesso come contatto!</translation>
     </message>
     <message>
-        <location filename="../widget/form/addfriendform.cpp" line="116"/>
+        <location filename="../src/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="120"/>
+        <location filename="../src/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="126"/>
+        <location filename="../src/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="132"/>
+        <location filename="../src/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="139"/>
+        <location filename="../src/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="145"/>
+        <location filename="../src/widget/form/addfriendform.cpp" line="145"/>
-        <location filename="../widget/form/addfriendform.cpp" line="151"/>
+        <location filename="../src/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>
@@ -122,7 +150,7 @@
 <context>
     <name>ChatForm</name>
     <message>
-        <location filename="../widget/form/chatform.cpp" line="105"/>
+        <location filename="../src/widget/form/chatform.cpp" line="105"/>
         <source>Send a file</source>
         <translation>Invia un file</translation>
     </message>
@@ -130,12 +158,12 @@
 <context>
     <name>Core</name>
     <message>
-        <location filename="../core.cpp" line="1068"/>
+        <location filename="../src/core.cpp" line="1104"/>
         <source>Encrypted profile</source>
         <translation>Profilo criptato</translation>
     </message>
     <message>
-        <location filename="../core.cpp" line="1069"/>
+        <location filename="../src/core.cpp" line="1105"/>
         <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>
@@ -144,19 +172,19 @@ Do you want to erase this profile ?</source>
 <context>
     <name>FileTransferInstance</name>
     <message>
-        <location filename="../filetransferinstance.cpp" line="208"/>
+        <location filename="../src/filetransferinstance.cpp" line="209"/>
         <source>Save a file</source>
         <comment>Title of the file saving dialog</comment>
         <translation>Salva file</translation>
     </message>
     <message>
-        <location filename="../filetransferinstance.cpp" line="219"/>
+        <location filename="../src/filetransferinstance.cpp" line="220"/>
         <source>Location not writable</source>
         <comment>Title of permissions popup</comment>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="../filetransferinstance.cpp" line="219"/>
+        <location filename="../src/filetransferinstance.cpp" line="220"/>
         <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>
@@ -165,18 +193,18 @@ Do you want to erase this profile ?</source>
 <context>
     <name>FilesForm</name>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="30"/>
+        <location filename="../src/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="38"/>
+        <location filename="../src/widget/form/filesform.cpp" line="38"/>
         <source>Downloads</source>
         <translation>Ricevuti</translation>
     </message>
     <message>
-        <location filename="../widget/form/filesform.cpp" line="39"/>
+        <location filename="../src/widget/form/filesform.cpp" line="39"/>
         <source>Uploads</source>
         <translation>Inviati</translation>
     </message>
@@ -184,34 +212,34 @@ Do you want to erase this profile ?</source>
 <context>
     <name>FriendRequestDialog</name>
     <message>
-        <location filename="../widget/tool/friendrequestdialog.cpp" line="30"/>
+        <location filename="../src/widget/tool/friendrequestdialog.cpp" line="30"/>
         <source>Friend request</source>
         <comment>Title of the window to aceept/deny a friend request</comment>
         <translation>Richiesta d&apos;amicizia</translation>
     </message>
     <message>
-        <location filename="../widget/tool/friendrequestdialog.cpp" line="32"/>
+        <location filename="../src/widget/tool/friendrequestdialog.cpp" line="32"/>
         <source>Someone wants to make friends with you</source>
         <translation>Qualcuno vuole chattare con te</translation>
     </message>
     <message>
-        <location filename="../widget/tool/friendrequestdialog.cpp" line="33"/>
+        <location filename="../src/widget/tool/friendrequestdialog.cpp" line="33"/>
         <source>User ID:</source>
         <translation>ID Utente:</translation>
     </message>
     <message>
-        <location filename="../widget/tool/friendrequestdialog.cpp" line="37"/>
+        <location filename="../src/widget/tool/friendrequestdialog.cpp" line="37"/>
         <source>Friend request message:</source>
         <translation>Messaggio della richiesta d&apos;amicizia:</translation>
     </message>
     <message>
-        <location filename="../widget/tool/friendrequestdialog.cpp" line="44"/>
+        <location filename="../src/widget/tool/friendrequestdialog.cpp" line="44"/>
         <source>Accept</source>
         <comment>Accept a friend request</comment>
         <translation>Accetta</translation>
     </message>
     <message>
-        <location filename="../widget/tool/friendrequestdialog.cpp" line="45"/>
+        <location filename="../src/widget/tool/friendrequestdialog.cpp" line="45"/>
         <source>Reject</source>
         <comment>Reject a friend request</comment>
         <translation>Rifiuta</translation>
@@ -220,19 +248,19 @@ Do you want to erase this profile ?</source>
 <context>
     <name>FriendWidget</name>
     <message>
-        <location filename="../widget/friendwidget.cpp" line="48"/>
+        <location filename="../src/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="49"/>
+        <location filename="../src/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="59"/>
+        <location filename="../src/widget/friendwidget.cpp" line="59"/>
         <source>Remove friend</source>
         <comment>Menu to remove the friend from our friendlist</comment>
         <translation>Rimuovi contatto</translation>
@@ -241,7 +269,7 @@ Do you want to erase this profile ?</source>
 <context>
     <name>GeneralForm</name>
     <message>
-        <location filename="../widget/form/settings/generalform.cpp" line="26"/>
+        <location filename="../src/widget/form/settings/generalform.cpp" line="26"/>
         <source>General Settings</source>
         <translation>Impostazioni Generali</translation>
     </message>
@@ -249,79 +277,84 @@ Do you want to erase this profile ?</source>
 <context>
     <name>GeneralSettings</name>
     <message>
-        <location filename="../widget/form/settings/generalsettings.ui" line="14"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="14"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../widget/form/settings/generalsettings.ui" line="29"/>
+        <location filename="../src/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="74"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="81"/>
         <source>Connection Settings</source>
         <translation>Impostazioni Connessione</translation>
     </message>
     <message>
-        <location filename="../widget/form/settings/generalsettings.ui" line="80"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="87"/>
         <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="35"/>
+        <location filename="../src/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="42"/>
+        <location filename="../src/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="45"/>
+        <location filename="../src/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="55"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="52"/>
+        <source>Start in tray</source>
+        <translation>Avvia minimizzato</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="62"/>
         <source>Theme</source>
         <translation>Impostazioni Tema</translation>
     </message>
     <message>
-        <location filename="../widget/form/settings/generalsettings.ui" line="61"/>
+        <location filename="../src/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="97"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="104"/>
         <source>Use proxy (SOCKS5)</source>
         <translation>Usa proxy (SOCKS5)</translation>
     </message>
     <message>
-        <location filename="../widget/form/settings/generalsettings.ui" line="106"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="113"/>
         <source>Address</source>
         <extracomment>Text on proxy addr label</extracomment>
         <translation>IP</translation>
     </message>
     <message>
-        <location filename="../widget/form/settings/generalsettings.ui" line="116"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="123"/>
         <source>Port</source>
         <extracomment>Text on proxy port label</extracomment>
         <translation>Porta</translation>
     </message>
     <message>
-        <location filename="../widget/form/settings/generalsettings.ui" line="90"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="97"/>
         <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="87"/>
+        <location filename="../src/widget/form/settings/generalsettings.ui" line="94"/>
         <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>
@@ -330,8 +363,8 @@ Do you want to erase this profile ?</source>
 <context>
     <name>GenericChatForm</name>
     <message>
-        <location filename="../widget/form/genericchatform.cpp" line="149"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="149"/>
-        <location filename="../widget/form/genericchatform.cpp" line="155"/>
+        <location filename="../src/widget/form/genericchatform.cpp" line="155"/>
         <source>Save chat log</source>
         <translation>Salva il log della chat</translation>
     </message>
@@ -339,13 +372,13 @@ Do you want to erase this profile ?</source>
 <context>
     <name>GroupChatForm</name>
     <message>
-        <location filename="../widget/form/groupchatform.cpp" line="47"/>
+        <location filename="../src/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="85"/>
+        <location filename="../src/widget/form/groupchatform.cpp" line="85"/>
         <source>%1 users in chat</source>
         <translation>%1 utenti in chat</translation>
     </message>
@@ -353,19 +386,19 @@ Do you want to erase this profile ?</source>
 <context>
     <name>GroupWidget</name>
     <message>
-        <location filename="../widget/groupwidget.cpp" line="39"/>
+        <location filename="../src/widget/groupwidget.cpp" line="39"/>
-        <location filename="../widget/groupwidget.cpp" line="59"/>
+        <location filename="../src/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="41"/>
+        <location filename="../src/widget/groupwidget.cpp" line="41"/>
-        <location filename="../widget/groupwidget.cpp" line="61"/>
+        <location filename="../src/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="48"/>
+        <location filename="../src/widget/groupwidget.cpp" line="48"/>
         <source>Quit group</source>
         <comment>Menu to quit a groupchat</comment>
         <translation>Esci dal gruppo</translation>
@@ -374,88 +407,188 @@ Do you want to erase this profile ?</source>
 <context>
     <name>IdentityForm</name>
     <message>
-        <location filename="../widget/form/settings/identityform.cpp" line="29"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="33"/>
         <source>Your identity</source>
         <translation>Il tuo profilo</translation>
     </message>
+    <message>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="117"/>
+        <source>Rename &quot;%1&quot;</source>
+        <comment>renaming a profile</comment>
+        <translation>Rinomina &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="132"/>
+        <source>Export profile</source>
+        <comment>save dialog title</comment>
+        <translation>Esporta profilo</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="134"/>
+        <source>Tox save file (*.tox)</source>
+        <comment>save dialog filter</comment>
+        <translation>Tox save file (*.tox)</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="143"/>
+        <source>Profile currently loaded</source>
+        <comment>current profile deletion warning title</comment>
+        <translation>Profilo attualmente in uso</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="143"/>
+        <source>This profile is currently in use. Please load a different profile before deleting this one.</source>
+        <comment>current profile deletion warning text</comment>
+        <translation>Questo profilo è attualmente in uso. Per favore carica un profilo differente prima di eliminare questo.</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="148"/>
+        <source>Deletion imminent!</source>
+        <comment>deletion confirmation title</comment>
+        <translation>Eliminazione imminente!</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="148"/>
+        <source>Are you sure you want to delete this profile?</source>
+        <comment>deletion confirmation text</comment>
+        <translation>Sei sicuro di voler eliminare questo profilo?</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="160"/>
+        <source>Import profile</source>
+        <comment>import dialog title</comment>
+        <translation>Importa profilo</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="160"/>
+        <source>Tox save file (*.tox)</source>
+        <comment>import dialog filter</comment>
+        <translation>Tox save file (*.tox)</translation>
+    </message>
 </context>
 <context>
     <name>IdentitySettings</name>
     <message>
-        <location filename="../widget/form/settings/identitysettings.ui" line="14"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="14"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../widget/form/settings/identitysettings.ui" line="20"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="20"/>
         <source>Public Information</source>
         <translation>Informazioni Pubbliche</translation>
     </message>
     <message>
-        <location filename="../widget/form/settings/identitysettings.ui" line="26"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="26"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../widget/form/settings/identitysettings.ui" line="36"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="36"/>
         <source>Status</source>
         <translation>Stato</translation>
     </message>
     <message>
-        <location filename="../widget/form/settings/identitysettings.ui" line="49"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="49"/>
         <source>Tox ID</source>
         <translation>Tox ID</translation>
     </message>
     <message>
-        <location filename="../widget/form/settings/identitysettings.ui" line="55"/>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="55"/>
         <source>Your Tox ID (click to copy)</source>
         <translation>(clicca qui per copiare)</translation>
     </message>
+    <message>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="65"/>
+        <source>Profiles</source>
+        <translation>Profili</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="73"/>
+        <source>Available profiles:</source>
+        <translation>Profili disponibili:</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="87"/>
+        <source>Load</source>
+        <comment>load profile button</comment>
+        <translation>Carica</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="94"/>
+        <source>Rename</source>
+        <comment>rename profile button</comment>
+        <translation>Rinomina</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="101"/>
+        <source>Export</source>
+        <comment>export profile button</comment>
+        <translation>Esporta</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="108"/>
+        <source>Delete</source>
+        <comment>delete profile button</comment>
+        <translation>Elimina</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="111"/>
+        <source>This is useful to remain safe on public computers</source>
+        <comment>delete profile button tooltip</comment>
+        <translation>Utile per preservare la tua sicurezza su computer pubblici</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/settings/identitysettings.ui" line="120"/>
+        <source>Import a profile</source>
+        <comment>import profile button</comment>
+        <translation>Importa un profilo</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="20"/>
+        <location filename="../src/mainwindow.ui" line="20"/>
         <source>qTox</source>
         <translation>qTox</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="859"/>
+        <location filename="../src/mainwindow.ui" line="859"/>
         <source>Your name</source>
         <translation>qTox User</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="941"/>
+        <location filename="../src/mainwindow.ui" line="941"/>
         <source>Your status</source>
         <translation>Toxing on qTox</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1089"/>
+        <location filename="../src/mainwindow.ui" line="1089"/>
         <source>Add friends</source>
         <translation>Aggiungi contatto</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1115"/>
+        <location filename="../src/mainwindow.ui" line="1115"/>
         <source>Create a group chat</source>
         <translation>Crea un gruppo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1147"/>
+        <location filename="../src/mainwindow.ui" line="1147"/>
         <source>View completed file transfers</source>
         <translation>Visualizza i trasferimenti completati</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1179"/>
+        <location filename="../src/mainwindow.ui" line="1179"/>
         <source>Change your settings</source>
         <translation>Cambia le impostazioni</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1761"/>
+        <location filename="../src/mainwindow.ui" line="1761"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="1764"/>
+        <location filename="../src/mainwindow.ui" line="1764"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
@@ -463,80 +596,81 @@ Do you want to erase this profile ?</source>
 <context>
     <name>PrivacyForm</name>
     <message>
-        <location filename="../widget/form/settings/privacyform.cpp" line="21"/>
+        <location filename="../src/widget/form/settings/privacyform.cpp" line="21"/>
         <source>Privacy settings</source>
         <translation>Impostazioni privacy</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>qTox video test</translation>
-    </message>
-</context>
 <context>
     <name>Widget</name>
     <message>
-        <location filename="../widget/widget.cpp" line="88"/>
+        <location filename="../src/widget/widget.cpp" line="90"/>
         <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="90"/>
+        <location filename="../src/widget/widget.cpp" line="92"/>
         <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="92"/>
+        <location filename="../src/widget/widget.cpp" line="94"/>
         <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="225"/>
+        <location filename="../src/widget/widget.cpp" line="264"/>
+        <source>Choose a profile</source>
+        <translation>Scegli un profilo</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/widget.cpp" line="265"/>
+        <source>Please choose which identity to use</source>
+        <translation>Per favore scegli quale identità usare</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/widget.cpp" line="286"/>
         <source>Choose a profile picture</source>
         <translation>Scegli un&apos;immagine per il profilo</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="232"/>
+        <location filename="../src/widget/widget.cpp" line="293"/>
-        <location filename="../widget/widget.cpp" line="239"/>
+        <location filename="../src/widget/widget.cpp" line="300"/>
-        <location filename="../widget/widget.cpp" line="260"/>
+        <location filename="../src/widget/widget.cpp" line="321"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="232"/>
+        <location filename="../src/widget/widget.cpp" line="293"/>
         <source>Unable to open this file</source>
         <translation>Impossibile aprire il file</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="239"/>
+        <location filename="../src/widget/widget.cpp" line="300"/>
         <source>Unable to read this image</source>
         <translation>Impossibile leggere l&apos;immagine</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="260"/>
+        <location filename="../src/widget/widget.cpp" line="321"/>
         <source>This image is too big</source>
         <translation>L&apos;immagine è troppo grande</translation>
     </message>
     <message>
-        <location filename="../widget/widget.cpp" line="287"/>
+        <location filename="../src/widget/widget.cpp" line="348"/>
         <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"/>
+        <location filename="../src/widget/widget.cpp" line="357"/>
         <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"/>
+        <location filename="../src/widget/widget.cpp" line="712"/>
         <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>

ui/settings/mainContent.css

@@ -11,7 +11,11 @@ QLabel
 QGroupBox::title
 {
     color: black;
-    background-color: white;
+}
+
+QGroupBox
+{
+    background-color: white;    
 }
 
 QWidget