[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra/krita-mohit-testing] krita: Changes in KoResourceBundleTest to overcome compile errors unk
From: Mohit Goyal <mohit.bits2011 () gmail ! com>
Date: 2014-06-08 13:01:36
Message-ID: E1WtcjA-0003O6-Cr () scm ! kde ! org
[Download RAW message or body]
Git commit 489a52e014066bd2dcf72d4cbe90e341bdf899a2 by Mohit Goyal.
Committed on 08/06/2014 at 12:57.
Pushed by mohitgoyal into branch 'krita-mohit-testing'.
Changes in KoResourceBundleTest to overcome compile errors unknowingly introduced in \
last commit. Initial phase for Locked settings to setup structure.
M +6 -0 krita/image/CMakeLists.txt
A +49 -0 krita/image/brushengine/kis_locked_properties.cc [License: \
UNKNOWN] * A +25 -0 krita/image/brushengine/kis_locked_properties.h \
[License: UNKNOWN] * A +22 -0 \
krita/image/brushengine/kis_locked_properties_proxy.cpp [License: UNKNOWN] * A \
+23 -0 krita/image/brushengine/kis_locked_properties_proxy.h [License: \
UNKNOWN] * A +25 -0 krita/image/brushengine/kis_locked_properties_server.cpp \
[License: UNKNOWN] * A +20 -0 \
krita/image/brushengine/kis_locked_properties_server.h [License: UNKNOWN] * A \
+10 -0 krita/image/kis_locked_settings.h [License: UNKNOWN] * M +9 -9 \
krita/plugins/paintops/resourcemanager/tests/KoResourceBundleTest.cpp M +1 -0 \
krita/plugins/paintops/resourcemanager/tests/KoResourceBundleTest.h M +5 -1 \
krita/ui/kis_paintop_options_widget.cpp
The files marked with a * at the end have a non valid license. Please read: \
http://techbase.kde.org/Policies/Licensing_Policy and use the headers which are \
listed at that page.
http://commits.kde.org/calligra/489a52e014066bd2dcf72d4cbe90e341bdf899a2
diff --git a/krita/image/CMakeLists.txt b/krita/image/CMakeLists.txt
index eba2ec3..9970dce 100644
--- a/krita/image/CMakeLists.txt
+++ b/krita/image/CMakeLists.txt
@@ -66,6 +66,9 @@ set(kritaimage_LIB_SRCS
brushengine/kis_paintop_preset.cpp
brushengine/kis_paintop_registry.cc
brushengine/kis_paintop_settings.cpp
+ brushengine/kis_locked_properties.cc
+ brushengine/kis_locked_properties_proxy.cpp
+ brushengine/kis_locked_properties_server.cpp
commands/kis_deselect_global_selection_command.cpp
commands/kis_image_change_layers_command.cpp
commands/kis_image_command.cpp
@@ -318,4 +321,7 @@ install( FILES
filter/kis_filter_configuration.h
generator/kis_generator.h
generator/kis_generator_registry.h
+ brushengine/kis_locked_properties.h
+ brushengine/kis_locked_properties_proxy.h
+ brushengine/kis_locked_properties_server.h
DESTINATION ${INCLUDE_INSTALL_DIR}/krita)
diff --git a/krita/image/brushengine/kis_locked_properties.cc \
b/krita/image/brushengine/kis_locked_properties.cc new file mode 100644
index 0000000..e6c2cf9
--- /dev/null
+++ b/krita/image/brushengine/kis_locked_properties.cc
@@ -0,0 +1,49 @@
+#include "kis_locked_properties.h"
+
+
+KisLockedProperties::KisLockedProperties()
+{
+ m_lockedProperties = new KisPropertiesConfiguration();
+}
+
+KisLockedProperties::KisLockedProperties(KisPropertiesConfiguration *p)
+{
+ m_lockedProperties = new KisPropertiesConfiguration();
+ QMap<QString,QVariant>::Iterator i;
+ for(i = p->getProperties().begin();i!=p->getProperties().end();i++)
+ {
+ m_lockedProperties->setProperty(i.key(),i.value());
+ }
+}
+void KisLockedProperties::addToLockedProperties(KisPropertiesConfiguration *p)
+{
+ QMap<QString,QVariant>::Iterator i;
+ for(i = p->getProperties().begin();i!=p->getProperties().end();i++)
+ {
+ m_lockedProperties->setProperty(i.key(),i.value());
+ }
+}
+void KisLockedProperties::removeFromLockedProperties(KisPropertiesConfiguration *p)
+{
+ KisPropertiesConfiguration *temp = new KisPropertiesConfiguration();
+ QMap<QString,QVariant>::Iterator i;
+ for(i = m_lockedProperties->getProperties().begin();i!=m_lockedProperties->getProperties().end();i++)
+ {
+ temp->setProperty(i.key(),i.value());
+ }
+ m_lockedProperties->clearProperties();
+
+
+
+ for(i = temp->getProperties().begin();i!=temp->getProperties().end();i++)
+ {
+ if(!p->hasProperty(i.key()))
+ {
+ m_lockedProperties->setProperty(i.key(),i.value());
+ }
+ }
+}
+KisPropertiesConfiguration *KisLockedProperties::lockedProperties()
+{
+ return m_lockedProperties;
+}
diff --git a/krita/image/brushengine/kis_locked_properties.h \
b/krita/image/brushengine/kis_locked_properties.h new file mode 100644
index 0000000..98dc414
--- /dev/null
+++ b/krita/image/brushengine/kis_locked_properties.h
@@ -0,0 +1,25 @@
+#ifndef KISLOCKEDPROPERTIES_H
+#define KISLOCKEDPROPERTIES_H
+
+#include "kis_properties_configuration.h"
+#include "kis_paintop_settings.h"
+
+class KisLockedProperties
+{
+public:
+ KisLockedProperties();
+ KisLockedProperties(KisPropertiesConfiguration *p);
+
+ /**Whenever any setting is made locked**/
+ void addToLockedProperties(KisPropertiesConfiguration *p);
+
+ /**Whenever any property is unlocked**/
+ void removeFromLockedProperties(KisPropertiesConfiguration *p);
+ KisPropertiesConfiguration *lockedProperties();
+
+
+private:
+ KisPropertiesConfiguration* m_lockedProperties;
+};
+
+#endif // KISLOCKEDPROPERTIES_H
diff --git a/krita/image/brushengine/kis_locked_properties_proxy.cpp \
b/krita/image/brushengine/kis_locked_properties_proxy.cpp new file mode 100644
index 0000000..06011ae
--- /dev/null
+++ b/krita/image/brushengine/kis_locked_properties_proxy.cpp
@@ -0,0 +1,22 @@
+#include "kis_locked_properties_proxy.h"
+
+KisLockedPropertiesProxy ::KisLockedPropertiesProxy ()
+{
+ m_lockedProperties = NULL;
+ m_parent = NULL;
+}
+KisLockedPropertiesProxy::KisLockedPropertiesProxy(KisLockedProperties* p)
+{
+ m_lockedProperties = p;
+}
+KisLockedPropertiesProxy::KisLockedPropertiesProxy(KisPropertiesConfiguration *p, \
KisLockedProperties *l) +{
+ m_lockedProperties = l;
+ m_parent = p;
+}
+
+bool KisLockedPropertiesProxy::getBool(const QString &name, bool def) const
+{
+ qDebug("Overridden Setting");
+ return true;
+}
diff --git a/krita/image/brushengine/kis_locked_properties_proxy.h \
b/krita/image/brushengine/kis_locked_properties_proxy.h new file mode 100644
index 0000000..3de411b
--- /dev/null
+++ b/krita/image/brushengine/kis_locked_properties_proxy.h
@@ -0,0 +1,23 @@
+#ifndef KIS_LOCKED_PROPERTIES_PROXY_H
+#define KIS_LOCKED_PROPERTIES_PROXY_H
+
+#include "kis_locked_properties.h"
+#include "kis_properties_configuration.h"
+
+class KisLockedPropertiesProxy: public KisPropertiesConfiguration
+{
+public:
+ KisLockedPropertiesProxy() ;
+ KisLockedPropertiesProxy(KisLockedProperties* p);
+ KisLockedPropertiesProxy(KisPropertiesConfiguration *, KisLockedProperties *);
+ bool getBool(const QString &name, bool def) const;
+
+
+
+private:
+ KisLockedProperties* m_lockedProperties;
+ KisPropertiesConfiguration* m_parent;
+
+};
+
+#endif // KIS_LOCKED_PROPERTIES_PROXY_H
diff --git a/krita/image/brushengine/kis_locked_properties_server.cpp \
b/krita/image/brushengine/kis_locked_properties_server.cpp new file mode 100644
index 0000000..9387497
--- /dev/null
+++ b/krita/image/brushengine/kis_locked_properties_server.cpp
@@ -0,0 +1,25 @@
+#include "kis_locked_properties_server.h"
+
+KisLockedPropertiesServer::KisLockedPropertiesServer()
+{
+}
+
+KisLockedPropertiesProxy* \
KisLockedPropertiesServer::createLockedPropertiesProxy(KisPropertiesConfiguration* \
config) +{
+ KisLockedPropertiesProxy* m = new \
KisLockedPropertiesProxy(config,m_lockedProperties); + return m;
+}
+KisLockedPropertiesServer* KisLockedPropertiesServer::instance()
+{
+ K_GLOBAL_STATIC(KisLockedPropertiesServer, s_instance);
+ if(s_instance)
+ {
+ return s_instance;
+ }
+ return NULL;
+}
+KisLockedProperties* KisLockedPropertiesServer::lockedProperties()
+{
+ return m_lockedProperties;
+}
+
diff --git a/krita/image/brushengine/kis_locked_properties_server.h \
b/krita/image/brushengine/kis_locked_properties_server.h new file mode 100644
index 0000000..51dbe77
--- /dev/null
+++ b/krita/image/brushengine/kis_locked_properties_server.h
@@ -0,0 +1,20 @@
+#ifndef KIS_LOCKED_PROPERTIES_SERVER_H
+#define KIS_LOCKED_PROPERTIES_SERVER_H
+
+#include"kis_locked_properties.h"
+#include"kis_locked_properties_proxy.h"
+#include"kis_properties_configuration.h"
+
+class KRITAIMAGE_EXPORT KisLockedPropertiesServer: public QObject
+{
+public:
+ KisLockedPropertiesServer();
+ static KisLockedPropertiesServer* instance();
+ KisLockedPropertiesProxy* \
createLockedPropertiesProxy(KisPropertiesConfiguration*); + KisLockedProperties* \
lockedProperties(); +
+private:
+ KisLockedProperties* m_lockedProperties;
+};
+
+#endif // KIS_LOCKED_PROPERTIES_SERVER_H
diff --git a/krita/image/kis_locked_settings.h b/krita/image/kis_locked_settings.h
new file mode 100644
index 0000000..0ef16b4
--- /dev/null
+++ b/krita/image/kis_locked_settings.h
@@ -0,0 +1,10 @@
+#ifndef KIS_LOCKED_SETTINGS_H
+#define KIS_LOCKED_SETTINGS_H
+
+#include "kis_paintop_preset.h"
+#include "kis_paintop_settings.h"
+#include "kis_properties_configuration.h"
+
+
+
+#endif // KIS_LOCKED_SETTINGS_H
diff --git a/krita/plugins/paintops/resourcemanager/tests/KoResourceBundleTest.cpp \
b/krita/plugins/paintops/resourcemanager/tests/KoResourceBundleTest.cpp index \
551d308..36449e2 100644
--- a/krita/plugins/paintops/resourcemanager/tests/KoResourceBundleTest.cpp
+++ b/krita/plugins/paintops/resourcemanager/tests/KoResourceBundleTest.cpp
@@ -87,7 +87,7 @@ void KoResourceBundleTest::testLoadSave()
KoResourceServer<KoAbstractGradient>* gradientServer = \
KoResourceServerProvider::instance()->gradientServer(); \
gradientServer->loadResources(gradientServer->fileNames());
- QVERIFY(gradientServer->resoureCount() > 0);
+ QVERIFY(gradientServer->resourceCount() > 0);
foreach(KoAbstractGradient* gradient, gradientServer->resources()) {
if (gradient->name() == "Foreground to Transparent" || gradient->name() == \
"Foreground to Background") continue;
gradientServer->addTag(gradient, QString("testtag: %1").arg(tagCount));
@@ -96,7 +96,7 @@ void KoResourceBundleTest::testLoadSave()
}
KoResourceServer<KoPattern>* patternServer = \
KoResourceServerProvider::instance()->patternServer();
- QVERIFY(patternServer->resoureCount() > 0);
+ QVERIFY(patternServer->resourceCount() > 0);
foreach(KoPattern* pattern, patternServer->resources()) {
patternServer->addTag(pattern, QString("testtag: %1").arg(tagCount));
tagCount++;
@@ -104,7 +104,7 @@ void KoResourceBundleTest::testLoadSave()
}
KisBrushResourceServer* brushServer = KisBrushServer::instance()->brushServer();
- QVERIFY(brushServer->resoureCount() > 0);
+ QVERIFY(brushServer->resourceCount() > 0);
foreach(KisBrushSP brush, brushServer->resources()) {
brushServer->addTag(brush.data(), QString("testtag: %1").arg(tagCount));
tagCount++;
@@ -113,7 +113,7 @@ void KoResourceBundleTest::testLoadSave()
KoResourceServer<KoColorSet>* paletteServer = \
KoResourceServerProvider::instance()->paletteServer();
- QVERIFY(paletteServer->resoureCount() > 0);
+ QVERIFY(paletteServer->resourceCount() > 0);
foreach(KoColorSet* palette, paletteServer->resources()) {
paletteServer->addTag(palette, QString("testtag: %1").arg(tagCount));
tagCount++;
@@ -122,7 +122,7 @@ void KoResourceBundleTest::testLoadSave()
KoResourceServer< KisWorkspaceResource >* workspaceServer = \
KisResourceServerProvider::instance()->workspaceServer();
- QVERIFY(workspaceServer->resoureCount() > 0);
+ QVERIFY(workspaceServer->resourceCount() > 0);
foreach(KisWorkspaceResource* workspace, workspaceServer->resources()) {
workspaceServer->addTag(workspace, QString("testtag: %1").arg(tagCount));
tagCount++;
@@ -130,11 +130,11 @@ void KoResourceBundleTest::testLoadSave()
}
KisPaintOpPresetResourceServer * paintopServer = \
KisResourceServerProvider::instance()->paintOpPresetServer();
- QVERIFY(paintopServer->resoureCount() > 0);
- foreach(KisPaintOpPreset* preset, paintopServer->resources()) {
- paintopServer->addTag(preset, QString("testtag: %1").arg(tagCount));
+ QVERIFY(paintopServer->resourceCount() > 0);
+ foreach(KisPaintOpPresetSP preset, paintopServer->resources()) {
+ paintopServer->addTag(preset.data(), QString("testtag: %1").arg(tagCount));
tagCount++;
- bundle.addResource(paintopServer->type(), preset->filename(), \
paintopServer->tagObject()->assignedTagsList(preset), preset->md5()); + \
bundle.addResource(paintopServer->type(), preset->filename(), \
paintopServer->tagObject()->assignedTagsList(preset.data()), preset->md5()); }
//QCOMPARE(bundle.getTagsList(), );
diff --git a/krita/plugins/paintops/resourcemanager/tests/KoResourceBundleTest.h \
b/krita/plugins/paintops/resourcemanager/tests/KoResourceBundleTest.h index \
7676581..a83a500 100644
--- a/krita/plugins/paintops/resourcemanager/tests/KoResourceBundleTest.h
+++ b/krita/plugins/paintops/resourcemanager/tests/KoResourceBundleTest.h
@@ -36,3 +36,4 @@ private slots:
};
#endif // KORESOURCEBUNDLE_TEST_H
+
diff --git a/krita/ui/kis_paintop_options_widget.cpp \
b/krita/ui/kis_paintop_options_widget.cpp index 9c462df..c0c3da6 100644
--- a/krita/ui/kis_paintop_options_widget.cpp
+++ b/krita/ui/kis_paintop_options_widget.cpp
@@ -30,6 +30,8 @@
#include <kis_paintop_preset.h>
#include <kis_cmb_composite.h>
#include <kis_categorized_item_delegate.h>
+#include <kis_locked_properties_server.h>
+#include <kis_locked_properties_proxy.h>
struct KisPaintOpOptionsWidget::Private
{
@@ -98,8 +100,10 @@ void KisPaintOpOptionsWidget::setConfiguration(const \
KisPropertiesConfiguration
void KisPaintOpOptionsWidget::writeConfiguration(KisPropertiesConfiguration *config) \
const {
+ KisLockedPropertiesProxy* m = \
KisLockedPropertiesServer::instance()->createLockedPropertiesProxy(config); +
foreach(const KisPaintOpOption* option, m_d->paintOpOptions) {
- option->writeOptionSetting(config);
+ option->writeOptionSetting(m);
}
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic