summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configurationdialog.cpp68
-rw-r--r--configurationdialog.h16
2 files changed, 37 insertions, 47 deletions
diff --git a/configurationdialog.cpp b/configurationdialog.cpp
index 5f4f2c2..da394e8 100644
--- a/configurationdialog.cpp
+++ b/configurationdialog.cpp
@@ -231,11 +231,11 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : S
QStringList reasons = SmGlobals::instance()->reencReasons();
mReasonsBox->addItems(reasons);
QPushButton *editRBtn = new QPushButton(tr("Edit..."));
- connect(editRBtn, SIGNAL(clicked()), this, SLOT(editReason()));
+ connect(editRBtn, &QPushButton::clicked, this, &ConfigurationDialog::editReason);
QPushButton *newRBtn = new QPushButton(tr("Add..."));
- connect(newRBtn, SIGNAL(clicked()), this, SLOT(addReason()));
+ connect(newRBtn, &QPushButton::clicked, this, &ConfigurationDialog::addReason);
QPushButton *delRBtn = new QPushButton(tr("Delete..."));
- connect(delRBtn, SIGNAL(clicked()), this, SLOT(delReason()));
+ connect(delRBtn, &QPushButton::clicked, this, &ConfigurationDialog::delReason);
QVBoxLayout *reasonL = new QVBoxLayout;
QHBoxLayout *reasonCBL = new QHBoxLayout;
reasonCBL->addWidget(rbl1);
@@ -307,68 +307,68 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : S
mClipboardColor = new QLabel;
mClipboardColor->setFrameStyle(QFrame::Sunken | QFrame::Panel);
mClipboardColor->setScaledContents(true);
- mClipboardButton = new QPushButton(tr("Choose..."));
- connect(mClipboardButton, &QPushButton::clicked, [=] { chooseColor(mClipboardColor); });
+ QPushButton *clipboardButton = new QPushButton(tr("Choose..."));
+ connect(clipboardButton, &QPushButton::clicked, [=] { chooseColor(mClipboardColor); });
colorGrid->addWidget(colorl2, 1, 0);
colorGrid->addWidget(mClipboardColor, 1, 1);
- colorGrid->addWidget(mClipboardButton, 1, 2);
+ colorGrid->addWidget(clipboardButton, 1, 2);
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..."));
+ 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);
+ colorGrid->addWidget(mBaseButton, 2, 2);
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..."));
+ 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);
+ colorGrid->addWidget(mAlternateBaseButton, 3, 2);
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); });
+ QPushButton *fontColorBtn = new QPushButton(tr("Choose..."));
+ connect(fontColorBtn, &QPushButton::clicked, [=] { chooseColor(mFontColor); });
colorGrid->addWidget(colorl5, 4, 0);
colorGrid->addWidget(mFontColor, 4, 1);
- colorGrid->addWidget(mFontColorButton, 4, 2);
+ colorGrid->addWidget(fontColorBtn, 4, 2);
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); });
+ QPushButton *localColorBtn = new QPushButton(tr("Choose..."));
+ connect(localColorBtn, &QPushButton::clicked, [=] { chooseColor(mLocalColor); });
colorGrid->addWidget(colorl6, 5, 0);
colorGrid->addWidget(mLocalColor, 5, 1);
- colorGrid->addWidget(mLocalColorButton, 5, 2);
+ colorGrid->addWidget(localColorBtn, 5, 2);
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); });
+ QPushButton *archivedColorBtn = new QPushButton(tr("Choose..."));
+ connect(archivedColorBtn, &QPushButton::clicked, [=] { chooseColor(mArchivedColor); });
colorGrid->addWidget(colorl7, 6, 0);
colorGrid->addWidget(mArchivedColor, 6, 1);
- colorGrid->addWidget(mArchivedColorButton, 6, 2);
+ colorGrid->addWidget(archivedColorBtn, 6, 2);
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); });
+ QPushButton *favoriteColorBtn = new QPushButton(tr("Choose..."));
+ connect(favoriteColorBtn, &QPushButton::clicked, [=] { chooseColor(mFavoriteColor); });
colorGrid->addWidget(colorl8, 7, 0);
colorGrid->addWidget(mFavoriteColor, 7, 1);
- colorGrid->addWidget(mFavoriteColorButton, 7, 2);
+ colorGrid->addWidget(favoriteColorBtn, 7, 2);
mAlternateColors = new QCheckBox(tr("Use alternating row colors"));
mAlternateColors->setTristate(false);
- connect(mAlternateColors, SIGNAL(stateChanged(int)), this, SLOT(alternateColorsChanged(int)));
+ connect(mAlternateColors, &QCheckBox::stateChanged, this, &ConfigurationDialog::alternateColorsChanged);
colorGrid->addWidget(mAlternateColors, 8, 1, 1, 2, Qt::AlignLeft);
colorsWidget->setLayout(colorGrid);
@@ -384,7 +384,7 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : S
pvGrid->addWidget(mPVBgButton, 0, 2);
mPVGradient = new QCheckBox(tr("Use random gradient as background"));
mPVGradient->setTristate(false);
- connect(mPVGradient, SIGNAL(stateChanged(int)), this, SLOT(randomGradientChanged(int)));
+ connect(mPVGradient, &QCheckBox::stateChanged, this, &ConfigurationDialog::randomGradientChanged);
pvGrid->addWidget(mPVGradient, 1, 1, 1, 2, Qt::AlignLeft);
QGroupBox *treeGB = new QGroupBox(tr("Treeview colors"));
@@ -398,14 +398,14 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : S
mTab->addTab(colorsWidget, tr("Colors"));
//main layout
- mOk = new QPushButton(tr("Ok"));
- connect(mOk, SIGNAL(clicked()), this, SLOT(accept()));
- mCancel = new QPushButton(tr("Cancel"));
- connect(mCancel, SIGNAL(clicked()), this, SLOT(reject()));
+ QPushButton *okBtn = new QPushButton(tr("Ok"));
+ connect(okBtn, &QPushButton::clicked, this, &ConfigurationDialog::accept);
+ QPushButton *cancelBtn = new QPushButton(tr("Cancel"));
+ connect(cancelBtn, &QPushButton::clicked, this, &ConfigurationDialog::reject);
QHBoxLayout *mainButtonLayout = new QHBoxLayout;
mainButtonLayout->addStretch();
- mainButtonLayout->addWidget(mOk);
- mainButtonLayout->addWidget(mCancel);
+ mainButtonLayout->addWidget(okBtn);
+ mainButtonLayout->addWidget(cancelBtn);
QVBoxLayout *mainLayout = new QVBoxLayout;
mainLayout->addWidget(mTab);
mainLayout->addLayout(mainButtonLayout);
@@ -606,7 +606,7 @@ bool ConfigurationDialog::checkDvdPath(){
continue;
}
QStringList options = fsParts.at(3).split(',');
- foreach(QString opt, options){
+ for(const QString &opt : options){
if(opt.toLower().trimmed() == "user"){
ok = true;
break;
@@ -639,9 +639,9 @@ void ConfigurationDialog::chooseColor(QWidget *label){
}
void ConfigurationDialog::alternateColorsChanged(int state){
- mBaseButton->setEnabled(state == Qt::Checked);
- mBaseColor->setEnabled(state == Qt::Checked);
- mAlternateBaseButton->setEnabled(state == Qt::Checked);
+ mBaseButton->setEnabled(state == Qt::Checked);
+ mBaseColor->setEnabled(state == Qt::Checked);
+ mAlternateBaseButton->setEnabled(state == Qt::Checked);
mAlternateBaseColor->setEnabled(state == Qt::Checked);
}
diff --git a/configurationdialog.h b/configurationdialog.h
index dd6b451..cc3ed06 100644
--- a/configurationdialog.h
+++ b/configurationdialog.h
@@ -8,7 +8,6 @@
#ifndef CONFIGURATIONDIALOG_H
#define CONFIGURATIONDIALOG_H
-#include <QHash>
#include <QMap>
#include "smdialog.h"
@@ -36,7 +35,7 @@ class ConfigurationDialog : public SmDialog {
private slots:
void chooseColor(QWidget *label);
- void alternateColorsChanged(int);
+ void alternateColorsChanged(int);
void randomGradientChanged(int);
void editReason();
void addReason();
@@ -50,9 +49,6 @@ class ConfigurationDialog : public SmDialog {
void setColor(QWidget *label);
void createPositionMap();
void fillPositions(QComboBox *cb);
- QPushButton *mOk;
- QPushButton *mCancel;
- QPushButton *mPVSizeReset;
QTabWidget *mTab;
ProgramConfigurator *mMovieConfig;
QLineEdit *mArchiveDir;
@@ -93,14 +89,8 @@ class ConfigurationDialog : public SmDialog {
QLabel *mArchivedColor;
QLabel *mFavoriteColor;
QLabel *mPVBgColor;
- QPushButton *mSeenButton;
- QPushButton *mClipboardButton;
- QPushButton *mBaseButton;
- QPushButton *mAlternateBaseButton;
- QPushButton *mFontColorButton;
- QPushButton *mLocalColorButton;
- QPushButton *mArchivedColorButton;
- QPushButton *mFavoriteColorButton;
+ QPushButton *mBaseButton;
+ QPushButton *mAlternateBaseButton;
QPushButton *mPVBgButton;
QCheckBox *mAlternateColors;
QCheckBox *mPVGradient;
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-05-10 06:11:11 +0000