X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fcolorset.h;h=954b62d89033be933e618f6bfd3461b0273e4e01;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=15e0c9046092e20f477ba9f8a87da2e1bf19e0db;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/colorset.h b/synfig-studio/trunk/src/synfigapp/actions/colorset.h
index 15e0c90..954b62d 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/colorset.h
+++ b/synfig-studio/trunk/src/synfigapp/actions/colorset.h
@@ -46,23 +46,42 @@ class ColorSet :
 {
 private:
 
-	ValueDesc value_desc;
+	std::list<ValueDesc> value_desc_list;
 	synfig::Color color;
 	synfig::Time time;
+	bool use_outline_color;
 
 public:
 
-	ColorSet();
+	ColorSet(bool use_outline_color);
 
 	static ParamVocab get_param_vocab();
 	static bool is_candidate(const ParamList &x);
 
 	virtual bool set_param(const synfig::String& name, const Param &);
-	virtual bool is_ready()const;
+	virtual bool is_ready() const;
 
 	virtual void prepare();
+};
+
+class ColorSetFromOC : public ColorSet
+{
+public:
+
+	ColorSetFromOC() : ColorSet(true) {}
+
+	ACTION_MODULE_EXT
+
+};
+
+class ColorSetFromFC : public ColorSet
+{
+public:
+
+	ColorSetFromFC() : ColorSet(false) {}
 
 	ACTION_MODULE_EXT
+
 };
 
 }; // END of namespace action