introduce Layout ViewsTable

app/data/CMakeLists.txt

@@ -12,5 +12,6 @@ set(lattedock-app_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/screendata.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/uniqueidinfo.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/viewdata.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/viewstable.cpp
     PARENT_SCOPE
 )

app/data/generictable.cpp

@@ -24,6 +24,7 @@
 #include "appletdata.h"
 #include "layoutdata.h"
 #include "screendata.h"
+#include "viewdata.h"
 
 // Qt
 #include <QDebug>
@@ -308,6 +309,7 @@ template class GenericTable<Data::Applet>;
 template class GenericTable<Data::Generic>;
 template class GenericTable<Data::Layout>;
 template class GenericTable<Data::Screen>;
+template class GenericTable<Data::View>;
 
 }
 }

app/data/layoutdata.cpp

@@ -45,7 +45,8 @@ Layout::Layout(Layout &&o)
       isTemplate(o.isTemplate),
       hasDisabledBorders(o.hasDisabledBorders),
       activities(o.activities),
-      backgroundStyle(o.backgroundStyle)
+      backgroundStyle(o.backgroundStyle),
+      views(o.views)
 {
 }
 
@@ -63,7 +64,8 @@ Layout::Layout(const Layout &o)
       isTemplate(o.isTemplate),
       hasDisabledBorders(o.hasDisabledBorders),
       activities(o.activities),
-      backgroundStyle(o.backgroundStyle)
+      backgroundStyle(o.backgroundStyle),
+      views(o.views)
 {
 }
 
@@ -84,6 +86,7 @@ Layout &Layout::operator=(Layout &&rhs)
     hasDisabledBorders = rhs.hasDisabledBorders;
     activities = rhs.activities;
     backgroundStyle = rhs.backgroundStyle;
+    views = rhs.views;
 
     return (*this);
 }
@@ -105,6 +108,7 @@ Layout &Layout::operator=(const Layout &rhs)
     hasDisabledBorders = rhs.hasDisabledBorders;
     activities = rhs.activities;
     backgroundStyle = rhs.backgroundStyle;
+    views = rhs.views;
 
     return (*this);
 }
@@ -125,7 +129,8 @@ bool Layout::operator==(const Layout &rhs) const
             && (isTemplate == rhs.isTemplate)
             && (hasDisabledBorders == rhs.hasDisabledBorders)
             && (activities == rhs.activities)
-            && (backgroundStyle == rhs.backgroundStyle);
+            && (backgroundStyle == rhs.backgroundStyle)
+            && (views == rhs.views);
 }
 
 bool Layout::operator!=(const Layout &rhs) const

app/data/layoutdata.h

@@ -23,6 +23,7 @@
 
 // local
 #include "genericdata.h"
+#include "viewstable.h"
 #include "../layout/abstractlayout.h"
 
 //Qt
@@ -60,6 +61,8 @@ public:
 
     Latte::Layout::BackgroundStyle backgroundStyle{Latte::Layout::ColorBackgroundStyle};
 
+    ViewsTable views;
+
     //! Functionality
     bool isOnAllActivities() const;
     bool isForFreeActivities() const;
@@ -68,7 +71,6 @@ public:
     bool isEmpty() const;
     bool isSystemTemplate() const;
 
-
     //! Operators
     Layout &operator=(const Layout &rhs);
     Layout &operator=(Layout &&rhs);

app/data/viewstable.cpp

@@ -0,0 +1,76 @@
+/*
+ * Copyright 2021  Michail Vourlakos <mvourlakos@gmail.com>
+ *
+ * This file is part of Latte-Dock
+ *
+ * Latte-Dock is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * Latte-Dock is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "viewstable.h"
+
+#include <QDebug>
+
+namespace Latte {
+namespace Data {
+
+ViewsTable::ViewsTable()
+    : GenericTable<View>()
+{
+}
+
+ViewsTable::ViewsTable(ViewsTable &&o)
+    : GenericTable<View>(o),
+      isInitialized(o.isInitialized)
+{
+
+}
+
+ViewsTable::ViewsTable(const ViewsTable &o)
+    : GenericTable<View>(o),
+      isInitialized(o.isInitialized)
+{
+}
+
+//! Operators
+ViewsTable &ViewsTable::operator=(const ViewsTable &rhs)
+{
+    m_list = rhs.m_list;
+    isInitialized = rhs.isInitialized;
+    return (*this);
+}
+
+ViewsTable &ViewsTable::operator=(ViewsTable &&rhs)
+{
+    m_list = rhs.m_list;
+    isInitialized = rhs.isInitialized;
+    return (*this);
+}
+
+bool ViewsTable::operator==(const ViewsTable &rhs) const
+{
+    GenericTable<View> tempView = (*this);
+
+    return (isInitialized == rhs.isInitialized)
+            && (((GenericTable<View>)*this) == ((GenericTable<View>)rhs));
+}
+
+bool ViewsTable::operator!=(const ViewsTable &rhs) const
+{
+    return !(*this == rhs);
+}
+
+
+}
+}

app/data/viewstable.h

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2020  Michail Vourlakos <mvourlakos@gmail.com>
+ *
+ * This file is part of Latte-Dock
+ *
+ * Latte-Dock is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * Latte-Dock is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef VIEWSTABLEDATA_H
+#define VIEWSTABLEDATA_H
+
+// local
+#include "generictable.h"
+#include "viewdata.h"
+
+// Qt
+#include <QList>
+
+namespace Latte {
+namespace Data {
+
+class ViewsTable : public GenericTable<View>
+{
+
+public:
+    ViewsTable();
+    ViewsTable(ViewsTable &&o);
+    ViewsTable(const ViewsTable &o);
+
+    bool isInitialized{false};
+
+    //! Operators
+    ViewsTable &operator=(const ViewsTable &rhs);
+    ViewsTable &operator=(ViewsTable &&rhs);
+    bool operator==(const ViewsTable &rhs) const;
+    bool operator!=(const ViewsTable &rhs) const;
+};
+
+}
+}
+
+Q_DECLARE_METATYPE(Latte::Data::ViewsTable)
+
+#endif