kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-29 22:50:30 +03:00
Code Issues Projects Releases Wiki Activity

contextmenu:update visibility for hash actions

Browse Source
This commit is contained in:
Michail Vourlakos 2021-06-08 21:05:29 +03:00
parent 2c9b07ebe0
commit 5b0a507be2
3 changed files with 30 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/settings/universalsettings.cpp
View File

@ -514,7 +514,8 @@ void UniversalSettings::loadConfig()
m_version = m_universalGroup.readEntry("version", 1);
m_badges3DStyle = m_universalGroup.readEntry("badges3DStyle", false);
m_canDisableBorders = m_universalGroup.readEntry("canDisableBorders", false);
m_contextMenuActionsAlwaysShown = m_universalGroup.readEntry("contextMenuActionsAlwaysShown", Latte::Data::ContextMenu::ACTIONSALWAYSVISIBLE);
m_contextMenuActionsAlwaysShown = m_universalGroup.readEntry("contextMenuActionsAlwaysShown", QStringList());
m_contextMenuActionsAlwaysShown = m_contextMenuActionsAlwaysShown.isEmpty() ? Latte::Data::ContextMenu::ACTIONSALWAYSVISIBLE : m_contextMenuActionsAlwaysShown;
m_inAdvancedModeForEditSettings = m_universalGroup.readEntry("inAdvancedModeForEditSettings", false);
m_launchers = m_universalGroup.readEntry("launchers", QStringList());
m_metaPressAndHoldEnabled = m_universalGroup.readEntry("metaPressAndHoldEnabled", true);

65
containmentactions/contextmenu/menu.cpp
View File

