rename colorscmb to backgroundcmb

--improve delegate name

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

app/settings/delegates/backgroundcmbdelegate.cpp

@@ -17,10 +17,10 @@
 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "colorcmbboxdelegate.h"
+#include "backgroundcmbdelegate.h"
 
 // local
-#include "colorcmbboxitemdelegate.h"
+#include "backgroundcmbitemdelegate.h"
 
 // Qt
 #include <QComboBox>
@@ -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<QComboBox *>(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<QComboBox *>(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);

app/settings/delegates/backgroundcmbdelegate.h

@@ -17,8 +17,8 @@
 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef COLORCMBBOXDELEGATE_H
-#define COLORCMBBOXDELEGATE_H
+#ifndef BACKGROUNDCMBBOXDELEGATE_H
+#define BACKGROUNDCMBBOXDELEGATE_H
 
 // Qt
 #include <QItemDelegate>
@@ -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;

app/settings/delegates/backgroundcmbitemdelegate.cpp

@@ -17,7 +17,7 @@
 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "colorcmbboxitemdelegate.h"
+#include "backgroundcmbitemdelegate.h"
 
 // Qt
 #include <QApplication>
@@ -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);

app/settings/delegates/backgroundcmbitemdelegate.h

@@ -17,8 +17,8 @@
 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef COLORCMBBOXITEMDELEGATE_H
-#define COLORCMBBOXITEMDELEGATE_H
+#ifndef BACKGROUNDCMBBOXITEMDELEGATE_H
+#define BACKGROUNDCMBBOXITEMDELEGATE_H
 
 // Qt
 #include <QAbstractItemDelegate>
@@ -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;

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));