provide name for views

app/layouts/storage.cpp

@@ -1264,6 +1264,7 @@ Data::View Storage::view(const KConfigGroup &containmentGroup)
     }
 
     vdata.id = containmentGroup.name();
+    vdata.name = containmentGroup.readEntry("name", QString());
     vdata.isActive = false;
     vdata.onPrimary = containmentGroup.readEntry("onPrimary", true);
     vdata.screen = containmentGroup.readEntry("lastScreen", IDNULL);

app/view/view.cpp

@@ -306,6 +306,7 @@ void View::init(Plasma::Containment *plasma_containment)
 
     connect(this, &View::byPassWMChanged, this, &View::saveConfig);
     connect(this, &View::isPreferredForShortcutsChanged, this, &View::saveConfig);
+    connect(this, &View::nameChanged, this, &View::saveConfig);
     connect(this, &View::onPrimaryChanged, this, &View::saveConfig);
     connect(this, &View::typeChanged, this, &View::saveConfig);
 
@@ -562,6 +563,22 @@ void View::setLocalGeometry(const QRect &geometry)
     emit localGeometryChanged();
 }
 
+
+QString View::name() const
+{
+    return m_name;
+}
+
+void View::setName(const QString &newname)
+{
+    if (m_name == newname) {
+        return;
+    }
+
+    m_name = newname;
+    emit nameChanged();
+}
+
 QString View::validTitle() const
 {
     if (!containment()) {
@@ -1277,6 +1294,7 @@ Latte::Data::View View::data() const
 {
     Latte::Data::View vdata;
     vdata.id = QString::number(containment()->id());
+    vdata.name = name();
     vdata.isActive = true;
     vdata.onPrimary = onPrimary();
 
@@ -1623,6 +1641,7 @@ void View::saveConfig()
     config.writeEntry("onPrimary", onPrimary());
     config.writeEntry("byPassWM", byPassWM());
     config.writeEntry("isPreferredForShortcuts", isPreferredForShortcuts());
+    config.writeEntry("name", m_name);
     config.writeEntry("viewType", (int)m_type);
 }
 
@@ -1635,6 +1654,7 @@ void View::restoreConfig()
     m_onPrimary = config.readEntry("onPrimary", true);
     m_byPassWM = config.readEntry("byPassWM", false);
     m_isPreferredForShortcuts = config.readEntry("isPreferredForShortcuts", false);
+    m_name = config.readEntry("name", QString());
 
     //! Send changed signals at the end in order to be sure that saveConfig
     //! wont rewrite default/invalid values

app/view/view.h

@@ -118,6 +118,8 @@ class View : public PlasmaQuick::ContainmentView
     Q_PROPERTY(float maxLength READ maxLength WRITE setMaxLength NOTIFY maxLengthChanged)
     Q_PROPERTY(float offset READ offset WRITE setOffset NOTIFY offsetChanged)
 
+    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
+
     Q_PROPERTY(QQuickItem *colorizer READ colorizer WRITE setColorizer NOTIFY colorizerChanged)
 
     Q_PROPERTY(QVariantList containmentActions READ containmentActions NOTIFY containmentActionsChanged)
@@ -222,6 +224,9 @@ public:
 
     QString validTitle() const;
 
+    QString name() const;
+    void setName(const QString &newname);
+
     bool isOnActivity(const QString &activity) const;
     bool isOnAllActivities() const;
 
@@ -331,6 +336,7 @@ signals:
     void maxThicknessChanged();
     void normalThicknessChanged();
     void maxNormalThicknessChanged();
+    void nameChanged();
     void offsetChanged();
     void onPrimaryChanged();
     void parabolicChanged();
@@ -417,6 +423,8 @@ private:
     QRect m_localGeometry;
     QRect m_absoluteGeometry;
 
+    QString m_name;
+
     QStringList m_activities;
 
     //! HACK: In order to avoid crashes when the View is added and removed