@ -140,7 +140,6 @@ void Menu::makeActions()
//! Move submenu
m_moveToLayoutMenu = new QMenu;
m_actions[Latte::Data::ContextMenu::MOVEVIEWACTION] = m_moveToLayoutMenu->menuAction();
m_actions[Latte::Data::ContextMenu::MOVEVIEWACTION]->setVisible(containment()->isUserConfiguring());
m_actions[Latte::Data::ContextMenu::MOVEVIEWACTION]->setText("Move To Layout");
m_actions[Latte::Data::ContextMenu::MOVEVIEWACTION]->setIcon(QIcon::fromTheme("transform-move-horizontal"));
m_actions[Latte::Data::ContextMenu::MOVEVIEWACTION]->setStatusTip(i18n("Move dock or panel to different layout"));
@ -173,7 +172,6 @@ void Menu::makeActions()
//! Export View Template Action
m_actions[Latte::Data::ContextMenu::EXPORTVIEWTEMPLATEACTION] = new QAction(QIcon::fromTheme("document-export"), "Export as Template...", this);
m_actions[Latte::Data::ContextMenu::EXPORTVIEWTEMPLATEACTION]->setVisible(containment()->isUserConfiguring());
connect(m_actions[Latte::Data::ContextMenu::EXPORTVIEWTEMPLATEACTION], &QAction::triggered, [=](){
QDBusInterface iface("org.kde.lattedock", "/Latte", "", QDBusConnection::sessionBus());
@ -185,7 +183,6 @@ void Menu::makeActions()
//! Remove Action
m_actions[Latte::Data::ContextMenu::REMOVEVIEWACTION] = new QAction(QIcon::fromTheme("delete"), "Remove Dock", this);
m_actions[Latte::Data::ContextMenu::REMOVEVIEWACTION]->setVisible(containment()->isUserConfiguring());
connect(m_actions[Latte::Data::ContextMenu::REMOVEVIEWACTION], &QAction::triggered, [=](){
QDBusInterface iface("org.kde.lattedock", "/Latte", "", QDBusConnection::sessionBus());
@ -196,7 +193,9 @@ void Menu::makeActions()
this->containment()->actions()->addAction(Latte::Data::ContextMenu::REMOVEVIEWACTION, m_actions[Latte::Data::ContextMenu::REMOVEVIEWACTION]);
//! Signals
connect(this->containment(), &Plasma::Containment::userConfiguringChanged, this, &Menu::onUserConfiguringChanged);
connect(this->containment(), &Plasma::Containment::userConfiguringChanged, [=](){
updateVisibleActions();
});
}
void Menu::requestConfiguration()
@ -256,18 +255,15 @@ QList<QAction *> Menu::contextualActions()
const QString exportTemplateText = (viewType == DockView) ? i18n("E&xport Dock as Template") : i18n("E&xport Panel as Template");
m_actions[Latte::Data::ContextMenu::EXPORTVIEWTEMPLATEACTION]->setText(exportTemplateText);
QStringList activeNames = m_data[ACTIVELAYOUTSINDEX].split(";;");
if (activeNames.count() > 1 && containment()->isUserConfiguring()) {
m_actions[Latte::Data::ContextMenu::MOVEVIEWACTION]->setVisible(true);
const QString moveText = (viewType == DockView) ? i18n("&Move Dock To Layout") : i18n("&Move Panel To Layout");
m_actions[Latte::Data::ContextMenu::MOVEVIEWACTION]->setText(moveText);
} else {
m_actions[Latte::Data::ContextMenu::MOVEVIEWACTION]->setVisible(false);
}
m_activeLayoutNames = m_data[ACTIVELAYOUTSINDEX].split(";;");
const QString moveText = (viewType == DockView) ? i18n("&Move Dock To Layout") : i18n("&Move Panel To Layout");
m_actions[Latte::Data::ContextMenu::MOVEVIEWACTION]->setText(moveText);
const QString removeActionText = (viewType == DockView) ? i18n("&Remove Dock") : i18n("&Remove Panel");
m_actions[Latte::Data::ContextMenu::REMOVEVIEWACTION]->setText(removeActionText);
updateVisibleActions();
return actions;
}
@ -280,25 +276,6 @@ QAction *Menu::action(const QString &name)
return nullptr;
}
void Menu::onUserConfiguringChanged(const bool &configuring)
{
if (!m_actions.contains(Latte::Data::ContextMenu::EDITVIEWACTION)
|| !m_actions.contains(Latte::Data::ContextMenu::REMOVEVIEWACTION)) {
return;
}
m_actions[Latte::Data::ContextMenu::EDITVIEWACTION]->setVisible(!configuring);
m_actions[Latte::Data::ContextMenu::EXPORTVIEWTEMPLATEACTION]->setVisible(configuring);
m_actions[Latte::Data::ContextMenu::MOVEVIEWACTION]->setVisible(configuring);
m_actions[Latte::Data::ContextMenu::REMOVEVIEWACTION]->setVisible(configuring);
// because sometimes they are disabled unexpectedly, we should reenable them
m_actions[Latte::Data::ContextMenu::EDITVIEWACTION]->setEnabled(true);
m_actions[Latte::Data::ContextMenu::EXPORTVIEWTEMPLATEACTION]->setEnabled(true);
m_actions[Latte::Data::ContextMenu::MOVEVIEWACTION]->setEnabled(true);
m_actions[Latte::Data::ContextMenu::REMOVEVIEWACTION]->setEnabled(true);
}
void Menu::updateVisibleActions()
{
if (!m_actions.contains(Latte::Data::ContextMenu::EDITVIEWACTION)
@ -308,16 +285,28 @@ void Menu::updateVisibleActions()
bool configuring = containment()->isUserConfiguring();
// normal actions that the user can specify their visibility
for(auto actionName: m_actions.keys()) {
if (Latte::Data::ContextMenu::ACTIONSSPECIAL.contains(actionName)) {
continue;
}
bool isvisible = m_actionsAlwaysShown.contains(actionName) || configuring;
m_actions[actionName]->setVisible(isvisible);
}
// normal actions with more criteria
bool isshown = (m_actions[Latte::Data::ContextMenu::MOVEVIEWACTION]->isVisible() && m_activeLayoutNames.count()>1);
m_actions[Latte::Data::ContextMenu::MOVEVIEWACTION]->setVisible(isshown);
// special actions
m_actions[Latte::Data::ContextMenu::EDITVIEWACTION]->setVisible(!configuring);
m_actions[Latte::Data::ContextMenu::EXPORTVIEWTEMPLATEACTION]->setVisible(configuring);
m_actions[Latte::Data::ContextMenu::MOVEVIEWACTION]->setVisible(configuring);
m_actions[Latte::Data::ContextMenu::REMOVEVIEWACTION]->setVisible(configuring);
m_actions[Latte::Data::ContextMenu::SECTIONACTION]->setVisible(true);
// because sometimes they are disabled unexpectedly, we should reenable them
m_actions[Latte::Data::ContextMenu::EDITVIEWACTION]->setEnabled(true);
m_actions[Latte::Data::ContextMenu::EXPORTVIEWTEMPLATEACTION]->setEnabled(true);
m_actions[Latte::Data::ContextMenu::MOVEVIEWACTION]->setEnabled(true);
m_actions[Latte::Data::ContextMenu::REMOVEVIEWACTION]->setEnabled(true);
for(auto actionName: m_actions.keys()) {
m_actions[actionName]->setEnabled(true);
}
}

2
containmentactions/contextmenu/menu.h
View File

@ -34,7 +34,6 @@ public:
QAction *action(const QString &name);
private Q_SLOTS:
void makeActions();
void onUserConfiguringChanged(const bool &configuring);
void populateLayouts();
void populateMoveToLayouts();
void populateViewTemplates();
@ -52,6 +51,7 @@ private:
QStringList m_viewTemplates;
QStringList m_actionsAlwaysShown;
QStringList m_activeLayoutNames;
QHash<QString, QAction *> m_actions;