diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 05abf162..5809945a 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,77 +1,78 @@
 set(lattedock-app_SRCS
     ../liblatte2/commontools.cpp
     ../liblatte2/types.cpp
     alternativeshelper.cpp
     infoview.cpp
     lattecorona.cpp
     screenpool.cpp
     main.cpp
 )
 
 add_subdirectory(indicator)
 add_subdirectory(layout)
 add_subdirectory(layouts)
 add_subdirectory(package)
 add_subdirectory(plasma/extended)
 add_subdirectory(settings)
 add_subdirectory(settings/delegates)
 add_subdirectory(settings/tools)
 add_subdirectory(shortcuts)
 add_subdirectory(view)
+add_subdirectory(view/indicator)
 add_subdirectory(view/settings)
 add_subdirectory(wm)
 add_subdirectory(wm/tracker)
 
 set(latte_dbusXML dbus/org.kde.LatteDock.xml)
 qt5_add_dbus_adaptor(lattedock-app_SRCS ${latte_dbusXML} lattecorona.h Latte::Corona lattedockadaptor)
 ki18n_wrap_ui(lattedock-app_SRCS settings/settingsdialog.ui)
 
 add_executable(latte-dock ${lattedock-app_SRCS})
 
 include(FakeTarget.cmake)
 
 target_link_libraries(latte-dock
     Qt5::DBus
     Qt5::Quick
     Qt5::Qml
     KF5::Activities 
     KF5::Archive    
     KF5::CoreAddons    
     KF5::Crash    
     KF5::DBusAddons
     KF5::Declarative
     KF5::GuiAddons
     KF5::GlobalAccel
     KF5::I18n
     KF5::IconThemes
     KF5::Notifications
     KF5::NewStuff   
     KF5::QuickAddons    
     KF5::Plasma
     KF5::PlasmaQuick    
     KF5::ProcessCore
     KF5::WaylandClient
     KF5::XmlGui    
 )
 
 if(HAVE_X11)
     target_link_libraries(latte-dock
         Qt5::X11Extras
         KF5::WindowSystem
         ${X11_LIBRARIES}
         ${XCB_LIBRARIES}
     )
 endif()
 
 configure_file(org.kde.latte-dock.desktop.cmake org.kde.latte-dock.desktop)
 configure_file(org.kde.latte-dock.appdata.xml.cmake org.kde.latte-dock.appdata.xml)
 
 install(TARGETS latte-dock ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.latte-dock.desktop DESTINATION ${KDE_INSTALL_APPDIR})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.latte-dock.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
 install(FILES dbus/org.kde.LatteDock.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR})
 install(FILES lattedock.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
 install(FILES latte-layouts.knsrc DESTINATION  ${CONFIG_INSTALL_DIR})
 install(FILES latte-indicators.knsrc DESTINATION  ${CONFIG_INSTALL_DIR})
 
 add_subdirectory(packageplugins)
diff --git a/app/view/CMakeLists.txt b/app/view/CMakeLists.txt
index 201f51f2..06c623c8 100644
--- a/app/view/CMakeLists.txt
+++ b/app/view/CMakeLists.txt
@@ -1,17 +1,14 @@
 set(lattedock-app_SRCS
     ${lattedock-app_SRCS}   
     ${CMAKE_CURRENT_SOURCE_DIR}/contextmenu.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/effects.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/indicator.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/indicatorinfo.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/indicatorresources.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/panelshadows.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/positioner.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/screenedgeghostwindow.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/view.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/visibilitymanager.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/windowstracker.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/settings/primaryconfigview.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/settings/secondaryconfigview.cpp
     PARENT_SCOPE
 )
diff --git a/app/view/indicator/CMakeLists.txt b/app/view/indicator/CMakeLists.txt
new file mode 100644
index 00000000..b3f12e99
--- /dev/null
+++ b/app/view/indicator/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(lattedock-app_SRCS
+    ${lattedock-app_SRCS}   
+    ${CMAKE_CURRENT_SOURCE_DIR}/indicator.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/indicatorinfo.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/indicatorresources.cpp    
+    PARENT_SCOPE
+)
diff --git a/app/view/indicator.cpp b/app/view/indicator/indicator.cpp
similarity index 98%
rename from app/view/indicator.cpp
rename to app/view/indicator/indicator.cpp
index 0db46420..1acc1885 100644
--- a/app/view/indicator.cpp
+++ b/app/view/indicator/indicator.cpp
@@ -1,449 +1,449 @@
 /*
 *  Copyright 2019  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 "indicator.h"
 
 // local
 #include "indicatorinfo.h"
-#include "view.h"
-#include "../lattecorona.h"
-#include "../indicator/factory.h"
-#include "../../liblatte2/types.h"
+#include "../view.h"
+#include "../../lattecorona.h"
+#include "../../indicator/factory.h"
+#include "../../../liblatte2/types.h"
 
 // Qt
 #include <QFileDialog>
 
 // KDE
 #include <KLocalizedString>
 #include <KPluginMetaData>
 #include <KDeclarative/ConfigPropertyMap>
 #include <KDeclarative/QmlObjectSharedEngine>
 
 namespace Latte {
 namespace ViewPart {
 
 Indicator::Indicator(Latte::View *parent)
     : QObject(parent),
       m_view(parent),
       m_info(new IndicatorPart::Info(this)),
       m_resources(new IndicatorPart::Resources(this))
 {
     m_corona = qobject_cast<Latte::Corona *>(m_view->corona());
     loadConfig();
 
     connect(this, &Indicator::enabledChanged, this, &Indicator::saveConfig);
     connect(this, &Indicator::enabledForAppletsChanged, this, &Indicator::saveConfig);
     connect(this, &Indicator::paddingChanged, this, &Indicator::saveConfig);
     connect(this, &Indicator::pluginChanged, this, &Indicator::saveConfig);
 
     connect(m_view, &Latte::View::latteTasksArePresentChanged, this, &Indicator::latteTasksArePresentChanged);
 
     connect(m_corona->indicatorFactory(), &Latte::Indicator::Factory::customPluginsChanged, [this]() {
         if (!m_corona->indicatorFactory()->pluginExists(m_type)) {
             setType("org.kde.latte.default");
         }
 
         emit customPluginsChanged();
     });
 
     connect(this, &Indicator::pluginChanged, [this]() {
         if ((m_type != "org.kde.latte.default") && m_type != "org.kde.latte.plasma") {
             setCustomType(m_type);
         }
     });
 
     load(m_type);
 
     loadPlasmaComponent();
 }
 
 Indicator::~Indicator()
 {
     if (m_component) {
         m_component->deleteLater();
     }
 
     if (m_configLoader) {
         m_configLoader->deleteLater();
     }
 
     if (m_configuration) {
         m_configuration->deleteLater();
     }
 
     if (m_info) {
         m_info->deleteLater();
     }
 }
 
 bool Indicator::enabled() const
 {
     return m_enabled;
 }
 
 void Indicator::setEnabled(bool enabled)
 {
     if (m_enabled == enabled) {
         return;
     }
 
     m_enabled = enabled;
     emit enabledChanged();
 }
 
 bool Indicator::enabledForApplets() const
 {
     return m_enabledForApplets;
 }
 
 void Indicator::setEnabledForApplets(bool enabled)
 {
     if (m_enabledForApplets == enabled) {
         return;
     }
 
     m_enabledForApplets = enabled;
     emit enabledForAppletsChanged();
 }
 
 bool Indicator::latteTasksArePresent()
 {
     return m_view->latteTasksArePresent();
 }
 
 bool Indicator::providesConfigUi() const
 {
     return m_providesConfigUi;
 }
 
 void Indicator::setProvidesConfigUi(bool provides)
 {
     if (m_providesConfigUi == provides) {
         return;
     }
 
     m_providesConfigUi = provides;
     emit providesConfigUiChanged();
 }
 
 float Indicator::padding() const
 {
     return m_padding;
 }
 
 void Indicator::setPadding(float padding)
 {
     if (m_padding == padding) {
         return;
     }
 
     m_padding = padding;
     emit paddingChanged();
 }
 
 bool Indicator::pluginIsReady()
 {
     return m_pluginIsReady;
 }
 
 void Indicator::setPluginIsReady(bool ready)
 {
     if (m_pluginIsReady == ready) {
         return;
     }
 
     m_pluginIsReady = ready;
     emit pluginIsReadyChanged();
 }
 
 QString Indicator::type() const
 {
     return m_type;
 }
 
 void Indicator::setType(QString type)
 {
     if (m_type == type) {
         return;
     }
 
     load(type);
 }
 
 QString Indicator::customType() const
 {
     return m_customType;
 }
 
 void Indicator::setCustomType(QString type)
 {
     if (m_customType == type) {
         return;
     }
 
     m_customType = type;
     emit customPluginChanged();
 }
 
 int Indicator::customPluginsCount() const
 {
     return m_corona->indicatorFactory()->customPluginsCount();
 }
 
 QStringList Indicator::customPluginIds() const
 {
     return m_corona->indicatorFactory()->customPluginIds();
 }
 
 QStringList Indicator::customPluginNames() const
 {
     return m_corona->indicatorFactory()->customPluginNames();
 }
 
 QStringList Indicator::customLocalPluginIds() const
 {
     return m_corona->indicatorFactory()->customLocalPluginIds();
 }
 
 IndicatorPart::Info *Indicator::info() const
 {
     return m_info;
 }
 
 IndicatorPart::Resources *Indicator::resources() const
 {
     return m_resources;
 }
 
 QQmlComponent *Indicator::component() const
 {
     return m_component;
 }
 
 QQmlComponent *Indicator::plasmaComponent() const
 {
     return m_plasmaComponent;
 }
 
 QObject *Indicator::configuration() const
 {
     return m_configuration;
 }
 
 void Indicator::load(QString type)
 {
     KPluginMetaData metadata = m_corona->indicatorFactory()->metadata(type);
 
     if (metadata.isValid()) {
         bool state{m_enabled};
         //! remove all previous indicators
         setPluginIsReady(false);
 
         m_metadata = metadata;
         m_type = type;
 
         QString path = m_metadata.fileName();
         m_pluginPath = path.remove("metadata.desktop");
 
         updateScheme();
         updateComponent();
 
         emit pluginChanged();
 
         //! create all indicators with the new type
         setPluginIsReady(true);
     } else if (type!="org.kde.latte.default") {
         qDebug() << " Indicator metadata are not valid : " << type;
         setType("org.kde.latte.default");
     }
 }
 
 void Indicator::updateComponent()
 {
     auto prevComponent = m_component;
 
     QString uiPath = m_metadata.value("X-Latte-MainScript");
 
     if (!uiPath.isEmpty()) {
         uiPath = m_pluginPath + "package/" + uiPath;
         m_component = new QQmlComponent(m_view->engine(), uiPath);
     }
 
     if (prevComponent) {
         prevComponent->deleteLater();
     }
 }
 
 void Indicator::loadPlasmaComponent()
 {
     auto prevComponent = m_plasmaComponent;
 
     KPluginMetaData metadata = m_corona->indicatorFactory()->metadata("org.kde.latte.plasma");
     QString uiPath = metadata.value("X-Latte-MainScript");
 
     if (!uiPath.isEmpty()) {
         QString path = metadata.fileName();
         path = path.remove("metadata.desktop");
 
         uiPath = path + "package/" + uiPath;
         m_plasmaComponent = new QQmlComponent(m_view->engine(), uiPath);
     }
 
     if (prevComponent) {
         prevComponent->deleteLater();
     }
 
     emit plasmaComponentChanged();
 }
 
 void Indicator::configUiFor(QString type, QQuickItem *parent)
 {
     if (m_lastCreatedConfigUi) {
         delete m_lastCreatedConfigUi;
         m_lastCreatedConfigUi = nullptr;
     }
     auto prevConfigUi = m_lastCreatedConfigUi;
 
     KPluginMetaData metadata;
 
     if (m_metadata.pluginId() == type) {
         metadata = m_metadata;
     } else {
         metadata = m_corona->indicatorFactory()->metadata(type);
     }
 
     if (metadata.isValid()) {
         QString uiPath = metadata.value("X-Latte-ConfigUi");
 
         if (!uiPath.isEmpty()) {
             m_lastCreatedConfigUi = new KDeclarative::QmlObjectSharedEngine(parent);
             m_lastCreatedConfigUi->setTranslationDomain(QLatin1String("latte_indicator_") + m_metadata.pluginId());
             m_lastCreatedConfigUi->setInitializationDelayed(true);
             uiPath = m_pluginPath + "package/" + uiPath;
             m_lastCreatedConfigUi->setSource(QUrl::fromLocalFile(uiPath));
             m_lastCreatedConfigUi->rootContext()->setContextProperty(QStringLiteral("dialog"), parent);
             m_lastCreatedConfigUi->rootContext()->setContextProperty(QStringLiteral("indicator"), this);
             m_lastCreatedConfigUi->completeInitialization();
 
             QQuickItem *qmlItem = qobject_cast<QQuickItem*>(m_lastCreatedConfigUi->rootObject());
             qmlItem->setParentItem(parent);
 
             setProvidesConfigUi(true);
         } else {
             setProvidesConfigUi(false);
         }
     }
 }
 
 void Indicator::unloadIndicators()
 {
     setPluginIsReady(false);
 }
 
 void Indicator::updateScheme()
 {
     auto prevConfigLoader = m_configLoader;
     auto prevConfiguration = m_configuration;
 
     QString xmlPath = m_metadata.value("X-Latte-ConfigXml");
 
     if (!xmlPath.isEmpty()) {
         QFile file(m_pluginPath + "package/" + xmlPath);
         m_configLoader = new KConfigLoader(m_view->containment()->config().group("Indicator").group(m_metadata.pluginId()), &file);
         m_configuration = new KDeclarative::ConfigPropertyMap(m_configLoader, this);
     } else {
         m_configLoader = nullptr;
         m_configuration = nullptr;
     }
 
     if (prevConfigLoader) {
         prevConfigLoader->deleteLater();
     }
 
     if (prevConfiguration) {
         prevConfiguration->deleteLater();
     }
 }
 
 void Indicator::addIndicator()
 {
     QFileDialog *fileDialog = new QFileDialog(nullptr
                                               , i18nc("add indicator", "Add Indicator")
                                               , QDir::homePath()
                                               , QStringLiteral("indicator.latte"));
 
     fileDialog->setFileMode(QFileDialog::AnyFile);
     fileDialog->setAcceptMode(QFileDialog::AcceptOpen);
     fileDialog->setDefaultSuffix("indicator.latte");
 
     QStringList filters;
     filters << QString(i18nc("add indicator file", "Latte Indicator") + "(*.indicator.latte)");
     fileDialog->setNameFilters(filters);
 
     connect(fileDialog, &QFileDialog::finished, fileDialog, &QFileDialog::deleteLater);
 
     connect(fileDialog, &QFileDialog::fileSelected, this, [&](const QString & file) {
         qDebug() << "Trying to import indicator file ::: " << file;
         m_corona->indicatorFactory()->importIndicatorFile(file);
     });
 
     fileDialog->open();
 }
 
 void Indicator::downloadIndicator()
 {
     //! call asynchronously in order to not crash when view settings window
     //! loses focus and it closes
     QTimer::singleShot(0, [this]() {
         m_corona->indicatorFactory()->downloadIndicator();
     });
 }
 
 void Indicator::removeIndicator(QString pluginId)
 {    //! call asynchronously in order to not crash when view settings window
     //! loses focus and it closes
     QTimer::singleShot(0, [this, pluginId]() {
         m_corona->indicatorFactory()->removeIndicator(pluginId);
     });
 }
 
 void Indicator::loadConfig()
 {
     auto config = m_view->containment()->config().group("Indicator");
     m_customType = config.readEntry("customType", QString());
     m_enabled = config.readEntry("enabled", true);
     m_enabledForApplets = config.readEntry("enabledForApplets", true);
     m_padding = config.readEntry("padding", (float)0.08);
     m_type = config.readEntry("type", "org.kde.latte.default");
 }
 
 void Indicator::saveConfig()
 {
     auto config = m_view->containment()->config().group("Indicator");
     config.writeEntry("customType", m_customType);
     config.writeEntry("enabled", m_enabled);
     config.writeEntry("enabledForApplets", m_enabledForApplets);
     config.writeEntry("padding", m_padding);
     config.writeEntry("type", m_type);
 
     config.sync();
 }
 
 }
 }
diff --git a/app/view/indicator.h b/app/view/indicator/indicator.h
similarity index 100%
rename from app/view/indicator.h
rename to app/view/indicator/indicator.h
diff --git a/app/view/indicatorinfo.cpp b/app/view/indicator/indicatorinfo.cpp
similarity index 100%
rename from app/view/indicatorinfo.cpp
rename to app/view/indicator/indicatorinfo.cpp
diff --git a/app/view/indicatorinfo.h b/app/view/indicator/indicatorinfo.h
similarity index 100%
rename from app/view/indicatorinfo.h
rename to app/view/indicator/indicatorinfo.h
diff --git a/app/view/indicatorresources.cpp b/app/view/indicator/indicatorresources.cpp
similarity index 100%
rename from app/view/indicatorresources.cpp
rename to app/view/indicator/indicatorresources.cpp
diff --git a/app/view/indicatorresources.h b/app/view/indicator/indicatorresources.h
similarity index 100%
rename from app/view/indicatorresources.h
rename to app/view/indicator/indicatorresources.h
diff --git a/app/view/view.h b/app/view/view.h
index 759abdad..1cfdf99c 100644
--- a/app/view/view.h
+++ b/app/view/view.h
@@ -1,341 +1,341 @@
 /*
 *  Copyright 2016  Smith AR <audoban@openmailbox.org>
 *                  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 VIEW_H
 #define VIEW_H
 
 // local
 #include "effects.h"
-#include "indicator.h"
 #include "positioner.h"
 #include "visibilitymanager.h"
 #include "windowstracker.h"
+#include "indicator/indicator.h"
 #include "settings/primaryconfigview.h"
 #include "../shortcuts/globalshortcuts.h"
 #include "../layout/genericlayout.h"
 #include "../plasma/quick/containmentview.h"
 #include "../plasma/quick/configview.h"
 #include "../../liblatte2/types.h"
 
 // C++
 #include <array>
 
 // Qt
 #include <QQuickView>
 #include <QMenu>
 #include <QMimeData>
 #include <QScreen>
 #include <QPointer>
 #include <QTimer>
 
 namespace Plasma {
 class Types;
 class Corona;
 class Containment;
 }
 
 namespace KWayland {
 namespace Client {
 class PlasmaShellSurface;
 }
 }
 
 namespace Latte {
 class Corona;
 class GenericLayout;
 
 namespace ViewPart {
 class ContextMenu;
 }
 }
 
 namespace Latte {
 
 class View : public PlasmaQuick::ContainmentView
 {
     Q_OBJECT
 
     Q_PROPERTY(Latte::Types::ViewType type READ type WRITE setType NOTIFY typeChanged)
 
     Q_PROPERTY(bool alternativesIsShown READ alternativesIsShown NOTIFY alternativesIsShownChanged)
     Q_PROPERTY(bool behaveAsPlasmaPanel READ behaveAsPlasmaPanel WRITE setBehaveAsPlasmaPanel NOTIFY behaveAsPlasmaPanelChanged)
     Q_PROPERTY(bool byPassWM READ byPassWM WRITE setByPassWM NOTIFY byPassWMChanged)
     Q_PROPERTY(bool containsDrag READ containsDrag NOTIFY containsDragChanged)
     Q_PROPERTY(bool contextMenuIsShown READ contextMenuIsShown NOTIFY contextMenuIsShownChanged)
     //! Because Latte uses animations, changing to edit mode it may be different than
     //! when the isUserConfiguring changes value
     Q_PROPERTY(bool inEditMode READ inEditMode WRITE setInEditMode NOTIFY inEditModeChanged)
     Q_PROPERTY(bool isPreferredForShortcuts READ isPreferredForShortcuts WRITE setIsPreferredForShortcuts NOTIFY isPreferredForShortcutsChanged)
     Q_PROPERTY(bool latteTasksArePresent READ latteTasksArePresent WRITE setLatteTasksArePresent NOTIFY latteTasksArePresentChanged)
     Q_PROPERTY(bool onPrimary READ onPrimary WRITE setOnPrimary NOTIFY onPrimaryChanged)
 
     Q_PROPERTY(int alignment READ alignment WRITE setAlignment NOTIFY alignmentChanged)
     Q_PROPERTY(int fontPixelSize READ fontPixelSize WRITE setFontPixelSize NOTIFY fontPixelSizeChanged)
     Q_PROPERTY(int x READ x NOTIFY xChanged)
     Q_PROPERTY(int y READ y NOTIFY yChanged)
     Q_PROPERTY(int width READ width NOTIFY widthChanged)
     Q_PROPERTY(int height READ height NOTIFY heightChanged)
     Q_PROPERTY(int editThickness READ editThickness WRITE setEditThickness NOTIFY editThicknessChanged)
     Q_PROPERTY(int maxThickness READ maxThickness WRITE setMaxThickness NOTIFY maxThicknessChanged)
     Q_PROPERTY(int normalThickness READ normalThickness WRITE setNormalThickness NOTIFY normalThicknessChanged)
     Q_PROPERTY(int offset READ offset WRITE setOffset NOTIFY offsetChanged)
 
     Q_PROPERTY(float maxLength READ maxLength WRITE setMaxLength NOTIFY maxLengthChanged)
 
     Q_PROPERTY(Latte::Layout::GenericLayout *layout READ layout WRITE setLayout NOTIFY layoutChanged)
     Q_PROPERTY(Latte::ViewPart::Effects *effects READ effects NOTIFY effectsChanged)
     Q_PROPERTY(Latte::ViewPart::Indicator *indicator READ indicator NOTIFY indicatorChanged)
     Q_PROPERTY(Latte::ViewPart::Positioner *positioner READ positioner NOTIFY positionerChanged)
     Q_PROPERTY(Latte::ViewPart::VisibilityManager *visibility READ visibility NOTIFY visibilityChanged)
     Q_PROPERTY(Latte::ViewPart::WindowsTracker *windowsTracker READ windowsTracker NOTIFY windowsTrackerChanged)
 
     Q_PROPERTY(QRect absoluteGeometry READ absoluteGeometry NOTIFY absoluteGeometryChanged)
     Q_PROPERTY(QRect localGeometry READ localGeometry WRITE setLocalGeometry NOTIFY localGeometryChanged)
     Q_PROPERTY(QRect screenGeometry READ screenGeometry NOTIFY screenGeometryChanged)
 
 public:
     View(Plasma::Corona *corona, QScreen *targetScreen = nullptr, bool byPassWM = false);
     virtual ~View();
 
     void init();
 
     Types::ViewType type() const;
     void setType(Types::ViewType type);
 
     bool alternativesIsShown() const;
     void setAlternativesIsShown(bool show);
 
     bool inDelete() const;
 
     bool onPrimary() const;
     void setOnPrimary(bool flag);
 
     int currentThickness() const;
 
     bool behaveAsPlasmaPanel() const;
     void setBehaveAsPlasmaPanel(bool behavior);
 
     bool containsDrag() const;
     bool containsMouse() const;
 
     bool contextMenuIsShown() const;
 
     bool byPassWM() const;
     void setByPassWM(bool bypass);
 
     bool inEditMode() const;
     void setInEditMode(bool edit);
 
     bool isPreferredForShortcuts() const;
     void setIsPreferredForShortcuts(bool preferred);
 
     bool latteTasksArePresent() const;
     void setLatteTasksArePresent(bool present);
 
     float maxLength() const;
     void setMaxLength(float length);
 
     int fontPixelSize() const;
     void setFontPixelSize(int size);
 
     int editThickness() const;
     void setEditThickness(int thickness);
 
     int maxThickness() const;
     void setMaxThickness(int thickness);
 
     int normalThickness() const;
     void setNormalThickness(int thickness);
 
     int offset() const;
     void setOffset(int offset);
 
     int alignment() const;
     void setAlignment(int alignment);
 
     QRect absoluteGeometry() const;
     QRect screenGeometry() const;
 
     QRect localGeometry() const;
     void setLocalGeometry(const QRect &geometry);
 
     bool settingsWindowIsShown();
     void showSettingsWindow();
 
     PlasmaQuick::ConfigView *configView();
 
     ViewPart::Effects *effects() const;
     ViewPart::Indicator *indicator() const;
     ViewPart::Positioner *positioner() const;
     ViewPart::VisibilityManager *visibility() const;
     ViewPart::WindowsTracker *windowsTracker() const;
 
     Layout::GenericLayout *layout() const;
     void setLayout(Layout::GenericLayout *layout);
 
     KWayland::Client::PlasmaShellSurface *surface();
 
     void reconsiderScreen();
 
     //! these are signals that create crashes, such a example is the availableScreenRectChanged from corona
     //! when its containment is destroyed
     void disconnectSensitiveSignals();
 
 public slots:
     Q_INVOKABLE void copyView();
     Q_INVOKABLE void removeView();
 
     Q_INVOKABLE QVariantList containmentActions();
 
     Q_INVOKABLE void deactivateApplets();
     Q_INVOKABLE void moveToLayout(QString layoutName);
     Q_INVOKABLE void removeTasksPlasmoid();
     Q_INVOKABLE void setBlockHiding(bool block);
     Q_INVOKABLE void toggleAppletExpanded(const int id);
 
     Q_INVOKABLE bool mimeContainsPlasmoid(QMimeData *mimeData, QString name);
     Q_INVOKABLE bool tasksPresent();
 
     void updateAbsoluteGeometry(bool bypassChecks = false);
 
     Q_INVOKABLE void disableGrabItemBehavior();
     Q_INVOKABLE void restoreGrabItemBehavior();
 
     Q_INVOKABLE bool isHighestPriorityView();
 
 protected slots:
     void showConfigurationInterface(Plasma::Applet *applet) override;
 
 protected:
     bool event(QEvent *ev) override;
     void mousePressEvent(QMouseEvent *event) override;
 
 signals:
     void eventTriggered(QEvent *ev);
     void mousePressed(const QPoint pos, const int button);
     void mouseReleased(const QPoint pos, const int button);
 
     void activitiesChanged();
     void alternativesIsShownChanged();
     void alignmentChanged();
     void behaveAsPlasmaPanelChanged();
     void byPassWMChanged();
     void configWindowGeometryChanged(); // is called from config windows
     void containsDragChanged();
     void contextMenuIsShownChanged();
     void dockLocationChanged();
     void editThicknessChanged();
     void effectsChanged();
     void fontPixelSizeChanged();
     void widthChanged();
     void heightChanged();
     void inEditModeChanged();
     void indicatorChanged();
     void isPreferredForShortcutsChanged();
     void latteTasksArePresentChanged();
     void layoutChanged();
     void localGeometryChanged();
     void maxLengthChanged();
     void maxThicknessChanged();
     void normalThicknessChanged();
     void offsetChanged();
     void onPrimaryChanged();
     void positionerChanged();
     void screenGeometryChanged();
     void typeChanged();
     void visibilityChanged();
     void windowsTrackerChanged();
     void xChanged();
     void yChanged();
 
     void absoluteGeometryChanged(const QRect &geometry);
 
 private slots:
     void availableScreenRectChangedFrom(View *origin);
     void configViewCreatedFor(Latte::View *view);
     void hideWindowsForSlidingOut();
     void preferredViewForShortcutsChangedSlot(Latte::View *view);
     void statusChanged(Plasma::Types::ItemStatus);
 
     void restoreConfig();
     void saveConfig();
 
 private:
     void applyActivitiesToWindows();
     void initSignalingForLocationChangeSliding();
     void setupWaylandIntegration();
     void updateAppletContainsMethod();
 
     void setContainsDrag(bool contains);
 
 private:
     Plasma::Containment *containmentById(uint id);
 
     bool m_alternativesIsShown{false};
     bool m_behaveAsPlasmaPanel{false};
     bool m_byPassWM{true};
     bool m_containsDrag{false};
     bool m_containsMouse{false};
     bool m_inDelete{false};
     bool m_inEditMode{false};
     bool m_isPreferredForShortcuts{false};
     bool m_latteTasksArePresent{false};
     bool m_onPrimary{true};
 
     int m_fontPixelSize{ -1};
     int m_editThickness{24};
     int m_maxThickness{24};
     int m_normalThickness{24};
     int m_offset{0};
     float m_maxLength{1};
 
     Types::Alignment m_alignment{Types::Center};
     Types::ViewType m_type{Types::DockView};
 
     QRect m_localGeometry;
     QRect m_absoluteGeometry;
 
     //! HACK: Timers in order to handle KWin faulty
     //! behavior that hides Views when closing Activities
     //! with no actual reason
     QTimer m_visibleHackTimer1;
     QTimer m_visibleHackTimer2;
 
     Layout::GenericLayout *m_layout{nullptr};
     QPointer<PlasmaQuick::ConfigView> m_configView;
 
     QPointer<ViewPart::ContextMenu> m_contextMenu;
     QPointer<ViewPart::Effects> m_effects;
     QPointer<ViewPart::Indicator> m_indicator;
     QPointer<ViewPart::Positioner> m_positioner;
     QPointer<ViewPart::VisibilityManager> m_visibility;
     QPointer<ViewPart::WindowsTracker> m_windowsTracker;
 
     //! Connections to release and bound for the assigned layout
     QList<QMetaObject::Connection> connectionsLayout;
 
     QPointer<Latte::Corona> m_corona;
 
     KWayland::Client::PlasmaShellSurface *m_shellSurface{nullptr};
 };
 
 }
 
 #endif