From c39a50f253ae8e0cc99c3b37b4d29ec86d014c21 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Fri, 13 Mar 2020 19:01:42 +0200 Subject: [PATCH] rename colorscmb to backgroundcmb --improve delegate name --- app/settings/delegates/CMakeLists.txt | 4 ++-- ...xdelegate.cpp => backgroundcmbdelegate.cpp} | 18 +++++++++--------- ...mbboxdelegate.h => backgroundcmbdelegate.h} | 8 ++++---- ...egate.cpp => backgroundcmbitemdelegate.cpp} | 8 ++++---- ...mdelegate.h => backgroundcmbitemdelegate.h} | 8 ++++---- app/settings/settingsdialog.cpp | 4 ++-- 6 files changed, 25 insertions(+), 25 deletions(-) rename app/settings/delegates/{colorcmbboxdelegate.cpp => backgroundcmbdelegate.cpp} (78%) rename app/settings/delegates/{colorcmbboxdelegate.h => backgroundcmbdelegate.h} (87%) rename app/settings/delegates/{colorcmbboxitemdelegate.cpp => backgroundcmbitemdelegate.cpp} (85%) rename app/settings/delegates/{colorcmbboxitemdelegate.h => backgroundcmbitemdelegate.h} (84%) diff --git a/app/settings/delegates/CMakeLists.txt b/app/settings/delegates/CMakeLists.txt index f579b386c..d1f31b61c 100644 --- a/app/settings/delegates/CMakeLists.txt +++ b/app/settings/delegates/CMakeLists.txt @@ -1,9 +1,9 @@ set(lattedock-app_SRCS ${lattedock-app_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/activitiesdelegate.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/backgroundcmbdelegate.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/backgroundcmbitemdelegate.cpp ${CMAKE_CURRENT_SOURCE_DIR}/checkboxdelegate.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/colorcmbboxdelegate.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/colorcmbboxitemdelegate.cpp ${CMAKE_CURRENT_SOURCE_DIR}/layoutnamedelegate.cpp ${CMAKE_CURRENT_SOURCE_DIR}/shareddelegate.cpp ${CMAKE_CURRENT_SOURCE_DIR}/persistentmenu.cpp diff --git a/app/settings/delegates/colorcmbboxdelegate.cpp b/app/settings/delegates/backgroundcmbdelegate.cpp similarity index 78% rename from app/settings/delegates/colorcmbboxdelegate.cpp rename to app/settings/delegates/backgroundcmbdelegate.cpp index df2b716b2..574ac2e35 100644 --- a/app/settings/delegates/colorcmbboxdelegate.cpp +++ b/app/settings/delegates/backgroundcmbdelegate.cpp @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -#include "colorcmbboxdelegate.h" +#include "backgroundcmbdelegate.h" // local -#include "colorcmbboxitemdelegate.h" +#include "backgroundcmbitemdelegate.h" // Qt #include @@ -39,17 +39,17 @@ namespace Settings { namespace Layouts { namespace Delegates { -ColorCmbBox::ColorCmbBox(QObject *parent, QString iconsPath, QStringList colors) +BackgroundCmbBox::BackgroundCmbBox(QObject *parent, QString iconsPath, QStringList colors) : QItemDelegate(parent), m_iconsPath(iconsPath), Colors(colors) { } -QWidget *ColorCmbBox::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const +QWidget *BackgroundCmbBox::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const { QComboBox *editor = new QComboBox(parent); - editor->setItemDelegate(new ColorCmbBoxItem(editor, m_iconsPath)); + editor->setItemDelegate(new BackgroundCmbBoxItem(editor, m_iconsPath)); for (unsigned int i = 0; i < Colors.count(); ++i) { if (Colors[i] != "sepia") { @@ -74,7 +74,7 @@ QWidget *ColorCmbBox::createEditor(QWidget *parent, const QStyleOptionViewItem & return editor; } -void ColorCmbBox::setEditorData(QWidget *editor, const QModelIndex &index) const +void BackgroundCmbBox::setEditorData(QWidget *editor, const QModelIndex &index) const { QComboBox *comboBox = static_cast(editor); QString value = index.model()->data(index, Qt::BackgroundRole).toString(); @@ -88,7 +88,7 @@ void ColorCmbBox::setEditorData(QWidget *editor, const QModelIndex &index) const } } -void ColorCmbBox::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const +void BackgroundCmbBox::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const { QComboBox *comboBox = static_cast(editor); @@ -96,12 +96,12 @@ void ColorCmbBox::setModelData(QWidget *editor, QAbstractItemModel *model, const model->setData(index, comboBox->currentText(), Qt::BackgroundRole); } -void ColorCmbBox::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const +void BackgroundCmbBox::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const { editor->setGeometry(option.rect); } -void ColorCmbBox::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const +void BackgroundCmbBox::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const { QStyleOptionViewItem myOption = option; QVariant background = index.data(Qt::BackgroundRole); diff --git a/app/settings/delegates/colorcmbboxdelegate.h b/app/settings/delegates/backgroundcmbdelegate.h similarity index 87% rename from app/settings/delegates/colorcmbboxdelegate.h rename to app/settings/delegates/backgroundcmbdelegate.h index ced28d860..a205cd0cf 100644 --- a/app/settings/delegates/colorcmbboxdelegate.h +++ b/app/settings/delegates/backgroundcmbdelegate.h @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#ifndef COLORCMBBOXDELEGATE_H -#define COLORCMBBOXDELEGATE_H +#ifndef BACKGROUNDCMBBOXDELEGATE_H +#define BACKGROUNDCMBBOXDELEGATE_H // Qt #include @@ -31,11 +31,11 @@ namespace Settings { namespace Layouts { namespace Delegates { -class ColorCmbBox : public QItemDelegate +class BackgroundCmbBox : public QItemDelegate { Q_OBJECT public: - ColorCmbBox(QObject *parent = 0, QString iconsPath = QString(), QStringList colors = QStringList()); + BackgroundCmbBox(QObject *parent = 0, QString iconsPath = QString(), QStringList colors = QStringList()); QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override; void setEditorData(QWidget *editor, const QModelIndex &index) const override; diff --git a/app/settings/delegates/colorcmbboxitemdelegate.cpp b/app/settings/delegates/backgroundcmbitemdelegate.cpp similarity index 85% rename from app/settings/delegates/colorcmbboxitemdelegate.cpp rename to app/settings/delegates/backgroundcmbitemdelegate.cpp index 331f7ced9..1d8df410a 100644 --- a/app/settings/delegates/colorcmbboxitemdelegate.cpp +++ b/app/settings/delegates/backgroundcmbitemdelegate.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "colorcmbboxitemdelegate.h" +#include "backgroundcmbitemdelegate.h" // Qt #include @@ -30,18 +30,18 @@ namespace Settings { namespace Layouts { namespace Delegates { -ColorCmbBoxItem::ColorCmbBoxItem(QObject *parent, QString iconsPath) +BackgroundCmbBoxItem::BackgroundCmbBoxItem(QObject *parent, QString iconsPath) : QAbstractItemDelegate(parent), m_iconsPath(iconsPath) { } -QSize ColorCmbBoxItem::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const +QSize BackgroundCmbBoxItem::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const { return QSize(option.rect.width(), 50); } -void ColorCmbBoxItem::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const +void BackgroundCmbBoxItem::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const { QStyleOptionViewItem myOption = option; QVariant value = index.data(Qt::DisplayRole); diff --git a/app/settings/delegates/colorcmbboxitemdelegate.h b/app/settings/delegates/backgroundcmbitemdelegate.h similarity index 84% rename from app/settings/delegates/colorcmbboxitemdelegate.h rename to app/settings/delegates/backgroundcmbitemdelegate.h index c14a2fb00..89bbb5fca 100644 --- a/app/settings/delegates/colorcmbboxitemdelegate.h +++ b/app/settings/delegates/backgroundcmbitemdelegate.h @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#ifndef COLORCMBBOXITEMDELEGATE_H -#define COLORCMBBOXITEMDELEGATE_H +#ifndef BACKGROUNDCMBBOXITEMDELEGATE_H +#define BACKGROUNDCMBBOXITEMDELEGATE_H // Qt #include @@ -28,11 +28,11 @@ namespace Settings { namespace Layouts { namespace Delegates { -class ColorCmbBoxItem : public QAbstractItemDelegate +class BackgroundCmbBoxItem : public QAbstractItemDelegate { Q_OBJECT public: - ColorCmbBoxItem(QObject *parent = 0, QString iconsPath = QString()); + BackgroundCmbBoxItem(QObject *parent = 0, QString iconsPath = QString()); void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; diff --git a/app/settings/settingsdialog.cpp b/app/settings/settingsdialog.cpp index a8f23ecfb..b61f14356 100644 --- a/app/settings/settingsdialog.cpp +++ b/app/settings/settingsdialog.cpp @@ -36,8 +36,8 @@ #include "../plasma/extended/theme.h" #include "data/layoutdata.h" #include "delegates/activitiesdelegate.h" +#include "delegates/backgroundcmbdelegate.h" #include "delegates/checkboxdelegate.h" -#include "delegates/colorcmbboxdelegate.h" #include "delegates/layoutnamedelegate.h" #include "delegates/shareddelegate.h" @@ -126,7 +126,7 @@ SettingsDialog::SettingsDialog(QWidget *parent, Latte::Corona *corona) } ui->layoutsView->setItemDelegateForColumn(NAMECOLUMN, new Settings::Layouts::Delegates::LayoutName(this)); - ui->layoutsView->setItemDelegateForColumn(COLORCOLUMN, new Settings::Layouts::Delegates::ColorCmbBox(this, iconsPath, colors)); + ui->layoutsView->setItemDelegateForColumn(COLORCOLUMN, new Settings::Layouts::Delegates::BackgroundCmbBox(this, iconsPath, colors)); ui->layoutsView->setItemDelegateForColumn(MENUCOLUMN, new Settings::Layouts::Delegates::CheckBox(this)); ui->layoutsView->setItemDelegateForColumn(BORDERSCOLUMN, new Settings::Layouts::Delegates::CheckBox(this)); ui->layoutsView->setItemDelegateForColumn(ACTIVITYCOLUMN, new Settings::Layouts::Delegates::Activities(this));