Add option for using the internal viewer

Also use the new connect syntax for ProgramConfigurator.

1 files changed, 25 insertions, 16 deletions

diff --git a/programconfigurator.cpp b/programconfigurator.cpp
index fa05e5c..ae272f5 100644
--- a/programconfigurator.cpp
+++ b/programconfigurator.cpp
@@ -5,16 +5,17 @@
   2 of the License, or (at your option) any later version.
 */
 
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QComboBox>
-#include <QtWidgets/QLineEdit>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QCompleter>
+#include <QPushButton>
+#include <QComboBox>
+#include <QLineEdit>
+#include <QLabel>
+#include <QCheckBox>
+#include <QGridLayout>
+#include <QHBoxLayout>
+#include <QCompleter>
 #include <QSettings>
-#include <QtWidgets/QDirModel>
-#include <QtWidgets/QMessageBox>
+#include <QDirModel>
+#include <QMessageBox>
 #include <QRegExp>
 #include <QFileInfo>
 
@@ -56,15 +57,21 @@ ProgramConfigurator::ProgramConfigurator(const QString &prefix, const QString &d
 	buttonLayout->addWidget(mUpdate);
 	buttonLayout->addWidget(mDefault);
 	buttonLayout->addStretch();
-	mainLayout->addLayout(buttonLayout, 5, 0, 1, 2, Qt::AlignCenter);
+    mainLayout->addLayout(buttonLayout, 5, 0, 1, 2, Qt::AlignCenter);
+    mInternalViewer = new QCheckBox(tr("Use internal Viewer"));
+    QHBoxLayout *intViewerL = new QHBoxLayout;
+    intViewerL->addStretch();
+    intViewerL->addWidget(mInternalViewer);
+    intViewerL->addStretch();
+    mainLayout->addLayout(intViewerL, 6, 0, 1, 2, Qt::AlignCenter);
 	QVBoxLayout *stretchLayout = new QVBoxLayout;
 	stretchLayout->addStretch();
 	mainLayout->addLayout(stretchLayout, 6, 0, 1, 2);
-	connect(mProgramSelector, SIGNAL(currentIndexChanged(QString)), this, SLOT(programChanged(QString)));
-	connect(mAdd, SIGNAL(clicked()), this, SLOT(addProgram()));
-	connect(mRemove, SIGNAL(clicked()), this, SLOT(removeProgram()));
-	connect(mUpdate, SIGNAL(clicked()), this, SLOT(updateProgram()));
-	connect(mDefault, SIGNAL(clicked()), this, SLOT(setDefault()));
+    connect(mProgramSelector, QOverload<const QString &>::of(&QComboBox::currentIndexChanged), this, &ProgramConfigurator::programChanged);
+    connect(mAdd, &QPushButton::clicked, this, &ProgramConfigurator::addProgram);
+    connect(mRemove, &QPushButton::clicked, this, &ProgramConfigurator::removeProgram);
+    connect(mUpdate, &QPushButton::clicked, this, &ProgramConfigurator::updateProgram);
+    connect(mDefault, &QPushButton::clicked, this, &ProgramConfigurator::setDefault);
 	readSettings();
 	setLayout(mainLayout);
 }
@@ -76,6 +83,7 @@ void ProgramConfigurator::writeSettings(){
 	QSettings s;
 	s.setValue(defaultString, mDefautProg);
 	s.setValue(dataString, mData);
+    s.setValue("vw/internal", mInternalViewer->isChecked());
 }
 
 void ProgramConfigurator::programChanged(const QString &program){
@@ -162,7 +170,7 @@ void ProgramConfigurator::readSettings(){
 	QSettings s;
 	mData = s.value(dataString).toHash();
 	QStringList progs;
-	foreach(QString p, mData.keys()){
+    for(QString p : mData.keys()){
 		progs << p;
 	}
 	mProgramSelector->addItems(progs);
@@ -171,6 +179,7 @@ void ProgramConfigurator::readSettings(){
 	if(idx != -1){
 		mProgramSelector->setCurrentIndex(idx);
 	}
+    mInternalViewer->setChecked(s.value("vw/internal").toBool());
 	setDefault();
 }