![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index c8dc30d8bc1766977b4c6f825a60caf106b08aa9..e67a4b95f65c84acfa2d864272dcba50cc2648c0 100644 (file)
std::vector<const gchar *> Extension::search_path;
std::ofstream Extension::error_file;
-Parameter * param_shared (const gchar * name, GSList * list);
+Parameter * get_param (const gchar * name);
/**
\return none
not related to the module directly. If the Repr does not include
a name and an ID the module will be left in an errored state.
*/
-Extension::Extension (Inkscape::XML::Node * in_repr, Implementation::Implementation * in_imp) : _help(NULL)
+Extension::Extension (Inkscape::XML::Node * in_repr, Implementation::Implementation * in_imp)
+ : _help(NULL)
+ , _gui(true)
{
repr = in_repr;
Inkscape::GC::anchor(in_repr);
\brief This function looks through the linked list for a parameter
structure with the name of the passed in name
\param name The name to search for
- \param list The list to look for
This is an inline function that is used by all the get_param and
set_param functions to find a param_t in the linked list with
- the passed in name. It is done as an inline so that it will be
- optimized into a 'jump' by the compiler.
+ the passed in name.
This function can throw a 'param_not_exist' exception if the
name is not found.
The first thing that this function checks is if the list is NULL.
It could be NULL because there are no parameters for this extension
- or because all of them have been checked (I'll spoil the ending and
- tell you that this function is called recursively). If the list
+ or because all of them have been checked. If the list
is NULL then the 'param_not_exist' exception is thrown.
-
- Otherwise, the function looks at the current param_t that the element
- list points to. If the name of that param_t matches the passed in
- name then that param_t is returned. Otherwise, this function is
- called again with g_slist_next as a parameter.
*/
Parameter *
-param_shared (const gchar * name, GSList * list)
+Extension::get_param (const gchar * name)
{
- Parameter * output;
-
if (name == NULL) {
throw Extension::param_not_exist();
}
- if (list == NULL) {
+ if (this->parameters == NULL) {
+ // the list of parameters is empty
throw Extension::param_not_exist();
}
- output = static_cast<Parameter *>(list->data);
- if (!strcmp(output->name(), name)) {
- return output;
+ for (GSList * list = this->parameters; list != NULL; list =
+g_slist_next(list)) {
+ Parameter * param = static_cast<Parameter*>(list->data);
+ if (!strcmp(param->name(), name)) {
+ return param;
+ } else {
+ Parameter * subparam = param->get_param(name);
+ if (subparam) {
+ return subparam;
+ }
+ }
}
- return param_shared(name, g_slist_next(list));
+ // if execution reaches here, no parameter matching 'name' was found
+ throw Extension::param_not_exist();
}
/**
found parameter.
*/
const gchar *
-Extension::get_param_string (const gchar * name, const Document * doc, const Inkscape::XML::Node * node)
+Extension::get_param_string (const gchar * name, const SPDocument * doc, const Inkscape::XML::Node * node)
{
Parameter * param;
-
- param = param_shared(name, parameters);
+ param = get_param(name);
return param->get_string(doc, node);
}
const gchar *
-Extension::get_param_enum (const gchar * name, const Document * doc, const Inkscape::XML::Node * node)
+Extension::get_param_enum (const gchar * name, const SPDocument * doc, const Inkscape::XML::Node * node)
{
- Parameter* param = param_shared(name, parameters);
+ Parameter* param = get_param(name);
return param->get_enum(doc, node);
}
+gchar const *
+Extension::get_param_optiongroup( gchar const * name, SPDocument const * doc, Inkscape::XML::Node const * node)
+{
+ Parameter* param = get_param(name);
+ return param->get_optiongroup(doc, node);
+}
+
+
/**
\return The value of the parameter identified by the name
\brief Gets a parameter identified by name with the bool placed
@@ -450,11 +459,10 @@ Extension::get_param_enum (const gchar * name, const Document * doc, const Inksc
found parameter.
*/
bool
-Extension::get_param_bool (const gchar * name, const Document * doc, const Inkscape::XML::Node * node)
+Extension::get_param_bool (const gchar * name, const SPDocument * doc, const Inkscape::XML::Node * node)
{
Parameter * param;
-
- param = param_shared(name, parameters);
+ param = get_param(name);
return param->get_bool(doc, node);
}
@@ -470,11 +478,10 @@ Extension::get_param_bool (const gchar * name, const Document * doc, const Inksc
found parameter.
*/
int
-Extension::get_param_int (const gchar * name, const Document * doc, const Inkscape::XML::Node * node)
+Extension::get_param_int (const gchar * name, const SPDocument * doc, const Inkscape::XML::Node * node)
{
Parameter * param;
-
- param = param_shared(name, parameters);
+ param = get_param(name);
return param->get_int(doc, node);
}
@@ -490,10 +497,10 @@ Extension::get_param_int (const gchar * name, const Document * doc, const Inksca
found parameter.
*/
float
-Extension::get_param_float (const gchar * name, const Document * doc, const Inkscape::XML::Node * node)
+Extension::get_param_float (const gchar * name, const SPDocument * doc, const Inkscape::XML::Node * node)
{
Parameter * param;
- param = param_shared(name, parameters);
+ param = get_param(name);
return param->get_float(doc, node);
}
@@ -509,9 +516,9 @@ Extension::get_param_float (const gchar * name, const Document * doc, const Inks
found parameter.
*/
guint32
-Extension::get_param_color (const gchar * name, const Document * doc, const Inkscape::XML::Node * node)
+Extension::get_param_color (const gchar * name, const SPDocument * doc, const Inkscape::XML::Node * node)
{
- Parameter* param = param_shared(name, parameters);
+ Parameter* param = get_param(name);
return param->get_color(doc, node);
}
@@ -528,10 +535,10 @@ Extension::get_param_color (const gchar * name, const Document * doc, const Inks
found parameter.
*/
bool
-Extension::set_param_bool (const gchar * name, bool value, Document * doc, Inkscape::XML::Node * node)
+Extension::set_param_bool (const gchar * name, bool value, SPDocument * doc, Inkscape::XML::Node * node)
{
Parameter * param;
- param = param_shared(name, parameters);
+ param = get_param(name);
return param->set_bool(value, doc, node);
}
@@ -548,10 +555,10 @@ Extension::set_param_bool (const gchar * name, bool value, Document * doc, Inksc
found parameter.
*/
int
-Extension::set_param_int (const gchar * name, int value, Document * doc, Inkscape::XML::Node * node)
+Extension::set_param_int (const gchar * name, int value, SPDocument * doc, Inkscape::XML::Node * node)
{
Parameter * param;
- param = param_shared(name, parameters);
+ param = get_param(name);
return param->set_int(value, doc, node);
}
@@ -568,10 +575,10 @@ Extension::set_param_int (const gchar * name, int value, Document * doc, Inkscap
found parameter.
*/
float
-Extension::set_param_float (const gchar * name, float value, Document * doc, Inkscape::XML::Node * node)
+Extension::set_param_float (const gchar * name, float value, SPDocument * doc, Inkscape::XML::Node * node)
{
Parameter * param;
- param = param_shared(name, parameters);
+ param = get_param(name);
return param->set_float(value, doc, node);
}
@@ -588,13 +595,21 @@ Extension::set_param_float (const gchar * name, float value, Document * doc, Ink
found parameter.
*/
const gchar *
-Extension::set_param_string (const gchar * name, const gchar * value, Document * doc, Inkscape::XML::Node * node)
+Extension::set_param_string (const gchar * name, const gchar * value, SPDocument * doc, Inkscape::XML::Node * node)
{
Parameter * param;
- param = param_shared(name, parameters);
+ param = get_param(name);
return param->set_string(value, doc, node);
}
+gchar const *
+Extension::set_param_optiongroup(gchar const * name, gchar const * value, SPDocument * doc, Inkscape::XML::Node * node)
+{
+ Parameter * param = get_param(name);
+ return param->set_optiongroup(value, doc, node);
+}
+
+
/**
\return The passed in value
\brief Sets a parameter identified by name with the string
@@ -608,9 +623,9 @@ Extension::set_param_string (const gchar * name, const gchar * value, Document *
found parameter.
*/
guint32
-Extension::set_param_color (const gchar * name, guint32 color, Document * doc, Inkscape::XML::Node * node)
+Extension::set_param_color (const gchar * name, guint32 color, SPDocument * doc, Inkscape::XML::Node * node)
{
- Parameter* param = param_shared(name, parameters);
+ Parameter* param = get_param(name);
return param->set_color(color, doc, node);
}
*/
void addWidget (Gtk::Widget * widg, gchar const * tooltip) {
if (widg == NULL) return;
- this->pack_start(*widg, true, true, 2);
+ this->pack_start(*widg, false, false, 2);
if (tooltip != NULL) {
- _tooltips.set_tip(*widg, Glib::ustring(tooltip));
+ _tooltips.set_tip(*widg, Glib::ustring(_(tooltip)));
}
return;
};
If all parameters are gui_visible = false NULL is returned as well.
*/
Gtk::Widget *
-Extension::autogui (Document * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal)
+Extension::autogui (SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal)
{
- if (param_visible_count() == 0) return NULL;
+ if (!_gui || param_visible_count() == 0) return NULL;
AutoGUI * agui = Gtk::manage(new AutoGUI());