Commit b6e859cc authored by Halla Rempt's avatar Halla Rempt
Browse files

Remove saving the palette with the workspace

BUG:446634
parent fa0d3635
Pipeline #204338 failed with stage
in 63 minutes
......@@ -155,10 +155,6 @@ void PaletteDockerDock::setViewManager(KisViewManager* kisview)
{
m_view = kisview;
m_resourceProvider = kisview->canvasResourceProvider();
connect(m_resourceProvider, SIGNAL(sigSavingWorkspace(KisWorkspaceResourceSP)),
SLOT(saveToWorkspace(KisWorkspaceResourceSP)));
connect(m_resourceProvider, SIGNAL(sigLoadingWorkspace(KisWorkspaceResourceSP)),
SLOT(loadFromWorkspace(KisWorkspaceResourceSP)));
connect(m_resourceProvider, SIGNAL(sigFGColorChanged(KoColor)),
this, SLOT(slotFGColorResourceChanged(KoColor)));
kisview->nodeManager()->disconnect(m_model);
......@@ -386,24 +382,6 @@ void PaletteDockerDock::slotUpdatePaletteName()
}
}
void PaletteDockerDock::saveToWorkspace(KisWorkspaceResourceSP workspace)
{
if (!m_currentColorSet.isNull()) {
workspace->setProperty("palette", m_currentColorSet->name());
}
}
void PaletteDockerDock::loadFromWorkspace(KisWorkspaceResourceSP workspace)
{
if (workspace->hasProperty("palette")) {
KoResourceServer<KoColorSet>* rServer = KoResourceServerProvider::instance()->paletteServer();
KoColorSetSP colorSet = rServer->resource("", "", workspace->getString("palette"));
if (colorSet) {
slotSetColorSet(colorSet);
}
}
}
void PaletteDockerDock::slotFGColorResourceChanged(const KoColor &color)
{
if (!m_colorSelfUpdate) {
......
......@@ -76,9 +76,6 @@ private Q_SLOTS:
void slotNameListSelection(const KoColor &color);
void slotSetColorSet(KoColorSetSP colorSet);
void saveToWorkspace(KisWorkspaceResourceSP workspace);
void loadFromWorkspace(KisWorkspaceResourceSP workspace);
void slotFGColorResourceChanged(const KoColor& color);
void slotStoragesChanged(const QString &location);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment