diff options
| -rw-r--r-- | configurationdialog.cpp | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/configurationdialog.cpp b/configurationdialog.cpp index 0654ea7..6ac25ff 100644 --- a/configurationdialog.cpp +++ b/configurationdialog.cpp @@ -28,7 +28,6 @@ #include <QFile> #include <QTextStream> #include <QRegExpValidator> -#include <QSignalMapper> #include <QColor> #include <QColorDialog> #include <QPalette> @@ -322,77 +321,69 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : S //colors tab QWidget *colorsWidget = new QWidget; QGridLayout *colorGrid = new QGridLayout; - QSignalMapper *colorMapper = new QSignalMapper(this); QLabel *colorl2 = new QLabel(tr("Files in clipboard")); mClipboardColor = new QLabel; mClipboardColor->setFrameStyle(QFrame::Sunken | QFrame::Panel); mClipboardColor->setScaledContents(true); mClipboardButton = new QPushButton(tr("Choose...")); + connect(mClipboardButton, &QPushButton::clicked, [=] { chooseColor(mClipboardColor); }); colorGrid->addWidget(colorl2, 1, 0); colorGrid->addWidget(mClipboardColor, 1, 1); colorGrid->addWidget(mClipboardButton, 1, 2); - colorMapper->setMapping(mClipboardButton, mClipboardColor); - connect(mClipboardButton, SIGNAL(clicked()), colorMapper, SLOT(map())); QLabel *colorl3 = new QLabel(tr("Base color for rows")); mBaseColor = new QLabel; mBaseColor->setFrameStyle(QFrame::Sunken | QFrame::Panel); mBaseColor->setScaledContents(true); mBaseButton = new QPushButton(tr("Choose...")); + connect(mBaseButton, &QPushButton::clicked, [=] { chooseColor(mBaseColor); }); colorGrid->addWidget(colorl3, 2, 0); colorGrid->addWidget(mBaseColor, 2, 1); colorGrid->addWidget(mBaseButton, 2, 2); - colorMapper->setMapping(mBaseButton, mBaseColor); - connect(mBaseButton, SIGNAL(clicked()), colorMapper, SLOT(map())); QLabel *colorl4 = new QLabel(tr("Alternate base for rows")); mAlternateBaseColor = new QLabel; mAlternateBaseColor->setFrameStyle(QFrame::Sunken | QFrame::Panel); mAlternateBaseColor->setScaledContents(true); mAlternateBaseButton = new QPushButton(tr("Choose...")); + connect(mAlternateBaseButton, &QPushButton::clicked, [=] { chooseColor(mAlternateBaseColor); }); colorGrid->addWidget(colorl4, 3, 0); colorGrid->addWidget(mAlternateBaseColor, 3, 1); colorGrid->addWidget(mAlternateBaseButton, 3, 2); - colorMapper->setMapping(mAlternateBaseButton, mAlternateBaseColor); - connect(mAlternateBaseButton, SIGNAL(clicked()), colorMapper, SLOT(map())); QLabel *colorl5 = new QLabel(tr("Font color")); mFontColor = new QLabel; mFontColor->setFrameStyle(QFrame::Sunken | QFrame::Panel); mFontColor->setScaledContents(true); mFontColorButton = new QPushButton(tr("Choose...")); + connect(mFontColorButton, &QPushButton::clicked, [=] { chooseColor(mFontColor); }); colorGrid->addWidget(colorl5, 4, 0); colorGrid->addWidget(mFontColor, 4, 1); colorGrid->addWidget(mFontColorButton, 4, 2); - colorMapper->setMapping(mFontColorButton, mFontColor); - connect(mFontColorButton, SIGNAL(clicked()), colorMapper, SLOT(map())); QLabel *colorl6 = new QLabel(tr("Local files")); mLocalColor = new QLabel; mLocalColor->setFrameStyle(QFrame::Sunken | QFrame::Panel); mLocalColor->setScaledContents(true); mLocalColorButton = new QPushButton(tr("Choose...")); + connect(mLocalColorButton, &QPushButton::clicked, [=] { chooseColor(mLocalColor); }); colorGrid->addWidget(colorl6, 5, 0); colorGrid->addWidget(mLocalColor, 5, 1); colorGrid->addWidget(mLocalColorButton, 5, 2); - colorMapper->setMapping(mLocalColorButton, mLocalColor); - connect(mLocalColorButton, SIGNAL(clicked()), colorMapper, SLOT(map())); QLabel *colorl7 = new QLabel(tr("Archived Files")); mArchivedColor = new QLabel; mArchivedColor->setFrameStyle(QFrame::Sunken | QFrame::Panel); mArchivedColor->setScaledContents(true); mArchivedColorButton = new QPushButton(tr("Choose...")); + connect(mArchivedColorButton, &QPushButton::clicked, [=] { chooseColor(mArchivedColor); }); colorGrid->addWidget(colorl7, 6, 0); colorGrid->addWidget(mArchivedColor, 6, 1); colorGrid->addWidget(mArchivedColorButton, 6, 2); - colorMapper->setMapping(mArchivedColorButton, mArchivedColor); - connect(mArchivedColorButton, SIGNAL(clicked()), colorMapper, SLOT(map())); QLabel *colorl8 = new QLabel(tr("Favorites")); mFavoriteColor = new QLabel; mFavoriteColor->setFrameStyle(QFrame::Sunken | QFrame::Panel); mFavoriteColor->setScaledContents(true); mFavoriteColorButton = new QPushButton(tr("Choose...")); + connect(mFavoriteColorButton, &QPushButton::clicked, [=] { chooseColor(mFavoriteColor); }); colorGrid->addWidget(colorl8, 7, 0); colorGrid->addWidget(mFavoriteColor, 7, 1); colorGrid->addWidget(mFavoriteColorButton, 7, 2); - colorMapper->setMapping(mFavoriteColorButton, mFavoriteColor); - connect(mFavoriteColorButton, SIGNAL(clicked()), colorMapper, SLOT(map())); mAlternateColors = new QCheckBox(tr("Use alternating row colors")); mAlternateColors->setTristate(false); connect(mAlternateColors, SIGNAL(stateChanged(int)), this, SLOT(alternateColorsChanged(int))); @@ -404,18 +395,16 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : S mPVBgColor->setFrameStyle(QFrame::Sunken | QFrame::Panel); mPVBgColor->setScaledContents(true); mPVBgButton = new QPushButton(tr("Choose...")); + connect(mPVBgButton, &QPushButton::clicked, [=] { chooseColor(mPVBgColor); }); QGridLayout *pvGrid = new QGridLayout; pvGrid->addWidget(color9, 0, 0); pvGrid->addWidget(mPVBgColor, 0, 1); pvGrid->addWidget(mPVBgButton, 0, 2); - colorMapper->setMapping(mPVBgButton, mPVBgColor); - connect(mPVBgButton, SIGNAL(clicked()), colorMapper, SLOT(map())); mPVGradient = new QCheckBox(tr("Use random gradient as background")); mPVGradient->setTristate(false); connect(mPVGradient, SIGNAL(stateChanged(int)), this, SLOT(randomGradientChanged(int))); pvGrid->addWidget(mPVGradient, 1, 1, 1, 2, Qt::AlignLeft); - connect(colorMapper, SIGNAL(mapped(QWidget*)), this, SLOT(chooseColor(QWidget*))); QGroupBox *treeGB = new QGroupBox(tr("Treeview colors")); treeGB->setLayout(colorGrid); QGroupBox *pvGB = new QGroupBox(tr("PicViewer colors")); |