diff options
Diffstat (limited to 'configurationdialog.cpp')
| -rw-r--r-- | configurationdialog.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/configurationdialog.cpp b/configurationdialog.cpp index 82623e8..ce36ee6 100644 --- a/configurationdialog.cpp +++ b/configurationdialog.cpp @@ -5,38 +5,38 @@ 2 of the License, or (at your option) any later version. */ -#include <QPushButton> -#include <QTabWidget> -#include <QHBoxLayout> -#include <QVBoxLayout> -#include <QGridLayout> -#include <QFormLayout> -#include <QLineEdit> -#include <QLabel> -#include <QComboBox> -#include <QDirModel> -#include <QCompleter> -#include <QApplication> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QTabWidget> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QFormLayout> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QLabel> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QDirModel> +#include <QtWidgets/QCompleter> +#include <QtWidgets/QApplication> #include <QSettings> #include <QRegExp> #include <QFileInfo> -#include <QGroupBox> -#include <QCheckBox> -#include <QSpinBox> +#include <QtWidgets/QGroupBox> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QSpinBox> #include <QFileInfo> -#include <QMessageBox> +#include <QtWidgets/QMessageBox> #include <QFile> #include <QTextStream> #include <QRegExpValidator> #include <QSignalMapper> #include <QColor> -#include <QColorDialog> +#include <QtWidgets/QColorDialog> #include <QPalette> #include <QImage> #include <QPainter> #include <QStandardItemModel> #include <QStandardItem> -#include <QDesktopWidget> +#include <QtWidgets/QDesktopWidget> #include "configurationdialog.h" #include "programconfigurator.h" @@ -422,9 +422,9 @@ void ConfigurationDialog::readSettings(){ mDatabasePassword->setText(s.value("database/dbpass").toString()); //read colors - QVariant seen = s.value("ui/seencolor", Qt::red); + QVariant seen = s.value("ui/seencolor", QVariant(QColor(Qt::red))); mColors.insert(mSeenColor, seen.value<QColor>()); - QVariant clip = s.value("ui/clipcolor", Qt::darkBlue); + QVariant clip = s.value("ui/clipcolor", QVariant(QColor(Qt::darkBlue))); mColors.insert(mClipboardColor, clip.value<QColor>()); QVariant base = s.value("ui/basecolor", qApp->palette().base().color()); mColors.insert(mBaseColor, base.value<QColor>()); @@ -432,13 +432,13 @@ void ConfigurationDialog::readSettings(){ mColors.insert(mAlternateBaseColor, alternate.value<QColor>()); QVariant font = s.value("ui/fontcolor", qApp->palette().foreground().color()); mColors.insert(mFontColor, font.value<QColor>()); - QVariant local = s.value("ui/localcolor", Qt::darkBlue); + QVariant local = s.value("ui/localcolor", QVariant(QColor(Qt::darkBlue))); mColors.insert(mLocalColor, local.value<QColor>()); - QVariant archived = s.value("ui/archivedcolor", Qt::black); + QVariant archived = s.value("ui/archivedcolor", QVariant(QColor(Qt::black))); mColors.insert(mArchivedColor, archived.value<QColor>()); - QVariant favorite = s.value("ui/favoritecolor", Qt::red); + QVariant favorite = s.value("ui/favoritecolor", QVariant(QColor(Qt::red))); mColors.insert(mFavoriteColor, favorite.value<QColor>()); - QVariant pvbackground = s.value("ui/pvbgcolor", Qt::red); + QVariant pvbackground = s.value("ui/pvbgcolor", QVariant(QColor(Qt::red))); mColors.insert(mPVBgColor, pvbackground.value<QColor>()); QHash<QWidget*, QColor>::const_iterator it; for(it = mColors.constBegin(); it != mColors.constEnd(); ++it){ @@ -475,7 +475,7 @@ void ConfigurationDialog::writeSettings(){ s.setValue("paths/strippath", mStripPath->text()); s.setValue("paths/coverpath", mCoverPath->text()); - s.setValue("ui/folderIcon", mIconForFolder->currentText()); + s.setValue("ui/foldericon", mIconForFolder->currentText()); s.setValue("ui/hoverpics", (mHoverPics->checkState() == Qt::Checked)); s.setValue("ui/hoverarchive", (mHoverArchive->checkState() == Qt::Checked)); s.setValue("ui/hoveropacity", mHoverOpacity->value()); |