Merge branch 'master' into friend_list

src/coreencryption.cpp

@@ -159,6 +159,7 @@ QByteArray Core::getSaltFromFile(QString filename)
     }
 
     QByteArray res = QByteArray::fromRawData(reinterpret_cast<const char*>(salt), tox_pass_salt_length());
+    delete[] salt;
     return res;
 }
 

src/friend.cpp

@@ -35,6 +35,11 @@ Friend::Friend(int FriendId, const ToxID &UserId)
 
     widget = new FriendWidget(friendId, getDisplayedName());
     chatForm = new ChatForm(this);
+    if (Settings::getInstance().getEnableLogging())
+    {
+        chatForm->loadHistory(QDateTime::currentDateTime().addDays(-7), true);
+        widget->historyLoaded = true;
+    }
 }
 
 Friend::~Friend()

src/misc/settings.cpp

@@ -209,6 +209,7 @@ void Settings::load()
         checkUpdates = s.value("checkUpdates", false).toBool();
         showWindow = s.value("showWindow", true).toBool();
         showInFront = s.value("showInFront", false).toBool();
+        notifySound = s.value("notifySound", true).toBool();
         groupAlwaysNotify = s.value("groupAlwaysNotify", false).toBool();
         fauxOfflineMessaging = s.value("fauxOfflineMessaging", true).toBool();
         autoSaveEnabled = s.value("autoSaveEnabled", false).toBool();
@@ -381,6 +382,7 @@ void Settings::saveGlobal(QString path)
         s.setValue("checkUpdates", checkUpdates);
         s.setValue("showWindow", showWindow);
         s.setValue("showInFront", showInFront);
+        s.setValue("notifySound", notifySound);
         s.setValue("groupAlwaysNotify", groupAlwaysNotify);
         s.setValue("fauxOfflineMessaging", fauxOfflineMessaging);
         s.setValue("compactLayout", compactLayout);
@@ -695,6 +697,16 @@ void Settings::setShowInFront(bool newValue)
     showInFront = newValue;
 }
 
+bool Settings::getNotifySound() const
+{
+   return notifySound;
+}
+
+void Settings::setNotifySound(bool newValue)
+{
+    notifySound = newValue;
+}
+
 bool Settings::getGroupAlwaysNotify() const
 {
     return groupAlwaysNotify;

src/misc/settings.h

@@ -128,6 +128,9 @@ public:
     bool getShowInFront() const;
     void setShowInFront(bool newValue);
 
+    bool getNotifySound() const;
+    void setNotifySound(bool newValue);
+
     bool getGroupAlwaysNotify() const;
     void setGroupAlwaysNotify(bool newValue);
 
@@ -284,6 +287,7 @@ private:
     bool checkUpdates;
     bool showWindow;
     bool showInFront;
+    bool notifySound;
     bool groupAlwaysNotify;
 
     bool forceTCP;

src/widget/form/settings/generalform.cpp

@@ -73,6 +73,7 @@ GeneralForm::GeneralForm(SettingsWidget *myParent) :
     bodyUI->autoSaveFilesDir->setText(Settings::getInstance().getGlobalAutoAcceptDir());
     bodyUI->showWindow->setChecked(Settings::getInstance().getShowWindow());
     bodyUI->showInFront->setChecked(Settings::getInstance().getShowInFront());
+    bodyUI->notifySound->setChecked(Settings::getInstance().getNotifySound());
     bodyUI->groupAlwaysNotify->setChecked(Settings::getInstance().getGroupAlwaysNotify());
     bodyUI->cbFauxOfflineMessaging->setChecked(Settings::getInstance().getFauxOfflineMessaging());
     bodyUI->cbCompactLayout->setChecked(Settings::getInstance().getCompactLayout());
@@ -133,6 +134,7 @@ GeneralForm::GeneralForm(SettingsWidget *myParent) :
     connect(bodyUI->autoAwaySpinBox, SIGNAL(editingFinished()), this, SLOT(onAutoAwayChanged()));
     connect(bodyUI->showWindow, &QCheckBox::stateChanged, this, &GeneralForm::onShowWindowChanged);
     connect(bodyUI->showInFront, &QCheckBox::stateChanged, this, &GeneralForm::onSetShowInFront);
+    connect(bodyUI->notifySound, &QCheckBox::stateChanged, this, &GeneralForm::onSetNotifySound);
     connect(bodyUI->groupAlwaysNotify, &QCheckBox::stateChanged, this, &GeneralForm::onSetGroupAlwaysNotify);
     connect(bodyUI->autoacceptFiles, &QCheckBox::stateChanged, this, &GeneralForm::onAutoAcceptFileChange);
     if (bodyUI->autoacceptFiles->isChecked())
@@ -373,6 +375,11 @@ void GeneralForm::onSetShowInFront()
     Settings::getInstance().setShowInFront(bodyUI->showInFront->isChecked());
 }
 
