From 90a2bb3bc1d528d0c3e71418ef4c8231d3730d2a Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Sun, 2 Dec 2018 00:53:40 +0200 Subject: [PATCH] refactor:rename MenuManager to View::ContextMenu --- app/CMakeLists.txt | 2 +- .../{dockmenumanager.cpp => contextmenu.cpp} | 30 ++++++++++--------- app/dock/{dockmenumanager.h => contextmenu.h} | 21 ++++++------- app/dock/dockview.cpp | 16 +++++----- app/dock/dockview.h | 7 +++-- 5 files changed, 41 insertions(+), 35 deletions(-) rename app/dock/{dockmenumanager.cpp => contextmenu.cpp} (95%) rename app/dock/{dockmenumanager.h => contextmenu.h} (84%) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index f7010e7fa..d690187c1 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -20,8 +20,8 @@ set(lattedock-app_SRCS waylandinterface.cpp windowinfowrap.cpp xwindowinterface.cpp + dock/contextmenu.cpp dock/dockconfigview.cpp - dock/dockmenumanager.cpp dock/docksecconfigview.cpp dock/dockview.cpp dock/effects.cpp diff --git a/app/dock/dockmenumanager.cpp b/app/dock/contextmenu.cpp similarity index 95% rename from app/dock/dockmenumanager.cpp rename to app/dock/contextmenu.cpp index c58a24c52..f7b9680c4 100644 --- a/app/dock/dockmenumanager.cpp +++ b/app/dock/contextmenu.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "dockmenumanager.h" +#include "contextmenu.h" #include "dockview.h" #include "visibilitymanager.h" @@ -38,23 +38,24 @@ #include namespace Latte { +namespace View { -DockMenuManager::DockMenuManager(DockView *view) : +ContextMenu::ContextMenu(Latte::DockView *view) : QObject(view), m_dockView(view) { } -DockMenuManager::~DockMenuManager() +ContextMenu::~ContextMenu() { } -QMenu *DockMenuManager::contextMenu() +QMenu *ContextMenu::menu() { return m_contextMenu; } -void DockMenuManager::menuAboutToHide() +void ContextMenu::menuAboutToHide() { if (!m_dockView) { return; @@ -66,10 +67,10 @@ void DockMenuManager::menuAboutToHide() m_dockView->visibility()->setBlockHiding(false); } - emit contextMenuChanged(); + emit menuChanged(); } -bool DockMenuManager::mousePressEvent(QMouseEvent *event) +bool ContextMenu::mousePressEvent(QMouseEvent *event) { //qDebug() << "Step -1 ..."; @@ -85,7 +86,7 @@ bool DockMenuManager::mousePressEvent(QMouseEvent *event) //qDebug() << "Step 0.5 ..."; m_contextMenu->close(); m_contextMenu = 0; - emit contextMenuChanged(); + emit menuChanged(); // PlasmaQuick::ContainmentView::mousePressEvent(event); return false; } @@ -281,7 +282,7 @@ bool DockMenuManager::mousePressEvent(QMouseEvent *event) m_dockView->visibility()->setBlockHiding(true); desktopMenu->popup(pos); event->setAccepted(true); - emit contextMenuChanged(); + emit menuChanged(); return false; } @@ -292,13 +293,13 @@ bool DockMenuManager::mousePressEvent(QMouseEvent *event) } //qDebug() << "10 ..."; - emit contextMenuChanged(); + emit menuChanged(); return true; // PlasmaQuick::ContainmentView::mousePressEvent(event); } //! update the appletContainsPos method from Panel view -void DockMenuManager::updateAppletContainsMethod() +void ContextMenu::updateAppletContainsMethod() { for (QQuickItem *item : m_dockView->contentItem()->childItems()) { if (auto *metaObject = item->metaObject()) { @@ -319,7 +320,7 @@ void DockMenuManager::updateAppletContainsMethod() } } -void DockMenuManager::addAppletActions(QMenu *desktopMenu, Plasma::Applet *applet, QEvent *event) +void ContextMenu::addAppletActions(QMenu *desktopMenu, Plasma::Applet *applet, QEvent *event) { if (!m_dockView->containment()) { return; @@ -402,7 +403,7 @@ void DockMenuManager::addAppletActions(QMenu *desktopMenu, Plasma::Applet *apple } } -void DockMenuManager::addContainmentActions(QMenu *desktopMenu, QEvent *event) +void ContextMenu::addContainmentActions(QMenu *desktopMenu, QEvent *event) { if (!m_dockView->containment()) { return; @@ -452,7 +453,7 @@ void DockMenuManager::addContainmentActions(QMenu *desktopMenu, QEvent *event) return; } -Plasma::Containment *DockMenuManager::containmentById(uint id) +Plasma::Containment *ContextMenu::containmentById(uint id) { foreach (auto containment, m_dockView->corona()->containments()) { if (id == containment->id()) { @@ -464,3 +465,4 @@ Plasma::Containment *DockMenuManager::containmentById(uint id) } } +} diff --git a/app/dock/dockmenumanager.h b/app/dock/contextmenu.h similarity index 84% rename from app/dock/dockmenumanager.h rename to app/dock/contextmenu.h index 7ae2bc69b..007329315 100644 --- a/app/dock/dockmenumanager.h +++ b/app/dock/contextmenu.h @@ -17,9 +17,8 @@ * along with this program. If not, see . */ - -#ifndef DOCKMENUMANAGER_H -#define DOCKMENUMANAGER_H +#ifndef CONTEXTMENU_H +#define CONTEXTMENU_H #include #include @@ -38,21 +37,22 @@ class DockView; } namespace Latte { +namespace View { -class DockMenuManager : public QObject +class ContextMenu : public QObject { Q_OBJECT public: - DockMenuManager(DockView *view); - ~DockMenuManager() override; + ContextMenu(Latte::DockView *view); + ~ContextMenu() override; - QMenu *contextMenu(); + QMenu *menu(); bool mousePressEvent(QMouseEvent *event); signals: - void contextMenuChanged(); + void menuChanged(); private slots: void menuAboutToHide(); @@ -69,11 +69,12 @@ private: QMetaMethod m_appletContainsMethod; QQuickItem *m_appletContainsMethodItem{nullptr}; - DockView *m_dockView; + Latte::DockView *m_dockView; - friend class DockView; + friend class Latte::DockView; }; +} } #endif // DOCKMENUMANAGER_H diff --git a/app/dock/dockview.cpp b/app/dock/dockview.cpp index 3e7fa7748..cc291ea8c 100644 --- a/app/dock/dockview.cpp +++ b/app/dock/dockview.cpp @@ -20,8 +20,8 @@ #include "dockview.h" +#include "contextmenu.h" #include "dockconfigview.h" -#include "dockmenumanager.h" #include "effects.h" #include "positioner.h" #include "visibilitymanager.h" @@ -59,7 +59,7 @@ namespace Latte { //! are needed in order for window flags to be set correctly DockView::DockView(Plasma::Corona *corona, QScreen *targetScreen, bool dockWindowBehavior) : PlasmaQuick::ContainmentView(corona), - m_menuManager(new DockMenuManager(this)), + m_contextMenu(new View::ContextMenu(this)), m_effects(new View::Effects(this)), m_positioner(new View::Positioner(this)) //needs to be created after Effects becuase it catches some of its signals { @@ -149,8 +149,8 @@ DockView::~DockView() m_configView->setVisible(false);//hide(); } - if (m_menuManager) { - delete m_menuManager; + if (m_contextMenu) { + delete m_contextMenu; } //needs to be deleted before Effects becuase it catches some of its signals @@ -188,7 +188,7 @@ void DockView::init() connect(this, SIGNAL(normalThicknessChanged()), corona(), SIGNAL(availableScreenRectChanged())); - connect(m_menuManager, &DockMenuManager::contextMenuChanged, this, &DockView::contextMenuIsShownChanged); + connect(m_contextMenu, &View::ContextMenu::menuChanged, this, &DockView::contextMenuIsShownChanged); ///!!!!! rootContext()->setContextProperty(QStringLiteral("dock"), this); @@ -434,11 +434,11 @@ void DockView::setAlternativesIsShown(bool show) bool DockView::contextMenuIsShown() const { - if (!m_menuManager) { + if (!m_contextMenu) { return false; } - return m_menuManager->contextMenu(); + return m_contextMenu->menu(); } int DockView::currentThickness() const @@ -1027,7 +1027,7 @@ void DockView::restoreGrabItemBehavior() //!BEGIN overriding context menus behavior void DockView::mousePressEvent(QMouseEvent *event) { - bool result = m_menuManager->mousePressEvent(event); + bool result = m_contextMenu->mousePressEvent(event); emit contextMenuIsShownChanged(); if (result) { diff --git a/app/dock/dockview.h b/app/dock/dockview.h index f97020ec8..ebaf1fe8d 100644 --- a/app/dock/dockview.h +++ b/app/dock/dockview.h @@ -52,8 +52,11 @@ class PlasmaShellSurface; } namespace Latte { -class DockMenuManager; class Layout; + +namespace View { +class ContextMenu; +} } namespace Latte { @@ -264,7 +267,7 @@ private: Layout *m_managedLayout{nullptr}; QPointer m_configView; - QPointer m_menuManager; + QPointer m_contextMenu; QPointer m_effects; QPointer m_positioner; QPointer m_visibility;