Merge default branch

This commit is contained in:
Felix Kauselmann
2018-02-18 17:17:14 +01:00
parent 1815ba64a1
commit 09c8125f87
36 changed files with 2014 additions and 1897 deletions

View File

@ -11,6 +11,7 @@
#include <QPushButton>
#include <QLabel>
#include <QColorDialog>
#include <QCheckBox>
#include "yacreader_spin_slider_widget.h"
#include "yacreader_flow_config_widget.h"
@ -104,7 +105,7 @@ OptionsDialog::OptionsDialog(QWidget * parent)
gammaS->setTracking(false);
connect(gammaS,SIGNAL(valueChanged(int)),this,SLOT(gammaChanged(int)));
//connect(brightnessS,SIGNAL(valueChanged(int)),this,SIGNAL(changedOptions()));
quickNavi = new QCheckBox(tr("Quick Navigation Mode"));
disableShowOnMouseOver = new QCheckBox(tr("Disable mouse over activation"));