+void GeneralForm::onSetNotifySound()
+{
+    Settings::getInstance().setNotifySound(bodyUI->notifySound->isChecked());
+}
+
 void GeneralForm::onSetGroupAlwaysNotify()
 {
     Settings::getInstance().setGroupAlwaysNotify(bodyUI->groupAlwaysNotify->isChecked());

src/widget/form/settings/generalform.h

@@ -56,6 +56,7 @@ private slots:
     void onCheckUpdateChanged();
     void onShowWindowChanged();
     void onSetShowInFront();
+    void onSetNotifySound();
     void onSetGroupAlwaysNotify();
     void onFauxOfflineMessaging();
     void onCompactLayout();

src/widget/form/settings/generalsettings.ui

@@ -345,6 +345,16 @@ instead of system taskbar.</string>
               </property>
              </widget>
             </item>
+            <item>
+             <widget class="QCheckBox" name="notifySound">
+              <property name="toolTip">
+               <string comment="toolTip for Notify sound setting">Play a sound when you recieve message.</string>
+              </property>
+              <property name="text">
+               <string>Play sound</string>
+              </property>
+             </widget>
+            </item>
            </layout>
           </item>
           <item row="1" column="2">

src/widget/friendwidget.cpp

@@ -130,16 +130,6 @@ void FriendWidget::setAsActiveChatroom()
 
     if (isDefaultAvatar)
         avatar->setPixmap(QPixmap(":img/contact_dark.svg"), Qt::transparent);
-
-    if(!historyLoaded)
-    {
-        Friend* f = FriendList::findFriend(friendId);
-        if (Settings::getInstance().getEnableLogging())
-        {
-            f->getChatForm()->loadHistory(QDateTime::currentDateTime().addDays(-7), true);
-            historyLoaded = true;
-        }
-    }
 }
 
 void FriendWidget::setAsInactiveChatroom()

src/widget/widget.cpp

@@ -237,7 +237,6 @@ bool Widget::eventFilter(QObject *obj, QEvent *event)
                     wasMaximized = false;
            }
     }
-    event->accept();
     return false;
 }
 
@@ -753,17 +752,20 @@ void Widget::newMessageAlert(GenericChatroomWidget* chat)
             setWindowState(Qt::WindowActive);
     }
 
-    static QFile sndFile(":audio/notification.pcm");
-    static QByteArray sndData;
-
-    if (sndData.isEmpty())
+    if (Settings::getInstance().getNotifySound())
     {
-        sndFile.open(QIODevice::ReadOnly);
-        sndData = sndFile.readAll();
-        sndFile.close();
-    }
+        static QFile sndFile(":audio/notification.pcm");
+        static QByteArray sndData;
 
-    Audio::playMono16Sound(sndData);
+        if (sndData.isEmpty())
+        {
+            sndFile.open(QIODevice::ReadOnly);
+            sndData = sndFile.readAll();
+            sndFile.close();
+        }
+
+        Audio::playMono16Sound(sndData);
+    }
 }
 
 void Widget::playRingtone()

ui/chatArea/chatArea.css

@@ -1,7 +1,7 @@
 QTextEdit
 {
     background: white;
-    color: back;
+    color: black;
 }
 
 QGraphicsView