|
|
@ -54,11 +54,11 @@ NowDockCorona::NowDockCorona(QObject *parent)
|
|
|
|
|
|
|
|
|
|
|
|
setKPackage(package);
|
|
|
|
setKPackage(package);
|
|
|
|
qmlRegisterTypes();
|
|
|
|
qmlRegisterTypes();
|
|
|
|
|
|
|
|
|
|
|
|
connect(this, &Corona::containmentAdded, this, &NowDockCorona::addDock);
|
|
|
|
connect(this, &Corona::containmentAdded, this, &NowDockCorona::addDock);
|
|
|
|
|
|
|
|
|
|
|
|
loadLayout();
|
|
|
|
loadLayout();
|
|
|
|
|
|
|
|
|
|
|
|
/*QAction *addDock = actions()->add<QAction>(QStringLiteral("add dock"));
|
|
|
|
/*QAction *addDock = actions()->add<QAction>(QStringLiteral("add dock"));
|
|
|
|
connect(addDock, &QAction::triggered, this, &NowDockCorona::loadDefaultLayout);
|
|
|
|
connect(addDock, &QAction::triggered, this, &NowDockCorona::loadDefaultLayout);
|
|
|
|
addDock->setText(i18n("Add New Dock"));
|
|
|
|
addDock->setText(i18n("Add New Dock"));
|
|
|
@ -66,7 +66,7 @@ NowDockCorona::NowDockCorona(QObject *parent)
|
|
|
|
addDock->setStatusTip(tr("Adds a new dock in the environment"));
|
|
|
|
addDock->setStatusTip(tr("Adds a new dock in the environment"));
|
|
|
|
addDock->setVisible(true);
|
|
|
|
addDock->setVisible(true);
|
|
|
|
addDock->setEnabled(true);
|
|
|
|
addDock->setEnabled(true);
|
|
|
|
|
|
|
|
|
|
|
|
addDock->setIcon(QIcon::fromTheme(QStringLiteral("object-locked")));
|
|
|
|
addDock->setIcon(QIcon::fromTheme(QStringLiteral("object-locked")));
|
|
|
|
addDock->setData(Plasma::Types::ControlAction);
|
|
|
|
addDock->setData(Plasma::Types::ControlAction);
|
|
|
|
addDock->setShortcut(QKeySequence(QStringLiteral("alt+d, l")));
|
|
|
|
addDock->setShortcut(QKeySequence(QStringLiteral("alt+d, l")));
|
|
|
@ -156,21 +156,21 @@ void NowDockCorona::addDock(Plasma::Containment *containment)
|
|
|
|
qWarning() << "the requested containment plugin can not be located or loaded";
|
|
|
|
qWarning() << "the requested containment plugin can not be located or loaded";
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// the system tray is a containment that behaves as an applet
|
|
|
|
// the system tray is a containment that behaves as an applet
|
|
|
|
// so a dockview shouldnt be created for it
|
|
|
|
// so a dockview shouldnt be created for it
|
|
|
|
KPluginMetaData metadata = containment->kPackage().metadata();
|
|
|
|
KPluginMetaData metadata = containment->kPackage().metadata();
|
|
|
|
|
|
|
|
|
|
|
|
if (metadata.pluginId() == "org.kde.plasma.systemtray") {
|
|
|
|
if (metadata.pluginId() == "org.kde.plasma.systemtray") {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
foreach (NowDockView *dock, m_containments) {
|
|
|
|
foreach (NowDockView *dock, m_containments) {
|
|
|
|
if (dock->containment() == containment) {
|
|
|
|
if (dock->containment() == containment) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
qWarning() << "Adding dock for container...";
|
|
|
|
qWarning() << "Adding dock for container...";
|
|
|
|
|
|
|
|
|
|
|
|
auto dockView = new NowDockView(this);
|
|
|
|
auto dockView = new NowDockView(this);
|
|
|
@ -191,7 +191,7 @@ void NowDockCorona::loadDefaultLayout()
|
|
|
|
|
|
|
|
|
|
|
|
QVariantList args;
|
|
|
|
QVariantList args;
|
|
|
|
auto defaultContainment = createContainmentDelayed("org.kde.latte.containment", args);
|
|
|
|
auto defaultContainment = createContainmentDelayed("org.kde.latte.containment", args);
|
|
|
|
|
|
|
|
|
|
|
|
defaultContainment->setContainmentType(Plasma::Types::PanelContainment);
|
|
|
|
defaultContainment->setContainmentType(Plasma::Types::PanelContainment);
|
|
|
|
defaultContainment->init();
|
|
|
|
defaultContainment->init();
|
|
|
|
|
|
|
|
|
|
|
@ -199,23 +199,23 @@ void NowDockCorona::loadDefaultLayout()
|
|
|
|
qWarning() << "the requested containment plugin can not be located or loaded";
|
|
|
|
qWarning() << "the requested containment plugin can not be located or loaded";
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
auto config = defaultContainment->config();
|
|
|
|
auto config = defaultContainment->config();
|
|
|
|
defaultContainment->restore(config);
|
|
|
|
defaultContainment->restore(config);
|
|
|
|
|
|
|
|
|
|
|
|
switch (containments().size()) {
|
|
|
|
switch (containments().size()) {
|
|
|
|
case 1:
|
|
|
|
case 1:
|
|
|
|
defaultContainment->setLocation(Plasma::Types::LeftEdge);
|
|
|
|
defaultContainment->setLocation(Plasma::Types::LeftEdge);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case 2:
|
|
|
|
case 2:
|
|
|
|
defaultContainment->setLocation(Plasma::Types::RightEdge);
|
|
|
|
defaultContainment->setLocation(Plasma::Types::RightEdge);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case 3:
|
|
|
|
case 3:
|
|
|
|
defaultContainment->setLocation(Plasma::Types::TopEdge);
|
|
|
|
defaultContainment->setLocation(Plasma::Types::TopEdge);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
default:
|
|
|
|
defaultContainment->setLocation(Plasma::Types::BottomEdge);
|
|
|
|
defaultContainment->setLocation(Plasma::Types::BottomEdge);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
@ -224,14 +224,14 @@ void NowDockCorona::loadDefaultLayout()
|
|
|
|
//config.writeEntry("dock", "initial");
|
|
|
|
//config.writeEntry("dock", "initial");
|
|
|
|
//config.writeEntry("alignment", (int)Dock::Center);
|
|
|
|
//config.writeEntry("alignment", (int)Dock::Center);
|
|
|
|
//config.deleteEntry("wallpaperplugin");
|
|
|
|
//config.deleteEntry("wallpaperplugin");
|
|
|
|
|
|
|
|
|
|
|
|
defaultContainment->updateConstraints(Plasma::Types::StartupCompletedConstraint);
|
|
|
|
defaultContainment->updateConstraints(Plasma::Types::StartupCompletedConstraint);
|
|
|
|
defaultContainment->save(config);
|
|
|
|
defaultContainment->save(config);
|
|
|
|
requestConfigSync();
|
|
|
|
requestConfigSync();
|
|
|
|
defaultContainment->flushPendingConstraintsEvents();
|
|
|
|
defaultContainment->flushPendingConstraintsEvents();
|
|
|
|
emit containmentAdded(defaultContainment);
|
|
|
|
emit containmentAdded(defaultContainment);
|
|
|
|
emit containmentCreated(defaultContainment);
|
|
|
|
emit containmentCreated(defaultContainment);
|
|
|
|
|
|
|
|
|
|
|
|
addDock(defaultContainment);
|
|
|
|
addDock(defaultContainment);
|
|
|
|
|
|
|
|
|
|
|
|
defaultContainment->createApplet(QStringLiteral("org.kde.latte.plasmoid"));
|
|
|
|
defaultContainment->createApplet(QStringLiteral("org.kde.latte.plasmoid"));
|
|
|
|