Merge branch 'pr1400', with style fixes @agilob

Conflicts:
	src/widget/form/profileform.cpp

src/widget/form/profileform.cpp

@@ -120,6 +120,12 @@ ProfileForm::ProfileForm(QWidget *parent) :
 
     connect(core, &Core::usernameSet, this, [=](const QString& val) { bodyUI->userName->setText(val); });
     connect(core, &Core::statusMessageSet, this, [=](const QString& val) { bodyUI->statusMessage->setText(val); });
+
+    for (QComboBox* cb : findChildren<QComboBox*>())
+    {
+            cb->installEventFilter(this);
+            cb->setFocusPolicy(Qt::StrongFocus);
+    }
 }
 
 ProfileForm::~ProfileForm()
@@ -392,3 +398,14 @@ void ProfileForm::on_saveQr_clicked()
             GUI::showWarning(tr("Failed to copy file"), tr("The file you chose could not be written to."));
     }
 }
+
+bool ProfileForm::eventFilter(QObject *o, QEvent *e)
+{
+    if ((e->type() == QEvent::Wheel) &&
+         (qobject_cast<QComboBox*>(o) || qobject_cast<QAbstractSpinBox*>(o) ))
+    {
+        e->ignore();
+        return true;
+    }
+    return QWidget::eventFilter(o, e);
+}

src/widget/form/profileform.h

@@ -80,6 +80,7 @@ private slots:
     
 protected:
     virtual void showEvent(QShowEvent *);
+    bool eventFilter(QObject *o, QEvent *e);
 
 private:
     void refreshProfiles();

src/widget/form/settings/advancedform.cpp

@@ -42,6 +42,12 @@ AdvancedForm::AdvancedForm() :
     connect(bodyUI->cbMakeToxPortable, &QCheckBox::stateChanged, this, &AdvancedForm::onMakeToxPortableUpdated);
     connect(bodyUI->syncTypeComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(onDbSyncTypeUpdated()));
     connect(bodyUI->resetButton, SIGNAL(clicked()), this, SLOT(resetToDefault()));
+
+    for (QComboBox* cb : findChildren<QComboBox*>())
+    {
+            cb->installEventFilter(this);
+            cb->setFocusPolicy(Qt::StrongFocus);
+    }
 }
 
 AdvancedForm::~AdvancedForm()
@@ -67,3 +73,14 @@ void AdvancedForm::resetToDefault()
     bodyUI->syncTypeComboBox->setCurrentIndex(index);
     onDbSyncTypeUpdated();
 }
+
+bool AdvancedForm::eventFilter(QObject *o, QEvent *e)
+{
+    if ((e->type() == QEvent::Wheel) &&
+         (qobject_cast<QComboBox*>(o) || qobject_cast<QAbstractSpinBox*>(o) ))
+    {
+        e->ignore();
+        return true;
+    }
+    return QWidget::eventFilter(o, e);
+}

src/widget/form/settings/advancedform.h

@@ -32,6 +32,9 @@ public:
     AdvancedForm();
     virtual ~AdvancedForm();
     
+protected:
+    bool eventFilter(QObject *o, QEvent *e);
+
 private slots:
     void onMakeToxPortableUpdated();
     void onDbSyncTypeUpdated();

src/widget/form/settings/avform.cpp

@@ -52,6 +52,12 @@ AVForm::AVForm() :
     connect(bodyUI->filterAudio, SIGNAL(toggled(bool)), this, SLOT(onFilterAudioToggled(bool)));
     connect(bodyUI->rescanButton, &QPushButton::clicked, this, [=](){getAudioInDevices(); getAudioOutDevices();});
     bodyUI->playbackSlider->setValue(100);
+
+    for (QComboBox* cb : findChildren<QComboBox*>())
+    {
+            cb->installEventFilter(this);
+            cb->setFocusPolicy(Qt::StrongFocus);
+    }
 }
 
 AVForm::~AVForm()
@@ -268,3 +274,14 @@ void AVForm::on_playbackSlider_valueChanged(int value)
 {
     Audio::getInstance().outputVolume = value / 100.0;
 }
+
+bool AVForm::eventFilter(QObject *o, QEvent *e)
+{
+    if ((e->type() == QEvent::Wheel) &&
+         (qobject_cast<QComboBox*>(o) || qobject_cast<QAbstractSpinBox*>(o) ))
+    {
+        e->ignore();
+        return true;
+    }
+    return QWidget::eventFilter(o, e);
+}

src/widget/form/settings/avform.h

@@ -63,13 +63,13 @@ private slots:
     virtual void showEvent(QShowEvent*);
 
     void on_HueSlider_valueChanged(int value);
-
     void on_BrightnessSlider_valueChanged(int value);
-
     void on_SaturationSlider_valueChanged(int value);
-
     void on_ContrastSlider_valueChanged(int value);
     
+protected:
+    bool eventFilter(QObject *o, QEvent *e);    
+
 private:
     Ui::AVSettings *bodyUI;
     VideoSurface* camView;

src/widget/form/settings/generalform.cpp

@@ -157,12 +157,14 @@ GeneralForm::GeneralForm(SettingsWidget *myParent) :
     // scrolling event won't be transmitted to comboboxes or qspinboxes when scrolling
     // you can scroll through general settings without accidentially chaning theme/skin/icons etc.
     // @see GeneralForm::eventFilter(QObject *o, QEvent *e) at the bottom of this file for more
-    Q_FOREACH(QComboBox *cb, findChildren<QComboBox*>() ) {
+    for (QComboBox* cb : findChildren<QComboBox*>())
+    {
             cb->installEventFilter(this);
             cb->setFocusPolicy(Qt::StrongFocus);
     }
 
-    Q_FOREACH(QSpinBox *sp, findChildren<QSpinBox*>() ) {
+    for (QSpinBox* sp : findChildren<QSpinBox*>())
+    {
             sp->installEventFilter(this);
             sp->setFocusPolicy(Qt::WheelFocus);
     }

src/widget/form/settings/privacyform.cpp

@@ -80,9 +80,9 @@ bool PrivacyForm::setChatLogsPassword()
         body += "\n\n" + tr("It appears you have an unused encrypted chat history; if the password matches, it will be added to your current history.");
 
     if (core->isPasswordSet(Core::ptMain))
-        dialog = new SetPasswordDialog(body, tr("Use data file password", "pushbutton text"), this);
+        dialog = new SetPasswordDialog(body, tr("Use data file password", "pushbutton text"), 0);
     else
-        dialog = new SetPasswordDialog(body, QString(), this);
+        dialog = new SetPasswordDialog(body, QString(), 0);
 
     do {
         int r = dialog->exec();
@@ -203,9 +203,9 @@ bool PrivacyForm::setToxPassword()
     SetPasswordDialog* dialog;
     QString body = tr("Please set your new data file password.");
     if (core->isPasswordSet(Core::ptHistory))
-        dialog = new SetPasswordDialog(body, tr("Use chat history password", "pushbutton text"), this);
+        dialog = new SetPasswordDialog(body, tr("Use chat history password", "pushbutton text"), 0);
     else
-        dialog = new SetPasswordDialog(body, QString(), this);
+        dialog = new SetPasswordDialog(body, QString(), 0);
 
     if (int r = dialog->exec())
     {